Changeset 229029 in webkit

Timestamp:

Feb 26, 2018 11:08:33 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[WinCairo] WebKit2_C.h should be included for TestWebKit
​https://bugs.webkit.org/show_bug.cgi?id=182682

Patch by Yousuke Kimoto <​yousuke.kimoto@sony.com> on 2018-02-26
Reviewed by Yusuke Suzuki.

.:

Added a new definition "BUILDING_WIN_CAIRO_WEBKIT" to specify
the wincairo webkit build.

• Source/cmake/OptionsWinCairo.cmake:

Tools:

• TestWebKitAPI/config.h:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/OptionsWinCairo.cmake (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/config.h (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2018-02-26  Yousuke Kimoto  <yousuke.kimoto@sony.com>
+
+        [WinCairo] WebKit2_C.h should be included for TestWebKit
+        https://bugs.webkit.org/show_bug.cgi?id=182682
+
+        Reviewed by Yusuke Suzuki.
+
+        Added a new definition "BUILDING_WIN_CAIRO_WEBKIT" to specify
+        the wincairo webkit build.
+
+        * Source/cmake/OptionsWinCairo.cmake:
+
 2018-02-26  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/cmake/OptionsWinCairo.cmake

@@ -5 +5 @@
 if (ENABLE_WIN_CAIRO_WEBKIT)
     set(ENABLE_WEBKIT ON)
+    add_definitions(-DBUILDING_WIN_CAIRO_WEBKIT=1)
 endif ()
 

trunk/Tools/ChangeLog

@@ +1 @@
+2018-02-26  Yousuke Kimoto  <yousuke.kimoto@sony.com>
+
+        [WinCairo] WebKit2_C.h should be included for TestWebKit
+        https://bugs.webkit.org/show_bug.cgi?id=182682
+
+        Reviewed by Yusuke Suzuki.
+
+        * TestWebKitAPI/config.h:
+
 2018-02-25  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Tools/TestWebKitAPI/config.h

@@ -46 +46 @@
 #include <stdint.h>
 
-#if !PLATFORM(IOS) && !PLATFORM(WIN) && !defined(BUILDING_JSCONLY__)
+#if !PLATFORM(IOS) && !defined(BUILDING_JSCONLY__) && (!PLATFORM(WIN) || defined(BUILDING_WIN_CAIRO_WEBKIT))
 #include <WebKit/WebKit2_C.h>
 #endif