[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);
+
+  UpdateRenderViewHostExtSettings();
+  if (web_contents->GetRenderViewHost()) {
+    UpdateRenderViewHostSettings(web_contents->GetRenderViewHost());
+  }
 }
 
-
 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) {
     rvhe->SetInitialPageScale(-1);
   } else {
     rvhe->SetInitialPageScale(initial_page_scale_percent_ / 100.0f);
   }
 }
 
 void AwSettings::UpdateTextZoom() {
   AwRenderViewHostExt* rvhe = GetAwRenderViewHostExt();
   if (!rvhe) return;
   if (text_zoom_percent_ > 0) {
     rvhe->SetTextZoomLevel(webkit_glue::ZoomFactorToZoomLevel(
         text_zoom_percent_ / 100.0f));
   } else {
     // Use the default zoom level value when Text Autosizer is turned on.
     rvhe->SetTextZoomLevel(0);
   }
 }
 
-void AwSettings::RenderViewCreated(content::RenderViewHost* render_view_host) {
+void AwSettings::UpdatePreferredSizeMode(
+    content::RenderViewHost* render_view_host) {
+  render_view_host->EnablePreferredSizeMode();
+}
+
+void AwSettings::UpdateRenderViewHostExtSettings() {
   UpdateEnableFixedLayoutMode();
   UpdateInitialPageScale();
   UpdateTextZoom();
 }
 
+void AwSettings::UpdateRenderViewHostSettings(
+    content::RenderViewHost* render_view_host) {
+  UpdatePreferredSizeMode(render_view_host);
+}
+
+void AwSettings::RenderViewCreated(content::RenderViewHost* render_view_host) {
+  // TODO(mkosiba): This is a bit contrived since there is only one
+  // RenderViewHostExt instance per WebContents, while the RenderViewHost
+  // associated with the WebContents can change over time (and there can be
+  // more than one of them associated with a WebContents).
+  // This means the RenderViewHostExt needs to be pinged to make it update the
+  // RenderViewHost settings every time the RenderViewHost changes. That
+  // code in turn depends on the fact that the newly-created RenderViewHost
+  // immediately becomes the current RenderViewHost for the given WebContents,
+  // which is documented by the following DCHECK:
+  DCHECK(web_contents()->GetRenderViewHost() == render_view_host);

[mkosiba (inactive), 2013/03/28 14:20:37]

this fails on some tests, which most likely means we're not always pushing the
AwSettings to the right RenderView! I'll take this DCHECK out for the moment and
work with Mikhail to identify and fix the problem.

[joth, 2013/03/28 22:51:08]

There's a tricky dance that happens on cross site navigations, with the RVH
being created and only being made "current" later on (when provisional load
committed, right?) you're probably tickling that.
It does indeed sound like RVHExt is either flawed in this scenario, or at very
least, badly named. I haven't quite got my head around what the 'right' way to
deal with this is.

[mkosiba (inactive), 2013/04/03 16:25:28]

So the way I see it is that we've got an actual problem, since this means that
whenever the DCHECK fails we don't propagate the settings to the correct
RenderView. Essentially we'd need to register for a RenderViewMadeCurrent
notification or something.

+
+  UpdateRenderViewHostExtSettings();
+  UpdateRenderViewHostSettings(render_view_host);
+}
+
 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