Use a cc::Display for WebView resourceless software draws.

cc/test/pixel_test.cc

 // Copyright 2013 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 "cc/test/pixel_test.h"
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 62 matching lines @@
   if (copy_rect)
     request->set_area(*copy_rect);
   target->copy_requests.push_back(std::move(request));
 
   float device_scale_factor = 1.f;
   gfx::Rect device_viewport_rect =
       gfx::Rect(device_viewport_size_) + external_device_viewport_offset_;
   gfx::Rect device_clip_rect = external_device_clip_rect_.IsEmpty()
                                    ? device_viewport_rect
                                    : external_device_clip_rect_;
+
+  if (software_renderer_) {
+    software_renderer_->SetDisablePictureQuadImageFiltering(
+        disable_picture_quad_image_filtering_);
+  }
+
   renderer_->DecideRenderPassAllocationsForFrame(*pass_list);
   renderer_->DrawFrame(pass_list, device_scale_factor, gfx::ColorSpace(),
-                       device_viewport_rect, device_clip_rect,
-                       disable_picture_quad_image_filtering_);
+                       device_viewport_rect, device_clip_rect);
 
   // Wait for the readback to complete.
   if (output_surface_->context_provider())
     output_surface_->context_provider()->ContextGL()->Finish();
   run_loop.Run();
 
   return PixelsMatchReference(ref_file, comparator);
 }
 
 void PixelTest::ReadbackResult(base::Closure quit_run_loop,
@@ skipping 78 matching lines @@
       new PixelTestSoftwareOutputDevice());
   output_surface_.reset(new PixelTestOutputSurface(std::move(device)));
   output_surface_->BindToClient(output_surface_client_.get());
   shared_bitmap_manager_.reset(new TestSharedBitmapManager());
   bool delegated_sync_points_required = false;  // Meaningless for software.
   resource_provider_ = base::MakeUnique<ResourceProvider>(
       nullptr, shared_bitmap_manager_.get(), gpu_memory_buffer_manager_.get(),
       main_thread_task_runner_.get(), 0, 1, delegated_sync_points_required,
       settings_.renderer_settings.use_gpu_memory_buffer_resources,
       settings_.use_image_texture_targets);
-  renderer_ = SoftwareRenderer::Create(
-      this, &settings_.renderer_settings, output_surface_.get(),
-      resource_provider_.get(), true /* use_image_hijack_canvas */);
+  std::unique_ptr<SoftwareRenderer> renderer =
+      SoftwareRenderer::Create(this, &settings_.renderer_settings,
+                               output_surface_.get(), resource_provider_.get());
+  software_renderer_ = renderer.get();
+  renderer_ = std::move(renderer);
 }
 
 }  // namespace cc