Changeset 166631 in webkit

Timestamp:

Apr 1, 2014 10:36:54 PM (10 years ago)

Author:

abucur@adobe.com

Message:

[CSS Regions] Simplify the RenderFlowThread state pusher
​https://bugs.webkit.org/show_bug.cgi?id=131035

Reviewed by David Hyatt.

The RenderFlowThread state pusher is desynchronized from the RenderView layout state pusher
by one renderer. This patch fixes the anomaly by correctly ordering the push and pop operations
between the two systems.

Tests: no functional change, no new tests.

• rendering/RenderFlowThread.cpp:

(WebCore::RenderFlowThread::pushFlowThreadLayoutState):
(WebCore::RenderFlowThread::popFlowThreadLayoutState):
(WebCore::RenderFlowThread::offsetFromLogicalTopOfFirstRegion):

• rendering/RenderView.cpp:

(WebCore::RenderView::pushLayoutState):

• rendering/RenderView.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-01  Andrei Bucur  <abucur@adobe.com>
+
+        [CSS Regions] Simplify the RenderFlowThread state pusher
+        https://bugs.webkit.org/show_bug.cgi?id=131035
+
+        Reviewed by David Hyatt.
+
+        The RenderFlowThread state pusher is desynchronized from the RenderView layout state pusher
+        by one renderer. This patch fixes the anomaly by correctly ordering the push and pop operations
+        between the two systems.
+
+        Tests: no functional change, no new tests.
+
+        * rendering/RenderFlowThread.cpp:
+        (WebCore::RenderFlowThread::pushFlowThreadLayoutState):
+        (WebCore::RenderFlowThread::popFlowThreadLayoutState):
+        (WebCore::RenderFlowThread::offsetFromLogicalTopOfFirstRegion):
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::pushLayoutState):
+        * rendering/RenderView.h:
+
 2014-04-01  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebCore/rendering/RenderFlowThread.cpp

@@ -1145 +1145 @@
 void RenderFlowThread::pushFlowThreadLayoutState(const RenderObject& object)
 {
+    m_activeObjectsStack.add(&object);
+
     if (const RenderBox* currentBoxDescendant = currentActiveRenderBox()) {
         LayoutState* layoutState = currentBoxDescendant->view().layoutState();
@@ -1153 +1155 @@
         }
     }
-
-    m_activeObjectsStack.add(&object);
 }
 
 void RenderFlowThread::popFlowThreadLayoutState()
 {
-    m_activeObjectsStack.removeLast();
-
     if (const RenderBox* currentBoxDescendant = currentActiveRenderBox()) {
         LayoutState* layoutState = currentBoxDescendant->view().layoutState();
@@ -1166 +1164 @@
             clearOffsetFromLogicalTopOfFirstRegion(currentBoxDescendant);
     }
+
+    m_activeObjectsStack.removeLast();
 }
 
@@ -1174 +1174 @@
     if (hasCachedOffsetFromLogicalTopOfFirstRegion(currentBlock))
         return cachedOffsetFromLogicalTopOfFirstRegion(currentBlock);
-
-    // If it's the current box being laid out, use the layout state.
-    const RenderBox* currentBoxDescendant = currentActiveRenderBox();
-    if (currentBlock == currentBoxDescendant) {
-        LayoutState* layoutState = view().layoutState();
-        ASSERT(layoutState->m_renderer == currentBlock);
-        ASSERT(layoutState && layoutState->isPaginated());
-        LayoutSize offsetDelta = layoutState->m_layoutOffset - layoutState->m_pageOffset;
-        return currentBoxDescendant->isHorizontalWritingMode() ? offsetDelta.height() : offsetDelta.width();
-    }
 
     // As a last resort, take the slow path.

trunk/Source/WebCore/rendering/RenderView.cpp

@@ -1020 +1020 @@
     ASSERT(m_layoutState == 0);
 
+    m_layoutState = std::make_unique<LayoutState>(root);
     pushLayoutStateForCurrentFlowThread(root);
-    m_layoutState = std::make_unique<LayoutState>(root);
 }
 

trunk/Source/WebCore/rendering/RenderView.h

@@ -254 +254 @@
         if (!doingFullRepaint() || m_layoutState->isPaginated() || renderer.hasColumns() || renderer.flowThreadContainingBlock()
             || m_layoutState->lineGrid() || (renderer.style().lineGrid() != RenderStyle::initialLineGrid() && renderer.isRenderBlockFlow())) {
+            m_layoutState = std::make_unique<LayoutState>(std::move(m_layoutState), &renderer, offset, pageHeight, pageHeightChanged, colInfo);
             pushLayoutStateForCurrentFlowThread(renderer);
-            m_layoutState = std::make_unique<LayoutState>(std::move(m_layoutState), &renderer, offset, pageHeight, pageHeightChanged, colInfo);
             return true;
         }
@@ -263 +263 @@
     void popLayoutState()
     {
+        popLayoutStateForCurrentFlowThread();
         m_layoutState = std::move(m_layoutState->m_next);
-        popLayoutStateForCurrentFlowThread();
     }