Attachment 343334 Details for Bug 186927 – Patch

[patch] Patch

bug-186927-20180622095247.patch (text/plain), 2.72 KB, created by Ross Kirsling on 2018-06-22 09:52:47 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ross Kirsling

Created: 2018-06-22 09:52:47 PDT

Size: 2.72 KB

patch

obsolete

>Subversion Revision: 233081
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 45220a2bf3a66b39e3f3e1d25cdabd8c54ee9317..8888c9f3fe86cdd847e830e810d84b3313b1f9fc 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-06-22  Ross Kirsling  <ross.kirsling@sony.com>
>+
>+        [WinCairo] ImageDiff should use DLLLauncher
>+        https://bugs.webkit.org/show_bug.cgi?id=186927
>+
>+        ImageDiff needs to find Cairo, so it should be using DLLLauncher in the same fashion as DRT & TestWebKitAPI.
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * ImageDiff/CMakeLists.txt:
>+        * ImageDiff/ImageDiff.cpp:
>+        (dllLauncherEntryPoint):
>+        * ImageDiff/PlatformWin.cmake:
>+
> 2018-06-20  Darin Adler  <darin@apple.com>
> 
>         [Cocoa] Use the isDirectory: variants of NSURL methods more to eliminate unnecessary file system activity
>diff --git a/Tools/ImageDiff/CMakeLists.txt b/Tools/ImageDiff/CMakeLists.txt
>index 2c1ec8ead27129a328240c5aee526b6faf11685d..7ba61df4aa227f8c0d0c53255beb33f46cb770e2 100644
>--- a/Tools/ImageDiff/CMakeLists.txt
>+++ b/Tools/ImageDiff/CMakeLists.txt
>@@ -17,3 +17,7 @@ include_directories(${IMAGE_DIFF_INCLUDE_DIRECTORIES})
> include_directories(SYSTEM ${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES})
> add_executable(ImageDiff ${IMAGE_DIFF_SOURCES})
> target_link_libraries(ImageDiff ${IMAGE_DIFF_LIBRARIES})
>+
>+if (${WTF_PLATFORM_WIN_CAIRO})
>+    add_dependencies(ImageDiff ImageDiffLib)
>+endif ()
>diff --git a/Tools/ImageDiff/ImageDiff.cpp b/Tools/ImageDiff/ImageDiff.cpp
>index f8a983b83905cb622f48010e262e574980a2ca74..123a431cadf4a6a6574bea15e35f8ab6a3c4fd0d 100644
>--- a/Tools/ImageDiff/ImageDiff.cpp
>+++ b/Tools/ImageDiff/ImageDiff.cpp
>@@ -39,6 +39,10 @@
> #include <io.h>
> #endif
> 
>+#ifdef WIN_CAIRO
>+#include <windows.h>
>+#endif
>+
> using namespace ImageDiff;
> 
> #ifdef _WIN32
>@@ -136,3 +140,10 @@ int main(int argc, const char* argv[])
> 
>     return EXIT_SUCCESS;
> }
>+
>+#ifdef WIN_CAIRO
>+extern "C" __declspec(dllexport) int WINAPI dllLauncherEntryPoint(int argc, const char* argv[])
>+{
>+    return main(argc, argv);
>+}
>+#endif
>diff --git a/Tools/ImageDiff/PlatformWin.cmake b/Tools/ImageDiff/PlatformWin.cmake
>index 2b9a86040fe0e151f2a5b6c8092c8e562359ff0f..53c52de67008d6da67dd6d63a0d0517ac1da849b 100644
>--- a/Tools/ImageDiff/PlatformWin.cmake
>+++ b/Tools/ImageDiff/PlatformWin.cmake
>@@ -1,5 +1,13 @@
> if (${WTF_PLATFORM_WIN_CAIRO})
>     include(Cairo.cmake)
>+
>+    add_definitions(-DWIN_CAIRO -DUSE_CONSOLE_ENTRY_POINT)
>+
>+    add_library(ImageDiffLib SHARED ${IMAGE_DIFF_SOURCES})
>+    target_link_libraries(ImageDiffLib ${IMAGE_DIFF_LIBRARIES})
>+
>+    set(IMAGE_DIFF_SOURCES ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp)
>+    set(IMAGE_DIFF_LIBRARIES shlwapi)
> else ()
>     include(PlatformMac.cmake)
> endif ()

Actions: View | Formatted Diff | Diff

Attachments on bug 186927: 343334 | 343341