Changeset 82912 in webkit

Timestamp:

Apr 5, 2011 1:12:11 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-05 John Mellor <​johnme@chromium.org>

Reviewed by Darin Fisher.

[chromium] Minor cleanup: simplify WebFrameImpl by using contentsToWindow instead of convertToContainingWindow.
​https://bugs.webkit.org/show_bug.cgi?id=55681

• src/WebFrameImpl.cpp: (WebKit::WebFrameImpl::find): (WebKit::WebFrameImpl::scopeStringMatches):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/WebFrameImpl.cpp (modified) (2 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-04-05  John Mellor  <johnme@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [chromium] Minor cleanup: simplify WebFrameImpl by using contentsToWindow instead of convertToContainingWindow.
+        https://bugs.webkit.org/show_bug.cgi?id=55681
+
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::find):
+        (WebKit::WebFrameImpl::scopeStringMatches):
+
 2011-04-05  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp

@@ -1483 +1483 @@
             }
             if (selectionRect) {
-                WebRect rect = frame()->view()->convertToContainingWindow(currSelectionRect);
-                rect.x -= frameView()->scrollOffset().width();
-                rect.y -= frameView()->scrollOffset().height();
-                *selectionRect = rect;
-
-                reportFindInPageSelection(rect, m_activeMatchIndex + 1, identifier);
+                *selectionRect = frameView()->contentsToWindow(currSelectionRect);
+                reportFindInPageSelection(*selectionRect, m_activeMatchIndex + 1, identifier);
             }
         }
@@ -1625 +1621 @@
 
                 // Notify browser of new location for the selected rectangle.
-                resultBounds.move(-frameView()->scrollOffset().width(),
-                                  -frameView()->scrollOffset().height());
                 reportFindInPageSelection(
-                    frame()->view()->convertToContainingWindow(resultBounds),
+                    frameView()->contentsToWindow(resultBounds),
                     m_activeMatchIndex + 1,
                     identifier);