Remove dependency on WebGraphicsContext3D from GLHelper unit tests.

content/common/gpu/client/gl_helper_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <cmath>
 #include <string>
@@ skipping 14 matching lines @@
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "content/common/gpu/client/gl_helper.h"
 #include "content/common/gpu/client/gl_helper_readback_support.h"
 #include "content/common/gpu/client/gl_helper_scaling.h"
-#include "gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h"
+#include "gpu/command_buffer/client/gl_in_process_context.h"
+#include "gpu/command_buffer/client/gles2_implementation.h"
 #include "media/base/video_frame.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkTypes.h"
 #include "ui/gl/gl_implementation.h"
 
 namespace content {
 
-using blink::WebGLId;
-using blink::WebGraphicsContext3D;
-using gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl;
-
 content::GLHelper::ScalerQuality kQualities[] = {
     content::GLHelper::SCALER_QUALITY_BEST,
     content::GLHelper::SCALER_QUALITY_GOOD,
     content::GLHelper::SCALER_QUALITY_FAST, };
 
 const char* kQualityNames[] = {"best", "good", "fast", };
 
 class GLHelperTest : public testing::Test {
  protected:
   void SetUp() override {
-    WebGraphicsContext3D::Attributes attributes;
-    bool lose_context_when_out_of_memory = false;

[Ken Russell (switch to Gerrit), 2016/03/16 01:34:38]

Is the default value for this at lower levels "false"?

[danakj, 2016/03/16 01:44:48]

Yeah.

https://code.google.com/p/chromium/codesearch#chromium/src/gpu/command_buffer...

-    context_ =
-        WebGraphicsContext3DInProcessCommandBufferImpl::CreateOffscreenContext(
-            attributes, lose_context_when_out_of_memory);
-    context_->InitializeOnCurrentThread();
-    context_support_ = context_->GetContextSupport();
-    helper_.reset(
-        new content::GLHelper(context_->GetGLInterface(), context_support_));
-    helper_scaling_.reset(new content::GLHelperScaling(
-        context_->GetGLInterface(), helper_.get()));
+    gpu::gles2::ContextCreationAttribHelper attributes;
+    attributes.alpha_size = 8;
+    attributes.depth_size = 24;
+    attributes.red_size = 8;
+    attributes.green_size = 8;
+    attributes.blue_size = 8;
+    attributes.stencil_size = 8;
+    attributes.samples = 4;
+    attributes.sample_buffers = 1;
+    attributes.bind_generates_resource = false;
+
+    context_.reset(gpu::GLInProcessContext::Create(
+        nullptr,                     /* service */
+        nullptr,                     /* surface */
+        true,                        /* offscreen */
+        gfx::kNullAcceleratedWidget, /* window */
+        gfx::Size(1, 1),             /* size */
+        nullptr,                     /* share_context */
+        true,                        /* use_global_share_group */
+        attributes, gfx::PreferDiscreteGpu,
+        ::gpu::GLInProcessContextSharedMemoryLimits(),
+        nullptr, /* gpu_memory_buffer_manager */
+        nullptr /* image_factory */));
+    gl_ = context_->GetImplementation();
+    gpu::ContextSupport* support = context_->GetImplementation();
+
+    helper_.reset(new content::GLHelper(gl_, support));
+    helper_scaling_.reset(new content::GLHelperScaling(gl_, helper_.get()));
   }
 
   void TearDown() override {
     helper_scaling_.reset(NULL);
     helper_.reset(NULL);
     context_.reset(NULL);
   }
 
   void StartTracing(const std::string& filter) {
     base::trace_event::TraceLog::GetInstance()->SetEnabled(
@@ skipping 614 matching lines @@
             SetChannel(bitmap.get(), x, y, 2, (x + y) / 5 * 50 + 5);
             SetChannel(bitmap.get(), x, y, 3, 255);
             break;
         }
       }
     }
     return bitmap;
   }
 
   // Binds texture and framebuffer and loads the bitmap pixels into the texture.
