Changeset 105314 in webkit

Timestamp:

Jan 18, 2012 1:41:51 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Enable tracking opaque region in Skia graphics context, return it from LayerTextureUpdater
​https://bugs.webkit.org/show_bug.cgi?id=76211

Patch by Dana Jansens <​danakj@chromium.org> on 2012-01-18
Reviewed by James Robinson.

Source/WebCore:

New unit tests in LayerTextureUpdaterTest.cpp

• platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.cpp:

(WebCore::BitmapCanvasLayerTextureUpdater::prepareToUpdate):

• platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.h:
• platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.cpp:

(WebCore::BitmapSkPictureCanvasLayerTextureUpdater::prepareToUpdate):

• platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.h:
• platform/graphics/chromium/ContentLayerChromium.cpp:

(WebCore::ContentLayerChromium::createTextureUpdater):

• platform/graphics/chromium/LayerTextureUpdater.h:

(WebCore::LayerTextureUpdater::prepareToUpdate):

• platform/graphics/chromium/PlatformCanvas.h:

(WebCore::PlatformCanvas::Painter::skiaContext):

• platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.cpp:

(WebCore::SkPictureCanvasLayerTextureUpdater::SkPictureCanvasLayerTextureUpdater):
(WebCore::SkPictureCanvasLayerTextureUpdater::prepareToUpdate):
(WebCore::SkPictureCanvasLayerTextureUpdater::setOpaque):

• platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.h:
• platform/graphics/chromium/TiledLayerChromium.cpp:

(WebCore::TiledLayerChromium::prepareToUpdateTiles):

Source/WebKit/chromium:

• WebKit.gypi:
• tests/LayerTextureUpdaterTest.cpp: Added.

(WebCore::TestLayerPainterChromium::TestLayerPainterChromium):
(WebCore::TestLayerPainterChromium::paint):
(WebCore::PaintFillOpaque::operator()):
(WebCore::PaintFillAlpha::operator()):
(WebCore::TEST):

• tests/TiledLayerChromiumTest.cpp:

