Title: [199485] releases/WebKitGTK/webkit-2.12/Source/WebCore
- Revision
- 199485
- Author
- [email protected]
- Date
- 2016-04-13 07:59:51 -0700 (Wed, 13 Apr 2016)
Log Message
Merge r199045 - [TexMap] Improve viewport array access in TextureMapperGL::bindDefaultSurface()
https://bugs.webkit.org/show_bug.cgi?id=156159
Reviewed by Antonio Gomes.
* platform/graphics/texmap/TextureMapperGL.cpp:
(WebCore::TextureMapperGL::bindDefaultSurface): Create a reference to the
viewport array in the TextureMapperGLData object. Inline the IntSize constructor
for the object that's passed to createProjectionMatrix(), and use the reference
to access all four elements of the array as necessary.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (199484 => 199485)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-13 14:59:01 UTC (rev 199484)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-13 14:59:51 UTC (rev 199485)
@@ -1,5 +1,18 @@
2016-04-04 Zan Dobersek <[email protected]>
+ [TexMap] Improve viewport array access in TextureMapperGL::bindDefaultSurface()
+ https://bugs.webkit.org/show_bug.cgi?id=156159
+
+ Reviewed by Antonio Gomes.
+
+ * platform/graphics/texmap/TextureMapperGL.cpp:
+ (WebCore::TextureMapperGL::bindDefaultSurface): Create a reference to the
+ viewport array in the TextureMapperGLData object. Inline the IntSize constructor
+ for the object that's passed to createProjectionMatrix(), and use the reference
+ to access all four elements of the array as necessary.
+
+2016-04-04 Zan Dobersek <[email protected]>
+
[TexMap] resolveOverlaps() should be passed-in the first Region parameter via a reference
https://bugs.webkit.org/show_bug.cgi?id=156158
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp (199484 => 199485)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2016-04-13 14:59:01 UTC (rev 199484)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2016-04-13 14:59:51 UTC (rev 199485)
@@ -618,9 +618,9 @@
void TextureMapperGL::bindDefaultSurface()
{
m_context3D->bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, data().targetFrameBuffer);
- IntSize viewportSize(data().viewport[2], data().viewport[3]);
- data().projectionMatrix = createProjectionMatrix(viewportSize, data().PaintFlags & PaintingMirrored);
- m_context3D->viewport(data().viewport[0], data().viewport[1], viewportSize.width(), viewportSize.height());
+ auto& viewport = data().viewport;
+ data().projectionMatrix = createProjectionMatrix(IntSize(viewport[2], viewport[3]), data().PaintFlags & PaintingMirrored);
+ m_context3D->viewport(viewport[0], viewport[1], viewport[2], viewport[3]);
m_clipStack.apply(*m_context3D);
data().currentSurface = nullptr;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
