Attachment 362623 Details for Bug 194879 – Patch

[patch] Patch

bug-194879.diff (text/plain), 3.06 KB, created by Don Olmstead on 2019-02-21 11:29:57 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2019-02-21 11:29:57 PST

Size: 3.06 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 2399fa5be12..9efe0616a02 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-02-21  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake][Win] Fix !USE(CF) build of WebCore
>+        https://bugs.webkit.org/show_bug.cgi?id=194879
>+
>+        Reviewed by Konstantin Tokarev.
>+
>+        * PlatformAppleWin.cmake:
>+        * PlatformWin.cmake:
>+        * PlatformWinCairo.cmake:
>+
> 2019-02-21  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][Floats] Add support for placing formatting roots in-between floats.
>diff --git a/Source/WebCore/PlatformAppleWin.cmake b/Source/WebCore/PlatformAppleWin.cmake
>index 436ca87598a..8021bb3eee5 100644
>--- a/Source/WebCore/PlatformAppleWin.cmake
>+++ b/Source/WebCore/PlatformAppleWin.cmake
>@@ -65,6 +65,8 @@ list(APPEND WebCore_SOURCES
>     platform/network/cf/ResourceResponseCFNet.cpp
>     platform/network/cf/SocketStreamHandleImplCFNet.cpp
>     platform/network/cf/SynchronousLoaderClientCFNet.cpp
>+
>+    platform/text/LocaleNone.cpp
> )
> 
> if (${USE_DIRECT2D})
>diff --git a/Source/WebCore/PlatformWin.cmake b/Source/WebCore/PlatformWin.cmake
>index fcb57a45a5f..aae21233005 100644
>--- a/Source/WebCore/PlatformWin.cmake
>+++ b/Source/WebCore/PlatformWin.cmake
>@@ -22,7 +22,6 @@ list(APPEND WebCore_SOURCES
>     accessibility/win/AccessibilityObjectWin.cpp
>     accessibility/win/AccessibilityObjectWrapperWin.cpp
> 
>-    editing/SmartReplaceCF.cpp
>     editing/win/EditorWin.cpp
> 
>     html/HTMLSelectElementWin.cpp
>@@ -74,8 +73,6 @@ list(APPEND WebCore_SOURCES
>     platform/network/win/DownloadBundleWin.cpp
>     platform/network/win/NetworkStateNotifierWin.cpp
> 
>-    platform/text/LocaleNone.cpp
>-
>     platform/win/BString.cpp
>     platform/win/BitmapInfo.cpp
>     platform/win/ClipboardUtilitiesWin.cpp
>@@ -244,6 +241,8 @@ if (USE_CF)
>     )
> 
>     list(APPEND WebCore_SOURCES
>+        editing/SmartReplaceCF.cpp
>+
>         loader/archive/cf/LegacyWebArchive.cpp
> 
>         platform/cf/KeyedDecoderCF.cpp
>@@ -264,6 +263,20 @@ if (USE_CF)
> 
>         platform/cf/win
>     )
>+
>+    list(APPEND WebCore_LIBRARIES ${COREFOUNDATION_LIBRARY})
>+    list(APPEND WebCoreTestSupport_LIBRARIES ${COREFOUNDATION_LIBRARY})
>+else ()
>+    list(APPEND WebCore_SOURCES
>+        platform/generic/KeyedDecoderGeneric.cpp
>+        platform/generic/KeyedEncoderGeneric.cpp
>+
>+        platform/text/Hyphenation.cpp
>+    )
>+
>+    list(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
>+        platform/generic
>+    )
> endif ()
> 
> if (CMAKE_SIZEOF_VOID_P EQUAL 4)
>diff --git a/Source/WebCore/PlatformWinCairo.cmake b/Source/WebCore/PlatformWinCairo.cmake
>index 434bc43932f..b0565a09c88 100644
>--- a/Source/WebCore/PlatformWinCairo.cmake
>+++ b/Source/WebCore/PlatformWinCairo.cmake
>@@ -36,9 +36,7 @@ list(APPEND WebCore_SOURCES
> )
> 
> list(APPEND WebCore_LIBRARIES
>-    ${CURL_LIBRARY}
>     ${DirectX_LIBRARIES}
>-    CFLite
>     comctl32
>     crypt32
>     iphlpapi
>@@ -52,7 +50,6 @@ list(APPEND WebCore_LIBRARIES
> 
> list(APPEND WebCoreTestSupport_LIBRARIES
>     ${CAIRO_LIBRARIES}
>-    CFLite
>     shlwapi
> )
>

Actions: View | Formatted Diff | Diff

Attachments on bug 194879: 362562 | 362582 | 362615 | 362621 | 362623