WebCore:

Revert mistake in yesterday's HTMLDocumentParser refactor.
https://bugs.webkit.org/show_bug.cgi?id=140041

* html/parser/HTMLDocumentParser.cpp:
(WebCore::HTMLDocumentParser::HTMLDocumentParser): Pass the parser content policy
from the parserContentPolicy function, not the raw policy that was passed in. This
restores the behavior from before r177883.

LayoutTests:

* TestExpectations: Re-enabled the test I broke yesterday,
editing/pasteboard/drag-and-drop-objectimage-contenteditable.html,
now that it's fixed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@177951 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 14303b4649fd45badc0e9d5644939653da2dd835..3ded46a803e395d2a49048044b4c73951ab81833 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-05  Darin Adler  <darin@apple.com>
+
+        * TestExpectations: Re-enabled the test I broke yesterday,
+        editing/pasteboard/drag-and-drop-objectimage-contenteditable.html,
+        now that it's fixed.
+
 2015-01-05  Chris Dumez  <cdumez@apple.com>
 
         Using calc() for -webkit-filter does not work

diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
index b855ac09939873472bc9f5c12eb9b144aed0a45c..584044ec82fb6098f0210cae4d9c231e402ee65d 100644 (file)
--- a/LayoutTests/TestExpectations
+++ b/LayoutTests/TestExpectations
@@ -457,5 +457,3 @@ webkit.org/b/139865 js/promises-tests/promises-tests-2-3-3.html [ Skip ]
 webkit.org/b/139840 fast/xmlhttprequest/xmlhttprequest-recursive-sync-event.html [ Pass Failure ]
 
 webkit.org/b/140043 [ Debug ] js/dom/Promise.html [ Pass Failure ]
-
-webkit.org/b/140041 editing/pasteboard/drag-and-drop-objectimage-contenteditable.html [ Skip ]

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 2ca3ad2b747b8f0a96be0b13be0499f73a1b797b..6bb91dded5666c0f98f78002bad4a598b1cdb09a 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2015-01-05  Darin Adler  <darin@apple.com>
+
+        Revert mistake in yesterday's HTMLDocumentParser refactor.
+        https://bugs.webkit.org/show_bug.cgi?id=140041
+
+        * html/parser/HTMLDocumentParser.cpp:
+        (WebCore::HTMLDocumentParser::HTMLDocumentParser): Pass the parser content policy
+        from the parserContentPolicy function, not the raw policy that was passed in. This
+        restores the behavior from before r177883.
+
 2015-01-05  Chris Dumez  <cdumez@apple.com>
 
         Using calc() for -webkit-filter does not work

diff --git a/Source/WebCore/html/parser/HTMLDocumentParser.cpp b/Source/WebCore/html/parser/HTMLDocumentParser.cpp
index 0915350945d77b3420523df5848f4a6b02cdecff..cf6f3865aef0b6df638377f367cf196551af401a 100644 (file)
--- a/Source/WebCore/html/parser/HTMLDocumentParser.cpp
+++ b/Source/WebCore/html/parser/HTMLDocumentParser.cpp
@@ -78,11 +78,11 @@ Ref<HTMLDocumentParser> HTMLDocumentParser::create(HTMLDocument& document)
     return adoptRef(*new HTMLDocumentParser(document));
 }
 
-inline HTMLDocumentParser::HTMLDocumentParser(DocumentFragment& fragment, Element& contextElement, ParserContentPolicy contentPolicy)
-    : ScriptableDocumentParser(fragment.document(), contentPolicy)
+inline HTMLDocumentParser::HTMLDocumentParser(DocumentFragment& fragment, Element& contextElement, ParserContentPolicy rawPolicy)
+    : ScriptableDocumentParser(fragment.document(), rawPolicy)
     , m_options(fragment.document())
     , m_tokenizer(m_options)
-    , m_treeBuilder(std::make_unique<HTMLTreeBuilder>(*this, fragment, contextElement, contentPolicy, m_options))
+    , m_treeBuilder(std::make_unique<HTMLTreeBuilder>(*this, fragment, contextElement, parserContentPolicy(), m_options))
     , m_xssAuditorDelegate(fragment.document())
 {
     bool reportErrors = false; // For now document fragment parsing never reports errors.