| Index: cc/debug/debug_rect_history.cc
|
| diff --git a/cc/debug/debug_rect_history.cc b/cc/debug/debug_rect_history.cc
|
| index a8c50306134a3e8990c3198cf24b470235990772..473cf9009efc99d54aacd136eeb18a2d0d544270 100644
|
| --- a/cc/debug/debug_rect_history.cc
|
| +++ b/cc/debug/debug_rect_history.cc
|
| @@ -185,10 +185,9 @@ void DebugRectHistory::SaveNonOccludingRects(
|
| }
|
|
|
| void DebugRectHistory::SaveTouchEventHandlerRects(LayerImpl* layer) {
|
| - LayerTreeHostCommon::CallFunctionForSubtree<LayerImpl>(
|
| - layer,
|
| - base::Bind(&DebugRectHistory::SaveTouchEventHandlerRectsCallback,
|
| - base::Unretained(this)));
|
| + LayerTreeHostCommon::CallFunctionForSubtree(layer, [this](LayerImpl* layer) {
|
| + SaveTouchEventHandlerRectsCallback(layer);
|
| + });
|
| }
|
|
|
| void DebugRectHistory::SaveTouchEventHandlerRectsCallback(LayerImpl* layer) {
|
| @@ -205,10 +204,9 @@ void DebugRectHistory::SaveTouchEventHandlerRectsCallback(LayerImpl* layer) {
|
| }
|
|
|
| void DebugRectHistory::SaveWheelEventHandlerRects(LayerImpl* layer) {
|
| - LayerTreeHostCommon::CallFunctionForSubtree<LayerImpl>(
|
| - layer,
|
| - base::Bind(&DebugRectHistory::SaveWheelEventHandlerRectsCallback,
|
| - base::Unretained(this)));
|
| + LayerTreeHostCommon::CallFunctionForSubtree(layer, [this](LayerImpl* layer) {
|
| + SaveWheelEventHandlerRectsCallback(layer);
|
| + });
|
| }
|
|
|
| void DebugRectHistory::SaveWheelEventHandlerRectsCallback(LayerImpl* layer) {
|
| @@ -226,10 +224,9 @@ void DebugRectHistory::SaveWheelEventHandlerRectsCallback(LayerImpl* layer) {
|
| }
|
|
|
| void DebugRectHistory::SaveScrollEventHandlerRects(LayerImpl* layer) {
|
| - LayerTreeHostCommon::CallFunctionForSubtree<LayerImpl>(
|
| - layer,
|
| - base::Bind(&DebugRectHistory::SaveScrollEventHandlerRectsCallback,
|
| - base::Unretained(this)));
|
| + LayerTreeHostCommon::CallFunctionForSubtree(layer, [this](LayerImpl* layer) {
|
| + SaveScrollEventHandlerRectsCallback(layer);
|
| + });
|
| }
|
|
|
| void DebugRectHistory::SaveScrollEventHandlerRectsCallback(LayerImpl* layer) {
|
| @@ -247,10 +244,9 @@ void DebugRectHistory::SaveScrollEventHandlerRectsCallback(LayerImpl* layer) {
|
| }
|
|
|
| void DebugRectHistory::SaveNonFastScrollableRects(LayerImpl* layer) {
|
| - LayerTreeHostCommon::CallFunctionForSubtree<LayerImpl>(
|
| - layer,
|
| - base::Bind(&DebugRectHistory::SaveNonFastScrollableRectsCallback,
|
| - base::Unretained(this)));
|
| + LayerTreeHostCommon::CallFunctionForSubtree(layer, [this](LayerImpl* layer) {
|
| + SaveNonFastScrollableRectsCallback(layer);
|
| + });
|
| }
|
|
|
| void DebugRectHistory::SaveNonFastScrollableRectsCallback(LayerImpl* layer) {
|
|
|