Title: [199478] releases/WebKitGTK/webkit-2.12/Source/WebCore
- Revision
- 199478
- Author
- [email protected]
- Date
- 2016-04-13 06:46:26 -0700 (Wed, 13 Apr 2016)
Log Message
Merge r199000 - Rely on PlatformLayer to choose the TextureMapperPlatformLayer impl
https://bugs.webkit.org/show_bug.cgi?id=155926
Patch by Emanuele Aina <[email protected]> on 2016-04-04
Reviewed by Žan Doberšek.
Use PlatformLayer to replace a bunch of subtly different #ifdef
scattered over the codebase to choose between TextureMapperPlatformLayer
and TextureMapperPlatformLayerProxyProvider.
* platform/graphics/GraphicsContext3DPrivate.h:
* platform/graphics/cairo/ImageBufferDataCairo.h:
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h: Use
PlatformLayer.h an inherit from PlatformLayer instead of choosing the
right implementation every time.
* platform/graphics/texmap/TextureMapperPlatformLayer.h: Add
TEXTURE_MAPPER guards to make it unconditionally usable.
* platform/graphics/texmap/TextureMapperPlatformLayerProxy.h: Add
COORDINATED_GRAPHICS_THREADED guards to make it unconditionally
usable.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (199477 => 199478)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-13 13:40:51 UTC (rev 199477)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-13 13:46:26 UTC (rev 199478)
@@ -1,3 +1,25 @@
+2016-04-04 Emanuele Aina <[email protected]>
+
+ Rely on PlatformLayer to choose the TextureMapperPlatformLayer impl
+ https://bugs.webkit.org/show_bug.cgi?id=155926
+
+ Reviewed by Žan Doberšek.
+
+ Use PlatformLayer to replace a bunch of subtly different #ifdef
+ scattered over the codebase to choose between TextureMapperPlatformLayer
+ and TextureMapperPlatformLayerProxyProvider.
+
+ * platform/graphics/GraphicsContext3DPrivate.h:
+ * platform/graphics/cairo/ImageBufferDataCairo.h:
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h: Use
+ PlatformLayer.h an inherit from PlatformLayer instead of choosing the
+ right implementation every time.
+ * platform/graphics/texmap/TextureMapperPlatformLayer.h: Add
+ TEXTURE_MAPPER guards to make it unconditionally usable.
+ * platform/graphics/texmap/TextureMapperPlatformLayerProxy.h: Add
+ COORDINATED_GRAPHICS_THREADED guards to make it unconditionally
+ usable.
+
2016-04-12 Carlos Garcia Campos <[email protected]>
[GTK] Rework scrollbars theming code for GTK+ 3.20
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.h (199477 => 199478)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.h 2016-04-13 13:40:51 UTC (rev 199477)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.h 2016-04-13 13:46:26 UTC (rev 199478)
@@ -22,21 +22,17 @@
#include "GLContext.h"
#include "GraphicsContext3D.h"
-
-#if USE(COORDINATED_GRAPHICS_THREADED)
-#include "BitmapTextureGL.h"
-#include "TextureMapperPlatformLayerProxy.h"
-#elif USE(TEXTURE_MAPPER)
+#include "PlatformLayer.h"
#include "TextureMapperPlatformLayer.h"
-#endif
+#include "TextureMapperPlatformLayerProxy.h"
namespace WebCore {
+class BitmapTextureGL;
+
class GraphicsContext3DPrivate
-#if USE(COORDINATED_GRAPHICS_THREADED)
- : public TextureMapperPlatformLayerProxyProvider
-#elif USE(TEXTURE_MAPPER)
- : public TextureMapperPlatformLayer
+#if USE(TEXTURE_MAPPER)
+ : public PlatformLayer
#endif
{
public:
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h (199477 => 199478)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h 2016-04-13 13:40:51 UTC (rev 199477)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h 2016-04-13 13:46:26 UTC (rev 199478)
@@ -32,13 +32,11 @@
#include "RefPtrCairo.h"
#if ENABLE(ACCELERATED_2D_CANVAS)
+#include "PlatformLayer.h"
#include "TextureMapper.h"
-#if USE(COORDINATED_GRAPHICS_THREADED)
-#include "TextureMapperPlatformLayerProxy.h"
-#else
#include "TextureMapperPlatformLayer.h"
+#include "TextureMapperPlatformLayerProxy.h"
#endif
-#endif
namespace WebCore {
@@ -46,12 +44,8 @@
class ImageBufferData
#if ENABLE(ACCELERATED_2D_CANVAS)
-#if USE(COORDINATED_GRAPHICS_THREADED)
- : public TextureMapperPlatformLayerProxyProvider
-#else
- : public TextureMapperPlatformLayer
+ : public PlatformLayer
#endif
-#endif
{
public:
ImageBufferData(const IntSize&, RenderingMode);
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h (199477 => 199478)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h 2016-04-13 13:40:51 UTC (rev 199477)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h 2016-04-13 13:46:26 UTC (rev 199478)
@@ -27,18 +27,14 @@
#include "GRefPtrGStreamer.h"
#include "MainThreadNotifier.h"
#include "MediaPlayerPrivate.h"
+#include "PlatformLayer.h"
+#include "TextureMapperPlatformLayer.h"
+#include "TextureMapperPlatformLayerProxy.h"
#include <glib.h>
#include <wtf/Condition.h>
#include <wtf/Forward.h>
#include <wtf/RunLoop.h>
-#if USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
-#include "TextureMapperPlatformLayer.h"
-#endif
-#if USE(COORDINATED_GRAPHICS_THREADED)
-#include "TextureMapperPlatformLayerProxy.h"
-#endif
-
typedef struct _GstMessage GstMessage;
typedef struct _GstStreamVolume GstStreamVolume;
typedef struct _GstVideoInfo GstVideoInfo;
@@ -54,10 +50,8 @@
class IntRect;
class MediaPlayerPrivateGStreamerBase : public MediaPlayerPrivateInterface
-#if USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
- , public TextureMapperPlatformLayer
-#elif USE(COORDINATED_GRAPHICS_THREADED)
- , public TextureMapperPlatformLayerProxyProvider
+#if USE(COORDINATED_GRAPHICS_THREADED) || (USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS))
+ , public PlatformLayer
#endif
{
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h (199477 => 199478)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h 2016-04-13 13:40:51 UTC (rev 199477)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h 2016-04-13 13:46:26 UTC (rev 199478)
@@ -20,6 +20,8 @@
#ifndef TextureMapperPlatformLayer_h
#define TextureMapperPlatformLayer_h
+#if USE(TEXTURE_MAPPER)
+
#if USE(GRAPHICS_SURFACE)
#include "GraphicsSurface.h"
#endif
@@ -65,4 +67,6 @@
};
+#endif // USE(TEXTURE_MAPPER)
+
#endif // TextureMapperPlatformLayer_h
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.h (199477 => 199478)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.h 2016-04-13 13:40:51 UTC (rev 199477)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.h 2016-04-13 13:46:26 UTC (rev 199478)
@@ -26,6 +26,8 @@
#ifndef TextureMapperPlatformLayerProxy_h
#define TextureMapperPlatformLayerProxy_h
+#if USE(COORDINATED_GRAPHICS_THREADED)
+
#include "GraphicsTypes3D.h"
#include "TextureMapper.h"
#include "TransformationMatrix.h"
@@ -103,4 +105,6 @@
} // namespace WebCore
+#endif // USE(COORDINATED_GRAPHICS_THREADED)
+
#endif // TextureMapperPlatformLayerProxy_h
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
