| Index: android_webview/browser/browser_view_renderer.h
|
| diff --git a/android_webview/browser/browser_view_renderer.h b/android_webview/browser/browser_view_renderer.h
|
| index c016cf1198fc12beaf210e1638427d68ba6b626b..784afb8714787f9da731153529c5cf04845ac7af 100644
|
| --- a/android_webview/browser/browser_view_renderer.h
|
| +++ b/android_webview/browser/browser_view_renderer.h
|
| @@ -115,9 +115,9 @@ class BrowserViewRenderer : public content::SynchronousCompositorClient {
|
| bool CompositeSW(SkCanvas* canvas);
|
| void DidComposite();
|
| void DidSkipCompositeInDraw();
|
| - scoped_refptr<base::debug::ConvertableToTraceFormat> RootLayerStateAsValue(
|
| - const gfx::Vector2dF& total_scroll_offset_dip,
|
| - const gfx::SizeF& scrollable_size_dip);
|
| + scoped_refptr<base::trace_event::ConvertableToTraceFormat>
|
| + RootLayerStateAsValue(const gfx::Vector2dF& total_scroll_offset_dip,
|
| + const gfx::SizeF& scrollable_size_dip);
|
|
|
| scoped_ptr<cc::CompositorFrame> CompositeHw();
|
| void ReturnUnusedResource(scoped_ptr<cc::CompositorFrame> frame);
|
|
|