| Index: android_webview/native/aw_contents.cc
|
| diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
|
| index dd8db0a43d62b20fe520441fc1157b3d888e1cab..f374deee62d4e230c85a037dc54a12a4576cbe1f 100644
|
| --- a/android_webview/native/aw_contents.cc
|
| +++ b/android_webview/native/aw_contents.cc
|
| @@ -50,6 +50,7 @@
|
| #include "ui/base/l10n/l10n_util_android.h"
|
| #include "ui/gfx/android/java_bitmap.h"
|
| #include "ui/gfx/image/image.h"
|
| +#include "ui/gfx/size.h"
|
|
|
| struct AwDrawSWFunctionTable;
|
| struct AwDrawGLFunctionTable;
|
| @@ -743,14 +744,21 @@ void AwContents::DidOverscroll(gfx::Vector2d overscroll_delta) {
|
| env, obj.obj(), overscroll_delta.x(), overscroll_delta.y());
|
| }
|
|
|
| -void AwContents::SetDipScale(JNIEnv* env, jobject obj, jfloat dipScale) {
|
| - browser_view_renderer_->SetDipScale(dipScale);
|
| +void AwContents::SetDipScale(JNIEnv* env, jobject obj, jfloat dip_scale) {
|
| + browser_view_renderer_->SetDipScale(dip_scale);
|
| }
|
|
|
| void AwContents::SetDisplayedPageScaleFactor(JNIEnv* env,
|
| jobject obj,
|
| - jfloat pageScaleFactor) {
|
| - browser_view_renderer_->SetPageScaleFactor(pageScaleFactor);
|
| + jfloat page_scale_factor) {
|
| + browser_view_renderer_->SetPageScaleFactor(page_scale_factor);
|
| +}
|
| +
|
| +void AwContents::SetAutoResizeMode(JNIEnv* env,
|
| + jobject obj,
|
| + jboolean enabled,
|
| + jint width_dip) {
|
| + render_view_host_ext_->SetAutoResizeMode(enabled, width_dip);
|
| }
|
|
|
| void AwContents::ScrollTo(JNIEnv* env, jobject obj, jint xPix, jint yPix) {
|
|
|