Changeset 167673 in webkit

Timestamp:

Apr 22, 2014 12:00:06 PM (10 years ago)

Author:

hyatt@apple.com

Message:

REGRESSION: Hitting asserts in new flow thread selection code.
​https://bugs.webkit.org/show_bug.cgi?id=132019

Reviewed by Anders Carlsson.

Null checking flowThreadController is not enough. The list of threads
can be null even when the flowThreadController is not. That's why you
use hasRenderNamedFlowThreads. I patched the two bad places in the code
to use hasRenderNamedFlowThreads to stop the crashes.

• rendering/RenderView.cpp:

(WebCore::RenderView::selectionBounds):
(WebCore::RenderView::repaintSelection):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-22  David Hyatt  <hyatt@apple.com>
+
+        REGRESSION: Hitting asserts in new flow thread selection code.
+        https://bugs.webkit.org/show_bug.cgi?id=132019
+
+        Reviewed by Anders Carlsson.
+
+        Null checking flowThreadController is not enough. The list of threads
+        can be null even when the flowThreadController is not. That's why you
+        use hasRenderNamedFlowThreads. I patched the two bad places in the code
+        to use hasRenderNamedFlowThreads to stop the crashes.
+        
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::selectionBounds):
+        (WebCore::RenderView::repaintSelection):
+
 2014-04-22  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/rendering/RenderView.cpp

@@ -664 +664 @@
     LayoutRect selRect = subtreeSelectionBounds(*this, clipToVisibleContent);
 
-    if (m_flowThreadController) {
+    if (hasRenderNamedFlowThreads()) {
         for (auto* namedFlowThread : *m_flowThreadController->renderNamedFlowThreadList()) {
             LayoutRect currRect = subtreeSelectionBounds(*namedFlowThread, clipToVisibleContent);
@@ -718 +718 @@
     repaintSubtreeSelection(*this);
 
-    if (m_flowThreadController) {
+    if (hasRenderNamedFlowThreads()) {
         for (auto* namedFlowThread : *m_flowThreadController->renderNamedFlowThreadList())
             repaintSubtreeSelection(*namedFlowThread);