Changeset 85527 in webkit

Timestamp:

May 2, 2011 3:13:38 PM (13 years ago)

Author:

enne@google.com

Message:

2011-04-27 Adrienne Walker <​enne@google.com>

Reviewed by James Robinson.

Add test for multiple invalidations of the same size.
​https://bugs.webkit.org/show_bug.cgi?id=58907

This tests a bug in Chromium where canvas state was not being properly
reset between draw calls and a cached canvas of the same size was
being used to paint into that retained incorrect state.

• compositing/repaint/same-size-invalidation-expected.txt: Added.
• compositing/repaint/same-size-invalidation.html: Added.
• platform/chromium-gpu/compositing/repaint/same-size-invalidation-expected.png: Added.

2011-04-19 Adrienne Walker <​enne@google.com>

Reviewed by James Robinson.

[chromium] Don't unnecessarily resize skia/cg canvases when painting in compositor
​https://bugs.webkit.org/show_bug.cgi?id=58907

Additionally, move the context save/restore logic to a place where it
will reset the translation added in LayerTilerChromium.

Test: compositing/repaint/same-size-invalidation.html

• platform/graphics/chromium/ContentLayerChromium.cpp: (WebCore::ContentLayerPainter::paint):
• platform/graphics/chromium/PlatformCanvas.cpp: (WebCore::PlatformCanvas::resize): (WebCore::PlatformCanvas::Painter::Painter): (WebCore::PlatformCanvas::Painter::~Painter):
• platform/graphics/chromium/PlatformCanvas.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/repaint/same-size-invalidation-expected.txt (added)
• LayoutTests/compositing/repaint/same-size-invalidation.html (added)
• LayoutTests/platform/chromium-gpu/compositing/repaint (added)
• LayoutTests/platform/chromium-gpu/compositing/repaint/same-size-invalidation-expected.png (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/chromium/PlatformCanvas.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/chromium/PlatformCanvas.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-27  Adrienne Walker  <enne@google.com>
+
+        Reviewed by James Robinson.
+
+        Add test for multiple invalidations of the same size.
+        https://bugs.webkit.org/show_bug.cgi?id=58907
+
+        This tests a bug in Chromium where canvas state was not being properly
+        reset between draw calls and a cached canvas of the same size was
+        being used to paint into that retained incorrect state.
+
+        * compositing/repaint/same-size-invalidation-expected.txt: Added.
+        * compositing/repaint/same-size-invalidation.html: Added.
+        * platform/chromium-gpu/compositing/repaint/same-size-invalidation-expected.png: Added.
+
 2011-05-02  Alpha Lam  <hclam@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-19  Adrienne Walker  <enne@google.com>
+
+        Reviewed by James Robinson.
+
+        [chromium] Don't unnecessarily resize skia/cg canvases when painting in compositor
+        https://bugs.webkit.org/show_bug.cgi?id=58907
+
+        Additionally, move the context save/restore logic to a place where it
+        will reset the translation added in LayerTilerChromium.
+
+        Test: compositing/repaint/same-size-invalidation.html
+
+        * platform/graphics/chromium/ContentLayerChromium.cpp:
+        (WebCore::ContentLayerPainter::paint):
+        * platform/graphics/chromium/PlatformCanvas.cpp:
+        (WebCore::PlatformCanvas::resize):
+        (WebCore::PlatformCanvas::Painter::Painter):
+        (WebCore::PlatformCanvas::Painter::~Painter):
+        * platform/graphics/chromium/PlatformCanvas.h:
+
 2011-05-02  Csaba Osztrogonác  <ossy@webkit.org>
 

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

@@ -78 +78 @@
     virtual void paint(GraphicsContext& context, const IntRect& contentRect)
     {
-        context.save();
         context.clearRect(contentRect);
         context.clip(contentRect);
         m_owner->paintGraphicsLayerContents(context, contentRect);
-        context.restore();
     }
 private:

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

@@ -51 +51 @@
 void PlatformCanvas::resize(const IntSize& size)
 {
+    if (m_size == size)
+        return;
     m_size = size;
 #if USE(SKIA)
@@ -108 +110 @@
     m_context = adoptPtr(new GraphicsContext(m_contextCG.get()));
 #endif
+    context()->save();
 }
 
 PlatformCanvas::Painter::~Painter()
 {
+    context()->restore();
 }
 

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

@@ -82 +82 @@
 
         Painter(PlatformCanvas*, TextOption);
+        // Destructor restores canvas context to pre-construction state.
         ~Painter();