Add buffer_to_texture_target_map to LayerTreeSettings

content/browser/renderer_host/compositor_impl_android.cc

 // Copyright (c) 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 "content/browser/renderer_host/compositor_impl_android.h"
 
 #include <android/bitmap.h>
 #include <android/native_window_jni.h>
 #include <stdint.h>
 #include <unordered_set>
@@ skipping 498 matching lines @@
         gpu::GpuSurfaceTracker::SurfaceRecord(window, surface));
     SetVisible(true);
     ANativeWindow_release(window);
   }
 }
 
 void CompositorImpl::CreateLayerTreeHost() {
   DCHECK(!host_);
 
   cc::LayerTreeSettings settings;
-  settings.renderer_settings.refresh_rate = 60.0;
-  settings.renderer_settings.allow_antialiasing = false;
-  settings.renderer_settings.highp_threshold_min = 2048;
   settings.use_zero_copy = true;
 
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   settings.initial_debug_state.SetRecordRenderingStats(
       command_line->HasSwitch(cc::switches::kEnableGpuBenchmarking));
   settings.initial_debug_state.show_fps_counter =
       command_line->HasSwitch(cc::switches::kUIShowFPSCounter);
   settings.single_thread_proxy_scheduler = true;
 
   animation_host_ = cc::AnimationHost::CreateMainInstance();
@@ skipping 233 matching lines @@
 
   pending_frames_ = 0;
   num_successive_context_creation_failures_ = 0;
 
   if (context_provider) {
     gpu_capabilities_ = context_provider->ContextCapabilities();
   } else {
     // TODO(danakj): Populate gpu_capabilities_ for VulkanContextProvider.
   }
 
+  cc::RendererSettings renderer_settings;

[boliu, 2017/05/25 23:44:44]

it's not clear to me why this change is relevant to the CL description. And why
should LTH have a different renderer setting from the display now?

[Alex Z., 2017/05/26 12:48:58]

You are right. I have reverted this changes.
This CL is part of the effort of separating RendererSettings from
LayerTreeSettings. The whole task is diced up into smaller chunks to
avoid large CLs. Sometimes the border of each CL gets blurred.

As for Display having a different renderer settings, LTH doesn't
consume the renderer settings. It passes it along when creating
Displays and ResourceProviders. We decided to leave some fields as
default instead of deleting them for now to have smaller CLs.

+  renderer_settings.allow_antialiasing = false;
+  renderer_settings.highp_threshold_min = 2048;
   cc::SurfaceManager* manager = GetSurfaceManager();
   auto* task_runner = base::ThreadTaskRunnerHandle::Get().get();
   std::unique_ptr<cc::DisplayScheduler> scheduler(new cc::DisplayScheduler(
       task_runner, display_output_surface->capabilities().max_frames_pending));
 
   display_.reset(new cc::Display(
       viz::HostSharedBitmapManager::current(),
-      BrowserGpuMemoryBufferManager::current(),
-      host_->GetSettings().renderer_settings, frame_sink_id_,
-      root_window_->GetBeginFrameSource(), std::move(display_output_surface),
-      std::move(scheduler),
+      BrowserGpuMemoryBufferManager::current(), renderer_settings,
+      frame_sink_id_, root_window_->GetBeginFrameSource(),
+      std::move(display_output_surface), std::move(scheduler),
       base::MakeUnique<cc::TextureMailboxDeleter>(task_runner)));
 
   auto compositor_frame_sink =
       vulkan_context_provider
           ? base::MakeUnique<cc::DirectCompositorFrameSink>(
                 frame_sink_id_, manager, display_.get(),
                 vulkan_context_provider)
           : base::MakeUnique<cc::DirectCompositorFrameSink>(
                 frame_sink_id_, manager, display_.get(), context_provider,
                 nullptr, BrowserGpuMemoryBufferManager::current(),
@@ skipping 85 matching lines @@
   }
   GetSurfaceManager()->UnregisterFrameSinkHierarchy(frame_sink_id_,
                                                     frame_sink_id);
 }
 
 bool CompositorImpl::HavePendingReadbacks() {
   return !readback_layer_tree_->children().empty();
 }
 
 }  // namespace content