Changeset 60548 in webkit

Timestamp:

Jun 2, 2010 2:01:49 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-02 Vangelis Kokkevis <​vangelis@chromium.org>

Reviewed by Dimitri Glazkov.

[Chromium] Clamp dirtyRect updates of composited layer contents to the size
of the layer to avoid writing outside texture bounds.
​https://bugs.webkit.org/show_bug.cgi?id=40030

• platform/graphics/chromium/LayerChromium.cpp: (WebCore::LayerChromium::updateTextureContents):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/LayerChromium.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-02  Vangelis Kokkevis  <vangelis@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        [Chromium] Clamp dirtyRect updates of composited layer contents to the size
+        of the layer to avoid writing outside texture bounds.
+        https://bugs.webkit.org/show_bug.cgi?id=40030
+
+        * platform/graphics/chromium/LayerChromium.cpp:
+        (WebCore::LayerChromium::updateTextureContents):
+
 2010-06-02  Yael Aharon  <yael.aharon@nokia.com>
 

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

@@ -119 +119 @@
         OwnPtr<GraphicsContext> graphicsContext;
         if (drawsContent()) { // Layer contents must be drawn into a canvas.
+            // Clip the dirtyRect to the size of the layer to avoid drawing outside
+            // the bounds of the backing texture.
+            dirtyRect.intersect(IntRect(IntPoint(0, 0), m_bounds));
+
             canvas.set(new skia::PlatformCanvas(dirtyRect.width(), dirtyRect.height(), false));
             skiaContext.set(new PlatformContextSkia(canvas.get()));
@@ -136 +140 @@
             const SkBitmap& bitmap = canvas->getDevice()->accessBitmap(false);
             skiaBitmap = &bitmap;
-            requiredTextureSize = IntSize(max(m_bounds.width(), dirtyRect.width()),
-                                          max(m_bounds.height(), dirtyRect.height()));
+            requiredTextureSize = m_bounds;
         } else { // Layer is a container.
             // The layer contains an Image.