Changeset 86808 in webkit

Timestamp:

May 18, 2011 5:38:20 PM (13 years ago)

Author:

enne@google.com

Message:

2011-05-16 Adrienne Walker <​enne@google.com>

Reviewed by James Robinson.

[chromium] Robustly handle mapTexSubImage2D returning NULL
​https://bugs.webkit.org/show_bug.cgi?id=60934

Also, lazily create the temp buffer so that both the map and non-map
cases can use it.

• platform/graphics/chromium/LayerTextureSubImage.cpp: (WebCore::LayerTextureSubImage::setSubImageSize): (WebCore::LayerTextureSubImage::uploadWithTexSubImage): (WebCore::LayerTextureSubImage::uploadWithMapTexSubImage):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/LayerTextureSubImage.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-16  Adrienne Walker  <enne@google.com>
+
+        Reviewed by James Robinson.
+
+        [chromium] Robustly handle mapTexSubImage2D returning NULL
+        https://bugs.webkit.org/show_bug.cgi?id=60934
+
+        Also, lazily create the temp buffer so that both the map and non-map
+        cases can use it.
+
+        * platform/graphics/chromium/LayerTextureSubImage.cpp:
+        (WebCore::LayerTextureSubImage::setSubImageSize):
+        (WebCore::LayerTextureSubImage::uploadWithTexSubImage):
+        (WebCore::LayerTextureSubImage::uploadWithMapTexSubImage):
+
 2011-05-18  Emil A Eklund  <eae@chromium.org>
 

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

@@ -50 +50 @@
 
     m_subImageSize = subImageSize;
-    if (!m_useMapTexSubImage)
-        m_subImage = adoptArrayPtr(new uint8_t[m_subImageSize.width() * m_subImageSize.height() * 4]);
+    m_subImage.clear();
 }
 
@@ -68 +67 @@
                                                  GraphicsContext3D* context)
 {
+    if (!m_subImage)
+        m_subImage = adoptArrayPtr(new uint8_t[m_subImageSize.width() * m_subImageSize.height() * 4]);
+
     // Offset from image-rect to source-rect.
     IntPoint offset(sourceRect.x() - imageRect.x(), sourceRect.y() - imageRect.y());
@@ -97 +99 @@
     Extensions3DChromium* extensions = static_cast<Extensions3DChromium*>(context->getExtensions());
     uint8_t* pixelDest = static_cast<uint8_t*>(extensions->mapTexSubImage2DCHROMIUM(GraphicsContext3D::TEXTURE_2D, 0, destRect.x(), destRect.y(), destRect.width(), destRect.height(), GraphicsContext3D::RGBA, GraphicsContext3D::UNSIGNED_BYTE, Extensions3DChromium::WRITE_ONLY));
-    ASSERT(pixelDest);
+
+    if (!pixelDest) {
+        uploadWithTexSubImage(image, imageRect, sourceRect, destRect, context);
+        return;
+    }
+
     if (imageRect.width() == sourceRect.width() && !offset.x())
         memcpy(pixelDest, &image[4 * offset.y() * imageRect.width()], imageRect.width() * destRect.height() * 4);