Chrome/Mac layout error on Google Docs Demo page

content/renderer/render_view_impl.cc

 // Copyright (c) 2011 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 "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 2853 matching lines @@
 
   gfx::Size size(webview()->mainFrame()->contentsPreferredWidth(),
                  webview()->mainFrame()->documentElementScrollHeight());
 
   // In the presence of zoom, these sizes are still reported as if unzoomed,
   // so we need to adjust.
   double zoom_factor = WebView::zoomLevelToZoomFactor(webview()->zoomLevel());
   size.set_width(static_cast<int>(size.width() * zoom_factor));
   size.set_height(static_cast<int>(size.height() * zoom_factor));
 
+  if (!size.height())
+    size.set_height(preferred_size_.height());
+
   if (size == preferred_size_)
     return;
 
   preferred_size_ = size;
   Send(new ViewHostMsg_DidContentsPreferredSizeChange(routing_id_,
                                                       preferred_size_));
 }
 
 void RenderViewImpl::didChangeContentsSize(WebFrame* frame,
                                            const WebSize& size) {
@@ skipping 1844 matching lines @@
   return !!RenderThreadImpl::current()->compositor_thread();
 }
 
 void RenderViewImpl::OnJavaBridgeInit(
     const IPC::ChannelHandle& channel_handle) {
   DCHECK(!java_bridge_dispatcher_.get());
 #if defined(ENABLE_JAVA_BRIDGE)
   java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle));
 #endif
 }