[android] Resize the android_webview if it's 0x0 initially.

android_webview/native/aw_settings.cc

 // Copyright (c) 2013 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_settings.h"
 
 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
 #include "android_webview/native/aw_contents.h"
+#include "content/public/browser/render_view_host.h"
+#include "content/public/browser/web_contents.h"
 #include "jni/AwSettings_jni.h"
 #include "webkit/glue/webkit_glue.h"
 
 namespace android_webview {
 
 AwSettings::AwSettings(JNIEnv* env, jobject obj)
     : java_ref_(env, obj),
       enable_fixed_layout_(false),
       initial_page_scale_percent_(0),
       text_zoom_percent_(100) {
@@ skipping 32 matching lines @@
   initial_page_scale_percent_ = page_scale_percent;
   UpdateInitialPageScale();
 }
 
 void AwSettings::SetTextZoom(JNIEnv* env, jobject obj, jint text_zoom_percent) {
   if (text_zoom_percent_ == text_zoom_percent) return;
   text_zoom_percent_ = text_zoom_percent;
   UpdateTextZoom();
 }
 
-void AwSettings::SetWebContents(JNIEnv* env, jobject obj, jint web_contents) {
-  Observe(reinterpret_cast<content::WebContents*>(web_contents));
+void AwSettings::SetWebContents(JNIEnv* env, jobject obj, jint jweb_contents) {
+  content::WebContents* web_contents =
+      reinterpret_cast<content::WebContents*>(jweb_contents);
+  Observe(web_contents);
+
+  content::RenderViewHost* rvh = web_contents->GetRenderViewHost();
+  if (rvh) {
+    rvh->EnablePreferredSizeMode();
+  }
 }
 
-
 void AwSettings::UpdateEnableFixedLayoutMode() {
   AwRenderViewHostExt* rvhe = GetAwRenderViewHostExt();
   if (!rvhe) return;
   rvhe->SetEnableFixedLayoutMode(enable_fixed_layout_);
 }
 
 void AwSettings::UpdateInitialPageScale() {
   AwRenderViewHostExt* rvhe = GetAwRenderViewHostExt();
   if (!rvhe) return;
   if (initial_page_scale_percent_ == 0) {
@@ skipping 12 matching lines @@
   } else {
     // Use the default zoom level value when Text Autosizer is turned on.
     rvhe->SetTextZoomLevel(0);
   }
 }
 
 void AwSettings::RenderViewCreated(content::RenderViewHost* render_view_host) {
   UpdateEnableFixedLayoutMode();
   UpdateInitialPageScale();
   UpdateTextZoom();
+  render_view_host->EnablePreferredSizeMode();

[joth, 2013/03/26 22:12:49]

for consistency I wonder about having UpdatePreferredSizeMode(), called here and
in SetWebContents

That way there's a single place to look for the policy about what it is set to
(i.e. always enabled).

also, I now wonder if the other UpdateFooBar methods need calling from the
SetWebContents? maybe check with mikhail/ben (it's mostly relevant for the
pop-up window case)

[mnaganov (inactive), 2013/03/27 11:06:31]

Yes, a good point! I have completely missed the pop-up case here. We also need
to be able to copy those setting from the embedder-provided WebView. Currently,
we only do that for the ContentSettings part.

I will shortly turn to refactoring ContentSettings / AwSettings mayhem and will
sort the things out.

 }
 
 static jint Init(JNIEnv* env,
                  jobject obj,
                  jint web_contents) {
   AwSettings* settings = new AwSettings(env, obj);
   settings->SetWebContents(env, obj, web_contents);
   return reinterpret_cast<jint>(settings);
 }
 
 bool RegisterAwSettings(JNIEnv* env) {
   return RegisterNativesImpl(env) >= 0;
 }
 
 }  // namespace android_webview