Title: [170707] trunk/Source/WebKit2
- Revision
- 170707
- Author
- [email protected]
- Date
- 2014-07-02 08:22:44 -0700 (Wed, 02 Jul 2014)
Log Message
[GTK] WebKitVersion.h should be shared between UI and Web Process APIs
https://bugs.webkit.org/show_bug.cgi?id=134538
Reviewed by Martin Robinson.
To be able to check current version from web extensions too.
* UIProcess/API/gtk/WebKitVersion.h.in: Allow to include WebKitVersion.h also from webkit-web-extension.h.
* WebProcess/InjectedBundle/API/gtk/webkit-web-extension.h: Include WebKitVersion.h.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170706 => 170707)
--- trunk/Source/WebKit2/ChangeLog 2014-07-02 15:13:33 UTC (rev 170706)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-02 15:22:44 UTC (rev 170707)
@@ -1,5 +1,17 @@
2014-07-02 Carlos Garcia Campos <[email protected]>
+ [GTK] WebKitVersion.h should be shared between UI and Web Process APIs
+ https://bugs.webkit.org/show_bug.cgi?id=134538
+
+ Reviewed by Martin Robinson.
+
+ To be able to check current version from web extensions too.
+
+ * UIProcess/API/gtk/WebKitVersion.h.in: Allow to include WebKitVersion.h also from webkit-web-extension.h.
+ * WebProcess/InjectedBundle/API/gtk/webkit-web-extension.h: Include WebKitVersion.h.
+
+2014-07-02 Carlos Garcia Campos <[email protected]>
+
[GTK] WebKitWebView::create should receive information about the navigation action
https://bugs.webkit.org/show_bug.cgi?id=133680
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitVersion.h.in (170706 => 170707)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitVersion.h.in 2014-07-02 15:13:33 UTC (rev 170706)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitVersion.h.in 2014-07-02 15:22:44 UTC (rev 170707)
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#if !defined(__WEBKIT2_H_INSIDE__) && !defined(WEBKIT2_COMPILATION)
+#if !defined(__WEBKIT2_H_INSIDE__) && !defined(WEBKIT2_COMPILATION) && !defined(__WEBKIT_WEB_EXTENSION_H_INSIDE__)
#error "Only <webkit2/webkit2.h> can be included directly."
#endif
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/webkit-web-extension.h (170706 => 170707)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/webkit-web-extension.h 2014-07-02 15:13:33 UTC (rev 170706)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/webkit-web-extension.h 2014-07-02 15:22:44 UTC (rev 170707)
@@ -30,6 +30,7 @@
#include <webkit2/WebKitScriptWorld.h>
#include <webkit2/WebKitURIRequest.h>
#include <webkit2/WebKitURIResponse.h>
+#include <webkit2/WebKitVersion.h>
#include <webkit2/WebKitWebExtension.h>
#include <webkit2/WebKitWebPage.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
