Diff
Modified: trunk/Source/WebKit2/ChangeLog (213570 => 213571)
--- trunk/Source/WebKit2/ChangeLog 2017-03-08 09:15:10 UTC (rev 213570)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-08 09:35:40 UTC (rev 213571)
@@ -1,3 +1,20 @@
+2017-03-08 Tim Horton <[email protected]>
+
+ Remove unused WebPageIOS::zoomToRect and plumbing
+ https://bugs.webkit.org/show_bug.cgi?id=169344
+
+ Reviewed by Alex Christensen.
+
+ * UIProcess/PageClient.h:
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * UIProcess/ios/PageClientImplIOS.h:
+ * UIProcess/ios/PageClientImplIOS.mm:
+ (WebKit::PageClientImpl::zoomToRect): Deleted.
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::zoomToRect): Deleted.
+
2017-03-08 Brad Wright <[email protected]>
UIViewController with WKWebView presented modally causes the presented UIViewController to be dismissed.
Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (213570 => 213571)
--- trunk/Source/WebKit2/UIProcess/PageClient.h 2017-03-08 09:15:10 UTC (rev 213570)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2017-03-08 09:35:40 UTC (rev 213571)
@@ -304,7 +304,6 @@
virtual void saveImageToLibrary(PassRefPtr<WebCore::SharedBuffer>) = 0;
virtual void didUpdateBlockSelectionWithTouch(uint32_t touch, uint32_t flags, float growThreshold, float shrinkThreshold) = 0;
virtual void showPlaybackTargetPicker(bool hasVideo, const WebCore::IntRect& elementRect) = 0;
- virtual void zoomToRect(WebCore::FloatRect, double minimumScale, double maximumScale) = 0;
virtual void disableDoubleTapGesturesDuringTapIfNecessary(uint64_t requestID) = 0;
virtual double minimumZoomScale() const = 0;
virtual WebCore::FloatRect documentRect() const = 0;
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (213570 => 213571)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2017-03-08 09:15:10 UTC (rev 213570)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2017-03-08 09:35:40 UTC (rev 213571)
@@ -545,7 +545,6 @@
void applicationWillEnterForeground();
void applicationWillResignActive();
void applicationDidBecomeActive();
- void zoomToRect(WebCore::FloatRect, double minimumScale, double maximumScale);
void commitPotentialTapFailed();
void didNotHandleTapAsClick(const WebCore::IntPoint&);
void disableDoubleTapGesturesDuringTapIfNecessary(uint64_t requestID);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (213570 => 213571)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2017-03-08 09:15:10 UTC (rev 213570)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2017-03-08 09:35:40 UTC (rev 213571)
@@ -180,7 +180,6 @@
SaveImageToLibrary(WebKit::SharedMemory::Handle handle, uint64_t size)
DidUpdateBlockSelectionWithTouch(uint32_t touch, uint32_t flags, float growThreshold, float shrinkThreshold)
ShowPlaybackTargetPicker(bool hasVideo, WebCore::IntRect elementRect)
- ZoomToRect(WebCore::FloatRect rect, double minimumScale, double maximumScale)
CommitPotentialTapFailed()
DidNotHandleTapAsClick(WebCore::IntPoint point)
DisableDoubleTapGesturesDuringTapIfNecessary(uint64_t requestID)
Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h (213570 => 213571)
--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2017-03-08 09:15:10 UTC (rev 213570)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2017-03-08 09:35:40 UTC (rev 213571)
@@ -148,7 +148,6 @@
void enableInspectorNodeSearch() override;
void disableInspectorNodeSearch() override;
- void zoomToRect(WebCore::FloatRect, double minimumScale, double maximumScale) override;
void overflowScrollViewWillStartPanGesture() override;
void overflowScrollViewDidScroll() override;
void overflowScrollWillStartScroll() override;
Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (213570 => 213571)
--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2017-03-08 09:15:10 UTC (rev 213570)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2017-03-08 09:35:40 UTC (rev 213571)
@@ -648,11 +648,6 @@
[m_webView _didFinishLoadingDataForCustomContentProviderWithSuggestedFilename:suggestedFilename data:data.get()];
}
-void PageClientImpl::zoomToRect(FloatRect rect, double minimumScale, double maximumScale)
-{
- [m_contentView _zoomToRect:rect withOrigin:rect.center() fitEntireRect:YES minimumScale:minimumScale maximumScale:maximumScale minimumScrollDistance:0];
-}
-
void PageClientImpl::overflowScrollViewWillStartPanGesture()
{
[m_contentView scrollViewWillStartPanOrPinchGesture];
Modified: trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (213570 => 213571)
--- trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2017-03-08 09:15:10 UTC (rev 213570)
+++ trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2017-03-08 09:35:40 UTC (rev 213571)
@@ -1028,11 +1028,6 @@
m_pageClient.showPlaybackTargetPicker(hasVideo, elementRect);
}
-void WebPageProxy::zoomToRect(FloatRect rect, double minimumScale, double maximumScale)
-{
- m_pageClient.zoomToRect(rect, minimumScale, maximumScale);
-}
-
void WebPageProxy::commitPotentialTapFailed()
{
m_pageClient.commitPotentialTapFailed();
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (213570 => 213571)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2017-03-08 09:15:10 UTC (rev 213570)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2017-03-08 09:35:40 UTC (rev 213571)
@@ -830,7 +830,6 @@
void applicationDidFinishSnapshottingAfterEnteringBackground();
void applicationWillEnterForeground(bool isSuspendedUnderLock);
void applicationDidBecomeActive();
- void zoomToRect(WebCore::FloatRect, double minimumScale, double maximumScale);
void completePendingSyntheticClickForContentChangeObserver();
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (213570 => 213571)
--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2017-03-08 09:15:10 UTC (rev 213570)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2017-03-08 09:35:40 UTC (rev 213571)
@@ -3239,11 +3239,6 @@
}
#endif
-void WebPage::zoomToRect(FloatRect rect, double minimumScale, double maximumScale)
-{
- send(Messages::WebPageProxy::ZoomToRect(rect, minimumScale, maximumScale));
-}
-
#if ENABLE(IOS_TOUCH_EVENTS)
void WebPage::dispatchAsynchronousTouchEvents(const Vector<WebTouchEvent, 1>& queue)
{
