Attachment 340819 Details for Bug 185141 – Patch

[patch] Patch

bug-185141-20180521132531.patch (text/plain), 5.31 KB, created by Fujii Hironori on 2018-05-20 21:25:33 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-05-20 21:25:33 PDT

Size: 5.31 KB

patch

obsolete

>Subversion Revision: 232008
>diff --git a/Source/cmake/OptionsWin.cmake b/Source/cmake/OptionsWin.cmake
>index 34a0494dd0cfd97be075836f5cc23268dfe26d76..88f2f4f809f977b0bf6fce120b9cd2916f22fbd8 100644
>--- a/Source/cmake/OptionsWin.cmake
>+++ b/Source/cmake/OptionsWin.cmake
>@@ -83,9 +83,7 @@ if (${WTF_PLATFORM_WIN_CAIRO})
>     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PUBLIC ON)
> 
>     # 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)
>     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTL PUBLIC OFF)
>diff --git a/Source/cmake/OptionsWinCairo.cmake b/Source/cmake/OptionsWinCairo.cmake
>index 29e7fe4b280e6fd8ea1800aaf2c3a79f68c86621..008d1f32a29dc4e3d5b8b51cd2258b9117d35392 100644
>--- a/Source/cmake/OptionsWinCairo.cmake
>+++ b/Source/cmake/OptionsWinCairo.cmake
>@@ -2,11 +2,6 @@ set(WTF_PLATFORM_WIN_CAIRO 1)
> 
> 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)
> find_package(CURL 7.60.0 REQUIRED)
> find_package(JPEG 1.5.2 REQUIRED)
>@@ -34,6 +29,7 @@ SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER_GL ON)
> SET_AND_EXPOSE_TO_BUILD(USE_MEDIA_FOUNDATION ON)
> 
> set(ENABLE_GRAPHICS_CONTEXT_3D ON)
>+set(ENABLE_WEBKIT ON)
> 
> set(COREFOUNDATION_LIBRARY CFlite)
> 
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 083c7f98d210e4e684dd5d2ea0beacf1184ff015..ffcc81d859ebaa2fc5ad12d424cf8dfc58072816 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-05-20  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        [WinCairo] Enable WebKit build by default
>+        https://bugs.webkit.org/show_bug.cgi?id=185141
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-19  Sihui Liu  <sihui_liu@apple.com>
> 
>         Flaky API test WebKit.WKHTTPCookieStoreWithoutProcessPool: incorrect order of cookies
>diff --git a/Tools/TestWebKitAPI/PlatformWin.cmake b/Tools/TestWebKitAPI/PlatformWin.cmake
>index c8b44dbdd09bf56e256cdda4df107f8393ecee1f..fc6309eed1cb9b49023911fdb5f9eef1e6438109 100644
>--- a/Tools/TestWebKitAPI/PlatformWin.cmake
>+++ b/Tools/TestWebKitAPI/PlatformWin.cmake
>@@ -98,13 +98,18 @@ if (USE_CF)
>     )
> endif ()
> 
>+set(forwarding_headers_dependencies WebCoreForwardingHeaders PALForwardingHeaders)
>+if (ENABLE_WEBKIT)
>+    list(APPEND forwarding_headers_dependencies WebKitForwardingHeaders)
>+endif ()
>+
> add_library(TestWTFLib SHARED
>     ${test_main_SOURCES}
>     ${TestWTF_SOURCES}
> )
> 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
>     shlwapi
>@@ -118,6 +123,7 @@ add_library(TestWebCoreLib SHARED
> 
> target_link_libraries(TestWebCoreLib ${test_webcore_LIBRARIES})
> set_target_properties(TestWebCoreLib PROPERTIES OUTPUT_NAME "TestWebCoreLib")
>+add_dependencies(TestWebCoreLib ${forwarding_headers_dependencies})
> 
> add_executable(TestWebCore
>     ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
>@@ -150,6 +156,7 @@ if (ENABLE_WEBKIT_LEGACY)
>     )
> 
>     target_link_libraries(TestWebKitLegacyLib ${test_webkitlegacy_LIBRARIES})
>+    add_dependencies(TestWebKitLegacyLib ${forwarding_headers_dependencies})
> 
>     add_executable(TestWebKitLegacy
>         ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
>diff --git a/Tools/TestWebKitAPI/config.h b/Tools/TestWebKitAPI/config.h
>index a3aa45aac17dcf888f570dab6819e1775fa0549b..edf8a6f1f56b0bedffe84e660ee8ef504c4c52ca 100644
>--- a/Tools/TestWebKitAPI/config.h
>+++ b/Tools/TestWebKitAPI/config.h
>@@ -45,7 +45,7 @@
> 
> #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
> 
>diff --git a/ChangeLog b/ChangeLog
>index be8ab03cb7e5782a5972813bf0aff9464cae8727..9a05f2672228d0dd018d7f76469348c6d5aad1dc 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-05-20  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        [WinCairo] Enable WebKit build by default
>+        https://bugs.webkit.org/show_bug.cgi?id=185141
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * 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-17  Carlos Alberto Lopez Perez  <clopez@igalia.com>
> 
>         [WPE] Implement and enable FULLSCREEN_API

Actions: View | Formatted Diff | Diff

Attachments on bug 185141: 340685 | 340698 | 340730 | 340819