Use SkImage snapshots for ImageBufferSurface texture access

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 154 matching lines @@
     return DontCopyBackingStore;
 }
 
 WebLayer* ImageBuffer::platformLayer() const
 {
     return m_surface->layer();
 }
 
 bool ImageBuffer::copyToPlatformTexture(WebGraphicsContext3D* context, Platform3DObject texture, GLenum internalFormat, GLenum destType, GLint level, bool premultiplyAlpha, bool flipY)
 {
-    if (!m_surface->isAccelerated() || !getBackingTexture() || !isSurfaceValid())
+    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();
+    if (!textureImage)
+        return false;
+
+    ASSERT(textureImage->isTextureBacked());
+    // 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)
         return false;
 
     OwnPtr<WebExternalTextureMailbox> mailbox = adoptPtr(new WebExternalTextureMailbox);
 
     // Contexts may be in a different share group. We must transfer the texture through a mailbox first
     sharedContext->genMailboxCHROMIUM(mailbox->name);
-    sharedContext->produceTextureDirectCHROMIUM(getBackingTexture(), GL_TEXTURE_2D, mailbox->name);
+    sharedContext->produceTextureDirectCHROMIUM(textureId, GL_TEXTURE_2D, mailbox->name);
     sharedContext->flush();
 
     mailbox->syncPoint = sharedContext->insertSyncPoint();
 
     context->waitSyncPoint(mailbox->syncPoint);
     Platform3DObject sourceTexture = context->createAndConsumeTextureCHROMIUM(GL_TEXTURE_2D, mailbox->name);
 
     // The canvas is stored in a premultiplied format, so unpremultiply if necessary.
     context->pixelStorei(GC3D_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM, !premultiplyAlpha);
 
     // The canvas is stored in an inverted position, so the flip semantics are reversed.
     context->pixelStorei(GC3D_UNPACK_FLIP_Y_CHROMIUM, !flipY);
     context->copyTextureCHROMIUM(GL_TEXTURE_2D, sourceTexture, texture, internalFormat, destType);
 
     context->pixelStorei(GC3D_UNPACK_FLIP_Y_CHROMIUM, false);
     context->pixelStorei(GC3D_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM, false);
 
     context->deleteTexture(sourceTexture);
 
     context->flush();
     sharedContext->waitSyncPoint(context->insertSyncPoint());
 
     // Undo grContext texture binding changes introduced in this function
     provider->grContext()->resetContext(kTextureBinding_GrGLBackendState);
 
     return true;
 }
 
-Platform3DObject ImageBuffer::getBackingTexture()
-{
-    return m_surface->getBackingTexture();
-}
-
-void ImageBuffer::didModifyBackingTexture()
-{
-    m_surface->didModifyBackingTexture();
-}
-
 bool ImageBuffer::copyRenderingResultsFromDrawingBuffer(DrawingBuffer* drawingBuffer, SourceDrawingBuffer sourceBuffer)
 {
     if (!drawingBuffer)
         return false;
     OwnPtr<WebGraphicsContext3DProvider> provider = adoptPtr(Platform::current()->createSharedOffscreenGraphicsContext3DProvider());
     if (!provider)
         return false;
     WebGraphicsContext3D* context3D = provider->context3d();
-    Platform3DObject tex = m_surface->getBackingTexture();
-    if (!context3D || !tex)
+    RefPtr<SkImage> textureImage = m_surface->getBackingTextureImage();
+    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;
 
     m_surface->invalidateCachedBitmap();
-    bool result = drawingBuffer->copyToPlatformTexture(context3D, tex, GL_RGBA,
+    bool result = drawingBuffer->copyToPlatformTexture(context3D, textureId, GL_RGBA,
         GL_UNSIGNED_BYTE, 0, true, false, sourceBuffer);
 
     if (result) {
         m_surface->didModifyBackingTexture();
     }
 
     return result;
 }
 
 void ImageBuffer::draw(GraphicsContext* context, const FloatRect& destRect, const FloatRect* srcPtr, SkXfermode::Mode op)
@@ skipping 121 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