WebKit Bugzilla
Attachment 342355 Details for
Bug 186442
: [WebKit on watchOS] Upstream watchOS source additions to OpenSource
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for landing
bug-186442-20180608193223.patch (text/plain), 81.26 KB, created by
Wenson Hsieh
on 2018-06-08 19:32:24 PDT
(
hide
)
Description:
Patch for landing
Filename:
MIME Type:
Creator:
Wenson Hsieh
Created:
2018-06-08 19:32:24 PDT
Size:
81.26 KB
patch
obsolete
>Subversion Revision: 232658 >diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog >index 8f928fd2a4cd2f44eedc1df3f9f80cf65d2802f5..2ca6c4dc4f5cccaf0f48c31912e73b0dc2411672 100644 >--- a/Source/JavaScriptCore/ChangeLog >+++ b/Source/JavaScriptCore/ChangeLog >@@ -1,3 +1,13 @@ >+2018-06-08 Wenson Hsieh <wenson_hsieh@apple.com> >+ >+ [WebKit on watchOS] Upstream watchOS source additions to OpenSource (Part 1) >+ https://bugs.webkit.org/show_bug.cgi?id=186442 >+ <rdar://problem/40879364> >+ >+ Reviewed by Tim Horton. >+ >+ * Configurations/FeatureDefines.xcconfig: >+ > 2018-06-08 Tadeu Zagallo <tzagallo@apple.com> > > jumpTrueOrFalse only takes the fast path for boolean false on 64bit LLInt >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index 6241bc457104eee03745d07f3ae7dea7d009209a..ed51febcab4ee6f6bdb7fffdc28bc49e132871f3 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,17 @@ >+2018-06-08 Wenson Hsieh <wenson_hsieh@apple.com> >+ >+ [WebKit on watchOS] Upstream watchOS source additions to OpenSource (Part 1) >+ https://bugs.webkit.org/show_bug.cgi?id=186442 >+ <rdar://problem/40879364> >+ >+ Reviewed by Tim Horton. >+ >+ No change in behavior. >+ >+ * Configurations/FeatureDefines.xcconfig: >+ * page/DisabledAdaptations.cpp: >+ (WebCore::extraZoomModeAdaptationName): >+ > 2018-06-08 Per Arne Vollan <pvollan@apple.com> > > Only display refresh monitors having requested display refresh callback should get notified on screen updates. >diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog >index fbd744b006f66019fb4434ac64e894207b72f2d5..ffd7cbbd02a90414fe1c12ee98e7b5f2a761cd11 100644 >--- a/Source/WebCore/PAL/ChangeLog >+++ b/Source/WebCore/PAL/ChangeLog >@@ -1,3 +1,13 @@ >+2018-06-08 Wenson Hsieh <wenson_hsieh@apple.com> >+ >+ [WebKit on watchOS] Upstream watchOS source additions to OpenSource (Part 1) >+ https://bugs.webkit.org/show_bug.cgi?id=186442 >+ <rdar://problem/40879364> >+ >+ Reviewed by Tim Horton. >+ >+ * Configurations/FeatureDefines.xcconfig: >+ > 2018-06-08 Darin Adler <darin@apple.com> > > [Cocoa] Make more of our soft linking ARC-compatible >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index 5d51b7fcfdfd2e83c1f9da18029f4ec7b987602b..198d70cbf298ca02078cffa80f910e1f2346b417 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,74 @@ >+2018-06-08 Wenson Hsieh <wenson_hsieh@apple.com> >+ >+ [WebKit on watchOS] Upstream watchOS source additions to OpenSource (Part 1) >+ https://bugs.webkit.org/show_bug.cgi?id=186442 >+ <rdar://problem/40879364> >+ >+ Reviewed by Tim Horton. >+ >+ * Configurations/FeatureDefines.xcconfig: >+ * UIProcess/ios/WKContentViewInteraction.mm: >+ (-[WKContentView dismissQuickboardViewControllerAndRevealFocusedFormOverlayIfNecessary:]): >+ (-[WKContentView quickboard:textEntered:]): >+ (-[WKContentView quickboardInputCancelled:]): >+ (-[WKContentView viewController:inputContextViewHeightForSize:]): >+ (-[WKContentView allowsLanguageSelectionMenuForListViewController:]): >+ (-[WKContentView inputContextViewForViewController:]): >+ (-[WKContentView inputLabelTextForViewController:]): >+ (-[WKContentView initialValueForViewController:]): >+ (-[WKContentView shouldDisplayInputContextViewForListViewController:]): >+ (-[WKContentView numericInputModeForListViewController:]): >+ (-[WKContentView textContentTypeForListViewController:]): >+ (-[WKContentView textSuggestionsForListViewController:]): >+ (-[WKContentView listViewController:didSelectTextSuggestion:]): >+ (-[WKContentView allowsDictationInputForListViewController:]): >+ * UIProcess/ios/WKScrollView.mm: >+ (-[WKScrollView initWithFrame:]): >+ (-[WKScrollView addGestureRecognizer:]): >+ (-[WKScrollView _configureDigitalCrownScrolling]): >+ (-[WKScrollView _puic_contentOffsetForCrownInputSequencerOffset:]): >+ * UIProcess/ios/forms/WKFocusedFormControlView.h: >+ * UIProcess/ios/forms/WKFocusedFormControlView.mm: >+ (pathWithRoundedRectInFrame): >+ (-[WKFocusedFormControlView initWithFrame:delegate:]): >+ (-[WKFocusedFormControlView handleWheelEvent:]): >+ (-[WKFocusedFormControlView show:]): >+ (-[WKFocusedFormControlView hide:]): >+ (-[WKFocusedFormControlView delegate]): >+ (-[WKFocusedFormControlView setDelegate:]): >+ (-[WKFocusedFormControlView dimmingMaskLayer]): >+ (-[WKFocusedFormControlView handleTap]): >+ (-[WKFocusedFormControlView _wheelChangedWithEvent:]): >+ (-[WKFocusedFormControlView didDismiss]): >+ (-[WKFocusedFormControlView didSubmit]): >+ (-[WKFocusedFormControlView layoutSubviews]): >+ (-[WKFocusedFormControlView setHighlightedFrame:]): >+ (-[WKFocusedFormControlView computeDimmingViewCutoutPath]): >+ (-[WKFocusedFormControlView disengageFocusedFormControlNavigation]): >+ (-[WKFocusedFormControlView engageFocusedFormControlNavigation]): >+ (-[WKFocusedFormControlView reloadData:]): >+ (-[WKFocusedFormControlView setMaskLayerPosition:animated:]): >+ (-[WKFocusedFormControlView setHighlightedFrame:animated:]): >+ (-[WKFocusedFormControlView submitActionName]): >+ (submitActionNameFontAttributes): >+ (-[WKFocusedFormControlView setSubmitActionName:]): >+ (-[WKFocusedFormControlView scrollViewForCrownInputSequencer]): >+ (-[WKFocusedFormControlView updateViewForCurrentCrownInputSequencerState]): >+ (-[WKFocusedFormControlView scrollOffsetForCrownInputOffset:]): >+ (-[WKFocusedFormControlView _crownInputSequencerTimerFired]): >+ (-[WKFocusedFormControlView cancelPendingCrownInputSequencerUpdate]): >+ (-[WKFocusedFormControlView scheduleCrownInputSequencerUpdate]): >+ (-[WKFocusedFormControlView crownInputSequencerOffsetDidChange:]): >+ (-[WKFocusedFormControlView crownInputSequencerDidBecomeIdle:willDecelerate:]): >+ (-[WKFocusedFormControlView crownInputSequencerIdleDidChange:]): >+ (-[WKFocusedFormControlView suggestions]): >+ (-[WKFocusedFormControlView setSuggestions:]): >+ (-[WKFocusedFormControlView handleWebViewCredentialsSaveForWebsiteURL:user:password:passwordIsAutoGenerated:]): >+ (-[WKFocusedFormControlView selectionWillChange:]): >+ (-[WKFocusedFormControlView selectionDidChange:]): >+ (-[WKFocusedFormControlView textWillChange:]): >+ (-[WKFocusedFormControlView textDidChange:]): >+ > 2018-06-08 Per Arne Vollan <pvollan@apple.com> > > Only display refresh monitors having requested display refresh callback should get notified on screen updates. >diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog >index 2b3ae50da359b18c5ceb7f0a463aed98c47a0330..13e80ee4e5b27cf20e8c9e3b287370cc1550dd08 100644 >--- a/Source/WebKitLegacy/mac/ChangeLog >+++ b/Source/WebKitLegacy/mac/ChangeLog >@@ -1,3 +1,13 @@ >+2018-06-08 Wenson Hsieh <wenson_hsieh@apple.com> >+ >+ [WebKit on watchOS] Upstream watchOS source additions to OpenSource (Part 1) >+ https://bugs.webkit.org/show_bug.cgi?id=186442 >+ <rdar://problem/40879364> >+ >+ Reviewed by Tim Horton. >+ >+ * Configurations/FeatureDefines.xcconfig: >+ > 2018-06-08 Aditya Keerthi <akeerthi@apple.com> > > [Datalist] Allow TextFieldInputType to show and hide suggestions >diff --git a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig >index 1b9186da5f9500b6adb37fa3b7ca236e215f99c8..e34c142e21939813d49381d8eff4a44ebd7732bf 100644 >--- a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig >+++ b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig >@@ -128,8 +128,6 @@ ENABLE_ENCRYPTED_MEDIA_MACOS_SINCE_1014 = ENABLE_ENCRYPTED_MEDIA; > ENABLE_EXPERIMENTAL_FEATURES = $(ENABLE_EXPERIMENTAL_FEATURES_$(WK_RELOCATABLE_FRAMEWORKS)); > ENABLE_EXPERIMENTAL_FEATURES_YES = ENABLE_EXPERIMENTAL_FEATURES; > >-ENABLE_EXTRA_ZOOM_MODE = ; >- > ENABLE_FAST_JIT_PERMISSIONS = $(ENABLE_FAST_JIT_PERMISSIONS_$(WK_PLATFORM_NAME)); > ENABLE_FAST_JIT_PERMISSIONS_iphoneos[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSIONS_iphoneos_$(USE_INTERNAL_SDK)); > ENABLE_FAST_JIT_PERMISSIONS_iphoneos_YES = ENABLE_FAST_JIT_PERMISSIONS; >@@ -386,4 +384,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET; > > ENABLE_XSLT = ENABLE_XSLT; > >-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_EXTRA_ZOOM_MODE) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_INTL_NUMBER_FORMAT_TO_PARTS) $(ENABLE_INTL_PLURAL_RULES) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_JS_ASYNC_ITERATION) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MINIMAL_SIMULATOR) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); >+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_INTL_NUMBER_FORMAT_TO_PARTS) $(ENABLE_INTL_PLURAL_RULES) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_JS_ASYNC_ITERATION) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MINIMAL_SIMULATOR) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); >diff --git a/Source/WebCore/Configurations/FeatureDefines.xcconfig b/Source/WebCore/Configurations/FeatureDefines.xcconfig >index 1b9186da5f9500b6adb37fa3b7ca236e215f99c8..e34c142e21939813d49381d8eff4a44ebd7732bf 100644 >--- a/Source/WebCore/Configurations/FeatureDefines.xcconfig >+++ b/Source/WebCore/Configurations/FeatureDefines.xcconfig >@@ -128,8 +128,6 @@ ENABLE_ENCRYPTED_MEDIA_MACOS_SINCE_1014 = ENABLE_ENCRYPTED_MEDIA; > ENABLE_EXPERIMENTAL_FEATURES = $(ENABLE_EXPERIMENTAL_FEATURES_$(WK_RELOCATABLE_FRAMEWORKS)); > ENABLE_EXPERIMENTAL_FEATURES_YES = ENABLE_EXPERIMENTAL_FEATURES; > >-ENABLE_EXTRA_ZOOM_MODE = ; >- > ENABLE_FAST_JIT_PERMISSIONS = $(ENABLE_FAST_JIT_PERMISSIONS_$(WK_PLATFORM_NAME)); > ENABLE_FAST_JIT_PERMISSIONS_iphoneos[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSIONS_iphoneos_$(USE_INTERNAL_SDK)); > ENABLE_FAST_JIT_PERMISSIONS_iphoneos_YES = ENABLE_FAST_JIT_PERMISSIONS; >@@ -386,4 +384,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET; > > ENABLE_XSLT = ENABLE_XSLT; > >-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_EXTRA_ZOOM_MODE) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_INTL_NUMBER_FORMAT_TO_PARTS) $(ENABLE_INTL_PLURAL_RULES) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_JS_ASYNC_ITERATION) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MINIMAL_SIMULATOR) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); >+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_INTL_NUMBER_FORMAT_TO_PARTS) $(ENABLE_INTL_PLURAL_RULES) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_JS_ASYNC_ITERATION) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MINIMAL_SIMULATOR) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); >diff --git a/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig b/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig >index 1b9186da5f9500b6adb37fa3b7ca236e215f99c8..e34c142e21939813d49381d8eff4a44ebd7732bf 100644 >--- a/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig >+++ b/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig >@@ -128,8 +128,6 @@ ENABLE_ENCRYPTED_MEDIA_MACOS_SINCE_1014 = ENABLE_ENCRYPTED_MEDIA; > ENABLE_EXPERIMENTAL_FEATURES = $(ENABLE_EXPERIMENTAL_FEATURES_$(WK_RELOCATABLE_FRAMEWORKS)); > ENABLE_EXPERIMENTAL_FEATURES_YES = ENABLE_EXPERIMENTAL_FEATURES; > >-ENABLE_EXTRA_ZOOM_MODE = ; >- > ENABLE_FAST_JIT_PERMISSIONS = $(ENABLE_FAST_JIT_PERMISSIONS_$(WK_PLATFORM_NAME)); > ENABLE_FAST_JIT_PERMISSIONS_iphoneos[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSIONS_iphoneos_$(USE_INTERNAL_SDK)); > ENABLE_FAST_JIT_PERMISSIONS_iphoneos_YES = ENABLE_FAST_JIT_PERMISSIONS; >@@ -386,4 +384,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET; > > ENABLE_XSLT = ENABLE_XSLT; > >-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_EXTRA_ZOOM_MODE) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_INTL_NUMBER_FORMAT_TO_PARTS) $(ENABLE_INTL_PLURAL_RULES) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_JS_ASYNC_ITERATION) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MINIMAL_SIMULATOR) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); >+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_INTL_NUMBER_FORMAT_TO_PARTS) $(ENABLE_INTL_PLURAL_RULES) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_JS_ASYNC_ITERATION) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MINIMAL_SIMULATOR) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); >diff --git a/Source/WebCore/page/DisabledAdaptations.cpp b/Source/WebCore/page/DisabledAdaptations.cpp >index 312ee3fd3e4e945601b6f4024577a75ac502a196..71bd522a1f5ef4ba372c7c59fda49b97df5fd364 100644 >--- a/Source/WebCore/page/DisabledAdaptations.cpp >+++ b/Source/WebCore/page/DisabledAdaptations.cpp >@@ -30,17 +30,9 @@ > > namespace WebCore { > >-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/DisabledAdaptationsAdditions.cpp>) >- >-#import <WebKitAdditions/DisabledAdaptationsAdditions.cpp> >- >-#else >- > String extraZoomModeAdaptationName() > { >- return ASCIILiteral("extrazoom"); >+ return ASCIILiteral("watch"); > } > >-#endif >- > } // namespace WebCore >diff --git a/Source/WebKit/Configurations/FeatureDefines.xcconfig b/Source/WebKit/Configurations/FeatureDefines.xcconfig >index 1b9186da5f9500b6adb37fa3b7ca236e215f99c8..e34c142e21939813d49381d8eff4a44ebd7732bf 100644 >--- a/Source/WebKit/Configurations/FeatureDefines.xcconfig >+++ b/Source/WebKit/Configurations/FeatureDefines.xcconfig >@@ -128,8 +128,6 @@ ENABLE_ENCRYPTED_MEDIA_MACOS_SINCE_1014 = ENABLE_ENCRYPTED_MEDIA; > ENABLE_EXPERIMENTAL_FEATURES = $(ENABLE_EXPERIMENTAL_FEATURES_$(WK_RELOCATABLE_FRAMEWORKS)); > ENABLE_EXPERIMENTAL_FEATURES_YES = ENABLE_EXPERIMENTAL_FEATURES; > >-ENABLE_EXTRA_ZOOM_MODE = ; >- > ENABLE_FAST_JIT_PERMISSIONS = $(ENABLE_FAST_JIT_PERMISSIONS_$(WK_PLATFORM_NAME)); > ENABLE_FAST_JIT_PERMISSIONS_iphoneos[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSIONS_iphoneos_$(USE_INTERNAL_SDK)); > ENABLE_FAST_JIT_PERMISSIONS_iphoneos_YES = ENABLE_FAST_JIT_PERMISSIONS; >@@ -386,4 +384,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET; > > ENABLE_XSLT = ENABLE_XSLT; > >-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_EXTRA_ZOOM_MODE) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_INTL_NUMBER_FORMAT_TO_PARTS) $(ENABLE_INTL_PLURAL_RULES) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_JS_ASYNC_ITERATION) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MINIMAL_SIMULATOR) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); >+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_INTL_NUMBER_FORMAT_TO_PARTS) $(ENABLE_INTL_PLURAL_RULES) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_JS_ASYNC_ITERATION) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MINIMAL_SIMULATOR) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); >diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm >index d6d7f362e7960916661205adc6e3b1dfdecdc0d1..c613deb8993b3fc5761ae7ad5f5f9437873d39d7 100644 >--- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm >+++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm >@@ -5470,8 +5470,175 @@ static NSArray<UIItemProvider *> *extractItemProvidersFromDropSession(id <UIDrop > > #endif > >+#if PLATFORM(WATCHOS) >+ >+- (void)dismissQuickboardViewControllerAndRevealFocusedFormOverlayIfNecessary:(PUICQuickboardViewController *)quickboard >+{ >+ BOOL shouldRevealFocusOverlay = NO; >+ // In the case where there's nothing the user could potentially do besides dismiss the overlay, we can just automatically without asking the delegate. >+ if ([_webView._inputDelegate respondsToSelector:@selector(_webView:shouldRevealFocusOverlayForInputSession:)] >+ && ([self actionNameForFocusedFormControlView:_focusedFormControlView.get()] || _assistedNodeInformation.hasNextNode || _assistedNodeInformation.hasPreviousNode)) >+ shouldRevealFocusOverlay = [_webView._inputDelegate _webView:_webView shouldRevealFocusOverlayForInputSession:_formInputSession.get()]; >+ >+ if (shouldRevealFocusOverlay) { >+ [_focusedFormControlView show:NO]; >+ [self updateCurrentAssistedNodeInformation:[weakSelf = WeakObjCPtr<WKContentView>(self)] (bool didUpdate) { >+ if (!didUpdate) >+ return; >+ >+ auto focusedFormController = weakSelf.get()->_focusedFormControlView; >+ [focusedFormController reloadData:YES]; >+ [focusedFormController engageFocusedFormControlNavigation]; >+ }]; >+ } else >+ _page->blurAssistedNode(); >+ >+ // The Quickboard view controller passed into this delegate method is not necessarily the view controller we originally presented; >+ // this happens in the case when the user chooses an input method (e.g. scribble) and a new Quickboard view controller is presented. >+ if (quickboard != _presentedFullScreenInputViewController) >+ [quickboard dismissViewControllerAnimated:YES completion:nil]; >+ >+ [self dismissAllInputViewControllers:quickboard == _presentedFullScreenInputViewController]; >+} >+ >+#pragma mark - PUICQuickboardViewControllerDelegate >+ >+- (void)quickboard:(PUICQuickboardViewController *)quickboard textEntered:(NSAttributedString *)attributedText >+{ >+ if (attributedText) >+ _page->setTextAsync(attributedText.string); >+ >+ [self dismissQuickboardViewControllerAndRevealFocusedFormOverlayIfNecessary:quickboard]; >+} >+ >+- (void)quickboardInputCancelled:(PUICQuickboardViewController *)quickboard >+{ >+ [self dismissQuickboardViewControllerAndRevealFocusedFormOverlayIfNecessary:quickboard]; >+} >+ >+#pragma mark - WKQuickboardViewControllerDelegate >+ >+- (CGFloat)viewController:(PUICQuickboardViewController *)controller inputContextViewHeightForSize:(CGSize)size >+{ >+ id <_WKInputDelegate> delegate = _webView._inputDelegate; >+ if (![delegate respondsToSelector:@selector(_webView:focusedElementContextViewHeightForFittingSize:inputSession:)]) >+ return 0; >+ >+ return [delegate _webView:_webView focusedElementContextViewHeightForFittingSize:size inputSession:_formInputSession.get()]; >+} >+ >+- (BOOL)allowsLanguageSelectionMenuForListViewController:(PUICQuickboardViewController *)controller >+{ >+ switch (_assistedNodeInformation.elementType) { >+ case InputType::ContentEditable: >+ case InputType::Text: >+ case InputType::TextArea: >+ case InputType::Search: >+ case InputType::Email: >+ case InputType::URL: >+ return YES; >+ default: >+ return NO; >+ } >+} >+ >+- (UIView *)inputContextViewForViewController:(PUICQuickboardViewController *)controller >+{ >+ id <_WKInputDelegate> delegate = _webView._inputDelegate; >+ if (![delegate respondsToSelector:@selector(_webView:focusedElementContextViewForInputSession:)]) >+ return nil; >+ >+ return [delegate _webView:_webView focusedElementContextViewForInputSession:_formInputSession.get()]; >+} >+ >+- (NSString *)inputLabelTextForViewController:(PUICQuickboardViewController *)controller >+{ >+ if (!_assistedNodeInformation.label.isEmpty()) >+ return _assistedNodeInformation.label; >+ >+ if (!_assistedNodeInformation.ariaLabel.isEmpty()) >+ return _assistedNodeInformation.ariaLabel; >+ >+ if (!_assistedNodeInformation.title.isEmpty()) >+ return _assistedNodeInformation.title; >+ >+ return _assistedNodeInformation.placeholder; >+} >+ >+- (NSString *)initialValueForViewController:(PUICQuickboardViewController *)controller >+{ >+ return _assistedNodeInformation.value; >+} >+ >+- (BOOL)shouldDisplayInputContextViewForListViewController:(PUICQuickboardViewController *)controller >+{ >+ switch (_assistedNodeInformation.elementType) { >+ case InputType::ContentEditable: >+ case InputType::Text: >+ case InputType::Password: >+ case InputType::TextArea: >+ case InputType::Search: >+ case InputType::Email: >+ case InputType::URL: >+ case InputType::Phone: >+ return YES; >+ default: >+ return NO; >+ } >+} >+ >+#pragma mark - WKTextInputListViewControllerDelegate >+ >+- (WKNumberPadInputMode)numericInputModeForListViewController:(WKTextInputListViewController *)controller >+{ >+ switch (_assistedNodeInformation.elementType) { >+ case InputType::Phone: >+ return WKNumberPadInputModeTelephone; >+ case InputType::Number: >+ return WKNumberPadInputModeNumbersAndSymbols; >+ case InputType::NumberPad: >+ return WKNumberPadInputModeNumbersOnly; >+ default: >+ return WKNumberPadInputModeNone; >+ } >+} >+ >+- (NSString *)textContentTypeForListViewController:(WKTextInputListViewController *)controller >+{ >+ switch (_assistedNodeInformation.elementType) { >+ case InputType::Password: >+ return UITextContentTypePassword; >+ case InputType::URL: >+ return UITextContentTypeURL; >+ case InputType::Email: >+ return UITextContentTypeEmailAddress; >+ case InputType::Phone: >+ return UITextContentTypeTelephoneNumber; >+ default: >+ // The element type alone is insufficient to infer content type; fall back to autofill data. >+ return contentTypeFromFieldName(_assistedNodeInformation.autofillFieldName); >+ } >+} >+ >+- (NSArray<UITextSuggestion *> *)textSuggestionsForListViewController:(WKTextInputListViewController *)controller >+{ >+ return [_focusedFormControlView suggestions]; >+} >+ >+- (void)listViewController:(WKTextInputListViewController *)controller didSelectTextSuggestion:(UITextSuggestion *)suggestion >+{ >+ [self insertTextSuggestion:suggestion]; >+ [self dismissQuickboardViewControllerAndRevealFocusedFormOverlayIfNecessary:controller]; >+} >+ >+- (BOOL)allowsDictationInputForListViewController:(PUICQuickboardViewController *)controller >+{ >+ return _assistedNodeInformation.elementType != InputType::Password; >+} >+ >+#endif // PLATFORM(WATCHOS) >+ > #if USE(APPLE_INTERNAL_SDK) >-#import <WebKitAdditions/WKContentViewInteractionAdditions.mm> > #import <WebKitAdditions/WKContentViewInteractionAdditionsAfter.mm> > #endif > >diff --git a/Source/WebKit/UIProcess/ios/WKScrollView.mm b/Source/WebKit/UIProcess/ios/WKScrollView.mm >index 9a741ec8378707cc13d1a3d346b9147f2330fb87..cdcc05ad6578cdb6ed8d362f800648c2ddeeaef7 100644 >--- a/Source/WebKit/UIProcess/ios/WKScrollView.mm >+++ b/Source/WebKit/UIProcess/ios/WKScrollView.mm >@@ -32,12 +32,12 @@ > #import <pal/spi/cg/CoreGraphicsSPI.h> > #import <wtf/WeakObjCPtr.h> > >-using namespace WebKit; >- >-#if USE(APPLE_INTERNAL_SDK) >-#import <WebKitAdditions/WKScrollViewAdditionsBefore.mm> >+#if PLATFORM(WATCHOS) >+#import <PepperUICore/UIScrollView+PUICAdditionsPrivate.h> > #endif > >+using namespace WebKit; >+ > @interface UIScrollView (UIScrollViewInternalHack) > - (CGFloat)_rubberBandOffsetForOffset:(CGFloat)newOffset maxOffset:(CGFloat)maxOffset minOffset:(CGFloat)minOffset range:(CGFloat)range outside:(BOOL *)outside; > @end >@@ -150,7 +150,7 @@ static BOOL shouldForwardScrollViewDelegateMethodToExternalDelegate(SEL selector > #endif > > #if PLATFORM(WATCHOS) >- [self _configureScrollingForExtraZoomMode]; >+ [self _configureDigitalCrownScrolling]; > #endif > > return self; >@@ -330,18 +330,33 @@ static inline bool valuesAreWithinOnePixel(CGFloat a, CGFloat b) > [self _restoreContentOffsetWithRubberbandAmount:rubberbandAmount]; > } > >+#if PLATFORM(WATCHOS) >+ > - (void)addGestureRecognizer:(UIGestureRecognizer *)gestureRecognizer > { > [super addGestureRecognizer:gestureRecognizer]; > >-#if PLATFORM(WATCHOS) > if (gestureRecognizer == self.pinchGestureRecognizer) > gestureRecognizer.allowedTouchTypes = @[]; >-#endif > } > >-#if USE(APPLE_INTERNAL_SDK) >-#import <WebKitAdditions/WKScrollViewAdditionsAfter.mm> >+- (void)_configureDigitalCrownScrolling >+{ >+ self.showsVerticalScrollIndicator = NO; >+ self.crownInputScrollDirection = PUICCrownInputScrollDirectionVertical; >+} >+ >+- (CGPoint)_puic_contentOffsetForCrownInputSequencerOffset:(double)sequencerOffset >+{ >+ CGPoint targetOffset = [super _puic_contentOffsetForCrownInputSequencerOffset:sequencerOffset]; >+ auto scrollDirection = self.puic_crownInputScrollDirection; >+ if (scrollDirection == PUICCrownInputScrollDirectionVertical) >+ targetOffset.x = self.contentOffset.x; >+ else if (scrollDirection == PUICCrownInputScrollDirectionHorizontal) >+ targetOffset.y = self.contentOffset.y; >+ return targetOffset; >+} >+ > #endif > > @end >diff --git a/Source/WebKit/UIProcess/ios/forms/WKFocusedFormControlView.h b/Source/WebKit/UIProcess/ios/forms/WKFocusedFormControlView.h >index 952ef92954311e0ac0576c704d94cfa3a74e1996..437c392ae924565619abf191ef84828481696f89 100644 >--- a/Source/WebKit/UIProcess/ios/forms/WKFocusedFormControlView.h >+++ b/Source/WebKit/UIProcess/ios/forms/WKFocusedFormControlView.h >@@ -25,6 +25,51 @@ > > #pragma once > >-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WKFocusedFormControlViewAdditions.h>) >-#import <WebKitAdditions/WKFocusedFormControlViewAdditions.h> >+#if PLATFORM(WATCHOS) >+ >+#import "UIKitSPI.h" >+ >+@class WKFocusedFormControlView; >+ >+@protocol WKFocusedFormControlViewDelegate <NSObject> >+ >+- (void)focusedFormControlViewDidSubmit:(WKFocusedFormControlView *)view; >+- (void)focusedFormControlViewDidCancel:(WKFocusedFormControlView *)view; >+- (void)focusedFormControlViewDidBeginEditing:(WKFocusedFormControlView *)view; >+- (CGRect)rectForFocusedFormControlView:(WKFocusedFormControlView *)view; >+- (NSString *)actionNameForFocusedFormControlView:(WKFocusedFormControlView *)view; >+ >+// Support for focusing upstream and downstream nodes. >+- (void)focusedFormControlViewDidRequestNextNode:(WKFocusedFormControlView *)view; >+- (void)focusedFormControlViewDidRequestPreviousNode:(WKFocusedFormControlView *)view; >+- (BOOL)hasNextNodeForFocusedFormControlView:(WKFocusedFormControlView *)view; >+- (BOOL)hasPreviousNodeForFocusedFormControlView:(WKFocusedFormControlView *)view; >+- (CGRect)nextRectForFocusedFormControlView:(WKFocusedFormControlView *)view; >+- (CGRect)previousRectForFocusedFormControlView:(WKFocusedFormControlView *)view; >+- (UIScrollView *)scrollViewForFocusedFormControlView:(WKFocusedFormControlView *)view; >+ >+- (void)focusedFormControllerDidUpdateSuggestions:(WKFocusedFormControlView *)view; >+@end >+ >+@interface WKFocusedFormControlView : UIView <UITextInputSuggestionDelegate> >+ >+- (instancetype)initWithFrame:(CGRect)frame delegate:(id <WKFocusedFormControlViewDelegate>)delegate; >+- (instancetype)initWithCoder:(NSCoder *)aDecoder NS_UNAVAILABLE; >+- (instancetype)initWithFrame:(CGRect)frame NS_UNAVAILABLE; >+ >+- (void)reloadData:(BOOL)animated; >+- (void)show:(BOOL)animated; >+- (void)hide:(BOOL)animated; >+ >+- (void)engageFocusedFormControlNavigation; >+- (void)disengageFocusedFormControlNavigation; >+ >+- (BOOL)handleWheelEvent:(UIEvent *)event; >+ >+@property (nonatomic, weak) id <WKFocusedFormControlViewDelegate> delegate; >+@property (nonatomic, readonly, getter=isVisible) BOOL visible; >+@property (nonatomic, copy) NSArray<UITextSuggestion *> *suggestions; >+ >+@end >+ > #endif >diff --git a/Source/WebKit/UIProcess/ios/forms/WKFocusedFormControlView.mm b/Source/WebKit/UIProcess/ios/forms/WKFocusedFormControlView.mm >index 7f1740b407d51e0413339b37e33cb816c8ae8bd9..26b01d49528fb7686d74a04264e85fea06dfb4cf 100644 >--- a/Source/WebKit/UIProcess/ios/forms/WKFocusedFormControlView.mm >+++ b/Source/WebKit/UIProcess/ios/forms/WKFocusedFormControlView.mm >@@ -26,6 +26,469 @@ > #include "config.h" > #include "WKFocusedFormControlView.h" > >-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WKFocusedFormControlViewAdditions.mm>) >-#import <WebKitAdditions/WKFocusedFormControlViewAdditions.mm> >-#endif >+#if PLATFORM(WATCHOS) >+ >+asm(".linker_option \"-framework\", \"PepperUICore\""); >+ >+#import <PepperUICore/PUICCrownInputSequencer.h> >+#import <PepperUICore/PUICCrownInputSequencer_Private.h> >+#import <WebCore/LocalizedStrings.h> >+#import <WebCore/WebCoreCALayerExtras.h> >+#import <wtf/NeverDestroyed.h> >+#import <wtf/RetainPtr.h> >+#import <wtf/WeakObjCPtr.h> >+#import <wtf/text/WTFString.h> >+ >+static const NSTimeInterval formControlViewAnimationDuration = 0.25; >+static const CGFloat focusedRectDimmingViewAlpha = 0.8; >+static const CGFloat focusedRectDimmingViewCornerRadius = 6; >+static const CGFloat focusedRectExpandedHitTestMargin = 15; >+static const CGFloat submitButtonHeight = 24; >+ >+static const NSTimeInterval dimmingViewAnimationDuration = 0.25; >+// Determines the rate at which digital crown scrolling drives animations in the focus overlay. >+static const CGFloat digitalCrownPointsPerUnit = 20; >+static const CGFloat digitalCrownInactiveScrollDistancePerUnit = 4; >+static const CGFloat digitalCrownActiveScrollDistancePerUnit = 8; >+static const CGFloat digitalCrownMaximumScrollDistance = 12; >+ >+static UIBezierPath *pathWithRoundedRectInFrame(CGRect rect, CGFloat borderRadius, CGRect frame) >+{ >+ UIBezierPath *path = [UIBezierPath bezierPathWithRoundedRect:rect cornerRadius:borderRadius]; >+ [path appendPath:[UIBezierPath bezierPathWithRect:frame]]; >+ return path; >+} >+ >+@interface WKFocusedFormControlView () <PUICCrownInputSequencerDelegate> >+@property (nonatomic, readonly) CAShapeLayer *dimmingMaskLayer; >+@property (nonatomic) CGRect previousHighlightedFrame; >+@property (nonatomic) CGRect nextHighlightedFrame; >+@property (nonatomic) CGRect highlightedFrame; >+@property (nonatomic, copy) NSString *submitActionName; >+@property (nonatomic) BOOL hasNextNode; >+@property (nonatomic) BOOL hasPreviousNode; >+@end >+ >+@implementation WKFocusedFormControlView { >+ RetainPtr<UIView> _dimmingView; >+ RetainPtr<UIButton> _submitButton; >+ RetainPtr<UIButton> _dismissButton; >+ RetainPtr<UIView> _submitButtonBackgroundView; >+ RetainPtr<UITapGestureRecognizer> _tapGestureRecognizer; >+ RetainPtr<NSArray<UITextSuggestion *>> _textSuggestions; >+ WeakObjCPtr<id <WKFocusedFormControlViewDelegate>> _delegate; >+ RetainPtr<NSString> _submitActionName; >+ RetainPtr<PUICCrownInputSequencer> _crownInputSequencer; >+ std::optional<CGPoint> _initialScrollViewContentOffset; >+ BOOL _hasPendingFocusRequest; >+} >+ >+- (instancetype)initWithFrame:(CGRect)frame delegate:(id <WKFocusedFormControlViewDelegate>)delegate >+{ >+ if (!(self = [super initWithFrame:frame])) >+ return nil; >+ >+ _delegate = delegate; >+ _highlightedFrame = CGRectZero; >+ >+ _dimmingView = adoptNS([[UIView alloc] init]); >+ [_dimmingView setOpaque:NO]; >+ [_dimmingView setBackgroundColor:[UIColor colorWithWhite:0 alpha:focusedRectDimmingViewAlpha]]; >+ auto maskLayer = adoptNS([[CAShapeLayer alloc] init]); >+ [maskLayer setBackgroundColor:[UIColor blackColor].CGColor]; >+ [maskLayer setFillRule:kCAFillRuleEvenOdd]; >+ [_dimmingView layer].mask = maskLayer.get(); >+ [maskLayer web_disableAllActions]; >+ >+ // FIXME: If we decide to turn on the focused form control overlay by default, we will need to move the submit and dismiss >+ // buttons to the status bar. See <rdar://problem/39264218>. >+ _submitButton = [UIButton buttonWithType:UIButtonTypeSystem]; >+ [_submitButton addTarget:self action:@selector(didSubmit) forControlEvents:UIControlEventTouchUpInside]; >+ >+ _dismissButton = [UIButton buttonWithType:UIButtonTypeSystem]; >+ [_dismissButton addTarget:self action:@selector(didDismiss) forControlEvents:UIControlEventTouchUpInside]; >+ [_dismissButton setTitle:WebCore::formControlHideButtonTitle() forState:UIControlStateNormal]; >+ [_dismissButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; >+ >+ _tapGestureRecognizer = adoptNS([[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTap)]); >+ [_tapGestureRecognizer setNumberOfTapsRequired:1]; >+ >+ self.opaque = NO; >+ self.layer.masksToBounds = YES; >+ [self addGestureRecognizer:_tapGestureRecognizer.get()]; >+ >+ _submitButtonBackgroundView = adoptNS([[UIView alloc] init]); >+ [_submitButtonBackgroundView setOpaque:YES]; >+ [_submitButtonBackgroundView setBackgroundColor:[UIColor blackColor]]; >+ >+ [_submitButtonBackgroundView addSubview:_dismissButton.get()]; >+ [_submitButtonBackgroundView addSubview:_submitButton.get()]; >+ [self addSubview:_dimmingView.get()]; >+ [self addSubview:_submitButtonBackgroundView.get()]; >+ >+ _hasPendingFocusRequest = NO; >+ _initialScrollViewContentOffset = std::nullopt; >+ >+ return self; >+} >+ >+- (BOOL)handleWheelEvent:(UIEvent *)event >+{ >+ [self _wheelChangedWithEvent:event]; >+ return YES; >+} >+ >+- (void)show:(BOOL)animated >+{ >+ if (!self.hidden) >+ return; >+ >+ self.hidden = NO; >+ >+ auto fadeInViewBlock = [view = retainPtr(self)] { >+ [view setAlpha:1]; >+ }; >+ >+ if (animated) >+ [UIView animateWithDuration:formControlViewAnimationDuration delay:0 options:UIViewAnimationOptionBeginFromCurrentState animations:fadeInViewBlock completion:nil]; >+ else >+ fadeInViewBlock(); >+} >+ >+- (void)hide:(BOOL)animated >+{ >+ if (self.hidden) >+ return; >+ >+ if (!animated) { >+ self.alpha = 0; >+ self.hidden = YES; >+ return; >+ } >+ >+ [UIView animateWithDuration:formControlViewAnimationDuration delay:0 options:UIViewAnimationOptionBeginFromCurrentState animations:[view = retainPtr(self)] { >+ [view setAlpha:0]; >+ } completion:[view = retainPtr(self)] (BOOL finished) >+ { >+ if (finished) >+ [view setHidden:YES]; >+ }]; >+} >+ >+- (id <WKFocusedFormControlViewDelegate>)delegate >+{ >+ return _delegate.get().get(); >+} >+ >+- (void)setDelegate:(id <WKFocusedFormControlViewDelegate>)delegate >+{ >+ _delegate = delegate; >+} >+ >+- (CAShapeLayer *)dimmingMaskLayer >+{ >+ return (CAShapeLayer *)[_dimmingView layer].mask; >+} >+ >+- (void)handleTap >+{ >+ if (CGRectContainsPoint(CGRectInset(_highlightedFrame, -focusedRectExpandedHitTestMargin, -focusedRectExpandedHitTestMargin), [_tapGestureRecognizer location])) { >+ [_delegate focusedFormControlViewDidBeginEditing:self]; >+ return; >+ } >+ >+ [self didDismiss]; >+} >+ >+- (void)_wheelChangedWithEvent:(UIEvent *)event >+{ >+ [super _wheelChangedWithEvent:event]; >+ >+ if ([_crownInputSequencer delegate] == self) >+ [_crownInputSequencer updateWithCrownInputEvent:event]; >+} >+ >+- (void)didDismiss >+{ >+ [_delegate focusedFormControlViewDidCancel:self]; >+} >+ >+- (void)didSubmit >+{ >+ [_delegate focusedFormControlViewDidSubmit:self]; >+} >+ >+- (void)layoutSubviews >+{ >+ [super layoutSubviews]; >+ >+ CGRect viewBounds = self.bounds; >+ [_dimmingView setFrame:UIRectInsetEdges(viewBounds, UIRectEdgeAll, -digitalCrownMaximumScrollDistance)]; >+ [_dismissButton sizeToFit]; >+ [_dismissButton setFrame:CGRect { CGPointMake(0, 0), [_dismissButton size] }]; >+ [_submitButton sizeToFit]; >+ [_submitButton setFrame:CGRect { CGPointMake(CGRectGetWidth(viewBounds) - CGRectGetWidth([_submitButton bounds]), 0), [_submitButton size] }]; >+ [_submitButtonBackgroundView setFrame:CGRectMake(0, 0, CGRectGetWidth(viewBounds), submitButtonHeight)]; >+} >+ >+- (void)setHighlightedFrame:(CGRect)highlightedFrame >+{ >+ [self setHighlightedFrame:highlightedFrame animated:NO]; >+} >+ >+- (UIBezierPath *)computeDimmingViewCutoutPath >+{ >+ if (CGRectIsEmpty(_highlightedFrame)) >+ return nil; >+ >+ CGRect inflatedHighlightFrame = UIRectInsetEdges(_highlightedFrame, UIRectEdgeAll, -focusedRectDimmingViewCornerRadius); >+ return pathWithRoundedRectInFrame([self convertRect:inflatedHighlightFrame toView:_dimmingView.get()], focusedRectDimmingViewCornerRadius, [_dimmingView bounds]); >+} >+ >+- (void)disengageFocusedFormControlNavigation >+{ >+ [self cancelPendingCrownInputSequencerUpdate]; >+ [_crownInputSequencer stopVelocityTrackingAndDecelerationImmediately]; >+ [_crownInputSequencer setOffset:0]; >+ [_crownInputSequencer setDelegate:nil]; >+} >+ >+- (void)engageFocusedFormControlNavigation >+{ >+ if (!_crownInputSequencer) { >+ _crownInputSequencer = adoptNS([[PUICCrownInputSequencer alloc] init]); >+ [_crownInputSequencer setRubberBandingEnabled:YES]; >+ [_crownInputSequencer setUseWideIdleCheck:YES]; >+ [_crownInputSequencer setStart:-1]; >+ [_crownInputSequencer setEnd:1]; >+ [_crownInputSequencer setScreenSpaceMultiplier:digitalCrownPointsPerUnit]; >+ } >+ >+ _initialScrollViewContentOffset = self.scrollViewForCrownInputSequencer.contentOffset; >+ [_crownInputSequencer stopVelocityTrackingAndDecelerationImmediately]; >+ [_crownInputSequencer setOffset:0]; >+ [_crownInputSequencer setDelegate:self]; >+} >+ >+- (void)reloadData:(BOOL)animated >+{ >+ [self setPreviousHighlightedFrame:[_delegate previousRectForFocusedFormControlView:self]]; >+ [self setNextHighlightedFrame:[_delegate nextRectForFocusedFormControlView:self]]; >+ [self setHighlightedFrame:[_delegate rectForFocusedFormControlView:self] animated:animated]; >+ self.submitActionName = [_delegate actionNameForFocusedFormControlView:self]; >+ self.hasNextNode = [_delegate hasNextNodeForFocusedFormControlView:self]; >+ self.hasPreviousNode = [_delegate hasPreviousNodeForFocusedFormControlView:self]; >+ [self setMaskLayerPosition:CGPointZero animated:animated]; >+ >+ _hasPendingFocusRequest = NO; >+} >+ >+- (void)setMaskLayerPosition:(CGPoint)position animated:(BOOL)animated >+{ >+ if (animated) { >+ CABasicAnimation *maskAnimation = [CABasicAnimation animationWithKeyPath:@"position"]; >+ maskAnimation.fromValue = [NSValue valueWithCGPoint:self.dimmingMaskLayer.position]; >+ maskAnimation.toValue = [NSValue valueWithCGPoint:position]; >+ maskAnimation.duration = dimmingViewAnimationDuration; >+ maskAnimation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; >+ [self.dimmingMaskLayer addAnimation:maskAnimation forKey:nil]; >+ } >+ self.dimmingMaskLayer.position = position; >+} >+ >+- (void)setHighlightedFrame:(CGRect)highlightedFrame animated:(BOOL)animated >+{ >+ if (CGRectEqualToRect(_highlightedFrame, highlightedFrame)) >+ return; >+ >+ _highlightedFrame = highlightedFrame; >+ >+ UIBezierPath *updatedCutoutPath = [self computeDimmingViewCutoutPath]; >+ if (!animated || !self.dimmingMaskLayer.path || !updatedCutoutPath) { >+ self.dimmingMaskLayer.path = updatedCutoutPath.CGPath; >+ return; >+ } >+ >+ CABasicAnimation *maskAnimation = [CABasicAnimation animationWithKeyPath:@"path"]; >+ maskAnimation.fromValue = (__bridge UIBezierPath *)self.dimmingMaskLayer.path; >+ maskAnimation.toValue = updatedCutoutPath; >+ maskAnimation.duration = dimmingViewAnimationDuration; >+ maskAnimation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; >+ [self.dimmingMaskLayer addAnimation:maskAnimation forKey:nil]; >+ self.dimmingMaskLayer.path = updatedCutoutPath.CGPath; >+} >+ >+- (NSString *)submitActionName >+{ >+ return _submitActionName.get(); >+} >+ >+static NSDictionary *submitActionNameFontAttributes() >+{ >+ return @{ NSFontAttributeName: [UIFont boldSystemFontOfSize:15] }; >+} >+ >+- (void)setSubmitActionName:(NSString *)submitActionName >+{ >+ if (_submitActionName == submitActionName || [_submitActionName isEqualToString:submitActionName]) >+ return; >+ >+ _submitActionName = adoptNS(submitActionName.copy); >+ >+ if (submitActionName.length) { >+ auto boldTitle = adoptNS([[NSAttributedString alloc] initWithString:submitActionName attributes:submitActionNameFontAttributes()]); >+ [_submitButton setAttributedTitle:boldTitle.get() forState:UIControlStateNormal]; >+ } else >+ [_submitButton setAttributedTitle:nil forState:UIControlStateNormal]; >+ >+ [self setNeedsLayout]; >+} >+ >+- (UIScrollView *)scrollViewForCrownInputSequencer >+{ >+ return [_delegate scrollViewForFocusedFormControlView:self]; >+} >+ >+- (void)updateViewForCurrentCrownInputSequencerState >+{ >+ if (!_initialScrollViewContentOffset) >+ return; >+ >+ CGFloat crownOffset = [_crownInputSequencer offset]; >+ UIScrollView *scrollView = self.scrollViewForCrownInputSequencer; >+ CGPoint targetContentOffset = [self scrollOffsetForCrownInputOffset:crownOffset]; >+ scrollView.contentOffset = targetContentOffset; >+ self.dimmingMaskLayer.position = CGPointMake(_initialScrollViewContentOffset->x - targetContentOffset.x, _initialScrollViewContentOffset->y - targetContentOffset.y); >+ >+ if (_hasPendingFocusRequest) >+ return; >+ >+ if (crownOffset > 1 && self.hasNextNode) { >+ [_delegate focusedFormControlViewDidRequestNextNode:self]; >+ _hasPendingFocusRequest = YES; >+ } >+ >+ if (crownOffset < -1 && self.hasPreviousNode) { >+ [_delegate focusedFormControlViewDidRequestPreviousNode:self]; >+ _hasPendingFocusRequest = YES; >+ } >+} >+ >+- (CGPoint)scrollOffsetForCrownInputOffset:(CGFloat)crownOffset >+{ >+ ASSERT(_initialScrollViewContentOffset); >+ if (!crownOffset) >+ return *_initialScrollViewContentOffset; >+ >+ CGPoint highlightedFrameMidpoint { CGRectGetMidX(_highlightedFrame), CGRectGetMidY(_highlightedFrame) }; >+ CGVector unitVectorToTarget = CGVectorMake(0, crownOffset < 0 ? -1 : 1); >+ CGFloat targetHighlightedFrameDeltaX = 0; >+ CGFloat targetHighlightedFrameDeltaY = 0; >+ BOOL isMovingTowardsNextOrPreviousNode = NO; >+ if (crownOffset < 0 && self.hasPreviousNode) { >+ targetHighlightedFrameDeltaX = CGRectGetMidX(_previousHighlightedFrame) - highlightedFrameMidpoint.x; >+ targetHighlightedFrameDeltaY = CGRectGetMidY(_previousHighlightedFrame) - highlightedFrameMidpoint.y; >+ isMovingTowardsNextOrPreviousNode = YES; >+ } else if (crownOffset > 0 && self.hasNextNode) { >+ targetHighlightedFrameDeltaX = CGRectGetMidX(_nextHighlightedFrame) - highlightedFrameMidpoint.x; >+ targetHighlightedFrameDeltaY = CGRectGetMidY(_nextHighlightedFrame) - highlightedFrameMidpoint.y; >+ isMovingTowardsNextOrPreviousNode = YES; >+ } >+ >+ if (targetHighlightedFrameDeltaX || targetHighlightedFrameDeltaY) { >+ CGFloat distanceToTarget = std::sqrt(targetHighlightedFrameDeltaX * targetHighlightedFrameDeltaX + targetHighlightedFrameDeltaY * targetHighlightedFrameDeltaY); >+ unitVectorToTarget = CGVector { targetHighlightedFrameDeltaX / distanceToTarget, targetHighlightedFrameDeltaY / distanceToTarget }; >+ } >+ >+ CGFloat distancePerUnit = isMovingTowardsNextOrPreviousNode ? digitalCrownActiveScrollDistancePerUnit : digitalCrownInactiveScrollDistancePerUnit; >+ CGFloat absoluteClampedCrownOffset = std::min<CGFloat>(digitalCrownMaximumScrollDistance / distancePerUnit, ABS(crownOffset)); >+ return { >+ _initialScrollViewContentOffset->x + distancePerUnit * unitVectorToTarget.dx * absoluteClampedCrownOffset, >+ _initialScrollViewContentOffset->y + distancePerUnit * unitVectorToTarget.dy * absoluteClampedCrownOffset >+ }; >+} >+ >+- (void)_crownInputSequencerTimerFired >+{ >+ CGFloat currentCrownInputSequencerOffset = [_crownInputSequencer offset]; >+ if (ABS(currentCrownInputSequencerOffset) < 0.01) { >+ [_crownInputSequencer setOffset:0]; >+ [self updateViewForCurrentCrownInputSequencerState]; >+ return; >+ } >+ >+ [_crownInputSequencer setOffset:0.75 * currentCrownInputSequencerOffset]; >+ [self updateViewForCurrentCrownInputSequencerState]; >+ [self scheduleCrownInputSequencerUpdate]; >+} >+ >+- (void)cancelPendingCrownInputSequencerUpdate >+{ >+ [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(_crownInputSequencerTimerFired) object:nil]; >+} >+ >+- (void)scheduleCrownInputSequencerUpdate >+{ >+ [self performSelector:@selector(_crownInputSequencerTimerFired) withObject:nil afterDelay:1 / 60.]; >+} >+ >+#pragma mark - PUICCrownInputSequencerDelegate >+ >+- (void)crownInputSequencerOffsetDidChange:(PUICCrownInputSequencer *)crownInputSequencer >+{ >+ [self updateViewForCurrentCrownInputSequencerState]; >+} >+ >+- (void)crownInputSequencerDidBecomeIdle:(PUICCrownInputSequencer *)crownInputSequencer willDecelerate:(BOOL)willDecelerate >+{ >+ [_crownInputSequencer stopVelocityTrackingAndDecelerationImmediately]; >+ [self scheduleCrownInputSequencerUpdate]; >+} >+ >+- (void)crownInputSequencerIdleDidChange:(PUICCrownInputSequencer *)crownInputSequencer >+{ >+ if (!crownInputSequencer.idle) >+ [self cancelPendingCrownInputSequencerUpdate]; >+} >+ >+#pragma mark - UITextInputSuggestionDelegate >+ >+// FIXME: Move text suggestion state out of the focus form overlay and into the content view or input session. >+// This class should only be concerned about the focused form overlay. >+- (NSArray<UITextSuggestion *> *)suggestions >+{ >+ return _textSuggestions.get(); >+} >+ >+- (void)setSuggestions:(NSArray<UITextSuggestion *> *)suggestions >+{ >+ if (_textSuggestions == suggestions || [_textSuggestions isEqualToArray:suggestions]) >+ return; >+ >+ _textSuggestions = adoptNS(suggestions.copy); >+ [_delegate focusedFormControllerDidUpdateSuggestions:self]; >+} >+ >+- (void)handleWebViewCredentialsSaveForWebsiteURL:(NSURL *)websiteURL user:(NSString *)user password:(NSString *)password passwordIsAutoGenerated:(BOOL)passwordIsAutoGenerated >+{ >+} >+ >+- (void)selectionWillChange:(id <UITextInput>)textInput >+{ >+} >+ >+- (void)selectionDidChange:(id <UITextInput>)textInput >+{ >+} >+ >+- (void)textWillChange:(id <UITextInput>)textInput >+{ >+} >+ >+- (void)textDidChange:(id <UITextInput>)textInput >+{ >+} >+ >+@end >+ >+#endif // PLATFORM(WATCHOS) >diff --git a/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig b/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig >index 1b9186da5f9500b6adb37fa3b7ca236e215f99c8..e34c142e21939813d49381d8eff4a44ebd7732bf 100644 >--- a/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig >+++ b/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig >@@ -128,8 +128,6 @@ ENABLE_ENCRYPTED_MEDIA_MACOS_SINCE_1014 = ENABLE_ENCRYPTED_MEDIA; > ENABLE_EXPERIMENTAL_FEATURES = $(ENABLE_EXPERIMENTAL_FEATURES_$(WK_RELOCATABLE_FRAMEWORKS)); > ENABLE_EXPERIMENTAL_FEATURES_YES = ENABLE_EXPERIMENTAL_FEATURES; > >-ENABLE_EXTRA_ZOOM_MODE = ; >- > ENABLE_FAST_JIT_PERMISSIONS = $(ENABLE_FAST_JIT_PERMISSIONS_$(WK_PLATFORM_NAME)); > ENABLE_FAST_JIT_PERMISSIONS_iphoneos[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSIONS_iphoneos_$(USE_INTERNAL_SDK)); > ENABLE_FAST_JIT_PERMISSIONS_iphoneos_YES = ENABLE_FAST_JIT_PERMISSIONS; >@@ -386,4 +384,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET; > > ENABLE_XSLT = ENABLE_XSLT; > >-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_EXTRA_ZOOM_MODE) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_INTL_NUMBER_FORMAT_TO_PARTS) $(ENABLE_INTL_PLURAL_RULES) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_JS_ASYNC_ITERATION) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MINIMAL_SIMULATOR) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); >+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_INTL_NUMBER_FORMAT_TO_PARTS) $(ENABLE_INTL_PLURAL_RULES) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_JS_ASYNC_ITERATION) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MINIMAL_SIMULATOR) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index 14b806ec9f3d3537ccc3d3e4105cd568878fd846..46aa07cbb4188091d0e6c0a9231e715c548db4cc 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,13 @@ >+2018-06-08 Wenson Hsieh <wenson_hsieh@apple.com> >+ >+ [WebKit on watchOS] Upstream watchOS source additions to OpenSource (Part 1) >+ https://bugs.webkit.org/show_bug.cgi?id=186442 >+ <rdar://problem/40879364> >+ >+ Reviewed by Tim Horton. >+ >+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig: >+ > 2018-06-08 Alicia Boya GarcÃa <aboya@igalia.com> > > [GTK] Update to libva-2.1.0 in jhbuild >diff --git a/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig b/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig >index 1b9186da5f9500b6adb37fa3b7ca236e215f99c8..e34c142e21939813d49381d8eff4a44ebd7732bf 100644 >--- a/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig >+++ b/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig >@@ -128,8 +128,6 @@ ENABLE_ENCRYPTED_MEDIA_MACOS_SINCE_1014 = ENABLE_ENCRYPTED_MEDIA; > ENABLE_EXPERIMENTAL_FEATURES = $(ENABLE_EXPERIMENTAL_FEATURES_$(WK_RELOCATABLE_FRAMEWORKS)); > ENABLE_EXPERIMENTAL_FEATURES_YES = ENABLE_EXPERIMENTAL_FEATURES; > >-ENABLE_EXTRA_ZOOM_MODE = ; >- > ENABLE_FAST_JIT_PERMISSIONS = $(ENABLE_FAST_JIT_PERMISSIONS_$(WK_PLATFORM_NAME)); > ENABLE_FAST_JIT_PERMISSIONS_iphoneos[arch=arm64*] = $(ENABLE_FAST_JIT_PERMISSIONS_iphoneos_$(USE_INTERNAL_SDK)); > ENABLE_FAST_JIT_PERMISSIONS_iphoneos_YES = ENABLE_FAST_JIT_PERMISSIONS; >@@ -386,4 +384,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET; > > ENABLE_XSLT = ENABLE_XSLT; > >-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_EXTRA_ZOOM_MODE) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_INTL_NUMBER_FORMAT_TO_PARTS) $(ENABLE_INTL_PLURAL_RULES) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_JS_ASYNC_ITERATION) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MINIMAL_SIMULATOR) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT); >+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_INTL_NUMBER_FORMAT_TO_PARTS) $(ENABLE_INTL_PLURAL_RULES) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_JS_ASYNC_ITERATION) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MINIMAL_SIMULATOR) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 186442
:
342317
| 342355 |
342357
|
342570
|
342581
|
342908