[webkit-changes] [146390] trunk

[zandobersek]

Title: [146390] trunk

Revision

146390

Author

zandober...@gmail.com

Date

2013-03-20 14:26:07 -0700 (Wed, 20 Mar 2013)

Log Message

[GTK] Build ANGLE sources into a separate library from libWebCore.la
https://bugs.webkit.org/show_bug.cgi?id=112778

Reviewed by Martin Robinson.

.: 

* GNUmakefile.am: Include the GNUmakefile.am covering the libANGLE.la library.

Source/ThirdParty/ANGLE: 

* GNUmakefile.am: Added, sets up the libANGLE.la library.

Source/WebCore: 

No new tests - no change in functionality.

* GNUmakefile.list.am: Remove the ANGLE sources listing, it's now placed in the ANGLE-specific GNUmakefile.am.

Source/WebKit/gtk: 

* GNUmakefile.am: Add libLevelDB.la to the libwebkitgtk library if using the OpenGL accelerated backend.

Source/WebKit2: 

* GNUmakefile.am: Add libLevelDB.la to the libwebkit2gtk library if using the OpenGL accelerated backend.

Modified Paths

• trunk/ChangeLog
• trunk/GNUmakefile.am
• trunk/Source/ThirdParty/ANGLE/ChangeLog
• trunk/Source/WebCore/ChangeLog
• trunk/Source/WebCore/GNUmakefile.list.am
• trunk/Source/WebKit/gtk/ChangeLog
• trunk/Source/WebKit/gtk/GNUmakefile.am
• trunk/Source/WebKit2/ChangeLog
• trunk/Source/WebKit2/GNUmakefile.am

Added Paths

• trunk/Source/ThirdParty/ANGLE/GNUmakefile.am

Diff

Modified: trunk/ChangeLog (146389 => 146390)

--- trunk/ChangeLog	2013-03-20 21:24:24 UTC (rev 146389)
+++ trunk/ChangeLog	2013-03-20 21:26:07 UTC (rev 146390)
@@ -1,3 +1,12 @@
+2013-03-20  Zan Dobersek  <zdober...@igalia.com>
+
+        [GTK] Build ANGLE sources into a separate library from libWebCore.la
+        https://bugs.webkit.org/show_bug.cgi?id=112778
+
+        Reviewed by Martin Robinson.
+
+        * GNUmakefile.am: Include the GNUmakefile.am covering the libANGLE.la library.
+
 2013-03-20  Jocelyn Turcotte  <jocelyn.turco...@digia.com>
 
         [Qt] Define MODULE_VERSION

Modified: trunk/GNUmakefile.am (146389 => 146390)

--- trunk/GNUmakefile.am	2013-03-20 21:24:24 UTC (rev 146389)
+++ trunk/GNUmakefile.am	2013-03-20 21:26:07 UTC (rev 146390)
@@ -189,6 +189,7 @@
 include Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am
 include Tools/MiniBrowser/gtk/GNUmakefile.am
 include Tools/WebKitTestRunner/GNUmakefile.am
+include Source/ThirdParty/ANGLE/GNUmakefile.am
 include Source/ThirdParty/gtest/GNUmakefile.am
 include Tools/TestWebKitAPI/GNUmakefile.am
 # [GTK] Refactor the translations now that we have webkit2

Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (146389 => 146390)

--- trunk/Source/ThirdParty/ANGLE/ChangeLog	2013-03-20 21:24:24 UTC (rev 146389)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog	2013-03-20 21:26:07 UTC (rev 146390)
@@ -1,3 +1,12 @@
+2013-03-20  Zan Dobersek  <zdober...@igalia.com>
+
+        [GTK] Build ANGLE sources into a separate library from libWebCore.la
+        https://bugs.webkit.org/show_bug.cgi?id=112778
+
+        Reviewed by Martin Robinson.
+
+        * GNUmakefile.am: Added, sets up the libANGLE.la library.
+
 2013-03-05  Kenneth Russell  <k...@google.com>
 
         Upgrade ANGLE to r1987

Added: trunk/Source/ThirdParty/ANGLE/GNUmakefile.am (0 => 146390)

