Title: [152192] trunk/Source/WebCore
- Revision
- 152192
- Author
- achristen...@apple.com
- Date
- 2013-06-28 15:43:33 -0700 (Fri, 28 Jun 2013)
Log Message
Added WebGL files to Windows build.
https://bugs.webkit.org/show_bug.cgi?id=118200
Reviewed by Brent Fulgham.
* WebCore.vcxproj/WebCore.vcxproj: Added WebGL files, removed unused GraphicsContext3DOpenGLES.cpp.
* WebCore.vcxproj/WebCore.vcxproj.filters: Added WebGL files, removed unused GraphicsContext3DOpenGLES.cpp.
* platform/graphics/cairo/GLContext.cpp: Only include GLContextEGL.h or GLContextGLX.h if they're needed.
* platform/graphics/cg/GraphicsContext3DCG.cpp: Only include GraphicsContext3DNEON.h if it's needed.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (152191 => 152192)
--- trunk/Source/WebCore/ChangeLog 2013-06-28 22:21:03 UTC (rev 152191)
+++ trunk/Source/WebCore/ChangeLog 2013-06-28 22:43:33 UTC (rev 152192)
@@ -1,3 +1,15 @@
+2013-06-28 Alex Christensen <achristen...@apple.com>
+
+ Added WebGL files to Windows build.
+ https://bugs.webkit.org/show_bug.cgi?id=118200
+
+ Reviewed by Brent Fulgham.
+
+ * WebCore.vcxproj/WebCore.vcxproj: Added WebGL files, removed unused GraphicsContext3DOpenGLES.cpp.
+ * WebCore.vcxproj/WebCore.vcxproj.filters: Added WebGL files, removed unused GraphicsContext3DOpenGLES.cpp.
+ * platform/graphics/cairo/GLContext.cpp: Only include GLContextEGL.h or GLContextGLX.h if they're needed.
+ * platform/graphics/cg/GraphicsContext3DCG.cpp: Only include GraphicsContext3DNEON.h if it's needed.
+
2013-06-28 Ryosuke Niwa <rn...@webkit.org>
-webkit-line-break: after-white-space sometimes truncates DOM on copy & paste
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (152191 => 152192)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-06-28 22:21:03 UTC (rev 152191)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-06-28 22:43:33 UTC (rev 152192)
@@ -361,6 +361,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\bindings\js\JSWebGLRenderingContextCustom.cpp" />
<ClCompile Include="..\DerivedSources.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</PrecompiledHeader>
@@ -3814,6 +3815,7 @@
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">ICUVersion.h</ForcedIncludeFiles>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">ICUVersion.h</ForcedIncludeFiles>
</ClCompile>
+ <ClCompile Include="..\html\canvas\CanvasContextAttributes.cpp" />
<ClCompile Include="..\html\canvas\CanvasPathMethods.cpp" />
<ClCompile Include="..\html\canvas\EXTDrawBuffers.cpp" />
<ClCompile Include="..\html\canvas\EXTTextureFilterAnisotropic.cpp" />
@@ -4347,7 +4349,26 @@
<ClCompile Include="..\platform\FileStream.cpp" />
<ClCompile Include="..\platform\FileSystem.cpp" />
<ClCompile Include="..\platform\graphics\ANGLEWebKitBridge.cpp" />
+ <ClCompile Include="..\platform\graphics\cairo\GLContext.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\platform\graphics\cairo\GraphicsContext3DCairo.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\platform\graphics\cairo\GraphicsContext3DPrivate.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="..\platform\graphics\ca\win\PlatformCAFiltersWin.cpp" />
+ <ClCompile Include="..\platform\graphics\cg\GraphicsContext3DCG.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="..\platform\graphics\cg\SubimageCacheWithTimer.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
@@ -4371,8 +4392,16 @@
<ClCompile Include="..\platform\graphics\opengl\Extensions3DOpenGLES.cpp" />
<ClCompile Include="..\platform\graphics\opengl\GLPlatformContext.cpp" />
<ClCompile Include="..\platform\graphics\opengl\GLPlatformSurface.cpp" />
+ <ClCompile Include="..\platform\graphics\opengl\GraphicsContext3DOpenGL.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="..\platform\graphics\opengl\GraphicsContext3DOpenGLCommon.cpp" />
- <ClCompile Include="..\platform\graphics\opengl\GraphicsContext3DOpenGLES.cpp" />
+ <ClCompile Include="..\platform\graphics\opengl\GraphicsContext3DOpenGLES.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="..\platform\HistogramSupport.cpp" />
<ClCompile Include="..\platform\KillRingNone.cpp" />
<ClCompile Include="..\platform\KURL.cpp" />
@@ -11423,6 +11452,7 @@
<ClInclude Include="..\ForwardingHeaders\runtime\WeakGCMap.h" />
<ClInclude Include="..\ForwardingHeaders\runtime\WriteBarrier.h" />
<ClInclude Include="..\ForwardingHeaders\yarr\YarrJIT.h" />
+ <ClInclude Include="..\html\canvas\CanvasContextAttributes.h" />
<ClInclude Include="..\html\canvas\CanvasPathMethods.h" />
<ClInclude Include="..\html\canvas\EXTDrawBuffers.h" />
<ClInclude Include="..\html\canvas\EXTTextureFilterAnisotropic.h" />
@@ -11849,6 +11879,8 @@
<ClInclude Include="..\platform\FloatConversion.h" />
<ClInclude Include="..\platform\graphics\ANGLEWebKitBridge.h" />
<ClInclude Include="..\platform\graphics\AudioTrackPrivate.h" />
+ <ClInclude Include="..\platform\graphics\cairo\GLContext.h" />
+ <ClInclude Include="..\platform\graphics\cairo\GraphicsContext3DPrivate.h" />
<ClInclude Include="..\platform\graphics\cg\SubimageCacheWithTimer.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (152191 => 152192)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-06-28 22:21:03 UTC (rev 152191)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-06-28 22:43:33 UTC (rev 152192)
@@ -7030,12 +7030,33 @@
<ClCompile Include="..\platform\graphics\opengl\GraphicsContext3DOpenGLCommon.cpp">
<Filter>platform\graphics\opengl</Filter>
</ClCompile>
+ <ClCompile Include="..\page\CaptionUserPreferencesMediaAF.cpp">
+ <Filter>page</Filter>
+ </ClCompile>
+ <ClCompile Include="..\platform\graphics\opengl\GraphicsContext3DOpenGL.cpp">
+ <Filter>platform\graphics\opengl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\platform\graphics\cg\GraphicsContext3DCG.cpp">
+ <Filter>platform\graphics\cg</Filter>
+ </ClCompile>
+ <ClCompile Include="..\bindings\js\JSWebGLRenderingContextCustom.cpp">
+ <Filter>bindings\js</Filter>
+ </ClCompile>
+ <ClCompile Include="..\platform\graphics\cairo\GraphicsContext3DCairo.cpp">
+ <Filter>platform\graphics\cairo</Filter>
+ </ClCompile>
+ <ClCompile Include="..\platform\graphics\cairo\GraphicsContext3DPrivate.cpp">
+ <Filter>platform\graphics\cairo</Filter>
+ </ClCompile>
+ <ClCompile Include="..\html\canvas\CanvasContextAttributes.cpp">
+ <Filter>html\canvas</Filter>
+ </ClCompile>
+ <ClCompile Include="..\platform\graphics\cairo\GLContext.cpp">
+ <Filter>platform\graphics\cairo</Filter>
+ </ClCompile>
<ClCompile Include="..\platform\graphics\opengl\GraphicsContext3DOpenGLES.cpp">
<Filter>platform\graphics\opengl</Filter>
</ClCompile>
- <ClCompile Include="..\page\CaptionUserPreferencesMediaAF.cpp">
- <Filter>page</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Modules\filesystem\AsyncFileWriter.h">
@@ -14732,6 +14753,15 @@
<ClInclude Include="..\page\CaptionUserPreferencesMediaAF.h">
<Filter>page</Filter>
</ClInclude>
+ <ClInclude Include="..\platform\graphics\cairo\GraphicsContext3DPrivate.h">
+ <Filter>platform\graphics\cairo</Filter>
+ </ClInclude>
+ <ClInclude Include="..\html\canvas\CanvasContextAttributes.h">
+ <Filter>html\canvas</Filter>
+ </ClInclude>
+ <ClInclude Include="..\platform\graphics\cairo\GLContext.h">
+ <Filter>platform\graphics\cairo</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\css\CSSGrammar.y.in">
@@ -15676,4 +15706,4 @@
<Filter>rendering</Filter>
</CustomBuildStep>
</ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
Modified: trunk/Source/WebCore/platform/graphics/cairo/GLContext.cpp (152191 => 152192)
--- trunk/Source/WebCore/platform/graphics/cairo/GLContext.cpp 2013-06-28 22:21:03 UTC (rev 152191)
+++ trunk/Source/WebCore/platform/graphics/cairo/GLContext.cpp 2013-06-28 22:43:33 UTC (rev 152192)
@@ -21,8 +21,14 @@
#if USE(OPENGL)
+#if USE(EGL)
#include "GLContextEGL.h"
+#endif
+
+#if USE(GLX)
#include "GLContextGLX.h"
+#endif
+
#include <wtf/ThreadSpecific.h>
#if PLATFORM(X11)
Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp (152191 => 152192)
--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp 2013-06-28 22:21:03 UTC (rev 152191)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp 2013-06-28 22:43:33 UTC (rev 152192)
@@ -31,10 +31,13 @@
#include "GraphicsContext3D.h"
#include "BitmapImage.h"
-#include "GraphicsContext3DNEON.h"
#include "GraphicsContextCG.h"
#include "Image.h"
+#if HAVE(ARM_NEON_INTRINSICS)
+#include "GraphicsContext3DNEON.h"
+#endif
+
#include <CoreGraphics/CGBitmapContext.h>
#include <CoreGraphics/CGContext.h>
#include <CoreGraphics/CGDataProvider.h>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
