Diff
Modified: trunk/Source/WebCore/ChangeLog (284543 => 284544)
--- trunk/Source/WebCore/ChangeLog 2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebCore/ChangeLog 2021-10-20 17:22:08 UTC (rev 284544)
@@ -1,3 +1,13 @@
+2021-10-20 Ross Kirsling <ross.kirsl...@sony.com>
+
+ Mac CMake build should not need to include iOS headers
+ https://bugs.webkit.org/show_bug.cgi?id=231998
+
+ Reviewed by Alex Christensen.
+
+ * PlatformMac.cmake:
+ * platform/ios/WebItemProviderPasteboard.h:
+
2021-10-20 Antti Koivisto <an...@apple.com>
fast/images/text-recognition/mac/select-rotated-transparent-image-overlay.html is failing
Modified: trunk/Source/WebCore/PAL/ChangeLog (284543 => 284544)
--- trunk/Source/WebCore/PAL/ChangeLog 2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebCore/PAL/ChangeLog 2021-10-20 17:22:08 UTC (rev 284544)
@@ -1,3 +1,12 @@
+2021-10-20 Ross Kirsling <ross.kirsl...@sony.com>
+
+ Mac CMake build should not need to include iOS headers
+ https://bugs.webkit.org/show_bug.cgi?id=231998
+
+ Reviewed by Alex Christensen.
+
+ * pal/PlatformMac.cmake:
+
2021-10-19 David Kilzer <ddkil...@apple.com>
REGRESSION (r284220): [PAL] TCCSPI.h should be a project header, not a private header
Modified: trunk/Source/WebCore/PAL/pal/PlatformMac.cmake (284543 => 284544)
--- trunk/Source/WebCore/PAL/pal/PlatformMac.cmake 2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebCore/PAL/pal/PlatformMac.cmake 2021-10-20 17:22:08 UTC (rev 284544)
@@ -21,8 +21,6 @@
cocoa/UsageTrackingSoftLink.h
cocoa/VisionKitCoreSoftLink.h
- ios/SystemStatusSoftLink.h
-
mac/DataDetectorsSoftLink.h
mac/LookupSoftLink.h
mac/QuickLookUISoftLink.h
@@ -97,9 +95,6 @@
spi/cocoa/WebFilterEvaluatorSPI.h
spi/cocoa/pthreadSPI.h
- spi/ios/DataDetectorsUISPI.h
- spi/ios/GraphicsServicesSPI.h
-
spi/mac/CoreUISPI.h
spi/mac/DataDetectorsSPI.h
spi/mac/HIServicesSPI.h
Modified: trunk/Source/WebCore/PlatformMac.cmake (284543 => 284544)
--- trunk/Source/WebCore/PlatformMac.cmake 2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebCore/PlatformMac.cmake 2021-10-20 17:22:08 UTC (rev 284544)
@@ -93,7 +93,6 @@
"${WEBCORE_DIR}/bridge/objc"
"${WEBCORE_DIR}/crypto/mac"
"${WEBCORE_DIR}/editing/cocoa"
- "${WEBCORE_DIR}/editing/ios"
"${WEBCORE_DIR}/editing/mac"
"${WEBCORE_DIR}/html/shadow/cocoa"
"${WEBCORE_DIR}/layout/tableformatting"
@@ -134,7 +133,6 @@
"${WEBCORE_DIR}/platform/mediastream/mac"
"${WEBCORE_DIR}/platform/network/cocoa"
"${WEBCORE_DIR}/platform/network/cf"
- "${WEBCORE_DIR}/platform/network/ios"
"${WEBCORE_DIR}/platform/network/mac"
"${WEBCORE_DIR}/platform/text/cf"
"${WEBCORE_DIR}/platform/text/cocoa"
@@ -142,7 +140,6 @@
"${WEBCORE_DIR}/platform/spi/cf"
"${WEBCORE_DIR}/platform/spi/cg"
"${WEBCORE_DIR}/platform/spi/cocoa"
- "${WEBCORE_DIR}/platform/spi/ios"
"${WEBCORE_DIR}/platform/spi/mac"
"${WEBCORE_DIR}/plugins/mac"
"${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}"
@@ -583,8 +580,6 @@
platform/audio/cocoa/MediaSessionManagerCocoa.h
platform/audio/cocoa/WebAudioBufferList.h
- platform/audio/ios/MediaSessionManagerIOS.h
-
platform/audio/mac/SharedRoutingArbitrator.h
platform/cf/MediaAccessibilitySoftLink.h
@@ -680,13 +675,6 @@
platform/graphics/mac/SwitchingGPUClient.h
platform/graphics/mac/WebLayer.h
- platform/ios/LocalizedDeviceModel.h
- platform/ios/PlaybackSessionInterfaceAVKit.h
- platform/ios/WebAVPlayerController.h
-
- platform/ios/wak/FloatingPointEnvironment.h
- platform/ios/wak/WebCoreThreadRun.h
-
platform/mac/DynamicLinkerInterposing.h
platform/mac/HIDDevice.h
platform/mac/HIDElement.h
Modified: trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.h (284543 => 284544)
--- trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.h 2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.h 2021-10-20 17:22:08 UTC (rev 284544)
@@ -23,7 +23,9 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if TARGET_OS_IPHONE
#import <WebCore/AbstractPasteboard.h>
+#endif
#if TARGET_OS_IOS
Modified: trunk/Source/WebKit/ChangeLog (284543 => 284544)
--- trunk/Source/WebKit/ChangeLog 2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebKit/ChangeLog 2021-10-20 17:22:08 UTC (rev 284544)
@@ -1,3 +1,25 @@
+2021-10-20 Ross Kirsling <ross.kirsl...@sony.com>
+
+ Mac CMake build should not need to include iOS headers
+ https://bugs.webkit.org/show_bug.cgi?id=231998
+
+ Reviewed by Alex Christensen.
+
+ * GPUProcess/cocoa/GPUConnectionToWebProcessCocoa.mm:
+ * PlatformMac.cmake:
+ * Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm:
+ * Shared/RemoteLayerTree/RemoteLayerTreeTransaction.h:
+ * Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm:
+ (WebKit::RemoteLayerTreeTransaction::encode const):
+ (WebKit::RemoteLayerTreeTransaction::decode):
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ * UIProcess/API/Cocoa/WKWebViewPrivateForTesting.h:
+ * UIProcess/API/Cocoa/WKWebViewTesting.mm:
+ * UIProcess/Cocoa/UIDelegate.mm:
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ * UIProcess/WebPageProxy.h:
+ * WebProcess/WebPage/WebPage.h:
+
2021-10-20 Antti Koivisto <an...@apple.com>
Don't re-evaluate viewport dependent media queries if the viewport doesn't change
Modified: trunk/Source/WebKit/GPUProcess/cocoa/GPUConnectionToWebProcessCocoa.mm (284543 => 284544)
--- trunk/Source/WebKit/GPUProcess/cocoa/GPUConnectionToWebProcessCocoa.mm 2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebKit/GPUProcess/cocoa/GPUConnectionToWebProcessCocoa.mm 2021-10-20 17:22:08 UTC (rev 284544)
@@ -29,7 +29,6 @@
#if ENABLE(GPU_PROCESS)
#import "MediaPermissionUtilities.h"
-#import "SystemStatusSPI.h"
#import <WebCore/LocalizedStrings.h>
#import <WebCore/RealtimeMediaSourceCenter.h>
#import <WebCore/RegistrableDomain.h>
@@ -37,9 +36,13 @@
#import <pal/spi/cocoa/LaunchServicesSPI.h>
#import <wtf/OSObjectPtr.h>
-#import "TCCSoftLink.h"
+#if HAVE(SYSTEM_STATUS)
+#import "SystemStatusSPI.h"
#import <pal/ios/SystemStatusSoftLink.h>
+#endif
+#import "TCCSoftLink.h"
+
namespace WebKit {
#if ENABLE(MEDIA_STREAM)
Modified: trunk/Source/WebKit/PlatformMac.cmake (284543 => 284544)
--- trunk/Source/WebKit/PlatformMac.cmake 2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebKit/PlatformMac.cmake 2021-10-20 17:22:08 UTC (rev 284544)
@@ -103,7 +103,6 @@
"${WEBKIT_DIR}/UIProcess/API/C/mac"
"${WEBKIT_DIR}/UIProcess/API/Cocoa"
"${WEBKIT_DIR}/UIProcess/API/mac"
- "${WEBKIT_DIR}/UIProcess/API/ios"
"${WEBKIT_DIR}/UIProcess/Authentication/cocoa"
"${WEBKIT_DIR}/UIProcess/Cocoa"
"${WEBKIT_DIR}/UIProcess/Cocoa/SOAuthorization"
@@ -115,10 +114,8 @@
"${WEBKIT_DIR}/UIProcess/PDF"
"${WEBKIT_DIR}/UIProcess/RemoteLayerTree"
"${WEBKIT_DIR}/UIProcess/RemoteLayerTree/cocoa"
- "${WEBKIT_DIR}/UIProcess/RemoteLayerTree/ios"
"${WEBKIT_DIR}/UIProcess/RemoteLayerTree/mac"
"${WEBKIT_DIR}/UIProcess/WebAuthentication/Cocoa"
- "${WEBKIT_DIR}/UIProcess/ios"
"${WEBKIT_DIR}/Platform/cg"
"${WEBKIT_DIR}/Platform/classifier"
"${WEBKIT_DIR}/Platform/classifier/cocoa"
@@ -126,7 +123,6 @@
"${WEBKIT_DIR}/Platform/mac"
"${WEBKIT_DIR}/Platform/unix"
"${WEBKIT_DIR}/Platform/spi/Cocoa"
- "${WEBKIT_DIR}/Platform/spi/ios"
"${WEBKIT_DIR}/Platform/spi/mac"
"${WEBKIT_DIR}/Platform/IPC/mac"
"${WEBKIT_DIR}/Platform/IPC/cocoa"
@@ -137,7 +133,6 @@
"${WEBKIT_DIR}/Shared/API/c/mac"
"${WEBKIT_DIR}/Shared/ApplePay/cocoa/"
"${WEBKIT_DIR}/Shared/Authentication/cocoa"
- "${WEBKIT_DIR}/Shared/ios"
"${WEBKIT_DIR}/Shared/cf"
"${WEBKIT_DIR}/Shared/Cocoa"
"${WEBKIT_DIR}/Shared/Daemon"
@@ -227,8 +222,6 @@
list(APPEND WebKit_MESSAGES_IN_FILES
GPUProcess/media/RemoteImageDecoderAVFProxy
- GPUProcess/media/ios/RemoteMediaSessionHelperProxy
-
NetworkProcess/CustomProtocols/LegacyCustomProtocolManager
Shared/API/Cocoa/RemoteObjectRegistry
@@ -261,8 +254,6 @@
WebProcess/GPU/media/RemoteImageDecoderAVFManager
- WebProcess/GPU/media/ios/RemoteMediaSessionHelper
-
WebProcess/Inspector/WebInspectorUIExtensionController
WebProcess/WebAuthentication/WebAuthnProcessConnection
@@ -501,8 +492,6 @@
UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h
UIProcess/API/Cocoa/_WKWebsiteDataStoreDelegate.h
- UIProcess/API/ios/WKWebViewPrivateForTestingIOS.h
-
UIProcess/API/mac/WKWebViewPrivateForTestingMac.h
UIProcess/Cocoa/WKShareSheet.h
@@ -559,7 +548,6 @@
UIProcess/API/C/Cocoa
UIProcess/API/C/mac
UIProcess/API/cpp
- UIProcess/API/ios
WebProcess/InjectedBundle/API/Cocoa
WebProcess/InjectedBundle/API/c
Modified: trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm (284543 => 284544)
--- trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm 2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm 2021-10-20 17:22:08 UTC (rev 284544)
@@ -29,7 +29,6 @@
#import "PlatformCAAnimationRemote.h"
#import "PlatformCALayerRemote.h"
#import "RemoteLayerTreeHost.h"
-#import "RemoteLayerTreeViews.h"
#import <QuartzCore/QuartzCore.h>
#import <WebCore/PlatformCAFilters.h>
#import <WebCore/ScrollbarThemeMac.h>
@@ -46,6 +45,7 @@
#endif
#if PLATFORM(IOS_FAMILY)
+#import "RemoteLayerTreeViews.h"
#import <UIKit/UIView.h>
#import <UIKitSPI.h>
#endif
Modified: trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreeTransaction.h (284543 => 284544)
--- trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreeTransaction.h 2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreeTransaction.h 2021-10-20 17:22:08 UTC (rev 284544)
@@ -26,7 +26,6 @@
#pragma once
#include "DrawingAreaInfo.h"
-#include "DynamicViewportSizeUpdate.h"
#include "EditorState.h"
#include "GenericCallback.h"
#include "PlatformCAAnimationRemote.h"
@@ -45,6 +44,10 @@
#include <wtf/text/StringHash.h>
#include <wtf/text/WTFString.h>
+#if PLATFORM(IOS_FAMILY)
+#include "DynamicViewportSizeUpdate.h"
+#endif
+
namespace IPC {
class Decoder;
class Encoder;
@@ -305,9 +308,11 @@
const EditorState& editorState() const { return m_editorState.value(); }
void setEditorState(const EditorState& editorState) { m_editorState = editorState; }
+#if PLATFORM(IOS_FAMILY)
std::optional<DynamicViewportSizeUpdateID> dynamicViewportSizeUpdateID() const { return m_dynamicViewportSizeUpdateID; }
void setDynamicViewportSizeUpdateID(DynamicViewportSizeUpdateID resizeID) { m_dynamicViewportSizeUpdateID = resizeID; }
-
+#endif
+
private:
WebCore::GraphicsLayer::PlatformLayerID m_rootLayerID;
Vector<RefPtr<PlatformCALayerRemote>> m_changedLayers; // Only used in the Web process.
@@ -346,7 +351,9 @@
bool m_isInStableState { false };
std::optional<EditorState> m_editorState;
+#if PLATFORM(IOS_FAMILY)
std::optional<DynamicViewportSizeUpdateID> m_dynamicViewportSizeUpdateID;
+#endif
};
} // namespace WebKit
Modified: trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm (284543 => 284544)
--- trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm 2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm 2021-10-20 17:22:08 UTC (rev 284544)
@@ -643,7 +643,9 @@
if (m_editorState)
encoder << *m_editorState;
+#if PLATFORM(IOS_FAMILY)
encoder << m_dynamicViewportSizeUpdateID;
+#endif
}
bool RemoteLayerTreeTransaction::decode(IPC::Decoder& decoder, RemoteLayerTreeTransaction& result)
@@ -780,8 +782,10 @@
result.setEditorState(editorState);
}
+#if PLATFORM(IOS_FAMILY)
if (!decoder.decode(result.m_dynamicViewportSizeUpdateID))
return false;
+#endif
return true;
}
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (284543 => 284544)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2021-10-20 17:22:08 UTC (rev 284544)
@@ -83,8 +83,6 @@
#import "WKUserContentControllerInternal.h"
#import "WKWebViewConfigurationInternal.h"
#import "WKWebViewContentProvider.h"
-#import "WKWebViewPrivateForTestingIOS.h"
-#import "WKWebViewIOS.h"
#import "WKWebViewMac.h"
#import "WKWebpagePreferencesInternal.h"
#import "WKWebsiteDataStoreInternal.h"
@@ -168,6 +166,8 @@
#import "WKContentViewInteraction.h"
#import "WKScrollView.h"
#import "WKWebViewContentProviderRegistry.h"
+#import "WKWebViewIOS.h"
+#import "WKWebViewPrivateForTestingIOS.h"
#import <MobileCoreServices/MobileCoreServices.h>
#import <UIKit/UIApplication.h>
#import <pal/spi/cf/CFNotificationCenterSPI.h>
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivateForTesting.h (284543 => 284544)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivateForTesting.h 2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivateForTesting.h 2021-10-20 17:22:08 UTC (rev 284544)
@@ -23,8 +23,11 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if TARGET_OS_IPHONE
#import "WKWebViewPrivateForTestingIOS.h"
+#else
#import "WKWebViewPrivateForTestingMac.h"
+#endif
NS_ASSUME_NONNULL_BEGIN
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewTesting.mm (284543 => 284544)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewTesting.mm 2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewTesting.mm 2021-10-20 17:22:08 UTC (rev 284544)
@@ -31,7 +31,6 @@
#import "PlaybackSessionManagerProxy.h"
#import "UserMediaProcessManager.h"
#import "ViewGestureController.h"
-#import "WKWebViewIOS.h"
#import "WebPageProxy.h"
#import "WebProcessPool.h"
#import "WebProcessProxy.h"
@@ -42,6 +41,14 @@
#import <WebCore/ValidationBubble.h>
#import <wtf/RetainPtr.h>
+#if PLATFORM(MAC)
+#import "WKWebViewMac.h"
+#endif
+
+#if PLATFORM(IOS_FAMILY)
+#import "WKWebViewIOS.h"
+#endif
+
#if ENABLE(MEDIA_SESSION_COORDINATOR)
@interface WKMediaSessionCoordinatorHelper : NSObject <_WKMediaSessionCoordinatorDelegate>
- (id)initWithCoordinator:(WebCore::MediaSessionCoordinatorClient*)coordinator;
Modified: trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm (284543 => 284544)
--- trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm 2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm 2021-10-20 17:22:08 UTC (rev 284544)
@@ -35,7 +35,6 @@
#import "MediaUtilities.h"
#import "NativeWebWheelEvent.h"
#import "NavigationActionData.h"
-#import "TapHandlingResult.h"
#import "UserMediaPermissionCheckProxy.h"
#import "UserMediaPermissionRequestManagerProxy.h"
#import "UserMediaPermissionRequestProxy.h"
@@ -46,9 +45,8 @@
#import "WKOpenPanelParametersInternal.h"
#import "WKSecurityOriginInternal.h"
#import "WKStorageAccessAlert.h"
-#import <WebKit/WKUIDelegatePrivate.h>
+#import "WKUIDelegatePrivate.h"
#import "WKWebViewConfigurationInternal.h"
-#import "WKWebViewIOS.h"
#import "WKWebViewInternal.h"
#import "WKWindowFeaturesInternal.h"
#import "WebEventFactory.h"
@@ -67,6 +65,11 @@
#import <wtf/BlockPtr.h>
#import <wtf/URL.h>
+#if PLATFORM(IOS_FAMILY)
+#import "TapHandlingResult.h"
+#import "WKWebViewIOS.h"
+#endif
+
#import <pal/cocoa/AVFoundationSoftLink.h>
namespace WebKit {
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (284543 => 284544)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2021-10-20 17:22:08 UTC (rev 284544)
@@ -41,8 +41,6 @@
#import "TextChecker.h"
#import "UserInterfaceIdiom.h"
#import "WKBrowsingContextControllerInternal.h"
-#import "WKMouseDeviceObserver.h"
-#import "WKStylusDeviceObserver.h"
#import "WebAuthnProcessMessages.h"
#import "WebAuthnProcessProxy.h"
#import "WebBackForwardCache.h"
@@ -105,6 +103,14 @@
#import "GPUProcessMessages.h"
#endif
+#if HAVE(MOUSE_DEVICE_OBSERVATION)
+#import "WKMouseDeviceObserver.h"
+#endif
+
+#if HAVE(STYLUS_DEVICE_OBSERVATION)
+#import "WKStylusDeviceObserver.h"
+#endif
+
#if HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
#include <WebCore/CaptionUserPreferencesMediaAF.h>
#include <WebCore/MediaAccessibilitySoftLink.h>
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (284543 => 284544)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2021-10-20 17:22:08 UTC (rev 284544)
@@ -137,6 +137,7 @@
#endif
#if PLATFORM(IOS_FAMILY)
+#include "DynamicViewportSizeUpdate.h"
#include "GestureTypes.h"
#include "WebAutocorrectionContext.h"
#include <WebCore/InspectorOverlay.h>
@@ -155,7 +156,6 @@
#endif
#if PLATFORM(COCOA)
-#include "DynamicViewportSizeUpdate.h"
#include "RemoteLayerTreeNode.h"
#include <wtf/WeakObjCPtr.h>
#endif
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (284543 => 284544)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2021-10-20 17:18:12 UTC (rev 284543)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2021-10-20 17:22:08 UTC (rev 284544)
@@ -126,6 +126,7 @@
#endif
#if PLATFORM(IOS_FAMILY)
+#include "DynamicViewportSizeUpdate.h"
#include "GestureTypes.h"
#include <WebCore/InspectorOverlay.h>
#include <WebCore/IntPointHash.h>
@@ -159,7 +160,6 @@
#endif
#if PLATFORM(COCOA)
-#include "DynamicViewportSizeUpdate.h"
#include <WebCore/VisibleSelection.h>
#include <wtf/RetainPtr.h>
OBJC_CLASS CALayer;
