Attachment 362562 Details for Bug 194879 – Patch

[patch] Patch

bug-194879.diff (text/plain), 3.34 KB, created by Don Olmstead on 2019-02-20 16:11:45 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2019-02-20 16:11:45 PST

Size: 3.34 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 24a9da37dfa..308705bf430 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-02-20  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 NOBODY (OOPS!).
>+
>+        * PlatformWin.cmake:
>+        * PlatformWinCairo.cmake:
>+        * editing/SmartReplaceCF.cpp:
>+
> 2019-02-20  Adrian Perez de Castro  <aperez@igalia.com>
> 
>         [WPE][GTK] Enable support for CONTENT_EXTENSIONS
>diff --git a/Source/WebCore/PlatformWin.cmake b/Source/WebCore/PlatformWin.cmake
>index fcb57a45a5f..957daa776a3 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,7 +73,7 @@ list(APPEND WebCore_SOURCES
>     platform/network/win/DownloadBundleWin.cpp
>     platform/network/win/NetworkStateNotifierWin.cpp
> 
>-    platform/text/LocaleNone.cpp
>+    platform/text/win/LocaleWin.cpp
> 
>     platform/win/BString.cpp
>     platform/win/BitmapInfo.cpp
>@@ -244,6 +243,8 @@ if (USE_CF)
>     )
> 
>     list(APPEND WebCore_SOURCES
>+        editing/SmartReplaceCF.cpp
>+
>         loader/archive/cf/LegacyWebArchive.cpp
> 
>         platform/cf/KeyedDecoderCF.cpp
>@@ -264,6 +265,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..f7768ab24fd 100644
>--- a/Source/WebCore/PlatformWinCairo.cmake
>+++ b/Source/WebCore/PlatformWinCairo.cmake
>@@ -26,8 +26,6 @@ list(APPEND WebCore_SOURCES
> 
>     platform/network/win/CurlSSLHandleWin.cpp
> 
>-    platform/text/win/LocaleWin.cpp
>-
>     platform/win/DelayLoadedModulesEnumerator.cpp
>     platform/win/DragImageCairoWin.cpp
>     platform/win/ImportedFunctionsEnumerator.cpp
>@@ -36,9 +34,7 @@ list(APPEND WebCore_SOURCES
> )
> 
> list(APPEND WebCore_LIBRARIES
>-    ${CURL_LIBRARY}
>     ${DirectX_LIBRARIES}
>-    CFLite
>     comctl32
>     crypt32
>     iphlpapi
>@@ -52,7 +48,6 @@ list(APPEND WebCore_LIBRARIES
> 
> list(APPEND WebCoreTestSupport_LIBRARIES
>     ${CAIRO_LIBRARIES}
>-    CFLite
>     shlwapi
> )
> 
>diff --git a/Source/WebCore/editing/SmartReplaceCF.cpp b/Source/WebCore/editing/SmartReplaceCF.cpp
>index 85e9bc4aa4e..57e5bfe54ac 100644
>--- a/Source/WebCore/editing/SmartReplaceCF.cpp
>+++ b/Source/WebCore/editing/SmartReplaceCF.cpp
>@@ -29,6 +29,8 @@
> #include "config.h"
> #include "SmartReplace.h"
> 
>+#if USE(CF)
>+
> #include <CoreFoundation/CFCharacterSet.h>
> #include <CoreFoundation/CFString.h>
> 
>@@ -71,3 +73,5 @@ bool isCharacterSmartReplaceExempt(UChar32 c, bool isPreviousCharacter)
> }
> 
> }
>+
>+#endif // USE(CF)

Flags:

ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

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