Changeset 85964 in webkit

Timestamp:

May 6, 2011 11:50:08 AM (13 years ago)

Author:

hyatt@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=60390 (<rdar://problem/9364449>)
REGRESSION (r81992): portions of ticketmaster site render blank

Reviewed by Dan Bernstein.

Make simplified layout skip from a positioned object out to its containing block. There is no
need to dirty the intermediate inlines, and in this case it's actively harmful, since the
block responsible for the layout of the positioned object doesn't get m_posChildNeedsLayout set.

Source/WebCore:

Added fast/block/positioning/hiding-inside-relpositioned-inline.html

• rendering/RenderObject.h:

(WebCore::RenderObject::markContainingBlocksForLayout):

LayoutTests:

• fast/block/positioning/hiding-inside-relpositioned-inline.html: Added.
• platform/mac/fast/block/positioning/hiding-inside-relpositioned-inline-expected.png: Added.
• platform/mac/fast/block/positioning/hiding-inside-relpositioned-inline-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/positioning/hiding-inside-relpositioned-inline.html (added)
• LayoutTests/platform/mac/fast/block/positioning/hiding-inside-relpositioned-inline-expected.png (added)
• LayoutTests/platform/mac/fast/block/positioning/hiding-inside-relpositioned-inline-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderObject.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-06  David Hyatt  <hyatt@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=60390 (<rdar://problem/9364449>)
+        REGRESSION (r81992): portions of ticketmaster site render blank
+
+        Make simplified layout skip from a positioned object out to its containing block.  There is no
+        need to dirty the intermediate inlines, and in this case it's actively harmful, since the
+        block responsible for the layout of the positioned object doesn't get m_posChildNeedsLayout set.
+
+        * fast/block/positioning/hiding-inside-relpositioned-inline.html: Added.
+        * platform/mac/fast/block/positioning/hiding-inside-relpositioned-inline-expected.png: Added.
+        * platform/mac/fast/block/positioning/hiding-inside-relpositioned-inline-expected.txt: Added.
+
 2011-05-06  Adam Roben  <aroben@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-06  David Hyatt  <hyatt@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=60390 (<rdar://problem/9364449>)
+        REGRESSION (r81992): portions of ticketmaster site render blank
+
+        Make simplified layout skip from a positioned object out to its containing block.  There is no
+        need to dirty the intermediate inlines, and in this case it's actively harmful, since the
+        block responsible for the layout of the positioned object doesn't get m_posChildNeedsLayout set.
+
+        Added fast/block/positioning/hiding-inside-relpositioned-inline.html
+
+        * rendering/RenderObject.h:
+        (WebCore::RenderObject::markContainingBlocksForLayout):
+
 2011-05-06  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/Source/WebCore/rendering/RenderObject.h

@@ -1019 +1019 @@
             return;
         if (!last->isText() && (last->style()->position() == FixedPosition || last->style()->position() == AbsolutePosition)) {
-            if (o->m_posChildNeedsLayout)
+            while (o && !o->isRenderBlock()) // Skip relatively positioned inlines and get to the enclosing RenderBlock.
+                o = o->container();
+            if (!o || o->m_posChildNeedsLayout)
                 return;
             o->m_posChildNeedsLayout = true;