Changeset 250755 in webkit

Timestamp:

Oct 4, 2019 4:18:18 PM (5 years ago)

Author:

dino@apple.com

Message:

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):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebPreferences.yaml (modified) (1 diff)
• Shared/WebPreferencesDefaultValues.h (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (2 diffs)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)
• UIProcess/ios/WebPageProxyIOS.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-10-04  Dean Jackson  <dino@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-04  Ross Kirsling  <ross.kirsling@sony.com>
 

trunk/Source/WebKit/Shared/WebPreferences.yaml

@@ -1564 +1564 @@
   defaultValue: true
   condition: PLATFORM(IOS_FAMILY)
-  humanReadableName: "Faster clicks"
+  humanReadableName: "Fast clicks"
   humanReadableDescription: "Support faster clicks on zoomable pages"
   webcoreBinding: none
   category: internal
 
-FastClicksEverywhere:
-  type: bool
-  defaultValue: DEFAULT_FAST_CLICKS_EVERYWHERE
+PreferFasterClickOverDoubleTap:
+  type: bool
+  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

trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h

@@ -263 +263 @@
 #endif
 
-#if PLATFORM(IOS_FAMILY)
-#if PLATFORM(WATCHOS)
-#define DEFAULT_FAST_CLICKS_EVERYWHERE false
-#else
-#define DEFAULT_FAST_CLICKS_EVERYWHERE true
-#endif
+#if PLATFORM(IOS_FAMILY) && !PLATFORM(WATCHOS)
+#define DEFAULT_PREFER_FASTER_CLICK_OVER_DOUBLE_TAP true
+#else
+#define DEFAULT_PREFER_FASTER_CLICK_OVER_DOUBLE_TAP false
 #endif
 

trunk/Source/WebKit/UIProcess/WebPageProxy.h

@@ -527 +527 @@
     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; }
@@ -2521 +2521 @@
     bool m_openedByDOM { false };
     bool m_hasCommittedAnyProvisionalLoads { false };
-    bool m_allowsFastClicksEverywhere { false };
+    bool m_preferFasterClickOverDoubleTap { false };
 
     HashMap<String, Ref<WebURLSchemeHandler>> m_urlSchemeHandlersByScheme;

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -1729 +1729 @@
         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;

trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm

@@ -1444 +1444 @@
     }
 
-    m_allowsFastClicksEverywhere = false;
+    m_preferFasterClickOverDoubleTap = false;
 
     if (!useDesktopBrowsingMode) {
@@ -1469 +1469 @@
         policies.setSimulatedMouseEventsDispatchPolicy(WebsiteSimulatedMouseEventsDispatchPolicy::Allow);
         policies.setLegacyOverflowScrollingTouchPolicy(WebsiteLegacyOverflowScrollingTouchPolicy::Disable);
-        m_allowsFastClicksEverywhere = true;
+        m_preferFasterClickOverDoubleTap = true;
     }