Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(880)

Unified Diff: content/browser/android/content_view_core_impl.cc

Issue 10913277: Upstream ContentViewCore.pageUp/pageDown (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/android/content_view_core_impl.cc
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index 22862218bb6555311f8e1b8b23aa612bb40b86e2..12efd7bb745af52a7b7ece75370cde88a932aaaf 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -556,6 +556,24 @@ void ContentViewCoreImpl::OnTabCrashed(const base::ProcessHandle handle) {
NOTIMPLEMENTED() << "not upstreamed yet";
}
+void ContentViewCoreImpl::UpdateContentSize(int width, int height) {
+ JNIEnv* env = AttachCurrentThread();
+ ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
+ if (obj.is_null())
+ return;
+ Java_ContentViewCore_updateContentSize(env, obj.obj(), width, height);
+}
+
+void ContentViewCoreImpl::UpdateScrollOffsetAndPageScaleFactor(int x, int y,
+ float scale) {
+ JNIEnv* env = AttachCurrentThread();
+ ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
+ if (obj.is_null())
+ return;
+ Java_ContentViewCore_updateScrollOffsetAndPageScaleFactor(env, obj.obj(), x,
+ y, scale);
+}
+
void ContentViewCoreImpl::ImeUpdateAdapter(int native_ime_adapter,
int text_input_type,
const std::string& text,

Powered by Google App Engine
This is Rietveld 408576698