Title: [185805] trunk
- Revision
- 185805
- Author
- commit-qu...@webkit.org
- Date
- 2015-06-21 03:06:14 -0700 (Sun, 21 Jun 2015)
Log Message
libwebkit2gtk fails to link without opengl
https://bugs.webkit.org/show_bug.cgi?id=138332
Patch by Philip Chimento <philip.chime...@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.
Modified Paths
Diff
Modified: trunk/ChangeLog (185804 => 185805)
--- trunk/ChangeLog 2015-06-21 06:43:14 UTC (rev 185804)
+++ trunk/ChangeLog 2015-06-21 10:06:14 UTC (rev 185805)
@@ -1,3 +1,14 @@
+2015-06-21 Philip Chimento <philip.chime...@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 <mcatanz...@igalia.com>
[EFL][GTK] Define GLIB_VERSION_MIN_REQUIRED and require glib 2.36 for GTK
Modified: trunk/Source/WebCore/CMakeLists.txt (185804 => 185805)
--- trunk/Source/WebCore/CMakeLists.txt 2015-06-21 06:43:14 UTC (rev 185804)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-06-21 10:06:14 UTC (rev 185805)
@@ -3047,8 +3047,6 @@
endif ()
list(APPEND WebCore_INCLUDE_DIRECTORIES
- "${THIRDPARTY_DIR}/ANGLE/"
- "${THIRDPARTY_DIR}/ANGLE/include/KHR"
"${WEBCORE_DIR}/platform/graphics/gpu"
)
@@ -3148,6 +3146,11 @@
)
endif ()
+list(APPEND WebCore_INCLUDE_DIRECTORIES
+ "${THIRDPARTY_DIR}/ANGLE/"
+ "${THIRDPARTY_DIR}/ANGLE/include/KHR"
+)
+
if (ENABLE_WEB_REPLAY)
list(APPEND WebCore_INCLUDE_DIRECTORIES
"${_javascript_CORE_DIR}/inspector"
Modified: trunk/Source/WebCore/ChangeLog (185804 => 185805)
--- trunk/Source/WebCore/ChangeLog 2015-06-21 06:43:14 UTC (rev 185804)
+++ trunk/Source/WebCore/ChangeLog 2015-06-21 10:06:14 UTC (rev 185805)
@@ -1,3 +1,16 @@
+2015-06-21 Philip Chimento <philip.chime...@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_hor...@apple.com>
Deselection of text causes a noticeable jump on force touch machines
Modified: trunk/Source/WebCore/platform/graphics/texmap/BitmapTexturePool.cpp (185804 => 185805)
--- trunk/Source/WebCore/platform/graphics/texmap/BitmapTexturePool.cpp 2015-06-21 06:43:14 UTC (rev 185804)
+++ trunk/Source/WebCore/platform/graphics/texmap/BitmapTexturePool.cpp 2015-06-21 10:06:14 UTC (rev 185805)
@@ -30,8 +30,6 @@
#if USE(TEXTURE_MAPPER_GL)
#include "BitmapTextureGL.h"
#include "GLContext.h"
-#else
-#include "BitmapTextureImageBuffer.h"
#endif
namespace WebCore {
Modified: trunk/Source/cmake/OptionsGTK.cmake (185804 => 185805)
--- trunk/Source/cmake/OptionsGTK.cmake 2015-06-21 06:43:14 UTC (rev 185804)
+++ trunk/Source/cmake/OptionsGTK.cmake 2015-06-21 10:06:14 UTC (rev 185805)
@@ -295,6 +295,8 @@
SET_AND_EXPOSE_TO_BUILD(USE_OPENWEBRTC TRUE)
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.
# But USE_OPENGL is the opposite of ENABLE_GLES2.
@@ -318,7 +320,6 @@
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)
SET_AND_EXPOSE_TO_BUILD(USE_EGL ${EGL_FOUND})
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
