| Index: android_webview/browser/browser_view_renderer.cc
|
| diff --git a/android_webview/browser/browser_view_renderer.cc b/android_webview/browser/browser_view_renderer.cc
|
| index c9a3e8a8da11293d78a7d451998407267e4dfff6..a4cea2bc4b92e92d4bc908522e34f953e8f38288 100644
|
| --- a/android_webview/browser/browser_view_renderer.cc
|
| +++ b/android_webview/browser/browser_view_renderer.cc
|
| @@ -658,12 +658,12 @@ void BrowserViewRenderer::UpdateRootLayerState(
|
| SetTotalRootLayerScrollOffset(total_scroll_offset_dip);
|
| }
|
|
|
| -scoped_refptr<base::trace_event::ConvertableToTraceFormat>
|
| +scoped_ptr<base::trace_event::ConvertableToTraceFormat>
|
| BrowserViewRenderer::RootLayerStateAsValue(
|
| const gfx::Vector2dF& total_scroll_offset_dip,
|
| const gfx::SizeF& scrollable_size_dip) {
|
| - scoped_refptr<base::trace_event::TracedValue> state =
|
| - new base::trace_event::TracedValue();
|
| + scoped_ptr<base::trace_event::TracedValue> state(
|
| + new base::trace_event::TracedValue());
|
|
|
| state->SetDouble("total_scroll_offset_dip.x", total_scroll_offset_dip.x());
|
| state->SetDouble("total_scroll_offset_dip.y", total_scroll_offset_dip.y());
|
| @@ -675,7 +675,7 @@ BrowserViewRenderer::RootLayerStateAsValue(
|
| state->SetDouble("scrollable_size_dip.height", scrollable_size_dip.height());
|
|
|
| state->SetDouble("page_scale_factor", page_scale_factor_);
|
| - return state;
|
| + return std::move(state);
|
| }
|
|
|
| void BrowserViewRenderer::DidOverscroll(
|
|
|