Diff
Modified: trunk/ChangeLog (206152 => 206153)
--- trunk/ChangeLog 2016-09-20 17:28:51 UTC (rev 206152)
+++ trunk/ChangeLog 2016-09-20 18:07:48 UTC (rev 206153)
@@ -1,3 +1,13 @@
+2016-09-20 Don Olmstead <don.olmst...@am.sony.com>
+
+ [WinCairo] Use find_package cairo in build
+ https://bugs.webkit.org/show_bug.cgi?id=162239
+
+ Reviewed by Alex Christensen.
+
+ * Source/cmake/FindCairo.cmake:
+ * Source/cmake/OptionsWinCairo.cmake:
+
2016-09-19 Daniel Bates <daba...@apple.com>
Remove ENABLE(TEXT_AUTOSIZING) automatic text size adjustment code
Modified: trunk/Source/WebCore/ChangeLog (206152 => 206153)
--- trunk/Source/WebCore/ChangeLog 2016-09-20 17:28:51 UTC (rev 206152)
+++ trunk/Source/WebCore/ChangeLog 2016-09-20 18:07:48 UTC (rev 206153)
@@ -1,3 +1,14 @@
+2016-09-20 Don Olmstead <don.olmst...@am.sony.com>
+
+ [WinCairo] Use find_package cairo in build
+ https://bugs.webkit.org/show_bug.cgi?id=162239
+
+ Reviewed by Alex Christensen.
+
+ No new tests. No change in behavior.
+
+ * PlatformWinCairo.cmake:
+
2016-09-20 Jer Noble <jer.no...@apple.com>
[media-source] Support MediaSource.setLiveSeekableRanges()
Modified: trunk/Source/WebCore/PlatformWinCairo.cmake (206152 => 206153)
--- trunk/Source/WebCore/PlatformWinCairo.cmake 2016-09-20 17:28:51 UTC (rev 206152)
+++ trunk/Source/WebCore/PlatformWinCairo.cmake 2016-09-20 18:07:48 UTC (rev 206153)
@@ -2,10 +2,10 @@
include(platform/TextureMapper.cmake)
list(APPEND WebCore_INCLUDE_DIRECTORIES
+ ${CAIRO_INCLUDE_DIRS}
"${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core"
"${DirectX_INCLUDE_DIRS}"
"${WEBKIT_LIBRARIES_DIR}/include"
- "${WEBKIT_LIBRARIES_DIR}/include/cairo"
"${WEBKIT_LIBRARIES_DIR}/include/SQLite"
"${WEBKIT_LIBRARIES_DIR}/include/zlib"
"${_javascript_CORE_DIR}/wtf/text"
@@ -74,10 +74,10 @@
)
list(APPEND WebCore_LIBRARIES
+ ${CAIRO_LIBRARIES}
${DirectX_LIBRARIES}
CFLite
SQLite3
- cairo
comctl32
crypt32
iphlpapi
@@ -96,8 +96,8 @@
)
list(APPEND WebCoreTestSupport_LIBRARIES
+ ${CAIRO_LIBRARIES}
CFLite
- cairo
shlwapi
)
Modified: trunk/Source/WebKit/ChangeLog (206152 => 206153)
--- trunk/Source/WebKit/ChangeLog 2016-09-20 17:28:51 UTC (rev 206152)
+++ trunk/Source/WebKit/ChangeLog 2016-09-20 18:07:48 UTC (rev 206153)
@@ -1,3 +1,12 @@
+2016-09-20 Don Olmstead <don.olmst...@am.sony.com>
+
+ [WinCairo] Use find_package cairo in build
+ https://bugs.webkit.org/show_bug.cgi?id=162239
+
+ Reviewed by Alex Christensen.
+
+ * PlatformWin.cmake:
+
2016-09-12 Brent Fulgham <bfulg...@apple.com>
[Win][Direct2D] Provide Direct2D-based geometry and transform cast operations
Modified: trunk/Source/WebKit/PlatformWin.cmake (206152 => 206153)
--- trunk/Source/WebKit/PlatformWin.cmake 2016-09-20 17:28:51 UTC (rev 206152)
+++ trunk/Source/WebKit/PlatformWin.cmake 2016-09-20 18:07:48 UTC (rev 206153)
@@ -1,8 +1,8 @@
if (${WTF_PLATFORM_WIN_CAIRO})
add_definitions(-DUSE_CAIRO=1 -DUSE_CURL=1 -DWEBKIT_EXPORTS=1)
list(APPEND WebKit_INCLUDE_DIRECTORIES
+ ${CAIRO_INCLUDE_DIRS}
"${WEBKIT_LIBRARIES_DIR}/include"
- "${WEBKIT_LIBRARIES_DIR}/include/cairo"
"${WEBKIT_LIBRARIES_DIR}/include/sqlite"
"${WEBCORE_DIR}/platform/graphics/cairo"
)
Modified: trunk/Source/cmake/FindCairo.cmake (206152 => 206153)
--- trunk/Source/cmake/FindCairo.cmake 2016-09-20 17:28:51 UTC (rev 206152)
+++ trunk/Source/cmake/FindCairo.cmake 2016-09-20 18:07:48 UTC (rev 206153)
@@ -35,6 +35,7 @@
NAMES cairo.h
HINTS ${PC_CAIRO_INCLUDEDIR}
${PC_CAIRO_INCLUDE_DIRS}
+ ${WEBKIT_LIBRARIES_INCLUDE_DIR}/cairo
PATH_SUFFIXES cairo
)
@@ -42,6 +43,7 @@
NAMES cairo
HINTS ${PC_CAIRO_LIBDIR}
${PC_CAIRO_LIBRARY_DIRS}
+ ${WEBKIT_LIBRARIES_LINK_DIR}
)
if (CAIRO_INCLUDE_DIRS)
Modified: trunk/Source/cmake/OptionsWinCairo.cmake (206152 => 206153)
--- trunk/Source/cmake/OptionsWinCairo.cmake 2016-09-20 17:28:51 UTC (rev 206152)
+++ trunk/Source/cmake/OptionsWinCairo.cmake 2016-09-20 18:07:48 UTC (rev 206153)
@@ -2,6 +2,8 @@
include(OptionsWin)
+find_package(Cairo 1.14.4 REQUIRED)
+
set(USE_CF 1)
set(USE_CURL 1)
set(USE_ICU_UNICODE 1)
Modified: trunk/Tools/ChangeLog (206152 => 206153)
--- trunk/Tools/ChangeLog 2016-09-20 17:28:51 UTC (rev 206152)
+++ trunk/Tools/ChangeLog 2016-09-20 18:07:48 UTC (rev 206153)
@@ -1,3 +1,13 @@
+2016-09-20 Don Olmstead <don.olmst...@am.sony.com>
+
+ [WinCairo] Use find_package cairo in build
+ https://bugs.webkit.org/show_bug.cgi?id=162239
+
+ Reviewed by Alex Christensen.
+
+ * DumpRenderTree/PlatformWin.cmake:
+ * TestWebKitAPI/PlatformWin.cmake:
+
2016-09-20 Wenson Hsieh <wenson_hs...@apple.com>
Unreviewed build fix on 10.10 bots.
Modified: trunk/Tools/DumpRenderTree/PlatformWin.cmake (206152 => 206153)
--- trunk/Tools/DumpRenderTree/PlatformWin.cmake 2016-09-20 17:28:51 UTC (rev 206152)
+++ trunk/Tools/DumpRenderTree/PlatformWin.cmake 2016-09-20 18:07:48 UTC (rev 206153)
@@ -95,7 +95,7 @@
if (${WTF_PLATFORM_WIN_CAIRO})
list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
cairo
- "${WEBKIT_LIBRARIES_DIR}/include/cairo"
+ ${CAIRO_INCLUDE_DIRS}
)
list(APPEND DumpRenderTreeLib_SOURCES
cairo/PixelDumpSupportCairo.cpp
@@ -104,7 +104,7 @@
win/ImageDiffCairo.cpp
)
list(APPEND ImageDiff_LIBRARIES
- cairo
+ ${CAIRO_LIBRARIES}
)
else ()
list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
Modified: trunk/Tools/TestWebKitAPI/PlatformWin.cmake (206152 => 206153)
--- trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2016-09-20 17:28:51 UTC (rev 206152)
+++ trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2016-09-20 18:07:48 UTC (rev 206153)
@@ -64,7 +64,7 @@
if (${WTF_PLATFORM_WIN_CAIRO})
list(APPEND test_webcore_LIBRARIES
- cairo
+ ${CAIRO_LIBRARIES}
libANGLE
libeay32
mfuuid
@@ -127,6 +127,12 @@
add_test(TestWebCore ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/TestWebCore)
set_tests_properties(TestWebCore PROPERTIES TIMEOUT 60)
+if (${WTF_PLATFORM_WIN_CAIRO})
+ include_directories(
+ ${CAIRO_INCLUDE_DIRS}
+ )
+endif ()
+
add_library(TestWebKitLib SHARED
${test_main_SOURCES}
${TESTWEBKITAPI_DIR}/TestsController.cpp
