- Revision
- 258403
- Author
- bfulg...@apple.com
- Date
- 2020-03-13 09:50:02 -0700 (Fri, 13 Mar 2020)
Log Message
Remove unused SmartMagnificationController Magnify message
https://bugs.webkit.org/show_bug.cgi?id=209036
<rdar://problem/59678060>
Reviewed by Tim Horton.
Remove the unused Magnify message from the SmartMagnificationController, since this is dead code.
* UIProcess/ios/SmartMagnificationController.h:
* UIProcess/ios/SmartMagnificationController.messages.in:
* UIProcess/ios/SmartMagnificationController.mm:
(WebKit::SmartMagnificationController::magnify): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (258402 => 258403)
--- trunk/Source/WebKit/ChangeLog 2020-03-13 16:35:54 UTC (rev 258402)
+++ trunk/Source/WebKit/ChangeLog 2020-03-13 16:50:02 UTC (rev 258403)
@@ -1,3 +1,18 @@
+2020-03-13 Brent Fulgham <bfulg...@apple.com>
+
+ Remove unused SmartMagnificationController Magnify message
+ https://bugs.webkit.org/show_bug.cgi?id=209036
+ <rdar://problem/59678060>
+
+ Reviewed by Tim Horton.
+
+ Remove the unused Magnify message from the SmartMagnificationController, since this is dead code.
+
+ * UIProcess/ios/SmartMagnificationController.h:
+ * UIProcess/ios/SmartMagnificationController.messages.in:
+ * UIProcess/ios/SmartMagnificationController.mm:
+ (WebKit::SmartMagnificationController::magnify): Deleted.
+
2020-03-13 David Kilzer <ddkil...@apple.com>
WebPageProxy::SetPromisedDataForImage should validate its `imageSize` and `archiveSize` parameters
Modified: trunk/Source/WebKit/UIProcess/ios/SmartMagnificationController.h (258402 => 258403)
--- trunk/Source/WebKit/UIProcess/ios/SmartMagnificationController.h 2020-03-13 16:35:54 UTC (rev 258402)
+++ trunk/Source/WebKit/UIProcess/ios/SmartMagnificationController.h 2020-03-13 16:50:02 UTC (rev 258403)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,8 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef SmartMagnificationController_h
-#define SmartMagnificationController_h
+#pragma once
#if PLATFORM(IOS_FAMILY)
@@ -56,7 +55,6 @@
void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
void didCollectGeometryForSmartMagnificationGesture(WebCore::FloatPoint origin, WebCore::FloatRect renderRect, WebCore::FloatRect visibleContentBounds, bool fitEntireRect, double viewportMinimumScale, double viewportMaximumScale);
- void magnify(WebCore::FloatPoint origin, WebCore::FloatRect targetRect, WebCore::FloatRect visibleContentRect, double viewportMinimumScale, double viewportMaximumScale);
void scrollToRect(WebCore::FloatPoint origin, WebCore::FloatRect targetRect);
std::tuple<WebCore::FloatRect, double, double> smartMagnificationTargetRectAndZoomScales(WebCore::FloatRect targetRect, double minimumScale, double maximumScale, bool addMagnificationPadding);
@@ -67,5 +65,3 @@
} // namespace WebKit
#endif // PLATFORM(IOS_FAMILY)
-
-#endif // SmartMagnificationController_h
Modified: trunk/Source/WebKit/UIProcess/ios/SmartMagnificationController.messages.in (258402 => 258403)
--- trunk/Source/WebKit/UIProcess/ios/SmartMagnificationController.messages.in 2020-03-13 16:35:54 UTC (rev 258402)
+++ trunk/Source/WebKit/UIProcess/ios/SmartMagnificationController.messages.in 2020-03-13 16:50:02 UTC (rev 258403)
@@ -1,4 +1,4 @@
-# Copyright (C) 2014 Apple Inc. All rights reserved.
+# Copyright (C) 2014-2020 Apple Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -24,7 +24,6 @@
messages -> SmartMagnificationController NotRefCounted {
DidCollectGeometryForSmartMagnificationGesture(WebCore::FloatPoint origin, WebCore::FloatRect renderRect, WebCore::FloatRect visibleContentBounds, bool fitEntireRect, double viewportMinimumScale, double viewportMaximumScale)
- Magnify(WebCore::FloatPoint origin, WebCore::FloatRect targetRect, WebCore::FloatRect visibleContentRect, double viewportMinimumScale, double viewportMaximumScale)
ScrollToRect(WebCore::FloatPoint origin, WebCore::FloatRect targetRect)
}
Modified: trunk/Source/WebKit/UIProcess/ios/SmartMagnificationController.mm (258402 => 258403)
--- trunk/Source/WebKit/UIProcess/ios/SmartMagnificationController.mm 2020-03-13 16:35:54 UTC (rev 258402)
+++ trunk/Source/WebKit/UIProcess/ios/SmartMagnificationController.mm 2020-03-13 16:50:02 UTC (rev 258403)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -134,13 +134,6 @@
[m_contentView _zoomToInitialScaleWithOrigin:origin];
}
-void SmartMagnificationController::magnify(FloatPoint origin, FloatRect targetRect, FloatRect visibleContentRect, double viewportMinimumScale, double viewportMaximumScale)
-{
- auto [adjustedTargetRect, minimumScale, maximumScale] = smartMagnificationTargetRectAndZoomScales(targetRect, viewportMinimumScale, viewportMaximumScale, true);
-
- [m_contentView _zoomToRect:adjustedTargetRect withOrigin:origin fitEntireRect:NO minimumScale:minimumScale maximumScale:maximumScale minimumScrollDistance:0];
-}
-
void SmartMagnificationController::scrollToRect(FloatPoint origin, FloatRect targetRect)
{
[m_contentView _scrollToRect:targetRect withOrigin:origin minimumScrollDistance:0];