--- trunk/Source/ThirdParty/ANGLE/GNUmakefile.am	                        (rev 0)
+++ trunk/Source/ThirdParty/ANGLE/GNUmakefile.am	2013-03-20 21:26:07 UTC (rev 146390)
@@ -0,0 +1,149 @@
+if USE_OPENGL
+noinst_LTLIBRARIES += \
+	libANGLE.la
+endif
+
+libANGLE_la_CXXFLAGS = $(global_cxxflags)
+libANGLE_la_CFLAGS = $(global_cflags)
+libANGLE_la_CPPFLAGS = \
+	$(global_cppflags) \
+	-I$(srcdir)/Source/ThirdParty/ANGLE/src \
+	-I$(srcdir)/Source/ThirdParty/ANGLE/include \
+	-I$(srcdir)/Source/ThirdParty/ANGLE/include/GLSLANG \
+	-I$(srcdir)/Source/ThirdParty/ANGLE/include/KHR
+
+nodist_libANGLE_la_SOURCES = \
+	DerivedSources/ANGLE/glslang.cpp \
+	DerivedSources/ANGLE/glslang_tab.cpp \
+	DerivedSources/ANGLE/glslang_tab.h
+
+libANGLE_la_SOURCES = \
+	Source/ThirdParty/ANGLE/include/EGL/egl.h \
+	Source/ThirdParty/ANGLE/include/EGL/eglplatform.h \
+	Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h \
+	Source/ThirdParty/ANGLE/include/KHR/khrplatform.h \
+	Source/ThirdParty/ANGLE/src/common/angleutils.h \
+	Source/ThirdParty/ANGLE/src/compiler/BaseTypes.h \
+	Source/ThirdParty/ANGLE/src/compiler/BuiltInFunctionEmulator.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/BuiltInFunctionEmulator.h \
+	Source/ThirdParty/ANGLE/src/compiler/CodeGenGLSL.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/Common.h \
+	Source/ThirdParty/ANGLE/src/compiler/Compiler.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/ConstantUnion.h \
+	Source/ThirdParty/ANGLE/src/compiler/debug.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/debug.h \
+	Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraph.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraph.h \
+	Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraphBuilder.h \
+	Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraphBuilder.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraphOutput.h \
+	Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraphOutput.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraphTraverse.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/DetectDiscontinuity.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/DetectDiscontinuity.h \
+	Source/ThirdParty/ANGLE/src/compiler/DetectRecursion.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/DetectRecursion.h \
+	Source/ThirdParty/ANGLE/src/compiler/Diagnostics.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/Diagnostics.h \
+	Source/ThirdParty/ANGLE/src/compiler/DirectiveHandler.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/DirectiveHandler.h \
+	Source/ThirdParty/ANGLE/src/compiler/ExtensionBehavior.h \
+	Source/ThirdParty/ANGLE/src/compiler/ForLoopUnroll.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/ForLoopUnroll.h \
+	Source/ThirdParty/ANGLE/src/compiler/glslang.h \
+	Source/ThirdParty/ANGLE/src/compiler/HashNames.h \
+	Source/ThirdParty/ANGLE/src/compiler/InfoSink.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/InfoSink.h \
+	Source/ThirdParty/ANGLE/src/compiler/Initialize.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/InitializeDll.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/InitializeDll.h \
+	Source/ThirdParty/ANGLE/src/compiler/InitializeGlobals.h \
+	Source/ThirdParty/ANGLE/src/compiler/Initialize.h \
+	Source/ThirdParty/ANGLE/src/compiler/InitializeParseContext.h \
+	Source/ThirdParty/ANGLE/src/compiler/InitializeParseContext.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/Intermediate.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/intermediate.h \
+	Source/ThirdParty/ANGLE/src/compiler/intermOut.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/IntermTraverse.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/localintermediate.h \
+	Source/ThirdParty/ANGLE/src/compiler/MapLongVariableNames.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/MapLongVariableNames.h \
+	Source/ThirdParty/ANGLE/src/compiler/MMap.h \
+	Source/ThirdParty/ANGLE/src/compiler/osinclude.h \
+	Source/ThirdParty/ANGLE/src/compiler/ossource_posix.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/OutputESSL.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/OutputESSL.h \
+	Source/ThirdParty/ANGLE/src/compiler/OutputGLSL.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/OutputGLSL.h \
+	Source/ThirdParty/ANGLE/src/compiler/OutputGLSLBase.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/OutputGLSLBase.h \
+	Source/ThirdParty/ANGLE/src/compiler/OutputHLSL.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/OutputHLSL.h \
+	Source/ThirdParty/ANGLE/src/compiler/parseConst.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/ParseHelper.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/ParseHelper.h \
+	Source/ThirdParty/ANGLE/src/compiler/PoolAlloc.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/PoolAlloc.h \
+	Source/ThirdParty/ANGLE/src/compiler/Pragma.h \
+	Source/ThirdParty/ANGLE/src/compiler/preprocessor/length_limits.h \
+	Source/ThirdParty/ANGLE/src/compiler/preprocessor/numeric_lex.h \
+	Source/ThirdParty/ANGLE/src/compiler/preprocessor/DiagnosticsBase.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/preprocessor/DiagnosticsBase.h \
+	Source/ThirdParty/ANGLE/src/compiler/preprocessor/DirectiveHandlerBase.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/preprocessor/DirectiveHandlerBase.h \
+	Source/ThirdParty/ANGLE/src/compiler/preprocessor/DirectiveParser.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/preprocessor/DirectiveParser.h \
+	Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.h \
+	Source/ThirdParty/ANGLE/src/compiler/preprocessor/Input.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/preprocessor/Input.h \
+	Source/ThirdParty/ANGLE/src/compiler/preprocessor/Lexer.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/preprocessor/Lexer.h \
+	Source/ThirdParty/ANGLE/src/compiler/preprocessor/Macro.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/preprocessor/Macro.h \
+	Source/ThirdParty/ANGLE/src/compiler/preprocessor/MacroExpander.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/preprocessor/MacroExpander.h \
+	Source/ThirdParty/ANGLE/src/compiler/preprocessor/Preprocessor.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/preprocessor/Preprocessor.h \
+	Source/ThirdParty/ANGLE/src/compiler/preprocessor/SourceLocation.h \
+	Source/ThirdParty/ANGLE/src/compiler/preprocessor/Token.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/preprocessor/Token.h \
+	Source/ThirdParty/ANGLE/src/compiler/preprocessor/Tokenizer.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/preprocessor/Tokenizer.h \
+	Source/ThirdParty/ANGLE/src/compiler/preprocessor/pp_utils.h \
+	Source/ThirdParty/ANGLE/src/compiler/QualifierAlive.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/QualifierAlive.h \
+	Source/ThirdParty/ANGLE/src/compiler/RemoveTree.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/RemoveTree.h \
+	Source/ThirdParty/ANGLE/src/compiler/RenameFunction.h \
+	Source/ThirdParty/ANGLE/src/compiler/SearchSymbol.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/SearchSymbol.h \
+	Source/ThirdParty/ANGLE/src/compiler/ShaderLang.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/ShHandle.h \
+	Source/ThirdParty/ANGLE/src/compiler/SymbolTable.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/SymbolTable.h \
+	Source/ThirdParty/ANGLE/src/compiler/VariablePacker.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/VariablePacker.h \
+	Source/ThirdParty/ANGLE/src/compiler/VersionGLSL.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/VersionGLSL.h \
+	Source/ThirdParty/ANGLE/src/compiler/timing/RestrictFragmentShaderTiming.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/timing/RestrictFragmentShaderTiming.h \
+	Source/ThirdParty/ANGLE/src/compiler/timing/RestrictVertexShaderTiming.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/timing/RestrictVertexShaderTiming.h \
+	Source/ThirdParty/ANGLE/src/compiler/TranslatorESSL.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/TranslatorESSL.h \
+	Source/ThirdParty/ANGLE/src/compiler/TranslatorGLSL.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/TranslatorGLSL.h \
+	Source/ThirdParty/ANGLE/src/compiler/TranslatorHLSL.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/TranslatorHLSL.h \
+	Source/ThirdParty/ANGLE/src/compiler/Types.h \
+	Source/ThirdParty/ANGLE/src/compiler/UnfoldShortCircuit.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/UnfoldShortCircuit.h \
+	Source/ThirdParty/ANGLE/src/compiler/util.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/util.h \
+	Source/ThirdParty/ANGLE/src/compiler/ValidateLimitations.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/ValidateLimitations.h \
+	Source/ThirdParty/ANGLE/src/compiler/VariableInfo.cpp \
+	Source/ThirdParty/ANGLE/src/compiler/VariableInfo.h \
+	Source/ThirdParty/ANGLE/src/third_party/compiler/ArrayBoundsClamper.cpp \
+	Source/ThirdParty/ANGLE/src/third_party/compiler/ArrayBoundsClamper.h

