Title: [191783] trunk/Tools
- Revision
- 191783
- Author
- [email protected]
- Date
- 2015-10-30 01:31:24 -0700 (Fri, 30 Oct 2015)
Log Message
[GTK] Fix MacCLang build errors in Tools
https://bugs.webkit.org/show_bug.cgi?id=150031
Reviewed by Carlos Garcia Campos.
* TestWebKitAPI/PlatformWebView.h: Fix PlatformWindow typedef on OSX flavor of the GTK port.
* TestWebKitAPI/gtk/PlatformWebViewGtk.cpp: Include WKView.h for WKViewCreate().
* WebKitTestRunner/PlatformWebView.h: Fix PlatformWindow typedef on OSX flavor of the GTK port.
* WebKitTestRunner/gtk/PlatformWebViewGtk.cpp: Include WKView.h for WKViewCreate().
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (191782 => 191783)
--- trunk/Tools/ChangeLog 2015-10-30 08:17:18 UTC (rev 191782)
+++ trunk/Tools/ChangeLog 2015-10-30 08:31:24 UTC (rev 191783)
@@ -1,3 +1,15 @@
+2015-10-30 Philippe Normand <[email protected]>
+
+ [GTK] Fix MacCLang build errors in Tools
+ https://bugs.webkit.org/show_bug.cgi?id=150031
+
+ Reviewed by Carlos Garcia Campos.
+
+ * TestWebKitAPI/PlatformWebView.h: Fix PlatformWindow typedef on OSX flavor of the GTK port.
+ * TestWebKitAPI/gtk/PlatformWebViewGtk.cpp: Include WKView.h for WKViewCreate().
+ * WebKitTestRunner/PlatformWebView.h: Fix PlatformWindow typedef on OSX flavor of the GTK port.
+ * WebKitTestRunner/gtk/PlatformWebViewGtk.cpp: Include WKView.h for WKViewCreate().
+
2015-10-29 Hunseop Jeong <[email protected]>
[EFL] MiniBrowser didn't work after r191749.
Modified: trunk/Tools/TestWebKitAPI/PlatformWebView.h (191782 => 191783)
--- trunk/Tools/TestWebKitAPI/PlatformWebView.h 2015-10-30 08:17:18 UTC (rev 191782)
+++ trunk/Tools/TestWebKitAPI/PlatformWebView.h 2015-10-30 08:31:24 UTC (rev 191783)
@@ -34,7 +34,7 @@
#include <objc/objc.h>
#endif
-#ifdef __APPLE__
+#if defined(__APPLE__) && !PLATFORM(GTK)
#ifdef __OBJC__
@class WKView;
@class NSWindow;
Modified: trunk/Tools/TestWebKitAPI/gtk/PlatformWebViewGtk.cpp (191782 => 191783)
--- trunk/Tools/TestWebKitAPI/gtk/PlatformWebViewGtk.cpp 2015-10-30 08:17:18 UTC (rev 191782)
+++ trunk/Tools/TestWebKitAPI/gtk/PlatformWebViewGtk.cpp 2015-10-30 08:31:24 UTC (rev 191783)
@@ -28,6 +28,7 @@
#include <WebCore/GUniquePtrGtk.h>
#include <WebKit/WKRetainPtr.h>
+#include <WebKit/WKView.h>
#include <gtk/gtk.h>
#include <wtf/glib/GUniquePtr.h>
Modified: trunk/Tools/WebKitTestRunner/PlatformWebView.h (191782 => 191783)
--- trunk/Tools/WebKitTestRunner/PlatformWebView.h 2015-10-30 08:17:18 UTC (rev 191782)
+++ trunk/Tools/WebKitTestRunner/PlatformWebView.h 2015-10-30 08:31:24 UTC (rev 191783)
@@ -29,7 +29,7 @@
#include "TestOptions.h"
#include <WebKit/WKRetainPtr.h>
-#if PLATFORM(COCOA)
+#if PLATFORM(COCOA) && !defined(BUILDING_GTK__)
#include <WebKit/WKFoundation.h>
OBJC_CLASS NSView;
OBJC_CLASS UIView;
Modified: trunk/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp (191782 => 191783)
--- trunk/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp 2015-10-30 08:17:18 UTC (rev 191782)
+++ trunk/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp 2015-10-30 08:31:24 UTC (rev 191783)
@@ -30,6 +30,7 @@
#include <WebKit/WKImageCairo.h>
#include <WebKit/WKPageConfigurationRef.h>
+#include <WebKit/WKView.h>
#include <WebKit/WKViewPrivate.h>
#include <gtk/gtk.h>
#include <wtf/Assertions.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
