<!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>[172254] branches/safari-600.1-branch/Source</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/172254">172254</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-08-07 13:56:43 -0700 (Thu, 07 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/172202">r172202</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreWebCorevcxprojWebCorevcxproj">branches/safari-600.1-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreplatformgraphicsGLContextcpp">branches/safari-600.1-branch/Source/WebCore/platform/graphics/GLContext.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreplatformgraphicsGraphicsContext3DPrivatecpp">branches/safari-600.1-branch/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreplatformgraphicsopenglGLPlatformContextcpp">branches/safari-600.1-branch/Source/WebCore/platform/graphics/opengl/GLPlatformContext.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreplatformgraphicsopenglGLPlatformSurfacecpp">branches/safari-600.1-branch/Source/WebCore/platform/graphics/opengl/GLPlatformSurface.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIChangeLog">branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUIvcxproj">branches/safari-600.1-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172253 => 172254)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-07 20:56:30 UTC (rev 172253)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-07 20:56:43 UTC (rev 172254)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-08-07 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172202
+
+ 2014-08-06 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Correct build errors when WebGL Disabled
+ https://bugs.webkit.org/show_bug.cgi?id=135687
+
+ Unreviewed build fix.
+
+ * WebCore.vcxproj/WebCore.vcxproj: Don't build Cairo files
+ when building CG.
+ * platform/graphics/GLContext.cpp: Correct use of 3D_GRAPHICS macro.
+ * platform/graphics/GraphicsContext3DPrivate.cpp: Ditto.
+ * platform/graphics/opengl/GLPlatformContext.cpp: Ditto.
+ * platform/graphics/opengl/GLPlatformSurface.cpp: Ditto.
+
+2014-08-07 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r172195
</span><span class="cx">
</span><span class="cx"> 2014-08-06 Enrica Casucci <enrica@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (172253 => 172254)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-08-07 20:56:30 UTC (rev 172253)
+++ branches/safari-600.1-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-08-07 20:56:43 UTC (rev 172254)
</span><span class="lines">@@ -7395,6 +7395,8 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</span><ins>+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\platform\graphics\GraphicsContext3DPrivate.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\graphics\ca\win\PlatformCAFiltersWin.cpp">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreplatformgraphicsGLContextcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/platform/graphics/GLContext.cpp (172253 => 172254)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/platform/graphics/GLContext.cpp 2014-08-07 20:56:30 UTC (rev 172253)
+++ branches/safari-600.1-branch/Source/WebCore/platform/graphics/GLContext.cpp 2014-08-07 20:56:43 UTC (rev 172254)
</span><span class="lines">@@ -17,9 +17,9 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-#include "GLContext.h"
</del><span class="cx">
</span><span class="cx"> #if USE(OPENGL)
</span><ins>+#include "GLContext.h"
</ins><span class="cx">
</span><span class="cx"> #if USE(EGL)
</span><span class="cx"> #include "GLContextEGL.h"
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreplatformgraphicsGraphicsContext3DPrivatecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.cpp (172253 => 172254)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.cpp 2014-08-07 20:56:30 UTC (rev 172253)
+++ branches/safari-600.1-branch/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.cpp 2014-08-07 20:56:43 UTC (rev 172254)
</span><span class="lines">@@ -18,9 +18,9 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-#include "GraphicsContext3DPrivate.h"
</del><span class="cx">
</span><span class="cx"> #if USE(3D_GRAPHICS)
</span><ins>+#include "GraphicsContext3DPrivate.h"
</ins><span class="cx">
</span><span class="cx"> #include "HostWindow.h"
</span><span class="cx"> #include "NotImplemented.h"
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreplatformgraphicsopenglGLPlatformContextcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/platform/graphics/opengl/GLPlatformContext.cpp (172253 => 172254)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/platform/graphics/opengl/GLPlatformContext.cpp 2014-08-07 20:56:30 UTC (rev 172253)
+++ branches/safari-600.1-branch/Source/WebCore/platform/graphics/opengl/GLPlatformContext.cpp 2014-08-07 20:56:43 UTC (rev 172254)
</span><span class="lines">@@ -24,6 +24,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><ins>+
+#if USE(3D_GRAPHICS)
</ins><span class="cx"> #include "GLPlatformContext.h"
</span><span class="cx">
</span><span class="cx"> #if USE(GLX)
</span><span class="lines">@@ -279,3 +281,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><ins>+
+#endif
</ins></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreplatformgraphicsopenglGLPlatformSurfacecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/platform/graphics/opengl/GLPlatformSurface.cpp (172253 => 172254)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/platform/graphics/opengl/GLPlatformSurface.cpp 2014-08-07 20:56:30 UTC (rev 172253)
+++ branches/safari-600.1-branch/Source/WebCore/platform/graphics/opengl/GLPlatformSurface.cpp 2014-08-07 20:56:43 UTC (rev 172254)
</span><span class="lines">@@ -24,6 +24,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><ins>+
+#if USE(3D_GRAPHICS)
</ins><span class="cx"> #include "GLPlatformSurface.h"
</span><span class="cx">
</span><span class="cx"> #if USE(GLX)
</span><span class="lines">@@ -131,3 +133,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><ins>+
+#endif
</ins></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog (172253 => 172254)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-08-07 20:56:30 UTC (rev 172253)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-08-07 20:56:43 UTC (rev 172254)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-08-07 Dana Burkart <dburkart@apple.com>
+
+ Merge r172202
+
+ 2014-08-06 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Build fix.
+
+ * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj: DebugSuffix target was missing
+ proper path settings for final output.
+
</ins><span class="cx"> 2014-08-05 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r171940
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUIvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj (172253 => 172254)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj 2014-08-07 20:56:30 UTC (rev 172253)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj 2014-08-07 20:56:43 UTC (rev 172254)
</span><span class="lines">@@ -1,6 +1,14 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><span class="cx"> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</span><span class="cx"> <ItemGroup Label="ProjectConfigurations">
</span><ins>+ <ProjectConfiguration Include="DebugSuffix|Win32">
+ <Configuration>DebugSuffix</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="DebugSuffix|x64">
+ <Configuration>DebugSuffix</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ins><span class="cx"> <ProjectConfiguration Include="Debug_WinCairo|Win32">
</span><span class="cx"> <Configuration>Debug_WinCairo</Configuration>
</span><span class="cx"> <Platform>Win32</Platform>
</span><span class="lines">@@ -53,6 +61,12 @@
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><span class="cx"> <PlatformToolset>v120_xp</PlatformToolset>
</span><span class="cx"> </PropertyGroup>
</span><ins>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
+ <ConfigurationType>Makefile</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v120_xp</PlatformToolset>
+ </PropertyGroup>
</ins><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="lines">@@ -86,6 +100,12 @@
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><span class="cx"> <PlatformToolset>v120</PlatformToolset>
</span><span class="cx"> </PropertyGroup>
</span><ins>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
+ <ConfigurationType>Makefile</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v120</PlatformToolset>
+ </PropertyGroup>
</ins><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="lines">@@ -121,6 +141,11 @@
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
</span><span class="cx"> </ImportGroup>
</span><ins>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
+ </ImportGroup>
</ins><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</span><span class="lines">@@ -146,6 +171,11 @@
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
</span><span class="cx"> </ImportGroup>
</span><ins>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
+ </ImportGroup>
</ins><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</span><span class="lines">@@ -176,6 +206,13 @@
</span><span class="cx"> </ClCompile>
</span><span class="cx"> <Link />
</span><span class="cx"> </ItemDefinitionGroup>
</span><ins>+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ </ClCompile>
+ <Link />
+ </ItemDefinitionGroup>
</ins><span class="cx"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</span><span class="cx"> <ClCompile>
</span><span class="cx"> <WarningLevel>Level3</WarningLevel>
</span><span class="lines">@@ -786,4 +823,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><ins>+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>