Changeset 63579 in webkit

Timestamp:

Jul 16, 2010, 2:01:01 PM (15 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/7527532> Crash beneath setSelection() during detach()
​https://bugs.webkit.org/show_bug.cgi?id=42020

Reviewed by Simon Fraser.

No test because I am unable to reproduce the crash.

• rendering/RenderView.cpp:

(WebCore::RenderView::setSelection): In the clearSelection() case, where the repaint mode is
RepaintNewMinusOld, avoid making RenderBlockSelectionInfo instances, and thereby avoid calling
localToAbsolute() during detach().

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-16  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        <rdar://problem/7527532> Crash beneath setSelection() during detach()
+        https://bugs.webkit.org/show_bug.cgi?id=42020
+
+        No test because I am unable to reproduce the crash.
+
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::setSelection): In the clearSelection() case, where the repaint mode is
+        RepaintNewMinusOld, avoid making RenderBlockSelectionInfo instances, and thereby avoid calling
+        localToAbsolute() during detach().
+
 2010-07-16  Anders Carlsson  <andersca@apple.com>
 

trunk/WebCore/rendering/RenderView.cpp

@@ -419 +419 @@
             // Blocks are responsible for painting line gaps and margin gaps.  They must be examined as well.
             oldSelectedObjects.set(os, new RenderSelectionInfo(os, true));
-            RenderBlock* cb = os->containingBlock();
-            while (cb && !cb->isRenderView()) {
-                RenderBlockSelectionInfo* blockInfo = oldSelectedBlocks.get(cb);
-                if (blockInfo)
-                    break;
-                oldSelectedBlocks.set(cb, new RenderBlockSelectionInfo(cb));
-                cb = cb->containingBlock();
+            if (blockRepaintMode == RepaintNewXOROld) {
+                RenderBlock* cb = os->containingBlock();
+                while (cb && !cb->isRenderView()) {
+                    RenderBlockSelectionInfo* blockInfo = oldSelectedBlocks.get(cb);
+                    if (blockInfo)
+                        break;
+                    oldSelectedBlocks.set(cb, new RenderBlockSelectionInfo(cb));
+                    cb = cb->containingBlock();
+                }
             }
         }
@@ -528 +530 @@
         RenderBlockSelectionInfo* oldInfo = i->second;
         if (!newInfo || oldInfo->rects() != newInfo->rects() || oldInfo->state() != newInfo->state()) {
-            if (blockRepaintMode == RepaintNewXOROld)
-                oldInfo->repaint();
+            oldInfo->repaint();
             if (newInfo) {
                 newInfo->repaint();