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

Side by Side Diff: content/browser/web_contents/web_contents_android.cc

Issue 2595263002: Introduce ViewRoot forwarding input/view events to native (Closed)
Patch Set: tests Created 3 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/web_contents/web_contents_android.h" 5 #include "content/browser/web_contents/web_contents_android.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_array.h" 10 #include "base/android/jni_array.h"
(...skipping 22 matching lines...) Expand all
33 #include "content/public/browser/browser_context.h" 33 #include "content/public/browser/browser_context.h"
34 #include "content/public/browser/browser_thread.h" 34 #include "content/public/browser/browser_thread.h"
35 #include "content/public/browser/message_port_provider.h" 35 #include "content/public/browser/message_port_provider.h"
36 #include "content/public/browser/render_widget_host.h" 36 #include "content/public/browser/render_widget_host.h"
37 #include "content/public/browser/web_contents.h" 37 #include "content/public/browser/web_contents.h"
38 #include "content/public/common/content_switches.h" 38 #include "content/public/common/content_switches.h"
39 #include "jni/WebContentsImpl_jni.h" 39 #include "jni/WebContentsImpl_jni.h"
40 #include "net/android/network_library.h" 40 #include "net/android/network_library.h"
41 #include "ui/accessibility/ax_node_data.h" 41 #include "ui/accessibility/ax_node_data.h"
42 #include "ui/android/overscroll_refresh_handler.h" 42 #include "ui/android/overscroll_refresh_handler.h"
43 #include "ui/android/view_root.h"
43 #include "ui/gfx/android/device_display_info.h" 44 #include "ui/gfx/android/device_display_info.h"
44 #include "ui/gfx/android/java_bitmap.h" 45 #include "ui/gfx/android/java_bitmap.h"
45 #include "ui/gfx/geometry/rect.h" 46 #include "ui/gfx/geometry/rect.h"
46 47
47 using base::android::AttachCurrentThread; 48 using base::android::AttachCurrentThread;
48 using base::android::ConvertJavaStringToUTF8; 49 using base::android::ConvertJavaStringToUTF8;
49 using base::android::ConvertJavaStringToUTF16; 50 using base::android::ConvertJavaStringToUTF16;
50 using base::android::ConvertUTF8ToJavaString; 51 using base::android::ConvertUTF8ToJavaString;
51 using base::android::ConvertUTF16ToJavaString; 52 using base::android::ConvertUTF16ToJavaString;
52 using base::android::JavaParamRef; 53 using base::android::JavaParamRef;
(...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after
658 pref_color_type, 659 pref_color_type,
659 gfx::Rect(x, y, width, height), 660 gfx::Rect(x, y, width, height),
660 result_callback); 661 result_callback);
661 } 662 }
662 663
663 void WebContentsAndroid::ReloadLoFiImages(JNIEnv* env, 664 void WebContentsAndroid::ReloadLoFiImages(JNIEnv* env,
664 const JavaParamRef<jobject>& obj) { 665 const JavaParamRef<jobject>& obj) {
665 static_cast<WebContentsImpl*>(web_contents_)->ReloadLoFiImages(); 666 static_cast<WebContentsImpl*>(web_contents_)->ReloadLoFiImages();
666 } 667 }
667 668
669 void WebContentsAndroid::InitViewRoot(
670 JNIEnv* env,
671 const base::android::JavaParamRef<jobject>& jobj,
672 const base::android::JavaParamRef<jobject>& jview_root) {
673 ui::ViewRoot* view_root = ui::ViewRoot::FromJavaObject(env, jview_root);
674 view_root->AddChild(web_contents_->GetView()->GetNativeView());
675 }
676
668 int WebContentsAndroid::DownloadImage( 677 int WebContentsAndroid::DownloadImage(
669 JNIEnv* env, 678 JNIEnv* env,
670 const base::android::JavaParamRef<jobject>& obj, 679 const base::android::JavaParamRef<jobject>& obj,
671 const base::android::JavaParamRef<jstring>& jurl, 680 const base::android::JavaParamRef<jstring>& jurl,
672 jboolean is_fav_icon, 681 jboolean is_fav_icon,
673 jint max_bitmap_size, 682 jint max_bitmap_size,
674 jboolean bypass_cache, 683 jboolean bypass_cache,
675 const base::android::JavaParamRef<jobject>& jcallback) { 684 const base::android::JavaParamRef<jobject>& jcallback) {
676 GURL url(base::android::ConvertJavaStringToUTF8(env, jurl)); 685 GURL url(base::android::ConvertJavaStringToUTF8(env, jurl));
677 return web_contents_->DownloadImage( 686 return web_contents_->DownloadImage(
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
734 env, obj, callback, id, http_status_code, jurl, jbitmaps, jsizes); 743 env, obj, callback, id, http_status_code, jurl, jbitmaps, jsizes);
735 } 744 }
736 745
737 void WebContentsAndroid::SetMediaSession( 746 void WebContentsAndroid::SetMediaSession(
738 const ScopedJavaLocalRef<jobject>& j_media_session) { 747 const ScopedJavaLocalRef<jobject>& j_media_session) {
739 JNIEnv* env = base::android::AttachCurrentThread(); 748 JNIEnv* env = base::android::AttachCurrentThread();
740 Java_WebContentsImpl_setMediaSession(env, obj_, j_media_session); 749 Java_WebContentsImpl_setMediaSession(env, obj_, j_media_session);
741 } 750 }
742 751
743 } // namespace content 752 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698