Title: [166370] trunk/Source/WebKit2
- Revision
- 166370
- Author
- ander...@apple.com
- Date
- 2014-03-27 14:21:14 -0700 (Thu, 27 Mar 2014)
Log Message
Add reload and reloadFromOrigin as API
https://bugs.webkit.org/show_bug.cgi?id=130858
Reviewed by Simon Fraser.
* UIProcess/API/Cocoa/WKWebView.h:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView reload]):
(-[WKWebView reloadFromOrigin]):
(-[WKWebView validateUserInterfaceItem:]):
(-[WKWebView reload:]):
(-[WKWebView reloadFromOrigin:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (166369 => 166370)
--- trunk/Source/WebKit2/ChangeLog 2014-03-27 20:49:27 UTC (rev 166369)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-27 21:21:14 UTC (rev 166370)
@@ -1,5 +1,20 @@
2014-03-27 Anders Carlsson <ander...@apple.com>
+ Add reload and reloadFromOrigin as API
+ https://bugs.webkit.org/show_bug.cgi?id=130858
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/API/Cocoa/WKWebView.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView reload]):
+ (-[WKWebView reloadFromOrigin]):
+ (-[WKWebView validateUserInterfaceItem:]):
+ (-[WKWebView reload:]):
+ (-[WKWebView reloadFromOrigin:]):
+
+2014-03-27 Anders Carlsson <ander...@apple.com>
+
Rename WKFrameHandle to _WKFrameHandle
https://bugs.webkit.org/show_bug.cgi?id=130847
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h (166369 => 166370)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2014-03-27 20:49:27 UTC (rev 166369)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2014-03-27 21:21:14 UTC (rev 166370)
@@ -118,6 +118,9 @@
- (WKNavigation *)goBack;
- (WKNavigation *)goForward;
+- (WKNavigation *)reload;
+- (WKNavigation *)reloadFromOrigin;
+
- (void)stopLoading;
// FIXME: Move this to WKIBActions.
@@ -143,6 +146,9 @@
- (IBAction)goBack:(id)sender;
- (IBAction)goForward:(id)sender;
+- (IBAction)reload:(id)sender;
+- (IBAction)reloadFromOrigin:(id)sender;
+
@end
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (166369 => 166370)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-03-27 20:49:27 UTC (rev 166369)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-03-27 21:21:14 UTC (rev 166370)
@@ -307,6 +307,22 @@
return nil;
}
+- (WKNavigation *)reload
+{
+ _page->reload(false);
+
+ // FIXME: Return a navigation object.
+ return nil;
+}
+
+- (WKNavigation *)reloadFromOrigin
+{
+ _page->reload(true);
+
+ // FIXME: Return a navigation object.
+ return nil;
+}
+
- (void)stopLoading
{
_page->stopLoading();
@@ -1213,6 +1229,11 @@
return YES;
}
+ if (action == @selector(reload:) || action == @selector(reloadFromOrigin:)) {
+ // FIXME: Return no if we're loading.
+ return YES;
+ }
+
return NO;
}
@@ -1226,6 +1247,16 @@
[self goForward];
}
+- (IBAction)reload:(id)sender
+{
+ [self reload];
+}
+
+- (IBAction)reloadFromOrigin:(id)sender
+{
+ [self reloadFromOrigin];
+}
+
@end
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
