Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(297)

Side by Side Diff: cc/surfaces/display.cc

Issue 1230203007: Re-land: cc: Use worker context for one-copy tile initialization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: v2 Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/surfaces/display.h" 5 #include "cc/surfaces/display.h"
6 6
7 #include "base/thread_task_runner_handle.h" 7 #include "base/thread_task_runner_handle.h"
8 #include "base/trace_event/trace_event.h" 8 #include "base/trace_event/trace_event.h"
9 #include "cc/debug/benchmark_instrumentation.h" 9 #include "cc/debug/benchmark_instrumentation.h"
10 #include "cc/output/compositor_frame.h" 10 #include "cc/output/compositor_frame.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 } 89 }
90 90
91 void Display::SetExternalClip(const gfx::Rect& clip) { 91 void Display::SetExternalClip(const gfx::Rect& clip) {
92 external_clip_ = clip; 92 external_clip_ = clip;
93 } 93 }
94 94
95 void Display::InitializeRenderer() { 95 void Display::InitializeRenderer() {
96 if (resource_provider_) 96 if (resource_provider_)
97 return; 97 return;
98 98
99 // Display does not use GpuMemoryBuffers, so persistent map is not relevant.
100 bool use_persistent_map_for_gpu_memory_buffers = false;
101 scoped_ptr<ResourceProvider> resource_provider = ResourceProvider::Create( 99 scoped_ptr<ResourceProvider> resource_provider = ResourceProvider::Create(
102 output_surface_.get(), bitmap_manager_, gpu_memory_buffer_manager_, 100 output_surface_.get(), bitmap_manager_, gpu_memory_buffer_manager_,
103 nullptr, settings_.highp_threshold_min, settings_.use_rgba_4444_textures, 101 nullptr, settings_.highp_threshold_min, settings_.use_rgba_4444_textures,
104 settings_.texture_id_allocation_chunk_size, 102 settings_.texture_id_allocation_chunk_size);
105 use_persistent_map_for_gpu_memory_buffers);
106 if (!resource_provider) 103 if (!resource_provider)
107 return; 104 return;
108 105
109 if (output_surface_->context_provider()) { 106 if (output_surface_->context_provider()) {
110 scoped_ptr<GLRenderer> renderer = GLRenderer::Create( 107 scoped_ptr<GLRenderer> renderer = GLRenderer::Create(
111 this, &settings_, output_surface_.get(), resource_provider.get(), 108 this, &settings_, output_surface_.get(), resource_provider.get(),
112 texture_mailbox_deleter_.get(), settings_.highp_threshold_min); 109 texture_mailbox_deleter_.get(), settings_.highp_threshold_min);
113 if (!renderer) 110 if (!renderer)
114 return; 111 return;
115 renderer_ = renderer.Pass(); 112 renderer_ = renderer.Pass();
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 295
299 if (surface_id == current_surface_id_) 296 if (surface_id == current_surface_id_)
300 UpdateRootSurfaceResourcesLocked(); 297 UpdateRootSurfaceResourcesLocked();
301 } 298 }
302 299
303 SurfaceId Display::CurrentSurfaceId() { 300 SurfaceId Display::CurrentSurfaceId() {
304 return current_surface_id_; 301 return current_surface_id_;
305 } 302 }
306 303
307 } // namespace cc 304 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698