Changeset 111689 in webkit

Timestamp:

Mar 22, 2012 7:14:13 AM (12 years ago)

Author:

leviw@chromium.org

Message:

Update LayoutUnit usage in FrameSelection
​https://bugs.webkit.org/show_bug.cgi?id=81754

Reviewed by Eric Seidel.

FrameSelection stores its caret and repaint bounds in absolute coordinates. Absolute coordinates
we treat as pixel values, so this patch changes these values to integers. Sub-pixel precision
will still be used when these coordinates are passed down and used locally.

No new tests. No change in behavior.

• editing/FrameSelection.cpp:

(WebCore::absoluteCaretY): Uses absolute coordinates, which are ints.
(WebCore::FrameSelection::modify): Uses absolute coordinates to handle vertical selection
modification. Sub-pixel precision will be used when these values are converted to local ones.
(WebCore::CaretBase::absoluteBoundsForLocalRect): Absolute coordinates -> ints.
(WebCore::FrameSelection::absoluteCaretBounds): Ditto.
(WebCore::CaretBase::caretRepaintRect): The caret repaint rect is stored in absolute coordinates.
Reverting the values to ints.
(WebCore::FrameSelection::recomputeCaretRect): Ditto.

• editing/FrameSelection.h:

(FrameSelection):

• editing/mac/FrameSelectionMac.mm:

(WebCore::FrameSelection::notifyAccessibilityForSelectionChange): Switching to store absolute
coordinates as integers.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/FrameSelection.cpp (modified) (8 diffs)
• editing/FrameSelection.h (modified) (3 diffs)
• editing/mac/FrameSelectionMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-22  Levi Weintraub  <leviw@chromium.org>
+
+        Update LayoutUnit usage in FrameSelection
+        https://bugs.webkit.org/show_bug.cgi?id=81754
+
+        Reviewed by Eric Seidel.
+
+        FrameSelection stores its caret and repaint bounds in absolute coordinates. Absolute coordinates
+        we treat as pixel values, so this patch changes these values to integers. Sub-pixel precision
+        will still be used when these coordinates are passed down and used locally.
+
+        No new tests. No change in behavior.
+
+        * editing/FrameSelection.cpp:
+        (WebCore::absoluteCaretY): Uses absolute coordinates, which are ints.
+        (WebCore::FrameSelection::modify): Uses absolute coordinates to handle vertical selection
+        modification. Sub-pixel precision will be used when these values are converted to local ones.
+        (WebCore::CaretBase::absoluteBoundsForLocalRect): Absolute coordinates -> ints.
+        (WebCore::FrameSelection::absoluteCaretBounds): Ditto.
+        (WebCore::CaretBase::caretRepaintRect): The caret repaint rect is stored in absolute coordinates.
+        Reverting the values to ints.
+        (WebCore::FrameSelection::recomputeCaretRect): Ditto.
+        * editing/FrameSelection.h:
+        (FrameSelection):
+        * editing/mac/FrameSelectionMac.mm:
+        (WebCore::FrameSelection::notifyAccessibilityForSelectionChange): Switching to store absolute
+        coordinates as integers.
+
 2012-03-22  Alexei Filippov  <alexeif@chromium.org>
 

trunk/Source/WebCore/editing/FrameSelection.cpp

@@ -988 +988 @@
 
 // FIXME: Maybe baseline would be better?