Modified: trunk/Source/WebCore/ChangeLog (146389 => 146390)

--- trunk/Source/WebCore/ChangeLog	2013-03-20 21:24:24 UTC (rev 146389)
+++ trunk/Source/WebCore/ChangeLog	2013-03-20 21:26:07 UTC (rev 146390)
@@ -1,3 +1,14 @@
+2013-03-20  Zan Dobersek  <zdober...@igalia.com>
+
+        [GTK] Build ANGLE sources into a separate library from libWebCore.la
+        https://bugs.webkit.org/show_bug.cgi?id=112778
+
+        Reviewed by Martin Robinson.
+
+        No new tests - no change in functionality.
+
+        * GNUmakefile.list.am: Remove the ANGLE sources listing, it's now placed in the ANGLE-specific GNUmakefile.am.
+
 2011-03-20  Ryosuke Niwa  <rn...@webkit.org>
 
         Assertion in LegacyWebArchive::create() in editing tests

Modified: trunk/Source/WebCore/GNUmakefile.list.am (146389 => 146390)

--- trunk/Source/WebCore/GNUmakefile.list.am	2013-03-20 21:24:24 UTC (rev 146389)
+++ trunk/Source/WebCore/GNUmakefile.list.am	2013-03-20 21:26:07 UTC (rev 146390)
@@ -6352,146 +6352,6 @@
 	Source/WebCore/platform/graphics/gstreamer/GStreamerVersioning.h
 endif
 
