Changeset 55669 in webkit

Timestamp:

Mar 8, 2010 9:54:36 AM (14 years ago)

Author:

dbates@webkit.org

Message:

2010-03-08 Daniel Bates <​dbates@rim.com>

Reviewed by Simon Fraser.

​https://bugs.webkit.org/show_bug.cgi?id=34819

Fixes an issue where we repaint the caret rectangle even if the associated
selection is not in a content editable element. This is extraneous since the
caret is only visible when the selection is in a content editable element.
Hence, we should only repaint the caret rectangle when the associated selection
is in a content editable element.

Note, we always paint the caret when caret browsing is enabled.

Test: fast/repaint/no-caret-repaint-in-non-content-editable-element.html

• editing/SelectionController.cpp: (WebCore::SelectionController::recomputeCaretRect): Modified to call method SelectionController::shouldRepaintCaret. (WebCore::SelectionController::shouldRepaintCaret): Added. (WebCore::SelectionController::invalidateCaretRect): Modified to call method SelectionController::shouldRepaintCaret.
• editing/SelectionController.h:

2010-03-08 Daniel Bates <​dbates@rim.com>

Reviewed by Simon Fraser.

​https://bugs.webkit.org/show_bug.cgi?id=34819

Tests that we do not repaint the caret rectangle when the associated selection is
not in a content editable element.

• fast/repaint/no-caret-repaint-in-non-content-editable-element.html: Added.
• platform/mac/fast/repaint/no-caret-repaint-in-non-content-editable-element-expected.checksum: Added.
• platform/mac/fast/repaint/no-caret-repaint-in-non-content-editable-element-expected.png: Added.
• platform/mac/fast/repaint/no-caret-repaint-in-non-content-editable-element-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/repaint/no-caret-repaint-in-non-content-editable-element.html (added)
• LayoutTests/platform/mac/fast/repaint/no-caret-repaint-in-non-content-editable-element-expected.checksum (added)
• LayoutTests/platform/mac/fast/repaint/no-caret-repaint-in-non-content-editable-element-expected.png (added)
• LayoutTests/platform/mac/fast/repaint/no-caret-repaint-in-non-content-editable-element-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/SelectionController.cpp (modified) (2 diffs)
• WebCore/editing/SelectionController.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-03-08  Daniel Bates  <dbates@rim.com>
+
+        Reviewed by Simon Fraser.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34819
+
+        Tests that we do not repaint the caret rectangle when the associated selection is
+        not in a content editable element.
+
+        * fast/repaint/no-caret-repaint-in-non-content-editable-element.html: Added.
+        * platform/mac/fast/repaint/no-caret-repaint-in-non-content-editable-element-expected.checksum: Added.
+        * platform/mac/fast/repaint/no-caret-repaint-in-non-content-editable-element-expected.png: Added.
+        * platform/mac/fast/repaint/no-caret-repaint-in-non-content-editable-element-expected.txt: Added.
+
 2010-03-08  Shu Chang  <Chang.Shu@nokia.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-08  Daniel Bates  <dbates@rim.com>
+
+        Reviewed by Simon Fraser.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34819
+
+        Fixes an issue where we repaint the caret rectangle even if the associated
+        selection is not in a content editable element. This is extraneous since the
+        caret is only visible when the selection is in a content editable element.
+        Hence, we should only repaint the caret rectangle when the associated selection
+        is in a content editable element.
+
+        Note, we always paint the caret when caret browsing is enabled.
+
+        Test: fast/repaint/no-caret-repaint-in-non-content-editable-element.html
+
+        * editing/SelectionController.cpp:
+        (WebCore::SelectionController::recomputeCaretRect): Modified to call method
+        SelectionController::shouldRepaintCaret.
+        (WebCore::SelectionController::shouldRepaintCaret): Added.
+        (WebCore::SelectionController::invalidateCaretRect): Modified to call method
+        SelectionController::shouldRepaintCaret.
+        * editing/SelectionController.h:
+
 2010-03-08  Eric Carlson  <eric.carlson@apple.com>
 

trunk/WebCore/editing/SelectionController.cpp

@@ -974 +974 @@
         // FIXME: make caret repainting container-aware.
         view->repaintRectangleInViewAndCompositedLayers(oldAbsoluteCaretRepaintBounds, false);
-        view->repaintRectangleInViewAndCompositedLayers(m_absoluteCaretRepaintBounds, false);
+        if (shouldRepaintCaret(view))
+            view->repaintRectangleInViewAndCompositedLayers(m_absoluteCaretRepaintBounds, false);
     }
 
     return true;
+}
+
+bool SelectionController::shouldRepaintCaret(const RenderView* view) const
+{
+    ASSERT(view);
+    Frame* frame = view->frameView() ? view->frameView()->frame() : 0; // The frame where the selection started.
+    bool caretBrowsing = frame && frame->settings() && frame->settings()->caretBrowsingEnabled();
+    return (caretBrowsing || isContentEditable());
 }
 
@@ -1005 +1014 @@
 
     if (!caretRectChanged) {
-        if (RenderView* view = toRenderView(d->renderer()))
+        RenderView* view = toRenderView(d->renderer());
+        if (view && shouldRepaintCaret(view))
             view->repaintRectangleInViewAndCompositedLayers(caretRepaintRect(), false);
     }

trunk/WebCore/editing/SelectionController.h

@@ -38 +38 @@
 class GraphicsContext;
 class RenderObject;
+class RenderView;
 class VisiblePosition;
 
@@ -156 +157 @@
     void layout();
     IntRect caretRepaintRect() const;
+    bool shouldRepaintCaret(const RenderView* view) const;
 
     int xPosForVerticalArrowNavigation(EPositionType);