(WTF::FakeLayerTextureUpdater::prepareToUpdate):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.cpp (modified) (3 diffs)
• WebCore/platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.h (modified) (1 diff)
• WebCore/platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.cpp (modified) (1 diff)
• WebCore/platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.h (modified) (1 diff)
• WebCore/platform/graphics/chromium/ContentLayerChromium.cpp (modified) (1 diff)
• WebCore/platform/graphics/chromium/LayerTextureUpdater.h (modified) (1 diff)
• WebCore/platform/graphics/chromium/PlatformCanvas.h (modified) (1 diff)
• WebCore/platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.cpp (modified) (3 diffs)
• WebCore/platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.h (modified) (1 diff)
• WebCore/platform/graphics/chromium/TiledLayerChromium.cpp (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/WebKit.gypi (modified) (1 diff)
• WebKit/chromium/tests/LayerTextureUpdaterTest.cpp (added)
• WebKit/chromium/tests/TiledLayerChromiumTest.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-18  Dana Jansens  <danakj@chromium.org>
+
+        [chromium] Enable tracking opaque region in Skia graphics context, return it from LayerTextureUpdater
+        https://bugs.webkit.org/show_bug.cgi?id=76211
+
+        Reviewed by James Robinson.
+
+        New unit tests in LayerTextureUpdaterTest.cpp
+
+        * platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.cpp:
+        (WebCore::BitmapCanvasLayerTextureUpdater::prepareToUpdate):
+        * platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.h:
+        * platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.cpp:
+        (WebCore::BitmapSkPictureCanvasLayerTextureUpdater::prepareToUpdate):
+        * platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.h:
+        * platform/graphics/chromium/ContentLayerChromium.cpp:
+        (WebCore::ContentLayerChromium::createTextureUpdater):
+        * platform/graphics/chromium/LayerTextureUpdater.h:
+        (WebCore::LayerTextureUpdater::prepareToUpdate):
+        * platform/graphics/chromium/PlatformCanvas.h:
+        (WebCore::PlatformCanvas::Painter::skiaContext):
+        * platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.cpp:
+        (WebCore::SkPictureCanvasLayerTextureUpdater::SkPictureCanvasLayerTextureUpdater):
+        (WebCore::SkPictureCanvasLayerTextureUpdater::prepareToUpdate):
+        (WebCore::SkPictureCanvasLayerTextureUpdater::setOpaque):
+        * platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.h:
+        * platform/graphics/chromium/TiledLayerChromium.cpp:
+        (WebCore::TiledLayerChromium::prepareToUpdateTiles):
+
 2012-01-18  Tim Dresser  <tdresser@chromium.org>
 

trunk/Source/WebCore/platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.cpp

@@ -33 +33 @@
 #include "LayerPainterChromium.h"
 #include "PlatformColor.h"
+#include "PlatformContextSkia.h"
 
 namespace WebCore {
@@ -78 +79 @@
 }
 
-void BitmapCanvasLayerTextureUpdater::prepareToUpdate(const IntRect& contentRect, const IntSize& tileSize, int borderTexels, float contentsScale)
+void BitmapCanvasLayerTextureUpdater::prepareToUpdate(const IntRect& contentRect, const IntSize& tileSize, int borderTexels, float contentsScale, IntRect* resultingOpaqueRect)
 {
     m_texSubImage.setSubImageSize(tileSize);
+
+    bool layerIsOpaque = m_canvas.opaque();
 
     m_canvas.resize(contentRect.size());
@@ -89 +92 @@
         borderTexels ? PlatformCanvas::Painter::GrayscaleText : PlatformCanvas::Painter::SubpixelText;
     PlatformCanvas::Painter canvasPainter(&m_canvas, textOption);
+    canvasPainter.skiaContext()->setTrackOpaqueRegion(!layerIsOpaque);
     paintContents(*canvasPainter.context(), contentRect, contentsScale);
+
+    if (!layerIsOpaque)
+        *resultingOpaqueRect = canvasPainter.skiaContext()->opaqueRegion().asRect();
 }
 

trunk/Source/WebCore/platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.h

@@ -61 +61 @@
     virtual PassOwnPtr<LayerTextureUpdater::Texture> createTexture(TextureManager*);
     virtual SampledTexelFormat sampledTexelFormat(GC3Denum textureFormat);
-    virtual void prepareToUpdate(const IntRect& contentRect, const IntSize& tileSize, int borderTexels, float contentsScale);
+    virtual void prepareToUpdate(const IntRect& contentRect, const IntSize& tileSize, int borderTexels, float contentsScale, IntRect* resultingOpaqueRect);
     void updateTextureRect(GraphicsContext3D*, TextureAllocator*, ManagedTexture*, const IntRect& sourceRect, const IntRect& destRect);
 

trunk/Source/WebCore/platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.cpp

@@ -87 +87 @@
 }
 
-void BitmapSkPictureCanvasLayerTextureUpdater::prepareToUpdate(const IntRect& contentRect, const IntSize& tileSize, int borderTexels, float contentsScale)
+void BitmapSkPictureCanvasLayerTextureUpdater::prepareToUpdate(const IntRect& contentRect, const IntSize& tileSize, int borderTexels, float contentsScale, IntRect* resultingOpaqueRect)
 {
     m_texSubImage.setSubImageSize(tileSize);
-    SkPictureCanvasLayerTextureUpdater::prepareToUpdate(contentRect, tileSize, borderTexels, contentsScale);
+    SkPictureCanvasLayerTextureUpdater::prepareToUpdate(contentRect, tileSize, borderTexels, contentsScale, resultingOpaqueRect);
 }
 

trunk/Source/WebCore/platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.h

@@ -60 +60 @@
     virtual PassOwnPtr<LayerTextureUpdater::Texture> createTexture(TextureManager*);
     virtual SampledTexelFormat sampledTexelFormat(GC3Denum textureFormat);
-    virtual void prepareToUpdate(const IntRect& contentRect, const IntSize& tileSize, int borderTexels, float contentsScale);
+    virtual void prepareToUpdate(const IntRect& contentRect, const IntSize& tileSize, int borderTexels, float contentsScale, IntRect* resultingOpaqueRect);
     void paintContentsRect(SkCanvas*, const IntRect& sourceRect);
     void updateTextureRect(GraphicsContext3D*, GC3Denum format, const IntRect& destRect, const uint8_t* pixels);

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

