[android_webview] Fixes for wrap_content layouts.

android_webview/native/aw_contents.cc

Index: android_webview/native/aw_contents.cc
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
index 82100be08d15eba2b17a77a6708e7f76a1588fd7..e046ec79a2dc51d007a754290113e7251a0db2df 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -4,6 +4,8 @@
 
 #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"
@@ -51,6 +53,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;
@@ -759,14 +762,40 @@ 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::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) {