Changeset 69747 in webkit

Timestamp:

Oct 14, 2010 12:18:18 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-10-14 Adrienne Walker <​enne@google.com>

Reviewed by James Robinson.

Add a test for very large image layers. Skip this test for mac-wk2
because of the use of layerTreeAsText().
​https://bugs.webkit.org/show_bug.cgi?id=47016

• compositing/tiling/huge-layer-img.html: Added.
• platform/chromium-gpu/compositing/tiling/huge-layer-img-expected.txt: Added.
• platform/mac-wk2/Skipped:
• platform/mac/compositing/tiling/huge-layer-img-expected.txt: Added.

2010-10-14 Adrienne Walker <​enne@google.com>

Reviewed by James Robinson.

Add a short-term solution for large layers. Layers that are too
large to be contained in a single texture just upload the portion of
the layer that is within the content rect. A longer-term solution
is still tiling with proper memory management. Layers that have full
3D transforms (more than just translations) are still not drawn.
​https://bugs.webkit.org/show_bug.cgi?id=47016

Test: compositing/tiling

• platform/graphics/chromium/ContentLayerChromium.cpp: (WebCore::ContentLayerChromium::ContentLayerChromium): (WebCore::ContentLayerChromium::requiresClippedUpdateRect): (WebCore::ContentLayerChromium::calculateClippedUpdateRect): (WebCore::ContentLayerChromium::updateContents): (WebCore::ContentLayerChromium::updateTextureRect): (WebCore::ContentLayerChromium::draw):
• platform/graphics/chromium/ContentLayerChromium.h:
• platform/graphics/chromium/ImageLayerChromium.cpp: (WebCore::ImageLayerChromium::updateContents):
• platform/graphics/chromium/LayerRendererChromium.cpp: (WebCore::LayerRendererChromium::drawLayers):
• platform/graphics/chromium/LayerRendererChromium.h: (WebCore::LayerRendererChromium::rootLayerContentRect):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/tiling/huge-layer-img.html (added)
• LayoutTests/platform/chromium-gpu/compositing (added)
• LayoutTests/platform/chromium-gpu/compositing/tiling (added)
• LayoutTests/platform/chromium-gpu/compositing/tiling/huge-layer-img-expected.txt (added)
• LayoutTests/platform/mac-wk2/Skipped (modified) (1 diff)
• LayoutTests/platform/mac/compositing/tiling (added)
• LayoutTests/platform/mac/compositing/tiling/huge-layer-img-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/chromium/ContentLayerChromium.cpp (modified) (6 diffs)
• WebCore/platform/graphics/chromium/ContentLayerChromium.h (modified) (2 diffs)
• WebCore/platform/graphics/chromium/ImageLayerChromium.cpp (modified) (2 diffs)
• WebCore/platform/graphics/chromium/LayerRendererChromium.cpp (modified) (1 diff)
• WebCore/platform/graphics/chromium/LayerRendererChromium.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-14  Adrienne Walker  <enne@google.com>
+
+        Reviewed by James Robinson.
+
+        Add a test for very large image layers.  Skip this test for mac-wk2
+        because of the use of layerTreeAsText().
+        https://bugs.webkit.org/show_bug.cgi?id=47016
+
+        * compositing/tiling/huge-layer-img.html: Added.
+        * platform/chromium-gpu/compositing/tiling/huge-layer-img-expected.txt: Added.
+        * platform/mac-wk2/Skipped:
+        * platform/mac/compositing/tiling/huge-layer-img-expected.txt: Added.
+
 2010-10-13  James Simonsen  <simonjam@chromium.org>
 

trunk/LayoutTests/platform/mac-wk2/Skipped

@@ -79 +79 @@
 compositing/tiling/huge-layer-with-layer-children.html
 compositing/tiling/huge-layer.html
+compositing/tiling/huge-layer-img.html
 compositing/video/video-poster.html
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-14  Adrienne Walker  <enne@google.com>
+
+        Reviewed by James Robinson.
+
+        Add a short-term solution for large layers.  Layers that are too
+        large to be contained in a single texture just upload the portion of
+        the layer that is within the content rect.  A longer-term solution
+        is still tiling with proper memory management.  Layers that have full
+        3D transforms (more than just translations) are still not drawn.
+        https://bugs.webkit.org/show_bug.cgi?id=47016
+
+        Test: compositing/tiling
+
+        * platform/graphics/chromium/ContentLayerChromium.cpp:
+        (WebCore::ContentLayerChromium::ContentLayerChromium):
+        (WebCore::ContentLayerChromium::requiresClippedUpdateRect):
+        (WebCore::ContentLayerChromium::calculateClippedUpdateRect):
+        (WebCore::ContentLayerChromium::updateContents):
+        (WebCore::ContentLayerChromium::updateTextureRect):
+        (WebCore::ContentLayerChromium::draw):
+        * platform/graphics/chromium/ContentLayerChromium.h:
+        * platform/graphics/chromium/ImageLayerChromium.cpp:
+        (WebCore::ImageLayerChromium::updateContents):
+        * platform/graphics/chromium/LayerRendererChromium.cpp:
+        (WebCore::LayerRendererChromium::drawLayers):
+        * platform/graphics/chromium/LayerRendererChromium.h:
+        (WebCore::LayerRendererChromium::rootLayerContentRect):
+
 2010-10-14  Chris Rogers  <crogers@google.com>
 

