Changeset 185805 in webkit

Timestamp:

Jun 21, 2015 3:06:14 AM (9 years ago)

Author:

commit-queue@webkit.org

Message:

libwebkit2gtk fails to link without opengl
​https://bugs.webkit.org/show_bug.cgi?id=138332

Patch by Philip Chimento <​philip.chimento@gmail.com> on 2015-06-21
Reviewed by Carlos Garcia Campos.

.:

• Source/cmake/OptionsGTK.cmake: USE(TEXTURE_MAPPER) must be

enabled regardless of whether OpenGL is, because certain symbols
such as WebCore::GraphicsLayer::create() need to be built.

Source/WebCore:

• CMakeLists.txt: The third-party ANGLE directories need to be

included even if ENABLE(GRAPHICS_CONTEXT_3D) is false. They must
be included after the OpenGL headers as the comment says.

• platform/graphics/texmap/BitmapTexturePool.cpp: Remove

reference to no longer existent header file.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebCore/CMakeLists.txt (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/texmap/BitmapTexturePool.cpp (modified) (1 diff)
• Source/cmake/OptionsGTK.cmake (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2015-06-21  Philip Chimento  <philip.chimento@gmail.com>
+
+        libwebkit2gtk fails to link without opengl
+        https://bugs.webkit.org/show_bug.cgi?id=138332
+
+        Reviewed by Carlos Garcia Campos.
+
+        * Source/cmake/OptionsGTK.cmake: USE(TEXTURE_MAPPER) must be
+        enabled regardless of whether OpenGL is, because certain symbols
+        such as WebCore::GraphicsLayer::create() need to be built.
+
 2015-06-20  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/WebCore/CMakeLists.txt

@@ -3048 +3048 @@
 
     list(APPEND WebCore_INCLUDE_DIRECTORIES
-        "${THIRDPARTY_DIR}/ANGLE/"
-        "${THIRDPARTY_DIR}/ANGLE/include/KHR"
         "${WEBCORE_DIR}/platform/graphics/gpu"
     )
@@ -3149 +3147 @@
 endif ()
 
+list(APPEND WebCore_INCLUDE_DIRECTORIES
+    "${THIRDPARTY_DIR}/ANGLE/"
+    "${THIRDPARTY_DIR}/ANGLE/include/KHR"
+)
+
 if (ENABLE_WEB_REPLAY)
     list(APPEND WebCore_INCLUDE_DIRECTORIES

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-21  Philip Chimento  <philip.chimento@gmail.com>
+
+        libwebkit2gtk fails to link without opengl
+        https://bugs.webkit.org/show_bug.cgi?id=138332
+
+        Reviewed by Carlos Garcia Campos.
+
+        * CMakeLists.txt: The third-party ANGLE directories need to be
+        included even if ENABLE(GRAPHICS_CONTEXT_3D) is false. They must
+        be included after the OpenGL headers as the comment says.
+        * platform/graphics/texmap/BitmapTexturePool.cpp: Remove
+        reference to no longer existent header file.
+
 2015-06-20  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/platform/graphics/texmap/BitmapTexturePool.cpp

@@ -31 +31 @@
 #include "BitmapTextureGL.h"
 #include "GLContext.h"
-#else
-#include "BitmapTextureImageBuffer.h"
 #endif
 

trunk/Source/cmake/OptionsGTK.cmake

@@ -296 +296 @@
 endif ()
 
+SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER TRUE)
+
 if (ENABLE_OPENGL)
     # ENABLE_OPENGL is true if either USE_OPENGL or ENABLE_GLES2 is true.
@@ -319 +321 @@
     SET_AND_EXPOSE_TO_BUILD(ENABLE_GRAPHICS_CONTEXT_3D TRUE)
 
-    SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER TRUE)
     SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER_GL TRUE)