Chromium Code Reviews| Index: content/browser/renderer_host/compositor_impl_android.h |
| diff --git a/content/browser/renderer_host/compositor_impl_android.h b/content/browser/renderer_host/compositor_impl_android.h |
| index 7af080b88bd41a8781f551ba9daa3ec452432ee7..ab409b01b1540592512ba47628d7231a66628015 100644 |
| --- a/content/browser/renderer_host/compositor_impl_android.h |
| +++ b/content/browser/renderer_host/compositor_impl_android.h |
| @@ -26,6 +26,10 @@ class LayerTreeHost; |
| class ScopedUIResource; |
| } |
| +namespace ui { |
| +class WindowAndroid; |
| +} |
| + |
| namespace content { |
| class CompositorClient; |
| class GraphicsContext; |
| @@ -39,7 +43,7 @@ class CONTENT_EXPORT CompositorImpl |
| public cc::LayerTreeHostSingleThreadClient, |
| public ImageTransportFactoryAndroidObserver { |
| public: |
| - explicit CompositorImpl(CompositorClient* client); |
| + CompositorImpl(CompositorClient* client, ui::WindowAndroid* window_android); |
| virtual ~CompositorImpl(); |
| static bool IsInitialized(); |
| @@ -81,7 +85,7 @@ class CONTENT_EXPORT CompositorImpl |
| OVERRIDE; |
| virtual void DidInitializeOutputSurface(bool success) OVERRIDE {} |
| virtual void WillCommit() OVERRIDE {} |
| - virtual void DidCommit() OVERRIDE {} |
| + virtual void DidCommit() OVERRIDE; |
| virtual void DidCommitAndDrawFrame() OVERRIDE {} |
| virtual void DidCompleteSwapBuffers() OVERRIDE; |
| virtual scoped_refptr<cc::ContextProvider> |
| @@ -117,6 +121,8 @@ class CONTENT_EXPORT CompositorImpl |
| UIResourceMap; |
| UIResourceMap ui_resource_map_; |
| + ui::WindowAndroid* window_android_; |
|
no sievers
2013/11/14 22:01:01
nit: maybe call it |root_window_| or so?
powei
2013/11/15 02:18:26
Done.
|
| + |
| DISALLOW_COPY_AND_ASSIGN(CompositorImpl); |
| }; |