OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/android/content_view_core_impl.h" | 5 #include "content/browser/android/content_view_core_impl.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/android/jni_array.h" | 8 #include "base/android/jni_array.h" |
9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
10 #include "base/android/scoped_java_ref.h" | 10 #include "base/android/scoped_java_ref.h" |
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
381 const gfx::SizeF& content_size, | 381 const gfx::SizeF& content_size, |
382 const gfx::SizeF& viewport_size, | 382 const gfx::SizeF& viewport_size, |
383 const gfx::Vector2dF& controls_offset, | 383 const gfx::Vector2dF& controls_offset, |
384 const gfx::Vector2dF& content_offset, | 384 const gfx::Vector2dF& content_offset, |
385 float overdraw_bottom_height) { | 385 float overdraw_bottom_height) { |
386 JNIEnv* env = AttachCurrentThread(); | 386 JNIEnv* env = AttachCurrentThread(); |
387 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); | 387 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); |
388 if (obj.is_null()) | 388 if (obj.is_null()) |
389 return; | 389 return; |
390 | 390 |
391 window_android_->set_content_offset( | 391 window_android_->set_content_offset(content_offset); |
392 gfx::ScaleVector2d(content_offset, dpi_scale_)); | |
393 | 392 |
394 Java_ContentViewCore_updateFrameInfo( | 393 Java_ContentViewCore_updateFrameInfo( |
395 env, obj.obj(), | 394 env, obj.obj(), |
396 scroll_offset.x(), | 395 scroll_offset.x(), |
397 scroll_offset.y(), | 396 scroll_offset.y(), |
398 page_scale_factor, | 397 page_scale_factor, |
399 page_scale_factor_limits.x(), | 398 page_scale_factor_limits.x(), |
400 page_scale_factor_limits.y(), | 399 page_scale_factor_limits.y(), |
401 content_size.width(), | 400 content_size.width(), |
402 content_size.height(), | 401 content_size.height(), |
(...skipping 1272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1675 reinterpret_cast<ui::WindowAndroid*>(window_android), | 1674 reinterpret_cast<ui::WindowAndroid*>(window_android), |
1676 retained_objects_set); | 1675 retained_objects_set); |
1677 return reinterpret_cast<intptr_t>(view); | 1676 return reinterpret_cast<intptr_t>(view); |
1678 } | 1677 } |
1679 | 1678 |
1680 bool RegisterContentViewCore(JNIEnv* env) { | 1679 bool RegisterContentViewCore(JNIEnv* env) { |
1681 return RegisterNativesImpl(env); | 1680 return RegisterNativesImpl(env); |
1682 } | 1681 } |
1683 | 1682 |
1684 } // namespace content | 1683 } // namespace content |
OLD | NEW |