Changeset 106544 in webkit

Timestamp:

Feb 2, 2012 2:25:25 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Regions should ignore the saved currentRenderFlowThread during repainting
because if there are imbricated flow threads, it might end using the wrong one.

[CSSRegions] Assert failure in RenderView::computeRectForRepaint
​https://bugs.webkit.org/show_bug.cgi?id=77430

Patch by Raul Hudea <​rhudea@adobe.com> on 2012-02-02
Reviewed by David Hyatt.

Source/WebCore:

Test: fast/regions/imbricated-flow-threads-crash.html

• rendering/RenderFlowThread.cpp:

(CurrentRenderFlowThreadDisabler):
(WebCore::CurrentRenderFlowThreadDisabler::CurrentRenderFlowThreadDisabler):
(WebCore::CurrentRenderFlowThreadDisabler::~CurrentRenderFlowThreadDisabler):
(WebCore):
(WebCore::RenderFlowThread::repaintRectangleInRegions):

LayoutTests:

• fast/regions/imbricated-flow-threads-crash-expected.txt: Added.
• fast/regions/imbricated-flow-threads-crash.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/imbricated-flow-threads-crash-expected.txt (added)
• LayoutTests/fast/regions/imbricated-flow-threads-crash.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderFlowThread.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-02  Raul Hudea  <rhudea@adobe.com>
+
+        Regions should ignore the saved currentRenderFlowThread during repainting
+        because if there are imbricated flow threads, it might end using the wrong one.
+
+        [CSSRegions] Assert failure in RenderView::computeRectForRepaint
+        https://bugs.webkit.org/show_bug.cgi?id=77430
+
+        Reviewed by David Hyatt.
+
+        * fast/regions/imbricated-flow-threads-crash-expected.txt: Added.
+        * fast/regions/imbricated-flow-threads-crash.html: Added.
+
 2012-02-02  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-02  Raul Hudea  <rhudea@adobe.com>
+
+        Regions should ignore the saved currentRenderFlowThread during repainting
+        because if there are imbricated flow threads, it might end using the wrong one.
+
+        [CSSRegions] Assert failure in RenderView::computeRectForRepaint
+        https://bugs.webkit.org/show_bug.cgi?id=77430
+
+        Reviewed by David Hyatt.
+
+        Test: fast/regions/imbricated-flow-threads-crash.html
+
+        * rendering/RenderFlowThread.cpp:
+        (CurrentRenderFlowThreadDisabler):
+        (WebCore::CurrentRenderFlowThreadDisabler::CurrentRenderFlowThreadDisabler):
+        (WebCore::CurrentRenderFlowThreadDisabler::~CurrentRenderFlowThreadDisabler):
+        (WebCore):
+        (WebCore::RenderFlowThread::repaintRectangleInRegions):
+
 2012-02-02  Kinuko Yasuda  <kinuko@chromium.org>
 

trunk/Source/WebCore/rendering/RenderFlowThread.cpp

@@ -300 +300 @@
 };
 
+class CurrentRenderFlowThreadDisabler {
+    WTF_MAKE_NONCOPYABLE(CurrentRenderFlowThreadDisabler);
+public:
+    CurrentRenderFlowThreadDisabler(RenderView* view)
+        : m_view(view)
+        , m_renderFlowThread(0)
+    {
+        m_renderFlowThread = m_view->currentRenderFlowThread();
+        if (m_renderFlowThread)
+            view->setCurrentRenderFlowThread(0);
+    }
+    ~CurrentRenderFlowThreadDisabler()
+    {
+        if (m_renderFlowThread)
+            m_view->setCurrentRenderFlowThread(m_renderFlowThread);
+    }
+private:
+    RenderView* m_view;
+    RenderFlowThread* m_renderFlowThread;
+};
+
 void RenderFlowThread::layout()
 {
@@ -521 +542 @@
         region->flipForWritingMode(clippedRect);
         LayoutStateDisabler layoutStateDisabler(view()); // We can't use layout state to repaint, since the region is somewhere else.
+
+        // Can't use currentFlowThread as it possible to have imbricated flow threads and the wrong one could be used,
+        // so, we let each region figure out the proper enclosing flow thread
+        CurrentRenderFlowThreadDisabler disabler(view());
         region->repaintRectangle(clippedRect, immediate);
     }