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

Side by Side Diff: cc/layers/surface_layer.cc

Issue 2846653002: cc : Stop pushing layers from hidden subtrees at commit
Patch Set: hide mask layer also Created 3 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 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/layers/surface_layer.h" 5 #include "cc/layers/surface_layer.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 primary_reference_returner_ = ref_factory_->CreateReference( 112 primary_reference_returner_ = ref_factory_->CreateReference(
113 layer_tree_host(), primary_surface_info_.id()); 113 layer_tree_host(), primary_surface_info_.id());
114 } 114 }
115 if (fallback_surface_info_.is_valid()) { 115 if (fallback_surface_info_.is_valid()) {
116 fallback_reference_returner_ = ref_factory_->CreateReference( 116 fallback_reference_returner_ = ref_factory_->CreateReference(
117 layer_tree_host(), fallback_surface_info_.id()); 117 layer_tree_host(), fallback_surface_info_.id());
118 } 118 }
119 } 119 }
120 } 120 }
121 121
122 bool SurfaceLayer::IsSurfaceLayer() const {
123 return true;
124 }
125
122 void SurfaceLayer::PushPropertiesTo(LayerImpl* layer) { 126 void SurfaceLayer::PushPropertiesTo(LayerImpl* layer) {
123 Layer::PushPropertiesTo(layer); 127 Layer::PushPropertiesTo(layer);
124 TRACE_EVENT0("cc", "SurfaceLayer::PushPropertiesTo"); 128 TRACE_EVENT0("cc", "SurfaceLayer::PushPropertiesTo");
125 SurfaceLayerImpl* layer_impl = static_cast<SurfaceLayerImpl*>(layer); 129 SurfaceLayerImpl* layer_impl = static_cast<SurfaceLayerImpl*>(layer);
126 layer_impl->SetPrimarySurfaceInfo(primary_surface_info_); 130 layer_impl->SetPrimarySurfaceInfo(primary_surface_info_);
127 layer_impl->SetFallbackSurfaceInfo(fallback_surface_info_); 131 layer_impl->SetFallbackSurfaceInfo(fallback_surface_info_);
128 layer_impl->SetStretchContentToFillBounds(stretch_content_to_fill_bounds_); 132 layer_impl->SetStretchContentToFillBounds(stretch_content_to_fill_bounds_);
129 } 133 }
130 134
135 const SurfaceId* SurfaceLayer::GetSurfaceId() const {
136 if (layer_tree_host()->GetSettings().enable_surface_synchronization) {
137 if (fallback_surface_info_.is_valid())
138 return &fallback_surface_info_.id();
139 } else {
140 return &primary_surface_info_.id();
141 }
142 return nullptr;
143 }
144
131 void SurfaceLayer::RemoveReference(base::Closure reference_returner) { 145 void SurfaceLayer::RemoveReference(base::Closure reference_returner) {
132 if (!reference_returner) 146 if (!reference_returner)
133 return; 147 return;
134 auto swap_promise = base::MakeUnique<SatisfySwapPromise>( 148 auto swap_promise = base::MakeUnique<SatisfySwapPromise>(
135 std::move(reference_returner), 149 std::move(reference_returner),
136 layer_tree_host()->GetTaskRunnerProvider()->MainThreadTaskRunner()); 150 layer_tree_host()->GetTaskRunnerProvider()->MainThreadTaskRunner());
137 layer_tree_host()->GetSwapPromiseManager()->QueueSwapPromise( 151 layer_tree_host()->GetSwapPromiseManager()->QueueSwapPromise(
138 std::move(swap_promise)); 152 std::move(swap_promise));
139 } 153 }
140 154
141 } // namespace cc 155 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698