Upstream version 10.39.225.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 112d391..de02e5b 100644 (file)
--- a/src/cc/test/pixel_test.cc
+++ b/src/cc/test/pixel_test.cc
@@ -15,6 +15,7 @@
 #include "cc/output/gl_renderer.h"
 #include "cc/output/output_surface_client.h"
 #include "cc/output/software_renderer.h"
+#include "cc/resources/raster_worker_pool.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/texture_mailbox_deleter.h"
 #include "cc/test/fake_output_surface_client.h"
@@ -24,6 +25,8 @@
 #include "cc/test/pixel_test_utils.h"
 #include "cc/test/test_in_process_context_provider.h"
 #include "cc/test/test_shared_bitmap_manager.h"
+#include "cc/trees/blocking_task_runner.h"
+#include "gpu/command_buffer/client/gles2_interface.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
@@ -31,17 +34,17 @@ namespace cc {
 PixelTest::PixelTest()
     : device_viewport_size_(gfx::Size(200, 200)),
       disable_picture_quad_image_filtering_(false),
-      output_surface_client_(new FakeOutputSurfaceClient) {}
-
+      output_surface_client_(new FakeOutputSurfaceClient),
+      main_thread_task_runner_(
+          BlockingTaskRunner::Create(base::MessageLoopProxy::current())) {
+}
 PixelTest::~PixelTest() {}
 
 bool PixelTest::RunPixelTest(RenderPassList* pass_list,
-                             OffscreenContextOption provide_offscreen_context,
                              const base::FilePath& ref_file,
                              const PixelComparator& comparator) {
   return RunPixelTestWithReadbackTarget(pass_list,
                                         pass_list->back(),
-                                        provide_offscreen_context,
                                         ref_file,
                                         comparator);
 }
@@ -49,7 +52,6 @@ bool PixelTest::RunPixelTest(RenderPassList* pass_list,
 bool PixelTest::RunPixelTestWithReadbackTarget(
     RenderPassList* pass_list,
     RenderPass* target,
-    OffscreenContextOption provide_offscreen_context,
     const base::FilePath& ref_file,
     const PixelComparator& comparator) {
   base::RunLoop run_loop;
@@ -59,16 +61,6 @@ bool PixelTest::RunPixelTestWithReadbackTarget(
                  base::Unretained(this),
                  run_loop.QuitClosure())));
 
-  scoped_refptr<ContextProvider> offscreen_contexts;
-  switch (provide_offscreen_context) {
-    case NoOffscreenContext:
-      break;
-    case WithOffscreenContext:
-      offscreen_contexts = new TestInProcessContextProvider;
-      CHECK(offscreen_contexts->BindToCurrentThread());
-      break;
-  }
-
   float device_scale_factor = 1.f;
   gfx::Rect device_viewport_rect =
       gfx::Rect(device_viewport_size_) + external_device_viewport_offset_;
@@ -77,14 +69,14 @@ bool PixelTest::RunPixelTestWithReadbackTarget(
                                    : external_device_clip_rect_;
   renderer_->DecideRenderPassAllocationsForFrame(*pass_list);
   renderer_->DrawFrame(pass_list,
-                       offscreen_contexts.get(),
                        device_scale_factor,
                        device_viewport_rect,
                        device_clip_rect,
                        disable_picture_quad_image_filtering_);
 
   // Wait for the readback to complete.
-  resource_provider_->Finish();
+  if (output_surface_->context_provider())
+    output_surface_->context_provider()->ContextGL()->Finish();
   run_loop.Run();
 
   return PixelsMatchReference(ref_file, comparator);
@@ -123,8 +115,13 @@ void PixelTest::SetUpGLRenderer(bool use_skia_gpu_backend) {
   output_surface_->BindToClient(output_surface_client_.get());
 
   shared_bitmap_manager_.reset(new TestSharedBitmapManager());
-  resource_provider_ = ResourceProvider::Create(
-      output_surface_.get(), shared_bitmap_manager_.get(), 0, false, 1);
+  resource_provider_ = ResourceProvider::Create(output_surface_.get(),
+                                                shared_bitmap_manager_.get(),
+                                                main_thread_task_runner_.get(),
+                                                0,
+                                                false,
+                                                1,
+                                                false);
 
   texture_mailbox_deleter_ = make_scoped_ptr(
       new TextureMailboxDeleter(base::MessageLoopProxy::current()));
@@ -165,8 +162,13 @@ void PixelTest::SetUpSoftwareRenderer() {
   output_surface_.reset(new PixelTestOutputSurface(device.Pass()));
   output_surface_->BindToClient(output_surface_client_.get());
   shared_bitmap_manager_.reset(new TestSharedBitmapManager());
-  resource_provider_ = ResourceProvider::Create(
-      output_surface_.get(), shared_bitmap_manager_.get(), 0, false, 1);
+  resource_provider_ = ResourceProvider::Create(output_surface_.get(),
+                                                shared_bitmap_manager_.get(),
+                                                main_thread_task_runner_.get(),
+                                                0,
+                                                false,
+                                                1,
+                                                false);
   renderer_ =
       SoftwareRenderer::Create(
           this, &settings_, output_surface_.get(), resource_provider_.get())