trunk/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp

@@ -123 +123 @@
     : LayerChromium(owner)
     , m_contentsTexture(0)
+    , m_skipsDraw(false)
 {
 }
@@ -141 +142 @@
 }
 
+bool ContentLayerChromium::requiresClippedUpdateRect() const
+{
+    return !layerRenderer()->checkTextureSize(m_bounds);
+}
+
+void ContentLayerChromium::calculateClippedUpdateRect(IntRect& dirtyRect, IntRect& drawRect) const
+{
+    // For the given layer size and content rect, calculate:
+    // 1) The minimal texture space rectangle to be uploaded, returned in dirtyRect.
+    // 2) The content rect-relative rectangle to draw this texture in, returned in drawRect.
+
+    const IntRect contentRect = layerRenderer()->rootLayerContentRect();
+    const TransformationMatrix& transform = drawTransform();
+    // The layer's draw transform points to the center of the layer, relative to
+    // the content rect.  layerPos is the distance from the top left of the
+    // layer to the top left of the content rect.
+    const IntPoint layerPos(m_bounds.width() / 2 - transform.m41(),
+                            m_bounds.height() / 2 - transform.m42());
+    // Transform the contentRect into the space of the layer.
+    IntRect contentRectInLayerSpace(layerPos, contentRect.size());
+
+    // Clip the entire layer against the visible region in the content rect
+    // and use that as the drawable texture, instead of the entire layer.
+    dirtyRect = IntRect(IntPoint(0, 0), m_bounds);
+    dirtyRect.intersect(contentRectInLayerSpace);
+
+    // The draw position is relative to the content rect.
+    drawRect = IntRect(toPoint(dirtyRect.location() - layerPos), dirtyRect.size());
+}
+
 void ContentLayerChromium::updateContents()
 {
@@ -151 +182 @@
     ASSERT(layerRenderer());
 
-    // FIXME: Remove this test when tiled layers are implemented.
-    m_skipsDraw = false;
-    if (!layerRenderer()->checkTextureSize(m_bounds)) {
-        m_skipsDraw = true;
-        return;
-    }
-
     void* pixels = 0;
-    IntRect dirtyRect(m_dirtyRect);
+    IntRect dirtyRect;
+    IntRect updateRect;
     IntSize requiredTextureSize;
     IntSize bitmapSize;
 
-    requiredTextureSize = m_bounds;
-    IntRect boundsRect(IntPoint(0, 0), m_bounds);
-
-    // If the texture needs to be reallocated then we must redraw the entire
-    // contents of the layer.
-    if (requiredTextureSize != m_allocatedTextureSize)
-        dirtyRect = boundsRect;
-    else {
-        // Clip the dirtyRect to the size of the layer to avoid drawing outside
-        // the bounds of the backing texture.
-        dirtyRect.intersect(boundsRect);
+    // FIXME: Remove this test when tiled layers are implemented.
+    if (requiresClippedUpdateRect()) {
+        // A layer with 3D transforms could require an arbitrarily large number
+        // of texels to be repainted, so ignore these layers until tiling is
+        // implemented.
+        if (!drawTransform().isIdentityOrTranslation()) {
+            m_skipsDraw = true;
+            return;
+        }
+
+        calculateClippedUpdateRect(dirtyRect, m_largeLayerDrawRect);
+        if (!layerRenderer()->checkTextureSize(m_largeLayerDrawRect.size())) {
+            m_skipsDraw = true;
+            return;
+        }
+        if (m_largeLayerDirtyRect == dirtyRect)
+            return;
+
+        m_largeLayerDirtyRect = dirtyRect;
+        requiredTextureSize = dirtyRect.size();
+        updateRect = IntRect(IntPoint(0, 0), dirtyRect.size());
+    } else {
+        dirtyRect = IntRect(m_dirtyRect);
+        IntRect boundsRect(IntPoint(0, 0), m_bounds);
+        requiredTextureSize = m_bounds;
+        // If the texture needs to be reallocated then we must redraw the entire
+        // contents of the layer.
+        if (requiredTextureSize != m_allocatedTextureSize)
+            dirtyRect = boundsRect;
+        else {
+            // Clip the dirtyRect to the size of the layer to avoid drawing
+            // outside the bounds of the backing texture.
+            dirtyRect.intersect(boundsRect);
+        }
+        updateRect = dirtyRect;
     }
 
@@ -237 +286 @@
 
     if (pixels)
-        updateTextureRect(pixels, bitmapSize, requiredTextureSize,  dirtyRect, textureId);
+        updateTextureRect(pixels, bitmapSize, requiredTextureSize, updateRect, textureId);
 }
 
@@ -288 +337 @@
 
     m_dirtyRect.setSize(FloatSize());
-    m_contentsDirty = false;
+    // Large layers always stay dirty, because they need to update when the content rect changes.
+    m_contentsDirty = requiresClippedUpdateRect();
 }
 
