| Index: android_webview/native/aw_contents.cc
|
| diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
|
| index 6d2db78021772ce6a6f898f1bcf63ba0d4636ff6..b1b53eeb1c515fdc1a35a656d778799e8615a8fb 100644
|
| --- a/android_webview/native/aw_contents.cc
|
| +++ b/android_webview/native/aw_contents.cc
|
| @@ -628,7 +628,8 @@ jint AwContents::ReleasePopupWebContents(JNIEnv* env, jobject obj) {
|
| gfx::Point AwContents::GetLocationOnScreen() {
|
| JNIEnv* env = AttachCurrentThread();
|
| ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
|
| - if (obj.is_null()) return gfx::Point();
|
| + if (obj.is_null())
|
| + return gfx::Point();
|
| std::vector<int> location;
|
| base::android::JavaIntArrayToIntVector(
|
| env,
|
| @@ -637,6 +638,14 @@ gfx::Point AwContents::GetLocationOnScreen() {
|
| return gfx::Point(location[0], location[1]);
|
| }
|
|
|
| +void AwContents::OnPageScaleFactorChanged(float page_scale_factor) {
|
| + JNIEnv* env = AttachCurrentThread();
|
| + ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
|
| + if (obj.is_null())
|
| + return;
|
| + Java_AwContents_onPageScaleFactorChanged(env, obj.obj(), page_scale_factor);
|
| +}
|
| +
|
| ScopedJavaLocalRef<jobject> AwContents::CapturePicture(JNIEnv* env,
|
| jobject obj) {
|
| return browser_view_renderer_->CapturePicture();
|
|
|