Changeset 84542 in webkit

Timestamp:

Apr 21, 2011 1:19:36 PM (13 years ago)

Author:

enne@google.com

Message:

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

Reviewed by James Robinson.

[chromium] Don't upload partially drawn tiles in the compositor
​https://bugs.webkit.org/show_bug.cgi?id=59112

Use the same set of tiles for painting as is used for updating.
Before, a larger set of tiles were being uploaded, causing some to
only be partially undirtied because they were not fully painted.
As tiles are clear their dirty rect after being unpainted, this caused
artifacts to appear when scrolling.

Unfortunately, no layout test can test this behavior yet because
scrolling invalidations are done differently in test shell.

• platform/graphics/chromium/ImageLayerChromium.cpp: (WebCore::ImageLayerChromium::updateCompositorResources):
• platform/graphics/chromium/LayerTilerChromium.cpp: (WebCore::LayerTilerChromium::update): (WebCore::LayerTilerChromium::uploadCanvas): (WebCore::LayerTilerChromium::updateFromPixels):
• platform/graphics/chromium/LayerTilerChromium.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/ImageLayerChromium.cpp (modified) (1 diff)
• platform/graphics/chromium/LayerTilerChromium.cpp (modified) (3 diffs)
• platform/graphics/chromium/LayerTilerChromium.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-21  Adrienne Walker  <enne@google.com>
+
+        Reviewed by James Robinson.
+
+        [chromium] Don't upload partially drawn tiles in the compositor
+        https://bugs.webkit.org/show_bug.cgi?id=59112
+
+        Use the same set of tiles for painting as is used for updating.
+        Before, a larger set of tiles were being uploaded, causing some to
+        only be partially undirtied because they were not fully painted.
+        As tiles are clear their dirty rect after being unpainted, this caused
+        artifacts to appear when scrolling.
+
+        Unfortunately, no layout test can test this behavior yet because
+        scrolling invalidations are done differently in test shell.
+
+        * platform/graphics/chromium/ImageLayerChromium.cpp:
+        (WebCore::ImageLayerChromium::updateCompositorResources):
+        * platform/graphics/chromium/LayerTilerChromium.cpp:
+        (WebCore::LayerTilerChromium::update):
+        (WebCore::LayerTilerChromium::uploadCanvas):
+        (WebCore::LayerTilerChromium::updateFromPixels):
+        * platform/graphics/chromium/LayerTilerChromium.h:
+
 2011-04-21  Ben Taylor  <bentaylor.solx86@gmail.com>
 

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

@@ -87 +87 @@
         m_dirtyRect = IntRect();
     }
-    m_tiler->updateFromPixels(paintRect, m_decodedImage.pixels());
+    m_tiler->updateFromPixels(paintRect, paintRect, m_decodedImage.pixels());
 }
 

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

@@ -253 +253 @@
     }
 
+    // Due to borders, when the paint rect is extended to tile boundaries, it
+    // may end up overlapping more tiles than the original content rect. Record
+    // that original rect so we don't upload more tiles than necessary.
+    m_updateRect = contentRect;
+
+    m_paintRect = layerRectToContentRect(dirtyLayerRect);
     if (dirtyLayerRect.isEmpty())
         return;
-
-    m_paintRect = layerRectToContentRect(dirtyLayerRect);
 
     m_canvas.resize(m_paintRect.size());
@@ -277 +281 @@
     {
         TRACE_EVENT("LayerTilerChromium::updateFromPixels", this, 0);
-        updateFromPixels(m_paintRect, locker.pixels());
-    }
-}
-
-void LayerTilerChromium::updateFromPixels(const IntRect& paintRect, const uint8_t* paintPixels)
+        updateFromPixels(m_updateRect, m_paintRect, locker.pixels());
+    }
+}
+
+void LayerTilerChromium::updateFromPixels(const IntRect& contentRect, const IntRect& paintRect, const uint8_t* paintPixels)
 {
     // Painting could cause compositing to get turned off, which may cause the tiler to become invalidated mid-update.
@@ -290 +294 @@
 
     int left, top, right, bottom;
-    contentRectToTileIndices(paintRect, left, top, right, bottom);
+    contentRectToTileIndices(contentRect, left, top, right, bottom);
     for (int j = top; j <= bottom; ++j) {
         for (int i = left; i <= right; ++i) {

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

@@ -69 +69 @@
 
     // Reserve and upload tile textures from an externally painted buffer.
-    void updateFromPixels(const IntRect& paintRect, const uint8_t* pixels);
+    void updateFromPixels(const IntRect& contentRect, const IntRect& paintRect, const uint8_t* pixels);
 
     // Draw all tiles that intersect with the content rect.
@@ -162 +162 @@
     Vector<RefPtr<Tile> > m_unusedTiles;
 
+    // State held between update and uploadCanvas.
     IntRect m_paintRect;
+    IntRect m_updateRect;
     PlatformCanvas m_canvas;