Title: [168633] branches/safari-538.34-branch/Source/WebKit2
Diff
Modified: branches/safari-538.34-branch/Source/WebKit2/ChangeLog (168632 => 168633)
--- branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-12 18:33:21 UTC (rev 168632)
+++ branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-12 18:35:33 UTC (rev 168633)
@@ -1,5 +1,20 @@
2014-04-17 Lucas Forschler <[email protected]>
+ Merge r168582
+
+ 2014-05-10 Anders Carlsson <[email protected]>
+
+ Follow-up fix.
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/API/Cocoa/WKNavigationResponse.h:
+ * UIProcess/API/Cocoa/WKNavigationResponse.mm:
+ (-[WKNavigationResponse isForMainFrame]):
+ Use a slightly better name.
+
+2014-04-17 Lucas Forschler <[email protected]>
+
Merge r168581
2014-05-10 Anders Carlsson <[email protected]>
Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.h (168632 => 168633)
--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.h 2014-05-12 18:33:21 UTC (rev 168632)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.h 2014-05-12 18:35:33 UTC (rev 168633)
@@ -37,7 +37,7 @@
/*! @abstract Whether the frame that is being navigated is the main frame or not.
*/
-@property (nonatomic, readonly, getter=isMainFrameNavigation) BOOL mainFrameNavigation;
+@property (nonatomic, readonly, getter=isForMainFrame) BOOL forMainFrame;
/*! @abstract The NSURLResponse of the frame.
*/
Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.mm (168632 => 168633)
--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.mm 2014-05-12 18:33:21 UTC (rev 168632)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.mm 2014-05-12 18:35:33 UTC (rev 168633)
@@ -40,7 +40,7 @@
return [NSString stringWithFormat:@"<%@: %p; response = %@>", NSStringFromClass(self.class), self, _response.get()];
}
-- (BOOL)isMainFrameNavigation
+- (BOOL)isForMainFrame
{
return [_frame isMainFrame];
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
