Title: [216484] releases/WebKitGTK/webkit-2.16/Source
- Revision
- 216484
- Author
- carlo...@webkit.org
- Date
- 2017-05-09 00:46:40 -0700 (Tue, 09 May 2017)
Log Message
Merge r216483 - [GTK] Building Webkit2Gtk without OpenGL fails.
https://bugs.webkit.org/show_bug.cgi?id=170959
Reviewed by Žan Doberšek.
Source/WebCore:
* platform/graphics/texmap/TextureMapperGC3DPlatformLayer.cpp:
* platform/graphics/texmap/TextureMapperGC3DPlatformLayer.h:
* platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h:
Source/WebKit2:
* UIProcess/gtk/HardwareAccelerationManager.cpp:
(WebKit::HardwareAccelerationManager::HardwareAccelerationManager):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (216483 => 216484)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-05-09 07:45:14 UTC (rev 216483)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-05-09 07:46:40 UTC (rev 216484)
@@ -1,3 +1,14 @@
+2017-05-09 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] Building Webkit2Gtk without OpenGL fails.
+ https://bugs.webkit.org/show_bug.cgi?id=170959
+
+ Reviewed by Žan Doberšek.
+
+ * platform/graphics/texmap/TextureMapperGC3DPlatformLayer.cpp:
+ * platform/graphics/texmap/TextureMapperGC3DPlatformLayer.h:
+ * platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h:
+
2017-05-04 Jiewen Tan <jiewen_...@apple.com>
Search events should not fire synchronously for search type input elements with incremental attribute set
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.cpp (216483 => 216484)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.cpp 2017-05-09 07:45:14 UTC (rev 216483)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.cpp 2017-05-09 07:46:40 UTC (rev 216484)
@@ -20,7 +20,7 @@
#include "config.h"
#include "TextureMapperGC3DPlatformLayer.h"
-#if USE(TEXTURE_MAPPER)
+#if ENABLE(GRAPHICS_CONTEXT_3D) && USE(TEXTURE_MAPPER)
#if USE(OPENGL_ES_2)
#include <GLES2/gl2.h>
@@ -128,4 +128,4 @@
} // namespace WebCore
-#endif // USE(TEXTURE_MAPPER)
+#endif // ENABLE(GRAPHICS_CONTEXT_3D) && USE(TEXTURE_MAPPER)
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.h (216483 => 216484)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.h 2017-05-09 07:45:14 UTC (rev 216483)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.h 2017-05-09 07:46:40 UTC (rev 216484)
@@ -19,7 +19,7 @@
#pragma once
-#if USE(TEXTURE_MAPPER)
+#if ENABLE(GRAPHICS_CONTEXT_3D) && USE(TEXTURE_MAPPER)
#include "GraphicsContext3D.h"
#include "PlatformLayer.h"
@@ -61,4 +61,4 @@
} // namespace WebCore
-#endif // USE(TEXTURE_MAPPER)
+#endif // ENABLE(GRAPHICS_CONTEXT_3D) && USE(TEXTURE_MAPPER)
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h (216483 => 216484)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h 2017-05-09 07:45:14 UTC (rev 216483)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h 2017-05-09 07:46:40 UTC (rev 216484)
@@ -23,8 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef TextureMapperPlatformLayerBuffer_h
-#define TextureMapperPlatformLayerBuffer_h
+#pragma once
#include "BitmapTextureGL.h"
#include "GraphicsTypes3D.h"
@@ -31,6 +30,8 @@
#include "TextureMapperPlatformLayer.h"
#include <wtf/CurrentTime.h>
+#if USE(COORDINATED_GRAPHICS_THREADED)
+
namespace WebCore {
class TextureMapperPlatformLayerBuffer : public TextureMapperPlatformLayer {
@@ -76,4 +77,4 @@
} // namespace WebCore
-#endif // TextureMapperPlatformLayerBuffer_h
+#endif // COORDINATED_GRAPHICS_THREADED
Modified: releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog (216483 => 216484)
--- releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog 2017-05-09 07:45:14 UTC (rev 216483)
+++ releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog 2017-05-09 07:46:40 UTC (rev 216484)
@@ -1,3 +1,13 @@
+2017-05-09 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] Building Webkit2Gtk without OpenGL fails.
+ https://bugs.webkit.org/show_bug.cgi?id=170959
+
+ Reviewed by Žan Doberšek.
+
+ * UIProcess/gtk/HardwareAccelerationManager.cpp:
+ (WebKit::HardwareAccelerationManager::HardwareAccelerationManager):
+
2017-05-05 Dean Jackson <d...@apple.com>
Restrict SVG filters to accessible security origins
Modified: releases/WebKitGTK/webkit-2.16/Source/WebKit2/UIProcess/gtk/HardwareAccelerationManager.cpp (216483 => 216484)
--- releases/WebKitGTK/webkit-2.16/Source/WebKit2/UIProcess/gtk/HardwareAccelerationManager.cpp 2017-05-09 07:45:14 UTC (rev 216483)
+++ releases/WebKitGTK/webkit-2.16/Source/WebKit2/UIProcess/gtk/HardwareAccelerationManager.cpp 2017-05-09 07:46:40 UTC (rev 216484)
@@ -70,7 +70,7 @@
}
#endif
-#if PLATFORM(WAYLAND)
+#if PLATFORM(WAYLAND) && USE(EGL)
if (PlatformDisplay::sharedDisplay().type() == PlatformDisplay::Type::Wayland) {
if (!WaylandCompositor::singleton().isRunning()) {
m_canUseHardwareAcceleration = false;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
