Title: [144413] trunk
- Revision
- 144413
- Author
- [email protected]
- Date
- 2013-02-28 21:03:34 -0800 (Thu, 28 Feb 2013)
Log Message
Unreviewed, rolling out r144370.
http://trac.webkit.org/changeset/144370
https://bugs.webkit.org/show_bug.cgi?id=111136
Caused 21 assertion failure at DocumentLoader.cpp(436)
(Requested by toyoshim on #webkit).
Patch by Sheriff Bot <[email protected]> on 2013-02-28
Source/WebCore:
* dom/Document.cpp:
(WebCore::Document::decrementActiveParserCount):
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::isLoading):
(WebCore::DocumentLoader::checkLoadComplete):
LayoutTests:
* platform/mac/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (144412 => 144413)
--- trunk/LayoutTests/ChangeLog 2013-03-01 04:40:10 UTC (rev 144412)
+++ trunk/LayoutTests/ChangeLog 2013-03-01 05:03:34 UTC (rev 144413)
@@ -1,3 +1,14 @@
+2013-02-28 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r144370.
+ http://trac.webkit.org/changeset/144370
+ https://bugs.webkit.org/show_bug.cgi?id=111136
+
+ Caused 21 assertion failure at DocumentLoader.cpp(436)
+ (Requested by toyoshim on #webkit).
+
+ * platform/mac/TestExpectations:
+
2013-02-28 Takashi Toyoshima <[email protected]>
Unreviewed, chromium gardening; update expected image for Snow Leopard
Modified: trunk/LayoutTests/platform/mac/TestExpectations (144412 => 144413)
--- trunk/LayoutTests/platform/mac/TestExpectations 2013-03-01 04:40:10 UTC (rev 144412)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2013-03-01 05:03:34 UTC (rev 144413)
@@ -1439,6 +1439,7 @@
webkit.org/b/110186 inspector-protocol/page/_javascript_DialogEvents.html [ Skip ]
+webkit.org/b/110554 http/tests/security/feed-urls-from-remote.html [ Failure ]
webkit.org/b/110555 fast/canvas/canvas-currentPath.html [ Failure ]
webkit.org/b/110555 fast/canvas/canvas-path-constructors.html [ Failure ]
Modified: trunk/Source/WebCore/ChangeLog (144412 => 144413)
--- trunk/Source/WebCore/ChangeLog 2013-03-01 04:40:10 UTC (rev 144412)
+++ trunk/Source/WebCore/ChangeLog 2013-03-01 05:03:34 UTC (rev 144413)
@@ -1,3 +1,18 @@
+2013-02-28 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r144370.
+ http://trac.webkit.org/changeset/144370
+ https://bugs.webkit.org/show_bug.cgi?id=111136
+
+ Caused 21 assertion failure at DocumentLoader.cpp(436)
+ (Requested by toyoshim on #webkit).
+
+ * dom/Document.cpp:
+ (WebCore::Document::decrementActiveParserCount):
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::isLoading):
+ (WebCore::DocumentLoader::checkLoadComplete):
+
2013-02-28 Li Yin <[email protected]>
[chromium] Events can't be triggered on MediaStreamTrack
Modified: trunk/Source/WebCore/dom/Document.cpp (144412 => 144413)
--- trunk/Source/WebCore/dom/Document.cpp 2013-03-01 04:40:10 UTC (rev 144412)
+++ trunk/Source/WebCore/dom/Document.cpp 2013-03-01 05:03:34 UTC (rev 144413)
@@ -5808,7 +5808,12 @@
--m_activeParserCount;
if (!frame())
return;
+ // FIXME: This should always be enabled, but it seems to cause
+ // http/tests/security/feed-urls-from-remote.html to timeout on Mac WK1
+ // see http://webkit.org/b/110554 and http://webkit.org/b/110401
+#if ENABLE(THREADED_HTML_PARSER)
loader()->checkLoadComplete();
+#endif
frame()->loader()->checkLoadComplete();
}
Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (144412 => 144413)
--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2013-03-01 04:40:10 UTC (rev 144412)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2013-03-01 05:03:34 UTC (rev 144413)
@@ -287,8 +287,13 @@
bool DocumentLoader::isLoading() const
{
+ // FIXME: This should always be enabled, but it seems to cause
+ // http/tests/security/feed-urls-from-remote.html to timeout on Mac WK1
+ // see http://webkit.org/b/110554 and http://webkit.org/b/110401
+#if ENABLE(THREADED_HTML_PARSER)
if (document() && document()->hasActiveParser())
return true;
+#endif
return isLoadingMainResource() || !m_subresourceLoaders.isEmpty() || !m_plugInStreamLoaders.isEmpty();
}
@@ -433,7 +438,11 @@
{
if (!m_frame || isLoading())
return;
+#if !ENABLE(THREADED_HTML_PARSER)
+ // This ASSERT triggers with the threaded HTML parser.
+ // See https://bugs.webkit.org/show_bug.cgi?id=110937
ASSERT(this == frameLoader()->activeDocumentLoader());
+#endif
m_frame->document()->domWindow()->finishedLoading();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
