Changeset 195429 in webkit

Timestamp:

Jan 21, 2016 4:47:00 PM (8 years ago)

Author:

dino@apple.com

Message:

Move _allowsDoubleTapGestures implementation out of category
​https://bugs.webkit.org/show_bug.cgi?id=153329
<rdar://problem/24289768>

Reviewed by Simon Fraser.

We were generating a linker warning because the implementation
was located inside the WKPrivate category.

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _allowsDoubleTapGestures]): Move this out of
the category.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-01-21  Dean Jackson  <dino@apple.com>
+
+        Move _allowsDoubleTapGestures implementation out of category
+        https://bugs.webkit.org/show_bug.cgi?id=153329
+        <rdar://problem/24289768>
+
+        Reviewed by Simon Fraser.
+
+        We were generating a linker warning because the implementation
+        was located inside the WKPrivate category.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _allowsDoubleTapGestures]): Move this out of
+        the category.
+
 2016-01-21  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

@@ -1585 +1585 @@
     [super setBackgroundColor:backgroundColor];
     [_contentView setBackgroundColor:backgroundColor];
+}
+
+- (BOOL)_allowsDoubleTapGestures
+{
+    if (_fastClickingIsDisabled)
+        return YES;
+
+    // If the page is not user scalable, we don't allow double tap gestures.
+    if (![_scrollView isZoomEnabled] || [_scrollView minimumZoomScale] >= [_scrollView maximumZoomScale])
+        return NO;
+
+    // For scalable viewports, only disable double tap gestures if the viewport width is device width.
+    if (_viewportMetaTagWidth != WebCore::ViewportArguments::ValueDeviceWidth)
+        return YES;
+
+    return !areEssentiallyEqualAsFloat(contentZoomScale(self), _initialScaleFactor);
 }
 
@@ -4056 +4072 @@
 }
 
-- (BOOL)_allowsDoubleTapGestures
-{
-    if (_fastClickingIsDisabled)
-        return YES;
-
-    // If the page is not user scalable, we don't allow double tap gestures.
-    if (![_scrollView isZoomEnabled] || [_scrollView minimumZoomScale] >= [_scrollView maximumZoomScale])
-        return NO;
-
-    // For scalable viewports, only disable double tap gestures if the viewport width is device width.
-    if (_viewportMetaTagWidth != WebCore::ViewportArguments::ValueDeviceWidth)
-        return YES;
-
-    return !areEssentiallyEqualAsFloat(contentZoomScale(self), _initialScaleFactor);
-}
-
 - (_WKWebViewPrintFormatter *)_webViewPrintFormatter
 {