Changeset 98081 in webkit

Timestamp:

Oct 21, 2011, 1:17:03 AM (14 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Add can_go_back/forward methods to WebKit2 GTK+ API
​https://bugs.webkit.org/show_bug.cgi?id=69823

Reviewed by Martin Robinson.

• UIProcess/API/gtk/WebKitWebView.cpp:

(webkit_web_view_go_back):
(webkit_web_view_can_go_back):
(webkit_web_view_go_forward):
(webkit_web_view_can_go_forward):

• UIProcess/API/gtk/WebKitWebView.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/WebKitWebView.cpp (modified) (2 diffs)
• UIProcess/API/gtk/WebKitWebView.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-10-21  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Add can_go_back/forward methods to WebKit2 GTK+ API
+        https://bugs.webkit.org/show_bug.cgi?id=69823
+
+        Reviewed by Martin Robinson.
+
+        * UIProcess/API/gtk/WebKitWebView.cpp:
+        (webkit_web_view_go_back):
+        (webkit_web_view_can_go_back):
+        (webkit_web_view_go_forward):
+        (webkit_web_view_can_go_forward):
+        * UIProcess/API/gtk/WebKitWebView.h:
+
 2011-10-21  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp

@@ -346 +346 @@
     g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
 
-    WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
-    WKPageGoBack(toAPI(page));
+    WKPageGoBack(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))));
+}
+
+/**
+ * webkit_web_view_can_go_back:
+ * @web_view: a #WebKitWebView
+ *
+ * Determines whether @web_view has a previous history item.
+ *
+ * Returns: %TRUE if able to move back or %FALSE otherwise.
+ */
+gboolean webkit_web_view_can_go_back(WebKitWebView* webView)
+{
+    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
+
+    return WKPageCanGoBack(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))));
 }
 
@@ -362 +376 @@
     g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
 
-    WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
-    WKPageGoForward(toAPI(page));
+    WKPageGoForward(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))));
+}
+
+/**
+ * webkit_web_view_can_go_forward:
+ * @web_view: a #WebKitWebView
+ *
+ * Determines whether @web_view has a next history item.
+ *
+ * Returns: %TRUE if able to move forward or %FALSE otherwise.
+ */
+gboolean webkit_web_view_can_go_forward(WebKitWebView* webView)
+{
+    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
+
+    return WKPageCanGoForward(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))));
 }
 

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h

@@ -106 +106 @@
 webkit_web_view_go_back                     (WebKitWebView         *web_view);
 
+WEBKIT_API gboolean
+webkit_web_view_can_go_back                 (WebKitWebView         *web_view)
+
 WEBKIT_API void
 webkit_web_view_go_forward                  (WebKitWebView         *web_view);
+
+WEBKIT_API gboolean
+webkit_web_view_can_go_forward              (WebKitWebView         *web_view);
 
 WEBKIT_API const gchar *