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

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: remove components/html_viewer/ change 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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 } 95 }
96 96
97 void Display::SetExternalClip(const gfx::Rect& clip) { 97 void Display::SetExternalClip(const gfx::Rect& clip) {
98 external_clip_ = clip; 98 external_clip_ = clip;
99 } 99 }
100 100
101 void Display::InitializeRenderer() { 101 void Display::InitializeRenderer() {
102 if (resource_provider_) 102 if (resource_provider_)
103 return; 103 return;
104 104
105 // Display does not use GpuMemoryBuffers, so persistent map is not relevant.
106 bool use_persistent_map_for_gpu_memory_buffers = false;
107 scoped_ptr<ResourceProvider> resource_provider = ResourceProvider::Create( 105 scoped_ptr<ResourceProvider> resource_provider = ResourceProvider::Create(
108 output_surface_.get(), bitmap_manager_, gpu_memory_buffer_manager_, 106 output_surface_.get(), bitmap_manager_, gpu_memory_buffer_manager_,
109 nullptr, settings_.highp_threshold_min, settings_.use_rgba_4444_textures, 107 nullptr, settings_.highp_threshold_min, settings_.use_rgba_4444_textures,
110 settings_.texture_id_allocation_chunk_size, 108 settings_.texture_id_allocation_chunk_size,
111 use_persistent_map_for_gpu_memory_buffers,
112 std::vector<unsigned>(static_cast<size_t>(gfx::BufferFormat::LAST) + 1, 109 std::vector<unsigned>(static_cast<size_t>(gfx::BufferFormat::LAST) + 1,
113 GL_TEXTURE_2D)); 110 GL_TEXTURE_2D));
114 if (!resource_provider) 111 if (!resource_provider)
115 return; 112 return;
116 113
117 if (output_surface_->context_provider()) { 114 if (output_surface_->context_provider()) {
118 scoped_ptr<GLRenderer> renderer = GLRenderer::Create( 115 scoped_ptr<GLRenderer> renderer = GLRenderer::Create(
119 this, &settings_, output_surface_.get(), resource_provider.get(), 116 this, &settings_, output_surface_.get(), resource_provider.get(),
120 texture_mailbox_deleter_.get(), settings_.highp_threshold_min); 117 texture_mailbox_deleter_.get(), settings_.highp_threshold_min);
121 if (!renderer) 118 if (!renderer)
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 323
327 if (surface_id == current_surface_id_) 324 if (surface_id == current_surface_id_)
328 UpdateRootSurfaceResourcesLocked(); 325 UpdateRootSurfaceResourcesLocked();
329 } 326 }
330 327
331 SurfaceId Display::CurrentSurfaceId() { 328 SurfaceId Display::CurrentSurfaceId() {
332 return current_surface_id_; 329 return current_surface_id_;
333 } 330 }
334 331
335 } // namespace cc 332 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698