Title: [229029] trunk
Revision
229029
Author
[email protected]
Date
2018-02-26 11:08:33 -0800 (Mon, 26 Feb 2018)

Log Message

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

Patch by Yousuke Kimoto <[email protected]> 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:

Modified Paths

Diff

Modified: trunk/ChangeLog (229028 => 229029)


--- trunk/ChangeLog	2018-02-26 18:01:12 UTC (rev 229028)
+++ trunk/ChangeLog	2018-02-26 19:08:33 UTC (rev 229029)
@@ -1,3 +1,15 @@
+2018-02-26  Yousuke Kimoto  <[email protected]>
+
+        [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  <[email protected]>
 
         [CMake][OpenVR] Linkage errors happen because only OpenVR is compiled with -stdlib=libc++ if Clang is used

Modified: trunk/Source/cmake/OptionsWinCairo.cmake (229028 => 229029)


--- trunk/Source/cmake/OptionsWinCairo.cmake	2018-02-26 18:01:12 UTC (rev 229028)
+++ trunk/Source/cmake/OptionsWinCairo.cmake	2018-02-26 19:08:33 UTC (rev 229029)
@@ -4,6 +4,7 @@
 
 if (ENABLE_WIN_CAIRO_WEBKIT)
     set(ENABLE_WEBKIT ON)
+    add_definitions(-DBUILDING_WIN_CAIRO_WEBKIT=1)
 endif ()
 
 find_package(Cairo 1.14.10 REQUIRED)

Modified: trunk/Tools/ChangeLog (229028 => 229029)


--- trunk/Tools/ChangeLog	2018-02-26 18:01:12 UTC (rev 229028)
+++ trunk/Tools/ChangeLog	2018-02-26 19:08:33 UTC (rev 229029)
@@ -1,3 +1,12 @@
+2018-02-26  Yousuke Kimoto  <[email protected]>
+
+        [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  <[email protected]>
 
         [WK2] http/tests/navigation/new-window-redirect-history.html crashes

Modified: trunk/Tools/TestWebKitAPI/config.h (229028 => 229029)


--- trunk/Tools/TestWebKitAPI/config.h	2018-02-26 18:01:12 UTC (rev 229028)
+++ trunk/Tools/TestWebKitAPI/config.h	2018-02-26 19:08:33 UTC (rev 229029)
@@ -45,7 +45,7 @@
 
 #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
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to