Title: [177150] trunk/Source/WebKit2
- Revision
- 177150
- Author
- [email protected]
- Date
- 2014-12-11 09:09:24 -0800 (Thu, 11 Dec 2014)
Log Message
[GTK] WebKitNotification is defined twice
https://bugs.webkit.org/show_bug.cgi?id=139538
Reviewed by Martin Robinson.
Remove the typedef from WebKitForwardDeclarations.h since it's
already in WebKitNotification.h and include WebKitNotification.h
in WebKitWebView.h.
* UIProcess/API/gtk/WebKitForwardDeclarations.h:
* UIProcess/API/gtk/WebKitWebView.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (177149 => 177150)
--- trunk/Source/WebKit2/ChangeLog 2014-12-11 17:09:04 UTC (rev 177149)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-11 17:09:24 UTC (rev 177150)
@@ -1,5 +1,19 @@
2014-12-11 Carlos Garcia Campos <[email protected]>
+ [GTK] WebKitNotification is defined twice
+ https://bugs.webkit.org/show_bug.cgi?id=139538
+
+ Reviewed by Martin Robinson.
+
+ Remove the typedef from WebKitForwardDeclarations.h since it's
+ already in WebKitNotification.h and include WebKitNotification.h
+ in WebKitWebView.h.
+
+ * UIProcess/API/gtk/WebKitForwardDeclarations.h:
+ * UIProcess/API/gtk/WebKitWebView.h:
+
+2014-12-11 Carlos Garcia Campos <[email protected]>
+
[GTK] Move click counter logic back to WebKitWebViewBase
https://bugs.webkit.org/show_bug.cgi?id=137685
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitForwardDeclarations.h (177149 => 177150)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitForwardDeclarations.h 2014-12-11 17:09:04 UTC (rev 177149)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitForwardDeclarations.h 2014-12-11 17:09:24 UTC (rev 177150)
@@ -35,6 +35,5 @@
typedef struct _WebKitWebView WebKitWebView;
typedef struct _WebKitContextMenu WebKitContextMenu;
typedef struct _WebKitContextMenuItem WebKitContextMenuItem;
-typedef struct _WebKitNotification WebKitNotification;
#endif // WebKitForward_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h (177149 => 177150)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2014-12-11 17:09:04 UTC (rev 177149)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h 2014-12-11 17:09:24 UTC (rev 177150)
@@ -39,6 +39,7 @@
#include <webkit2/WebKitHitTestResult.h>
#include <webkit2/WebKitJavascriptResult.h>
#include <webkit2/WebKitNavigationAction.h>
+#include <webkit2/WebKitNotification.h>
#include <webkit2/WebKitPermissionRequest.h>
#include <webkit2/WebKitPolicyDecision.h>
#include <webkit2/WebKitScriptDialog.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
