<!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>[187866] trunk</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/187866">187866</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-08-04 10:48:59 -0700 (Tue, 04 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Enable WebGL on Windows CMake build.
https://bugs.webkit.org/show_bug.cgi?id=143311
Reviewed by Csaba Osztrogonác.
.:
* Source/cmake/OptionsWindows.cmake:
Enable WebGL by default in CMake builds now that it works.
Source/ThirdParty/ANGLE:
* CMakeLists.txt: Added.
Source/WebCore:
* CMakeLists.txt:
ANGLE is built quite differently on Windows, so I'm not going to touch the existing CMake build system for
ANGLE on Linux, although I think it should eventually be unified more by using ANGLE's OpenGL renderer.
* PlatformWin.cmake:
Added some needed source files and include directories.
Source/WebKit:
* PlatformWin.cmake:
Added some needed source files and include directories.
Source/WTF:
* wtf/FeatureDefines.h:
Made the CMake feature defines the same as the non-CMake feature defines.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceCMakeListstxt">trunk/Source/CMakeLists.txt</a></li>
<li><a href="#trunkSourceThirdPartyANGLEChangeLog">trunk/Source/ThirdParty/ANGLE/ChangeLog</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfFeatureDefinesh">trunk/Source/WTF/wtf/FeatureDefines.h</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformWincmake">trunk/Source/WebCore/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformWincmake">trunk/Source/WebKit/PlatformWin.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsWindowscmake">trunk/Source/cmake/OptionsWindows.cmake</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceThirdPartyANGLECMakeListstxt">trunk/Source/ThirdParty/ANGLE/CMakeLists.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (187865 => 187866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-08-04 17:12:19 UTC (rev 187865)
+++ trunk/ChangeLog 2015-08-04 17:48:59 UTC (rev 187866)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-08-04 Alex Christensen <achristensen@webkit.org>
+
+ Enable WebGL on Windows CMake build.
+ https://bugs.webkit.org/show_bug.cgi?id=143311
+
+ Reviewed by Csaba Osztrogonác.
+
+ * Source/cmake/OptionsWindows.cmake:
+ Enable WebGL by default in CMake builds now that it works.
+
</ins><span class="cx"> 2015-08-04 Mario Sanchez Prada <mario@endlessm.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Accelerated 2D Canvas enabled when cairo-gl is not available
</span></span></pre></div>
<a id="trunkSourceCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/CMakeLists.txt (187865 => 187866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/CMakeLists.txt 2015-08-04 17:12:19 UTC (rev 187865)
+++ trunk/Source/CMakeLists.txt 2015-08-04 17:48:59 UTC (rev 187866)
</span><span class="lines">@@ -12,6 +12,10 @@
</span><span class="cx">
</span><span class="cx"> add_subdirectory(WebCore)
</span><span class="cx">
</span><ins>+if (WIN32 AND ENABLE_GRAPHICS_CONTEXT_3D)
+ add_subdirectory(ThirdParty/ANGLE)
+endif ()
+
</ins><span class="cx"> if (ENABLE_API_TESTS)
</span><span class="cx"> add_subdirectory(ThirdParty/gtest)
</span><span class="cx"> endif ()
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLECMakeListstxt"></a>
<div class="addfile"><h4>Added: trunk/Source/ThirdParty/ANGLE/CMakeLists.txt (0 => 187866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/CMakeLists.txt (rev 0)
+++ trunk/Source/ThirdParty/ANGLE/CMakeLists.txt 2015-08-04 17:48:59 UTC (rev 187866)
</span><span class="lines">@@ -0,0 +1,268 @@
</span><ins>+include_directories(
+ src
+ include
+ include/KHR
+)
+
+if (${CMAKE_GENERATOR} MATCHES "Ninja")
+ if (${MSVC_CXX_ARCHITECTURE_ID} STREQUAL "X86")
+ link_directories(${WINDOWSSDKDIR}Lib/${WINDOWSSDKLIBVERSION}/um/x86)
+ else ()
+ link_directories(${WINDOWSSDKDIR}Lib/${WINDOWSSDKLIBVERSION}/um/x64)
+ endif ()
+else ()
+ if (${MSVC_CXX_ARCHITECTURE_ID} STREQUAL "X86")
+ link_directories($(WINDOWSSDKDIR)Lib/$(WINDOWSSDKLIBVERSION)/um/x86)
+ else ()
+ link_directories($(WINDOWSSDKDIR)Lib/$(WINDOWSSDKLIBVERSION)/um/x64)
+ endif ()
+endif ()
+
+add_library(libEGL SHARED
+ src/libEGL/libEGL.cpp
+)
+
+add_library(libGLESv2 SHARED
+ src/libGLESv2/entry_points_egl.cpp
+ src/libGLESv2/entry_points_egl_ext.cpp
+ src/libGLESv2/entry_points_gles_2_0.cpp
+ src/libGLESv2/entry_points_gles_2_0_ext.cpp
+ src/libGLESv2/entry_points_gles_3_0.cpp
+ src/libGLESv2/entry_points_gles_3_0_ext.cpp
+ src/libGLESv2/global_state.cpp
+ src/libGLESv2/libGLESv2.cpp
+)
+
+add_library(libANGLE STATIC
+ src/common/angleutils.cpp
+ src/common/debug.cpp
+ src/common/event_tracer.cpp
+ src/common/mathutil.cpp
+ src/common/MemoryBuffer.cpp
+ src/common/tls.cpp
+ src/common/utilities.cpp
+ src/compiler/preprocessor/DiagnosticsBase.cpp
+ src/compiler/preprocessor/DirectiveHandlerBase.cpp
+ src/compiler/preprocessor/DirectiveParser.cpp
+ src/compiler/preprocessor/ExpressionParser.cpp
+ src/compiler/preprocessor/Input.cpp
+ src/compiler/preprocessor/Lexer.cpp
+ src/compiler/preprocessor/Macro.cpp
+ src/compiler/preprocessor/MacroExpander.cpp
+ src/compiler/preprocessor/Preprocessor.cpp
+ src/compiler/preprocessor/Token.cpp
+ src/compiler/preprocessor/Tokenizer.cpp
+ src/compiler/translator/BuiltInFunctionEmulatorGLSL.cpp
+ src/compiler/translator/OutputESSL.cpp
+ src/compiler/translator/OutputGLSL.cpp
+ src/compiler/translator/OutputGLSLBase.cpp
+ src/compiler/translator/SearchSymbol.cpp
+ src/compiler/translator/TranslatorESSL.cpp
+ src/compiler/translator/TranslatorGLSL.cpp
+ src/compiler/translator/UnfoldShortCircuit.cpp
+ src/compiler/translator/VersionGLSL.cpp
+ src/compiler/translator/ASTMetadataHLSL.cpp
+ src/compiler/translator/blocklayoutHLSL.cpp
+ src/compiler/translator/BuiltInFunctionEmulatorHLSL.cpp
+ src/compiler/translator/OutputHLSL.cpp
+ src/compiler/translator/SearchSymbol.cpp
+ src/compiler/translator/StructureHLSL.cpp
+ src/compiler/translator/TranslatorHLSL.cpp
+ src/compiler/translator/UnfoldShortCircuit.cpp
+ src/compiler/translator/UniformHLSL.cpp
+ src/compiler/translator/UtilsHLSL.cpp
+ src/compiler/translator/ArrayReturnValueToOutParameter.cpp
+ src/compiler/translator/blocklayout.cpp
+ src/compiler/translator/BuiltInFunctionEmulator.cpp
+ src/compiler/translator/CallDAG.cpp
+ src/compiler/translator/CodeGen.cpp
+ src/compiler/translator/Compiler.cpp
+ src/compiler/translator/Diagnostics.cpp
+ src/compiler/translator/DirectiveHandler.cpp
+ src/compiler/translator/EmulatePrecision.cpp
+ src/compiler/translator/FlagStd140Structs.cpp
+ src/compiler/translator/ForLoopUnroll.cpp
+ src/compiler/translator/InfoSink.cpp
+ src/compiler/translator/Initialize.cpp
+ src/compiler/translator/InitializeVariables.cpp
+ src/compiler/translator/InitializeDll.cpp
+ src/compiler/translator/InitializeParseContext.cpp
+ src/compiler/translator/Intermediate.cpp
+ src/compiler/translator/IntermNode.cpp
+ src/compiler/translator/intermOut.cpp
+ src/compiler/translator/IntermTraverse.cpp
+ src/compiler/translator/LoopInfo.cpp
+ src/compiler/translator/Operator.cpp
+ src/compiler/translator/parseConst.cpp
+ src/compiler/translator/ParseContext.cpp
+ src/compiler/translator/PoolAlloc.cpp
+ src/compiler/translator/PruneEmptyDeclarations.cpp
+ src/compiler/translator/QualifierAlive.cpp
+ src/compiler/translator/RegenerateStructNames.cpp
+ src/compiler/translator/RemoveSwitchFallThrough.cpp
+ src/compiler/translator/RewriteElseBlocks.cpp
+ src/compiler/translator/ScalarizeVecAndMatConstructorArgs.cpp
+ src/compiler/translator/SearchSymbol.cpp
+ src/compiler/translator/SeparateArrayInitialization.cpp
+ src/compiler/translator/SeparateDeclarations.cpp
+ src/compiler/translator/ShaderLang.cpp
+ src/compiler/translator/ShaderVars.cpp
+ src/compiler/translator/SimplifyArrayAssignment.cpp
+ src/compiler/translator/SymbolTable.cpp
+ src/compiler/translator/Types.cpp
+ src/compiler/translator/UnfoldShortCircuit.cpp
+ src/compiler/translator/UnfoldShortCircuitAST.cpp
+ src/compiler/translator/util.cpp
+ src/compiler/translator/ValidateLimitations.cpp
+ src/compiler/translator/ValidateOutputs.cpp
+ src/compiler/translator/ValidateSwitch.cpp
+ src/compiler/translator/VariableInfo.cpp
+ src/compiler/translator/VariablePacker.cpp
+ src/compiler/translator/glslang_lex.cpp
+ src/compiler/translator/glslang_tab.cpp
+ src/compiler/translator/depgraph/DependencyGraph.cpp
+ src/compiler/translator/depgraph/DependencyGraphBuilder.cpp
+ src/compiler/translator/depgraph/DependencyGraphOutput.cpp
+ src/compiler/translator/depgraph/DependencyGraphTraverse.cpp
+ src/compiler/translator/timing/RestrictFragmentShaderTiming.cpp
+ src/compiler/translator/timing/RestrictVertexShaderTiming.cpp
+ src/compiler/translator/VersionGLSL.cpp
+ src/libANGLE/angletypes.cpp
+ src/libANGLE/AttributeMap.cpp
+ src/libANGLE/Buffer.cpp
+ src/libANGLE/Caps.cpp
+ src/libANGLE/Compiler.cpp
+ src/libANGLE/Config.cpp
+ src/libANGLE/Context.cpp
+ src/libANGLE/Data.cpp
+ src/libANGLE/Device.cpp
+ src/libANGLE/Display.cpp
+ src/libANGLE/Error.cpp
+ src/libANGLE/Fence.cpp
+ src/libANGLE/Float16ToFloat32.cpp
+ src/libANGLE/formatutils.cpp
+ src/libANGLE/Framebuffer.cpp
+ src/libANGLE/FramebufferAttachment.cpp
+ src/libANGLE/HandleAllocator.cpp
+ src/libANGLE/ImageIndex.cpp
+ src/libANGLE/Platform.cpp
+ src/libANGLE/Program.cpp
+ src/libANGLE/Query.cpp
+ src/libANGLE/queryconversions.cpp
+ src/libANGLE/RefCountObject.cpp
+ src/libANGLE/Renderbuffer.cpp
+ src/libANGLE/renderer/d3d/BufferD3D.cpp
+ src/libANGLE/renderer/d3d/CompilerD3D.cpp
+ src/libANGLE/renderer/d3d/copyimage.cpp
+ src/libANGLE/renderer/d3d/d3d11/Blit11.cpp
+ src/libANGLE/renderer/d3d/d3d11/Buffer11.cpp
+ src/libANGLE/renderer/d3d/d3d11/Clear11.cpp
+ src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.cpp
+ src/libANGLE/renderer/d3d/d3d11/Fence11.cpp
+ src/libANGLE/renderer/d3d/d3d11/formatutils11.cpp
+ src/libANGLE/renderer/d3d/d3d11/Framebuffer11.cpp
+ src/libANGLE/renderer/d3d/d3d11/Image11.cpp
+ src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.cpp
+ src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp
+ src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.cpp
+ src/libANGLE/renderer/d3d/d3d11/Query11.cpp
+ src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
+ src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
+ src/libANGLE/renderer/d3d/d3d11/RenderStateCache.cpp
+ src/libANGLE/renderer/d3d/d3d11/RenderTarget11.cpp
+ src/libANGLE/renderer/d3d/d3d11/ShaderExecutable11.cpp
+ src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp
+ src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp
+ src/libANGLE/renderer/d3d/d3d11/Trim11.cpp
+ src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp
+ src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow.cpp
+ src/libANGLE/renderer/d3d/d3d9/Blit9.cpp
+ src/libANGLE/renderer/d3d/d3d9/Buffer9.cpp
+ src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.cpp
+ src/libANGLE/renderer/d3d/d3d9/Fence9.cpp
+ src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp
+ src/libANGLE/renderer/d3d/d3d9/Framebuffer9.cpp
+ src/libANGLE/renderer/d3d/d3d9/Image9.cpp
+ src/libANGLE/renderer/d3d/d3d9/IndexBuffer9.cpp
+ src/libANGLE/renderer/d3d/d3d9/Query9.cpp
+ src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp
+ src/libANGLE/renderer/d3d/d3d9/renderer9_utils.cpp
+ src/libANGLE/renderer/d3d/d3d9/RenderTarget9.cpp
+ src/libANGLE/renderer/d3d/d3d9/ShaderExecutable9.cpp
+ src/libANGLE/renderer/d3d/d3d9/SwapChain9.cpp
+ src/libANGLE/renderer/d3d/d3d9/TextureStorage9.cpp
+ src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp
+ src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.cpp
+ src/libANGLE/renderer/d3d/DeviceD3D.cpp
+ src/libANGLE/renderer/d3d/DisplayD3D.cpp
+ src/libANGLE/renderer/d3d/DynamicHLSL.cpp
+ src/libANGLE/renderer/d3d/formatutilsD3D.cpp
+ src/libANGLE/renderer/d3d/FramebufferD3D.cpp
+ src/libANGLE/renderer/d3d/HLSLCompiler.cpp
+ src/libANGLE/renderer/d3d/ImageD3D.cpp
+ src/libANGLE/renderer/d3d/IndexBuffer.cpp
+ src/libANGLE/renderer/d3d/IndexDataManager.cpp
+ src/libANGLE/renderer/d3d/loadimage.cpp
+ src/libANGLE/renderer/d3d/loadimageSSE2.cpp
+ src/libANGLE/renderer/d3d/ProgramD3D.cpp
+ src/libANGLE/renderer/d3d/RenderbufferD3D.cpp
+ src/libANGLE/renderer/d3d/RendererD3D.cpp
+ src/libANGLE/renderer/d3d/RenderTargetD3D.cpp
+ src/libANGLE/renderer/d3d/ShaderD3D.cpp
+ src/libANGLE/renderer/d3d/ShaderExecutableD3D.cpp
+ src/libANGLE/renderer/d3d/SurfaceD3D.cpp
+ src/libANGLE/renderer/d3d/TextureD3D.cpp
+ src/libANGLE/renderer/d3d/TextureStorage.cpp
+ src/libANGLE/renderer/d3d/TransformFeedbackD3D.cpp
+ src/libANGLE/renderer/d3d/VertexBuffer.cpp
+ src/libANGLE/renderer/d3d/VertexDataManager.cpp
+ src/libANGLE/renderer/DeviceImpl.cpp
+ src/libANGLE/renderer/DisplayImpl.cpp
+ src/libANGLE/renderer/IndexRangeCache.cpp
+ src/libANGLE/renderer/ProgramImpl.cpp
+ src/libANGLE/renderer/RenderbufferImpl.cpp
+ src/libANGLE/renderer/Renderer.cpp
+ src/libANGLE/renderer/SurfaceImpl.cpp
+ src/libANGLE/ResourceManager.cpp
+ src/libANGLE/Sampler.cpp
+ src/libANGLE/Shader.cpp
+ src/libANGLE/State.cpp
+ src/libANGLE/Surface.cpp
+ src/libANGLE/Texture.cpp
+ src/libANGLE/TransformFeedback.cpp
+ src/libANGLE/Uniform.cpp
+ src/libANGLE/validationEGL.cpp
+ src/libANGLE/validationES.cpp
+ src/libANGLE/validationES2.cpp
+ src/libANGLE/validationES3.cpp
+ src/libANGLE/VertexArray.cpp
+ src/libANGLE/VertexAttribute.cpp
+ src/third_party/compiler/ArrayBoundsClamper.cpp
+ src/third_party/murmurhash/MurmurHash3.cpp
+ src/third_party/systeminfo/SystemInfo.cpp
+)
+
+set_property(TARGET libANGLE PROPERTY COMPILE_DEFINITIONS
+ ANGLE_DEFAULT_D3D11=1
+ ANGLE_ENABLE_D3D9
+ ANGLE_ENABLE_D3D11
+ ANGLE_ENABLE_HLSL
+ ANGLE_SKIP_DXGI_1_2_CHECK=1
+ ANGLE_WEBKIT_WIN
+ LIBANGLE_IMPLEMENTATION
+ NOMINMAX
+ __STDC_LIMIT_MACROS
+)
+
+target_link_libraries(libEGL
+ libGLESv2
+)
+
+target_link_libraries(libGLESv2
+ D3d9
+ libANGLE
+)
+
+set_target_properties(libANGLE PROPERTIES FOLDER "ANGLE")
+set_target_properties(libEGL PROPERTIES FOLDER "ANGLE")
+set_target_properties(libGLESv2 PROPERTIES FOLDER "ANGLE")
</ins></span></pre></div>
<a id="trunkSourceThirdPartyANGLEChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (187865 => 187866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2015-08-04 17:12:19 UTC (rev 187865)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2015-08-04 17:48:59 UTC (rev 187866)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-08-04 Alex Christensen <achristensen@webkit.org>
+
+ Enable WebGL on Windows CMake build.
+ https://bugs.webkit.org/show_bug.cgi?id=143311
+
+ Reviewed by Csaba Osztrogonác.
+
+ * CMakeLists.txt: Added.
+
</ins><span class="cx"> 2015-07-03 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Xcode] Update some build settings as recommended by Xcode 7
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (187865 => 187866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-08-04 17:12:19 UTC (rev 187865)
+++ trunk/Source/WTF/ChangeLog 2015-08-04 17:48:59 UTC (rev 187866)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-08-04 Alex Christensen <achristensen@webkit.org>
+
+ Enable WebGL on Windows CMake build.
+ https://bugs.webkit.org/show_bug.cgi?id=143311
+
+ Reviewed by Csaba Osztrogonác.
+
+ * wtf/FeatureDefines.h:
+ Made the CMake feature defines the same as the non-CMake feature defines.
+
</ins><span class="cx"> 2015-08-03 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Introduce COMPILER(GCC_OR_CLANG) guard and make COMPILER(GCC) true only for GCC
</span></span></pre></div>
<a id="trunkSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FeatureDefines.h (187865 => 187866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FeatureDefines.h 2015-08-04 17:12:19 UTC (rev 187865)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2015-08-04 17:48:59 UTC (rev 187866)
</span><span class="lines">@@ -272,13 +272,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !defined(ENABLE_WEBGL)
</span><del>-// FIXME: Get WebGL working on Windows with CMake. https://bugs.webkit.org/show_bug.cgi?id=143311
-#if defined(BUILDING_WITH_CMAKE)
</del><span class="cx"> #define ENABLE_WEBGL 0
</span><del>-#else
-#define ENABLE_WEBGL 0
</del><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if !defined(ENABLE_GEOLOCATION)
</span><span class="cx"> #define ENABLE_GEOLOCATION 1
</span><span class="lines">@@ -300,13 +295,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !defined(ENABLE_WEBGL)
</span><del>-// FIXME: Get WebGL working on Windows with CMake. https://bugs.webkit.org/show_bug.cgi?id=143311
-#if defined(BUILDING_WITH_CMAKE)
-#define ENABLE_WEBGL 0
-#else
</del><span class="cx"> #define ENABLE_WEBGL 1
</span><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if !defined(ENABLE_GEOLOCATION)
</span><span class="cx"> #define ENABLE_GEOLOCATION 1
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (187865 => 187866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-08-04 17:12:19 UTC (rev 187865)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-08-04 17:48:59 UTC (rev 187866)
</span><span class="lines">@@ -3650,7 +3650,7 @@
</span><span class="cx"> set_target_properties(WebCoreTestSupport PROPERTIES OUTPUT_NAME ${WebCoreTestSupport_OUTPUT_NAME})
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (ENABLE_GRAPHICS_CONTEXT_3D)
</del><ins>+if (ENABLE_GRAPHICS_CONTEXT_3D AND NOT WIN32)
</ins><span class="cx"> add_library(ANGLESupport STATIC ${ANGLESupport_SOURCES})
</span><span class="cx"> set_target_properties(ANGLESupport PROPERTIES FOLDER "WebCore")
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187865 => 187866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-04 17:12:19 UTC (rev 187865)
+++ trunk/Source/WebCore/ChangeLog 2015-08-04 17:48:59 UTC (rev 187866)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-08-04 Alex Christensen <achristensen@webkit.org>
+
+ Enable WebGL on Windows CMake build.
+ https://bugs.webkit.org/show_bug.cgi?id=143311
+
+ Reviewed by Csaba Osztrogonác.
+
+ * CMakeLists.txt:
+ ANGLE is built quite differently on Windows, so I'm not going to touch the existing CMake build system for
+ ANGLE on Linux, although I think it should eventually be unified more by using ANGLE's OpenGL renderer.
+ * PlatformWin.cmake:
+ Added some needed source files and include directories.
+
</ins><span class="cx"> 2015-08-04 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement isPictureInPictureInterrupted.
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWin.cmake (187865 => 187866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWin.cmake 2015-08-04 17:12:19 UTC (rev 187865)
+++ trunk/Source/WebCore/PlatformWin.cmake 2015-08-04 17:48:59 UTC (rev 187866)
</span><span class="lines">@@ -3,11 +3,15 @@
</span><span class="cx"> "${WEBCORE_DIR}/page/win"
</span><span class="cx"> "${WEBCORE_DIR}/platform/cf"
</span><span class="cx"> "${WEBCORE_DIR}/platform/cf/win"
</span><ins>+ "${WEBCORE_DIR}/platform/graphics/egl"
+ "${WEBCORE_DIR}/platform/graphics/opengl"
</ins><span class="cx"> "${WEBCORE_DIR}/platform/graphics/opentype"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/win"
</span><span class="cx"> "${WEBCORE_DIR}/platform/network/win"
</span><span class="cx"> "${WEBCORE_DIR}/platform/win"
</span><span class="cx"> "${WEBCORE_DIR}/plugins/win"
</span><ins>+ "${THIRDPARTY_DIR}/ANGLE/include"
+ "${THIRDPARTY_DIR}/ANGLE/include/egl"
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> enable_language(ASM_MASM)
</span><span class="lines">@@ -39,8 +43,17 @@
</span><span class="cx"> platform/cf/win/CertificateCFWin.cpp
</span><span class="cx">
</span><span class="cx"> platform/graphics/FontPlatformData.cpp
</span><ins>+ platform/graphics/GraphicsContext3DPrivate.cpp
</ins><span class="cx"> platform/graphics/WOFFFileFormat.cpp
</span><span class="cx">
</span><ins>+ platform/graphics/egl/GLContextEGL.cpp
+
+ platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
+ platform/graphics/opengl/Extensions3DOpenGLES.cpp
+ platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
+ platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
+ platform/graphics/opengl/TemporaryOpenGLSetting.cpp
+
</ins><span class="cx"> platform/graphics/opentype/OpenTypeUtilities.cpp
</span><span class="cx">
</span><span class="cx"> platform/graphics/win/DIBPixelData.cpp
</span><span class="lines">@@ -175,7 +188,9 @@
</span><span class="cx">
</span><span class="cx"> platform/cf/win
</span><span class="cx">
</span><ins>+ platform/graphics/opengl
</ins><span class="cx"> platform/graphics/opentype
</span><ins>+ platform/graphics/texmap
</ins><span class="cx"> platform/graphics/transforms
</span><span class="cx"> platform/graphics/win
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (187865 => 187866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2015-08-04 17:12:19 UTC (rev 187865)
+++ trunk/Source/WebKit/ChangeLog 2015-08-04 17:48:59 UTC (rev 187866)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-08-04 Alex Christensen <achristensen@webkit.org>
+
+ Enable WebGL on Windows CMake build.
+ https://bugs.webkit.org/show_bug.cgi?id=143311
+
+ Reviewed by Csaba Osztrogonác.
+
+ * PlatformWin.cmake:
+ Added some needed source files and include directories.
+
</ins><span class="cx"> 2015-08-01 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix 64-bit CMake build on Windows.
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformWin.cmake (187865 => 187866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformWin.cmake 2015-08-04 17:12:19 UTC (rev 187865)
+++ trunk/Source/WebKit/PlatformWin.cmake 2015-08-04 17:48:59 UTC (rev 187866)
</span><span class="lines">@@ -52,6 +52,11 @@
</span><span class="cx"> "${WEBCORE_DIR}/modules/websockets"
</span><span class="cx"> "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces"
</span><span class="cx"> "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
</span><ins>+ "${THIRDPARTY_DIR}"
+ "${THIRDPARTY_DIR}/ANGLE"
+ "${THIRDPARTY_DIR}/ANGLE/include"
+ "${THIRDPARTY_DIR}/ANGLE/include/egl"
+ "${THIRDPARTY_DIR}/ANGLE/include/khr"
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit_INCLUDES
</span><span class="lines">@@ -219,6 +224,7 @@
</span><span class="cx"> WebCoreSupport/WebViewGroup.cpp
</span><span class="cx"> WebCoreSupport/WebViewGroup.h
</span><span class="cx">
</span><ins>+ win/WebCoreSupport/AcceleratedCompositingContext.cpp
</ins><span class="cx"> win/WebCoreSupport/EmbeddedWidget.cpp
</span><span class="cx"> win/WebCoreSupport/EmbeddedWidget.h
</span><span class="cx"> win/WebCoreSupport/WebChromeClient.cpp
</span><span class="lines">@@ -422,6 +428,14 @@
</span><span class="cx"> WebKitGUID
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+if (ENABLE_GRAPHICS_CONTEXT_3D)
+ list(APPEND WebKit_LIBRARIES
+ libANGLE
+ libEGL
+ libGLESv2
+ )
+endif ()
+
</ins><span class="cx"> # We need the webkit libraries to come before the system default libraries to prevent symbol conflicts with uuid.lib.
</span><span class="cx"> # To do this we add system default libs as webkit libs and zero out system default libs.
</span><span class="cx"> string(REPLACE " " "\;" CXX_LIBS ${CMAKE_CXX_STANDARD_LIBRARIES})
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsWindowscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsWindows.cmake (187865 => 187866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsWindows.cmake 2015-08-04 17:12:19 UTC (rev 187865)
+++ trunk/Source/cmake/OptionsWindows.cmake 2015-08-04 17:48:59 UTC (rev 187866)
</span><span class="lines">@@ -9,6 +9,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PICTURE_SIZES PUBLIC OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_STREAMS_API PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIEW_MODE_CSS_MEDIA PUBLIC OFF)
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PUBLIC ON)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SYSTEM_MALLOC PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_END()
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>