Title: [197673] releases/WebKitGTK/webkit-2.12/Source/WebCore
- Revision
- 197673
- Author
- [email protected]
- Date
- 2016-03-07 03:30:07 -0800 (Mon, 07 Mar 2016)
Log Message
Merge r197385 - TextureMapperGL: beginPainting() should handle the PaintingMirrored value in PaintFlags
https://bugs.webkit.org/show_bug.cgi?id=154789
Reviewed by Carlos Garcia Campos.
* platform/graphics/texmap/TextureMapperGL.cpp:
(WebCore::TextureMapperGL::beginPainting): The ClipStack should be reset with
a Y-axis mode that corresponds to the presence of the PaintingMirrored value in
the passed-in PaintFlags argument. If present, the default Y-axis mode should be
used, and the inverted Y-axis otherwise.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (197672 => 197673)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-03-07 11:28:54 UTC (rev 197672)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-03-07 11:30:07 UTC (rev 197673)
@@ -1,3 +1,16 @@
+2016-02-29 Zan Dobersek <[email protected]>
+
+ TextureMapperGL: beginPainting() should handle the PaintingMirrored value in PaintFlags
+ https://bugs.webkit.org/show_bug.cgi?id=154789
+
+ Reviewed by Carlos Garcia Campos.
+
+ * platform/graphics/texmap/TextureMapperGL.cpp:
+ (WebCore::TextureMapperGL::beginPainting): The ClipStack should be reset with
+ a Y-axis mode that corresponds to the presence of the PaintingMirrored value in
+ the passed-in PaintFlags argument. If present, the default Y-axis mode should be
+ used, and the inverted Y-axis otherwise.
+
2016-02-28 Tim Horton <[email protected]>
Variables can resolve to the wrong value when elements differ in nothing but inherited variable value
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp (197672 => 197673)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2016-03-07 11:28:54 UTC (rev 197672)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2016-03-07 11:30:07 UTC (rev 197673)
@@ -197,7 +197,7 @@
m_context3D->depthMask(0);
m_context3D->getIntegerv(GraphicsContext3D::VIEWPORT, data().viewport);
m_context3D->getIntegerv(GraphicsContext3D::SCISSOR_BOX, data().previousScissor);
- m_clipStack.reset(IntRect(0, 0, data().viewport[2], data().viewport[3]), ClipStack::YAxisMode::Inverted);
+ m_clipStack.reset(IntRect(0, 0, data().viewport[2], data().viewport[3]), flags & PaintingMirrored ? ClipStack::YAxisMode::Default : ClipStack::YAxisMode::Inverted);
m_context3D->getIntegerv(GraphicsContext3D::FRAMEBUFFER_BINDING, &data().targetFrameBuffer);
data().PaintFlags = flags;
bindSurface(0);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
