Use contents size for android_webview layout.

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 "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 54 matching lines @@
   if (!obj) return;
   // Grab the lock and call UpdateEverythingLocked.
   Java_AwSettings_updateEverything(env, obj);
 }
 
 void AwSettings::UpdateEverythingLocked(JNIEnv* env, jobject obj) {
   UpdateInitialPageScaleLocked(env, obj);
   UpdateWebkitPreferencesLocked(env, obj);
   UpdateUserAgentLocked(env, obj);
   ResetScrollAndScaleState(env, obj);
-  UpdatePreferredSizeMode();
   UpdateFormDataPreferencesLocked(env, obj);
+  UpdateContentSizeNotificationMode(env, obj);
 }
 
 void AwSettings::UpdateUserAgentLocked(JNIEnv* env, jobject obj) {
   if (!web_contents()) return;
 
   ScopedJavaLocalRef<jstring> str =
       Java_AwSettings_getUserAgentLocked(env, obj);
   bool ua_overidden = str.obj() != NULL;
 
   if (ua_overidden) {
@@ skipping 136 matching lines @@
       Java_AwSettings_getInitialPageScalePercentLocked(env, obj);
   if (initial_page_scale_percent == 0) {
     rvhe->SetInitialPageScale(-1);
   } else {
     float dip_scale = static_cast<float>(
         Java_AwSettings_getDIPScaleLocked(env, obj));
     rvhe->SetInitialPageScale(initial_page_scale_percent / dip_scale / 100.0f);
   }
 }
 
-void AwSettings::UpdatePreferredSizeMode() {
-  if (web_contents()->GetRenderViewHost()) {
+void AwSettings::UpdateContentSizeNotificationMode(JNIEnv* env, jobject obj) {
+  bool support_quirks = Java_AwSettings_getSupportLegacyQuirksLocked(env, obj);
+  if (support_quirks) {
+    GetAwRenderViewHostExt()->EnableContentsSizeNotifications();
+  }
+  if (!support_quirks && web_contents()->GetRenderViewHost()) {

[benm (inactive), 2013/09/06 19:27:53]

cache wc->GRVH?

[mnaganov (inactive), 2013/09/06 21:07:04]

nit: perhaps write as:

if (support_quirks) { ... } else if (web_contents()->GetRenderViewHost()) { ...
}

[mkosiba (inactive), 2013/09/09 13:46:21]

Done.

[mkosiba (inactive), 2013/09/09 13:46:21]

Done.

     web_contents()->GetRenderViewHost()->EnablePreferredSizeMode();
   }
 }
 
 void AwSettings::UpdateFormDataPreferencesLocked(JNIEnv* env, jobject obj) {
   if (!web_contents()) return;
   AwContents* contents = AwContents::FromWebContents(web_contents());
   if (!contents) return;
 
   contents->SetSaveFormData(Java_AwSettings_getSaveFormDataLocked(env, obj));
@@ skipping 28 matching lines @@
 static jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) {
   return base::android::ConvertUTF8ToJavaString(
       env, content::GetUserAgent(GURL())).Release();
 }
 
 bool RegisterAwSettings(JNIEnv* env) {
   return RegisterNativesImpl(env) >= 0;
 }
 
 }  // namespace android_webview