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 "android_webview/native/aw_contents.h" | 5 #include "android_webview/native/aw_contents.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 | 8 |
9 #include "android_webview/browser/aw_browser_context.h" | 9 #include "android_webview/browser/aw_browser_context.h" |
10 #include "android_webview/browser/aw_browser_main_parts.h" | 10 #include "android_webview/browser/aw_browser_main_parts.h" |
(...skipping 902 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
913 void AwContents::FocusFirstNode(JNIEnv* env, jobject obj) { | 913 void AwContents::FocusFirstNode(JNIEnv* env, jobject obj) { |
914 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 914 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
915 web_contents_->FocusThroughTabTraversal(false); | 915 web_contents_->FocusThroughTabTraversal(false); |
916 } | 916 } |
917 | 917 |
918 void AwContents::SetBackgroundColor(JNIEnv* env, jobject obj, jint color) { | 918 void AwContents::SetBackgroundColor(JNIEnv* env, jobject obj, jint color) { |
919 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 919 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
920 render_view_host_ext_->SetBackgroundColor(color); | 920 render_view_host_ext_->SetBackgroundColor(color); |
921 } | 921 } |
922 | 922 |
| 923 void AwContents::OnComputeScroll(JNIEnv* env, |
| 924 jobject obj, |
| 925 jlong animation_time_millis) { |
| 926 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 927 browser_view_renderer_.OnComputeScroll( |
| 928 base::TimeTicks() + |
| 929 base::TimeDelta::FromMilliseconds(animation_time_millis)); |
| 930 } |
| 931 |
923 jlong AwContents::ReleasePopupAwContents(JNIEnv* env, jobject obj) { | 932 jlong AwContents::ReleasePopupAwContents(JNIEnv* env, jobject obj) { |
924 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 933 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
925 return reinterpret_cast<intptr_t>(pending_contents_.release()); | 934 return reinterpret_cast<intptr_t>(pending_contents_.release()); |
926 } | 935 } |
927 | 936 |
928 gfx::Point AwContents::GetLocationOnScreen() { | 937 gfx::Point AwContents::GetLocationOnScreen() { |
929 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 938 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
930 JNIEnv* env = AttachCurrentThread(); | 939 JNIEnv* env = AttachCurrentThread(); |
931 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); | 940 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); |
932 if (obj.is_null()) | 941 if (obj.is_null()) |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
972 obj.obj(), | 981 obj.obj(), |
973 max_scroll_offset.x(), | 982 max_scroll_offset.x(), |
974 max_scroll_offset.y(), | 983 max_scroll_offset.y(), |
975 contents_size_dip.width(), | 984 contents_size_dip.width(), |
976 contents_size_dip.height(), | 985 contents_size_dip.height(), |
977 page_scale_factor, | 986 page_scale_factor, |
978 min_page_scale_factor, | 987 min_page_scale_factor, |
979 max_page_scale_factor); | 988 max_page_scale_factor); |
980 } | 989 } |
981 | 990 |
982 void AwContents::DidOverscroll(gfx::Vector2d overscroll_delta) { | 991 void AwContents::DidOverscroll(gfx::Vector2d overscroll_delta, |
| 992 gfx::Vector2dF overscroll_velocity, |
| 993 bool first_overscroll_x, |
| 994 bool first_overscroll_y) { |
983 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 995 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
984 JNIEnv* env = AttachCurrentThread(); | 996 JNIEnv* env = AttachCurrentThread(); |
985 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); | 997 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); |
986 if (obj.is_null()) | 998 if (obj.is_null()) |
987 return; | 999 return; |
988 Java_AwContents_didOverscroll( | 1000 Java_AwContents_didOverscroll( |
989 env, obj.obj(), overscroll_delta.x(), overscroll_delta.y()); | 1001 env, obj.obj(), overscroll_delta.x(), overscroll_delta.y(), |
| 1002 overscroll_velocity.x(), overscroll_velocity.y(), |
| 1003 first_overscroll_x, first_overscroll_y); |
990 } | 1004 } |
991 | 1005 |
992 void AwContents::SetDipScale(JNIEnv* env, jobject obj, jfloat dip_scale) { | 1006 void AwContents::SetDipScale(JNIEnv* env, jobject obj, jfloat dip_scale) { |
993 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 1007 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
994 browser_view_renderer_.SetDipScale(dip_scale); | 1008 browser_view_renderer_.SetDipScale(dip_scale); |
995 } | 1009 } |
996 | 1010 |
997 void AwContents::ScrollTo(JNIEnv* env, jobject obj, jint x, jint y) { | 1011 void AwContents::ScrollTo(JNIEnv* env, jobject obj, jint x, jint y) { |
998 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 1012 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
999 browser_view_renderer_.ScrollTo(gfx::Vector2d(x, y)); | 1013 browser_view_renderer_.ScrollTo(gfx::Vector2d(x, y)); |
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1138 | 1152 |
1139 AwMessagePortServiceImpl::GetInstance()->CreateMessageChannel(env, ports, | 1153 AwMessagePortServiceImpl::GetInstance()->CreateMessageChannel(env, ports, |
1140 GetMessagePortMessageFilter()); | 1154 GetMessagePortMessageFilter()); |
1141 } | 1155 } |
1142 | 1156 |
1143 void SetShouldDownloadFavicons(JNIEnv* env, jclass jclazz) { | 1157 void SetShouldDownloadFavicons(JNIEnv* env, jclass jclazz) { |
1144 g_should_download_favicons = true; | 1158 g_should_download_favicons = true; |
1145 } | 1159 } |
1146 | 1160 |
1147 } // namespace android_webview | 1161 } // namespace android_webview |
OLD | NEW |