Changeset 42583 in webkit

Timestamp:

Apr 16, 2009 11:11:29 AM (15 years ago)

Author:

justin.garcia@apple.com

Message:

WebCore:

2009-04-16 Justin Garcia <​justin.garcia@apple.com>

Reviewed by Simon Fraser.

​https://bugs.webkit.org/show_bug.cgi?id=25228
SelectionController::absoluteCaretBounds returns an inflated caret (the caret repaint rect)

Return the bounds of the transformed caret, not the transformed repaint rect for the caret (which is inflated).

• editing/SelectionController.cpp: (WebCore::SelectionController::localCaretRect): (WebCore::SelectionController::absoluteBoundsForLocalRect): (WebCore::SelectionController::caretRepaintRect): (WebCore::SelectionController::recomputeCaretRect):
• editing/SelectionController.h:

LayoutTests:

2009-04-16 Justin Garcia <​justin.garcia@apple.com>

Reviewed by Simon Fraser.

​https://bugs.webkit.org/show_bug.cgi?id=25228
SelectionController::absoluteCaretBounds returns an inflated caret (the caret repaint rect)

• editing/selection/25228.html: Added.
• platform/mac/editing/selection/25228-expected.checksum: Added.
• platform/mac/editing/selection/25228-expected.png: Added.
• platform/mac/editing/selection/25228-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/25228.html (added)
• LayoutTests/platform/mac/editing/selection/25228-expected.checksum (added)
• LayoutTests/platform/mac/editing/selection/25228-expected.png (added)
• LayoutTests/platform/mac/editing/selection/25228-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/SelectionController.cpp (modified) (3 diffs)
• WebCore/editing/SelectionController.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-04-16  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by Simon Fraser.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=25228
+        SelectionController::absoluteCaretBounds returns an inflated caret (the caret repaint rect)
+
+        * editing/selection/25228.html: Added.
+        * platform/mac/editing/selection/25228-expected.checksum: Added.
+        * platform/mac/editing/selection/25228-expected.png: Added.
+        * platform/mac/editing/selection/25228-expected.txt: Added.
+
 2009-04-16  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-04-16  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        https://bugs.webkit.org/show_bug.cgi?id=25228
+        SelectionController::absoluteCaretBounds returns an inflated caret (the caret repaint rect)
+        
+        Return the bounds of the transformed caret, not the transformed repaint rect for the caret (which is inflated).
+
+        * editing/SelectionController.cpp:
+        (WebCore::SelectionController::localCaretRect):
+        (WebCore::SelectionController::absoluteBoundsForLocalRect):
+        (WebCore::SelectionController::caretRepaintRect):
+        (WebCore::SelectionController::recomputeCaretRect):
+        * editing/SelectionController.h:
+
 2009-04-16  Pierre d'Herbemont  <pdherbemont@apple.com>
 

trunk/WebCore/editing/SelectionController.cpp

@@ -877 +877 @@
 {
     if (m_needsLayout)
-        const_cast<SelectionController *>(this)->layout();
+        const_cast<SelectionController*>(this)->layout();
     
     return m_caretRect;
+}
+
+IntRect SelectionController::absoluteBoundsForLocalRect(const IntRect& rect) const
+{
+    RenderObject* caretPainter = caretRenderer();
+    if (!caretPainter)
+        return IntRect();
+        
+    return caretPainter->localToAbsoluteQuad(FloatRect(rect)).enclosingBoundingBox();
 }
 
@@ -900 +909 @@
 IntRect SelectionController::caretRepaintRect() const
 {
-    IntRect localRect = repaintRectForCaret(localCaretRect());
-    
-    RenderObject* caretPainter = caretRenderer();
-    if (caretPainter)
-        return caretPainter->localToAbsoluteQuad(FloatRect(localRect)).enclosingBoundingBox();
-
-    return IntRect();
+    return absoluteBoundsForLocalRect(repaintRectForCaret(localCaretRect()));
 }
 
@@ -922 +925 @@
 
     IntRect oldRect = m_caretRect;
-    m_needsLayout = true;
     IntRect newRect = localCaretRect();
     if (oldRect == newRect && !m_absCaretBoundsDirty)
         return false;
 
-    IntRect oldAbsRepaintRect = m_absCaretBounds;
-    m_absCaretBounds = caretRepaintRect();
+    IntRect oldAbsCaretBounds = m_absCaretBounds;
+    // FIXME: Rename m_caretRect to m_localCaretRect.
+    m_absCaretBounds = absoluteBoundsForLocalRect(m_caretRect);
     m_absCaretBoundsDirty = false;
     
-    if (oldAbsRepaintRect == m_absCaretBounds)
-        return false;
+    if (oldAbsCaretBounds == m_absCaretBounds)
+        return false;
+        
+    IntRect oldAbsoluteCaretRepaintBounds = m_absoluteCaretRepaintBounds;
+    // We believe that we need to inflate the local rect before transforming it to obtain the repaint bounds.
+    m_absoluteCaretRepaintBounds = caretRepaintRect();
     
     if (RenderView* view = toRenderView(m_frame->document()->renderer())) {
         // FIXME: make caret repainting container-aware.
-        view->repaintRectangleInViewAndCompositedLayers(oldAbsRepaintRect, false);
-        view->repaintRectangleInViewAndCompositedLayers(m_absCaretBounds, false);
+        view->repaintRectangleInViewAndCompositedLayers(oldAbsoluteCaretRepaintBounds, false);
+        view->repaintRectangleInViewAndCompositedLayers(m_absoluteCaretRepaintBounds, false);
     }
 

trunk/WebCore/editing/SelectionController.h

@@ -155 +155 @@
     void focusedOrActiveStateChanged();
     bool caretRendersInsideNode(Node*) const;
+    
+    IntRect absoluteBoundsForLocalRect(const IntRect&) const;
 
     Frame* m_frame;
@@ -163 +165 @@
     IntRect m_caretRect;        // caret rect in coords local to the renderer responsible for painting the caret
     IntRect m_absCaretBounds;   // absolute bounding rect for the caret
+    IntRect m_absoluteCaretRepaintBounds;
     
     bool m_needsLayout : 1;       // true if the caret and expectedVisible rectangles need to be calculated