[android_webview] Fixes for wrap_content layouts.

android_webview/renderer/aw_render_view_ext.cc

Index: android_webview/renderer/aw_render_view_ext.cc
diff --git a/android_webview/renderer/aw_render_view_ext.cc b/android_webview/renderer/aw_render_view_ext.cc
index 14cbb17a9a880b876a4af24abb469dd613fd04cc..22639e2ff5d505b90aa10360dd3391ce98c9ce20 100644
--- a/android_webview/renderer/aw_render_view_ext.cc
+++ b/android_webview/renderer/aw_render_view_ext.cc
@@ -164,6 +164,10 @@ bool AwRenderViewExt::OnMessageReceived(const IPC::Message& message) {
     IPC_MESSAGE_HANDLER(AwViewMsg_ResetScrollAndScaleState,
                         OnResetScrollAndScaleState)
     IPC_MESSAGE_HANDLER(AwViewMsg_SetInitialPageScale, OnSetInitialPageScale)
+    IPC_MESSAGE_HANDLER(AwViewMsg_EnableFixedLayoutOverride,
+                        OnEnableFixedLayoutOverride)
+    IPC_MESSAGE_HANDLER(AwViewMsg_DisableFixedLayoutOverride,
+                        OnDisableFixedLayoutOverride)
     IPC_MESSAGE_HANDLER(AwViewMsg_SetBackgroundColor, OnSetBackgroundColor)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
@@ -304,6 +308,21 @@ void AwRenderViewExt::OnSetInitialPageScale(double page_scale_factor) {
       page_scale_factor);
 }
 
+void AwRenderViewExt::OnEnableFixedLayoutOverride(const gfx::Size& size) {
+  if (!render_view() || !render_view()->GetWebView())
+    return;
+  DCHECK(render_view()->GetWebView()->isFixedLayoutModeEnabled());

[joth, 2013/09/06 02:15:17]

how do we get into this 'enabled' state to start with?

[mkosiba (inactive), 2013/09/06 18:23:09]

the RenderViewImpl sets it on initialization:
https://code.google.com/p/chromium/codesearch#chromium/src/content/renderer/r...

+  render_view()->GetWebView()->setFixedLayoutSizeLock(false);
+  render_view()->GetWebView()->setFixedLayoutSize(size);
+  render_view()->GetWebView()->setFixedLayoutSizeLock(true);
+}
+
+void AwRenderViewExt::OnDisableFixedLayoutOverride() {
+  if (!render_view() || !render_view()->GetWebView())
+    return;
+  render_view()->GetWebView()->setFixedLayoutSizeLock(false);
+}
+
 void AwRenderViewExt::OnSetBackgroundColor(SkColor c) {
   if (!render_view() || !render_view()->GetWebView())
     return;