Move simple methods [T-Z] 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 235 matching lines @@
 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);
+    GLuint imageId = gl->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);
+        gl->DestroyImageCHROMIUM(imageId);
         return Canvas2DLayerBridge::ImageInfo();
     }
 
     GLenum target = GC3D_TEXTURE_RECTANGLE_ARB;
     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);
+    gl->TexParameteri(target, GL_TEXTURE_MAG_FILTER, getGLFilter());
+    gl->TexParameteri(target, GL_TEXTURE_MIN_FILTER, getGLFilter());
+    gl->TexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    gl->TexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    gl->BindTexImage2DCHROMIUM(target, imageId);
 
     return Canvas2DLayerBridge::ImageInfo(imageId, textureId);
 }
 
 void Canvas2DLayerBridge::deleteCHROMIUMImage(ImageInfo info)
 {
     WebGraphicsContext3D* webContext = context();
     gpu::gles2::GLES2Interface* gl = contextGL();
     if (gl->GetGraphicsResetStatusKHR() != GL_NO_ERROR)
         return;
 
     GLenum target = GC3D_TEXTURE_RECTANGLE_ARB;
     gl->BindTexture(target, info.m_textureId);
-    webContext->releaseTexImage2DCHROMIUM(target, info.m_imageId);
-    webContext->destroyImageCHROMIUM(info.m_imageId);
+    gl->ReleaseTexImage2DCHROMIUM(target, info.m_imageId);
+    gl->DestroyImageCHROMIUM(info.m_imageId);
     webContext->deleteTexture(info.m_textureId);
     gl->BindTexture(target, 0);
 
     resetSkiaTextureBinding();
 }
 
 void Canvas2DLayerBridge::clearCHROMIUMImageCache()
 {
     for (const auto& it : m_imageInfoCache) {
         deleteCHROMIUMImage(it);
@@ skipping 42 matching lines @@
     // 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;
     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);
+    gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, getGLFilter());
+    gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, getGLFilter());
+    gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    gl->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 {
         gl->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());
         gl->ProduceTextureCHROMIUM(GL_TEXTURE_2D, mailboxInfo.m_mailbox.name);
@@ skipping 642 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