Title: [163669] trunk/Source/WebKit2
- Revision
- 163669
- Author
- [email protected]
- Date
- 2014-02-07 17:25:04 -0800 (Fri, 07 Feb 2014)
Log Message
Build fix. Wrong section of the file.
* UIProcess/API/mac/WKView.mm:
(-[WKView setAllowsBackForwardNavigationGestures:]):
(-[WKView allowsBackForwardNavigationGestures]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (163668 => 163669)
--- trunk/Source/WebKit2/ChangeLog 2014-02-08 01:10:52 UTC (rev 163668)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-08 01:25:04 UTC (rev 163669)
@@ -1,3 +1,11 @@
+2014-02-07 Tim Horton <[email protected]>
+
+ Build fix. Wrong section of the file.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView setAllowsBackForwardNavigationGestures:]):
+ (-[WKView allowsBackForwardNavigationGestures]):
+
2014-02-07 Benjamin Poulain <[email protected]>
[WK2] The WebPageProxy's copy of pageScaleFactor is not update when the scale is changed from the viewport configuration
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (163668 => 163669)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-02-08 01:10:52 UTC (rev 163668)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-02-08 01:25:04 UTC (rev 163669)
@@ -324,6 +324,18 @@
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;
@@ -3275,18 +3287,6 @@
return _data->_allowsMagnification;
}
-- (void)setAllowsBackForwardNavigationGestures:(BOOL)allowsBackForwardNavigationGestures
-{
- _data->_allowsBackForwardNavigationGestures = allowsBackForwardNavigationGestures;
- _data->_page->setShouldRecordNavigationSnapshots(allowsBackForwardNavigationGestures);
- _data->_page->setShouldUseImplicitRubberBandControl(allowsBackForwardNavigationGestures);
-}
-
-- (BOOL)allowsBackForwardNavigationGestures
-{
- return _data->_allowsBackForwardNavigationGestures;
-}
-
- (void)magnifyWithEvent:(NSEvent *)event
{
if (!_data->_allowsMagnification) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
