Index: content/browser/android/content_view_render_view.h |
diff --git a/content/browser/android/content_view_render_view.h b/content/browser/android/content_view_render_view.h |
index cbdb1f19b40f11e039e99e813e3b08e633456295..f29c1af7882132156bc970126e933fdcc69863c1 100644 |
--- a/content/browser/android/content_view_render_view.h |
+++ b/content/browser/android/content_view_render_view.h |
@@ -13,6 +13,7 @@ |
#include "ui/gfx/native_widget_types.h" |
namespace cc { |
+class CopyOutputResult; |
danakj
2014/05/13 23:11:09
oops some leftovers in here... *^^*
danakj
2014/05/13 23:14:04
Fixed.
|
class Layer; |
} |
@@ -40,7 +41,6 @@ class ContentViewRenderView : public CompositorClient { |
void SurfaceChanged(JNIEnv* env, jobject obj, |
jint format, jint width, jint height, jobject surface); |
jboolean Composite(JNIEnv* env, jobject obj); |
- jboolean CompositeToBitmap(JNIEnv* env, jobject obj, jobject java_bitmap); |
void SetOverlayVideoMode(JNIEnv* env, jobject obj, bool enabled); |
// CompositorClient implementation |
@@ -60,6 +60,8 @@ class ContentViewRenderView : public CompositorClient { |
gfx::NativeWindow root_window_; |
int current_surface_format_; |
+ base::WeakPtrFactory<ContentViewRenderView> weak_ptr_factory_; |
+ |
DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView); |
}; |