Changeset 96133 in webkit

Timestamp:

Sep 27, 2011 11:06:06 AM (13 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Add WebKitWebContext to GTK API
​https://bugs.webkit.org/show_bug.cgi?id=67931

Reviewed by Philippe Normand.

Initial implementation of WebKitWebContext for WebKit2 GTK API.

• GNUmakefile.am: Add new files to compilation.
• UIProcess/API/gtk/WebKitWebContext.cpp: Added.

(webkitWebContextFinalize):
(webkit_web_context_init):
(webkit_web_context_class_init):
(createDefaultWebContext):
(webkit_web_context_get_default):

• UIProcess/API/gtk/WebKitWebContext.h: Added.
• UIProcess/API/gtk/tests/testwebcontext.c:

(testWebContextDefault):
(main):

• UIProcess/API/gtk/webkit2.h: Add <webkit2/WebKitWebContext.h>.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.am (modified) (3 diffs)
• UIProcess/API/gtk/WebKitWebContext.cpp (added)
• UIProcess/API/gtk/WebKitWebContext.h (added)
• UIProcess/API/gtk/tests (added)
• UIProcess/API/gtk/tests/testwebcontext.c (copied) (copied from trunk/Source/WebKit2/UIProcess/API/gtk/webkit2.h) (2 diffs)
• UIProcess/API/gtk/webkit2.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-09-27  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+
+        [GTK] Add WebKitWebContext to GTK API
+        https://bugs.webkit.org/show_bug.cgi?id=67931
+
+        Reviewed by Philippe Normand.
+
+        Initial implementation of WebKitWebContext for WebKit2 GTK API.
+
+        * GNUmakefile.am: Add new files to compilation.
+        * UIProcess/API/gtk/WebKitWebContext.cpp: Added.
+        (webkitWebContextFinalize):
+        (webkit_web_context_init):
+        (webkit_web_context_class_init):
+        (createDefaultWebContext):
+        (webkit_web_context_get_default):
+        * UIProcess/API/gtk/WebKitWebContext.h: Added.
+        * UIProcess/API/gtk/tests/testwebcontext.c:
+        (testWebContextDefault):
+        (main):
+        * UIProcess/API/gtk/webkit2.h: Add <webkit2/WebKitWebContext.h>.
+
 2011-09-27  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit2/GNUmakefile.am

@@ -70 +70 @@
 libwebkit2gtkincludedir = $(libwebkitgtkincludedir)/webkit2
 libwebkit2gtkinclude_HEADERS = \
+        $(WebKit2)/UIProcess/API/gtk/WebKitWebContext.h \
         $(WebKit2)/UIProcess/API/gtk/WebKitWebView.h \
         $(WebKit2)/UIProcess/API/gtk/WebKitWebViewBase.h \
@@ -453 +454 @@
         Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h \
         Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp \
+        Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.h \
+        Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp \
         Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h \
         Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp \
@@ -983 +986 @@
         $(top_builddir)/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc
 
+# Unit tests
+TEST_PROGS += \
+        Programs/unittests/webkit2/testwebcontext
+
+noinst_PROGRAMS += $(TEST_PROGS)
+webkit2_tests_cflags = \
+        -I$(srcdir)/Source \
+        -I$(srcdir)/Source/WebKit2 \
+        -I$(top_builddir)/DerivedSources/WebKit2/include \
+        -I$(top_builddir)/DerivedSources/WebKit2/include/webkit2gtk \
+        -I$(srcdir)/Source/WebKit2/UIProcess/API/gtk \
+        $(global_cflags) \
+        $(global_cppflags) \
+        $(GLIB_CFLAGS) \
+        $(GTK_CFLAGS) \
+        $(LIBSOUP_CFLAGS)
+
+webkit2_tests_ldadd = \
+        libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
+        libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
+        $(GLIB_LIBS) \
+        $(GTK_LIBS) \
+        $(LIBSOUP_LIBS)
+
+webkit2_tests_ldflags = \
+        -no-install \
+        -no-fast-install
+
+Programs_unittests_webkit2_testwebcontext_SOURCES = Source/WebKit2/UIProcess/API/gtk/tests/testwebcontext.c
+Programs_unittests_webkit2_testwebcontext_CFLAGS = $(webkit2_tests_cflags)
+Programs_unittests_webkit2_testwebcontext_LDADD = $(webkit2_tests_ldadd)
+Programs_unittests_webkit2_testwebcontext_LDFLAGS = $(webkit2_tests_ldflags)
+
 # WebKitWebProcess
 libexec_PROGRAMS += \

trunk/Source/WebKit2/UIProcess/API/gtk/tests/testwebcontext.c

@@ -3 +3 @@
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2,1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ -18 +18 @@
  */
 
-#ifndef __WEBKIT2_H__
-#define __WEBKIT2_H__
+#include <glib.h>
+#include <gtk/gtk.h>
+#include <webkit2/webkit2.h>
 
-#include <webkit2/WebKitWebViewBase.h>
-#include <webkit2/WebKitWebView.h>
+static void testWebContextDefault(void)
+{
+    /* Check there's a single instance of the default web context. */
+    g_assert(webkit_web_context_get_default() == webkit_web_context_get_default());
+}
 
-#endif /* __WEBKIT2_H__ */
+int main(int argc, char **argv)
+{
+    g_thread_init(NULL);
+    gtk_test_init(&argc, &argv, NULL);
+
+    g_test_bug_base("https://bugs.webkit.org/");
+    g_test_add_func("/webkit2/webcontext/default_context",
+                    testWebContextDefault);
+
+    return g_test_run();
+}
+

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

@@ -21 +21 @@
 #define __WEBKIT2_H__
 
+#include <webkit2/WebKitWebContext.h>
 #include <webkit2/WebKitWebViewBase.h>
 #include <webkit2/WebKitWebView.h>