| Index: cc/trees/layer_tree_host.cc
|
| diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
|
| index f4780789394c447a1b3a56cfb5925ef325dec6a1..bd79762b43fba932b34fb262b5fa102d5dd8ae77 100644
|
| --- a/cc/trees/layer_tree_host.cc
|
| +++ b/cc/trees/layer_tree_host.cc
|
| @@ -212,10 +212,6 @@ void LayerTreeHost::SetLayerTreeHostClientReady() {
|
| proxy_->SetLayerTreeHostClientReady();
|
| }
|
|
|
| -static void LayerTreeHostOnOutputSurfaceCreatedCallback(Layer* layer) {
|
| - layer->OnOutputSurfaceCreated();
|
| -}
|
| -
|
| void LayerTreeHost::DeleteContentsTexturesOnImplThread(
|
| ResourceProvider* resource_provider) {
|
| DCHECK(proxy_->IsImplThread());
|
| @@ -424,7 +420,7 @@ void LayerTreeHost::DidInitializeOutputSurface() {
|
|
|
| if (root_layer()) {
|
| LayerTreeHostCommon::CallFunctionForSubtree(
|
| - root_layer(), base::Bind(&LayerTreeHostOnOutputSurfaceCreatedCallback));
|
| + root_layer(), [](Layer* layer) { layer->OnOutputSurfaceCreated(); });
|
| }
|
|
|
| client_->DidInitializeOutputSurface();
|
| @@ -866,8 +862,7 @@ bool LayerTreeHost::UpdateLayers(Layer* root_layer,
|
| kTotalFramesToUseForLCDTextMetrics) {
|
| LayerTreeHostCommon::CallFunctionForSubtree(
|
| root_layer,
|
| - base::Bind(&LayerTreeHost::CalculateLCDTextMetricsCallback,
|
| - base::Unretained(this)));
|
| + [this](Layer* layer) { CalculateLCDTextMetricsCallback(layer); });
|
| total_frames_used_for_lcd_text_metrics_++;
|
| }
|
|
|
| @@ -912,17 +907,12 @@ void LayerTreeHost::TriggerPrepaint() {
|
| SetNeedsCommit();
|
| }
|
|
|
| -static void LayerTreeHostReduceMemoryCallback(Layer* layer) {
|
| - layer->ReduceMemoryUsage();
|
| -}
|
| -
|
| void LayerTreeHost::ReduceMemoryUsage() {
|
| if (!root_layer())
|
| return;
|
|
|
| LayerTreeHostCommon::CallFunctionForSubtree(
|
| - root_layer(),
|
| - base::Bind(&LayerTreeHostReduceMemoryCallback));
|
| + root_layer(), [](Layer* layer) { layer->ReduceMemoryUsage(); });
|
| }
|
|
|
| void LayerTreeHost::SetPrioritiesForSurfaces(size_t surface_memory_bytes) {
|
|
|