| Index: cc/layers/layer_impl.h
|
| diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
|
| index 6fc5cb296f9e10ce6269dd96c63decdcfb285fa2..32c168d0a93e4148e30d505ca795d5cf24796a9c 100644
|
| --- a/cc/layers/layer_impl.h
|
| +++ b/cc/layers/layer_impl.h
|
| @@ -431,7 +431,7 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
|
| float contents_scale_y() const { return draw_properties_.contents_scale_y; }
|
| void SetContentsScale(float contents_scale_x, float contents_scale_y);
|
|
|
| - bool IsExternalFlingActive() const;
|
| + bool IsExternalScrollActive() const;
|
|
|
| void SetCurrentScrollOffset(const gfx::ScrollOffset& scroll_offset);
|
| void SetCurrentScrollOffsetFromDelegate(
|
|
|