<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[196394] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/196394">196394</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-10 14:01:18 -0800 (Wed, 10 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[cmake] Consolidate CMake code related to image decoders.
https://bugs.webkit.org/show_bug.cgi?id=154074
Patch by Konstantin Tokarev <annulen@yandex.ru> on 2016-02-10
Reviewed by Alex Christensen.
Common image decoder sources, includes and libs are moved to
platform/ImageDecoders.cmake.
Also, added include directories of libjpeg and libpng to
WebCore_SYSTEM_INCLUDE_DIRECTORIES.
No new tests needed.
* CMakeLists.txt: Moved common include paths to ImageDecoders.cmake.
* PlatformEfl.cmake: Moved common sources and libs to ImageDecoders.cmake.
* PlatformGTK.cmake: Ditto.
* PlatformWinCairo.cmake: Moved common sources to ImageDecoders.cmake.
* platform/ImageDecoders.cmake: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformEflcmake">trunk/Source/WebCore/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformWinCairocmake">trunk/Source/WebCore/PlatformWinCairo.cmake</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformImageDecoderscmake">trunk/Source/WebCore/platform/ImageDecoders.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (196393 => 196394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-02-10 21:57:53 UTC (rev 196393)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-02-10 22:01:18 UTC (rev 196394)
</span><span class="lines">@@ -80,13 +80,6 @@
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/opentype"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/texmap"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/transforms"
</span><del>- "${WEBCORE_DIR}/platform/image-decoders"
- "${WEBCORE_DIR}/platform/image-decoders/bmp"
- "${WEBCORE_DIR}/platform/image-decoders/gif"
- "${WEBCORE_DIR}/platform/image-decoders/ico"
- "${WEBCORE_DIR}/platform/image-decoders/jpeg"
- "${WEBCORE_DIR}/platform/image-decoders/png"
- "${WEBCORE_DIR}/platform/image-decoders/webp"
</del><span class="cx"> "${WEBCORE_DIR}/platform/mediastream"
</span><span class="cx"> "${WEBCORE_DIR}/platform/mock"
</span><span class="cx"> "${WEBCORE_DIR}/platform/mock/mediasource"
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196393 => 196394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-10 21:57:53 UTC (rev 196393)
+++ trunk/Source/WebCore/ChangeLog 2016-02-10 22:01:18 UTC (rev 196394)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-02-10 Konstantin Tokarev <annulen@yandex.ru>
+
+ [cmake] Consolidate CMake code related to image decoders.
+ https://bugs.webkit.org/show_bug.cgi?id=154074
+
+ Reviewed by Alex Christensen.
+
+ Common image decoder sources, includes and libs are moved to
+ platform/ImageDecoders.cmake.
+
+ Also, added include directories of libjpeg and libpng to
+ WebCore_SYSTEM_INCLUDE_DIRECTORIES.
+
+ No new tests needed.
+
+ * CMakeLists.txt: Moved common include paths to ImageDecoders.cmake.
+ * PlatformEfl.cmake: Moved common sources and libs to ImageDecoders.cmake.
+ * PlatformGTK.cmake: Ditto.
+ * PlatformWinCairo.cmake: Moved common sources to ImageDecoders.cmake.
+ * platform/ImageDecoders.cmake: Added.
+
</ins><span class="cx"> 2016-02-10 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> CSSSegmentedFontFace does not need to be reference counted
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (196393 => 196394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2016-02-10 21:57:53 UTC (rev 196393)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2016-02-10 22:01:18 UTC (rev 196394)
</span><span class="lines">@@ -1,3 +1,5 @@
</span><ins>+include(platform/ImageDecoders.cmake)
+
</ins><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><span class="cx"> "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
</span><span class="cx"> "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
</span><span class="lines">@@ -226,24 +228,8 @@
</span><span class="cx">
</span><span class="cx"> platform/image-encoders/JPEGImageEncoder.cpp
</span><span class="cx">
</span><del>- platform/image-decoders/ImageDecoder.cpp
-
- platform/image-decoders/bmp/BMPImageDecoder.cpp
- platform/image-decoders/bmp/BMPImageReader.cpp
-
</del><span class="cx"> platform/image-decoders/cairo/ImageDecoderCairo.cpp
</span><span class="cx">
</span><del>- platform/image-decoders/gif/GIFImageDecoder.cpp
- platform/image-decoders/gif/GIFImageReader.cpp
-
- platform/image-decoders/ico/ICOImageDecoder.cpp
-
- platform/image-decoders/jpeg/JPEGImageDecoder.cpp
-
- platform/image-decoders/png/PNGImageDecoder.cpp
-
- platform/image-decoders/webp/WEBPImageDecoder.cpp
-
</del><span class="cx"> platform/linux/GamepadDeviceLinux.cpp
</span><span class="cx"> platform/linux/MemoryPressureHandlerLinux.cpp
</span><span class="cx">
</span><span class="lines">@@ -344,14 +330,11 @@
</span><span class="cx"> ${GLIB_GOBJECT_LIBRARIES}
</span><span class="cx"> ${GLIB_LIBRARIES}
</span><span class="cx"> ${HARFBUZZ_LIBRARIES}
</span><del>- ${JPEG_LIBRARIES}
</del><span class="cx"> ${LIBSOUP_LIBRARIES}
</span><span class="cx"> ${LIBXML2_LIBRARIES}
</span><span class="cx"> ${LIBXSLT_LIBRARIES}
</span><span class="cx"> ${HYPHEN_LIBRARIES}
</span><del>- ${PNG_LIBRARIES}
</del><span class="cx"> ${SQLITE_LIBRARIES}
</span><del>- ${WEBP_LIBRARIES}
</del><span class="cx"> ${X11_X11_LIB}
</span><span class="cx"> ${ZLIB_LIBRARIES}
</span><span class="cx"> )
</span><span class="lines">@@ -374,7 +357,6 @@
</span><span class="cx"> ${LIBXML2_INCLUDE_DIR}
</span><span class="cx"> ${LIBXSLT_INCLUDE_DIR}
</span><span class="cx"> ${SQLITE_INCLUDE_DIR}
</span><del>- ${WEBP_INCLUDE_DIRS}
</del><span class="cx"> ${GLIB_INCLUDE_DIRS}
</span><span class="cx"> ${LIBSOUP_INCLUDE_DIRS}
</span><span class="cx"> ${ZLIB_INCLUDE_DIRS}
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (196393 => 196394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2016-02-10 21:57:53 UTC (rev 196393)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2016-02-10 22:01:18 UTC (rev 196394)
</span><span class="lines">@@ -1,3 +1,5 @@
</span><ins>+include(platform/ImageDecoders.cmake)
+
</ins><span class="cx"> set(WebCore_OUTPUT_NAME WebCoreGTK)
</span><span class="cx">
</span><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><span class="lines">@@ -168,24 +170,8 @@
</span><span class="cx"> platform/gtk/TemporaryLinkStubs.cpp
</span><span class="cx"> platform/gtk/UserAgentGtk.cpp
</span><span class="cx">
</span><del>- platform/image-decoders/ImageDecoder.cpp
-
- platform/image-decoders/bmp/BMPImageDecoder.cpp
- platform/image-decoders/bmp/BMPImageReader.cpp
-
</del><span class="cx"> platform/image-decoders/cairo/ImageDecoderCairo.cpp
</span><span class="cx">
</span><del>- platform/image-decoders/gif/GIFImageDecoder.cpp
- platform/image-decoders/gif/GIFImageReader.cpp
-
- platform/image-decoders/ico/ICOImageDecoder.cpp
-
- platform/image-decoders/jpeg/JPEGImageDecoder.cpp
-
- platform/image-decoders/png/PNGImageDecoder.cpp
-
- platform/image-decoders/webp/WEBPImageDecoder.cpp
-
</del><span class="cx"> platform/linux/GamepadDeviceLinux.cpp
</span><span class="cx"> platform/linux/MemoryPressureHandlerLinux.cpp
</span><span class="cx">
</span><span class="lines">@@ -299,15 +285,12 @@
</span><span class="cx"> ${GLIB_LIBRARIES}
</span><span class="cx"> ${GUDEV_LIBRARIES}
</span><span class="cx"> ${HARFBUZZ_LIBRARIES}
</span><del>- ${JPEG_LIBRARIES}
</del><span class="cx"> ${LIBSECRET_LIBRARIES}
</span><span class="cx"> ${LIBSOUP_LIBRARIES}
</span><span class="cx"> ${LIBXML2_LIBRARIES}
</span><span class="cx"> ${LIBXSLT_LIBRARIES}
</span><span class="cx"> ${HYPHEN_LIBRARIES}
</span><del>- ${PNG_LIBRARIES}
</del><span class="cx"> ${SQLITE_LIBRARIES}
</span><del>- ${WEBP_LIBRARIES}
</del><span class="cx"> ${X11_X11_LIB}
</span><span class="cx"> ${X11_Xcomposite_LIB}
</span><span class="cx"> ${X11_Xdamage_LIB}
</span><span class="lines">@@ -331,7 +314,6 @@
</span><span class="cx"> ${LIBXML2_INCLUDE_DIR}
</span><span class="cx"> ${LIBXSLT_INCLUDE_DIR}
</span><span class="cx"> ${SQLITE_INCLUDE_DIR}
</span><del>- ${WEBP_INCLUDE_DIRS}
</del><span class="cx"> ${ZLIB_INCLUDE_DIRS}
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformWinCairocmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWinCairo.cmake (196393 => 196394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWinCairo.cmake 2016-02-10 21:57:53 UTC (rev 196393)
+++ trunk/Source/WebCore/PlatformWinCairo.cmake 2016-02-10 22:01:18 UTC (rev 196394)
</span><span class="lines">@@ -1,3 +1,5 @@
</span><ins>+include(platform/ImageDecoders.cmake)
+
</ins><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore"
</span><span class="cx"> "${DirectX_INCLUDE_DIRS}"
</span><span class="lines">@@ -88,24 +90,8 @@
</span><span class="cx"> platform/graphics/win/TransformationMatrixWin.cpp
</span><span class="cx"> platform/graphics/win/UniscribeController.cpp
</span><span class="cx">
</span><del>- platform/image-decoders/ImageDecoder.cpp
-
- platform/image-decoders/bmp/BMPImageDecoder.cpp
- platform/image-decoders/bmp/BMPImageReader.cpp
-
</del><span class="cx"> platform/image-decoders/cairo/ImageDecoderCairo.cpp
</span><span class="cx">
</span><del>- platform/image-decoders/gif/GIFImageDecoder.cpp
- platform/image-decoders/gif/GIFImageReader.cpp
-
- platform/image-decoders/ico/ICOImageDecoder.cpp
-
- platform/image-decoders/jpeg/JPEGImageDecoder.cpp
-
- platform/image-decoders/png/PNGImageDecoder.cpp
-
- platform/image-decoders/webp/WEBPImageDecoder.cpp
-
</del><span class="cx"> platform/network/CredentialStorage.cpp
</span><span class="cx"> platform/network/NetworkStorageSessionStub.cpp
</span><span class="cx"> platform/network/SynchronousLoaderClient.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformImageDecoderscmake"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/ImageDecoders.cmake (0 => 196394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ImageDecoders.cmake (rev 0)
+++ trunk/Source/WebCore/platform/ImageDecoders.cmake 2016-02-10 22:01:18 UTC (rev 196394)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+list(APPEND WebCore_INCLUDE_DIRECTORIES
+ "${WEBCORE_DIR}/platform/image-decoders"
+ "${WEBCORE_DIR}/platform/image-decoders/bmp"
+ "${WEBCORE_DIR}/platform/image-decoders/gif"
+ "${WEBCORE_DIR}/platform/image-decoders/ico"
+ "${WEBCORE_DIR}/platform/image-decoders/jpeg"
+ "${WEBCORE_DIR}/platform/image-decoders/png"
+ "${WEBCORE_DIR}/platform/image-decoders/webp"
+)
+
+list(APPEND WebCore_SOURCES
+ platform/image-decoders/ImageDecoder.cpp
+
+ platform/image-decoders/bmp/BMPImageDecoder.cpp
+ platform/image-decoders/bmp/BMPImageReader.cpp
+
+ platform/image-decoders/gif/GIFImageDecoder.cpp
+ platform/image-decoders/gif/GIFImageReader.cpp
+
+ platform/image-decoders/ico/ICOImageDecoder.cpp
+
+ platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+
+ platform/image-decoders/png/PNGImageDecoder.cpp
+
+ platform/image-decoders/webp/WEBPImageDecoder.cpp
+)
+
+if (JPEG_FOUND)
+ list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
+ ${JPEG_INCLUDE_DIR}
+ )
+ list(APPEND WebCore_LIBRARIES
+ ${JPEG_LIBRARIES}
+ )
+endif ()
+
+if (PNG_FOUND)
+ list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
+ ${PNG_INCLUDE_DIRS}
+ )
+ list(APPEND WebCore_LIBRARIES
+ ${PNG_LIBRARIES}
+ )
+endif ()
+
+if (WEBP_FOUND)
+ list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
+ ${WEBP_INCLUDE_DIRS}
+ )
+ list(APPEND WebCore_LIBRARIES
+ ${WEBP_LIBRARIES}
+ )
+endif ()
</ins></span></pre>
</div>
</div>
</body>
</html>