-# ---
-# 3D canvas (WebGL) support
-# ---
-if ENABLE_WEBGL
-webcore_built_sources += \
-	DerivedSources/ANGLE/glslang.cpp \
-	DerivedSources/ANGLE/glslang_tab.cpp \
-	DerivedSources/ANGLE/glslang_tab.h
-
-webcore_sources += \
-	Source/ThirdParty/ANGLE/include/EGL/egl.h \
-	Source/ThirdParty/ANGLE/include/EGL/eglplatform.h \
-	Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h \
-	Source/ThirdParty/ANGLE/include/KHR/khrplatform.h \
-	Source/ThirdParty/ANGLE/src/common/angleutils.h \
-	Source/ThirdParty/ANGLE/src/compiler/BaseTypes.h \
-	Source/ThirdParty/ANGLE/src/compiler/BuiltInFunctionEmulator.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/BuiltInFunctionEmulator.h \
-	Source/ThirdParty/ANGLE/src/compiler/CodeGenGLSL.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/Common.h \
-	Source/ThirdParty/ANGLE/src/compiler/Compiler.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/ConstantUnion.h \
-	Source/ThirdParty/ANGLE/src/compiler/debug.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/debug.h \
-	Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraph.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraph.h \
-	Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraphBuilder.h \
-	Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraphBuilder.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraphOutput.h \
-	Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraphOutput.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraphTraverse.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/DetectDiscontinuity.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/DetectDiscontinuity.h \
-	Source/ThirdParty/ANGLE/src/compiler/DetectRecursion.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/DetectRecursion.h \
-	Source/ThirdParty/ANGLE/src/compiler/Diagnostics.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/Diagnostics.h \
-	Source/ThirdParty/ANGLE/src/compiler/DirectiveHandler.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/DirectiveHandler.h \
-	Source/ThirdParty/ANGLE/src/compiler/ExtensionBehavior.h \
-	Source/ThirdParty/ANGLE/src/compiler/ForLoopUnroll.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/ForLoopUnroll.h \
-	Source/ThirdParty/ANGLE/src/compiler/glslang.h \
-	Source/ThirdParty/ANGLE/src/compiler/HashNames.h \
-	Source/ThirdParty/ANGLE/src/compiler/InfoSink.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/InfoSink.h \
-	Source/ThirdParty/ANGLE/src/compiler/Initialize.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/InitializeDll.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/InitializeDll.h \
-	Source/ThirdParty/ANGLE/src/compiler/InitializeGlobals.h \
-	Source/ThirdParty/ANGLE/src/compiler/Initialize.h \
-	Source/ThirdParty/ANGLE/src/compiler/InitializeParseContext.h \
-	Source/ThirdParty/ANGLE/src/compiler/InitializeParseContext.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/Intermediate.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/intermediate.h \
-	Source/ThirdParty/ANGLE/src/compiler/intermOut.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/IntermTraverse.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/localintermediate.h \
-	Source/ThirdParty/ANGLE/src/compiler/MapLongVariableNames.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/MapLongVariableNames.h \
-	Source/ThirdParty/ANGLE/src/compiler/MMap.h \
-	Source/ThirdParty/ANGLE/src/compiler/osinclude.h \
-	Source/ThirdParty/ANGLE/src/compiler/ossource_posix.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/OutputESSL.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/OutputESSL.h \
-	Source/ThirdParty/ANGLE/src/compiler/OutputGLSL.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/OutputGLSL.h \
-	Source/ThirdParty/ANGLE/src/compiler/OutputGLSLBase.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/OutputGLSLBase.h \
-	Source/ThirdParty/ANGLE/src/compiler/OutputHLSL.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/OutputHLSL.h \
-	Source/ThirdParty/ANGLE/src/compiler/parseConst.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/ParseHelper.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/ParseHelper.h \
-	Source/ThirdParty/ANGLE/src/compiler/PoolAlloc.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/PoolAlloc.h \
-	Source/ThirdParty/ANGLE/src/compiler/Pragma.h \
-	Source/ThirdParty/ANGLE/src/compiler/preprocessor/length_limits.h \
-	Source/ThirdParty/ANGLE/src/compiler/preprocessor/numeric_lex.h \
-	Source/ThirdParty/ANGLE/src/compiler/preprocessor/DiagnosticsBase.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/preprocessor/DiagnosticsBase.h \
-	Source/ThirdParty/ANGLE/src/compiler/preprocessor/DirectiveHandlerBase.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/preprocessor/DirectiveHandlerBase.h \
-	Source/ThirdParty/ANGLE/src/compiler/preprocessor/DirectiveParser.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/preprocessor/DirectiveParser.h \
-	Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.h \
-	Source/ThirdParty/ANGLE/src/compiler/preprocessor/Input.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/preprocessor/Input.h \
-	Source/ThirdParty/ANGLE/src/compiler/preprocessor/Lexer.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/preprocessor/Lexer.h \
-	Source/ThirdParty/ANGLE/src/compiler/preprocessor/Macro.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/preprocessor/Macro.h \
-	Source/ThirdParty/ANGLE/src/compiler/preprocessor/MacroExpander.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/preprocessor/MacroExpander.h \
-	Source/ThirdParty/ANGLE/src/compiler/preprocessor/Preprocessor.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/preprocessor/Preprocessor.h \
-	Source/ThirdParty/ANGLE/src/compiler/preprocessor/SourceLocation.h \
-	Source/ThirdParty/ANGLE/src/compiler/preprocessor/Token.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/preprocessor/Token.h \
-	Source/ThirdParty/ANGLE/src/compiler/preprocessor/Tokenizer.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/preprocessor/Tokenizer.h \
-	Source/ThirdParty/ANGLE/src/compiler/preprocessor/pp_utils.h \
-	Source/ThirdParty/ANGLE/src/compiler/QualifierAlive.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/QualifierAlive.h \
-	Source/ThirdParty/ANGLE/src/compiler/RemoveTree.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/RemoveTree.h \
-	Source/ThirdParty/ANGLE/src/compiler/RenameFunction.h \
-	Source/ThirdParty/ANGLE/src/compiler/SearchSymbol.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/SearchSymbol.h \
-	Source/ThirdParty/ANGLE/src/compiler/ShaderLang.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/ShHandle.h \
-	Source/ThirdParty/ANGLE/src/compiler/SymbolTable.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/SymbolTable.h \
-	Source/ThirdParty/ANGLE/src/compiler/VariablePacker.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/VariablePacker.h \
-	Source/ThirdParty/ANGLE/src/compiler/VersionGLSL.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/VersionGLSL.h \
-	Source/ThirdParty/ANGLE/src/compiler/timing/RestrictFragmentShaderTiming.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/timing/RestrictFragmentShaderTiming.h \
-	Source/ThirdParty/ANGLE/src/compiler/timing/RestrictVertexShaderTiming.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/timing/RestrictVertexShaderTiming.h \
-	Source/ThirdParty/ANGLE/src/compiler/TranslatorESSL.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/TranslatorESSL.h \
-	Source/ThirdParty/ANGLE/src/compiler/TranslatorGLSL.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/TranslatorGLSL.h \
-	Source/ThirdParty/ANGLE/src/compiler/TranslatorHLSL.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/TranslatorHLSL.h \
-	Source/ThirdParty/ANGLE/src/compiler/Types.h \
-	Source/ThirdParty/ANGLE/src/compiler/UnfoldShortCircuit.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/UnfoldShortCircuit.h \
-	Source/ThirdParty/ANGLE/src/compiler/util.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/util.h \
-	Source/ThirdParty/ANGLE/src/compiler/ValidateLimitations.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/ValidateLimitations.h \
-	Source/ThirdParty/ANGLE/src/compiler/VariableInfo.cpp \
-	Source/ThirdParty/ANGLE/src/compiler/VariableInfo.h \
-	Source/ThirdParty/ANGLE/src/third_party/compiler/ArrayBoundsClamper.cpp \
-	Source/ThirdParty/ANGLE/src/third_party/compiler/ArrayBoundsClamper.h
-
 if USE_CLUTTER
 webcore_sources += \
 	Source/WebCore/platform/graphics/clutter/DrawingBufferClutter.cpp \
