Title: [161484] trunk
- Revision
- 161484
- Author
- [email protected]
- Date
- 2014-01-07 23:33:10 -0800 (Tue, 07 Jan 2014)
Log Message
REGRESSION (r161195): Acid2 regression tests frequently fail
https://bugs.webkit.org/show_bug.cgi?id=126432
Source/WebCore:
Reviewed by Anders Carlsson.
We would occasionally dump the render tree before the actual last resource on the page was loaded.
The problematic resource is an image loaded by an <object> tag nested as fallback of another <object>.
* html/HTMLObjectElement.cpp:
(WebCore::HTMLObjectElement::renderFallbackContent):
Force style recalc when rendering fallback content. The current mechanism for triggering the fallback content load
requires a style recalc.
LayoutTests:
Reviewed by Anders Carlsson.
* TestExpectations: acid2 is no longer flaky.
* fast/overflow/overflow-height-float-not-removed-crash3-expected.txt: whitespace change.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (161483 => 161484)
--- trunk/LayoutTests/ChangeLog 2014-01-08 07:02:54 UTC (rev 161483)
+++ trunk/LayoutTests/ChangeLog 2014-01-08 07:33:10 UTC (rev 161484)
@@ -1,3 +1,13 @@
+2014-01-07 Antti Koivisto <[email protected]>
+
+ REGRESSION (r161195): Acid2 regression tests frequently fail
+ https://bugs.webkit.org/show_bug.cgi?id=126432
+
+ Reviewed by Anders Carlsson.
+
+ * TestExpectations: acid2 is no longer flaky.
+ * fast/overflow/overflow-height-float-not-removed-crash3-expected.txt: whitespace change.
+
2014-01-07 Eric Carlson <[email protected]>
Teach MediaSessionManager to manage interruptions
Modified: trunk/LayoutTests/TestExpectations (161483 => 161484)
--- trunk/LayoutTests/TestExpectations 2014-01-08 07:02:54 UTC (rev 161483)
+++ trunk/LayoutTests/TestExpectations 2014-01-08 07:33:10 UTC (rev 161484)
@@ -69,8 +69,3 @@
webkit.org/b/124660 inspector-protocol/model/highlight-shape-outside.html [ Failure ]
webkit.org/b/126142 css3/calc/transitions-dependent.html [ Pass Failure ]
-
-webkit.org/b/126432 fast/css/acid2-pixel.html [ Pass Failure ]
-webkit.org/b/126432 fast/css/acid2.html [ Pass Failure ]
-webkit.org/b/126432 http/tests/misc/acid2-pixel.html [ Pass Failure ]
-webkit.org/b/126432 http/tests/misc/acid2.html [ Pass Failure ]
Modified: trunk/LayoutTests/fast/overflow/overflow-height-float-not-removed-crash3-expected.txt (161483 => 161484)
--- trunk/LayoutTests/fast/overflow/overflow-height-float-not-removed-crash3-expected.txt 2014-01-08 07:02:54 UTC (rev 161483)
+++ trunk/LayoutTests/fast/overflow/overflow-height-float-not-removed-crash3-expected.txt 2014-01-08 07:33:10 UTC (rev 161484)
@@ -1,3 +1,3 @@
Test passes if it does not crash.
sometextsometextsometextsometextsometextsometext
-
+
Modified: trunk/Source/WebCore/ChangeLog (161483 => 161484)
--- trunk/Source/WebCore/ChangeLog 2014-01-08 07:02:54 UTC (rev 161483)
+++ trunk/Source/WebCore/ChangeLog 2014-01-08 07:33:10 UTC (rev 161484)
@@ -1,3 +1,19 @@
+2014-01-07 Antti Koivisto <[email protected]>
+
+ REGRESSION (r161195): Acid2 regression tests frequently fail
+ https://bugs.webkit.org/show_bug.cgi?id=126432
+
+ Reviewed by Anders Carlsson.
+
+ We would occasionally dump the render tree before the actual last resource on the page was loaded.
+ The problematic resource is an image loaded by an <object> tag nested as fallback of another <object>.
+
+ * html/HTMLObjectElement.cpp:
+ (WebCore::HTMLObjectElement::renderFallbackContent):
+
+ Force style recalc when rendering fallback content. The current mechanism for triggering the fallback content load
+ requires a style recalc.
+
2014-01-07 Andreas Kling <[email protected]>
createAnonymousMathMLBlock() should return RenderPtr.
Modified: trunk/Source/WebCore/html/HTMLObjectElement.cpp (161483 => 161484)
--- trunk/Source/WebCore/html/HTMLObjectElement.cpp 2014-01-08 07:02:54 UTC (rev 161483)
+++ trunk/Source/WebCore/html/HTMLObjectElement.cpp 2014-01-08 07:33:10 UTC (rev 161484)
@@ -386,6 +386,11 @@
}
m_useFallbackContent = true;
+
+ // This is here mainly to keep acid2 non-flaky. A style recalc is required to make fallback resources to load. Without forcing
+ // this may happen after all the other resources have been loaded and the document is already considered complete.
+ // FIXME: Disentangle fallback content handling from style recalcs.
+ document().updateStyleIfNeeded();
}
// FIXME: This should be removed, all callers are almost certainly wrong.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
