From 1e8a275a2015dbb7bdf8fada5f15f46de5e9abca Mon Sep 17 00:00:00 2001 From: Alan Knight Date: Wed, 8 Jul 2015 12:19:30 -0700 Subject: [PATCH] Revert "appendHtml, when sanitizing, should create document fragment in the right context" This reverts commit 560f12bb21874824788e1f660ca07b8914c8cc4f. modified: sdk/lib/html/dart2js/html_dart2js.dart modified: sdk/lib/html/dartium/html_dartium.dart modified: tests/html/element_add_test.dart modified: tools/dom/templates/html/impl/impl_Element.darttemplate BUG= Review URL: https://codereview.chromium.org//1230553003 . --- sdk/lib/html/dart2js/html_dart2js.dart | 2 +- sdk/lib/html/dartium/html_dartium.dart | 2 +- tests/html/element_add_test.dart | 13 ------------- .../templates/html/impl/impl_Element.darttemplate | 2 +- 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/sdk/lib/html/dart2js/html_dart2js.dart b/sdk/lib/html/dart2js/html_dart2js.dart index 9d98a078aa2..ffe111fb77f 100644 --- a/sdk/lib/html/dart2js/html_dart2js.dart +++ b/sdk/lib/html/dart2js/html_dart2js.dart @@ -12898,7 +12898,7 @@ abstract class Element extends Node implements GlobalEventHandlers, ParentNode, if (treeSanitizer is _TrustedHtmlTreeSanitizer) { _insertAdjacentHtml(where, html); } else { - _insertAdjacentNode(where, createFragment(html, + _insertAdjacentNode(where, new DocumentFragment.html(html, validator: validator, treeSanitizer: treeSanitizer)); } } diff --git a/sdk/lib/html/dartium/html_dartium.dart b/sdk/lib/html/dartium/html_dartium.dart index 27ec8b61fa1..9e07f3135a7 100644 --- a/sdk/lib/html/dartium/html_dartium.dart +++ b/sdk/lib/html/dartium/html_dartium.dart @@ -12426,7 +12426,7 @@ abstract class Element extends Node implements GlobalEventHandlers, ParentNode, if (treeSanitizer is _TrustedHtmlTreeSanitizer) { _insertAdjacentHtml(where, html); } else { - _insertAdjacentNode(where, createFragment(html, + _insertAdjacentNode(where, new DocumentFragment.html(html, validator: validator, treeSanitizer: treeSanitizer)); } } diff --git a/tests/html/element_add_test.dart b/tests/html/element_add_test.dart index 45aa1c218c0..8346129a208 100644 --- a/tests/html/element_add_test.dart +++ b/tests/html/element_add_test.dart @@ -62,19 +62,6 @@ main() { expect(fragment.children.length, equals(1)); expect(fragment.children[0], isSpanElement); }); - - test('html interpreted in correct context', () { - var el = new TableElement(); - el.appendHtml('foo'); - expect(el.children.length, 1); - var section = el.children.first; - expect(section is TableSectionElement, isTrue); - var row = section.children.first; - expect(row is TableRowElement, isTrue); - var item = row.children.first; - expect(item is TableCellElement, isTrue); - expect(item.innerHtml, 'foo'); - }); }); group('appendText', () { diff --git a/tools/dom/templates/html/impl/impl_Element.darttemplate b/tools/dom/templates/html/impl/impl_Element.darttemplate index 9e85eacea63..fcf3c0c9dfe 100644 --- a/tools/dom/templates/html/impl/impl_Element.darttemplate +++ b/tools/dom/templates/html/impl/impl_Element.darttemplate @@ -1017,7 +1017,7 @@ $endif if (treeSanitizer is _TrustedHtmlTreeSanitizer) { _insertAdjacentHtml(where, html); } else { - _insertAdjacentNode(where, createFragment(html, + _insertAdjacentNode(where, new DocumentFragment.html(html, validator: validator, treeSanitizer: treeSanitizer)); } }