@@ -304 +354 @@
     layerRenderer()->useShader(sv->contentShaderProgram());
     GLC(context, context->uniform1i(sv->shaderSamplerLocation(), 0));
-    drawTexturedQuad(context, layerRenderer()->projectionMatrix(), drawTransform(),
-                     bounds().width(), bounds().height(), drawOpacity(),
-                     sv->shaderMatrixLocation(), sv->shaderAlphaLocation());
+
+    if (requiresClippedUpdateRect()) {
+        float m43 = drawTransform().m43();
+        TransformationMatrix transform;
+        transform.translate3d(m_largeLayerDrawRect.center().x(), m_largeLayerDrawRect.center().y(), m43);
+        drawTexturedQuad(context, layerRenderer()->projectionMatrix(),
+                         transform, m_largeLayerDrawRect.width(),
+                         m_largeLayerDrawRect.height(), drawOpacity(),
+                         sv->shaderMatrixLocation(), sv->shaderAlphaLocation());
+    } else {
+        drawTexturedQuad(context, layerRenderer()->projectionMatrix(),
+                         drawTransform(), m_bounds.width(), m_bounds.height(),
+                         drawOpacity(), sv->shaderMatrixLocation(),
+                         sv->shaderAlphaLocation());
+    }
 }
 

trunk/WebCore/platform/graphics/chromium/ContentLayerChromium.h

@@ -85 +85 @@
 
     virtual void cleanupResources();
+    bool requiresClippedUpdateRect() const;
 
     unsigned m_contentsTexture;
@@ -90 +91 @@
     bool m_skipsDraw;
 
+private:
+    void calculateClippedUpdateRect(IntRect& dirtyRect, IntRect& drawRect) const;
+    IntRect m_largeLayerDrawRect;
+    IntRect m_largeLayerDirtyRect;
 };
 

trunk/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp

@@ -76 +76 @@
     ASSERT(layerRenderer());
 
+    // FIXME: Remove this test when tiled layers are implemented.
+    if (requiresClippedUpdateRect()) {
+        // Use the base version of updateContents which draws a subset of the
+        // image to a bitmap, as the pixel contents can't be uploaded directly.
+        ContentLayerChromium::updateContents();
+        return;
+    }
+
     void* pixels = 0;
     IntSize requiredTextureSize;
@@ -137 +145 @@
 #error "Need to implement for your platform."
 #endif
-    // FIXME: Remove this test when tiled layers are implemented.
-    m_skipsDraw = false;
-    if (!layerRenderer()->checkTextureSize(requiredTextureSize)) {
-        m_skipsDraw = true;
-        return;
-    }
 
     unsigned textureId = m_contentsTexture;

trunk/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp

@@ -308 +308 @@
     GLC(m_context, m_context->blendFunc(GraphicsContext3D::ONE, GraphicsContext3D::ONE_MINUS_SRC_ALPHA));
 
-    // Set the rootVisibleRect --- used by subsequent drawLayers calls
+    // Set the root visible/content rects --- used by subsequent drawLayers calls.
     m_rootVisibleRect = visibleRect;
+    m_rootContentRect = contentRect;
 
     // Traverse the layer tree and update the layer transforms.

trunk/WebCore/platform/graphics/chromium/LayerRendererChromium.h

@@ -109 +109 @@
 
     IntSize rootLayerTextureSize() const { return IntSize(m_rootLayerTextureWidth, m_rootLayerTextureHeight); }
+    IntRect rootLayerContentRect() const { return m_rootContentRect; }
     void getFramebufferPixels(void *pixels, const IntRect& rect);
 
@@ -162 +163 @@
 
     IntRect m_rootVisibleRect;
+    IntRect m_rootContentRect;
 
     int m_maxTextureSize;