Title: [168816] branches/safari-538.34-branch/Source/WebKit2
Diff
Modified: branches/safari-538.34-branch/Source/WebKit2/ChangeLog (168815 => 168816)
--- branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-14 08:33:20 UTC (rev 168815)
+++ branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-14 08:35:12 UTC (rev 168816)
@@ -1,5 +1,17 @@
2014-05-14 Lucas Forschler <[email protected]>
+ Merge r168691
+
+ 2014-05-13 Anders Carlsson <[email protected]>
+
+ Follow-up fix.
+
+ * UIProcess/API/Cocoa/WKNavigationAction.mm:
+ (-[WKNavigationAction _initWithNavigationActionData:WebKit::]):
+ (-[WKNavigationAction _isUserInitiated]):
+
+2014-05-14 Lucas Forschler <[email protected]>
+
Merge r168690
2014-05-13 Anders Carlsson <[email protected]>
Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm (168815 => 168816)
--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm 2014-05-14 08:33:20 UTC (rev 168815)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm 2014-05-14 08:35:12 UTC (rev 168816)
@@ -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 @@
_buttonNumber = toNSButtonNumber(navigationActionData.mouseButton);
#endif
- _isUserInitiated = navigationActionData.isProcessingUserGesture;
+ _userInitiated = navigationActionData.isProcessingUserGesture;
return self;
}
@@ -167,7 +167,7 @@
- (BOOL)_isUserInitiated
{
- return _isUserInitiated;
+ return _userInitiated;
}
@end
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
