Skip to content

Commit 403c15d

Browse files
[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(). git-svn-id: http://svn.webkit.org/repository/webkit/trunk@191783 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 673dfed commit 403c15d

File tree

5 files changed

+16
-2
lines changed

5 files changed

+16
-2
lines changed

Tools/ChangeLog

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
2015-10-30 Philippe Normand <[email protected]>
2+
3+
[GTK] Fix MacCLang build errors in Tools
4+
https://bugs.webkit.org/show_bug.cgi?id=150031
5+
6+
Reviewed by Carlos Garcia Campos.
7+
8+
* TestWebKitAPI/PlatformWebView.h: Fix PlatformWindow typedef on OSX flavor of the GTK port.
9+
* TestWebKitAPI/gtk/PlatformWebViewGtk.cpp: Include WKView.h for WKViewCreate().
10+
* WebKitTestRunner/PlatformWebView.h: Fix PlatformWindow typedef on OSX flavor of the GTK port.
11+
* WebKitTestRunner/gtk/PlatformWebViewGtk.cpp: Include WKView.h for WKViewCreate().
12+
113
2015-10-29 Hunseop Jeong <[email protected]>
214

315
[EFL] MiniBrowser didn't work after r191749.

Tools/TestWebKitAPI/PlatformWebView.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include <objc/objc.h>
3535
#endif
3636

37-
#ifdef __APPLE__
37+
#if defined(__APPLE__) && !PLATFORM(GTK)
3838
#ifdef __OBJC__
3939
@class WKView;
4040
@class NSWindow;

Tools/TestWebKitAPI/gtk/PlatformWebViewGtk.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
#include <WebCore/GUniquePtrGtk.h>
3030
#include <WebKit/WKRetainPtr.h>
31+
#include <WebKit/WKView.h>
3132
#include <gtk/gtk.h>
3233
#include <wtf/glib/GUniquePtr.h>
3334

Tools/WebKitTestRunner/PlatformWebView.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "TestOptions.h"
3030
#include <WebKit/WKRetainPtr.h>
3131

32-
#if PLATFORM(COCOA)
32+
#if PLATFORM(COCOA) && !defined(BUILDING_GTK__)
3333
#include <WebKit/WKFoundation.h>
3434
OBJC_CLASS NSView;
3535
OBJC_CLASS UIView;

Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
#include <WebKit/WKImageCairo.h>
3232
#include <WebKit/WKPageConfigurationRef.h>
33+
#include <WebKit/WKView.h>
3334
#include <WebKit/WKViewPrivate.h>
3435
#include <gtk/gtk.h>
3536
#include <wtf/Assertions.h>

0 commit comments

Comments
 (0)