Follow-up fix.
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 13 May 2014 19:22:30 +0000 (19:22 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 13 May 2014 19:22:30 +0000 (19:22 +0000)
* UIProcess/API/Cocoa/WKNavigationAction.mm:
(-[WKNavigationAction _initWithNavigationActionData:WebKit::]):
(-[WKNavigationAction _isUserInitiated]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@168691 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm

index 405761c..a595fa9 100644 (file)
@@ -1,5 +1,13 @@
 2014-05-13  Anders Carlsson  <andersca@apple.com>
 
+        Follow-up fix.
+
+        * UIProcess/API/Cocoa/WKNavigationAction.mm:
+        (-[WKNavigationAction _initWithNavigationActionData:WebKit::]):
+        (-[WKNavigationAction _isUserInitiated]):
+
+2014-05-13  Anders Carlsson  <andersca@apple.com>
+
         Add -[WKNavigationAction modifierFlags] and -[WKNavigationAction buttonNumber]
         https://bugs.webkit.org/show_bug.cgi?id=132880
         <rdar://problem/16901354>
index 785e70e..0050e85 100644 (file)
@@ -36,7 +36,7 @@
     RetainPtr<WKFrameInfo> _targetFrame;
     RetainPtr<NSURLRequest> _request;
     RetainPtr<NSURL> _originalURL;
-    BOOL _isUserInitiated;
+    BOOL _userInitiated;
 }
 
 static WKNavigationType toWKNavigationType(WebCore::NavigationType navigationType)
@@ -114,7 +114,7 @@ static NSInteger toNSButtonNumber(WebKit::WebMouseEvent::Button mouseButton)
     _buttonNumber = toNSButtonNumber(navigationActionData.mouseButton);
 #endif
 
-    _isUserInitiated = navigationActionData.isProcessingUserGesture;
+    _userInitiated = navigationActionData.isProcessingUserGesture;
 
     return self;
 }
@@ -167,7 +167,7 @@ static NSInteger toNSButtonNumber(WebKit::WebMouseEvent::Button mouseButton)
 
 - (BOOL)_isUserInitiated
 {
-    return _isUserInitiated;
+    return _userInitiated;
 }
 
 @end