Title: [199479] releases/WebKitGTK/webkit-2.12/Source/WebCore
- Revision
- 199479
- Author
- [email protected]
- Date
- 2016-04-13 06:47:16 -0700 (Wed, 13 Apr 2016)
Log Message
Merge r199001 - [TexMap] Trim redundant guards
https://bugs.webkit.org/show_bug.cgi?id=155927
Patch by Emanuele Aina <[email protected]> on 2016-04-04
Reviewed by Žan Doberšek.
* platform/graphics/GraphicsContext3DPrivate.cpp: Drop some redundant
checks in preprocessor guards.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (199478 => 199479)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-13 13:46:26 UTC (rev 199478)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-13 13:47:16 UTC (rev 199479)
@@ -1,5 +1,15 @@
2016-04-04 Emanuele Aina <[email protected]>
+ [TexMap] Trim redundant guards
+ https://bugs.webkit.org/show_bug.cgi?id=155927
+
+ Reviewed by Žan Doberšek.
+
+ * platform/graphics/GraphicsContext3DPrivate.cpp: Drop some redundant
+ checks in preprocessor guards.
+
+2016-04-04 Emanuele Aina <[email protected]>
+
Rely on PlatformLayer to choose the TextureMapperPlatformLayer impl
https://bugs.webkit.org/show_bug.cgi?id=155926
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.cpp (199478 => 199479)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.cpp 2016-04-13 13:46:26 UTC (rev 199478)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.cpp 2016-04-13 13:47:16 UTC (rev 199479)
@@ -37,7 +37,7 @@
#include "OpenGLShims.h"
#endif
-#if USE(TEXTURE_MAPPER) && USE(TEXTURE_MAPPER_GL)
+#if USE(TEXTURE_MAPPER_GL)
#include <texmap/TextureMapperGL.h>
#endif
@@ -111,7 +111,7 @@
m_context->markLayerComposited();
}
-#elif USE(TEXTURE_MAPPER) && !USE(COORDINATED_GRAPHICS_THREADED)
+#elif USE(TEXTURE_MAPPER)
void GraphicsContext3DPrivate::paintToTextureMapper(TextureMapper& textureMapper, const FloatRect& targetRect, const TransformationMatrix& matrix, float opacity)
{
if (!m_glContext)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
