Removing getBackingTextureImage from ImageBufferSurface

Source/platform/graphics/ImageBuffer.cpp

 /*
  * Copyright (c) 2008, Google Inc. All rights reserved.
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
@@ skipping 160 matching lines @@
 }
 
 bool ImageBuffer::copyToPlatformTexture(WebGraphicsContext3D* context, Platform3DObject texture, GLenum internalFormat, GLenum destType, GLint level, bool premultiplyAlpha, bool flipY)
 {
     if (!m_surface->isAccelerated() || !isSurfaceValid())
         return false;
 
     if (!Extensions3DUtil::canUseCopyTextureCHROMIUM(GL_TEXTURE_2D, internalFormat, destType, level))
         return false;
 
-    RefPtr<const SkImage> textureImage = m_surface->getBackingTextureImage();
+    RefPtr<const SkImage> textureImage = m_surface->newImageSnapshot();
     if (!textureImage)
         return false;
 
-    ASSERT(textureImage->isTextureBacked());
+    ASSERT(textureImage->isTextureBacked()); // isAccelerated() check above should guarantee this
     // Get the texture ID, flushing pending operations if needed.
     Platform3DObject textureId = textureImage->getTextureHandle(true);
     if (!textureId)
         return false;
 
     OwnPtr<WebGraphicsContext3DProvider> provider = adoptPtr(Platform::current()->createSharedOffscreenGraphicsContext3DProvider());
     if (!provider)
         return false;
     WebGraphicsContext3D* sharedContext = provider->context3d();
     if (!sharedContext)
@@ skipping 27 matching lines @@
     sharedContext->waitSyncPoint(context->insertSyncPoint());
 
     // Undo grContext texture binding changes introduced in this function
     provider->grContext()->resetContext(kTextureBinding_GrGLBackendState);
 
     return true;
 }
 
 bool ImageBuffer::copyRenderingResultsFromDrawingBuffer(DrawingBuffer* drawingBuffer, SourceDrawingBuffer sourceBuffer)
 {
-    if (!drawingBuffer)
+    if (!drawingBuffer || !m_surface->isAccelerated())
         return false;
     OwnPtr<WebGraphicsContext3DProvider> provider = adoptPtr(Platform::current()->createSharedOffscreenGraphicsContext3DProvider());
     if (!provider)
         return false;
     WebGraphicsContext3D* context3D = provider->context3d();
-    RefPtr<SkImage> textureImage = m_surface->getBackingTextureImage();
+    RefPtr<SkImage> textureImage = m_surface->newImageSnapshot();
     if (!context3D || !textureImage)
         return false;
     ASSERT(textureImage->isTextureBacked());
     // Get the texture ID, flushing pending operations if needed.
     Platform3DObject textureId = textureImage->getTextureHandle(true);
     if (!textureId)
         return false;
 
+    context3D->flush();
+
     m_surface->invalidateCachedBitmap();
     bool result = drawingBuffer->copyToPlatformTexture(context3D, textureId, GL_RGBA,
         GL_UNSIGNED_BYTE, 0, true, false, sourceBuffer);
 
     if (result) {
         m_surface->didModifyBackingTexture();
     }
 
     return result;
 }
@@ skipping 123 matching lines @@
     ASSERT(MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType));
 
     Vector<char> encodedImage;
     if (!encodeImage(*this, mimeType, quality, &encodedImage))
         return "data:,";
 
     return "data:" + mimeType + ";base64," + base64Encode(encodedImage);
 }
 
 } // namespace blink