Diff
Modified: trunk/Source/WebKit/gtk/ChangeLog (91754 => 91755)
--- trunk/Source/WebKit/gtk/ChangeLog 2011-07-26 14:44:13 UTC (rev 91754)
+++ trunk/Source/WebKit/gtk/ChangeLog 2011-07-26 14:55:33 UTC (rev 91755)
@@ -1,3 +1,16 @@
+2011-07-26 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Remove header webkitwebviewcommon.h
+ https://bugs.webkit.org/show_bug.cgi?id=65177
+
+ Reviewed by Martin Robinson.
+
+ Move webkitwebviewcommon.h contents back to webkitwebview.h.
+
+ * GNUmakefile.am: Remove webkitwebviewcommon.h
+ * webkit/webkitwebview.h:
+ * webkit/webkitwebviewcommon.h: Removed.
+
2011-06-07 Martin Robinson <[email protected]>
Reviewed by Gustavo Noronha Silva.
Modified: trunk/Source/WebKit/gtk/GNUmakefile.am (91754 => 91755)
--- trunk/Source/WebKit/gtk/GNUmakefile.am 2011-07-26 14:44:13 UTC (rev 91754)
+++ trunk/Source/WebKit/gtk/GNUmakefile.am 2011-07-26 14:55:33 UTC (rev 91755)
@@ -140,8 +140,7 @@
$(srcdir)/Source/WebKit/gtk/webkit/webkitwebresource.h \
$(srcdir)/Source/WebKit/gtk/webkit/webkitwebsettings.h \
$(srcdir)/Source/WebKit/gtk/webkit/webkitwebwindowfeatures.h \
- $(srcdir)/Source/WebKit/gtk/webkit/webkitwebview.h \
- $(srcdir)/Source/WebKit/gtk/webkit/webkitwebviewcommon.h
+ $(srcdir)/Source/WebKit/gtk/webkit/webkitwebview.h
webkitgtk_built_h_api += \
Source/WebKit/gtk/webkit/webkitversion.h
Modified: trunk/Source/WebKit/gtk/webkit/webkitwebview.h (91754 => 91755)
--- trunk/Source/WebKit/gtk/webkit/webkitwebview.h 2011-07-26 14:44:13 UTC (rev 91754)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebview.h 2011-07-26 14:55:33 UTC (rev 91755)
@@ -32,7 +32,6 @@
#include <webkit/webkitwebframe.h>
#include <webkit/webkitwebhistoryitem.h>
#include <webkit/webkitwebsettings.h>
-#include <webkit/webkitwebviewcommon.h>
G_BEGIN_DECLS
@@ -154,7 +153,17 @@
void (*_webkit_reserved2) (void);
};
+WEBKIT_API GType
+webkit_web_view_get_type (void);
+
+WEBKIT_API GtkWidget *
+webkit_web_view_new (void);
+
WEBKIT_API const gchar *
+webkit_web_view_get_title (WebKitWebView *webView);
+
+
+WEBKIT_API const gchar *
webkit_web_view_get_uri (WebKitWebView *webView);
WEBKIT_API void
@@ -174,13 +183,17 @@
WEBKIT_API gboolean
webkit_web_view_can_go_back_or_forward (WebKitWebView *webView,
gint steps);
-
WEBKIT_API gboolean
webkit_web_view_can_go_forward (WebKitWebView *webView);
WEBKIT_API void
+webkit_web_view_go_back (WebKitWebView *webView);
+
+WEBKIT_API void
webkit_web_view_go_back_or_forward (WebKitWebView *webView,
gint steps);
+WEBKIT_API void
+webkit_web_view_go_forward (WebKitWebView *webView);
WEBKIT_API void
webkit_web_view_stop_loading (WebKitWebView *webView);
@@ -196,6 +209,9 @@
webkit_web_view_reload_bypass_cache (WebKitWebView *webView);
WEBKIT_API void
+webkit_web_view_load_uri (WebKitWebView *webView,
+ const gchar *uri);
+WEBKIT_API void
webkit_web_view_load_string (WebKitWebView *webView,
const gchar *content,
const gchar *mime_type,
Deleted: trunk/Source/WebKit/gtk/webkit/webkitwebviewcommon.h (91754 => 91755)
--- trunk/Source/WebKit/gtk/webkit/webkitwebviewcommon.h 2011-07-26 14:44:13 UTC (rev 91754)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebviewcommon.h 2011-07-26 14:55:33 UTC (rev 91755)
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2007 Holger Hans Peter Freyther
- * Copyright (C) 2007, 2008 Alp Toker <[email protected]>
- * Copyright (C) 2008 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef webkitwebviewcommon_h
-#define webkitwebviewcommon_h
-
-G_BEGIN_DECLS
-
-WEBKIT_API GType
-webkit_web_view_get_type (void);
-
-WEBKIT_API GtkWidget *
-webkit_web_view_new (void);
-
-WEBKIT_API const gchar *
-webkit_web_view_get_title (WebKitWebView *webView);
-
-WEBKIT_API void
-webkit_web_view_go_back (WebKitWebView *webView);
-
-WEBKIT_API void
-webkit_web_view_go_forward (WebKitWebView *webView);
-
-WEBKIT_API void
-webkit_web_view_load_uri (WebKitWebView *webView,
- const gchar *uri);
-
-G_END_DECLS
-
-#endif
Modified: trunk/Source/WebKit2/ChangeLog (91754 => 91755)
--- trunk/Source/WebKit2/ChangeLog 2011-07-26 14:44:13 UTC (rev 91754)
+++ trunk/Source/WebKit2/ChangeLog 2011-07-26 14:55:33 UTC (rev 91755)
@@ -1,3 +1,13 @@
+2011-07-26 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Remove header webkitwebviewcommon.h
+ https://bugs.webkit.org/show_bug.cgi?id=65177
+
+ Reviewed by Martin Robinson.
+
+ * UIProcess/API/gtk/WebKitWebView.h: Add function prototypes
+ instead of including webkitwebviewcommon.h.
+
2011-07-22 Jessie Berlin <[email protected]>
[WebKit2] Changing the cookie accept policy in Private Browsing doesn’t work.
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h (91754 => 91755)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-07-26 14:44:13 UTC (rev 91754)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2011-07-26 14:55:33 UTC (rev 91755)
@@ -24,8 +24,6 @@
#define WebKitWebView_h
#include <WebKit2/WebKitWebViewBase.h>
-#include <webkit/webkitdefines.h>
-#include <webkit/webkitwebviewcommon.h>
G_BEGIN_DECLS
@@ -36,6 +34,8 @@
#define WEBKIT_IS_WEB_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_TYPE_WEB_VIEW))
#define WEBKIT_WEB_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_WEB_VIEW, WebKitWebViewClass))
+typedef struct _WebKitWebView WebKitWebView;
+typedef struct _WebKitWebViewClass WebKitWebViewClass;
typedef struct _WebKitWebViewPrivate WebKitWebViewPrivate;
struct _WebKitWebView {
@@ -59,6 +59,22 @@
void (*_webkit_reserved7) (void);
};
+WK_EXPORT GType
+webkit_web_view_get_type (void);
+
+WK_EXPORT GtkWidget *
+webkit_web_view_new (void);
+
+WK_EXPORT void
+webkit_web_view_load_uri (WebKitWebView *webView,
+ const gchar *uri);
+
+WK_EXPORT void
+webkit_web_view_go_back (WebKitWebView *webView);
+
+WK_EXPORT void
+webkit_web_view_go_forward (WebKitWebView *webView);
+
G_END_DECLS
#endif
