Title: [220826] releases/WebKitGTK/webkit-2.18/Source/WebCore
- Revision
- 220826
- Author
- [email protected]
- Date
- 2017-08-16 23:08:41 -0700 (Wed, 16 Aug 2017)
Log Message
Merge r220521 - [TexMap] Remove GraphicsContext3D usage from BitmapTexturePool
https://bugs.webkit.org/show_bug.cgi?id=175319
Reviewed by Carlos Garcia Campos.
Drop the GraphicsContext3D reference in BitmapTexturePool now
that the BitmapTextureGL doesn't require it anymore.
No new tests -- no change in behavior.
* platform/graphics/texmap/BitmapTexturePool.cpp:
(WebCore::BitmapTexturePool::BitmapTexturePool):
* platform/graphics/texmap/BitmapTexturePool.h:
* platform/graphics/texmap/TextureMapperGL.cpp:
(WebCore::TextureMapperGL::TextureMapperGL):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog (220825 => 220826)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-08-17 06:08:34 UTC (rev 220825)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-08-17 06:08:41 UTC (rev 220826)
@@ -1,3 +1,21 @@
+2017-08-10 Zan Dobersek <[email protected]>
+
+ [TexMap] Remove GraphicsContext3D usage from BitmapTexturePool
+ https://bugs.webkit.org/show_bug.cgi?id=175319
+
+ Reviewed by Carlos Garcia Campos.
+
+ Drop the GraphicsContext3D reference in BitmapTexturePool now
+ that the BitmapTextureGL doesn't require it anymore.
+
+ No new tests -- no change in behavior.
+
+ * platform/graphics/texmap/BitmapTexturePool.cpp:
+ (WebCore::BitmapTexturePool::BitmapTexturePool):
+ * platform/graphics/texmap/BitmapTexturePool.h:
+ * platform/graphics/texmap/TextureMapperGL.cpp:
+ (WebCore::TextureMapperGL::TextureMapperGL):
+
2017-08-14 Zan Dobersek <[email protected]>
REGRESSION(r220517-r220521) [GTK] Various compositing tests fail
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/texmap/BitmapTexturePool.cpp (220825 => 220826)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/texmap/BitmapTexturePool.cpp 2017-08-17 06:08:34 UTC (rev 220825)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/texmap/BitmapTexturePool.cpp 2017-08-17 06:08:41 UTC (rev 220826)
@@ -37,9 +37,8 @@
static const Seconds releaseUnusedTexturesTimerInterval { 500_ms };
#if USE(TEXTURE_MAPPER_GL)
-BitmapTexturePool::BitmapTexturePool(const TextureMapperContextAttributes& contextAttributes, RefPtr<GraphicsContext3D>&& context3D)
+BitmapTexturePool::BitmapTexturePool(const TextureMapperContextAttributes& contextAttributes)
: m_contextAttributes(contextAttributes)
- , m_context3D(WTFMove(context3D))
, m_releaseUnusedTexturesTimer(RunLoop::current(), this, &BitmapTexturePool::releaseUnusedTexturesTimerFired)
{
}
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/texmap/BitmapTexturePool.h (220825 => 220826)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/texmap/BitmapTexturePool.h 2017-08-17 06:08:34 UTC (rev 220825)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/texmap/BitmapTexturePool.h 2017-08-17 06:08:41 UTC (rev 220826)
@@ -32,13 +32,8 @@
#include <wtf/CurrentTime.h>
#include <wtf/RunLoop.h>
-#if USE(TEXTURE_MAPPER_GL)
-#include "GraphicsContext3D.h"
-#endif
-
namespace WebCore {
-class GraphicsContext3D;
class IntSize;
class BitmapTexturePool {
@@ -46,7 +41,7 @@
WTF_MAKE_FAST_ALLOCATED;
public:
#if USE(TEXTURE_MAPPER_GL)
- explicit BitmapTexturePool(const TextureMapperContextAttributes&, RefPtr<GraphicsContext3D>&&);
+ explicit BitmapTexturePool(const TextureMapperContextAttributes&);
#endif
RefPtr<BitmapTexture> acquireTexture(const IntSize&, const BitmapTexture::Flags);
@@ -70,7 +65,6 @@
#if USE(TEXTURE_MAPPER_GL)
TextureMapperContextAttributes m_contextAttributes;
- RefPtr<GraphicsContext3D> m_context3D;
#endif
Vector<Entry> m_textures;
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp (220825 => 220826)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2017-08-17 06:08:34 UTC (rev 220825)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2017-08-17 06:08:41 UTC (rev 220826)
@@ -172,7 +172,7 @@
m_data = new TextureMapperGLData(*m_context3D);
#if USE(TEXTURE_MAPPER_GL)
- m_texturePool = std::make_unique<BitmapTexturePool>(m_contextAttributes, m_context3D.copyRef());
+ m_texturePool = std::make_unique<BitmapTexturePool>(m_contextAttributes);
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
