Title: [164464] trunk/Source/WebKit2
- Revision
- 164464
- Author
- [email protected]
- Date
- 2014-02-20 19:10:22 -0800 (Thu, 20 Feb 2014)
Log Message
Fix a build warning by moving some WKWebView methods from the private category to WKWebView itself.
Reviewed by Anders Carlsson.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView setAllowsBackForwardNavigationGestures:]):
(-[WKWebView allowsBackForwardNavigationGestures]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (164463 => 164464)
--- trunk/Source/WebKit2/ChangeLog 2014-02-21 02:53:14 UTC (rev 164463)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-21 03:10:22 UTC (rev 164464)
@@ -1,3 +1,13 @@
+2014-02-20 Tim Horton <[email protected]>
+
+ Fix a build warning by moving some WKWebView methods from the private category to WKWebView itself.
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView setAllowsBackForwardNavigationGestures:]):
+ (-[WKWebView allowsBackForwardNavigationGestures]):
+
2014-02-20 Enrica Casucci <[email protected]>
ASSERT on touches callbacks after r164409 on iOS.
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (164463 => 164464)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-02-21 02:53:14 UTC (rev 164463)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-02-21 03:10:22 UTC (rev 164464)
@@ -88,6 +88,7 @@
CGFloat _lastAdjustmentForScroller;
std::unique_ptr<WebKit::ViewGestureController> _gestureController;
+ BOOL _allowsBackForwardNavigationGestures;
#endif
#if PLATFORM(MAC)
RetainPtr<WKView> _wkView;
@@ -446,7 +447,29 @@
[self _keyboardChangedWithInfo:notification.userInfo adjustScrollView:YES];
}
+- (void)setAllowsBackForwardNavigationGestures:(BOOL)allowsBackForwardNavigationGestures
+{
+ if (_allowsBackForwardNavigationGestures == allowsBackForwardNavigationGestures)
+ return;
+ _allowsBackForwardNavigationGestures = allowsBackForwardNavigationGestures;
+
+ if (allowsBackForwardNavigationGestures) {
+ if (!_gestureController) {
+ _gestureController = std::make_unique<WebKit::ViewGestureController>(*_page);
+ _gestureController->installSwipeHandler(self, [self scrollView]);
+ }
+ } else
+ _gestureController = nullptr;
+
+ _page->setShouldRecordNavigationSnapshots(allowsBackForwardNavigationGestures);
+}
+
+- (BOOL)allowsBackForwardNavigationGestures
+{
+ return _allowsBackForwardNavigationGestures;
+}
+
#endif
#pragma mark OS X-specific methods
@@ -682,29 +705,6 @@
_isChangingObscuredInsetsInteractively = NO;
}
-- (void)setAllowsBackForwardNavigationGestures:(BOOL)allowsBackForwardNavigationGestures
-{
- if (_allowsBackForwardNavigationGestures == allowsBackForwardNavigationGestures)
- return;
-
- _allowsBackForwardNavigationGestures = allowsBackForwardNavigationGestures;
-
- if (allowsBackForwardNavigationGestures) {
- if (!_gestureController) {
- _gestureController = std::make_unique<WebKit::ViewGestureController>(*_page);
- _gestureController->installSwipeHandler(self, [self scrollView]);
- }
- } else
- _gestureController = nullptr;
-
- _page->setShouldRecordNavigationSnapshots(allowsBackForwardNavigationGestures);
-}
-
-- (BOOL)allowsBackForwardNavigationGestures
-{
- return _allowsBackForwardNavigationGestures;
-}
-
#endif
@end
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
