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

Side by Side Diff: android_webview/native/aw_contents.cc

Issue 23583025: [android_webview] Use auto-sizing for webviews in wrap content mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add test Created 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « android_webview/native/aw_contents.h ('k') | android_webview/renderer/aw_render_view_ext.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "android_webview/browser/aw_browser_context.h" 7 #include "android_webview/browser/aw_browser_context.h"
8 #include "android_webview/browser/aw_browser_main_parts.h" 8 #include "android_webview/browser/aw_browser_main_parts.h"
9 #include "android_webview/browser/gpu_memory_buffer_factory_impl.h" 9 #include "android_webview/browser/gpu_memory_buffer_factory_impl.h"
10 #include "android_webview/browser/in_process_view_renderer.h" 10 #include "android_webview/browser/in_process_view_renderer.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "content/public/browser/render_process_host.h" 43 #include "content/public/browser/render_process_host.h"
44 #include "content/public/browser/render_view_host.h" 44 #include "content/public/browser/render_view_host.h"
45 #include "content/public/browser/web_contents.h" 45 #include "content/public/browser/web_contents.h"
46 #include "content/public/common/ssl_status.h" 46 #include "content/public/common/ssl_status.h"
47 #include "jni/AwContents_jni.h" 47 #include "jni/AwContents_jni.h"
48 #include "net/cert/x509_certificate.h" 48 #include "net/cert/x509_certificate.h"
49 #include "third_party/skia/include/core/SkPicture.h" 49 #include "third_party/skia/include/core/SkPicture.h"
50 #include "ui/base/l10n/l10n_util_android.h" 50 #include "ui/base/l10n/l10n_util_android.h"
51 #include "ui/gfx/android/java_bitmap.h" 51 #include "ui/gfx/android/java_bitmap.h"
52 #include "ui/gfx/image/image.h" 52 #include "ui/gfx/image/image.h"
53 #include "ui/gfx/size.h"
53 54
54 struct AwDrawSWFunctionTable; 55 struct AwDrawSWFunctionTable;
55 struct AwDrawGLFunctionTable; 56 struct AwDrawGLFunctionTable;
56 57
57 using autofill::AutofillDriverImpl; 58 using autofill::AutofillDriverImpl;
58 using autofill::AutofillManager; 59 using autofill::AutofillManager;
59 using base::android::AttachCurrentThread; 60 using base::android::AttachCurrentThread;
60 using base::android::ConvertJavaStringToUTF16; 61 using base::android::ConvertJavaStringToUTF16;
61 using base::android::ConvertJavaStringToUTF8; 62 using base::android::ConvertJavaStringToUTF8;
62 using base::android::ConvertUTF16ToJavaString; 63 using base::android::ConvertUTF16ToJavaString;
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after
736 737
737 void AwContents::DidOverscroll(gfx::Vector2d overscroll_delta) { 738 void AwContents::DidOverscroll(gfx::Vector2d overscroll_delta) {
738 JNIEnv* env = AttachCurrentThread(); 739 JNIEnv* env = AttachCurrentThread();
739 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); 740 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
740 if (obj.is_null()) 741 if (obj.is_null())
741 return; 742 return;
742 Java_AwContents_didOverscroll( 743 Java_AwContents_didOverscroll(
743 env, obj.obj(), overscroll_delta.x(), overscroll_delta.y()); 744 env, obj.obj(), overscroll_delta.x(), overscroll_delta.y());
744 } 745 }
745 746
746 void AwContents::SetDipScale(JNIEnv* env, jobject obj, jfloat dipScale) { 747 void AwContents::SetDipScale(JNIEnv* env, jobject obj, jfloat dip_scale) {
747 browser_view_renderer_->SetDipScale(dipScale); 748 browser_view_renderer_->SetDipScale(dip_scale);
748 } 749 }
749 750
750 void AwContents::SetDisplayedPageScaleFactor(JNIEnv* env, 751 void AwContents::SetDisplayedPageScaleFactor(JNIEnv* env,
751 jobject obj, 752 jobject obj,
752 jfloat pageScaleFactor) { 753 jfloat page_scale_factor) {
753 browser_view_renderer_->SetPageScaleFactor(pageScaleFactor); 754 browser_view_renderer_->SetPageScaleFactor(page_scale_factor);
755 }
756
757 void AwContents::SetAutoResizeMode(JNIEnv* env,
758 jobject obj,
759 jboolean enabled,
760 jint width_dip) {
761 render_view_host_ext_->SetAutoResizeMode(enabled, width_dip);
754 } 762 }
755 763
756 void AwContents::ScrollTo(JNIEnv* env, jobject obj, jint xPix, jint yPix) { 764 void AwContents::ScrollTo(JNIEnv* env, jobject obj, jint xPix, jint yPix) {
757 browser_view_renderer_->ScrollTo(gfx::Vector2d(xPix, yPix)); 765 browser_view_renderer_->ScrollTo(gfx::Vector2d(xPix, yPix));
758 } 766 }
759 767
760 void AwContents::OnWebLayoutPageScaleFactorChanged(float page_scale_factor) { 768 void AwContents::OnWebLayoutPageScaleFactorChanged(float page_scale_factor) {
761 JNIEnv* env = AttachCurrentThread(); 769 JNIEnv* env = AttachCurrentThread();
762 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); 770 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
763 if (obj.is_null()) 771 if (obj.is_null())
(...skipping 16 matching lines...) Expand all
780 browser_view_renderer_->EnableOnNewPicture(enabled); 788 browser_view_renderer_->EnableOnNewPicture(enabled);
781 } 789 }
782 790
783 void AwContents::SetJsOnlineProperty(JNIEnv* env, 791 void AwContents::SetJsOnlineProperty(JNIEnv* env,
784 jobject obj, 792 jobject obj,
785 jboolean network_up) { 793 jboolean network_up) {
786 render_view_host_ext_->SetJsOnlineProperty(network_up); 794 render_view_host_ext_->SetJsOnlineProperty(network_up);
787 } 795 }
788 796
789 } // namespace android_webview 797 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/native/aw_contents.h ('k') | android_webview/renderer/aw_render_view_ext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698