Title: [145525] releases/WebKitGTK/webkit-2.0/Source/WebKit2
Revision
145525
Author
carlo...@webkit.org
Date
2013-03-12 04:43:43 -0700 (Tue, 12 Mar 2013)

Log Message

[GTK] Add webkit_web_page_get_id() to WebKit2 GTK+ API
https://bugs.webkit.org/show_bug.cgi?id=111938

Reviewed by Xan Lopez.

Add API to the web extensions API to get the identifier of a web
page.

* UIProcess/API/gtk/docs/webkit2gtk-sections.txt: Add new symbol.
* UIProcess/API/gtk/tests/WebExtensionTest.cpp:
(methodCallCallback): Check the page ID matches the one returned
by webkit_web_page_get_id().
* WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:
(webkit_web_page_get_id):
* WebProcess/InjectedBundle/API/gtk/WebKitWebPage.h:

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog (145524 => 145525)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog	2013-03-12 11:38:57 UTC (rev 145524)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog	2013-03-12 11:43:43 UTC (rev 145525)
@@ -1,3 +1,21 @@
+2013-03-12  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        [GTK] Add webkit_web_page_get_id() to WebKit2 GTK+ API
+        https://bugs.webkit.org/show_bug.cgi?id=111938
+
+        Reviewed by Xan Lopez.
+
+        Add API to the web extensions API to get the identifier of a web
+        page.
+
+        * UIProcess/API/gtk/docs/webkit2gtk-sections.txt: Add new symbol.
+        * UIProcess/API/gtk/tests/WebExtensionTest.cpp:
+        (methodCallCallback): Check the page ID matches the one returned
+        by webkit_web_page_get_id().
+        * WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:
+        (webkit_web_page_get_id):
+        * WebProcess/InjectedBundle/API/gtk/WebKitWebPage.h:
+
 2013-03-12  Manuel Rego Casasnovas  <r...@igalia.com>
 
         [GTK][WK2] REGRESSION(r145081): Unit tests not working if locale is not English

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt (145524 => 145525)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt	2013-03-12 11:38:57 UTC (rev 145524)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt	2013-03-12 11:43:43 UTC (rev 145525)
@@ -987,6 +987,7 @@
 WebKitWebPage
 webkit_web_page_get_dom_document
 webkit_web_page_get_uri
+webkit_web_page_get_id
 
 <SUBSECTION Standard>
 WebKitWebPageClass

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/WebExtensionTest.cpp (145524 => 145525)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/WebExtensionTest.cpp	2013-03-12 11:38:57 UTC (rev 145524)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/WebExtensionTest.cpp	2013-03-12 11:43:43 UTC (rev 145525)
@@ -105,6 +105,7 @@
                 "Invalid page ID: %"G_GUINT64_FORMAT, pageID);
             return;
         }
+        g_assert_cmpuint(webkit_web_page_get_id(page), ==, pageID);
 
         WebKitDOMDocument* document = webkit_web_page_get_dom_document(page);
         GOwnPtr<char> title(webkit_dom_document_get_title(document));

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp (145524 => 145525)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp	2013-03-12 11:38:57 UTC (rev 145524)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp	2013-03-12 11:43:43 UTC (rev 145525)
@@ -363,3 +363,18 @@
 
     return webPage->priv->uri.data();
 }
+
+/**
+ * webkit_web_page_get_id:
+ * @web_page: a #WebKitWebPage
+ *
+ * Get the identifier of the #WebKitWebPage
+ *
+ * Returns: the identifier of @web_page
+ */
+guint64 webkit_web_page_get_id(WebKitWebPage* webPage)
+{
+    g_return_val_if_fail(WEBKIT_IS_WEB_PAGE(webPage), 0);
+
+    return webPage->priv->webPage->pageID();
+}

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.h (145524 => 145525)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.h	2013-03-12 11:38:57 UTC (rev 145524)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.h	2013-03-12 11:43:43 UTC (rev 145525)
@@ -60,6 +60,9 @@
 WEBKIT_API const gchar *
 webkit_web_page_get_uri (WebKitWebPage *web_page);
 
+WEBKIT_API guint64
+webkit_web_page_get_id           (WebKitWebPage *web_page);
+
 G_END_DECLS
 
 #endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to