| Index: cc/surfaces/display.cc
|
| diff --git a/cc/surfaces/display.cc b/cc/surfaces/display.cc
|
| index 735c22885dce57a36a383e16737a77a5511f26b6..5136fc573a725fd53fac2dcc7089a3f542c2997c 100644
|
| --- a/cc/surfaces/display.cc
|
| +++ b/cc/surfaces/display.cc
|
| @@ -219,7 +219,7 @@ void Display::InitializeRenderer() {
|
|
|
| void Display::UpdateRootSurfaceResourcesLocked() {
|
| Surface* surface = surface_manager_->GetSurfaceForId(current_surface_id_);
|
| - bool root_surface_resources_locked = !surface || !surface->HasFrame();
|
| + bool root_surface_resources_locked = !surface || !surface->HasActiveFrame();
|
| if (scheduler_)
|
| scheduler_->SetRootSurfaceResourcesLocked(root_surface_resources_locked);
|
| }
|
| @@ -374,8 +374,8 @@ void Display::OnSurfaceDamaged(const SurfaceId& surface_id, bool* changed) {
|
| aggregator_->previous_contained_surfaces().count(surface_id)) {
|
| Surface* surface = surface_manager_->GetSurfaceForId(surface_id);
|
| if (surface) {
|
| - if (!surface->HasFrame() ||
|
| - surface->GetEligibleFrame().resource_list.empty()) {
|
| + if (!surface->HasActiveFrame() ||
|
| + surface->GetActiveFrame().resource_list.empty()) {
|
| aggregator_->ReleaseResources(surface_id);
|
| }
|
| }
|
|
|