Changeset 161484 in webkit

Timestamp:

Jan 7, 2014, 11:33:10 PM (11 years ago)

Author:

Antti Koivisto

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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• LayoutTests/fast/overflow/overflow-height-float-not-removed-crash3-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLObjectElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-01-07  Antti Koivisto  <antti@apple.com>
+
+        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  <eric.carlson@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -70 +70 @@
 
 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 ]

trunk/LayoutTests/fast/overflow/overflow-height-float-not-removed-crash3-expected.txt

@@ -1 +1 @@
 Test passes if it does not crash.
  sometextsometextsometextsometextsometextsometext
- 
+

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-07  Antti Koivisto  <antti@apple.com>
+
+        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  <akling@apple.com>
 

trunk/Source/WebCore/html/HTMLObjectElement.cpp

@@ -387 +387 @@
 
     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();
 }