Title: [98081] trunk/Source/WebKit2
- Revision
- 98081
- Author
- carlo...@webkit.org
- Date
- 2011-10-21 01:17:03 -0700 (Fri, 21 Oct 2011)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98080 => 98081)
--- trunk/Source/WebKit2/ChangeLog 2011-10-21 08:09:05 UTC (rev 98080)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-21 08:17:03 UTC (rev 98081)
@@ -1,5 +1,19 @@
2011-10-21 Carlos Garcia Campos <cgar...@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 <cgar...@igalia.com>
+
[GTK] Add webkit_web_view_stop_loading() to WebKit2 GTK+ API
https://bugs.webkit.org/show_bug.cgi?id=69610
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (98080 => 98081)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-21 08:09:05 UTC (rev 98080)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2011-10-21 08:17:03 UTC (rev 98081)
@@ -345,11 +345,25 @@
{
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))));
+}
+
+/**
* webkit_web_view_go_forward:
* @web_view: a #WebKitWebView
*
@@ -361,11 +375,25 @@
{
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))));
+}
+
+/**
* webkit_web_view_get_custom_charset:
* @web_view: a #WebKitWebView
*
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h (98080 => 98081)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-10-21 08:09:05 UTC (rev 98080)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-10-21 08:17:03 UTC (rev 98081)
@@ -105,9 +105,15 @@
WEBKIT_API void
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 *
webkit_web_view_get_custom_charset (WebKitWebView *web_view);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
