Title: [195429] trunk/Source/WebKit2
- Revision
- 195429
- Author
- d...@apple.com
- Date
- 2016-01-21 16:47:00 -0800 (Thu, 21 Jan 2016)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (195428 => 195429)
--- trunk/Source/WebKit2/ChangeLog 2016-01-21 23:57:35 UTC (rev 195428)
+++ trunk/Source/WebKit2/ChangeLog 2016-01-22 00:47:00 UTC (rev 195429)
@@ -1,5 +1,20 @@
2016-01-21 Dean Jackson <d...@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 <d...@apple.com>
+
[iOS] Crash in _endPotentialTapAndEnableDoubleTapGesturesIfNecessary
https://bugs.webkit.org/show_bug.cgi?id=153326
<rdar://problem/24264339>
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (195428 => 195429)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-01-21 23:57:35 UTC (rev 195428)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-01-22 00:47:00 UTC (rev 195429)
@@ -1586,6 +1586,22 @@
[_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);
+}
+
#pragma mark - UIScrollViewDelegate
- (BOOL)usesStandardContentView
@@ -4055,22 +4071,6 @@
return [(WKPDFView *)_customContentView.get() suggestedFilename];
}
-- (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
{
UIViewPrintFormatter *viewPrintFormatter = self.viewPrintFormatter;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
