Changeset 177951 in webkit

Timestamp:

Jan 5, 2015 11:46:07 PM (9 years ago)

Author:

Darin Adler

Message:

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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/parser/HTMLDocumentParser.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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>
 

trunk/LayoutTests/TestExpectations

@@ -458 +458 @@
 
 webkit.org/b/140043 [ Debug ] js/dom/Promise.html [ Pass Failure ]
-
-webkit.org/b/140041 editing/pasteboard/drag-and-drop-objectimage-contenteditable.html [ Skip ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/html/parser/HTMLDocumentParser.cpp

@@ -79 +79 @@
 }
 
-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())
 {