Changeset 167845 in webkit

Timestamp:

Apr 26, 2014 2:28:20 PM (10 years ago)

Author:

Darin Adler

Message:

REGRESSION (r164133): Selection doesn't paint when scrolling some pages
​https://bugs.webkit.org/show_bug.cgi?id=132172

Source/WebCore:
rdar://problem/16719473

Reviewed by Brent Fulgham.

Tests: fast/dynamic/remove-invisible-node-inside-selection.html

fast/dynamic/remove-node-inside-selection.html

• editing/FrameSelection.cpp:

(WebCore::clearRenderViewSelection): Changed to take a Node& because having
this take a Position& was unnecessary and strange, when really it just needs
to take a document as an argument.
(WebCore::DragCaretController::nodeWillBeRemoved): Updated for the above.
(WebCore::FrameSelection::respondToNodeModification): Added code to set the
m_pendingSelectionUpdate flag and call RenderView::setNeedsLayout so the
selection will be recomputed after it's temporarily cleared when one of
the selected nodes is removed.

LayoutTests:

Reviewed by Brent Fulgham.

• fast/dynamic/remove-invisible-node-inside-selection-expected.html: Added.
• fast/dynamic/remove-invisible-node-inside-selection.html: Added.
• fast/dynamic/remove-node-inside-selection-expected.html: Added.
• fast/dynamic/remove-node-inside-selection.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dynamic/remove-invisible-node-inside-selection-expected.html (added)
• LayoutTests/fast/dynamic/remove-invisible-node-inside-selection.html (added)
• LayoutTests/fast/dynamic/remove-node-inside-selection-expected.html (added)
• LayoutTests/fast/dynamic/remove-node-inside-selection.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/FrameSelection.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-04-24  Darin Adler  <darin@apple.com>
+
+        REGRESSION (r164133): Selection doesn't paint when scrolling some pages
+        https://bugs.webkit.org/show_bug.cgi?id=132172
+
+        Reviewed by Brent Fulgham.
+
+        * fast/dynamic/remove-invisible-node-inside-selection-expected.html: Added.
+        * fast/dynamic/remove-invisible-node-inside-selection.html: Added.
+        * fast/dynamic/remove-node-inside-selection-expected.html: Added.
+        * fast/dynamic/remove-node-inside-selection.html: Added.
+
 2014-04-25  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-24  Darin Adler  <darin@apple.com>
+
+        REGRESSION (r164133): Selection doesn't paint when scrolling some pages
+        https://bugs.webkit.org/show_bug.cgi?id=132172
+        rdar://problem/16719473
+
+        Reviewed by Brent Fulgham.
+
+        Tests: fast/dynamic/remove-invisible-node-inside-selection.html
+               fast/dynamic/remove-node-inside-selection.html
+
+        * editing/FrameSelection.cpp:
+        (WebCore::clearRenderViewSelection): Changed to take a Node& because having
+        this take a Position& was unnecessary and strange, when really it just needs
+        to take a document as an argument.
+        (WebCore::DragCaretController::nodeWillBeRemoved): Updated for the above.
+        (WebCore::FrameSelection::respondToNodeModification): Added code to set the
+        m_pendingSelectionUpdate flag and call RenderView::setNeedsLayout so the
+        selection will be recomputed after it's temporarily cleared when one of
+        the selected nodes is removed.
+
 2014-04-25  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/editing/FrameSelection.cpp

@@ -391 +391 @@
 }
 
-static void clearRenderViewSelection(const Position& position)
-{
-    Ref<Document> document(position.anchorNode()->document());
+static void clearRenderViewSelection(Node& node)
+{
+    Ref<Document> document(node.document());
     document->updateStyleIfNeeded();
     if (RenderView* view = document->renderView())
@@ -407 +407 @@
         return;
 
-    clearRenderViewSelection(m_position.deepEquivalent());
+    clearRenderViewSelection(*node);
     clear();
 }
@@ -465 +465 @@
     }
 
-    if (clearRenderTreeSelection)
-        clearRenderViewSelection(m_selection.start());
+    if (clearRenderTreeSelection) {
+        clearRenderViewSelection(*node);
+
+        // Trigger a selection update so the selection will be set again.
+        if (auto* renderView = node->document().renderView()) {
+            m_pendingSelectionUpdate = true;
+            renderView->setNeedsLayout();
+        }
+    }
 
     if (clearDOMTreeSelection)