Title: [260760] trunk
- Revision
- 260760
- Author
- [email protected]
- Date
- 2020-04-27 09:18:09 -0700 (Mon, 27 Apr 2020)
Log Message
[GTK] ENABLE(OPENGL) remmants...
https://bugs.webkit.org/show_bug.cgi?id=211077
Patch by Philippe Normand <[email protected]> on 2020-04-27
Reviewed by Adrian Perez de Castro.
ENABLE(OPENGL) was renamed to ENABLE(GRAPHICS_CONTEXT_GL) in
r254064 but not in all the code base...
.:
* Source/cmake/GStreamerDependencies.cmake:
* Source/cmake/OptionsGTK.cmake:
Source/WebKit:
* UIProcess/gtk/HardwareAccelerationManager.cpp:
(WebKit::HardwareAccelerationManager::HardwareAccelerationManager):
Modified Paths
Diff
Modified: trunk/ChangeLog (260759 => 260760)
--- trunk/ChangeLog 2020-04-27 16:08:21 UTC (rev 260759)
+++ trunk/ChangeLog 2020-04-27 16:18:09 UTC (rev 260760)
@@ -1,3 +1,16 @@
+2020-04-27 Philippe Normand <[email protected]>
+
+ [GTK] ENABLE(OPENGL) remmants...
+ https://bugs.webkit.org/show_bug.cgi?id=211077
+
+ Reviewed by Adrian Perez de Castro.
+
+ ENABLE(OPENGL) was renamed to ENABLE(GRAPHICS_CONTEXT_GL) in
+ r254064 but not in all the code base...
+
+ * Source/cmake/GStreamerDependencies.cmake:
+ * Source/cmake/OptionsGTK.cmake:
+
2020-04-27 Carlos Garcia Campos <[email protected]>
[GTK4] Make it possible to build with GTK4 without errors
Modified: trunk/Source/WebKit/ChangeLog (260759 => 260760)
--- trunk/Source/WebKit/ChangeLog 2020-04-27 16:08:21 UTC (rev 260759)
+++ trunk/Source/WebKit/ChangeLog 2020-04-27 16:18:09 UTC (rev 260760)
@@ -1,3 +1,16 @@
+2020-04-27 Philippe Normand <[email protected]>
+
+ [GTK] ENABLE(OPENGL) remmants...
+ https://bugs.webkit.org/show_bug.cgi?id=211077
+
+ Reviewed by Adrian Perez de Castro.
+
+ ENABLE(OPENGL) was renamed to ENABLE(GRAPHICS_CONTEXT_GL) in
+ r254064 but not in all the code base...
+
+ * UIProcess/gtk/HardwareAccelerationManager.cpp:
+ (WebKit::HardwareAccelerationManager::HardwareAccelerationManager):
+
2020-04-27 Daniel Bates <[email protected]>
Caret may be placed in the wrong spot for text input context that is a form control
Modified: trunk/Source/WebKit/UIProcess/gtk/HardwareAccelerationManager.cpp (260759 => 260760)
--- trunk/Source/WebKit/UIProcess/gtk/HardwareAccelerationManager.cpp 2020-04-27 16:08:21 UTC (rev 260759)
+++ trunk/Source/WebKit/UIProcess/gtk/HardwareAccelerationManager.cpp 2020-04-27 16:18:09 UTC (rev 260760)
@@ -41,7 +41,7 @@
: m_canUseHardwareAcceleration(true)
, m_forceHardwareAcceleration(false)
{
-#if !ENABLE(OPENGL)
+#if !ENABLE(GRAPHICS_CONTEXT_GL)
m_canUseHardwareAcceleration = false;
return;
#endif
Modified: trunk/Source/cmake/GStreamerDependencies.cmake (260759 => 260760)
--- trunk/Source/cmake/GStreamerDependencies.cmake 2020-04-27 16:08:21 UTC (rev 260759)
+++ trunk/Source/cmake/GStreamerDependencies.cmake 2020-04-27 16:18:09 UTC (rev 260760)
@@ -1,5 +1,5 @@
if (PORT STREQUAL "GTK")
- WEBKIT_OPTION_DEPEND(USE_GSTREAMER_GL ENABLE_OPENGL)
+ WEBKIT_OPTION_DEPEND(USE_GSTREAMER_GL ENABLE_GRAPHICS_CONTEXT_GL)
endif ()
WEBKIT_OPTION_DEPEND(USE_GSTREAMER_GL ENABLE_VIDEO)
WEBKIT_OPTION_DEPEND(USE_GSTREAMER_MPEGTS ENABLE_VIDEO)
Modified: trunk/Source/cmake/OptionsGTK.cmake (260759 => 260760)
--- trunk/Source/cmake/OptionsGTK.cmake 2020-04-27 16:08:21 UTC (rev 260759)
+++ trunk/Source/cmake/OptionsGTK.cmake 2020-04-27 16:18:09 UTC (rev 260760)
@@ -74,7 +74,7 @@
# Set the default value for ENABLE_GLES2 automatically.
# We are not enabling or disabling automatically a feature here, because
-# the feature is by default always on (ENABLE_OPENGL=ON).
+# the feature is by default always on (ENABLE_GRAPHICS_CONTEXT_GL=ON).
# What we select here automatically is if we use OPENGL (ENABLE_GLES2=OFF)
# or OPENGLES2 (ENABLE_GLES2=ON) for building the feature.
set(ENABLE_GLES2_DEFAULT OFF)
@@ -89,7 +89,7 @@
WEBKIT_OPTION_DEFINE(ENABLE_GLES2 "Whether to enable OpenGL ES 2.0." PUBLIC ${ENABLE_GLES2_DEFAULT})
WEBKIT_OPTION_DEFINE(ENABLE_GTKDOC "Whether or not to use generate gtkdoc." PUBLIC OFF)
WEBKIT_OPTION_DEFINE(ENABLE_INTROSPECTION "Whether to enable GObject introspection." PUBLIC ON)
-WEBKIT_OPTION_DEFINE(ENABLE_OPENGL "Whether to use OpenGL." PUBLIC ON)
+WEBKIT_OPTION_DEFINE(ENABLE_GRAPHICS_CONTEXT_GL "Whether to use OpenGL." PUBLIC ON)
WEBKIT_OPTION_DEFINE(ENABLE_QUARTZ_TARGET "Whether to enable support for the Quartz windowing target." PUBLIC ${GTK_SUPPORTS_QUARTZ})
WEBKIT_OPTION_DEFINE(ENABLE_X11_TARGET "Whether to enable support for the X11 windowing target." PUBLIC ${GTK_SUPPORTS_X11})
WEBKIT_OPTION_DEFINE(ENABLE_WAYLAND_TARGET "Whether to enable support for the Wayland windowing target." PUBLIC ${GTK_SUPPORTS_WAYLAND})
@@ -108,13 +108,13 @@
# FIXME: Can we use cairo-glesv2 to avoid this conflict?
WEBKIT_OPTION_CONFLICT(ENABLE_ACCELERATED_2D_CANVAS ENABLE_GLES2)
-WEBKIT_OPTION_DEPEND(ENABLE_3D_TRANSFORMS ENABLE_OPENGL)
-WEBKIT_OPTION_DEPEND(ENABLE_ACCELERATED_2D_CANVAS ENABLE_OPENGL)
-WEBKIT_OPTION_DEPEND(ENABLE_ASYNC_SCROLLING ENABLE_OPENGL)
-WEBKIT_OPTION_DEPEND(ENABLE_GLES2 ENABLE_OPENGL)
-WEBKIT_OPTION_DEPEND(ENABLE_WEBGL ENABLE_OPENGL)
+WEBKIT_OPTION_DEPEND(ENABLE_3D_TRANSFORMS ENABLE_GRAPHICS_CONTEXT_GL)
+WEBKIT_OPTION_DEPEND(ENABLE_ACCELERATED_2D_CANVAS ENABLE_GRAPHICS_CONTEXT_GL)
+WEBKIT_OPTION_DEPEND(ENABLE_ASYNC_SCROLLING ENABLE_GRAPHICS_CONTEXT_GL)
+WEBKIT_OPTION_DEPEND(ENABLE_GLES2 ENABLE_GRAPHICS_CONTEXT_GL)
+WEBKIT_OPTION_DEPEND(ENABLE_WEBGL ENABLE_GRAPHICS_CONTEXT_GL)
WEBKIT_OPTION_DEPEND(USE_ANGLE_WEBGL ENABLE_WEBGL)
-WEBKIT_OPTION_DEPEND(USE_WPE_RENDERER ENABLE_OPENGL)
+WEBKIT_OPTION_DEPEND(USE_WPE_RENDERER ENABLE_GRAPHICS_CONTEXT_GL)
WEBKIT_OPTION_DEPEND(USE_WPE_RENDERER ENABLE_WAYLAND_TARGET)
SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})
@@ -295,8 +295,8 @@
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.
+if (ENABLE_GRAPHICS_CONTEXT_GL)
+ # ENABLE_GRAPHICS_CONTEXT_GL is true if either USE_OPENGL or ENABLE_GLES2 is true.
# But USE_OPENGL is the opposite of ENABLE_GLES2.
if (ENABLE_GLES2)
find_package(OpenGLES2 REQUIRED)
@@ -308,13 +308,13 @@
endif ()
else ()
if (NOT OPENGL_FOUND)
- message(FATAL_ERROR "Either OpenGL or OpenGLES2 is needed for ENABLE_OPENGL.")
+ message(FATAL_ERROR "Either OpenGL or OpenGLES2 is needed for ENABLE_GRAPHICS_CONTEXT_GL.")
endif ()
SET_AND_EXPOSE_TO_BUILD(USE_OPENGL TRUE)
endif ()
if (NOT EGL_FOUND AND (NOT ENABLE_X11_TARGET OR NOT GLX_FOUND))
- message(FATAL_ERROR "Either GLX or EGL is needed for ENABLE_OPENGL.")
+ message(FATAL_ERROR "Either GLX or EGL is needed for ENABLE_GRAPHICS_CONTEXT_GL.")
endif ()
SET_AND_EXPOSE_TO_BUILD(ENABLE_GRAPHICS_CONTEXT_GL TRUE)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
