Attachment 465020 Details for Bug 252381 – [fast-cq] REVERT of 260269@main

[patch] [fast-cq] REVERT of 260269@main

bug-252381-20230216000115.patch (text/plain), 1.86 KB, created by WebKit Commit Bot on 2023-02-16 00:01:15 PST

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2023-02-16 00:01:15 PST

Size: 1.86 KB

patch

obsolete

>From 228090a0cd42a346bd0fd94d0976827f1d8645a6 Mon Sep 17 00:00:00 2001
>From: Commit Queue <commit-queue@webkit.org>
>Date: Thu, 16 Feb 2023 00:00:48 -0800
>Subject: [PATCH] Unreviewed, reverting r260269@main.
> https://bugs.webkit.org/show_bug.cgi?id=252381
>
>causes some layout test failures
>
>Reverted changeset:
>
>"[WinCairo] Remove CFLite dependency"
>https://bugs.webkit.org/show_bug.cgi?id=175336
>https://commits.webkit.org/260269@main
>---
> Source/WTF/wtf/URL.cpp        | 6 +++++-
> Source/cmake/OptionsWin.cmake | 2 ++
> 2 files changed, 7 insertions(+), 1 deletion(-)
>
>diff --git a/Source/WTF/wtf/URL.cpp b/Source/WTF/wtf/URL.cpp
>index f58be49d0d1c..128007fba574 100644
>--- a/Source/WTF/wtf/URL.cpp
>+++ b/Source/WTF/wtf/URL.cpp
>@@ -276,7 +276,11 @@ String URL::fileSystemPath() const
>     if (!isLocalFile())
>         return { };
> 
>-    return decodeEscapeSequencesFromParsedURL(path());
>+    auto result = decodeEscapeSequencesFromParsedURL(path());
>+#if PLATFORM(WIN)
>+    result = FileSystem::fileSystemRepresentation(result);
>+#endif
>+    return result;
> }
> 
> #endif
>diff --git a/Source/cmake/OptionsWin.cmake b/Source/cmake/OptionsWin.cmake
>index 7e4ecf1d1d14..5acf73d27b4e 100644
>--- a/Source/cmake/OptionsWin.cmake
>+++ b/Source/cmake/OptionsWin.cmake
>@@ -74,6 +74,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
> 
> set(CMAKE_DISABLE_PRECOMPILE_HEADERS OFF)
> 
>+find_package(Apple REQUIRED COMPONENTS CoreFoundation)
> find_package(Cairo 1.15.12 REQUIRED)
> find_package(CURL 7.77.0 REQUIRED)
> find_package(ICU 61.2 REQUIRED COMPONENTS data i18n uc)
>@@ -196,6 +197,7 @@ set(USE_ANGLE_EGL ON)
> 
> SET_AND_EXPOSE_TO_BUILD(USE_ANGLE ON)
> SET_AND_EXPOSE_TO_BUILD(USE_CAIRO ON)
>+SET_AND_EXPOSE_TO_BUILD(USE_CF ON)
> SET_AND_EXPOSE_TO_BUILD(USE_CURL ON)
> SET_AND_EXPOSE_TO_BUILD(USE_GRAPHICS_LAYER_TEXTURE_MAPPER ON)
> SET_AND_EXPOSE_TO_BUILD(USE_GRAPHICS_LAYER_WC ON)

Actions: View | Formatted Diff | Diff

Attachments on bug 252381: 465020