<!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>[183892] 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/183892">183892</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-05-06 15:32:36 -0700 (Wed, 06 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WinCairo] Compile error due to undefined symbols after <a href="http://trac.webkit.org/projects/webkit/changeset/183868">r183868</a>
https://bugs.webkit.org/show_bug.cgi?id=144692
Patch by Carlos Garcia Campos <cgarcia@igalia.com> and Per Arne Vollan <peavo@outlook.com> on 2015-05-06
Reviewed by Alex Christensen.
Speculative build fix. Add dummy PlatformDisplayWin.
* PlatformWinCairo.cmake: Add PlatformDisplay.cpp to compilation.
* platform/graphics/PlatformDisplay.cpp:
(WebCore::PlatformDisplay::createPlatformDisplay):
* platform/graphics/PlatformDisplay.h:
* platform/graphics/win/PlatformDisplayWin.h:
Add stubs to compile.
* WebCore.vcxproj/WebCore.vcxproj
* WebCore.vcxproj/WebCore.vcxproj.filters
Add new files to Windows build.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformWinCairocmake">trunk/Source/WebCore/PlatformWinCairo.cmake</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsPlatformDisplaycpp">trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsPlatformDisplayh">trunk/Source/WebCore/platform/graphics/PlatformDisplay.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformgraphicswinPlatformDisplayWinh">trunk/Source/WebCore/platform/graphics/win/PlatformDisplayWin.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183891 => 183892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-06 22:14:34 UTC (rev 183891)
+++ trunk/Source/WebCore/ChangeLog 2015-05-06 22:32:36 UTC (rev 183892)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-05-06 Carlos Garcia Campos <cgarcia@igalia.com> and Per Arne Vollan <peavo@outlook.com>
+
+ [WinCairo] Compile error due to undefined symbols after r183868
+ https://bugs.webkit.org/show_bug.cgi?id=144692
+
+ Reviewed by Alex Christensen.
+
+ Speculative build fix. Add dummy PlatformDisplayWin.
+
+ * PlatformWinCairo.cmake: Add PlatformDisplay.cpp to compilation.
+ * platform/graphics/PlatformDisplay.cpp:
+ (WebCore::PlatformDisplay::createPlatformDisplay):
+ * platform/graphics/PlatformDisplay.h:
+ * platform/graphics/win/PlatformDisplayWin.h:
+ Add stubs to compile.
+ * WebCore.vcxproj/WebCore.vcxproj
+ * WebCore.vcxproj/WebCore.vcxproj.filters
+ Add new files to Windows build.
+
</ins><span class="cx"> 2015-05-06 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> Avoid copies in scrollOffsetForFixedPosition() and inline it.
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformWinCairocmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWinCairo.cmake (183891 => 183892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWinCairo.cmake 2015-05-06 22:14:34 UTC (rev 183891)
+++ trunk/Source/WebCore/PlatformWinCairo.cmake 2015-05-06 22:32:36 UTC (rev 183892)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> platform/graphics/GLContext.cpp
</span><span class="cx"> platform/graphics/GraphicsLayer.cpp
</span><span class="cx"> platform/graphics/ImageSource.cpp
</span><ins>+ platform/graphics/PlatformDisplay.cpp
</ins><span class="cx"> platform/graphics/ShadowBlur.cpp
</span><span class="cx"> platform/graphics/WOFFFileFormat.cpp
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (183891 => 183892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-05-06 22:14:34 UTC (rev 183891)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-05-06 22:32:36 UTC (rev 183892)
</span><span class="lines">@@ -7607,6 +7607,20 @@
</span><span class="cx"> <ClCompile Include="..\platform\graphics\opengl\GraphicsContext3DOpenGLCommon.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\graphics\opengl\GraphicsContext3DOpenGLES.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\graphics\opengl\TemporaryOpenGLSetting.cpp" />
</span><ins>+ <ClCompile Include="..\platform\graphics\PlatformDisplay.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\platform\graphics\texmap\BitmapTexture.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -19823,6 +19837,7 @@
</span><span class="cx"> <ClInclude Include="..\platform\graphics\opengl\GLDefs.h" />
</span><span class="cx"> <ClInclude Include="..\platform\graphics\opengl\GLPlatformContext.h" />
</span><span class="cx"> <ClInclude Include="..\platform\graphics\opengl\GLPlatformSurface.h" />
</span><ins>+ <ClInclude Include="..\platform\graphics\PlatformDisplay.h" />
</ins><span class="cx"> <ClInclude Include="..\platform\graphics\texmap\BitmapTexture.h" />
</span><span class="cx"> <ClInclude Include="..\platform\graphics\texmap\BitmapTextureGL.h" />
</span><span class="cx"> <ClInclude Include="..\platform\graphics\texmap\BitmapTextureImageBuffer.h" />
</span><span class="lines">@@ -19856,6 +19871,7 @@
</span><span class="cx"> <ClInclude Include="..\platform\graphics\TrackBasePrivate.h" />
</span><span class="cx"> <ClInclude Include="..\platform\graphics\VideoTrackPrivate.h" />
</span><span class="cx"> <ClInclude Include="..\platform\graphics\win\MediaPlayerPrivateMediaFoundation.h" />
</span><ins>+ <ClInclude Include="..\platform\graphics\win\PlatformDisplayWin.h" />
</ins><span class="cx"> <ClInclude Include="..\platform\graphics\win\SharedGDIObject.h" />
</span><span class="cx"> <ClInclude Include="..\platform\HostWindow.h" />
</span><span class="cx"> <ClInclude Include="..\platform\KeypressCommand.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (183891 => 183892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-05-06 22:14:34 UTC (rev 183891)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-05-06 22:32:36 UTC (rev 183892)
</span><span class="lines">@@ -7273,6 +7273,9 @@
</span><span class="cx"> <ClCompile Include="..\platform\network\CacheValidation.cpp">
</span><span class="cx"> <Filter>platform\network</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\platform\graphics\PlatformDisplay.cpp">
+ <Filter>platform\graphics</Filter>
+ </ClCompile>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClInclude Include="..\Modules\geolocation\Coordinates.h">
</span><span class="lines">@@ -15272,6 +15275,12 @@
</span><span class="cx"> <ClInclude Include="..\platform\network\CacheValidation.h">
</span><span class="cx"> <Filter>platform\network</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\platform\graphics\PlatformDisplay.h">
+ <Filter>platform\graphics</Filter>
+ </ClInclude>
+ <ClInclude Include="..\platform\graphics\win\PlatformDisplayWin.h">
+ <Filter>platform\graphics\win</Filter>
+ </ClInclude>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <None Include="..\css\CSSGrammar.y.in">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsPlatformDisplaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp (183891 => 183892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp 2015-05-06 22:14:34 UTC (rev 183891)
+++ trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp 2015-05-06 22:32:36 UTC (rev 183892)
</span><span class="lines">@@ -37,6 +37,10 @@
</span><span class="cx"> #include "PlatformDisplayWayland.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(WIN)
+#include "PlatformDisplayWin.h"
+#endif
+
</ins><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> #include <gdk/gdkx.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -69,6 +73,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> #elif PLATFORM(EFL) && defined(HAVE_ECORE_X)
</span><span class="cx"> return std::make_unique<PlatformDisplayX11>(static_cast<Display*>(ecore_x_display_get()));
</span><ins>+#elif PLATFORM(WIN)
+ return std::make_unique<PlatformDisplayWin>();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(X11)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsPlatformDisplayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/PlatformDisplay.h (183891 => 183892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/PlatformDisplay.h 2015-05-06 22:14:34 UTC (rev 183891)
+++ trunk/Source/WebCore/platform/graphics/PlatformDisplay.h 2015-05-06 22:32:36 UTC (rev 183892)
</span><span class="lines">@@ -48,6 +48,9 @@
</span><span class="cx"> #if PLATFORM(WAYLAND)
</span><span class="cx"> Wayland,
</span><span class="cx"> #endif
</span><ins>+#if PLATFORM(WIN)
+ Windows,
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> virtual Type type() const = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinPlatformDisplayWinh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/graphics/win/PlatformDisplayWin.h (0 => 183892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/PlatformDisplayWin.h (rev 0)
+++ trunk/Source/WebCore/platform/graphics/win/PlatformDisplayWin.h 2015-05-06 22:32:36 UTC (rev 183892)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+/*
+ * Copyright (C) 2015 Igalia S.L
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef PlatformDisplayWin_h
+#define PlatformDisplayWin_h
+
+#if PLATFORM(WIN)
+
+#include "PlatformDisplay.h"
+
+namespace WebCore {
+
+class PlatformDisplayWin final : public PlatformDisplay {
+private:
+ virtual Type type() const override { return PlatformDisplay::Type::Windows; }
+};
+
+} // namespace WebCore
+
+SPECIALIZE_TYPE_TRAITS_PLATFORM_DISPLAY(PlatformDisplayWin, Windows)
+
+#endif // PLATFORM(WIN)
+
+#endif // PlatformDisplayWin
</ins></span></pre>
</div>
</div>
</body>
</html>