Title: [250829] branches/safari-608.3.10.0-branch/Source/WebKit
- Revision
- 250829
- Author
- alanc...@apple.com
- Date
- 2019-10-08 09:00:04 -0700 (Tue, 08 Oct 2019)
Log Message
Cherry-pick r250755. rdar://problem/56061130
Use a better name than allowFastClicksEverywhere
https://bugs.webkit.org/show_bug.cgi?id=202607
<rdar://problem/55997133>
Reviewed by Tim Horton.
This preference name is quite confusing. Change it to
PreferFasterClickOverDoubleTap.
* Shared/WebPreferences.yaml:
* Shared/WebPreferencesDefaultValues.h:
* UIProcess/WebPageProxy.h:
(WebKit::WebPageProxy::preferFasterClickOverDoubleTap const):
(WebKit::WebPageProxy::allowsFastClicksEverywhere const): Deleted.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _handleSmartMagnificationInformationForPotentialTap:renderRect:fitEntireRect:viewportMinimumScale:viewportMaximumScale:]):
* UIProcess/ios/WebPageProxyIOS.mm:
(WebKit::WebPageProxy::effectiveContentModeAfterAdjustingPolicies):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@250755 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-608.3.10.0-branch/Source/WebKit/ChangeLog (250828 => 250829)
--- branches/safari-608.3.10.0-branch/Source/WebKit/ChangeLog 2019-10-08 16:00:00 UTC (rev 250828)
+++ branches/safari-608.3.10.0-branch/Source/WebKit/ChangeLog 2019-10-08 16:00:04 UTC (rev 250829)
@@ -1,5 +1,51 @@
2019-10-08 Alan Coon <alanc...@apple.com>
+ Cherry-pick r250755. rdar://problem/56061130
+
+ Use a better name than allowFastClicksEverywhere
+ https://bugs.webkit.org/show_bug.cgi?id=202607
+ <rdar://problem/55997133>
+
+ Reviewed by Tim Horton.
+
+ This preference name is quite confusing. Change it to
+ PreferFasterClickOverDoubleTap.
+
+ * Shared/WebPreferences.yaml:
+ * Shared/WebPreferencesDefaultValues.h:
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::preferFasterClickOverDoubleTap const):
+ (WebKit::WebPageProxy::allowsFastClicksEverywhere const): Deleted.
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _handleSmartMagnificationInformationForPotentialTap:renderRect:fitEntireRect:viewportMinimumScale:viewportMaximumScale:]):
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::effectiveContentModeAfterAdjustingPolicies):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@250755 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-10-04 Dean Jackson <d...@apple.com>
+
+ Use a better name than allowFastClicksEverywhere
+ https://bugs.webkit.org/show_bug.cgi?id=202607
+ <rdar://problem/55997133>
+
+ Reviewed by Tim Horton.
+
+ This preference name is quite confusing. Change it to
+ PreferFasterClickOverDoubleTap.
+
+ * Shared/WebPreferences.yaml:
+ * Shared/WebPreferencesDefaultValues.h:
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::preferFasterClickOverDoubleTap const):
+ (WebKit::WebPageProxy::allowsFastClicksEverywhere const): Deleted.
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _handleSmartMagnificationInformationForPotentialTap:renderRect:fitEntireRect:viewportMinimumScale:viewportMaximumScale:]):
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::effectiveContentModeAfterAdjustingPolicies):
+
+2019-10-08 Alan Coon <alanc...@apple.com>
+
Cherry-pick r250438. rdar://problem/55984974
Unreviewed build-fix: wrap the AssertionServicesSPI.h in an IOS_FAMILY check.
Modified: branches/safari-608.3.10.0-branch/Source/WebKit/Shared/WebPreferences.yaml (250828 => 250829)
--- branches/safari-608.3.10.0-branch/Source/WebKit/Shared/WebPreferences.yaml 2019-10-08 16:00:00 UTC (rev 250828)
+++ branches/safari-608.3.10.0-branch/Source/WebKit/Shared/WebPreferences.yaml 2019-10-08 16:00:04 UTC (rev 250829)
@@ -1534,17 +1534,17 @@
type: bool
defaultValue: true
condition: PLATFORM(IOS_FAMILY)
- humanReadableName: "Faster clicks"
+ humanReadableName: "Fast clicks"
humanReadableDescription: "Support faster clicks on zoomable pages"
webcoreBinding: none
category: internal
-FastClicksEverywhere:
+PreferFasterClickOverDoubleTap:
type: bool
- defaultValue: DEFAULT_FAST_CLICKS_EVERYWHERE
+ defaultValue: DEFAULT_PREFER_FASTER_CLICK_OVER_DOUBLE_TAP
condition: PLATFORM(IOS_FAMILY)
- humanReadableName: "Fast clicks everywhere"
- humanReadableDescription: "Force fast clicks on all pages"
+ humanReadableName: "Use fast clicks before double tap"
+ humanReadableDescription: "Prefer a faster click over a double tap"
webcoreBinding: none
category: internal
Modified: branches/safari-608.3.10.0-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.h (250828 => 250829)
--- branches/safari-608.3.10.0-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.h 2019-10-08 16:00:00 UTC (rev 250828)
+++ branches/safari-608.3.10.0-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.h 2019-10-08 16:00:04 UTC (rev 250829)
@@ -256,13 +256,11 @@
#define DEFAULT_DOM_PASTE_ACCESS_REQUESTS_ENABLED false
#endif
-#if PLATFORM(IOS_FAMILY)
-#if PLATFORM(WATCHOS)
-#define DEFAULT_FAST_CLICKS_EVERYWHERE false
+#if PLATFORM(IOS_FAMILY) && !PLATFORM(WATCHOS)
+#define DEFAULT_PREFER_FASTER_CLICK_OVER_DOUBLE_TAP true
#else
-#define DEFAULT_FAST_CLICKS_EVERYWHERE true
+#define DEFAULT_PREFER_FASTER_CLICK_OVER_DOUBLE_TAP false
#endif
-#endif
#if ENABLE(APPLE_PAY_REMOTE_UI)
#define DEFAULT_APPLE_PAY_ENABLED true
Modified: branches/safari-608.3.10.0-branch/Source/WebKit/UIProcess/WebPageProxy.h (250828 => 250829)
--- branches/safari-608.3.10.0-branch/Source/WebKit/UIProcess/WebPageProxy.h 2019-10-08 16:00:00 UTC (rev 250828)
+++ branches/safari-608.3.10.0-branch/Source/WebKit/UIProcess/WebPageProxy.h 2019-10-08 16:00:04 UTC (rev 250829)
@@ -516,7 +516,7 @@
bool hasCommittedAnyProvisionalLoads() const { return m_hasCommittedAnyProvisionalLoads; }
- bool allowsFastClicksEverywhere() const { return m_allowsFastClicksEverywhere; }
+ bool preferFasterClickOverDoubleTap() const { return m_preferFasterClickOverDoubleTap; }
void setIsUsingHighPerformanceWebGL(bool value) { m_isUsingHighPerformanceWebGL = value; }
bool isUsingHighPerformanceWebGL() const { return m_isUsingHighPerformanceWebGL; }
@@ -2500,7 +2500,7 @@
bool m_isUsingHighPerformanceWebGL { false };
bool m_openedByDOM { false };
bool m_hasCommittedAnyProvisionalLoads { false };
- bool m_allowsFastClicksEverywhere { false };
+ bool m_preferFasterClickOverDoubleTap { false };
HashMap<String, Ref<WebURLSchemeHandler>> m_urlSchemeHandlersByScheme;
HashMap<uint64_t, Ref<WebURLSchemeHandler>> m_urlSchemeHandlersByIdentifier;
Modified: branches/safari-608.3.10.0-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (250828 => 250829)
--- branches/safari-608.3.10.0-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2019-10-08 16:00:00 UTC (rev 250828)
+++ branches/safari-608.3.10.0-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2019-10-08 16:00:04 UTC (rev 250829)
@@ -1728,8 +1728,8 @@
if (!_potentialTapInProgress)
return;
- if (_page->preferences().fastClicksEverywhere() && _page->allowsFastClicksEverywhere()) {
- RELEASE_LOG(ViewGestures, "Potential tap found an element and fast taps are forced on. Trigger click. (%p)", self);
+ if (_page->preferences().preferFasterClickOverDoubleTap() && _page->preferFasterClickOverDoubleTap()) {
+ RELEASE_LOG(ViewGestures, "Potential tap found an element and fast taps are preferred. Trigger click. (%p)", self);
[self _setDoubleTapGesturesEnabled:NO];
return;
}
Modified: branches/safari-608.3.10.0-branch/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm (250828 => 250829)
--- branches/safari-608.3.10.0-branch/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2019-10-08 16:00:00 UTC (rev 250828)
+++ branches/safari-608.3.10.0-branch/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2019-10-08 16:00:04 UTC (rev 250829)
@@ -1451,7 +1451,7 @@
break;
}
- m_allowsFastClicksEverywhere = false;
+ m_preferFasterClickOverDoubleTap = false;
if (!useDesktopBrowsingMode) {
policies.setAllowContentChangeObserverQuirk(true);
@@ -1476,7 +1476,7 @@
policies.setMediaSourcePolicy(WebsiteMediaSourcePolicy::Enable);
policies.setSimulatedMouseEventsDispatchPolicy(WebsiteSimulatedMouseEventsDispatchPolicy::Allow);
policies.setLegacyOverflowScrollingTouchPolicy(WebsiteLegacyOverflowScrollingTouchPolicy::Disable);
- m_allowsFastClicksEverywhere = true;
+ m_preferFasterClickOverDoubleTap = true;
}
return WebContentMode::Desktop;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
