Title: [163673] trunk/Source/WebKit2
- Revision
- 163673
- Author
- timothy_hor...@apple.com
- Date
- 2014-02-07 18:02:22 -0800 (Fri, 07 Feb 2014)
Log Message
Move allowsBackForwardNavigationGestures back to private because apparently our build systems are broken.
* UIProcess/API/Cocoa/WKView.h:
* UIProcess/API/Cocoa/WKViewPrivate.h:
* UIProcess/API/mac/WKView.mm:
(-[WKView setAllowsBackForwardNavigationGestures:]):
(-[WKView allowsBackForwardNavigationGestures]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (163672 => 163673)
--- trunk/Source/WebKit2/ChangeLog 2014-02-08 02:01:22 UTC (rev 163672)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-08 02:02:22 UTC (rev 163673)
@@ -1,3 +1,13 @@
+2014-02-07 Tim Horton <timothy_hor...@apple.com>
+
+ Move allowsBackForwardNavigationGestures back to private because apparently our build systems are broken.
+
+ * UIProcess/API/Cocoa/WKView.h:
+ * UIProcess/API/Cocoa/WKViewPrivate.h:
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView setAllowsBackForwardNavigationGestures:]):
+ (-[WKView allowsBackForwardNavigationGestures]):
+
2014-02-07 Anders Carlsson <ander...@apple.com>
Simplify web page creation
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKView.h (163672 => 163673)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKView.h 2014-02-08 02:01:22 UTC (rev 163672)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKView.h 2014-02-08 02:02:22 UTC (rev 163673)
@@ -65,8 +65,6 @@
@property BOOL drawsBackground;
@property BOOL drawsTransparentBackground;
-
-@property (readwrite) BOOL allowsBackForwardNavigationGestures;
#if TARGET_OS_IPHONE
@property (nonatomic, readonly) UIScrollView *scrollView;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h (163672 => 163673)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2014-02-08 02:01:22 UTC (rev 163672)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2014-02-08 02:02:22 UTC (rev 163673)
@@ -70,6 +70,7 @@
@property (readonly, getter=isUsingUISideCompositing) BOOL usingUISideCompositing;
@property (readwrite) BOOL allowsMagnification;
@property (readwrite) double magnification;
+@property (readwrite) BOOL allowsBackForwardNavigationGestures;
@property(copy, nonatomic) NSColor *underlayColor;
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (163672 => 163673)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-02-08 02:01:22 UTC (rev 163672)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-02-08 02:02:22 UTC (rev 163673)
@@ -324,18 +324,6 @@
return _data->_page->drawsTransparentBackground();
}
-- (void)setAllowsBackForwardNavigationGestures:(BOOL)allowsBackForwardNavigationGestures
-{
- _data->_allowsBackForwardNavigationGestures = allowsBackForwardNavigationGestures;
- _data->_page->setShouldRecordNavigationSnapshots(allowsBackForwardNavigationGestures);
- _data->_page->setShouldUseImplicitRubberBandControl(allowsBackForwardNavigationGestures);
-}
-
-- (BOOL)allowsBackForwardNavigationGestures
-{
- return _data->_allowsBackForwardNavigationGestures;
-}
-
- (BOOL)acceptsFirstResponder
{
return YES;
@@ -3245,6 +3233,18 @@
_data->_windowOcclusionDetectionEnabled = flag;
}
+- (void)setAllowsBackForwardNavigationGestures:(BOOL)allowsBackForwardNavigationGestures
+{
+ _data->_allowsBackForwardNavigationGestures = allowsBackForwardNavigationGestures;
+ _data->_page->setShouldRecordNavigationSnapshots(allowsBackForwardNavigationGestures);
+ _data->_page->setShouldUseImplicitRubberBandControl(allowsBackForwardNavigationGestures);
+}
+
+- (BOOL)allowsBackForwardNavigationGestures
+{
+ return _data->_allowsBackForwardNavigationGestures;
+}
+
// This method forces a drawing area geometry update, even if frame size updates are disabled.
// The updated is performed asynchronously; we don't wait for the geometry update before returning.
// The area drawn need not match the current frame size - if it differs it will be anchored to the
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
