Changeset 184149 in webkit

Timestamp:

May 11, 2015 7:45:47 PM (9 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/19773721> [iOS] Find on page feels like it zooms in too much
​https://bugs.webkit.org/show_bug.cgi?id=144891

Reviewed by Darin Adler.

Sometimes, Find on Page’s constant 1.6 scale factor is too much. Smart magnification is
designed to choose a scale factor that is just right.

• UIProcess/ios/SmartMagnificationController.h:
• UIProcess/ios/SmartMagnificationController.messages.in: Added Magnify message.
• UIProcess/ios/SmartMagnificationController.mm:

(WebKit::SmartMagnificationController::magnify): Added. Handle the new message using
-[WKContentView _soomToRect:withOrigin:fitEntireRect:minimumScale:maximumScale:minimumScrollDistance:].

• WebProcess/WebPage/ios/FindControllerIOS.mm:

(WebKit::FindController::updateFindIndicator): Instead of zooming to the selection rect,
get the surrounding render rect (the area we would target for a double-tap at the beginning
of the selection), and tell the magnification controller to target it. Use the center of the
start of the selection as the origin.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/SmartMagnificationController.h (modified) (1 diff)
• UIProcess/ios/SmartMagnificationController.messages.in (modified) (1 diff)
• UIProcess/ios/SmartMagnificationController.mm (modified) (1 diff)
• WebProcess/WebPage/ios/FindControllerIOS.mm (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-05-11  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/19773721> [iOS] Find on page feels like it zooms in too much
+        https://bugs.webkit.org/show_bug.cgi?id=144891
+
+        Reviewed by Darin Adler.
+
+        Sometimes, Find on Page’s constant 1.6 scale factor is too much. Smart magnification is
+        designed to choose a scale factor that is just right.
+
+        * UIProcess/ios/SmartMagnificationController.h:
+        * UIProcess/ios/SmartMagnificationController.messages.in: Added Magnify message.
+        * UIProcess/ios/SmartMagnificationController.mm:
+        (WebKit::SmartMagnificationController::magnify): Added. Handle the new message using
+        -[WKContentView _soomToRect:withOrigin:fitEntireRect:minimumScale:maximumScale:minimumScrollDistance:].
+        * WebProcess/WebPage/ios/FindControllerIOS.mm:
+        (WebKit::FindController::updateFindIndicator): Instead of zooming to the selection rect,
+        get the surrounding render rect (the area we would target for a double-tap at the beginning
+        of the selection), and tell the magnification controller to target it. Use the center of the
+        start of the selection as the origin.
+
 2015-05-11  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKit2/UIProcess/ios/SmartMagnificationController.h

@@ -55 +55 @@
 
     void didCollectGeometryForSmartMagnificationGesture(WebCore::FloatPoint origin, WebCore::FloatRect renderRect, WebCore::FloatRect visibleContentBounds, bool isReplacedElement, double viewportMinimumScale, double viewportMaximumScale);
+    void magnify(WebCore::FloatPoint origin, WebCore::FloatRect targetRect, WebCore::FloatRect visibleContentRect, double viewportMinimumScale, double viewportMaximumScale);
 
     WebPageProxy& m_webPageProxy;

trunk/Source/WebKit2/UIProcess/ios/SmartMagnificationController.messages.in

@@ -25 +25 @@
 messages -> SmartMagnificationController {
     DidCollectGeometryForSmartMagnificationGesture(WebCore::FloatPoint origin, WebCore::FloatRect renderRect, WebCore::FloatRect visibleContentBounds, bool isReplacedElement, double viewportMinimumScale, double viewportMaximumScale)
+    Magnify(WebCore::FloatPoint origin, WebCore::FloatRect targetRect, WebCore::FloatRect visibleContentRect, double viewportMinimumScale, double viewportMaximumScale)
 }
 

trunk/Source/WebKit2/UIProcess/ios/SmartMagnificationController.mm

@@ -116 +116 @@
     [m_contentView _zoomOutWithOrigin:origin];
 }
-    
+
+void SmartMagnificationController::magnify(FloatPoint origin, FloatRect targetRect, FloatRect visibleContentRect, double viewportMinimumScale, double viewportMaximumScale)
+{
+    targetRect.inflateX(smartMagnificationElementPadding * targetRect.width());
+    targetRect.inflateY(smartMagnificationElementPadding * targetRect.height());
+
+    double maximumScale = std::min(viewportMaximumScale, smartMagnificationMaximumScale);
+    double minimumScale = std::max(viewportMinimumScale, smartMagnificationMinimumScale);
+
+    [m_contentView _zoomToRect:targetRect withOrigin:origin fitEntireRect:NO minimumScale:minimumScale maximumScale:maximumScale minimumScrollDistance:0];
+}
+
 } // namespace WebKit
 

trunk/Source/WebKit2/WebProcess/WebPage/ios/FindControllerIOS.mm

@@ -30 +30 @@
 #import "FindController.h"
 #import "FindIndicatorOverlayClientIOS.h"
+#import "SmartMagnificationControllerMessages.h"
 #import "WebCoreArgumentCoders.h"
 #import "WebPage.h"
@@ -44 +45 @@
 const int totalHorizontalMargin = 2;
 const int totalVerticalMargin = 1;
-
-const double maximumFindIndicatorZoom = 1.6;
 
 static Color highlightColor()
@@ -96 +95 @@
     m_findIndicatorOverlay->setNeedsDisplay();
 
-    if (isShowingOverlay || shouldAnimate)
-        m_webPage->zoomToRect(matchRect, m_webPage->minimumPageScaleFactor(), std::min(m_webPage->maximumPageScaleFactor(), maximumFindIndicatorZoom));
+    if (isShowingOverlay || shouldAnimate) {
+        FloatRect visibleContentRect = m_webPage->mainFrameView()->unobscuredContentRectIncludingScrollbars();
+
+        bool isReplaced;
+        const VisibleSelection& visibleSelection = selectedFrame.selection().selection();
+        FloatRect renderRect = visibleSelection.start().containerNode()->renderRect(&isReplaced);
+
+        IntRect startRect = visibleSelection.visibleStart().absoluteCaretBounds();
+
+        m_webPage->send(Messages::SmartMagnificationController::Magnify(startRect.center(), renderRect, visibleContentRect, m_webPage->minimumPageScaleFactor(), m_webPage->maximumPageScaleFactor()));
+    }
 
     m_findIndicatorRect = matchRect;