Title: [166269] trunk/Source/WebKit2
- Revision
- 166269
- Author
- ander...@apple.com
- Date
- 2014-03-25 17:00:17 -0700 (Tue, 25 Mar 2014)
Log Message
Move stopLoading: back for now.
* UIProcess/API/Cocoa/WKWebView.h:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView stopLoading:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (166268 => 166269)
--- trunk/Source/WebKit2/ChangeLog 2014-03-25 23:43:13 UTC (rev 166268)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-26 00:00:17 UTC (rev 166269)
@@ -1,5 +1,13 @@
2014-03-25 Anders Carlsson <ander...@apple.com>
+ Move stopLoading: back for now.
+
+ * UIProcess/API/Cocoa/WKWebView.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView stopLoading:]):
+
+2014-03-25 Anders Carlsson <ander...@apple.com>
+
Change toolbarVisibility back to toolbarsVisibility
https://bugs.webkit.org/show_bug.cgi?id=130749
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h (166268 => 166269)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2014-03-25 23:43:13 UTC (rev 166268)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2014-03-26 00:00:17 UTC (rev 166269)
@@ -118,6 +118,8 @@
- (WKNavigation *)goBack;
- (WKNavigation *)goForward;
+- (IBAction)stopLoading:(id)sender;
+
@property (nonatomic) BOOL allowsBackForwardNavigationGestures;
#if TARGET_OS_IPHONE
@@ -138,8 +140,6 @@
- (IBAction)goBack:(id)sender;
- (IBAction)goForward:(id)sender;
-- (IBAction)stopLoading:(id)sender;
-
@end
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (166268 => 166269)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-03-25 23:43:13 UTC (rev 166268)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-03-26 00:00:17 UTC (rev 166269)
@@ -308,6 +308,11 @@
return nil;
}
+- (IBAction)stopLoading:(id)sender
+{
+ _page->stopLoading();
+}
+
#pragma mark iOS-specific methods
#if PLATFORM(IOS)
@@ -1217,11 +1222,6 @@
[self goForward];
}
-- (IBAction)stopLoading:(id)sender
-{
- _page->stopLoading();
-}
-
@end
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
