<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[166241] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/166241">166241</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-03-25 12:17:54 -0700 (Tue, 25 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add goBack: and goForward: IBActions and move stopLoading: to a new WKIBActions category on WKWebView
https://bugs.webkit.org/show_bug.cgi?id=130732
Reviewed by Tim Horton.
Source/WebKit2:
* UIProcess/API/Cocoa/WKWebView.h:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView goBack]):
(-[WKWebView goForward]):
(-[WKWebView validateUserInterfaceItem:]):
(-[WKWebView goBack:]):
(-[WKWebView goForward:]):
(-[WKWebView stopLoading:]):
Tools:
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController validateUserInterfaceItem:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK2BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (166240 => 166241)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-25 18:00:30 UTC (rev 166240)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-25 19:17:54 UTC (rev 166241)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-03-25 Anders Carlsson <andersca@apple.com>
+
+ Add goBack: and goForward: IBActions and move stopLoading: to a new WKIBActions category on WKWebView
+ https://bugs.webkit.org/show_bug.cgi?id=130732
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/API/Cocoa/WKWebView.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView goBack]):
+ (-[WKWebView goForward]):
+ (-[WKWebView validateUserInterfaceItem:]):
+ (-[WKWebView goBack:]):
+ (-[WKWebView goForward:]):
+ (-[WKWebView stopLoading:]):
+
</ins><span class="cx"> 2014-03-25 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Remove the autotools build
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h (166240 => 166241)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2014-03-25 18:00:30 UTC (rev 166240)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2014-03-25 19:17:54 UTC (rev 166241)
</span><span class="lines">@@ -89,8 +89,6 @@
</span><span class="cx"> */
</span><span class="cx"> - (WKNavigation *)goToBackForwardListItem:(WKBackForwardListItem *)item;
</span><span class="cx">
</span><del>-- (IBAction)stopLoading:(id)sender;
-
</del><span class="cx"> @property (nonatomic, readonly) NSString *title;
</span><span class="cx">
</span><span class="cx"> /*! @abstract The active URL. @link WKWebView @/link is KVO-compliant for this property.
</span><span class="lines">@@ -117,8 +115,8 @@
</span><span class="cx"> @property (readonly) BOOL canGoBack;
</span><span class="cx"> @property (readonly) BOOL canGoForward;
</span><span class="cx">
</span><del>-- (void)goBack;
-- (void)goForward;
</del><ins>+- (WKNavigation *)goBack;
+- (WKNavigation *)goForward;
</ins><span class="cx">
</span><span class="cx"> @property (nonatomic) BOOL allowsBackForwardNavigationGestures;
</span><span class="cx">
</span><span class="lines">@@ -133,4 +131,13 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@interface WKWebView (WKIBActions) <NSUserInterfaceValidations>
+
+- (IBAction)goBack:(id)sender;
+- (IBAction)goForward:(id)sender;
+
+- (IBAction)stopLoading:(id)sender;
+
+@end
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (166240 => 166241)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-03-25 18:00:30 UTC (rev 166240)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-03-25 19:17:54 UTC (rev 166241)
</span><span class="lines">@@ -256,11 +256,6 @@
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (IBAction)stopLoading:(id)sender
-{
- _page->stopLoading();
-}
-
</del><span class="cx"> - (NSString *)title
</span><span class="cx"> {
</span><span class="cx"> return _page->pageLoadState().title();
</span><span class="lines">@@ -298,16 +293,20 @@
</span><span class="cx"> return !!_page->backForwardList().forwardItem();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// FIXME: This should return a WKNavigation object.
-- (void)goBack
</del><ins>+- (WKNavigation *)goBack
</ins><span class="cx"> {
</span><span class="cx"> _page->goBack();
</span><ins>+
+ // FIXME: Return a navigation object.
+ return nil;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-// FIXME: This should return a WKNavigation object.
-- (void)goForward
</del><ins>+- (WKNavigation *)goForward
</ins><span class="cx"> {
</span><span class="cx"> _page->goForward();
</span><ins>+
+ // FIXME: Return a navigation object.
+ return nil;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark iOS-specific methods
</span><span class="lines">@@ -1177,4 +1176,41 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@implementation WKWebView (WKIBActions)
+
+- (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)item
+{
+ SEL action = item.action;
+
+ if (action == @selector(goBack:))
+ return !!_page->backForwardList().backItem();
+
+ if (action == @selector(goForward:))
+ return !!_page->backForwardList().forwardItem();
+
+ if (action == @selector(stopLoading:)) {
+ // FIXME: Return no if we're stopped.
+ return YES;
+ }
+
+ return NO;
+}
+
+- (IBAction)goBack:(id)sender
+{
+ [self goBack];
+}
+
+- (IBAction)goForward:(id)sender
+{
+ [self goForward];
+}
+
+- (IBAction)stopLoading:(id)sender
+{
+ _page->stopLoading();
+}
+
+@end
+
</ins><span class="cx"> #endif // WK_API_ENABLED
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (166240 => 166241)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-03-25 18:00:30 UTC (rev 166240)
+++ trunk/Tools/ChangeLog 2014-03-25 19:17:54 UTC (rev 166241)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-03-25 Anders Carlsson <andersca@apple.com>
+
+ Add goBack: and goForward: IBActions and move stopLoading: to a new WKIBActions category on WKWebView
+ https://bugs.webkit.org/show_bug.cgi?id=130732
+
+ Reviewed by Tim Horton.
+
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController validateUserInterfaceItem:]):
+
</ins><span class="cx"> 2014-03-25 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Remove the autotools build
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (166240 => 166241)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2014-03-25 18:00:30 UTC (rev 166240)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2014-03-25 19:17:54 UTC (rev 166241)
</span><span class="lines">@@ -194,14 +194,11 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)item
</span><span class="cx"> {
</span><del>- SEL action = [item action];
</del><ins>+ SEL action = item.action;
</ins><span class="cx">
</span><del>- if (action == @selector(goBack:))
- return _webView && [_webView canGoBack];
-
- if (action == @selector(goForward:))
- return _webView && [_webView canGoForward];
-
</del><ins>+ if (action == @selector(goBack:) || action == @selector(goForward:))
+ return [_webView validateUserInterfaceItem:item];
+
</ins><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>