Move simple methods [A-E] from WebGraphicsContext3D to GLES2Interface.

third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp

 /*
  * Copyright (C) 2012 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
@@ skipping 199 matching lines @@
 bool Canvas2DLayerBridge::prepareIOSurfaceMailboxFromImage(SkImage* image, WebExternalTextureMailbox* outMailbox)
 {
     // Need to flush skia's internal queue because texture is about to be accessed directly
     GrContext* grContext = m_contextProvider->grContext();
     grContext->flush();
 
     ImageInfo imageInfo = createIOSurfaceBackedTexture();
     if (imageInfo.empty())
         return false;
 
+    gpu::gles2::GLES2Interface* gl = contextGL();
     GLuint imageTexture = skia::GrBackendObjectToGrGLTextureInfo(image->getTextureHandle(true))->fID;
     context()->copySubTextureCHROMIUM(imageTexture, imageInfo.m_textureId, 0, 0, 0, 0, m_size.width(), m_size.height(), GL_FALSE, GL_FALSE, GL_FALSE);
 
     MailboxInfo& info = m_mailboxes.first();
     info.m_mailbox.textureTarget = GC3D_TEXTURE_RECTANGLE_ARB;
     context()->genMailboxCHROMIUM(info.m_mailbox.name);
     context()->produceTextureDirectCHROMIUM(imageInfo.m_textureId, info.m_mailbox.textureTarget, info.m_mailbox.name);
     info.m_mailbox.allowOverlay = true;
 
-    const WGC3Duint64 fenceSync = context()->insertFenceSyncCHROMIUM();
+    const WGC3Duint64 fenceSync = gl->InsertFenceSyncCHROMIUM();
     context()->flush();
     info.m_mailbox.validSyncToken = context()->genSyncTokenCHROMIUM(fenceSync, info.m_mailbox.syncToken);
 
     info.m_imageInfo = imageInfo;
     *outMailbox = info.m_mailbox;
 
-    context()->bindTexture(GC3D_TEXTURE_RECTANGLE_ARB, 0);
+    gl->BindTexture(GC3D_TEXTURE_RECTANGLE_ARB, 0);
 
     // Because we are changing the texture binding without going through skia,
     // we must dirty the context.
     grContext->resetContext(kTextureBinding_GrGLBackendState);
 
     return true;
 }
 
 Canvas2DLayerBridge::ImageInfo Canvas2DLayerBridge::createIOSurfaceBackedTexture()
 {
     if (!m_imageInfoCache.isEmpty()) {
         Canvas2DLayerBridge::ImageInfo info = m_imageInfoCache.last();
         m_imageInfoCache.removeLast();
         return info;
     }
 
     WebGraphicsContext3D* webContext = context();
+    gpu::gles2::GLES2Interface* gl = contextGL();
     GLuint imageId = webContext->createGpuMemoryBufferImageCHROMIUM(m_size.width(), m_size.height(), GL_BGRA_EXT, GC3D_SCANOUT_CHROMIUM);
     if (!imageId)
         return Canvas2DLayerBridge::ImageInfo();
 
     GLuint textureId= webContext->createTexture();
     if (!textureId) {
         webContext->destroyImageCHROMIUM(imageId);
         return Canvas2DLayerBridge::ImageInfo();
     }
 
     GLenum target = GC3D_TEXTURE_RECTANGLE_ARB;
-    webContext->bindTexture(target, textureId);
+    gl->BindTexture(target, textureId);
     webContext->texParameteri(target, GL_TEXTURE_MAG_FILTER, getGLFilter());
     webContext->texParameteri(target, GL_TEXTURE_MIN_FILTER, getGLFilter());
     webContext->texParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
     webContext->texParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
     webContext->bindTexImage2DCHROMIUM(target, imageId);
 
     return Canvas2DLayerBridge::ImageInfo(imageId, textureId);
 }
 
 void Canvas2DLayerBridge::deleteCHROMIUMImage(ImageInfo info)
 {
-    if (m_contextProvider->contextGL()->GetGraphicsResetStatusKHR() != GL_NO_ERROR)
+    WebGraphicsContext3D* webContext = context();
+    gpu::gles2::GLES2Interface* gl = contextGL();
+    if (gl->GetGraphicsResetStatusKHR() != GL_NO_ERROR)
         return;
 
     GLenum target = GC3D_TEXTURE_RECTANGLE_ARB;
-    WebGraphicsContext3D* webContext = context();
-    webContext->bindTexture(target, info.m_textureId);
+    gl->BindTexture(target, info.m_textureId);
     webContext->releaseTexImage2DCHROMIUM(target, info.m_imageId);
     webContext->destroyImageCHROMIUM(info.m_imageId);
     webContext->deleteTexture(info.m_textureId);
-    webContext->bindTexture(target, 0);
+    gl->BindTexture(target, 0);
 
     resetSkiaTextureBinding();
 }
 
 void Canvas2DLayerBridge::clearCHROMIUMImageCache()
 {
     for (const auto& it : m_imageInfoCache) {
         deleteCHROMIUMImage(it);
     }
     m_imageInfoCache.clear();
@@ skipping 37 matching lines @@
     // Need to flush skia's internal queue because texture is about to be accessed directly
     grContext->flush();
 
     // Because of texture sharing with the compositor, we must invalidate
     // the state cached in skia so that the deferred copy on write
     // in SkSurface_Gpu does not make any false assumptions.
     mailboxInfo.m_image->getTexture()->textureParamsModified();
     mailboxInfo.m_mailbox.textureTarget = GL_TEXTURE_2D;
 
     WebGraphicsContext3D* webContext = context();
+    gpu::gles2::GLES2Interface* gl = contextGL();
     GLuint textureID = skia::GrBackendObjectToGrGLTextureInfo(mailboxInfo.m_image->getTextureHandle(true))->fID;
-    webContext->bindTexture(GL_TEXTURE_2D, textureID);
+    gl->BindTexture(GL_TEXTURE_2D, textureID);
     webContext->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, getGLFilter());
     webContext->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, getGLFilter());
     webContext->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
     webContext->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
     // Re-use the texture's existing mailbox, if there is one.
     if (mailboxInfo.m_image->getTexture()->getCustomData()) {
         ASSERT(mailboxInfo.m_image->getTexture()->getCustomData()->size() == sizeof(mailboxInfo.m_mailbox.name));
         memcpy(&mailboxInfo.m_mailbox.name[0], mailboxInfo.m_image->getTexture()->getCustomData()->data(), sizeof(mailboxInfo.m_mailbox.name));
     } else {
         context()->genMailboxCHROMIUM(mailboxInfo.m_mailbox.name);
         RefPtr<SkData> mailboxNameData = adoptRef(SkData::NewWithCopy(&mailboxInfo.m_mailbox.name[0], sizeof(mailboxInfo.m_mailbox.name)));
         mailboxInfo.m_image->getTexture()->setCustomData(mailboxNameData.get());
         webContext->produceTextureCHROMIUM(GL_TEXTURE_2D, mailboxInfo.m_mailbox.name);
     }
 
     if (isHidden()) {
         // With hidden canvases, we release the SkImage immediately because
         // there is no need for animations to be double buffered.
         mailboxInfo.m_image.clear();
     } else {
         // FIXME: We'd rather insert a syncpoint than perform a flush here,
         // but currently the canvas will flicker if we don't flush here.
-        const WGC3Duint64 fenceSync = webContext->insertFenceSyncCHROMIUM();
+        const GLuint64 fenceSync = gl->InsertFenceSyncCHROMIUM();
         webContext->flush();
         mailboxInfo.m_mailbox.validSyncToken = webContext->genSyncTokenCHROMIUM(fenceSync, mailboxInfo.m_mailbox.syncToken);
     }
-    webContext->bindTexture(GL_TEXTURE_2D, 0);
+    gl->BindTexture(GL_TEXTURE_2D, 0);
     // Because we are changing the texture binding without going through skia,
     // we must dirty the context.
     grContext->resetContext(kTextureBinding_GrGLBackendState);
 
     *outMailbox = mailboxInfo.m_mailbox;
     return true;
 }
 
 void Canvas2DLayerBridge::resetSkiaTextureBinding()
 {
@@ skipping 327 matching lines @@
 
 WebGraphicsContext3D* Canvas2DLayerBridge::context()
 {
     // Check on m_layer is necessary because context() may be called during
     // the destruction of m_layer
     if (m_layer && !m_destructionInProgress)
         checkSurfaceValid(); // To ensure rate limiter is disabled if context is lost.
     return m_contextProvider ? m_contextProvider->context3d() : 0;
 }
 
+gpu::gles2::GLES2Interface* Canvas2DLayerBridge::contextGL()
+{
+    // Check on m_layer is necessary because contextGL() may be called during
+    // the destruction of m_layer
+    if (m_layer && !m_destructionInProgress) {
+        // Ensure rate limiter is disabled if context is lost.
+        checkSurfaceValid();
+    }
+    return m_contextProvider ? m_contextProvider->contextGL() : nullptr;
+}
+
 bool Canvas2DLayerBridge::checkSurfaceValid()
 {
     ASSERT(!m_destructionInProgress);
     if (m_destructionInProgress)
         return false;
     if (isHibernating())
         return true;
     if (!m_layer)
         return true;
     if (!m_surface)
@@ skipping 106 matching lines @@
         ASSERT(releasedMailboxInfo != firstMailbox);
     }
 
     if (!contextLost) {
         // Invalidate texture state in case the compositor altered it since the copy-on-write.
         if (releasedMailboxInfo->m_image) {
 #if USE_IOSURFACE_FOR_2D_CANVAS
             ASSERT(releasedMailboxInfo->m_imageInfo.empty());
 #endif // USE_IOSURFACE_FOR_2D_CANVAS
             if (mailbox.validSyncToken) {
-                context()->waitSyncTokenCHROMIUM(mailbox.syncToken);
+                contextGL()->WaitSyncTokenCHROMIUM(mailbox.syncToken);
             }
             GrTexture* texture = releasedMailboxInfo->m_image->getTexture();
             if (texture) {
                 if (lostResource) {
                     texture->abandon();
                 } else {
                     texture->textureParamsModified();
                 }
             }
         }
@@ skipping 133 matching lines @@
 #endif // USE_IOSURFACE_FOR_2D_CANVAS
 }
 
 void Canvas2DLayerBridge::Logger::reportHibernationEvent(HibernationEvent event)
 {
     DEFINE_STATIC_LOCAL(EnumerationHistogram, hibernationHistogram, ("Canvas.HibernationEvents", HibernationEventCount));
     hibernationHistogram.count(event);
 }
 
 } // namespace blink