@@ -6506,8 +6366,6 @@
 	Source/WebCore/platform/graphics/cairo/GraphicsContext3DPrivate.h
 endif  # END USE_CLUTTER
 
-endif  # END ENABLE_WEBGL
-
 # ---
 # Accelerated compositing support
 # ---

Modified: trunk/Source/WebKit/gtk/ChangeLog (146389 => 146390)

--- trunk/Source/WebKit/gtk/ChangeLog	2013-03-20 21:24:24 UTC (rev 146389)
+++ trunk/Source/WebKit/gtk/ChangeLog	2013-03-20 21:26:07 UTC (rev 146390)
@@ -1,3 +1,12 @@
+2013-03-20  Zan Dobersek  <zdober...@igalia.com>
+
+        [GTK] Build ANGLE sources into a separate library from libWebCore.la
+        https://bugs.webkit.org/show_bug.cgi?id=112778
+
+        Reviewed by Martin Robinson.
+
+        * GNUmakefile.am: Add libLevelDB.la to the libwebkitgtk library if using the OpenGL accelerated backend.
+
 2013-03-17  Gustavo Noronha Silva  <g...@gnome.org>
 
         [GTK] Fix and improve dist hooks for translations

Modified: trunk/Source/WebKit/gtk/GNUmakefile.am (146389 => 146390)

