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

Unified Diff: cc/trees/layer_tree_host_impl.cc

Issue 2196023002: cc: Never make a DirectRenderer in LayerTreeHostImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@display-layertreetest
Patch Set: dcheck-delegating: blinktests Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/tiles/tile_manager_unittest.cc ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_impl.cc
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 1ba4a97a53b772259080a5893b2fefff31486099..22cbb9aa5e025987d605c0c9355cad26245d7282 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -53,8 +53,6 @@
#include "cc/output/compositor_frame_metadata.h"
#include "cc/output/copy_output_request.h"
#include "cc/output/delegating_renderer.h"
-#include "cc/output/gl_renderer.h"
-#include "cc/output/software_renderer.h"
#include "cc/output/texture_mailbox_deleter.h"
#include "cc/quads/render_pass_draw_quad.h"
#include "cc/quads/shared_quad_state.h"
@@ -2113,22 +2111,10 @@ void LayerTreeHostImpl::CreateAndSetRenderer() {
DCHECK(output_surface_);
DCHECK(resource_provider_);
- if (output_surface_->capabilities().delegated_rendering) {
- renderer_ =
- DelegatingRenderer::Create(this, &settings_.renderer_settings,
- output_surface_, resource_provider_.get());
- } else if (output_surface_->context_provider()) {
- renderer_ = GLRenderer::Create(
- this, &settings_.renderer_settings, output_surface_,
- resource_provider_.get(), texture_mailbox_deleter_.get(),
- settings_.renderer_settings.highp_threshold_min);
- } else if (output_surface_->software_device()) {
- renderer_ =
- SoftwareRenderer::Create(this, &settings_.renderer_settings,
+ DCHECK(output_surface_->capabilities().delegated_rendering);
+ renderer_ =
+ DelegatingRenderer::Create(this, &settings_.renderer_settings,
output_surface_, resource_provider_.get());
- }
- DCHECK(renderer_);
-
renderer_->SetVisible(visible_);
SetFullRootLayerDamage();
« no previous file with comments | « cc/tiles/tile_manager_unittest.cc ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698