Attachment 340730 Details for Bug 185141 – Patch

[patch] Patch

bug-185141-20180518170359.patch (text/plain), 3.49 KB, created by Don Olmstead on 2018-05-18 12:51:15 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2018-05-18 12:51:15 PDT

Size: 3.49 KB

patch

obsolete

>Subversion Revision: 231947
>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 7f293dcefe335367ace20b2ebcf26a67b50a625a..ebd597ec9c1262707d522a08dbf964b447a44fc2 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,12 @@
>+2018-05-18  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!).
>+
>+        * TestWebKitAPI/config.h: Use PLATFORM(WIN_CAIRO) instead of BUILDING_WIN_CAIRO_WEBKIT.
>+
> 2018-05-17  Nan Wang  <n_wang@apple.com>
> 
>         AX: [macOS] Expose the primary screen height through AX API
>diff --git a/Tools/TestWebKitAPI/config.h b/Tools/TestWebKitAPI/config.h
>index a3aa45aac17dcf888f570dab6819e1775fa0549b..d68aa0c4421b304933ad9c8d7cf582e5239dd73a 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..906191b71489764d71f0c3cff0bfe4fed7cebe11 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-05-18  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