@@ -120 +120 @@
 {
 #if USE(SKIA)
-    if (host->settings().acceleratePainting) {
+    if (host->settings().acceleratePainting)
         m_textureUpdater = FrameBufferSkPictureCanvasLayerTextureUpdater::create(ContentLayerPainter::create(m_delegate));
-        return;
-    }
-
-    if (host->settings().perTilePainting) {
+    else if (host->settings().perTilePainting)
         m_textureUpdater = BitmapSkPictureCanvasLayerTextureUpdater::create(ContentLayerPainter::create(m_delegate), host->layerRendererCapabilities().usingMapSub);
-        return;
-    }
+    else
 #endif // USE(SKIA)
-
-    m_textureUpdater = BitmapCanvasLayerTextureUpdater::create(ContentLayerPainter::create(m_delegate), host->layerRendererCapabilities().usingMapSub);
+        m_textureUpdater = BitmapCanvasLayerTextureUpdater::create(ContentLayerPainter::create(m_delegate), host->layerRendererCapabilities().usingMapSub);
     m_textureUpdater->setOpaque(opaque());
 }

trunk/Source/WebCore/platform/graphics/chromium/LayerTextureUpdater.h

@@ -72 +72 @@
     // If the format is TexelFormatBGRA, vec4.x is blue and vec4.z is red.
     virtual SampledTexelFormat sampledTexelFormat(GC3Denum textureFormat) = 0;
-    virtual void prepareToUpdate(const IntRect& /* contentRect */, const IntSize& /* tileSize */, int /* borderTexels */, float /* contentsScale */) { }
+    // The |resultingOpaqueRect| gives back a region of the layer that was painted opaque. If the layer is marked opaque in the updater,
+    // then this region should be ignored in preference for the entire layer's area.
+    virtual void prepareToUpdate(const IntRect& /* contentRect */, const IntSize& /* tileSize */, int /* borderTexels */, float /* contentsScale */,
+                                 IntRect* /* resultingOpaqueRect */) { }
 
+    // Set true by the layer when it is known that the entire output is going to be opaque.
     virtual void setOpaque(bool) { }
 };

trunk/Source/WebCore/platform/graphics/chromium/PlatformCanvas.h

@@ -86 +86 @@
 
         GraphicsContext* context() const { return m_context.get(); }
+        PlatformContextSkia* skiaContext() const { return m_skiaContext.get(); }
     private:
         OwnPtr<GraphicsContext> m_context;

trunk/Source/WebCore/platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.cpp

@@ -42 +42 @@
 SkPictureCanvasLayerTextureUpdater::SkPictureCanvasLayerTextureUpdater(PassOwnPtr<LayerPainterChromium> painter)
     : CanvasLayerTextureUpdater(painter)
+    , m_layerIsOpaque(false)
 {
 }
@@ -49 +50 @@
 }
 
-void SkPictureCanvasLayerTextureUpdater::prepareToUpdate(const IntRect& contentRect, const IntSize& /* tileSize */, int /* borderTexels */, float contentsScale)
+void SkPictureCanvasLayerTextureUpdater::prepareToUpdate(const IntRect& contentRect, const IntSize& /* tileSize */, int /* borderTexels */, float contentsScale, IntRect* resultingOpaqueRect)
 {
     SkCanvas* canvas = m_picture.beginRecording(contentRect.width(), contentRect.height());
     PlatformContextSkia platformContext(canvas);
     platformContext.setDeferred(true);
+    platformContext.setTrackOpaqueRegion(!m_layerIsOpaque);
     GraphicsContext graphicsContext(&platformContext);
     paintContents(graphicsContext, contentRect, contentsScale);
     m_picture.endRecording();
+
+    if (!m_layerIsOpaque)
+        *resultingOpaqueRect = platformContext.opaqueRegion().asRect();
 }
 
@@ -65 +70 @@
 }
 
