Attachment 319518 Details for Bug 176173 – Patch

[patch] Patch

bug-176173.diff (text/plain), 15.28 KB, created by Don Olmstead on 2017-08-31 13:53:42 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2017-08-31 13:53:42 PDT

Size: 15.28 KB

patch

obsolete

>diff --git a/ChangeLog b/ChangeLog
>index 2d9f7aae65c..fc63ca3bd79 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,13 @@
>+2017-08-31  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Make USE_CF conditional within Windows
>+        https://bugs.webkit.org/show_bug.cgi?id=176173
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Source/cmake/OptionsAppleWin.cmake:
>+        * Source/cmake/OptionsWinCairo.cmake:
>+
> 2017-08-30  Don Olmstead  <don.olmstead@sony.com>
> 
>         [CMake][WinCairo] Use find_package for libpng and libjpeg
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index b5b5c0ee4f7..0dd2844ebda 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,12 @@
>+2017-08-31  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Make USE_CF conditional within Windows
>+        https://bugs.webkit.org/show_bug.cgi?id=176173
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * PlatformWin.cmake:
>+
> 2017-08-22  Filip Pizlo  <fpizlo@apple.com>
> 
>         Strings need to be in some kind of gigacage
>diff --git a/Source/JavaScriptCore/PlatformWin.cmake b/Source/JavaScriptCore/PlatformWin.cmake
>index 5ae40045130..b348eaeafba 100644
>--- a/Source/JavaScriptCore/PlatformWin.cmake
>+++ b/Source/JavaScriptCore/PlatformWin.cmake
>@@ -1,19 +1,23 @@
> list(APPEND JavaScriptCore_SOURCES
>     API/JSStringRefBSTR.cpp
>-    API/JSStringRefCF.cpp
> )
> 
> list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
>     ${CMAKE_BINARY_DIR}/../include/private
> )
> 
>-if (WTF_PLATFORM_WIN_CAIRO)
>-    list(APPEND JavaScriptCore_LIBRARIES
>-        CFLite
>+if (USE_CF)
>+    list(APPEND JavaScriptCore_SOURCES
>+        API/JSStringRefCF.cpp
>     )
>-else ()
>+
>+    list(APPEND JavaScriptCore_LIBRARIES
>+        ${COREFOUNDATION_LIBRARY}
>+    )
>+endif ()
>+
>+if (NOT WTF_PLATFORM_WIN_CAIRO)
>     list(APPEND JavaScriptCore_LIBRARIES
>-        CoreFoundation${DEBUG_SUFFIX}
>         ${ICU_LIBRARIES}
>         winmm
>     )
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index fc7baf654bb..41d7f51fd3a 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,13 @@
>+2017-08-31  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Make USE_CF conditional within Windows
>+        https://bugs.webkit.org/show_bug.cgi?id=176173
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * wtf/Platform.h:
>+        * wtf/PlatformWin.cmake:
>+
> 2017-08-22  Filip Pizlo  <fpizlo@apple.com>
> 
>         Strings need to be in some kind of gigacage
>diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
>index 06434af5f9d..3f8a53516ca 100644
>--- a/Source/WTF/wtf/Platform.h
>+++ b/Source/WTF/wtf/Platform.h
>@@ -622,10 +622,6 @@
> 
> #endif /* PLATFORM(IOS) */
> 
>-#if PLATFORM(WIN) && !USE(WINGDI)
>-#define USE_CF 1
>-#endif
>-
> #if PLATFORM(WIN) && !USE(WINGDI) && !PLATFORM(WIN_CAIRO)
> #define USE_CFURLCONNECTION 1
> #endif
>@@ -1277,7 +1273,7 @@
> #define USE_MEDIAREMOTE 1
> #endif
> 
>-#if COMPILER(MSVC)
>+#if COMPILER(MSVC) && !COMPILER(CLANG)
> /* Enable strict runtime stack buffer checks. */
> #pragma strict_gs_check(on)
> #endif
>diff --git a/Source/WTF/wtf/PlatformWin.cmake b/Source/WTF/wtf/PlatformWin.cmake
>index 0b91634d560..780ef825cba 100644
>--- a/Source/WTF/wtf/PlatformWin.cmake
>+++ b/Source/WTF/wtf/PlatformWin.cmake
>@@ -7,11 +7,6 @@ list(APPEND WTF_SOURCES
> 
>     text/win/TextBreakIteratorInternalICUWin.cpp
> 
>-    text/cf/AtomicStringImplCF.cpp
>-    text/cf/StringCF.cpp
>-    text/cf/StringImplCF.cpp
>-    text/cf/StringViewCF.cpp
>-
>     win/CPUTimeWin.cpp
>     win/MainThreadWin.cpp
>     win/MemoryFootprintWin.cpp
>@@ -24,14 +19,15 @@ list(APPEND WTF_HEADERS
>     "${DERIVED_SOURCES_WTF_DIR}/AVFoundationHeaderDetection.h"
> )
> 
>-if (${WTF_PLATFORM_WIN_CAIRO})
>-    list(APPEND WTF_LIBRARIES
>-        cflite
>-    )
>-else ()
>-    list(APPEND WTF_LIBRARIES
>-        CoreFoundation${DEBUG_SUFFIX}
>+if (USE_CF)
>+    list(APPEND WTF_SOURCES
>+        text/cf/AtomicStringImplCF.cpp
>+        text/cf/StringCF.cpp
>+        text/cf/StringImplCF.cpp
>+        text/cf/StringViewCF.cpp
>     )
>+
>+    list(APPEND WTF_LIBRARIES ${COREFOUNDATION_LIBRARY})
> endif ()
> 
> add_custom_command(
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d3cc12a7889..65f1c84cbba 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2017-08-31  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Make USE_CF conditional within Windows
>+        https://bugs.webkit.org/show_bug.cgi?id=176173
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        No new tests (OOPS!).
>+
>+        * PlatformWin.cmake:
>+        * WebCorePrefix.h:
>+        * platform/text/win/LocaleWin.cpp:
>+        (WebCore::LocaleWin::getLocaleInfoString):
>+        * testing/js/WebCoreTestSupportPrefix.h:
>+
> 2017-08-22  Darin Adler  <darin@apple.com>
> 
>         REGRESSION (r220052): ASSERTION FAILED: !frame().isMainFrame() || !needsStyleRecalcOrLayout()  in WebCore::FrameView::updateLayoutAndStyleIfNeededRecursive()
>diff --git a/Source/WebCore/PlatformWin.cmake b/Source/WebCore/PlatformWin.cmake
>index ddc8172b229..9a4b4dafeec 100644
>--- a/Source/WebCore/PlatformWin.cmake
>+++ b/Source/WebCore/PlatformWin.cmake
>@@ -28,8 +28,6 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
>     "${FORWARDING_HEADERS_DIR}/WTF"
>     "${WEBCORE_DIR}/accessibility/win"
>     "${WEBCORE_DIR}/page/win"
>-    "${WEBCORE_DIR}/platform/cf"
>-    "${WEBCORE_DIR}/platform/cf/win"
>     "${WEBCORE_DIR}/platform/graphics/egl"
>     "${WEBCORE_DIR}/platform/graphics/opengl"
>     "${WEBCORE_DIR}/platform/graphics/opentype"
>@@ -50,8 +48,6 @@ list(APPEND WebCore_SOURCES
> 
>     html/HTMLSelectElementWin.cpp
> 
>-    loader/archive/cf/LegacyWebArchive.cpp
>-
>     page/win/DragControllerWin.cpp
>     page/win/EventHandlerWin.cpp
>     page/win/FrameWin.cpp
>@@ -62,15 +58,6 @@ list(APPEND WebCore_SOURCES
> 
>     platform/audio/PlatformMediaSessionManager.cpp
> 
>-    platform/cf/CFURLExtras.cpp
>-    platform/cf/FileSystemCF.cpp
>-    platform/cf/KeyedDecoderCF.cpp
>-    platform/cf/KeyedEncoderCF.cpp
>-    platform/cf/SharedBufferCF.cpp
>-    platform/cf/URLCF.cpp
>-
>-    platform/cf/win/CertificateCFWin.cpp
>-
>     platform/graphics/GraphicsContext3DPrivate.cpp
> 
>     platform/graphics/egl/GLContextEGL.cpp
>@@ -110,8 +97,6 @@ list(APPEND WebCore_SOURCES
> 
>     platform/text/LocaleNone.cpp
> 
>-    platform/text/cf/HyphenationCF.cpp
>-
>     platform/win/BString.cpp
>     platform/win/BitmapInfo.cpp
>     platform/win/ClipboardUtilitiesWin.cpp
>@@ -201,8 +186,6 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORIES
> 
>     css/parser
> 
>-    history/cf
>-
>     html/forms
>     html/parser
>     html/shadow
>@@ -213,7 +196,6 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORIES
>     loader/cache
>     loader/icon
> 
>-    loader/archive/cf
> 
>     page/animation
>     page/csp
>@@ -222,7 +204,6 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORIES
> 
>     platform/animation
>     platform/audio
>-    platform/cf
>     platform/graphics
>     platform/mock
>     platform/network
>@@ -230,8 +211,6 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORIES
>     platform/text
>     platform/win
> 
>-    platform/cf/win
>-
>     platform/graphics/filters
>     platform/graphics/opengl
>     platform/graphics/opentype
>@@ -255,6 +234,38 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORIES
>     svg/graphics/filters
> )
> 
>+if (USE_CF)
>+    list(APPEND WebCore_INCLUDE_DIRECTORIES
>+        "${WEBCORE_DIR}/platform/cf"
>+        "${WEBCORE_DIR}/platform/cf/win"
>+    )
>+
>+    list(APPEND WebCore_SOURCES
>+        loader/archive/cf/LegacyWebArchive.cpp
>+
>+        platform/cf/CFURLExtras.cpp
>+        platform/cf/FileSystemCF.cpp
>+        platform/cf/KeyedDecoderCF.cpp
>+        platform/cf/KeyedEncoderCF.cpp
>+        platform/cf/SharedBufferCF.cpp
>+        platform/cf/URLCF.cpp
>+
>+        platform/cf/win/CertificateCFWin.cpp
>+
>+        platform/text/cf/HyphenationCF.cpp
>+    )
>+
>+    list(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
>+        history/cf
>+
>+        loader/archive/cf
>+
>+        platform/cf
>+
>+        platform/cf/win
>+    )
>+endif ()
>+
> if (CMAKE_SIZEOF_VOID_P EQUAL 4)
>     list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/makesafeseh.obj)
>     add_custom_command(
>diff --git a/Source/WebCore/WebCorePrefix.h b/Source/WebCore/WebCorePrefix.h
>index ebfacc6eed4..61a59a5d144 100644
>--- a/Source/WebCore/WebCorePrefix.h
>+++ b/Source/WebCore/WebCorePrefix.h
>@@ -92,7 +92,9 @@
> #include <sys/resource.h>
> #endif
> 
>+#if USE(CF)
> #include <CoreFoundation/CoreFoundation.h>
>+#endif
> 
> #if OS(WINDOWS)
> #ifndef CF_IMPLICIT_BRIDGING_ENABLED
>@@ -103,7 +105,9 @@
> #define CF_IMPLICIT_BRIDGING_DISABLED
> #endif
> 
>+#if USE(CF)
> #include <CoreFoundation/CFBase.h>
>+#endif
> 
> #ifndef CF_ENUM
> #define CF_ENUM(_type, _name) _type _name; enum
>@@ -120,7 +124,6 @@
> #endif
> 
> #if PLATFORM(WIN_CAIRO)
>-#include <ConditionalMacros.h>
> #include <windows.h>
> #else
> 
>diff --git a/Source/WebCore/platform/text/win/LocaleWin.cpp b/Source/WebCore/platform/text/win/LocaleWin.cpp
>index 99ef0ad0ed3..1bf3bf47e44 100644
>--- a/Source/WebCore/platform/text/win/LocaleWin.cpp
>+++ b/Source/WebCore/platform/text/win/LocaleWin.cpp
>@@ -101,7 +101,8 @@ String LocaleWin::getLocaleInfoString(LCTYPE type)
>     Vector<UChar> buffer(bufferSizeWithNUL);
>     ::GetLocaleInfo(m_lcid, type, buffer.data(), bufferSizeWithNUL);
>     buffer.shrink(bufferSizeWithNUL - 1);
>-    return String::adopt(WTFMove(buffer));
>+	return String();
>+	//return String::adopt(WTFMove(buffer));
> }
> 
> void LocaleWin::getLocaleInfo(LCTYPE type, DWORD& result)
>diff --git a/Source/WebCore/testing/js/WebCoreTestSupportPrefix.h b/Source/WebCore/testing/js/WebCoreTestSupportPrefix.h
>index ad6959bf624..fe3a7f5c60a 100644
>--- a/Source/WebCore/testing/js/WebCoreTestSupportPrefix.h
>+++ b/Source/WebCore/testing/js/WebCoreTestSupportPrefix.h
>@@ -95,9 +95,11 @@
> #include <sys/time.h>
> #endif
> 
>+#if USE(CF)
> #include <CoreFoundation/CoreFoundation.h>
>+#endif
>+
> #if PLATFORM(WIN_CAIRO)
>-#include <ConditionalMacros.h>
> #include <windows.h>
> #else
> 
>diff --git a/Source/WebKitLegacy/ChangeLog b/Source/WebKitLegacy/ChangeLog
>index 6dbe3dcc414..1a57f602588 100644
>--- a/Source/WebKitLegacy/ChangeLog
>+++ b/Source/WebKitLegacy/ChangeLog
>@@ -1,3 +1,12 @@
>+2017-08-31  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Make USE_CF conditional within Windows
>+        https://bugs.webkit.org/show_bug.cgi?id=176173
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * PlatformWin.cmake:
>+
> 2017-08-30  Andy Estes  <aestes@apple.com>
> 
>         [Mac] Upstream Carbon-related WebKitSystemInterface functions
>diff --git a/Source/WebKitLegacy/PlatformWin.cmake b/Source/WebKitLegacy/PlatformWin.cmake
>index 9c1f1a851af..c0a547ffbdf 100644
>--- a/Source/WebKitLegacy/PlatformWin.cmake
>+++ b/Source/WebKitLegacy/PlatformWin.cmake
>@@ -21,7 +21,6 @@ else ()
>     )
>     list(APPEND WebKit_LIBRARIES
>         PRIVATE CFNetwork${DEBUG_SUFFIX}
>-        PRIVATE CoreFoundation${DEBUG_SUFFIX}
>         PRIVATE CoreGraphics${DEBUG_SUFFIX}
>         PRIVATE CoreText${DEBUG_SUFFIX}
>         PRIVATE QuartzCore${DEBUG_SUFFIX}
>@@ -129,8 +128,6 @@ list(APPEND WebKit_INCLUDES
> )
> 
> list(APPEND WebKit_SOURCES_Classes
>-    cf/WebCoreSupport/WebInspectorClientCF.cpp
>-
>     win/AccessibleBase.cpp
>     win/AccessibleDocument.cpp
>     win/AccessibleImage.cpp
>@@ -245,6 +242,16 @@ list(APPEND WebKit_SOURCES_WebCoreSupport
>     win/WebCoreSupport/WebVisitedLinkStore.h
> )
> 
>+if (USE_CF)
>+    list(APPEND WebKit_SOURCES_Classes
>+        cf/WebCoreSupport/WebInspectorClientCF.cpp
>+    )
>+
>+    list(APPEND WebKit_LIBRARIES
>+        ${COREFOUNDATION_LIBRARY}
>+    )
>+endif ()
>+
> if (CMAKE_SIZEOF_VOID_P EQUAL 8)
>     enable_language(ASM_MASM)
>     if (MSVC)
>diff --git a/Source/cmake/OptionsAppleWin.cmake b/Source/cmake/OptionsAppleWin.cmake
>index d3154897979..47b8deecfef 100644
>--- a/Source/cmake/OptionsAppleWin.cmake
>+++ b/Source/cmake/OptionsAppleWin.cmake
>@@ -1,11 +1,13 @@
> include(OptionsWin)
> 
>-set(USE_CG 1)
>+SET_AND_EXPOSE_TO_BUILD(USE_CF ON)
>+SET_AND_EXPOSE_TO_BUILD(USE_CFURLCONNECTION ON)
>+
> set(USE_CA 1)
>-set(USE_CFURLCONNECTION 1)
> set(USE_ICU_UNICODE 1)
> 
> # Libraries where find_package does not work
>+set(COREFOUNDATION_LIBRARY CoreFoundation${DEBUG_SUFFIX})
> set(LIBXML2_LIBRARIES libxml2${DEBUG_SUFFIX})
> set(LIBXSLT_LIBRARIES libxslt${DEBUG_SUFFIX})
> set(SQLITE_LIBRARIES SQLite3${DEBUG_SUFFIX})
>diff --git a/Source/cmake/OptionsWinCairo.cmake b/Source/cmake/OptionsWinCairo.cmake
>index b27dba48578..3ccde45dc4a 100644
>--- a/Source/cmake/OptionsWinCairo.cmake
>+++ b/Source/cmake/OptionsWinCairo.cmake
>@@ -16,12 +16,14 @@ if (ENABLE_XSLT)
> endif ()
> 
> SET_AND_EXPOSE_TO_BUILD(USE_CAIRO ON)
>+SET_AND_EXPOSE_TO_BUILD(USE_CF ON)
> 
>-set(USE_CF 1)
> set(USE_CURL 1)
> set(USE_ICU_UNICODE 1)
> set(USE_TEXTURE_MAPPER_GL 1)
> 
> set(ENABLE_GRAPHICS_CONTEXT_3D 1)
> 
>+set(COREFOUNDATION_LIBRARY CFlite)
>+
> add_definitions(-DWTF_PLATFORM_WIN_CAIRO=1)
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 376ed097ecc..84e6fa38076 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2017-08-31  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [CMake] Make USE_CF conditional within Windows
>+        https://bugs.webkit.org/show_bug.cgi?id=176173
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * DumpRenderTree/config.h:
>+        * MiniBrowser/win/CMakeLists.txt:
>+        * MiniBrowser/win/stdafx.h:
>+        * TestWebKitAPI/PlatformWin.cmake:
>+
> 2017-08-31  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         [GTK] Several InputMethodFilter tests are failing and crashing
>diff --git a/Tools/DumpRenderTree/config.h b/Tools/DumpRenderTree/config.h
>index 78d85009ddc..d43e48dc6eb 100644
>--- a/Tools/DumpRenderTree/config.h
>+++ b/Tools/DumpRenderTree/config.h
>@@ -37,12 +37,10 @@
> #endif
> 
> #if PLATFORM(WIN)
>-#define USE_CF 1 
> #if PLATFORM(WIN_CAIRO)
> #define USE_CURL 1
> #else
> #define USE_CG 1
>-#define USE_CFURLCONNECTION 1
> #endif
> 
> #undef _WINSOCKAPI_
>diff --git a/Tools/MiniBrowser/win/CMakeLists.txt b/Tools/MiniBrowser/win/CMakeLists.txt
>index ffe2593d7fd..e4eca5e5579 100644
>--- a/Tools/MiniBrowser/win/CMakeLists.txt
>+++ b/Tools/MiniBrowser/win/CMakeLists.txt
>@@ -30,13 +30,9 @@ set(MiniBrowser_LIBRARIES
>     shlwapi
> )
> 
>-if (WTF_PLATFORM_WIN_CAIRO)
>+if (USE_CF)
>     list(APPEND MiniBrowser_LIBRARIES
>-        CFLite
>-    )
>-else ()
>-    list(APPEND MiniBrowser_LIBRARIES
>-        CoreFoundation
>+        ${COREFOUNDATION_LIBRARY}
>     )
> endif ()
> 
>diff --git a/Tools/MiniBrowser/win/stdafx.h b/Tools/MiniBrowser/win/stdafx.h
>index 0e0c74916a9..c78d4c1e5b8 100644
>--- a/Tools/MiniBrowser/win/stdafx.h
>+++ b/Tools/MiniBrowser/win/stdafx.h
>@@ -30,6 +30,10 @@
> 
> #pragma once
> 
>+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H && defined(BUILDING_WITH_CMAKE)
>+#include "cmakeconfig.h"
>+#endif
>+
> #define WIN32_LEAN_AND_MEAN        // Exclude rarely-used stuff from Windows headers
> 
> // Needed for limit defines, like INTMAX_MAX, which is used by the std C++ library
>diff --git a/Tools/TestWebKitAPI/PlatformWin.cmake b/Tools/TestWebKitAPI/PlatformWin.cmake
>index f203950edd4..6ab56ffd3e2 100644
>--- a/Tools/TestWebKitAPI/PlatformWin.cmake
>+++ b/Tools/TestWebKitAPI/PlatformWin.cmake
>@@ -86,7 +86,6 @@ else ()
>     list(APPEND test_webcore_LIBRARIES
>         ASL${DEBUG_SUFFIX}
>         CFNetwork${DEBUG_SUFFIX}
>-        CoreFoundation${DEBUG_SUFFIX}
>         CoreGraphics${DEBUG_SUFFIX}
>         CoreText${DEBUG_SUFFIX}
>         QuartzCore${DEBUG_SUFFIX}
>@@ -99,6 +98,12 @@ else ()
>     )
> endif ()
> 
>+if (USE_CF)
>+    list(APPEND test_webcore_LIBRARIES
>+        ${COREFOUNDATION_LIBRARY}
>+    )
>+endif ()
>+
> add_library(TestWTFLib SHARED
>     ${test_main_SOURCES}
>     ${TestWTF_SOURCES}

Actions: View | Formatted Diff | Diff

Attachments on bug 176173: 319490 | 319518 | 319523