| Index: content/browser/android/content_view_core_impl.h
|
| diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h
|
| index 23cdc6663f4101c4136e792520d931121bd0fbb8..bbfc68f25a6d8080f354074c7cde946e2756c975 100644
|
| --- a/content/browser/android/content_view_core_impl.h
|
| +++ b/content/browser/android/content_view_core_impl.h
|
| @@ -50,6 +50,7 @@ class ContentViewCoreImpl : public ContentViewCore,
|
| virtual void OnWebPreferencesUpdated() OVERRIDE;
|
| virtual jint GetCurrentRenderProcessId(JNIEnv* env, jobject obj) OVERRIDE;
|
| virtual void ShowPastePopup(int x, int y) OVERRIDE;
|
| + virtual unsigned int GetScaledContentTexture(const gfx::Size& size) OVERRIDE;
|
|
|
| // --------------------------------------------------------------------------
|
| // Methods called from Java via JNI
|
| @@ -173,6 +174,9 @@ class ContentViewCoreImpl : public ContentViewCore,
|
| int GetNavigationHistory(JNIEnv* env, jobject obj, jobject context);
|
| void UpdateVSyncParameters(JNIEnv* env, jobject obj, jlong timebase_micros,
|
| jlong interval_micros);
|
| + jboolean PopulateBitmapFromCompositor(JNIEnv* env,
|
| + jobject obj,
|
| + jobject jbitmap);
|
|
|
| // --------------------------------------------------------------------------
|
| // Public methods that call to Java via JNI
|
| @@ -238,6 +242,9 @@ class ContentViewCoreImpl : public ContentViewCore,
|
| float DpiScale() const;
|
| WebKit::WebGestureEvent MakeGestureEvent(WebKit::WebInputEvent::Type type,
|
| long time_ms, int x, int y) const;
|
| +
|
| + void DeleteScaledSnapshotTexture();
|
| +
|
| struct JavaObject;
|
| JavaObject* java_object_;
|
|
|
|
|