cc: Remove most methods from RendererClient.

cc/output/delegating_renderer.cc

 // Copyright 2012 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/output/delegating_renderer.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 13 matching lines @@
 #include "cc/resources/resource_provider.h"
 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 
 using WebKit::WebGraphicsContext3D;
 
 namespace cc {
 
 scoped_ptr<DelegatingRenderer> DelegatingRenderer::Create(
     RendererClient* client,
+    const LayerTreeSettings* settings,
     OutputSurface* output_surface,
     ResourceProvider* resource_provider) {
-  scoped_ptr<DelegatingRenderer> renderer(
-      new DelegatingRenderer(client, output_surface, resource_provider));
+  scoped_ptr<DelegatingRenderer> renderer(new DelegatingRenderer(
+      client, settings, output_surface, resource_provider));
   if (!renderer->Initialize())
     return scoped_ptr<DelegatingRenderer>();
   return renderer.Pass();
 }
 
-DelegatingRenderer::DelegatingRenderer(
-    RendererClient* client,
-    OutputSurface* output_surface,
-    ResourceProvider* resource_provider)
-    : Renderer(client),
+DelegatingRenderer::DelegatingRenderer(RendererClient* client,
+                                       const LayerTreeSettings* settings,
+                                       OutputSurface* output_surface,
+                                       ResourceProvider* resource_provider)
+    : Renderer(client, settings),
       output_surface_(output_surface),
       resource_provider_(resource_provider),
       visible_(true) {
   DCHECK(resource_provider_);
 }
 
 bool DelegatingRenderer::Initialize() {
   capabilities_.using_partial_swap = false;
   capabilities_.max_texture_size = resource_provider_->max_texture_size();
   capabilities_.best_texture_format = resource_provider_->best_texture_format();
   capabilities_.allow_partial_texture_updates = false;
   capabilities_.using_offscreen_context3d = false;
 
   if (!output_surface_->context_provider()) {
     // TODO(danakj): Make software compositing work.
     return true;
   }
 
   WebGraphicsContext3D* context3d =
       output_surface_->context_provider()->Context3d();
 
   if (!context3d->makeContextCurrent())
     return false;
 
   std::string unique_context_name = base::StringPrintf(
-      "%s-%p",
-      Settings().compositor_name.c_str(),
-      context3d);
+      "%s-%p", settings_->compositor_name.c_str(), context3d);
   context3d->pushGroupMarkerEXT(unique_context_name.c_str());
 
   const ContextProvider::Capabilities& caps =
       output_surface_->context_provider()->ContextCapabilities();
 
   DCHECK(!caps.iosurface || caps.texture_rectangle);
 
   capabilities_.using_set_visibility = caps.set_visibility;
   capabilities_.using_egl_image = caps.egl_image_external;
-  capabilities_.using_map_image =
-      Settings().use_map_image && caps.map_image;
+  capabilities_.using_map_image = settings_->use_map_image && caps.map_image;
 
   return true;
 }
 
 DelegatingRenderer::~DelegatingRenderer() {}
 
 const RendererCapabilities& DelegatingRenderer::Capabilities() const {
   return capabilities_;
 }
 
 bool DelegatingRenderer::CanReadPixels() const { return false; }
 
 static ResourceProvider::ResourceId AppendToArray(
     ResourceProvider::ResourceIdArray* array,
     ResourceProvider::ResourceId id) {
   array->push_back(id);
   return id;
 }
 
-void DelegatingRenderer::DrawFrame(
-    RenderPassList* render_passes_in_draw_order,
-    ContextProvider* offscreen_context_provider) {
+void DelegatingRenderer::DrawFrame(RenderPassList* render_passes_in_draw_order,
+                                   ContextProvider* offscreen_context_provider,
+                                   float device_scale_factor,
+                                   bool allow_partial_swap) {
   TRACE_EVENT0("cc", "DelegatingRenderer::DrawFrame");
 
   DCHECK(!frame_for_swap_buffers_.delegated_frame_data);
 
   frame_for_swap_buffers_.metadata = client_->MakeCompositorFrameMetadata();
 
   frame_for_swap_buffers_.delegated_frame_data =
       make_scoped_ptr(new DelegatedFrameData);
   DelegatedFrameData& out_data = *frame_for_swap_buffers_.delegated_frame_data;
   // Move the render passes and resources into the |out_frame|.
@@ skipping 71 matching lines @@
   stats.bytesAllocated = bytes_allocated;
   stats.backbufferRequested = false;
   context_provider->Context3d()->sendManagedMemoryStatsCHROMIUM(&stats);
 }
 
 void DelegatingRenderer::SetDiscardBackBufferWhenNotVisible(bool discard) {
   // Nothing to do, we don't have a back buffer.
 }
 
 }  // namespace cc