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

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: rebase and add missing locks Created 5 years, 4 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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 } 94 }
95 95
96 void Display::SetExternalClip(const gfx::Rect& clip) { 96 void Display::SetExternalClip(const gfx::Rect& clip) {
97 external_clip_ = clip; 97 external_clip_ = clip;
98 } 98 }
99 99
100 void Display::InitializeRenderer() { 100 void Display::InitializeRenderer() {
101 if (resource_provider_) 101 if (resource_provider_)
102 return; 102 return;
103 103
104 // Display does not use GpuMemoryBuffers, so persistent map is not relevant.
105 bool use_persistent_map_for_gpu_memory_buffers = false;
106 scoped_ptr<ResourceProvider> resource_provider = ResourceProvider::Create( 104 scoped_ptr<ResourceProvider> resource_provider = ResourceProvider::Create(
107 output_surface_.get(), bitmap_manager_, gpu_memory_buffer_manager_, 105 output_surface_.get(), bitmap_manager_, gpu_memory_buffer_manager_,
108 nullptr, settings_.highp_threshold_min, settings_.use_rgba_4444_textures, 106 nullptr, settings_.highp_threshold_min, settings_.use_rgba_4444_textures,
109 settings_.texture_id_allocation_chunk_size, 107 settings_.texture_id_allocation_chunk_size);
110 use_persistent_map_for_gpu_memory_buffers);
111 if (!resource_provider) 108 if (!resource_provider)
112 return; 109 return;
113 110
114 if (output_surface_->context_provider()) { 111 if (output_surface_->context_provider()) {
115 scoped_ptr<GLRenderer> renderer = GLRenderer::Create( 112 scoped_ptr<GLRenderer> renderer = GLRenderer::Create(
116 this, &settings_, output_surface_.get(), resource_provider.get(), 113 this, &settings_, output_surface_.get(), resource_provider.get(),
117 texture_mailbox_deleter_.get(), settings_.highp_threshold_min); 114 texture_mailbox_deleter_.get(), settings_.highp_threshold_min);
118 if (!renderer) 115 if (!renderer)
119 return; 116 return;
120 renderer_ = renderer.Pass(); 117 renderer_ = renderer.Pass();
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 316
320 if (surface_id == current_surface_id_) 317 if (surface_id == current_surface_id_)
321 UpdateRootSurfaceResourcesLocked(); 318 UpdateRootSurfaceResourcesLocked();
322 } 319 }
323 320
324 SurfaceId Display::CurrentSurfaceId() { 321 SurfaceId Display::CurrentSurfaceId() {
325 return current_surface_id_; 322 return current_surface_id_;
326 } 323 }
327 324
328 } // namespace cc 325 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698