Title: [141470] trunk/Source/WebKit/chromium
Revision
141470
Author
[email protected]
Date
2013-01-31 12:55:33 -0800 (Thu, 31 Jan 2013)

Log Message

[chromium] Make selection handling work in applyPageScaleInCompositor mode
https://bugs.webkit.org/show_bug.cgi?id=107831

Patch by Chris Hopman <[email protected]> on 2013-01-31
Reviewed by Ryosuke Niwa.

These functions expect a window point. When in
applyPageScaleFactorInCompositor mode, the points need to be unscaled
by the page scale factor.

* src/WebFrameImpl.cpp:
(WebKit::WebFrameImpl::selectRange):
(WebKit::WebFrameImpl::moveCaretSelectionTowardsWindowPoint):

Modified Paths

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (141469 => 141470)


--- trunk/Source/WebKit/chromium/ChangeLog	2013-01-31 20:55:15 UTC (rev 141469)
+++ trunk/Source/WebKit/chromium/ChangeLog	2013-01-31 20:55:33 UTC (rev 141470)
@@ -1,3 +1,18 @@
+2013-01-31  Chris Hopman  <[email protected]>
+
+        [chromium] Make selection handling work in applyPageScaleInCompositor mode
+        https://bugs.webkit.org/show_bug.cgi?id=107831
+
+        Reviewed by Ryosuke Niwa.
+
+        These functions expect a window point. When in
+        applyPageScaleFactorInCompositor mode, the points need to be unscaled
+        by the page scale factor.
+
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::selectRange):
+        (WebKit::WebFrameImpl::moveCaretSelectionTowardsWindowPoint):
+
 2013-01-31  Tom Sepez  <[email protected]>
 
         [v8] Enable binding integrity on mac

Modified: trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp (141469 => 141470)


--- trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp	2013-01-31 20:55:15 UTC (rev 141469)
+++ trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp	2013-01-31 20:55:33 UTC (rev 141470)
@@ -1383,8 +1383,14 @@
 
 void WebFrameImpl::selectRange(const WebPoint& base, const WebPoint& extent)
 {
-    VisiblePosition basePosition = visiblePositionForWindowPoint(base);
-    VisiblePosition extentPosition = visiblePositionForWindowPoint(extent);
+    IntPoint unscaledBase = base;
+    IntPoint unscaledExtent = extent;
+    if (frame()->page()->settings()->applyPageScaleFactorInCompositor()) {
+        unscaledExtent.scale(1 / view()->pageScaleFactor(), 1 / view()->pageScaleFactor());
+        unscaledBase.scale(1 / view()->pageScaleFactor(), 1 / view()->pageScaleFactor());
+    }
+    VisiblePosition basePosition = visiblePositionForWindowPoint(unscaledBase);
+    VisiblePosition extentPosition = visiblePositionForWindowPoint(unscaledExtent);
     VisibleSelection newSelection = VisibleSelection(basePosition, extentPosition);
     if (frame()->selection()->shouldChangeSelection(newSelection))
         frame()->selection()->setSelection(newSelection, CharacterGranularity);
@@ -1398,8 +1404,12 @@
 
 void WebFrameImpl::moveCaretSelectionTowardsWindowPoint(const WebPoint& point)
 {
+    IntPoint unscaledPoint(point);
+    if (frame()->page()->settings()->applyPageScaleFactorInCompositor())
+        unscaledPoint.scale(1 / view()->pageScaleFactor(), 1 / view()->pageScaleFactor());
+
     Element* editable = frame()->selection()->rootEditableElement();
-    IntPoint contentsPoint = frame()->view()->windowToContents(IntPoint(point));
+    IntPoint contentsPoint = frame()->view()->windowToContents(unscaledPoint);
     LayoutPoint localPoint(editable->convertFromPage(contentsPoint));
     VisiblePosition position = editable->renderer()->positionForPoint(localPoint);
     if (frame()->selection()->shouldChangeSelection(position))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to