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

Unified Diff: cc/surfaces/display.cc

Issue 2007593005: Remove the concept of OutputSurface from ResourceProvider. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: resourceprovider-no-outputsurface: moreccptcompile Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/resources/resource_provider_unittest.cc ('k') | cc/test/fake_resource_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/surfaces/display.cc
diff --git a/cc/surfaces/display.cc b/cc/surfaces/display.cc
index b8a331abd25a00c870e313dbbe3d20fcfd70a779..7800ba03030fcd85c537ad8ffd333c1f60ad86b6 100644
--- a/cc/surfaces/display.cc
+++ b/cc/surfaces/display.cc
@@ -166,16 +166,14 @@ void Display::InitializeRenderer() {
if (resource_provider_)
return;
- std::unique_ptr<ResourceProvider> resource_provider =
- ResourceProvider::Create(
- output_surface_.get(), bitmap_manager_, gpu_memory_buffer_manager_,
- nullptr, settings_.highp_threshold_min,
- settings_.texture_id_allocation_chunk_size,
- settings_.use_gpu_memory_buffer_resources,
- std::vector<unsigned>(
- static_cast<size_t>(gfx::BufferFormat::LAST) + 1, GL_TEXTURE_2D));
- if (!resource_provider)
- return;
+ std::unique_ptr<ResourceProvider> resource_provider(new ResourceProvider(
+ output_surface_->context_provider(), bitmap_manager_,
+ gpu_memory_buffer_manager_, nullptr, settings_.highp_threshold_min,
+ settings_.texture_id_allocation_chunk_size,
+ output_surface_->capabilities().delegated_sync_points_required,
+ settings_.use_gpu_memory_buffer_resources,
+ std::vector<unsigned>(static_cast<size_t>(gfx::BufferFormat::LAST) + 1,
+ GL_TEXTURE_2D)));
if (output_surface_->context_provider()) {
std::unique_ptr<GLRenderer> renderer = GLRenderer::Create(
« no previous file with comments | « cc/resources/resource_provider_unittest.cc ('k') | cc/test/fake_resource_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698