Changeset 232038 in webkit

Timestamp:

May 21, 2018 5:03:20 PM (6 years ago)

Author:

Fujii Hironori

Message:

[WinCairo] Enable WebKit build by default
​https://bugs.webkit.org/show_bug.cgi?id=185141

Reviewed by Per Arne Vollan.

.:

• Source/cmake/OptionsWin.cmake: Disable

ENABLE_NETSCAPE_PLUGIN_API unconditionally for WinCairo port
because it builds both WK1 and WK2.

• Source/cmake/OptionsWinCairo.cmake: Turn ENABLE_WEBKIT on by default.

Remove BUILDING_WIN_CAIRO_WEBKIT macro.

Tools:

TestWTF, TestWebCore and TestWebKitLegacy need a dependency to
WebKitForwardingHeaders because config.h includes a header of WK2.

• TestWebKitAPI/PlatformWin.cmake: Make TestWTFLib, TestWebCoreLib and TestWebKitLegacyLib depend on WebKitForwardingHeaders.
• TestWebKitAPI/config.h: Use PLATFORM(WIN_CAIRO) instead of BUILDING_WIN_CAIRO_WEBKIT.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/OptionsWin.cmake (modified) (1 diff)
• Source/cmake/OptionsWinCairo.cmake (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/PlatformWin.cmake (modified) (4 diffs)
• Tools/TestWebKitAPI/config.h (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2018-05-21  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [WinCairo] Enable WebKit build by default
+        https://bugs.webkit.org/show_bug.cgi?id=185141
+
+        Reviewed by Per Arne Vollan.
+
+        * Source/cmake/OptionsWin.cmake: Disable
+        ENABLE_NETSCAPE_PLUGIN_API unconditionally for WinCairo port
+        because it builds both WK1 and WK2.
+        * Source/cmake/OptionsWinCairo.cmake: Turn ENABLE_WEBKIT on by default.
+        Remove BUILDING_WIN_CAIRO_WEBKIT macro.
+
 2018-05-21  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/cmake/OptionsWin.cmake

@@ -84 +84 @@
 
     # FIXME: Implement plugin process on Modern WebKit. https://bugs.webkit.org/show_bug.cgi?id=185313
-    if (ENABLE_WIN_CAIRO_WEBKIT)
-        WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF)
-    endif ()
+    WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF)
 else ()
     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_ENCRYPTED_MEDIA PUBLIC ON)

trunk/Source/cmake/OptionsWinCairo.cmake

@@ -2 +2 @@
 
 include(OptionsWin)
-
-if (ENABLE_WIN_CAIRO_WEBKIT)
-    set(ENABLE_WEBKIT ON)
-    add_definitions(-DBUILDING_WIN_CAIRO_WEBKIT=1)
-endif ()
 
 find_package(Cairo 1.15.12 REQUIRED)
@@ -35 +30 @@
 
 set(ENABLE_GRAPHICS_CONTEXT_3D ON)
+set(ENABLE_WEBKIT ON)
 
 set(COREFOUNDATION_LIBRARY CFlite)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-05-21  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [WinCairo] Enable WebKit build by default
+        https://bugs.webkit.org/show_bug.cgi?id=185141
+
+        Reviewed by Per Arne Vollan.
+
+        TestWTF, TestWebCore and TestWebKitLegacy need a dependency to
+        WebKitForwardingHeaders because config.h includes a header of WK2.
+
+        * TestWebKitAPI/PlatformWin.cmake: Make TestWTFLib, TestWebCoreLib and TestWebKitLegacyLib depend on WebKitForwardingHeaders.
+        * TestWebKitAPI/config.h: Use PLATFORM(WIN_CAIRO) instead of BUILDING_WIN_CAIRO_WEBKIT.
+
 2018-05-21  Jer Noble  <jer.noble@apple.com>
 

trunk/Tools/TestWebKitAPI/PlatformWin.cmake

@@ -99 +99 @@
 endif ()
 
+set(forwarding_headers_dependencies WebCoreForwardingHeaders PALForwardingHeaders)
+if (ENABLE_WEBKIT)
+    list(APPEND forwarding_headers_dependencies WebKitForwardingHeaders)
+endif ()
+
 add_library(TestWTFLib SHARED
     ${test_main_SOURCES}
@@ -105 +110 @@
 set_target_properties(TestWTFLib PROPERTIES OUTPUT_NAME "TestWTFLib")
 target_link_libraries(TestWTFLib ${test_wtf_LIBRARIES})
-add_dependencies(TestWTFLib WebCoreForwardingHeaders)
+add_dependencies(TestWTFLib ${forwarding_headers_dependencies})
 
 set(test_wtf_LIBRARIES
@@ -119 +124 @@
 target_link_libraries(TestWebCoreLib ${test_webcore_LIBRARIES})
 set_target_properties(TestWebCoreLib PROPERTIES OUTPUT_NAME "TestWebCoreLib")
+add_dependencies(TestWebCoreLib ${forwarding_headers_dependencies})
 
 add_executable(TestWebCore
@@ -151 +157 @@
 
     target_link_libraries(TestWebKitLegacyLib ${test_webkitlegacy_LIBRARIES})
+    add_dependencies(TestWebKitLegacyLib ${forwarding_headers_dependencies})
 
     add_executable(TestWebKitLegacy

trunk/Tools/TestWebKitAPI/config.h

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