| Index: content/browser/web_contents/web_contents_view_android.h
|
| diff --git a/content/browser/web_contents/web_contents_view_android.h b/content/browser/web_contents/web_contents_view_android.h
|
| index 594bc5c340df4da98132b1f3ee84bc5ce8a0517c..b59d289b6342038abed409d5130fc8925a79af0d 100644
|
| --- a/content/browser/web_contents/web_contents_view_android.h
|
| +++ b/content/browser/web_contents/web_contents_view_android.h
|
| @@ -14,6 +14,7 @@
|
| #include "ui/gfx/rect_f.h"
|
|
|
| namespace content {
|
| +class Compositor;
|
| class ContentViewCoreImpl;
|
|
|
| // Android-specific implementation of the WebContentsView.
|
| @@ -29,6 +30,8 @@ class WebContentsViewAndroid : public WebContentsViewPort,
|
| // by the UI frontend.
|
| void SetContentViewCore(ContentViewCoreImpl* content_view_core);
|
|
|
| + void SetCompositor(Compositor* compositor);
|
| +
|
| #if defined(GOOGLE_TV)
|
| void NotifyExternalSurface(int player_id,
|
| bool is_request,
|
| @@ -90,6 +93,11 @@ class WebContentsViewAndroid : public WebContentsViewPort,
|
| // Interface for extensions to WebContentsView. Used to show the context menu.
|
| scoped_ptr<WebContentsViewDelegate> delegate_;
|
|
|
| + // Compositor is not owned by this class. The compositor is unique and the
|
| + // lifetime of the compositor encompasses the lifetime of
|
| + // WebContentsViewAndroid.
|
| + Compositor* compositor_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(WebContentsViewAndroid);
|
| };
|
|
|
|
|