Changeset 113466 in webkit

Timestamp:

Apr 6, 2012 11:34:43 AM (12 years ago)

Author:

leviw@chromium.org

Message:

Update LayoutUnit usage in Editor and Frame
​https://bugs.webkit.org/show_bug.cgi?id=83278

Reviewed by Eric Seidel.

Frame and Editor both take input from the embedder, which passes along coordinates in screen
coordinates, which aren't fractional. Updating a few remaining functions to show this, and correcting
some inconsistencies in LayoutUnit usage.

No new tests. No change in behavior.

• editing/Editor.cpp:

(WebCore::Editor::rangeForPoint): windowToContents returns an IntPoint.
(WebCore::Editor::countMatchesForText): Using enclosingIntRect since we're (fake) repainting the entire
view rect.

• editing/Editor.h:

(Editor): Correcting mismatched function signature.

• page/Frame.cpp:

(WebCore::Frame::visiblePositionForPoint): Frame takes points in screen coordinates, usually from the
embedder. Changing these functions to be in IntPoints.
(WebCore::Frame::documentAtPoint): Ditto.
(WebCore::Frame::rangeForPoint): Ditto.

• page/Frame.h:

(Frame):

• platform/graphics/IntRect.h:

(enclosingIntRect): Adding an inline no-op copy of the FractionalLayoutRect method enclosingIntRect.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/Editor.cpp (modified) (2 diffs)
• editing/Editor.h (modified) (1 diff)
• page/Frame.cpp (modified) (3 diffs)
• page/Frame.h (modified) (1 diff)
• platform/graphics/IntRect.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-06  Levi Weintraub  <leviw@chromium.org>
+
+        Update LayoutUnit usage in Editor and Frame
+        https://bugs.webkit.org/show_bug.cgi?id=83278
+
+        Reviewed by Eric Seidel.
+
+        Frame and Editor both take input from the embedder, which passes along coordinates in screen
+        coordinates, which aren't fractional. Updating a few remaining functions to show this, and correcting
+        some inconsistencies in LayoutUnit usage.
+
+        No new tests. No change in behavior.
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::rangeForPoint): windowToContents returns an IntPoint.
+        (WebCore::Editor::countMatchesForText): Using enclosingIntRect since we're (fake) repainting the entire
+        view rect.
+        * editing/Editor.h:
+        (Editor): Correcting mismatched function signature.
+        * page/Frame.cpp:
+        (WebCore::Frame::visiblePositionForPoint): Frame takes points in screen coordinates, usually from the
+        embedder. Changing these functions to be in IntPoints.
+        (WebCore::Frame::documentAtPoint): Ditto.
+        (WebCore::Frame::rangeForPoint): Ditto.
+        * page/Frame.h:
+        (Frame):
+        * platform/graphics/IntRect.h:
+        (enclosingIntRect): Adding an inline no-op copy of the FractionalLayoutRect method enclosingIntRect.
+
 2012-04-06  Tommy Widenflycht  <tommyw@google.com>
 

trunk/Source/WebCore/editing/Editor.cpp

@@ -2249 +2249 @@
     if (!frameView)
         return 0;
-    LayoutPoint framePoint = frameView->windowToContents(windowPoint);
+    IntPoint framePoint = frameView->windowToContents(windowPoint);
     VisibleSelection selection(frame->visiblePositionForPoint(framePoint));
     return avoidIntersectionWithNode(selection.toNormalizedRange().get(), m_deleteButtonController->containerElement());
@@ -2869 +2869 @@
                 PaintBehavior oldBehavior = m_frame->view()->paintBehavior();
                 m_frame->view()->setPaintBehavior(oldBehavior | PaintBehaviorFlattenCompositingLayers);
-                m_frame->view()->paintContents(&context, visibleRect);
+                m_frame->view()->paintContents(&context, enclosingIntRect(visibleRect));
                 m_frame->view()->setPaintBehavior(oldBehavior);
             }

trunk/Source/WebCore/editing/Editor.h

@@ -301 +301 @@
     void setStartNewKillRingSequence(bool);
 
-    PassRefPtr<Range> rangeForPoint(const LayoutPoint& windowPoint);
+    PassRefPtr<Range> rangeForPoint(const IntPoint& windowPoint);
 
     void clear();

trunk/Source/WebCore/page/Frame.cpp

@@ -726 +726 @@
 }
 
-VisiblePosition Frame::visiblePositionForPoint(const LayoutPoint& framePoint)
+VisiblePosition Frame::visiblePositionForPoint(const IntPoint& framePoint)
 {
     HitTestResult result = eventHandler()->hitTestResultAtPoint(framePoint, true);
@@ -746 +746 @@
         return 0;
 
-    LayoutPoint pt = view()->windowToContents(point);
+    IntPoint pt = view()->windowToContents(point);
     HitTestResult result = HitTestResult(pt);
 
@@ -754 +754 @@
 }
 
-PassRefPtr<Range> Frame::rangeForPoint(const LayoutPoint& framePoint)
+PassRefPtr<Range> Frame::rangeForPoint(const IntPoint& framePoint)
 {
     VisiblePosition position = visiblePositionForPoint(framePoint);

trunk/Source/WebCore/page/Frame.h

@@ -180 +180 @@
         DragImageRef dragImageForSelection();
 
-        VisiblePosition visiblePositionForPoint(const LayoutPoint& framePoint);
+        VisiblePosition visiblePositionForPoint(const IntPoint& framePoint);
         Document* documentAtPoint(const IntPoint& windowPoint);
-        PassRefPtr<Range> rangeForPoint(const LayoutPoint& framePoint);
+        PassRefPtr<Range> rangeForPoint(const IntPoint& framePoint);
 
         String searchForLabelsAboveCell(RegularExpression*, HTMLTableCellElement*, size_t* resultDistanceFromStartOfCell);

trunk/Source/WebCore/platform/graphics/IntRect.h

@@ -273 +273 @@
 }
 
+// FIXME: This method is here only to ease the transition to sub-pixel layout. It should
+// be removed when we close http://webkit.org/b/60318
+inline IntRect enclosingIntRect(const IntRect& rect)
+{
+    return rect;
+}
+
 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
 IntRect enclosingIntRect(const CGRect&);