Changeset 104728 in webkit

Timestamp:

Jan 11, 2012 11:49:40 AM (12 years ago)

Author:

noam.rosenthal@nokia.com

Message:

[Qt][Texmap] LayoutTests/compositing/masks/masked-ancestor does not render correctly.
​https://bugs.webkit.org/show_bug.cgi?id=75910

Reviewed by Simon Hausmann.

Handle the mask surface correctly when drawing in two passes. Also, improve the readability
of the code that decides whether to draw in two passes.

LayoutTests/compositing/masks/masked-ancestor.html tests this.

• platform/graphics/texmap/TextureMapperNode.cpp:

(WebCore::TextureMapperNode::computeAllTransforms):
(WebCore::TextureMapperNode::hasMoreThanOneTile):
(WebCore::TextureMapperNode::paintRecursive):

• platform/graphics/texmap/TextureMapperNode.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/texmap/TextureMapperNode.cpp (modified) (6 diffs)
• platform/graphics/texmap/TextureMapperNode.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-11  No'am Rosenthal  <noam.rosenthal@nokia.com>
+
+        [Qt][Texmap] LayoutTests/compositing/masks/masked-ancestor does not render correctly.
+        https://bugs.webkit.org/show_bug.cgi?id=75910
+
+        Reviewed by Simon Hausmann.
+
+        Handle the mask surface correctly when drawing in two passes. Also, improve the readability
+        of the code that decides whether to draw in two passes.
+
+        LayoutTests/compositing/masks/masked-ancestor.html tests this.
+
+        * platform/graphics/texmap/TextureMapperNode.cpp:
+        (WebCore::TextureMapperNode::computeAllTransforms):
+        (WebCore::TextureMapperNode::hasMoreThanOneTile):
+        (WebCore::TextureMapperNode::paintRecursive):
+        * platform/graphics/texmap/TextureMapperNode.h:
+
 2012-01-11  Dmitry Titov  <dimich@chromium.org>
 

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp

@@ -113 +113 @@
     computePerspectiveTransformIfNeeded();
 
-    m_transforms.target = TransformationMatrix(m_parent ? m_parent->m_transforms.forDescendants : TransformationMatrix()).multiply(m_transforms.local);
+    TextureMapperNode* parent = m_parent ? m_parent : m_effectTarget;
+    m_transforms.target = TransformationMatrix(parent ? parent->m_transforms.forDescendants : TransformationMatrix()).multiply(m_transforms.local);
 
     m_state.visible = m_state.backfaceVisibility || m_transforms.target.inverse().m33() >= 0;
@@ -120 +121 @@
 
     // This transform is only applied if using a two-pass for the replica, because the transform needs to be adjusted to the size of the intermediate surface, insteaf of the size of the content layer.
-    if (m_parent && m_parent->m_state.preserves3D)
+    if (parent && parent->m_state.preserves3D)
         m_transforms.centerZ = m_transforms.target.mapPoint(FloatPoint3D(m_size.width() / 2, m_size.height() / 2, 0)).z();
 
@@ -248 +249 @@
 }
 #endif
+
+bool TextureMapperNode::hasMoreThanOneTile() const
+{
+    int tiles = 0;
+
+#if USE(TILED_BACKING_STORE)
+    if (m_state.tileOwnership == ExternallyManagedTiles) {
+        HashMap<int, ExternallyManagedTile>::const_iterator end = m_externallyManagedTiles.end();
+        for (HashMap<int, ExternallyManagedTile>::const_iterator it = m_externallyManagedTiles.begin(); it != end; ++it) {
+            if (it->second.frontBuffer.texture) {
+                if (++tiles > 1)
+                    return true;
+            }
+        }
+
+        return false;
+    }
+#endif
+
+    for (size_t i = 0; i < m_ownedTiles.size(); ++i) {
+        if (m_ownedTiles[i].texture) {
+            if (++tiles > 1)
+                return true;
+        }
+    }
+
+    return false;
+}
+
 
 void TextureMapperNode::renderContent(TextureMapper* textureMapper, GraphicsLayer* layer)
@@ -516 +546 @@
     options.opacity *= m_opacity;
     RefPtr<BitmapTexture> surface;
-    const bool needsTwoPass = ((m_state.replicaLayer || m_state.maskLayer) && !m_children.isEmpty()) || (m_opacity < 0.99 && m_state.mightHaveOverlaps) || (m_opacity < 0.99 && m_state.replicaLayer);
+
+    bool hasReplica = m_state.replicaLayer;
+    bool hasMask = m_state.maskLayer;
+    bool needsBlending = m_opacity < 0.99 || hasMask;
+    bool paintsMoreThanOneTexture = !m_children.isEmpty() || hasMoreThanOneTile() || (hasMask && m_state.maskLayer->hasMoreThanOneTile());
+    bool hasOverlaps = m_state.mightHaveOverlaps || hasReplica;
     const IntSize viewportSize = options.textureMapper->viewportSize();
+    bool needsTwoPass = ((hasReplica || hasMask) && paintsMoreThanOneTexture) || (needsBlending && hasOverlaps);
     options.isSurface = false;
 
@@ -531 +567 @@
     RefPtr<BitmapTexture> maskSurface;
 
-    // The mask has to be adjusted to target coordinates.
     if (m_state.maskLayer) {
         maskSurface = options.textureMapper->acquireTextureFromPool(options.textureMapper->viewportSize());
         options.textureMapper->bindSurface(maskSurface.get());
-        options.textureMapper->drawTexture(*m_state.maskLayer->texture(), entireRect(), m_transforms.target, 1.0, 0);
+        TextureMapperPaintOptions optionsForMask(options);
+        optionsForMask.isSurface = true;
+        m_state.maskLayer->paintSelf(optionsForMask);
     }
 
@@ -548 +585 @@
     if (!paintReflection(options, surface.get())) {
         options.textureMapper->bindSurface(options.surface);
-        options.textureMapper->drawTexture(*surface.get(), viewportRect, TransformationMatrix(), options.opacity, 0);
+        options.textureMapper->drawTexture(*surface.get(), viewportRect, TransformationMatrix(), options.opacity, maskSurface.get());
     }
 

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperNode.h

@@ -207 +207 @@
     bool hasOpacityAnimation() const;
     bool hasTransformAnimation() const;
-
+    bool hasMoreThanOneTile() const;
     struct TransformData {
         TransformationMatrix target;