Title: [207944] releases/WebKitGTK/webkit-2.14/Source/WebCore
- Revision
- 207944
- Author
- carlo...@webkit.org
- Date
- 2016-10-27 00:12:45 -0700 (Thu, 27 Oct 2016)
Log Message
Merge r206907 - [GTK] Remove unneeded creation of TextureMapperPlatformLayerProxy
https://bugs.webkit.org/show_bug.cgi?id=163101
Reviewed by Žan Doberšek.
Covered by existing tests.
* platform/graphics/cairo/ImageBufferCairo.cpp:
(WebCore::ImageBufferData::ImageBufferData): Modified not to create
TextureMapperPlatformLayerProxy if it is not created for the
accelerated 2d canvas.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (207943 => 207944)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-27 06:49:45 UTC (rev 207943)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-27 07:12:45 UTC (rev 207944)
@@ -1,3 +1,17 @@
+2016-10-07 Gwang Yoon Hwang <y...@igalia.com>
+
+ [GTK] Remove unneeded creation of TextureMapperPlatformLayerProxy
+ https://bugs.webkit.org/show_bug.cgi?id=163101
+
+ Reviewed by Žan Doberšek.
+
+ Covered by existing tests.
+
+ * platform/graphics/cairo/ImageBufferCairo.cpp:
+ (WebCore::ImageBufferData::ImageBufferData): Modified not to create
+ TextureMapperPlatformLayerProxy if it is not created for the
+ accelerated 2d canvas.
+
2016-10-05 Zalan Bujtas <za...@apple.com>
Missing quotation mark when <q> gets reparented.
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp (207943 => 207944)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2016-10-27 06:49:45 UTC (rev 207943)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2016-10-27 07:12:45 UTC (rev 207944)
@@ -74,12 +74,15 @@
, m_renderingMode(renderingMode)
#if ENABLE(ACCELERATED_2D_CANVAS)
#if USE(COORDINATED_GRAPHICS_THREADED)
- , m_platformLayerProxy(adoptRef(new TextureMapperPlatformLayerProxy))
, m_compositorTexture(0)
#endif
, m_texture(0)
#endif
{
+#if ENABLE(ACCELERATED_2D_CANVAS) && USE(COORDINATED_GRAPHICS_THREADED)
+ if (m_renderingMode == RenderingMode::Accelerated)
+ m_platformLayerProxy = adoptRef(new TextureMapperPlatformLayerProxy);
+#endif
}
ImageBufferData::~ImageBufferData()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