--- trunk/Source/WebKit/gtk/GNUmakefile.am	2013-03-20 21:24:24 UTC (rev 146389)
+++ trunk/Source/WebKit/gtk/GNUmakefile.am	2013-03-20 21:26:07 UTC (rev 146390)
@@ -92,6 +92,11 @@
 	libLevelDB.la
 endif
 
+if USE_OPENGL
+libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD += \
+	libANGLE.la
+endif
+
 if ENABLE_SVG
 libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD += \
 	libWebCoreSVG.la

Modified: trunk/Source/WebKit2/ChangeLog (146389 => 146390)

--- trunk/Source/WebKit2/ChangeLog	2013-03-20 21:24:24 UTC (rev 146389)
+++ trunk/Source/WebKit2/ChangeLog	2013-03-20 21:26:07 UTC (rev 146390)
@@ -1,3 +1,12 @@
+2013-03-20  Zan Dobersek  <zdober...@igalia.com>
+
+        [GTK] Build ANGLE sources into a separate library from libWebCore.la
+        https://bugs.webkit.org/show_bug.cgi?id=112778
+
+        Reviewed by Martin Robinson.
+
+        * GNUmakefile.am: Add libLevelDB.la to the libwebkit2gtk library if using the OpenGL accelerated backend.
+
 2013-03-20  Andras Becsi  <andras.be...@digia.com>
 
         [Qt][WK2] Clean up sanity checks related to gesture recognition

Modified: trunk/Source/WebKit2/GNUmakefile.am (146389 => 146390)

--- trunk/Source/WebKit2/GNUmakefile.am	2013-03-20 21:24:24 UTC (rev 146389)
+++ trunk/Source/WebKit2/GNUmakefile.am	2013-03-20 21:26:07 UTC (rev 146390)
@@ -178,6 +178,11 @@
 	libLevelDB.la
 endif
 
+if USE_OPENGL
+libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD += \
+	libANGLE.la
+endif
+
 if ENABLE_SVG
 libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD += \
 	libWebCoreSVG.la

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes