Changeset 106997 in webkit

Timestamp:

Feb 7, 2012 3:29:58 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Chromium] Crash when using per-tile painting on Windows.
​https://bugs.webkit.org/show_bug.cgi?id=75715

Patch by David Reveman <​reveman@chromium.org> on 2012-02-07
Reviewed by James Robinson.

PlatformCanvas constructor on win32 expects forth argument to be a
shared section handle. Passing a pointer to a system memory causes
it to crash. Fix this by not using the PlatformCanvas API for
SkCanvas construction in per-tile texture uploader.

Tested with manual tests.

• platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.cpp:

(WebCore::BitmapSkPictureCanvasLayerTextureUpdater::Texture::prepareRect):
(WebCore::BitmapSkPictureCanvasLayerTextureUpdater::Texture::updateRect):

• platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.h:

(Texture):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-07  David Reveman  <reveman@chromium.org>
+
+        [Chromium] Crash when using per-tile painting on Windows.
+        https://bugs.webkit.org/show_bug.cgi?id=75715
+
+        Reviewed by James Robinson.
+
+        PlatformCanvas constructor on win32 expects forth argument to be a
+        shared section handle. Passing a pointer to a system memory causes
+        it to crash. Fix this by not using the PlatformCanvas API for
+        SkCanvas construction in per-tile texture uploader.
+
+        Tested with manual tests.
+
+        * platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.cpp:
+        (WebCore::BitmapSkPictureCanvasLayerTextureUpdater::Texture::prepareRect):
+        (WebCore::BitmapSkPictureCanvasLayerTextureUpdater::Texture::updateRect):
+        * platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.h:
+        (Texture):
+
 2012-02-07  Jer Noble  <jer.noble@apple.com>
 

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

@@ -34 +34 @@
 #include "LayerPainterChromium.h"
 #include "SkCanvas.h"
-#include "skia/ext/platform_canvas.h"
+#include "SkDevice.h"
 
 namespace WebCore {
@@ -46 +46 @@
 void BitmapSkPictureCanvasLayerTextureUpdater::Texture::prepareRect(const IntRect& sourceRect)
 {
-    size_t bufferSize = TextureManager::memoryUseBytes(sourceRect.size(), texture()->format());
-    m_pixelData = adoptArrayPtr(new uint8_t[bufferSize]);
-    OwnPtr<SkCanvas> canvas = adoptPtr(new skia::PlatformCanvas(sourceRect.width(), sourceRect.height(), false, m_pixelData.get()));
+    m_device = adoptPtr(new SkDevice(SkBitmap::kARGB_8888_Config, sourceRect.width(), sourceRect.height()));
+    OwnPtr<SkCanvas> canvas = adoptPtr(new SkCanvas(m_device.get()));
     textureUpdater()->paintContentsRect(canvas.get(), sourceRect);
 }
@@ -55 +54 @@
 {
     texture()->bindTexture(context, allocator);
-    ASSERT(m_pixelData.get());
-    textureUpdater()->updateTextureRect(context, texture()->format(), destRect, m_pixelData.get());
-    m_pixelData.clear();
+
+    ASSERT(m_device);
+    const SkBitmap* bitmap = &m_device->accessBitmap(false);
+    bitmap->lockPixels();
+    textureUpdater()->updateTextureRect(context, texture()->format(), destRect, static_cast<uint8_t*>(bitmap->getPixels()));
+    bitmap->unlockPixels();
+    m_device.clear();
 }
 

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

@@ -35 +35 @@
 #include "SkPictureCanvasLayerTextureUpdater.h"
 
+class SkDevice;
+
 namespace WebCore {
 
@@ -51 +53 @@
         BitmapSkPictureCanvasLayerTextureUpdater* textureUpdater() { return m_textureUpdater; }
 
-        OwnArrayPtr<uint8_t> m_pixelData;
+        OwnPtr<SkDevice> m_device;
         BitmapSkPictureCanvasLayerTextureUpdater* m_textureUpdater;
     };