Diff
Modified: trunk/Source/WebKit2/ChangeLog (166545 => 166546)
--- trunk/Source/WebKit2/ChangeLog 2014-03-31 23:30:43 UTC (rev 166545)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-31 23:49:47 UTC (rev 166546)
@@ -1,3 +1,21 @@
+2014-03-31 Anders Carlsson <[email protected]>
+
+ Rename -[WKNavigationAction destinationFrame] to -[WKNavigationAction targetFrame]
+ https://bugs.webkit.org/show_bug.cgi?id=130994
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/Cocoa/WKNavigationAction.h:
+ * UIProcess/API/Cocoa/WKNavigationAction.mm:
+ (-[WKNavigationAction description]):
+ (-[WKNavigationAction targetFrame]):
+ (-[WKNavigationAction setTargetFrame:]):
+ (-[WKNavigationAction destinationFrame]): Deleted.
+ (-[WKNavigationAction setDestinationFrame:]): Deleted.
+ * UIProcess/API/Cocoa/WKNavigationActionInternal.h:
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::NavigationState::PolicyClient::decidePolicyForNavigationAction):
+
2014-03-31 Tim Horton <[email protected]>
[iOS WebKit2] Flush all surfaces after painting into all of them, instead of after painting into each one
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.h (166545 => 166546)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.h 2014-03-31 23:30:43 UTC (rev 166545)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.h 2014-03-31 23:49:47 UTC (rev 166546)
@@ -43,7 +43,7 @@
@interface WKNavigationAction : NSObject
@property (nonatomic, readonly) WKFrameInfo *sourceFrame;
-@property (nonatomic, readonly) WKFrameInfo *destinationFrame;
+@property (nonatomic, readonly) WKFrameInfo *targetFrame;
@property (nonatomic, readonly) WKNavigationType navigationType;
@property (nonatomic, readonly) NSURLRequest *request;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm (166545 => 166546)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm 2014-03-31 23:30:43 UTC (rev 166545)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm 2014-03-31 23:49:47 UTC (rev 166546)
@@ -32,15 +32,15 @@
@implementation WKNavigationAction {
RetainPtr<WKFrameInfo> _sourceFrame;
- RetainPtr<WKFrameInfo> _destinationFrame;
+ RetainPtr<WKFrameInfo> _targetFrame;
RetainPtr<NSURLRequest> _request;
RetainPtr<NSURL> _originalURL;
}
- (NSString *)description
{
- return [NSString stringWithFormat:@"<%@: %p; navigationType = %ld; request = %@; sourceFrame = %@; destinationFrame = %@>", NSStringFromClass(self.class), self,
- (long)_navigationType, _request.get(), _sourceFrame.get(), _destinationFrame.get()];
+ return [NSString stringWithFormat:@"<%@: %p; navigationType = %ld; request = %@; sourceFrame = %@; targetFrame = %@>", NSStringFromClass(self.class), self,
+ (long)_navigationType, _request.get(), _sourceFrame.get(), _targetFrame.get()];
}
- (WKFrameInfo *)sourceFrame
@@ -53,14 +53,14 @@
_sourceFrame = sourceFrame;
}
-- (WKFrameInfo *)destinationFrame
+- (WKFrameInfo *)targetFrame
{
- return _destinationFrame.get();
+ return _targetFrame.get();
}
-- (void)setDestinationFrame:(WKFrameInfo *)destinationFrame
+- (void)setTargetFrame:(WKFrameInfo *)targetFrame
{
- _destinationFrame = destinationFrame;
+ _targetFrame = targetFrame;
}
- (NSURLRequest *)request
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionInternal.h (166545 => 166546)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionInternal.h 2014-03-31 23:30:43 UTC (rev 166545)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionInternal.h 2014-03-31 23:49:47 UTC (rev 166546)
@@ -30,7 +30,7 @@
@interface WKNavigationAction ()
@property (nonatomic, readwrite, strong) WKFrameInfo *sourceFrame;
-@property (nonatomic, readwrite, strong) WKFrameInfo *destinationFrame;
+@property (nonatomic, readwrite, strong) WKFrameInfo *targetFrame;
@property (nonatomic, readwrite) WKNavigationType navigationType;
@property (nonatomic, readwrite, copy) NSURLRequest *request;
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (166545 => 166546)
--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-03-31 23:30:43 UTC (rev 166545)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-03-31 23:49:47 UTC (rev 166546)
@@ -246,13 +246,13 @@
auto navigationAction = adoptNS([[WKNavigationAction alloc] init]);
if (destinationFrame)
- [navigationAction setDestinationFrame:adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:*destinationFrame]).get()];
+ [navigationAction setTargetFrame:adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:*destinationFrame]).get()];
if (sourceFrame) {
if (sourceFrame == destinationFrame)
- [navigationAction setSourceFrame:[navigationAction destinationFrame]];
+ [navigationAction setSourceFrame:[navigationAction targetFrame]];
else
- [navigationAction setDestinationFrame:adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:*sourceFrame]).get()];
+ [navigationAction setTargetFrame:adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:*sourceFrame]).get()];
}
[navigationAction setNavigationType:toWKNavigationType(navigationActionData.navigationType)];
