Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / cc / test / pixel_test.cc

diff --git a/src/cc/test/pixel_test.cc b/src/cc/test/pixel_test.cc
index 1257be6..0a31bb0 100644 (file)
--- a/src/cc/test/pixel_test.cc
+++ b/src/cc/test/pixel_test.cc
@@ -23,7 +23,6 @@
 #include "cc/test/pixel_test_utils.h"
 #include "cc/test/test_in_process_context_provider.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/gl/gl_implementation.h"
 
 namespace cc {
 
@@ -118,8 +117,6 @@ bool PixelTest::PixelsMatchReference(const base::FilePath& ref_file,
 }
 
 void PixelTest::SetUpGLRenderer(bool use_skia_gpu_backend) {
-  CHECK(gfx::InitializeStaticGLBindings(gfx::kGLImplementationOSMesaGL));
-
   output_surface_.reset(
       new PixelTestOutputSurface(new TestInProcessContextProvider));
   output_surface_->BindToClient(output_surface_client_.get());
@@ -137,7 +134,7 @@ void PixelTest::SetUpGLRenderer(bool use_skia_gpu_backend) {
                                  0).PassAs<DirectRenderer>();
 }
 
-void PixelTest::ForceExpandedViewport(gfx::Size surface_expansion) {
+void PixelTest::ForceExpandedViewport(const gfx::Size& surface_expansion) {
   static_cast<PixelTestOutputSurface*>(output_surface_.get())
       ->set_surface_expansion_size(surface_expansion);
   SoftwareOutputDevice* device = output_surface_->software_device();
@@ -147,7 +144,7 @@ void PixelTest::ForceExpandedViewport(gfx::Size surface_expansion) {
   }
 }
 
-void PixelTest::ForceViewportOffset(gfx::Vector2d viewport_offset) {
+void PixelTest::ForceViewportOffset(const gfx::Vector2d& viewport_offset) {
   external_device_viewport_offset_ = viewport_offset;
 }