Changeset 87960 in webkit

Timestamp:

Jun 2, 2011 3:14:03 PM (13 years ago)

Author:

enne@google.com

Message:

2011-06-02 Adrienne Walker <​enne@google.com>

Reviewed by James Robinson.

[chromium] Compositor HUD should respect mapTexSubImage2D returning NULL
​https://bugs.webkit.org/show_bug.cgi?id=61954

• platform/graphics/chromium/cc/CCHeadsUpDisplay.cpp: (WebCore::CCHeadsUpDisplay::draw):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/cc/CCHeadsUpDisplay.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-02  Adrienne Walker  <enne@google.com>
+
+        Reviewed by James Robinson.
+
+        [chromium] Compositor HUD should respect mapTexSubImage2D returning NULL
+        https://bugs.webkit.org/show_bug.cgi?id=61954
+
+        * platform/graphics/chromium/cc/CCHeadsUpDisplay.cpp:
+        (WebCore::CCHeadsUpDisplay::draw):
+
 2011-06-02  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/platform/graphics/chromium/cc/CCHeadsUpDisplay.cpp

@@ -111 +111 @@
 
         m_hudTexture->bindTexture();
+        bool uploadedViaMap = false;
         if (m_useMapSubForUploads) {
             Extensions3DChromium* extensions = static_cast<Extensions3DChromium*>(context->getExtensions());
             uint8_t* pixelDest = static_cast<uint8_t*>(extensions->mapTexSubImage2DCHROMIUM(GraphicsContext3D::TEXTURE_2D, 0, 0, 0, hudSize.width(), hudSize.height(), GraphicsContext3D::RGBA, GraphicsContext3D::UNSIGNED_BYTE, Extensions3DChromium::WRITE_ONLY));
-            memcpy(pixelDest, locker.pixels(), hudSize.width() * hudSize.height() * 4);
-            extensions->unmapTexSubImage2DCHROMIUM(pixelDest);
-        } else
+
+            if (pixelDest) {
+                uploadedViaMap = true;
+                memcpy(pixelDest, locker.pixels(), hudSize.width() * hudSize.height() * 4);
+                extensions->unmapTexSubImage2DCHROMIUM(pixelDest);
+            }
+        }
+
+        if (!uploadedViaMap) {
             GLC(context, context->texImage2D(GraphicsContext3D::TEXTURE_2D, 0, GraphicsContext3D::RGBA, canvas.size().width(), canvas.size().height(), 0, GraphicsContext3D::RGBA, GraphicsContext3D::UNSIGNED_BYTE, locker.pixels()));
+        }
     }