Attachment 341914 Details for Bug 186279 – Patch

[patch] Patch

bug-186279-20180604132208.patch (text/plain), 41.48 KB, created by Wenson Hsieh on 2018-06-04 13:22:08 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Wenson Hsieh

Created: 2018-06-04 13:22:08 PDT

Size: 41.48 KB

patch

obsolete

>Subversion Revision: 232449
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index e99b807bf30131a0c10bd4c73dedbb509ffea1bb..9f5d57c3d84f2b3b2ff9a2c0ef299656282c5c22 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,59 @@
>+2018-06-04  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        [WebKit on watchOS] Remove all uses of the EXTRA_ZOOM_MODE compiler flag
>+        https://bugs.webkit.org/show_bug.cgi?id=186279
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Replaces uses of ENABLE(EXTRA_ZOOM_MODE) with PLATFORM(WATCHOS). No change in behavior.
>+
>+        * Modules/mediacontrols/MediaControlsHost.cpp:
>+        (WebCore::MediaControlsHost::compactMode const):
>+        * html/HTMLMediaElement.cpp:
>+        (WebCore::HTMLMediaElement::updatePlayState):
>+        * page/Page.cpp:
>+        (WebCore::relevantViewRect):
>+        * page/SettingsBase.cpp:
>+        (WebCore::SettingsBase::defaultMinimumZoomFontSize):
>+        (WebCore::SettingsBase::defaultDownloadableBinaryFontsEnabled):
>+        * page/ViewportConfiguration.cpp:
>+        (WebCore::platformDeviceWidthOverride):
>+        (WebCore::shouldOverrideShrinkToFitArgument):
>+        (WebCore::needsUpdateAfterChangingDisabledAdaptations):
>+        * platform/LocalizedStrings.cpp:
>+        * platform/LocalizedStrings.h:
>+        * platform/audio/ios/MediaSessionManagerIOS.mm:
>+        (WebCore::MediaSessionManageriOS::configureWireLessTargetMonitoring):
>+        (-[WebMediaSessionHelper dealloc]):
>+        (-[WebMediaSessionHelper hasWirelessTargetsAvailable]):
>+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
>+        (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerLayer):
>+        (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerItem):
>+        (WebCore::MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenMode):
>+        * platform/ios/PlaybackSessionInterfaceAVKit.mm:
>+        (WebCore::PlaybackSessionInterfaceAVKit::seekableRangesChanged):
>+        * platform/ios/VideoFullscreenInterfaceAVKit.mm:
>+        (-[WebAVPlayerViewController initWithFullscreenInterface:]):
>+        (-[WebAVPlayerViewController enterFullScreenAnimated:completionHandler:]):
>+        (-[WebAVPlayerViewController exitFullScreenAnimated:completionHandler:]):
>+        (-[WebAVPlayerViewController MY_NO_RETURN]):
>+        (-[WebAVPlayerViewController isPictureInPicturePossible]):
>+        (-[WebAVPlayerViewController isPictureInPictureActive]):
>+        (-[WebAVPlayerViewController pictureInPictureActive]):
>+        (-[WebAVPlayerViewController pictureInPictureWasStartedWhenEnteringBackground]):
>+        (-[WebAVPlayerViewController showsPlaybackControls]):
>+        (-[WebAVPlayerViewController setShowsPlaybackControls:]):
>+        (-[WebAVPlayerViewController setAllowsPictureInPicturePlayback:]):
>+        (-[WebAVPlayerViewController setDelegate:]):
>+        (VideoFullscreenInterfaceAVKit::setupFullscreen):
>+        (VideoFullscreenInterfaceAVKit::shouldExitFullscreenWithReason):
>+        (VideoFullscreenInterfaceAVKit::doSetup):
>+        (WebCore::supportsPictureInPicture):
>+        * platform/ios/WebVideoFullscreenControllerAVKit.mm:
>+        (VideoFullscreenControllerContext::willExitFullscreen):
>+        * rendering/RenderThemeIOS.h:
>+        * rendering/RenderThemeIOS.mm:
>+
> 2018-06-01  Ryosuke Niwa  <rniwa@webkit.org>
> 
>         Editor can hold references to Documents after you navigate away
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index fbd0bd2e1f9e13b1b4c4a1805e2699fc61fc417c..e6796fb6dc7666976c224999369d0b693de6fea9 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-06-04  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        [WebKit on watchOS] Remove all uses of the EXTRA_ZOOM_MODE compiler flag
>+        https://bugs.webkit.org/show_bug.cgi?id=186279
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Replaces uses of ENABLE(EXTRA_ZOOM_MODE) with PLATFORM(WATCHOS).
>+
>+        * pal/cf/CoreMediaSoftLink.h:
>+        * pal/spi/cocoa/AVKitSPI.h:
>+
> 2018-05-30  Andy Estes  <aestes@apple.com>
> 
>         [Cocoa] Add an SPI to suppress connection termination errors from CFNetwork when network interfaces change
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index e1062723109b028487c5245e09079b66c41a80dd..d74df888762ba11e032c2e53cac3d45829637e23 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,41 @@
>+2018-06-04  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        [WebKit on watchOS] Remove all uses of the EXTRA_ZOOM_MODE compiler flag
>+        https://bugs.webkit.org/show_bug.cgi?id=186279
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Replaces uses of ENABLE(EXTRA_ZOOM_MODE) with PLATFORM(WATCHOS).
>+
>+        * Shared/WebPreferencesDefaultValues.h:
>+        * UIProcess/API/Cocoa/WKWebView.mm:
>+        (-[WKWebView _initializeWithConfiguration:]):
>+        (-[WKWebView _zoomToFocusRect:selectionRect:insideFixed:fontSize:minimumScale:maximumScale:allowScaling:forceScroll:]):
>+        * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
>+        (-[WKWebViewConfiguration init]):
>+        * UIProcess/WebProcessProxy.cpp:
>+        * UIProcess/WebProcessProxy.h:
>+        * UIProcess/ios/WKContentViewInteraction.h:
>+        * UIProcess/ios/WKContentViewInteraction.mm:
>+        (-[WKContentView _willStartScrollingOrZooming]):
>+        (-[WKContentView _didEndScrollingOrZooming]):
>+        (-[WKContentView _startAssistingKeyboard]):
>+        (-[WKContentView _startAssistingNode:userIsInteracting:blurPreviousNode:changingActivityState:userObject:]):
>+        (-[WKContentView _stopAssistingNode]):
>+        (-[WKContentView reloadContextViewForPresentedListViewController]):
>+        (-[WKContentView _wheelChangedWithEvent:]):
>+        (-[WKContentView _simulateTextEntered:]):
>+        (-[WKContentView selectFormAccessoryPickerRow:]):
>+        (-[WKContentView formInputLabel]):
>+        (-[WKContentView setTimePickerValueToHour:minute:]):
>+        * UIProcess/ios/WKScrollView.mm:
>+        (-[WKScrollView initWithFrame:]):
>+        (-[WKScrollView addGestureRecognizer:]):
>+        * UIProcess/ios/forms/WKFileUploadPanel.mm:
>+        (-[WKFileUploadPanel platformSupportsPickerViewController]):
>+        * WebProcess/WebPage/ios/WebPageIOS.mm:
>+        (WebKit::WebPage::platformPrefersTextLegibilityBasedZoomScaling const):
>+
> 2018-06-02  Chris Dumez  <cdumez@apple.com>
> 
>         Unreviewed, rolling out r232275.
>diff --git a/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp b/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp
>index 26fe18752fb712337631365e6208366026f5b96c..f4cb2fb63d163507fd9a13d1d497cb3b0791e6aa 100644
>--- a/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp
>+++ b/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp
>@@ -296,7 +296,7 @@ bool MediaControlsHost::compactMode() const
>     if (m_simulateCompactMode)
>         return true;
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     return true;
> #else
>     return false;
>diff --git a/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h b/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h
>index c0aa051010ac20ddf8dbcc12f125da6df9c62ef7..88fd4bba08bba94dff5945aedcbca1651d387bb8 100644
>--- a/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h
>+++ b/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h
>@@ -31,7 +31,7 @@
> #include <pal/spi/cf/CoreMediaSPI.h>
> #include <wtf/SoftLinking.h>
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
> #define SOFTLINK_AVKIT_FRAMEWORK() SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(AVKit)
> #else
> #define SOFTLINK_AVKIT_FRAMEWORK() SOFT_LINK_FRAMEWORK_OPTIONAL(AVKit)
>diff --git a/Source/WebCore/PAL/pal/spi/cocoa/AVKitSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/AVKitSPI.h
>index f218f05af0b292ce444523eece786a964d73e44a..f1a53b894bf6e5f23d372cebcfb3afd7a0aac657 100644
>--- a/Source/WebCore/PAL/pal/spi/cocoa/AVKitSPI.h
>+++ b/Source/WebCore/PAL/pal/spi/cocoa/AVKitSPI.h
>@@ -41,7 +41,7 @@
> #import <AVKit/AVPlayerViewController_Private.h>
> #import <AVKit/AVPlayerViewController_WebKitOnly.h>
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
> 
> #import <AVFoundation/AVPlayerLayer.h>
> 
>diff --git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html/HTMLMediaElement.cpp
>index 1dc7cb4de27f4ecc1294d31d977a4f030e3da4ee..c4ed73b5764a77a2896840098fec51912aafab0d 100644
>--- a/Source/WebCore/html/HTMLMediaElement.cpp
>+++ b/Source/WebCore/html/HTMLMediaElement.cpp
>@@ -5287,7 +5287,7 @@ void HTMLMediaElement::updatePlayState(UpdateState updateState)
>         if (!m_waitingToEnterFullscreen)
>             enterFullscreen();
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>         // FIXME: Investigate doing this for all builds.
>         return;
> #endif
>diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp
>index f45f6eb80ffb953244b4b18849927ed6f88c7c5c..9e9defc8f4b2d74434bfa6a3e4a974f87244b51f 100644
>--- a/Source/WebCore/page/Page.cpp
>+++ b/Source/WebCore/page/Page.cpp
>@@ -1860,7 +1860,7 @@ static LayoutRect relevantViewRect(RenderView* view)
>     LayoutRect viewRect = view->viewRect();
> 
>     float relevantViewRectWidth = 980;
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     // FIXME(186051): Consider limiting the relevant rect width to the view width everywhere.
>     relevantViewRectWidth = std::min<float>(viewRect.width().toFloat(), relevantViewRectWidth);
> #endif
>diff --git a/Source/WebCore/page/SettingsBase.cpp b/Source/WebCore/page/SettingsBase.cpp
>index c646e77aece7c80964018cc5492e4073e3b97625..c867ae3987231a2195e1d6a5bf03ab90645078ae 100644
>--- a/Source/WebCore/page/SettingsBase.cpp
>+++ b/Source/WebCore/page/SettingsBase.cpp
>@@ -80,7 +80,7 @@ SettingsBase::~SettingsBase() = default;
> 
> float SettingsBase::defaultMinimumZoomFontSize()
> {
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     return 30;
> #else
>     return 15;
>@@ -96,7 +96,7 @@ bool SettingsBase::defaultTextAutosizingEnabled()
> 
> bool SettingsBase::defaultDownloadableBinaryFontsEnabled()
> {
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     return false;
> #else
>     return true;
>diff --git a/Source/WebCore/page/ViewportConfiguration.cpp b/Source/WebCore/page/ViewportConfiguration.cpp
>index f45902e3e130903dd25dc433ec267f389a0178e0..acf61cb7c27c3e243e111851e2052061b294a778 100644
>--- a/Source/WebCore/page/ViewportConfiguration.cpp
>+++ b/Source/WebCore/page/ViewportConfiguration.cpp
>@@ -47,7 +47,7 @@ static bool constraintsAreAllRelative(const ViewportConfiguration::Parameters& c
> 
> static float platformDeviceWidthOverride()
> {
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     return 320;
> #else
>     return 0;
>@@ -56,7 +56,7 @@ static float platformDeviceWidthOverride()
> 
> static bool shouldOverrideShrinkToFitArgument()
> {
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     return true;
> #else
>     return false;
>@@ -68,7 +68,7 @@ static bool needsUpdateAfterChangingDisabledAdaptations(const OptionSet<Disabled
>     if (oldDisabledAdaptations == newDisabledAdaptations)
>         return false;
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     if (oldDisabledAdaptations.contains(DisabledAdaptations::ExtraZoomMode) != newDisabledAdaptations.contains(DisabledAdaptations::ExtraZoomMode))
>         return true;
> #endif
>diff --git a/Source/WebCore/platform/LocalizedStrings.cpp b/Source/WebCore/platform/LocalizedStrings.cpp
>index a87aca7dcbf5054126c4f309136d984325bd0b55..0fdd9b15bb4a9e190a7c7749368e4b20c37da2ec 100644
>--- a/Source/WebCore/platform/LocalizedStrings.cpp
>+++ b/Source/WebCore/platform/LocalizedStrings.cpp
>@@ -1034,7 +1034,7 @@ String webCryptoMasterKeyKeychainComment()
> 
> #endif
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
> 
> String numberPadOKButtonTitle()
> {
>diff --git a/Source/WebCore/platform/LocalizedStrings.h b/Source/WebCore/platform/LocalizedStrings.h
>index 2d46a037d322529ea957451ac3f1425622ad7852..70fd214f7eba767fcf36d02a714b7f1f9315a20c 100644
>--- a/Source/WebCore/platform/LocalizedStrings.h
>+++ b/Source/WebCore/platform/LocalizedStrings.h
>@@ -316,7 +316,7 @@ namespace WebCore {
>     WEBCORE_EXPORT String exitFullScreenButtonAccessibilityTitle();
> #endif
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     WEBCORE_EXPORT String numberPadOKButtonTitle();
>     WEBCORE_EXPORT String formControlCancelButtonTitle();
>     WEBCORE_EXPORT String formControlDoneButtonTitle();
>diff --git a/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm b/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm
>index 9527906d13840462bf943ec8248cadc73e517ca2..86cf9d9866609c14564a417581b261a457365c72 100644
>--- a/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm
>+++ b/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm
>@@ -56,7 +56,7 @@ SOFT_LINK_POINTER(AVFoundation, AVAudioSessionInterruptionTypeKey, NSString *)
> SOFT_LINK_POINTER(AVFoundation, AVAudioSessionInterruptionOptionKey, NSString *)
> SOFT_LINK_POINTER(AVFoundation, AVRouteDetectorMultipleRoutesDetectedDidChangeNotification, NSString *)
> 
>-#if HAVE(MEDIA_PLAYER) && !ENABLE(EXTRA_ZOOM_MODE)
>+#if HAVE(MEDIA_PLAYER) && !PLATFORM(WATCHOS)
> SOFT_LINK_CLASS(AVFoundation, AVRouteDetector)
> #endif
> 
>@@ -104,7 +104,7 @@ using namespace WebCore;
> @interface WebMediaSessionHelper : NSObject {
>     MediaSessionManageriOS* _callback;
> 
>-#if HAVE(MEDIA_PLAYER) && !ENABLE(EXTRA_ZOOM_MODE)
>+#if HAVE(MEDIA_PLAYER) && !PLATFORM(WATCHOS)
>     RetainPtr<AVRouteDetector> _routeDetector;
> #endif
>     bool _monitoringAirPlayRoutes;
>@@ -120,7 +120,7 @@ using namespace WebCore;
> - (void)applicationDidEnterBackground:(NSNotification *)notification;
> - (BOOL)hasWirelessTargetsAvailable;
> 
>-#if HAVE(MEDIA_PLAYER) && !ENABLE(EXTRA_ZOOM_MODE)
>+#if HAVE(MEDIA_PLAYER) && !PLATFORM(WATCHOS)
> - (void)startMonitoringAirPlayRoutes;
> - (void)stopMonitoringAirPlayRoutes;
> #endif
>@@ -186,7 +186,7 @@ bool MediaSessionManageriOS::hasWirelessTargetsAvailable()
> 
> void MediaSessionManageriOS::configureWireLessTargetMonitoring()
> {
>-#if HAVE(MEDIA_PLAYER) && !ENABLE(EXTRA_ZOOM_MODE)
>+#if HAVE(MEDIA_PLAYER) && !PLATFORM(WATCHOS)
>     bool requiresMonitoring = anyOfSessions([] (PlatformMediaSession& session, size_t) {
>         return session.requiresPlaybackTargetRouteMonitoring();
>     });
>@@ -350,7 +350,7 @@ void MediaSessionManageriOS::externalOutputDeviceAvailableDidChange()
> {
>     LOG(Media, "-[WebMediaSessionHelper dealloc]");
> 
>-#if HAVE(MEDIA_PLAYER) && !ENABLE(EXTRA_ZOOM_MODE)
>+#if HAVE(MEDIA_PLAYER) && !PLATFORM(WATCHOS)
>     if (!pthread_main_np()) {
>         dispatch_async(dispatch_get_main_queue(), [routeDetector = WTFMove(_routeDetector)] () mutable {
>             LOG(Media, "safelyTearDown - dipatched to UI thread.");
>@@ -376,14 +376,14 @@ void MediaSessionManageriOS::externalOutputDeviceAvailableDidChange()
> - (BOOL)hasWirelessTargetsAvailable
> {
>     LOG(Media, "-[WebMediaSessionHelper hasWirelessTargetsAvailable]");
>-#if HAVE(MEDIA_PLAYER) && !ENABLE(EXTRA_ZOOM_MODE)
>+#if HAVE(MEDIA_PLAYER) && !PLATFORM(WATCHOS)
>     return _routeDetector.get().multipleRoutesDetected;
> #else
>     return NO;
> #endif
> }
> 
>-#if HAVE(MEDIA_PLAYER) && !ENABLE(EXTRA_ZOOM_MODE)
>+#if HAVE(MEDIA_PLAYER) && !PLATFORM(WATCHOS)
> - (void)startMonitoringAirPlayRoutes
> {
>     if (_monitoringAirPlayRoutes)
>@@ -428,7 +428,7 @@ void MediaSessionManageriOS::externalOutputDeviceAvailableDidChange()
>     _monitoringAirPlayRoutes = false;
>     _routeDetector.get().routeDetectionEnabled = NO;
> }
>-#endif // HAVE(MEDIA_PLAYER) && !ENABLE(EXTRA_ZOOM_MODE)
>+#endif // HAVE(MEDIA_PLAYER) && !PLATFORM(WATCHOS)
> 
> - (void)interruption:(NSNotification *)notification
> {
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
>index 84a19bf1e3694fd08ed2be53d762c15a4469b511..a8938202b3dbecde7b6dc3f92501bf437f19f9c8 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
>@@ -704,7 +704,7 @@ void MediaPlayerPrivateAVFoundationObjC::createAVPlayerLayer()
> 
>     m_videoFullscreenLayerManager->setVideoLayer(m_videoLayer.get(), defaultSize);
> 
>-#if PLATFORM(IOS) && !ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(IOS) && !PLATFORM(WATCHOS)
>     if ([m_videoLayer respondsToSelector:@selector(setPIPModeEnabled:)])
>         [m_videoLayer setPIPModeEnabled:(player()->fullscreenMode() & MediaPlayer::VideoFullscreenModePictureInPicture)];
> #endif
>@@ -1081,7 +1081,7 @@ void MediaPlayerPrivateAVFoundationObjC::createAVPlayerItem()
>     }
> #endif
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     createVideoOutput();
> #endif
> 
>@@ -1218,7 +1218,7 @@ void MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenGravity(MediaPlayer::
> 
> void MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenMode(MediaPlayer::VideoFullscreenMode mode)
> {
>-#if PLATFORM(IOS) && !ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(IOS) && !PLATFORM(WATCHOS)
>     if ([m_videoLayer respondsToSelector:@selector(setPIPModeEnabled:)])
>         [m_videoLayer setPIPModeEnabled:(mode & MediaPlayer::VideoFullscreenModePictureInPicture)];
>     updateDisableExternalPlayback();
>diff --git a/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.mm b/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.mm
>index a8fd3b04d02967eeca52cda0ec19057ba5325b52..0a28548b7f5951619534432da9a0007ddb9ae864 100644
>--- a/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.mm
>+++ b/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.mm
>@@ -128,7 +128,7 @@ void PlaybackSessionInterfaceAVKit::seekableRangesChanged(const TimeRanges& time
> {
>     RetainPtr<NSMutableArray> seekableRanges = adoptNS([[NSMutableArray alloc] init]);
> 
>-#if !ENABLE(EXTRA_ZOOM_MODE)
>+#if !PLATFORM(WATCHOS)
>     for (unsigned i = 0; i < timeRanges.length(); i++) {
>         double start = timeRanges.start(i).releaseReturnValue();
>         double end = timeRanges.end(i).releaseReturnValue();
>diff --git a/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm b/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm
>index 4a11b5c3150f8d59e3d7a6663a34b964014740a3..a755d1b4bd997995617ff3fb2ddd18ea6179c910 100644
>--- a/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm
>+++ b/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm
>@@ -560,7 +560,7 @@ NS_ASSUME_NONNULL_END
> 
>     _fullscreenInterface = interface;
>     _avPlayerViewController = adoptNS([allocAVPlayerViewControllerInstance() initWithPlayerLayerView:interface->playerLayerView()]);
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     _avPlayerViewController.get().delegate = self;
> #endif
> 
>@@ -578,7 +578,7 @@ NS_ASSUME_NONNULL_END
> 
> - (void)enterFullScreenAnimated:(BOOL)animated completionHandler:(void (^)(BOOL success, NSError * __nullable error))completionHandler
> {
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     _presentingViewController = _fullscreenInterface->presentingViewController();
> 
>     _avPlayerViewController.get().view.frame = _presentingViewController.get().view.frame;
>@@ -593,7 +593,7 @@ NS_ASSUME_NONNULL_END
> 
> - (void)exitFullScreenAnimated:(BOOL)animated completionHandler:(void (^)(BOOL success, NSError * __nullable error))completionHandler
> {
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     if (!_presentingViewController)
>         return;
> 
>@@ -607,7 +607,7 @@ NS_ASSUME_NONNULL_END
> #endif
> }
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
> #define MY_NO_RETURN NO_RETURN_DUE_TO_ASSERT
> #else
> #define MY_NO_RETURN
>@@ -615,7 +615,7 @@ NS_ASSUME_NONNULL_END
> 
> - (void)startPictureInPicture MY_NO_RETURN
> {
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     ASSERT_NOT_REACHED();
> #else
>     [_avPlayerViewController.get() startPictureInPicture];
>@@ -624,7 +624,7 @@ NS_ASSUME_NONNULL_END
> 
> - (void)stopPictureInPicture MY_NO_RETURN
> {
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     ASSERT_NOT_REACHED();
> #else
>     [_avPlayerViewController.get() stopPictureInPicture];
>@@ -633,7 +633,7 @@ NS_ASSUME_NONNULL_END
> 
> - (BOOL)isPictureInPicturePossible
> {
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     return NO;
> #else
>     return _avPlayerViewController.get().isPictureInPicturePossible;
>@@ -642,7 +642,7 @@ NS_ASSUME_NONNULL_END
> 
> - (BOOL)isPictureInPictureActive
> {
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     return NO;
> #else
>     return _avPlayerViewController.get().isPictureInPictureActive;
>@@ -651,7 +651,7 @@ NS_ASSUME_NONNULL_END
> 
> - (BOOL)pictureInPictureActive
> {
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     return NO;
> #else
>     return _avPlayerViewController.get().pictureInPictureActive;
>@@ -660,7 +660,7 @@ NS_ASSUME_NONNULL_END
> 
> - (BOOL)pictureInPictureWasStartedWhenEnteringBackground
> {
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     return NO;
> #else
>     return _avPlayerViewController.get().pictureInPictureWasStartedWhenEnteringBackground;
>@@ -674,7 +674,7 @@ NS_ASSUME_NONNULL_END
> 
> - (BOOL)showsPlaybackControls
> {
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     return YES;
> #else
>     return _avPlayerViewController.get().showsPlaybackControls;
>@@ -683,7 +683,7 @@ NS_ASSUME_NONNULL_END
> 
> - (void)setShowsPlaybackControls:(BOOL)showsPlaybackControls
> {
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     UNUSED_PARAM(showsPlaybackControls);
> #else
>     _avPlayerViewController.get().showsPlaybackControls = showsPlaybackControls;
>@@ -692,7 +692,7 @@ NS_ASSUME_NONNULL_END
> 
> - (void)setAllowsPictureInPicturePlayback:(BOOL)allowsPictureInPicturePlayback
> {
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     UNUSED_PARAM(allowsPictureInPicturePlayback);
> #else
>     _avPlayerViewController.get().allowsPictureInPicturePlayback = allowsPictureInPicturePlayback;
>@@ -701,7 +701,7 @@ NS_ASSUME_NONNULL_END
> 
> - (void)setDelegate:(id <AVPlayerViewControllerDelegate>)delegate
> {
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     ASSERT(!delegate || [delegate respondsToSelector:@selector(playerViewController:shouldExitFullScreenWithReason:)]);
>     _delegate = id<AVPlayerViewControllerDelegate_WebKitOnly>(delegate);
> #else
>@@ -839,7 +839,7 @@ void VideoFullscreenInterfaceAVKit::setupFullscreen(UIView& videoView, const Int
>     [CATransaction begin];
>     [CATransaction setDisableActions:YES];
> 
>-#if !ENABLE(EXTRA_ZOOM_MODE)
>+#if !PLATFORM(WATCHOS)
>     if (![[m_parentView window] _isHostedInAnotherProcess]) {
>         if (!m_window)
>             m_window = adoptNS([allocUIWindowInstance() initWithFrame:[[getUIScreenClass() mainScreen] bounds]]);
>@@ -878,7 +878,7 @@ void VideoFullscreenInterfaceAVKit::setupFullscreen(UIView& videoView, const Int
>     [m_playerViewController setAllowsPictureInPicturePlayback:m_allowsPictureInPicturePlayback];
>     [playerController() setPictureInPicturePossible:m_allowsPictureInPicturePlayback];
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     m_viewController = model()->createVideoFullscreenViewController(m_playerViewController.get().avPlayerViewController);
> #endif
> 
>@@ -1269,7 +1269,7 @@ bool VideoFullscreenInterfaceAVKit::shouldExitFullscreenWithReason(VideoFullscre
>     if (!m_watchdogTimer.isActive() && !ignoreWatchdogForDebugging)
>         m_watchdogTimer.startOneShot(defaultWatchdogTimerInterval);
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     if (m_fullscreenChangeObserver) {
>         m_waitingForPreparedToExit = true;
>         m_fullscreenChangeObserver->willExitFullscreen();
>@@ -1612,7 +1612,7 @@ void VideoFullscreenInterfaceAVKit::doSetup()
>     [CATransaction begin];
>     [CATransaction setDisableActions:YES];
> 
>-#if !ENABLE(EXTRA_ZOOM_MODE)
>+#if !PLATFORM(WATCHOS)
>     if (![[m_parentView window] _isHostedInAnotherProcess] && !m_window) {
>         if (!m_window)
>             m_window = adoptNS([allocUIWindowInstance() initWithFrame:[[getUIScreenClass() mainScreen] bounds]]);
>@@ -1652,7 +1652,7 @@ void VideoFullscreenInterfaceAVKit::doSetup()
>     [m_playerViewController setAllowsPictureInPicturePlayback:m_allowsPictureInPicturePlayback];
>     [playerController() setPictureInPicturePossible:m_allowsPictureInPicturePlayback];
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     m_viewController = model()->createVideoFullscreenViewController(m_playerViewController.get().avPlayerViewController);
> #endif
> 
>@@ -1883,7 +1883,7 @@ bool VideoFullscreenInterfaceAVKit::isPlayingVideoInEnhancedFullscreen() const
> 
> bool WebCore::supportsPictureInPicture()
> {
>-#if PLATFORM(IOS) && HAVE(AVKIT) && !ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(IOS) && HAVE(AVKIT) && !PLATFORM(WATCHOS)
>     return [getAVPictureInPictureControllerClass() isPictureInPictureSupported];
> #else
>     return false;
>diff --git a/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm b/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm
>index 99d21efabf9df4de407f233b17c4f057f18d09bd..72b8448b293fe3f4309cc7780a76f1f028f17429 100644
>--- a/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm
>+++ b/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm
>@@ -285,7 +285,7 @@ void VideoFullscreenControllerContext::didSetupFullscreen()
> 
> void VideoFullscreenControllerContext::willExitFullscreen()
> {
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     ASSERT(isUIThread());
>     WebThreadRun([protectedThis = makeRefPtr(this), this] () mutable {
>         m_fullscreenModel->willExitFullscreen();
>diff --git a/Source/WebCore/rendering/RenderThemeIOS.h b/Source/WebCore/rendering/RenderThemeIOS.h
>index 7b7ceef7448e9205bd1870a44c30fa984e41dd1e..1b43277cbf5672b9208f04a5721f99c267b959cd 100644
>--- a/Source/WebCore/rendering/RenderThemeIOS.h
>+++ b/Source/WebCore/rendering/RenderThemeIOS.h
>@@ -141,7 +141,7 @@ private:
> 
>     void purgeCaches() override;
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     String extraDefaultStyleSheet() final;
> #endif
> 
>diff --git a/Source/WebCore/rendering/RenderThemeIOS.mm b/Source/WebCore/rendering/RenderThemeIOS.mm
>index 2efbd0c5dbe01406faae3f686cf5a921a40c8d5c..d420a00690a20b7db0e6032441ea5cac7eeef6ea 100644
>--- a/Source/WebCore/rendering/RenderThemeIOS.mm
>+++ b/Source/WebCore/rendering/RenderThemeIOS.mm
>@@ -1815,7 +1815,7 @@ bool RenderThemeIOS::paintAttachment(const RenderObject& renderer, const PaintIn
> 
> #endif // ENABLE(ATTACHMENT_ELEMENT)
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
> 
> String RenderThemeIOS::extraDefaultStyleSheet()
> {
>diff --git a/Source/WebKit/Shared/WebPreferencesDefaultValues.h b/Source/WebKit/Shared/WebPreferencesDefaultValues.h
>index 6dc6f57077a8e48a20402b3d46bca1821233c02f..5ef6fcb2f7a9e6151ce5e36e59ffdcc95a9959ed 100644
>--- a/Source/WebKit/Shared/WebPreferencesDefaultValues.h
>+++ b/Source/WebKit/Shared/WebPreferencesDefaultValues.h
>@@ -139,7 +139,7 @@
> 
> #if PLATFORM(COCOA)
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
> #define DEFAULT_STANDARD_FONT_FAMILY "system-ui"
> #else
> #define DEFAULT_STANDARD_FONT_FAMILY "Times"
>@@ -170,19 +170,19 @@
> 
> #endif
> 
>-#if !ENABLE(EXTRA_ZOOM_MODE)
>+#if !PLATFORM(WATCHOS)
> #define DEFAULT_AVFOUNDATION_ENABLED true
> #else
> #define DEFAULT_AVFOUNDATION_ENABLED false
> #endif
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
> #define DEFAULT_VISUAL_VIEWPORT_HEIGHT_EXPANSION_FACTOR 1
> #else
> #define DEFAULT_VISUAL_VIEWPORT_HEIGHT_EXPANSION_FACTOR 0
> #endif
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
> #define DISABLED_ADAPTATIONS_META_TAG_ENABLED true
> #else
> #define DISABLED_ADAPTATIONS_META_TAG_ENABLED false
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>index d7bd8b0895e9e8903e5a62ecdc3081a60b3d591c..0e642a6af483a4705ed87bc0e9775e8bcc5c3c51 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>@@ -658,7 +658,7 @@ static void validate(WKWebViewConfiguration *configuration)
>     if (NSNumber *enabledValue = [[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitFastClickingDisabled"])
>         _fastClickingIsDisabled = enabledValue.boolValue;
>     else {
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>         _fastClickingIsDisabled = YES;
> #else
>         _fastClickingIsDisabled = NO;
>@@ -726,7 +726,7 @@ static void validate(WKWebViewConfiguration *configuration)
> 
> #if PLATFORM(IOS)
>     _dragInteractionPolicy = _WKDragInteractionPolicyDefault;
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     _allowsViewportShrinkToFit = YES;
> #else
>     _allowsViewportShrinkToFit = NO;
>@@ -2172,7 +2172,7 @@ static WebCore::FloatPoint constrainContentOffset(WebCore::FloatPoint contentOff
>     double currentScale = contentZoomScale(self);
>     double scale = currentScale;
>     if (allowScaling) {
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>         const CGFloat minimumMarginForZoomingToEntireFocusRectInWebViewCoordinates = 10;
>         const CGFloat maximumMarginForZoomingToEntireFocusRectInWebViewCoordinates = 35;
> 
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm
>index 14562c41709efa60c813a783624ef15c02f5e2bb..1258b42698dcb2ea3efc6c394c7d276c259828d8 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm
>@@ -174,14 +174,14 @@ static _WKDragLiftDelay toDragLiftDelay(NSUInteger value)
>     WebKit::InitializeWebKit2();
> 
> #if PLATFORM(IOS)
>-#if !ENABLE(EXTRA_ZOOM_MODE)
>+#if !PLATFORM(WATCHOS)
>     _allowsPictureInPictureMediaPlayback = YES;
> #endif
>     _allowsInlineMediaPlayback = WebCore::deviceClass() == MGDeviceClassiPad;
>     _inlineMediaPlaybackRequiresPlaysInlineAttribute = !_allowsInlineMediaPlayback;
>     _allowsInlineMediaPlaybackAfterFullscreen = !_allowsInlineMediaPlayback;
>     _mediaDataLoadsAutomatically = NO;
>-#if !ENABLE(EXTRA_ZOOM_MODE)
>+#if !PLATFORM(WATCHOS)
>     if (WebKit::linkedOnOrAfter(WebKit::SDKVersion::FirstWithMediaTypesRequiringUserActionForPlayback))
>         _mediaTypesRequiringUserActionForPlayback = WKAudiovisualMediaTypeAudio;
>     else
>@@ -231,7 +231,7 @@ static _WKDragLiftDelay toDragLiftDelay(NSUInteger value)
> #if PLATFORM(IOS)
>     _selectionGranularity = WKSelectionGranularityDynamic;
>     _dragLiftDelay = toDragLiftDelay([[NSUserDefaults standardUserDefaults] integerForKey:@"WebKitDebugDragLiftDelay"]);
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     _textInteractionGesturesEnabled = NO;
>     _longPressActionsEnabled = NO;
> #else
>diff --git a/Source/WebKit/UIProcess/WebProcessProxy.cpp b/Source/WebKit/UIProcess/WebProcessProxy.cpp
>index 77d63b2107f4d6431ccac394d5228f6344529d4a..092748b4339aefd1f721ca72ec58fc469d2f6cea 100644
>--- a/Source/WebKit/UIProcess/WebProcessProxy.cpp
>+++ b/Source/WebKit/UIProcess/WebProcessProxy.cpp
>@@ -1390,7 +1390,7 @@ void WebProcessProxy::didCheckProcessLocalPortForActivity(uint64_t callbackIdent
>     callback(isLocallyReachable ? MessagePortChannelProvider::HasActivity::Yes : MessagePortChannelProvider::HasActivity::No);
> }
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
> 
> void WebProcessProxy::takeBackgroundActivityTokenForFullscreenInput()
> {
>diff --git a/Source/WebKit/UIProcess/WebProcessProxy.h b/Source/WebKit/UIProcess/WebProcessProxy.h
>index dcfecef25ce4dc3cc77b2b5d568514bd3a3eedd3..7d63dc5b20a7f62412b11bceaf65c944e8d00c4d 100644
>--- a/Source/WebKit/UIProcess/WebProcessProxy.h
>+++ b/Source/WebKit/UIProcess/WebProcessProxy.h
>@@ -213,7 +213,7 @@ public:
>     void suspendWebPageProxy(WebPageProxy&, API::Navigation&);
>     void suspendedPageWasDestroyed(SuspendedPageProxy&);
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     void takeBackgroundActivityTokenForFullscreenInput();
>     void releaseBackgroundActivityTokenForFullscreenInput();
> #endif
>@@ -361,7 +361,7 @@ private:
>     bool m_hasCommittedAnyProvisionalLoads { false };
>     bool m_isInPrewarmedPool;
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     ProcessThrottler::BackgroundActivityToken m_backgroundActivityTokenForFullscreenFormControls;
> #endif
> };
>diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
>index f4d304eae86c5595a209f1c57ca992361a772e01..928e81b736785264ddad5a0172bc9709812ba256 100644
>--- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
>+++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
>@@ -88,7 +88,7 @@ class WebPageProxy;
> #import <WebKitAdditions/WKContentViewInteractionAdditionsBefore.h>
> #endif
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
> @class WKFocusedFormControlView;
> #endif
> 
>@@ -254,7 +254,7 @@ struct WKAutoCorrectionData {
>     RetainPtr<_UITextDragCaretView> _editDropCaretView;
> #endif
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     RetainPtr<WKFocusedFormControlView> _focusedFormControlView;
>     RetainPtr<UIViewController> _presentedFullScreenInputViewController;
>     RetainPtr<UINavigationController> _inputNavigationViewControllerForFullScreenInputs;
>diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>index a23fc2c833c1d75c8628caeefe39a7af9d85ebe0..ea1080b8dd712e007e82e275d3fe2cb5a06ae5b1 100644
>--- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>+++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>@@ -127,7 +127,7 @@
> 
> @end
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
> 
> @interface WKContentView (ExtraZoomMode) <WKFocusedFormControlViewDelegate, WKSelectMenuListViewControllerDelegate, WKTextInputListViewControllerDelegate>
> @end
>@@ -1975,7 +1975,7 @@ static void cancelPotentialTapIfNecessary(WKContentView* contentView)
>     [_textSelectionAssistant willStartScrollingOverflow];
>     _page->setIsScrollingOrZooming(true);
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     [_focusedFormControlView disengageFocusedFormControlNavigation];
> #endif
> }
>@@ -1995,7 +1995,7 @@ static void cancelPotentialTapIfNecessary(WKContentView* contentView)
>     }
>     _page->setIsScrollingOrZooming(false);
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     [_focusedFormControlView engageFocusedFormControlNavigation];
> #endif
> }
>@@ -3968,7 +3968,7 @@ static NSString *contentTypeFromFieldName(WebCore::AutofillFieldName fieldName)
>     if (self.isFirstResponder && !self.suppressAssistantSelectionView)
>         [_textSelectionAssistant activateSelection];
> 
>-#if !ENABLE(EXTRA_ZOOM_MODE)
>+#if !PLATFORM(WATCHOS)
>     [self reloadInputViews];
> #endif
> }
>@@ -4052,7 +4052,7 @@ static bool isAssistableInputType(InputType type)
>         // The default behavior is to allow node assistance if the user is interacting.
>         // We also allow node assistance if the keyboard already is showing, unless we're in extra zoom mode.
>         shouldShowKeyboard = userIsInteracting
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>             || (_isChangingFocus && ![_focusedFormControlView isHidden])
> #else
>             || _isChangingFocus
>@@ -4107,7 +4107,7 @@ static bool isAssistableInputType(InputType type)
>     if (![self isFirstResponder])
>         [self becomeFirstResponder];
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     [self addFocusedFormControlOverlay];
>     if (!_isChangingFocus)
>         [self presentViewControllerForCurrentAssistedNode];
>@@ -4133,7 +4133,7 @@ static bool isAssistableInputType(InputType type)
>     
>     [self _displayFormNodeInputView];
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     if (_isChangingFocus)
>         [_focusedFormControlView reloadData:YES];
> #endif
>@@ -4167,7 +4167,7 @@ static bool isAssistableInputType(InputType type)
>     // The name is misleading, but this actually clears the selection views and removes any selection.
>     [_webSelectionAssistant resignedFirstResponder];
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     [self dismissAllInputViewControllers:YES];
>     if (!_isChangingFocus)
>         [self removeFocusedFormControlOverlay];
>@@ -4198,13 +4198,13 @@ static bool isAssistableInputType(InputType type)
> 
> - (void)reloadContextViewForPresentedListViewController
> {
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     if ([_presentedFullScreenInputViewController isKindOfClass:[WKTextInputListViewController class]])
>         [(WKTextInputListViewController *)_presentedFullScreenInputViewController.get() reloadContextView];
> #endif
> }
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
> 
> - (void)addFocusedFormControlOverlay
> {
>@@ -4472,11 +4472,11 @@ static bool isAssistableInputType(InputType type)
>     return self.assistedNodeSelectOptions[index].isSelected;
> }
> 
>-#endif // ENABLE(EXTRA_ZOOM_MODE)
>+#endif // PLATFORM(WATCHOS)
> 
> - (void)_wheelChangedWithEvent:(UIEvent *)event
> {
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     if ([_focusedFormControlView handleWheelEvent:event])
>         return;
> #endif
>@@ -5481,7 +5481,7 @@ static NSArray<UIItemProvider *> *extractItemProvidersFromDropSession(id <UIDrop
> 
> - (void)_simulateTextEntered:(NSString *)text
> {
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     if ([_presentedFullScreenInputViewController isKindOfClass:[WKTextInputListViewController class]])
>         [(WKTextInputListViewController *)_presentedFullScreenInputViewController.get() enterText:text];
> #else
>@@ -5500,7 +5500,7 @@ static NSArray<UIItemProvider *> *extractItemProvidersFromDropSession(id <UIDrop
> 
> - (void)selectFormAccessoryPickerRow:(NSInteger)rowIndex
> {
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     if ([_presentedFullScreenInputViewController isKindOfClass:[WKSelectMenuListViewController class]])
>         [(WKSelectMenuListViewController *)_presentedFullScreenInputViewController.get() selectItemAtIndex:rowIndex];
> #else
>@@ -5519,7 +5519,7 @@ static NSArray<UIItemProvider *> *extractItemProvidersFromDropSession(id <UIDrop
> 
> - (NSString *)formInputLabel
> {
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     if (_presentedFullScreenInputViewController)
>         return [self inputLabelTextForViewController:(id)_presentedFullScreenInputViewController.get()];
> #endif
>@@ -5528,7 +5528,7 @@ static NSArray<UIItemProvider *> *extractItemProvidersFromDropSession(id <UIDrop
> 
> - (void)setTimePickerValueToHour:(NSInteger)hour minute:(NSInteger)minute
> {
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     if ([_presentedFullScreenInputViewController isKindOfClass:[WKTimePickerViewController class]])
>         [(WKTimePickerViewController *)_presentedFullScreenInputViewController.get() setHour:hour minute:minute];
> #endif
>diff --git a/Source/WebKit/UIProcess/ios/WKScrollView.mm b/Source/WebKit/UIProcess/ios/WKScrollView.mm
>index 373107bead4035a05f2eeb3bb60e6c2c32ef32eb..9a741ec8378707cc13d1a3d346b9147f2330fb87 100644
>--- a/Source/WebKit/UIProcess/ios/WKScrollView.mm
>+++ b/Source/WebKit/UIProcess/ios/WKScrollView.mm
>@@ -149,7 +149,7 @@ static BOOL shouldForwardScrollViewDelegateMethodToExternalDelegate(SEL selector
>     _contentInsetAdjustmentBehaviorWasExternallyOverridden = (self.contentInsetAdjustmentBehavior != UIScrollViewContentInsetAdjustmentAutomatic);
> #endif
>     
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     [self _configureScrollingForExtraZoomMode];
> #endif
> 
>@@ -334,7 +334,7 @@ static inline bool valuesAreWithinOnePixel(CGFloat a, CGFloat b)
> {
>     [super addGestureRecognizer:gestureRecognizer];
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     if (gestureRecognizer == self.pinchGestureRecognizer)
>         gestureRecognizer.allowedTouchTypes = @[];
> #endif
>diff --git a/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm b/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm
>index 5415ee1efad023685c2f3d1243dcb6fc4f6b66a9..2186ee8cf53347182f729cd0ef282556fb9291e7 100644
>--- a/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm
>+++ b/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm
>@@ -709,7 +709,7 @@ static NSArray *UTIsForMIMETypes(NSArray *mimeTypes)
> 
> - (BOOL)platformSupportsPickerViewController
> {
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     return NO;
> #else
>     return YES;
>diff --git a/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm b/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm
>index 5b844e351ccabe17cfddade1077a1d09ecf92f69..cf8c6fe1b0e7d72fa1b48c1d8342927b805f9b3b 100644
>--- a/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm
>+++ b/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm
>@@ -3032,7 +3032,7 @@ void WebPage::didReceivePasswordForQuickLookDocument(const String& password)
> 
> bool WebPage::platformPrefersTextLegibilityBasedZoomScaling() const
> {
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
>     return true;
> #else
>     return false;
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 574464a827f1fa70d6f6002c6dd5bdedd1008fd4..c9fabc6557a60acac9745d37947cd478f70f8b87 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-06-04  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        [WebKit on watchOS] Remove all uses of the EXTRA_ZOOM_MODE compiler flag
>+        https://bugs.webkit.org/show_bug.cgi?id=186279
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Replaces uses of ENABLE(EXTRA_ZOOM_MODE) with PLATFORM(WATCHOS).
>+
>+        * TestWebKitAPI/Tests/ios/RenderingProgressTests.mm:
>+
> 2018-06-02  Keith Miller  <keith_miller@apple.com>
> 
>         run-jsc should pass the option to use dollar vm by default
>diff --git a/Tools/TestWebKitAPI/Tests/ios/RenderingProgressTests.mm b/Tools/TestWebKitAPI/Tests/ios/RenderingProgressTests.mm
>index dcc0c3bf985af894a59f1d5fc99a46c8cd844f84..39a2ff9f33e8fcdfbe7a5b50c34f2b622f8a9aad 100644
>--- a/Tools/TestWebKitAPI/Tests/ios/RenderingProgressTests.mm
>+++ b/Tools/TestWebKitAPI/Tests/ios/RenderingProgressTests.mm
>@@ -48,7 +48,7 @@
> 
> @end
> 
>-#if ENABLE(EXTRA_ZOOM_MODE)
>+#if PLATFORM(WATCHOS)
> 
> TEST(RenderingProgressTests, FirstPaintWithSignificantArea)
> {
>@@ -71,6 +71,6 @@ TEST(RenderingProgressTests, FirstPaintWithSignificantArea)
>     TestWebKitAPI::Util::run(&observedSignificantPaint);
> }
> 
>-#endif // ENABLE(EXTRA_ZOOM_MODE)
>+#endif // PLATFORM(WATCHOS)
> 
> #endif // WK_API_ENABLED

Actions: View | Formatted Diff | Diff

Attachments on bug 186279: 341914