-static bool absoluteCaretY(const VisiblePosition &c, LayoutUnit &y)
-{
-    LayoutRect rect = c.absoluteCaretBounds();
+static bool absoluteCaretY(const VisiblePosition &c, int &y)
+{
+    IntRect rect = c.absoluteCaretBounds();
     if (rect.isEmpty())
         return false;
@@ -1029 +1029 @@
     }
 
-    LayoutUnit startY;
+    int startY;
     if (!absoluteCaretY(pos, startY))
         return false;
     if (direction == DirectionUp)
         startY = -startY;
-    LayoutUnit lastY = startY;
+    int lastY = startY;
 
     VisiblePosition result;
@@ -1046 +1046 @@
         if (next.isNull() || next == p)
             break;
-        LayoutUnit nextY;
+        int nextY;
         if (!absoluteCaretY(next, nextY))
             break;
         if (direction == DirectionUp)
             nextY = -nextY;
-        if (nextY - startY > static_cast<LayoutUnit>(verticalDistance))
+        if (nextY - startY > static_cast<int>(verticalDistance))
             break;
         if (nextY >= lastY) {
@@ -1248 +1248 @@
 }
 
-LayoutRect CaretBase::absoluteBoundsForLocalRect(Node* node, const LayoutRect& rect) const
+IntRect CaretBase::absoluteBoundsForLocalRect(Node* node, const LayoutRect& rect) const
 {
     RenderObject* caretPainter = caretRenderer(node);
     if (!caretPainter)
-        return LayoutRect();
+        return IntRect();
     
     LayoutRect localRect(rect);
@@ -1260 +1260 @@
 }
 
-LayoutRect FrameSelection::absoluteCaretBounds()
+IntRect FrameSelection::absoluteCaretBounds()
 {
     recomputeCaretRect();
@@ -1276 +1276 @@
 }
 
-LayoutRect CaretBase::caretRepaintRect(Node* node) const
+IntRect CaretBase::caretRepaintRect(Node* node) const
 {
     return absoluteBoundsForLocalRect(node, repaintRectForCaret(localCaretRectWithoutUpdate()));
@@ -1298 +1298 @@
         return false;
 
-    LayoutRect oldAbsCaretBounds = m_absCaretBounds;
+    IntRect oldAbsCaretBounds = m_absCaretBounds;
     // FIXME: Rename m_caretRect to m_localCaretRect.
     m_absCaretBounds = absoluteBoundsForLocalRect(m_selection.start().deprecatedNode(), localCaretRectWithoutUpdate());
@@ -1307 +1307 @@
 
 #if ENABLE(TEXT_CARET)
-    LayoutRect oldAbsoluteCaretRepaintBounds = m_absoluteCaretRepaintBounds;
+    IntRect oldAbsoluteCaretRepaintBounds = m_absoluteCaretRepaintBounds;
 #endif
 

trunk/Source/WebCore/editing/FrameSelection.h

@@ -60 +60 @@
     void clearCaretRect();
     bool updateCaretRect(Document*, const VisiblePosition& caretPosition);
-    LayoutRect absoluteBoundsForLocalRect(Node*, const LayoutRect&) const;
-    LayoutRect caretRepaintRect(Node*) const;
+    IntRect absoluteBoundsForLocalRect(Node*, const LayoutRect&) const;
+    IntRect caretRepaintRect(Node*) const;
     bool shouldRepaintCaret(const RenderView*, bool isContentEditable) const;
     void paintCaret(Node*, GraphicsContext*, const LayoutPoint&, const LayoutRect& clipRect) const;
@@ -181 +181 @@
 
     // Bounds of (possibly transformed) caret in absolute coords
-    LayoutRect absoluteCaretBounds();
+    IntRect absoluteCaretBounds();
     void setCaretRectNeedsUpdate() { CaretBase::setCaretRectNeedsUpdate(); }
 
@@ -296 +296 @@
 
     Timer<FrameSelection> m_caretBlinkTimer;
-    LayoutRect m_absCaretBounds; // absolute bounding rect for the caret
-    LayoutRect m_absoluteCaretRepaintBounds;
+    // The painted bounds of the caret in absolute coordinates
+    IntRect m_absCaretBounds;
+    // Similar to above, but inflated to ensure proper repaint (see https://bugs.webkit.org/show_bug.cgi?id=19086)
+    IntRect m_absoluteCaretRepaintBounds;
     bool m_absCaretBoundsDirty : 1;
     bool m_caretPaint : 1;

trunk/Source/WebCore/editing/mac/FrameSelectionMac.mm

@@ -64 +64 @@
         return;
 
-    LayoutRect selectionRect = absoluteCaretBounds();
-    LayoutRect viewRect = renderView->viewRect();
+    IntRect selectionRect = absoluteCaretBounds();
+    IntRect viewRect = pixelSnappedIntRect(renderView->viewRect());
 
     selectionRect = frameView->contentsToScreen(selectionRect);