Title: [216504] trunk/Tools
- Revision
- 216504
- Author
- commit-qu...@webkit.org
- Date
- 2017-05-09 07:50:54 -0700 (Tue, 09 May 2017)
Log Message
[Win] ImageDiff isn't built since Bug 168945
https://bugs.webkit.org/show_bug.cgi?id=171847
Patch by Fujii Hironori <hironori.fu...@sony.com> on 2017-05-09
Reviewed by Alex Christensen.
* CMakeLists.txt: Add 'ImageDiff' sub-directory to build if WIN32.
* ImageDiff/ImageDiff.cpp: Include some header files to fix compilation errors.
* ImageDiff/PlatformWin.cmake: Define USE_CAIRO if WinCairo port.
Modified Paths
Diff
Modified: trunk/Tools/CMakeLists.txt (216503 => 216504)
--- trunk/Tools/CMakeLists.txt 2017-05-09 13:00:57 UTC (rev 216503)
+++ trunk/Tools/CMakeLists.txt 2017-05-09 14:50:54 UTC (rev 216504)
@@ -34,6 +34,7 @@
add_subdirectory(DumpRenderTree)
add_subdirectory(TestWebKitAPI)
add_subdirectory(MiniBrowser/win)
+ add_subdirectory(ImageDiff)
endif ()
if (ENABLE_WEBKIT2 AND ENABLE_API_TESTS)
Modified: trunk/Tools/ChangeLog (216503 => 216504)
--- trunk/Tools/ChangeLog 2017-05-09 13:00:57 UTC (rev 216503)
+++ trunk/Tools/ChangeLog 2017-05-09 14:50:54 UTC (rev 216504)
@@ -1,3 +1,14 @@
+2017-05-09 Fujii Hironori <hironori.fu...@sony.com>
+
+ [Win] ImageDiff isn't built since Bug 168945
+ https://bugs.webkit.org/show_bug.cgi?id=171847
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt: Add 'ImageDiff' sub-directory to build if WIN32.
+ * ImageDiff/ImageDiff.cpp: Include some header files to fix compilation errors.
+ * ImageDiff/PlatformWin.cmake: Define USE_CAIRO if WinCairo port.
+
2017-05-09 Zan Dobersek <zdober...@igalia.com>
Upstream the WPE port
Modified: trunk/Tools/ImageDiff/ImageDiff.cpp (216503 => 216504)
--- trunk/Tools/ImageDiff/ImageDiff.cpp 2017-05-09 13:00:57 UTC (rev 216503)
+++ trunk/Tools/ImageDiff/ImageDiff.cpp 2017-05-09 14:50:54 UTC (rev 216504)
@@ -32,6 +32,11 @@
#include <stdio.h>
#include <string.h>
+#if PLATFORM(WIN)
+#include <fcntl.h>
+#include <io.h>
+#endif
+
using namespace ImageDiff;
#if OS(WINDOWS)
Modified: trunk/Tools/ImageDiff/PlatformWin.cmake (216503 => 216504)
--- trunk/Tools/ImageDiff/PlatformWin.cmake 2017-05-09 13:00:57 UTC (rev 216503)
+++ trunk/Tools/ImageDiff/PlatformWin.cmake 2017-05-09 14:50:54 UTC (rev 216504)
@@ -1,5 +1,6 @@
if (${WTF_PLATFORM_WIN_CAIRO})
+ add_definitions(-DUSE_CAIRO=1)
include(Cairo.cmake)
else ()
include(PlatformMac.cmake)
-endif ()
\ No newline at end of file
+endif ()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
