Title: [279717] releases/WebKitGTK/webkit-2.32/Source/WebCore
Revision
279717
Author
carlo...@webkit.org
Date
2021-07-08 01:18:23 -0700 (Thu, 08 Jul 2021)

Log Message

Merge r277855 - [GTK] REGRESSION: Broken scrolling on element.io with async scrolling
https://bugs.webkit.org/show_bug.cgi?id=222265

Reviewed by Carlos Garcia Campos.

Fix transform order for layer clipping in TextureMapperLayer.

No new tests.

* platform/graphics/texmap/TextureMapperLayer.cpp:
(WebCore::TextureMapperLayer::paintSelfAndChildren):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog (279716 => 279717)


--- releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog	2021-07-08 08:18:18 UTC (rev 279716)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog	2021-07-08 08:18:23 UTC (rev 279717)
@@ -1,3 +1,17 @@
+2021-05-21  Chris Lord  <cl...@igalia.com>
+
+        [GTK] REGRESSION: Broken scrolling on element.io with async scrolling
+        https://bugs.webkit.org/show_bug.cgi?id=222265
+
+        Reviewed by Carlos Garcia Campos.
+
+        Fix transform order for layer clipping in TextureMapperLayer.
+
+        No new tests.
+
+        * platform/graphics/texmap/TextureMapperLayer.cpp:
+        (WebCore::TextureMapperLayer::paintSelfAndChildren):
+
 2021-05-15  Alexander Mikhaylenko  <al...@gnome.org>
 
         [GTK] REGRESSION: Kinetic scrolling on touchpad doesn't work with async scrolling off

Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp (279716 => 279717)


--- releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp	2021-07-08 08:18:18 UTC (rev 279716)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp	2021-07-08 08:18:23 UTC (rev 279717)
@@ -263,10 +263,10 @@
     bool shouldClip = m_state.masksToBounds && !m_state.preserves3D;
     if (shouldClip) {
         TransformationMatrix clipTransform;
-        clipTransform.translate(options.offset.width() + m_state.boundsOrigin.x(),
-            options.offset.height() + m_state.boundsOrigin.y());
+        clipTransform.translate(options.offset.width(), options.offset.height());
         clipTransform.multiply(options.transform);
         clipTransform.multiply(m_layerTransforms.combined);
+        clipTransform.translate(m_state.boundsOrigin.x(), m_state.boundsOrigin.y());
         options.textureMapper.beginClip(clipTransform, FloatRoundedRect(layerRect()));
 
         // If as a result of beginClip(), the clipping area is empty, it means that the intersection of the previous
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to