Changeset 151992 in webkit

Timestamp:

Jun 26, 2013 9:05:23 AM (11 years ago)

Author:

abucur@adobe.com

Message:

[CSS Regions] fast/regions/seamless-iframe-flowed-into-regions.html asserts
​https://bugs.webkit.org/show_bug.cgi?id=117797

Reviewed by Antti Koivisto.

The seamless iframes inherit the current RenderFlowThread during layout. This means getting
the LayoutState object from the flow thread RenderView object is not always correct.
For RenderObjects inside the seamless iframes the view()/LayoutState object is different than the one
of the RenderFlowThread. The patch changes the code to use the correct LayoutState object during
layout when pushing a new state.

Tests: covered by fast/regions/seamless-iframe-flowed-into-regions.html

• rendering/RenderFlowThread.cpp:

(WebCore::RenderFlowThread::currentActiveRenderBox):
(WebCore::RenderFlowThread::pushFlowThreadLayoutState):
(WebCore::RenderFlowThread::popFlowThreadLayoutState):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderFlowThread.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-06-26  Andrei Bucur  <abucur@adobe.com>
+
+        [CSS Regions] fast/regions/seamless-iframe-flowed-into-regions.html asserts
+        https://bugs.webkit.org/show_bug.cgi?id=117797
+
+        Reviewed by Antti Koivisto.
+
+        The seamless iframes inherit the current RenderFlowThread during layout. This means getting
+        the LayoutState object from the flow thread RenderView object is not always correct.
+        For RenderObjects inside the seamless iframes the view()/LayoutState object is different than the one
+        of the RenderFlowThread. The patch changes the code to use the correct LayoutState object during
+        layout when pushing a new state.
+
+        Tests: covered by fast/regions/seamless-iframe-flowed-into-regions.html
+
+        * rendering/RenderFlowThread.cpp:
+        (WebCore::RenderFlowThread::currentActiveRenderBox):
+        (WebCore::RenderFlowThread::pushFlowThreadLayoutState):
+        (WebCore::RenderFlowThread::popFlowThreadLayoutState):
+
 2013-06-26  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/rendering/RenderFlowThread.cpp

@@ -1038 +1038 @@
 const RenderBox* RenderFlowThread::currentActiveRenderBox() const
 {
-    const RenderObject* currentObject = m_activeObjectsStack.isEmpty() ? 0 : m_activeObjectsStack.last();
-    if (currentObject && currentObject->isBox())
-        return toRenderBox(currentObject);
-
-    return 0;
+    if (m_activeObjectsStack.isEmpty())
+        return 0;
+
+    const RenderObject* currentObject = m_activeObjectsStack.last();
+    return currentObject->isBox() ? toRenderBox(currentObject) : 0;
 }
 
 void RenderFlowThread::pushFlowThreadLayoutState(const RenderObject* object)
 {
-    const RenderBox* currentBoxDescendant = currentActiveRenderBox();
-    LayoutState* layoutState = view()->layoutState();
-    if (currentBoxDescendant && layoutState && layoutState->isPaginated()) {
-        ASSERT(layoutState->m_renderer == currentBoxDescendant);
-        LayoutSize offsetDelta = layoutState->m_layoutOffset - layoutState->m_pageOffset;
-        setOffsetFromLogicalTopOfFirstRegion(currentBoxDescendant, currentBoxDescendant->isHorizontalWritingMode() ? offsetDelta.height() : offsetDelta.width());
+    if (const RenderBox* currentBoxDescendant = currentActiveRenderBox()) {
+        LayoutState* layoutState = currentBoxDescendant->view()->layoutState();
+        if (layoutState && layoutState->isPaginated()) {
+            ASSERT(layoutState->m_renderer == currentBoxDescendant);
+            LayoutSize offsetDelta = layoutState->m_layoutOffset - layoutState->m_pageOffset;
+            setOffsetFromLogicalTopOfFirstRegion(currentBoxDescendant, currentBoxDescendant->isHorizontalWritingMode() ? offsetDelta.height() : offsetDelta.width());
+        }
     }
 
@@ -1062 +1063 @@
     m_activeObjectsStack.removeLast();
 
-    const RenderBox* currentBoxDescendant = currentActiveRenderBox();
-    LayoutState* layoutState = view()->layoutState();
-    if (currentBoxDescendant && layoutState && layoutState->isPaginated())
-        clearOffsetFromLogicalTopOfFirstRegion(currentBoxDescendant);
+    if (const RenderBox* currentBoxDescendant = currentActiveRenderBox()) {
+        LayoutState* layoutState = currentBoxDescendant->view()->layoutState();
+        if (layoutState && layoutState->isPaginated())
+            clearOffsetFromLogicalTopOfFirstRegion(currentBoxDescendant);
+    }
 }