[android_webview] Fixes for wrap_content layouts.

android_webview/native/aw_contents.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/native/aw_contents.h"
 
+#include <limits>
+
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
 #include "android_webview/browser/gpu_memory_buffer_factory_impl.h"
 #include "android_webview/browser/in_process_view_renderer.h"
 #include "android_webview/browser/net_disk_cache_remover.h"
 #include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h"
 #include "android_webview/common/aw_hit_test_data.h"
 #include "android_webview/native/aw_autofill_manager_delegate.h"
 #include "android_webview/native/aw_browser_dependency_factory.h"
 #include "android_webview/native/aw_contents_client_bridge.h"
@@ skipping 27 matching lines @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/renderer_preferences.h"
 #include "content/public/common/ssl_status.h"
 #include "jni/AwContents_jni.h"
 #include "net/cert/x509_certificate.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #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;
 
 using autofill::AutofillDriverImpl;
 using autofill::AutofillManager;
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF16ToJavaString;
@@ skipping 688 matching lines @@
 
 void AwContents::DidOverscroll(gfx::Vector2d overscroll_delta) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return;
   Java_AwContents_didOverscroll(
       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::SetFixedLayoutOverride(JNIEnv* env,
+                                        jobject obj,
+                                        jboolean enable,
+                                        jint width_dip,
+                                        jint height_dip) {
+  if (enable) {
+    render_view_host_ext_->EnableFixedLayoutOverride(
+        gfx::Size(width_dip, height_dip));
+  } else {
+    render_view_host_ext_->DisableFixedLayoutOverride();
+  }
+}
+
+void AwContents::SetViewportDipSizeOverride(JNIEnv* env,
+                                            jobject obj,
+                                            jboolean enable,
+                                            jint width_dip,
+                                            jint height_dip) {
+  ContentViewCore* content_view_core =
+      ContentViewCore::FromWebContents(web_contents_.get());
+  gfx::Size dip_size_override(width_dip, height_dip);
+  if (!enable)
+    dip_size_override.SetSize(0, 0);
+  content_view_core->SetViewportSizeDipOverride(dip_size_override);
 }
 
 void AwContents::ScrollTo(JNIEnv* env, jobject obj, jint xPix, jint yPix) {
   browser_view_renderer_->ScrollTo(gfx::Vector2d(xPix, yPix));
 }
 
 void AwContents::OnWebLayoutPageScaleFactorChanged(float page_scale_factor) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
@@ skipping 16 matching lines @@
   browser_view_renderer_->EnableOnNewPicture(enabled);
 }
 
 void AwContents::SetJsOnlineProperty(JNIEnv* env,
                                      jobject obj,
                                      jboolean network_up) {
   render_view_host_ext_->SetJsOnlineProperty(network_up);
 }
 
 }  // namespace android_webview