Changeset 166546 in webkit

Timestamp:

Mar 31, 2014 4:49:47 PM (10 years ago)

Author:

andersca@apple.com

Message:

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):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKNavigationAction.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKNavigationAction.mm (modified) (3 diffs)
• UIProcess/API/Cocoa/WKNavigationActionInternal.h (modified) (1 diff)
• UIProcess/Cocoa/NavigationState.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-03-31  Anders Carlsson  <andersca@apple.com>
+
+        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  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.h

@@ -44 +44 @@
 
 @property (nonatomic, readonly) WKFrameInfo *sourceFrame;
-@property (nonatomic, readonly) WKFrameInfo *destinationFrame;
+@property (nonatomic, readonly) WKFrameInfo *targetFrame;
 
 @property (nonatomic, readonly) WKNavigationType navigationType;

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

@@ -33 +33 @@
 @implementation WKNavigationAction {
     RetainPtr<WKFrameInfo> _sourceFrame;
-    RetainPtr<WKFrameInfo> _destinationFrame;
+    RetainPtr<WKFrameInfo> _targetFrame;
     RetainPtr<NSURLRequest> _request;
     RetainPtr<NSURL> _originalURL;
@@ -40 +40 @@
 - (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()];
 }
 
@@ -54 +54 @@
 }
 
-- (WKFrameInfo *)destinationFrame
+- (WKFrameInfo *)targetFrame
 {
-    return _destinationFrame.get();
+    return _targetFrame.get();
 }
 
-- (void)setDestinationFrame:(WKFrameInfo *)destinationFrame
+- (void)setTargetFrame:(WKFrameInfo *)targetFrame
 {
-    _destinationFrame = destinationFrame;
+    _targetFrame = targetFrame;
 }
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionInternal.h

@@ -31 +31 @@
 
 @property (nonatomic, readwrite, strong) WKFrameInfo *sourceFrame;
-@property (nonatomic, readwrite, strong) WKFrameInfo *destinationFrame;
+@property (nonatomic, readwrite, strong) WKFrameInfo *targetFrame;
 
 @property (nonatomic, readwrite) WKNavigationType navigationType;

trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm

@@ -247 +247 @@
 
     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()];
     }