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

Unified Diff: cc/trees/layer_tree_host_impl.cc

Issue 2194013002: cc: Delete the Renderer base class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dcheck-delegating
Patch Set: delete-renderer-base-class: rebase 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
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 22cbb9aa5e025987d605c0c9355cad26245d7282..277b542e37b4c5202909cdf9b82b384b299106bf 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -984,7 +984,6 @@ DrawResult LayerTreeHostImpl::CalculateRenderPasses(
}
RemoveRenderPasses(frame);
- renderer_->DecideRenderPassAllocationsForFrame(frame->render_passes);
if (have_copy_request) {
// Any copy requests left in the tree are not going to get serviced, and
@@ -1412,9 +1411,7 @@ void LayerTreeHostImpl::SetManagedMemoryPolicy(
return;
if (!task_runner_provider_->HasImplThread()) {
- // In single-thread mode, this can be called on the main thread by
- // GLRenderer::OnMemoryAllocationChanged.
- DebugScopedSetImplThread impl_thread(task_runner_provider_);
+ // REMOVE ME ? DebugScopedSetImplThread impl_thread(task_runner_provider_);
UpdateTileManagerMemoryPolicy(actual_policy);
} else {
DCHECK(task_runner_provider_->IsImplThread());
@@ -1463,7 +1460,7 @@ void LayerTreeHostImpl::SetExternalTilePriorityConstraints(
// Compositor, not OutputSurface, is responsible for setting damage and
// triggering redraw for constraint changes.
- SetFullRootLayerDamage();
+ SetFullViewportDamage();
SetNeedsRedraw();
}
}
@@ -1535,7 +1532,7 @@ void LayerTreeHostImpl::OnDraw(const gfx::Transform& transform,
// always swap. Otherwise, need to set redraw for any changes to draw
// parameters.
if (transform_changed || viewport_changed || resourceless_software_draw_) {
- SetFullRootLayerDamage();
+ SetFullViewportDamage();
SetNeedsRedraw();
active_tree_->set_needs_update_draw_properties();
}
@@ -1553,7 +1550,7 @@ void LayerTreeHostImpl::OnDraw(const gfx::Transform& transform,
// This draw may have reset all damage, which would lead to subsequent
// incorrect hardware draw, so explicitly set damage for next hardware
// draw as well.
- SetFullRootLayerDamage();
+ SetFullViewportDamage();
}
}
@@ -2112,13 +2109,12 @@ void LayerTreeHostImpl::CreateAndSetRenderer() {
DCHECK(resource_provider_);
DCHECK(output_surface_->capabilities().delegated_rendering);
- renderer_ =
- DelegatingRenderer::Create(this, &settings_.renderer_settings,
- output_surface_, resource_provider_.get());
+ renderer_ = base::MakeUnique<DelegatingRenderer>(output_surface_,
+ resource_provider_.get());
renderer_->SetVisible(visible_);
- SetFullRootLayerDamage();
+ SetFullViewportDamage();
- // See note in LayerTreeImpl::UpdateDrawProperties. Renderer needs to be
+ // See note in LayerTreeImpl::UpdateDrawProperties. Renderer needs to be
// initialized to get max texture size. Also, after releasing resources,
// trees need another update to generate new ones.
active_tree_->set_needs_update_draw_properties();
@@ -2364,7 +2360,7 @@ void LayerTreeHostImpl::SetViewportSize(const gfx::Size& device_viewport_size) {
UpdateViewportContainerSizes();
client_->OnCanDrawStateChanged(CanDraw());
- SetFullRootLayerDamage();
+ SetFullViewportDamage();
active_tree_->set_needs_update_draw_properties();
}
@@ -2395,7 +2391,7 @@ void LayerTreeHostImpl::DidChangeTopControlsPosition() {
SetNeedsRedraw();
SetNeedsOneBeginImplFrame();
active_tree_->set_needs_update_draw_properties();
- SetFullRootLayerDamage();
+ SetFullViewportDamage();
}
float LayerTreeHostImpl::TopControlsHeight() const {
@@ -3174,7 +3170,7 @@ void LayerTreeHostImpl::SetSynchronousInputHandlerRootScrollOffset(
// After applying the synchronous input handler's scroll offset, tell it what
// we ended up with.
UpdateRootLayerStateForSynchronousInputHandler();
- SetFullRootLayerDamage();
+ SetFullViewportDamage();
SetNeedsRedraw();
}
@@ -3360,7 +3356,7 @@ std::unique_ptr<ScrollAndScaleSet> LayerTreeHostImpl::ProcessScrollDeltas() {
return scroll_info;
}
-void LayerTreeHostImpl::SetFullRootLayerDamage() {
+void LayerTreeHostImpl::SetFullViewportDamage() {
SetViewportDamage(gfx::Rect(DrawViewportSize()));
}
@@ -3649,7 +3645,7 @@ void LayerTreeHostImpl::SetDebugState(
debug_state_ = new_debug_state;
UpdateTileManagerMemoryPolicy(ActualManagedMemoryPolicy());
- SetFullRootLayerDamage();
+ SetFullViewportDamage();
}
void LayerTreeHostImpl::CreateUIResource(UIResourceId uid,

Powered by Google App Engine
This is Rietveld 408576698