Title: [139217] trunk/Source/WebCore
Revision
139217
Author
to...@chromium.org
Date
2013-01-09 12:01:46 -0800 (Wed, 09 Jan 2013)

Log Message

REGRESSION(r139141): Assertion failure in WebCore::HTMLConstructionSite::HTMLConstructionSite
https://bugs.webkit.org/show_bug.cgi?id=106412

Reviewed by Darin Adler.

This corrects the assertion added in r139141. The assertion was designed to make sure that we are using the
HTMLDocument class. XHTML documents also use HTMLDocument.

No new tests because no new functionality.

* html/parser/HTMLConstructionSite.cpp:
(WebCore::HTMLConstructionSite::HTMLConstructionSite):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (139216 => 139217)


--- trunk/Source/WebCore/ChangeLog	2013-01-09 19:41:01 UTC (rev 139216)
+++ trunk/Source/WebCore/ChangeLog	2013-01-09 20:01:46 UTC (rev 139217)
@@ -1,3 +1,18 @@
+2013-01-09  Tony Gentilcore  <to...@chromium.org>
+
+        REGRESSION(r139141): Assertion failure in WebCore::HTMLConstructionSite::HTMLConstructionSite
+        https://bugs.webkit.org/show_bug.cgi?id=106412
+
+        Reviewed by Darin Adler.
+
+        This corrects the assertion added in r139141. The assertion was designed to make sure that we are using the
+        HTMLDocument class. XHTML documents also use HTMLDocument.
+
+        No new tests because no new functionality.
+
+        * html/parser/HTMLConstructionSite.cpp:
+        (WebCore::HTMLConstructionSite::HTMLConstructionSite):
+
 2013-01-08  Ojan Vafai  <o...@chromium.org>
 
         min-content gets the wrong value if min-width is set on some form controls

Modified: trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp (139216 => 139217)


--- trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp	2013-01-09 19:41:01 UTC (rev 139216)
+++ trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp	2013-01-09 20:01:46 UTC (rev 139217)
@@ -146,7 +146,7 @@
     , m_maximumDOMTreeDepth(maximumDOMTreeDepth)
     , m_inQuirksMode(document->inQuirksMode())
 {
-    ASSERT(m_document->isHTMLDocument());
+    ASSERT(m_document->isHTMLDocument() || m_document->isXHTMLDocument());
 }
 
 HTMLConstructionSite::HTMLConstructionSite(DocumentFragment* fragment, FragmentScriptingPermission scriptingPermission, unsigned maximumDOMTreeDepth)
@@ -158,7 +158,7 @@
     , m_maximumDOMTreeDepth(maximumDOMTreeDepth)
     , m_inQuirksMode(fragment->document()->inQuirksMode())
 {
-    ASSERT(m_document->isHTMLDocument());
+    ASSERT(m_document->isHTMLDocument() || m_document->isXHTMLDocument());
 }
 
 HTMLConstructionSite::~HTMLConstructionSite()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to