Changeset 55334 in webkit

Timestamp:

Feb 26, 2010 6:59:56 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-02-26 Noam Rosenthal <​noam.rosenthal@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] GraphicsLayerQt: artifacts and wrong transformOrigin
This was due to wrong way of applying cache-mode and transformation
on a graphics-item with HTML. Cache-mode should be updated
when the content type updates, even if it was the same cache-mode

​https://bugs.webkit.org/show_bug.cgi?id=35382

Test URL attached to the bug now works correctly.

• platform/graphics/qt/GraphicsLayerQt.cpp: (WebCore::GraphicsLayerQtImpl::computeTransform): (WebCore::GraphicsLayerQtImpl::flushChanges):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/GraphicsLayerQt.cpp (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-02-26  Noam Rosenthal  <noam.rosenthal@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] GraphicsLayerQt: artifacts and wrong transformOrigin
+        This was due to wrong way of applying cache-mode and transformation
+        on a graphics-item with HTML. Cache-mode should be updated
+        when the content type updates, even if it was the same cache-mode
+   
+        https://bugs.webkit.org/show_bug.cgi?id=35382
+
+        Test URL attached to the bug now works correctly.
+
+        * platform/graphics/qt/GraphicsLayerQt.cpp:
+        (WebCore::GraphicsLayerQtImpl::computeTransform):
+        (WebCore::GraphicsLayerQtImpl::flushChanges):
+
 2010-02-26  Luiz Agostini  <luiz.agostini@openbossa.org>
 

trunk/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp

@@ -309 +309 @@
     // attribute that call setChildrenTransform
     QPointF offset = -pos() - boundingRect().bottomRight() / 2;
-    const GraphicsLayerQtImpl* ancestor = this;
-    while ((ancestor = qobject_cast<GraphicsLayerQtImpl*>(ancestor->parentObject()))) {
+
+    for (const GraphicsLayerQtImpl* ancestor = this; (ancestor = qobject_cast<GraphicsLayerQtImpl*>(ancestor->parentObject())); ) {
         if (!ancestor->m_state.childrenTransform.isIdentity()) {
-            offset += ancestor->boundingRect().bottomRight() / 2;
+            const QPointF offset = mapFromItem(ancestor, QPointF(ancestor->m_size.width() / 2, ancestor->m_size.height() / 2));
             computedTransform
                 .translate(offset.x(), offset.y())
@@ -319 +319 @@
             break;
         }
-        offset -= ancestor->pos();
-    }
-
-    computedTransform.multLeft(baseTransform);
+    }
 
     // webkit has relative-to-size originPoint, graphics-view has a pixel originPoint, here we convert
@@ -328 +325 @@
     const qreal originX = m_state.anchorPoint.x() * m_size.width();
     const qreal originY = m_state.anchorPoint.y() * m_size.height();
-    computedTransform = TransformationMatrix()
-                            .translate(originX, originY)
-                            .multiply(computedTransform)
-                            .translate(-originX, -originY);
+    computedTransform
+            .translate3d(originX, originY, m_state.anchorPoint.z())
+            .multLeft(baseTransform)
+            .translate3d(-originX, -originY, -m_state.anchorPoint.z());
 
     // now we project to 2D
@@ -512 +509 @@
                 update();
                 if (m_layer->drawsContent() && !m_maskEffect) {
-                    const QGraphicsItem::CacheMode mewCacheMode = isTransformAnimationRunning() ? ItemCoordinateCache : DeviceCoordinateCache;
-
-                    // optimization: QGraphicsItem doesn't always perform this test
-                    if (mewCacheMode != cacheMode())
-                        setCacheMode(mewCacheMode);
+                    setCacheMode(isTransformAnimationRunning() ? ItemCoordinateCache : DeviceCoordinateCache);
 
                     // HTML content: we want to use exposedRect so we don't use WebCore rendering if we don't have to