-  void BindTextureAndFrameBuffer(WebGLId texture,
-                                 WebGLId framebuffer,
+  void BindTextureAndFrameBuffer(GLuint texture,
+                                 GLuint framebuffer,
                                  SkBitmap* bitmap,
                                  int width,
                                  int height) {
-    context_->bindFramebuffer(GL_FRAMEBUFFER, framebuffer);
-    context_->bindTexture(GL_TEXTURE_2D, texture);
-    context_->texImage2D(GL_TEXTURE_2D,
-                         0,
-                         GL_RGBA,
-                         width,
-                         height,
-                         0,
-                         GL_RGBA,
-                         GL_UNSIGNED_BYTE,
-                         bitmap->getPixels());
+    gl_->BindFramebuffer(GL_FRAMEBUFFER, framebuffer);
+    gl_->BindTexture(GL_TEXTURE_2D, texture);
+    gl_->TexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA,
+                    GL_UNSIGNED_BYTE, bitmap->getPixels());
   }
 
   // Create a test image, transform it using
   // GLHelper::CropScaleReadbackAndCleanTexture and a reference implementation
   // and compare the results.
   void TestCropScaleReadbackAndCleanTexture(int xsize,
                                             int ysize,
                                             int scaled_xsize,
                                             int scaled_ysize,
                                             int test_pattern,
                                             SkColorType out_color_type,
                                             bool swizzle,
                                             size_t quality_index) {
     DCHECK(out_color_type == kAlpha_8_SkColorType ||
            out_color_type == kRGBA_8888_SkColorType ||
            out_color_type == kBGRA_8888_SkColorType);
-    WebGLId src_texture = context_->createTexture();
-    WebGLId framebuffer = context_->createFramebuffer();
+    GLuint src_texture;
+    gl_->GenTextures(1, &src_texture);
+    GLuint framebuffer;
+    gl_->GenFramebuffers(1, &framebuffer);
     scoped_ptr<SkBitmap> input_pixels =
         CreateTestBitmap(xsize, ysize, test_pattern);
     BindTextureAndFrameBuffer(
         src_texture, framebuffer, input_pixels.get(), xsize, ysize);
 
     std::string message = base::StringPrintf(
         "input size: %dx%d "
         "output size: %dx%d "
         "pattern: %d , quality: %s, "
         "out_color_type: %d",
@@ skipping 59 matching lines @@
     // Now compare the results.
     SkAutoLockPixels lock_input(truth_pixels);
     const std::vector<GLHelperScaling::ScalerStage> dummy_stages;
     Compare(&truth_pixels,
             &output_pixels,
             2,
             input_pixels.get(),
             dummy_stages,
             message + " comparing against transformed/scaled");
 
-    context_->deleteTexture(src_texture);
-    context_->deleteFramebuffer(framebuffer);
+    gl_->DeleteTextures(1, &src_texture);
+    gl_->DeleteFramebuffers(1, &framebuffer);
   }
 
   // Scaling test: Create a test image, scale it using GLHelperScaling
   // and a reference implementation and compare the results.
   void TestScale(int xsize,
                  int ysize,
                  int scaled_xsize,
                  int scaled_ysize,
                  int test_pattern,
                  size_t quality_index,
                  bool flip) {
-    WebGLId src_texture = context_->createTexture();
-    WebGLId framebuffer = context_->createFramebuffer();
+    GLuint src_texture;
+    gl_->GenTextures(1, &src_texture);
+    GLuint framebuffer;
+    gl_->GenFramebuffers(1, &framebuffer);
     scoped_ptr<SkBitmap> input_pixels =
         CreateTestBitmap(xsize, ysize, test_pattern);
     BindTextureAndFrameBuffer(
         src_texture, framebuffer, input_pixels.get(), xsize, ysize);
 
     std::string message = base::StringPrintf(
         "input size: %dx%d "
         "output size: %dx%d "
         "pattern: %d quality: %s",
         xsize,
         ysize,
         scaled_xsize,
         scaled_ysize,
         test_pattern,
         kQualityNames[quality_index]);
 
     std::vector<GLHelperScaling::ScalerStage> stages;
     helper_scaling_->ComputeScalerStages(kQualities[quality_index],
                                          gfx::Size(xsize, ysize),
                                          gfx::Rect(0, 0, xsize, ysize),
                                          gfx::Size(scaled_xsize, scaled_ysize),
                                          flip,
                                          false,
                                          &stages);
     ValidateScalerStages(kQualities[quality_index],
                          stages,
                          gfx::Size(scaled_xsize, scaled_ysize),
                          message);
 
-    WebGLId dst_texture =
-        helper_->CopyAndScaleTexture(src_texture,
-                                     gfx::Size(xsize, ysize),
-                                     gfx::Size(scaled_xsize, scaled_ysize),
-                                     flip,
-                                     kQualities[quality_index]);
+    GLuint dst_texture = helper_->CopyAndScaleTexture(
+        src_texture, gfx::Size(xsize, ysize),
+        gfx::Size(scaled_xsize, scaled_ysize), flip, kQualities[quality_index]);
 
     SkBitmap output_pixels;
     output_pixels.allocPixels(SkImageInfo::Make(scaled_xsize,
                                                 scaled_ysize,
                                                 kRGBA_8888_SkColorType,
                                                 kPremul_SkAlphaType));
 
     helper_->ReadbackTextureSync(
         dst_texture,
         gfx::Rect(0, 0, scaled_xsize, scaled_ysize),
@@ skipping 23 matching lines @@
                                                kPremul_SkAlphaType));
     ScaleSlowRecursive(
         input_pixels.get(), &truth_pixels, kQualities[quality_index]);
     Compare(&truth_pixels,
             &output_pixels,
             2,
             input_pixels.get(),
             stages,
             message + " comparing against scaled");
 
-    context_->deleteTexture(src_texture);
-    context_->deleteTexture(dst_texture);
-    context_->deleteFramebuffer(framebuffer);
+    gl_->DeleteTextures(1, &src_texture);
+    gl_->DeleteTextures(1, &dst_texture);
+    gl_->DeleteFramebuffers(1, &framebuffer);
   }
 
   // Create a scaling pipeline and check that it is made up of
   // valid scaling operations.
   void TestScalerPipeline(size_t quality,
                           int xsize,
                           int ysize,
                           int dst_xsize,
                           int dst_ysize) {
     std::vector<GLHelperScaling::ScalerStage> stages;
@@ skipping 253 matching lines @@
         }
       }
     }
     return true;
   }
 
   void BindAndAttachTextureWithPixels(GLuint src_texture,
                                       SkColorType color_type,
                                       const gfx::Size& src_size,
                                       const SkBitmap& input_pixels) {
-    context_->bindTexture(GL_TEXTURE_2D, src_texture);
+    gl_->BindTexture(GL_TEXTURE_2D, src_texture);
     GLenum format = 0;
     switch (color_type) {
       case kBGRA_8888_SkColorType:
         format = GL_BGRA_EXT;
         break;
       case kRGBA_8888_SkColorType:
         format = GL_RGBA;
         break;
       case kRGB_565_SkColorType:
         format = GL_RGB;
         break;
       default:
         NOTREACHED();
     }
     GLenum type = (color_type == kRGB_565_SkColorType) ?
                   GL_UNSIGNED_SHORT_5_6_5 : GL_UNSIGNED_BYTE;
-    context_->texImage2D(GL_TEXTURE_2D,
-                         0,
-                         format,
-                         src_size.width(),
-                         src_size.height(),
-                         0,
-                         format,
-                         type,
-                         input_pixels.getPixels());
+    gl_->TexImage2D(GL_TEXTURE_2D, 0, format, src_size.width(),
+                    src_size.height(), 0, format, type,
+                    input_pixels.getPixels());
   }
 
   void ReadBackTexture(GLuint src_texture,
                        const gfx::Size& src_size,
                        unsigned char* pixels,
                        SkColorType color_type,
                        bool async) {
     if (async) {
       base::RunLoop run_loop;
       helper_->ReadbackTextureAsync(src_texture,
@@ skipping 16 matching lines @@
                          bool async) {
     SkImageInfo info =
         SkImageInfo::Make(src_size.width(),
                           src_size.height(),
                           color_type,
                           kPremul_SkAlphaType);
     if (!helper_->IsReadbackConfigSupported(color_type)) {
       LOG(INFO) << "Skipping test format not supported" << color_type;
       return true;
     }
-    WebGLId src_texture = context_->createTexture();
+    GLuint src_texture;
+    gl_->GenTextures(1, &src_texture);
     SkBitmap input_pixels;
     input_pixels.allocPixels(info);
     // Test Pattern-1, Fill with Plain color pattern.
     // Erase the input bitmap with red color.
     input_pixels.eraseColor(SK_ColorRED);
     BindAndAttachTextureWithPixels(src_texture,
                                    color_type,
                                    src_size,
                                    input_pixels);
     SkBitmap output_pixels;
@@ skipping 33 matching lines @@
     BindAndAttachTextureWithPixels(src_texture,
                                    color_type,
                                    src_size,
                                    input_pixels);
     ReadBackTexture(src_texture, src_size, pixels, color_type, async);
     result = IsEqual(input_pixels, output_pixels);
     if (!result) {
       LOG(ERROR) << "Bitmap comparision failure Pattern-3";
       return false;
     }
-    context_->deleteTexture(src_texture);
+    gl_->DeleteTextures(1, &src_texture);
     if (HasFailure()) {
       return false;
     }
     return true;
   }
 
   // YUV readback test. Create a test pattern, convert to YUV
   // with reference implementation and compare to what gl_helper
   // returns.
   void TestYUVReadback(int xsize,
                        int ysize,
                        int output_xsize,
                        int output_ysize,
                        int xmargin,
                        int ymargin,
                        int test_pattern,
                        bool flip,
                        bool use_mrt,
                        content::GLHelper::ScalerQuality quality) {
-    WebGLId src_texture = context_->createTexture();
+    GLuint src_texture;
+    gl_->GenTextures(1, &src_texture);
     SkBitmap input_pixels;
     input_pixels.allocN32Pixels(xsize, ysize);
 
     for (int x = 0; x < xsize; ++x) {
       for (int y = 0; y < ysize; ++y) {
         switch (test_pattern) {
           case 0:  // Smooth test pattern
             SetChannel(&input_pixels, x, y, 0, x * 10);
             SetChannel(&input_pixels, x, y, 1, y * 10);
             SetChannel(&input_pixels, x, y, 2, (x + y) * 10);
             SetChannel(&input_pixels, x, y, 3, 255);
             break;
           case 1:  // Small blocks
             SetChannel(&input_pixels, x, y, 0, x & 1 ? 255 : 0);
             SetChannel(&input_pixels, x, y, 1, y & 1 ? 255 : 0);
             SetChannel(&input_pixels, x, y, 2, (x + y) & 1 ? 255 : 0);
             SetChannel(&input_pixels, x, y, 3, 255);
             break;
           case 2:  // Medium blocks
             SetChannel(&input_pixels, x, y, 0, 10 + x / 2 * 50);
             SetChannel(&input_pixels, x, y, 1, 10 + y / 3 * 50);
             SetChannel(&input_pixels, x, y, 2, (x + y) / 5 * 50 + 5);
             SetChannel(&input_pixels, x, y, 3, 255);
             break;
         }
       }
     }
 
-    context_->bindTexture(GL_TEXTURE_2D, src_texture);
-    context_->texImage2D(GL_TEXTURE_2D,
-                         0,
-                         GL_RGBA,
-                         xsize,
-                         ysize,
-                         0,
-                         GL_RGBA,
-                         GL_UNSIGNED_BYTE,
-                         input_pixels.getPixels());
+    gl_->BindTexture(GL_TEXTURE_2D, src_texture);
+    gl_->TexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, xsize, ysize, 0, GL_RGBA,
+                    GL_UNSIGNED_BYTE, input_pixels.getPixels());
 
     gpu::Mailbox mailbox;
-    context_->genMailboxCHROMIUM(mailbox.name);
+    gl_->GenMailboxCHROMIUM(mailbox.name);
     EXPECT_FALSE(mailbox.IsZero());
-    context_->produceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);
-    const blink::WGC3Duint64 fence_sync = context_->insertFenceSyncCHROMIUM();
-    context_->GetGLInterface()->ShallowFlushCHROMIUM();
+    gl_->ProduceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);
+    const GLuint64 fence_sync = gl_->InsertFenceSyncCHROMIUM();
+    gl_->ShallowFlushCHROMIUM();
 
     gpu::SyncToken sync_token;
