Diff
Modified: trunk/Source/WebCore/ChangeLog (172201 => 172202)
--- trunk/Source/WebCore/ChangeLog 2014-08-07 04:19:45 UTC (rev 172201)
+++ trunk/Source/WebCore/ChangeLog 2014-08-07 05:12:00 UTC (rev 172202)
@@ -1,3 +1,17 @@
+2014-08-06 Brent Fulgham <[email protected]>
+
+ [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-06 Ryuan Choi <[email protected]>
Unreviewed build fix on non Cocoa port since r172172
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (172201 => 172202)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-08-07 04:19:45 UTC (rev 172201)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-08-07 05:12:00 UTC (rev 172202)
@@ -7395,6 +7395,8 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\platform\graphics\GraphicsContext3DPrivate.cpp" />
<ClCompile Include="..\platform\graphics\ca\win\PlatformCAFiltersWin.cpp">
@@ -21372,4 +21374,4 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
Modified: trunk/Source/WebCore/platform/graphics/GLContext.cpp (172201 => 172202)
--- trunk/Source/WebCore/platform/graphics/GLContext.cpp 2014-08-07 04:19:45 UTC (rev 172201)
+++ trunk/Source/WebCore/platform/graphics/GLContext.cpp 2014-08-07 05:12:00 UTC (rev 172202)
@@ -17,9 +17,9 @@
*/
#include "config.h"
-#include "GLContext.h"
#if USE(OPENGL)
+#include "GLContext.h"
#if USE(EGL)
#include "GLContextEGL.h"
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.cpp (172201 => 172202)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.cpp 2014-08-07 04:19:45 UTC (rev 172201)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.cpp 2014-08-07 05:12:00 UTC (rev 172202)
@@ -18,9 +18,9 @@
*/
#include "config.h"
-#include "GraphicsContext3DPrivate.h"
#if USE(3D_GRAPHICS)
+#include "GraphicsContext3DPrivate.h"
#include "HostWindow.h"
#include "NotImplemented.h"
Modified: trunk/Source/WebCore/platform/graphics/opengl/GLPlatformContext.cpp (172201 => 172202)
--- trunk/Source/WebCore/platform/graphics/opengl/GLPlatformContext.cpp 2014-08-07 04:19:45 UTC (rev 172201)
+++ trunk/Source/WebCore/platform/graphics/opengl/GLPlatformContext.cpp 2014-08-07 05:12:00 UTC (rev 172202)
@@ -24,6 +24,8 @@
*/
#include "config.h"
+
+#if USE(3D_GRAPHICS)
#include "GLPlatformContext.h"
#if USE(GLX)
@@ -279,3 +281,5 @@
}
} // namespace WebCore
+
+#endif
Modified: trunk/Source/WebCore/platform/graphics/opengl/GLPlatformSurface.cpp (172201 => 172202)
--- trunk/Source/WebCore/platform/graphics/opengl/GLPlatformSurface.cpp 2014-08-07 04:19:45 UTC (rev 172201)
+++ trunk/Source/WebCore/platform/graphics/opengl/GLPlatformSurface.cpp 2014-08-07 05:12:00 UTC (rev 172202)
@@ -24,6 +24,8 @@
*/
#include "config.h"
+
+#if USE(3D_GRAPHICS)
#include "GLPlatformSurface.h"
#if USE(GLX)
@@ -131,3 +133,5 @@
}
}
+
+#endif
Modified: trunk/Source/WebInspectorUI/ChangeLog (172201 => 172202)
--- trunk/Source/WebInspectorUI/ChangeLog 2014-08-07 04:19:45 UTC (rev 172201)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-08-07 05:12:00 UTC (rev 172202)
@@ -1,3 +1,10 @@
+2014-08-06 Brent Fulgham <[email protected]>
+
+ [Win] Build fix.
+
+ * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj: DebugSuffix target was missing
+ proper path settings for final output.
+
2014-08-06 Wenson Hsieh <[email protected]>
Implement parsing for CSS scroll snap points
Modified: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj (172201 => 172202)
--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj 2014-08-07 04:19:45 UTC (rev 172201)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj 2014-08-07 05:12:00 UTC (rev 172202)
@@ -1,6 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="DebugSuffix|Win32">
+ <Configuration>DebugSuffix</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="DebugSuffix|x64">
+ <Configuration>DebugSuffix</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Debug_WinCairo|Win32">
<Configuration>Debug_WinCairo</Configuration>
<Platform>Win32</Platform>
@@ -53,6 +61,12 @@
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120_xp</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
+ <ConfigurationType>Makefile</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v120_xp</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
@@ -86,6 +100,12 @@
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
+ <ConfigurationType>Makefile</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v120</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
@@ -121,6 +141,11 @@
<Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
<Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
</ImportGroup>
+ <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>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<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" />
@@ -146,6 +171,11 @@
<Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
<Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
</ImportGroup>
+ <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>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<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" />
@@ -176,6 +206,13 @@
</ClCompile>
<Link />
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ </ClCompile>
+ <Link />
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
@@ -786,4 +823,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
