[android_webview] Fixes for wrap_content layouts.

android_webview/native/aw_contents.h

 // Copyright (c) 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.
 
 #ifndef ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_
 #define ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_
 
 #include <jni.h>
 #include <list>
 #include <string>
@@ skipping 146 matching lines @@
   virtual void OnNewPicture() OVERRIDE;
   virtual gfx::Point GetLocationOnScreen() OVERRIDE;
   virtual void ScrollContainerViewTo(gfx::Vector2d new_value) OVERRIDE;
   virtual void DidOverscroll(gfx::Vector2d overscroll_delta) OVERRIDE;
 
   void ClearCache(JNIEnv* env, jobject obj, jboolean include_disk_files);
   void SetPendingWebContentsForPopup(scoped_ptr<content::WebContents> pending);
   jint ReleasePopupAwContents(JNIEnv* env, jobject obj);
 
   void ScrollTo(JNIEnv* env, jobject obj, jint xPix, jint yPix);
-  void SetDipScale(JNIEnv* env, jobject obj, jfloat dipScale);
+  void SetDipScale(JNIEnv* env, jobject obj, jfloat dip_scale);
   void SetDisplayedPageScaleFactor(JNIEnv* env,
                                    jobject obj,
-                                   jfloat pageScaleFactor);
-
+                                   jfloat page_scale_factor);
+  void SetFixedLayoutOverride(JNIEnv* env,
+                              jobject obj,
+                              jboolean enable,
+                              jint width_dip,
+                              jint height_dip);
+  void SetViewportDipSizeOverride(JNIEnv* env,
+                                  jobject obj,
+                                  jboolean enable,
+                                  jint width_dip,
+                                  jint height_dip);
   void SetSaveFormData(bool enabled);
 
   // Sets the java delegate
   void SetAwAutofillManagerDelegate(jobject delegate);
 
   void SetJsOnlineProperty(JNIEnv* env, jobject obj, jboolean network_up);
 
  private:
   void InitAutofillIfNecessary(bool enabled);
   void SetAndroidWebViewRendererPrefs();
@@ skipping 16 matching lines @@
   std::list<OriginCallback> pending_geolocation_prompts_;
 
   DISALLOW_COPY_AND_ASSIGN(AwContents);
 };
 
 bool RegisterAwContents(JNIEnv* env);
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_