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

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

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 92 matching lines @@
     {
         PlatformCanvas::Painter painter(&canvas, PlatformCanvas::Painter::GrayscaleText);
         drawHudContents(painter.context(), hudSize);
     }
 
     // Upload to GL.
     {
         PlatformCanvas::AutoLocker locker(&canvas);
 
         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()));
+        }
     }
 
     // Draw the HUD onto the default render surface.
     const Program* program = m_layerRenderer->headsUpDisplayProgram();
     ASSERT(program && program->initialized());
     GLC(context, context->activeTexture(GraphicsContext3D::TEXTURE0));
     m_hudTexture->bindTexture();
     GLC(context, context->useProgram(program->program()));
     GLC(context, context->uniform1i(program->fragmentShader().samplerLocation(), 0));
 
@@ skipping 102 matching lines @@
 }
 
 void CCHeadsUpDisplay::onPresent()
 {
     m_currentFrameNumber += 1;
 }
 
 }
 
 #endif // USE(ACCELERATED_COMPOSITING)