-    ASSERT_TRUE(context_->genSyncTokenCHROMIUM(fence_sync,
-                                               sync_token.GetData()));
+    gl_->GenSyncTokenCHROMIUM(fence_sync, sync_token.GetData());
 
     std::string message = base::StringPrintf(
         "input size: %dx%d "
         "output size: %dx%d "
         "margin: %dx%d "
         "pattern: %d %s %s",
         xsize,
         ysize,
         output_xsize,
         output_ysize,
@@ skipping 105 matching lines @@
     ComparePlane(V,
                  v_stride,
                  output_frame->visible_data(media::VideoFrame::kVPlane),
                  output_frame->stride(media::VideoFrame::kVPlane),
                  2,
                  output_xsize / 2,
                  output_ysize / 2,
                  &input_pixels,
                  message + " V plane");
 
-    context_->deleteTexture(src_texture);
+    gl_->DeleteTextures(1, &src_texture);
   }
 
   void TestAddOps(int src, int dst, bool scale_x, bool allow3) {
     std::deque<GLHelperScaling::ScaleOp> ops;
     GLHelperScaling::ScaleOp::AddOps(src, dst, scale_x, allow3, &ops);
     // Scale factor 3 is a special case.
     // It is currently only allowed by itself.
     if (allow3 && dst * 3 >= src && dst * 2 < src) {
       EXPECT_EQ(ops[0].scale_factor, 3);
       EXPECT_EQ(ops.size(), 1U);
@@ skipping 181 matching lines @@
                    100,
                    1,
                    1,
                    "100x100 -> 100x32 bilinear4 Y\n"
                    "100x32 -> 100x4 bilinear4 Y\n"
                    "100x4 -> 64x1 bilinear2x2\n"
                    "64x1 -> 8x1 bilinear4 X\n"
                    "8x1 -> 1x1 bilinear4 X\n");
   }
 
-  scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context_;
-  gpu::ContextSupport* context_support_;
+  scoped_ptr<gpu::GLInProcessContext> context_;
+  gpu::gles2::GLES2Interface* gl_;
   scoped_ptr<content::GLHelper> helper_;
   scoped_ptr<content::GLHelperScaling> helper_scaling_;
   std::deque<GLHelperScaling::ScaleOp> x_ops_, y_ops_;
 };
 
 class GLHelperPixelTest : public GLHelperTest {
  private:
   gfx::DisableNullDrawGLBindings enable_pixel_output_;
 };
 
@@ skipping 277 matching lines @@
     }
   }
 }
 
 TEST_F(GLHelperTest, CheckOptimizations) {
   // Test in baseclass since it is friends with GLHelperScaling
   CheckOptimizationsTest();
 }
 
 }  // namespace content