+void SkPictureCanvasLayerTextureUpdater::setOpaque(bool opaque)
+{
+    m_layerIsOpaque = opaque;
+}
+
 } // namespace WebCore
 #endif // USE(SKIA)

trunk/Source/WebCore/platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.h

@@ -52 +52 @@
     explicit SkPictureCanvasLayerTextureUpdater(PassOwnPtr<LayerPainterChromium>);
 
-    virtual void prepareToUpdate(const IntRect& contentRect, const IntSize& tileSize, int borderTexels, float contentsScale);
+    virtual void prepareToUpdate(const IntRect& contentRect, const IntSize& tileSize, int borderTexels, float contentsScale, IntRect* resultingOpaqueRect);
     void drawPicture(SkCanvas*);
 
+    virtual void setOpaque(bool);
+
 private:
-    SkPicture m_picture; // Recording canvas.
+    // Recording canvas.
+    SkPicture m_picture;
+    // True when it is known that all output pixels will be opaque.
+    bool m_layerIsOpaque;
 };
 

trunk/Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp

@@ -413 +413 @@
     // so we grab a local reference here to hold the updater alive until the paint completes.
     RefPtr<LayerTextureUpdater> protector(textureUpdater());
-    textureUpdater()->prepareToUpdate(m_paintRect, m_tiler->tileSize(), m_tiler->hasBorderTexels(), contentsScale());
+    IntRect opaqueRect; // FIXME: unused. remove this and store in the layer to pass to impl for draw culling
+    textureUpdater()->prepareToUpdate(m_paintRect, m_tiler->tileSize(), m_tiler->hasBorderTexels(), contentsScale(), &opaqueRect);
     for (int j = top; j <= bottom; ++j) {
         for (int i = left; i <= right; ++i) {

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-01-18  Dana Jansens  <danakj@chromium.org>
+
+        [chromium] Enable tracking opaque region in Skia graphics context, return it from LayerTextureUpdater
+        https://bugs.webkit.org/show_bug.cgi?id=76211
+
+        Reviewed by James Robinson.
+
+        * WebKit.gypi:
+        * tests/LayerTextureUpdaterTest.cpp: Added.
+        (WebCore::TestLayerPainterChromium::TestLayerPainterChromium):
+        (WebCore::TestLayerPainterChromium::paint):
+        (WebCore::PaintFillOpaque::operator()):
+        (WebCore::PaintFillAlpha::operator()):
+        (WebCore::TEST):
+        * tests/TiledLayerChromiumTest.cpp:
+        (WTF::FakeLayerTextureUpdater::prepareToUpdate):
+
 2012-01-18  Tim Dresser  <tdresser@chromium.org>
 

trunk/Source/WebKit/chromium/WebKit.gypi

@@ -94 +94 @@
             'tests/KURLTest.cpp',
             'tests/LayerChromiumTest.cpp',
+            'tests/LayerTextureUpdaterTest.cpp',
             'tests/PODArenaTest.cpp',
             'tests/PODIntervalTreeTest.cpp',

trunk/Source/WebKit/chromium/tests/TiledLayerChromiumTest.cpp

@@ -73 +73 @@
     virtual PassOwnPtr<LayerTextureUpdater::Texture> createTexture(TextureManager* manager) { return adoptPtr(new Texture(ManagedTexture::create(manager))); }
     virtual SampledTexelFormat sampledTexelFormat(GC3Denum) { return SampledTexelFormatRGBA; }
-    virtual void prepareToUpdate(const IntRect& contentRect, const IntSize&, int, float);
+    virtual void prepareToUpdate(const IntRect& contentRect, const IntSize&, int, float, IntRect*);
 
 private:
@@ -150 +150 @@
 }
 
-void FakeLayerTextureUpdater::prepareToUpdate(const IntRect& contentRect, const IntSize&, int, float)
+void FakeLayerTextureUpdater::prepareToUpdate(const IntRect& contentRect, const IntSize&, int, float, IntRect* resultingOpaqueRect)
 {
     m_prepareCount++;
@@ -159 +159 @@
         m_layer = 0;
     }
+    *resultingOpaqueRect = IntRect();
 }