Chrome side of webkit merge to 40124....

webkit/glue/webframe_impl.cc

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 1737 matching lines @@
     view->setScrollbarModes(WebCore::ScrollbarAuto,
                             WebCore::ScrollbarAuto);
   }
   DCHECK_EQ(frame()->isFrameSet(), false);
 
   SetPrinting(printing, page_width_min, page_width_max);
   if (!printing)
     pages_.clear();
 
   // The document width is well hidden.
-  if (width)
-    *width = frame()->document()->renderer()->width();
+  if (width) {
+    WebCore::RenderObject* obj = frame()->document()->renderer();
+    *width = WebCore::RenderBox::toRenderBox(obj)->width();
+  }
   return true;
 }
 
 int WebFrameImpl::ComputePageRects(const gfx::Size& page_size_px) {
   if (!printing_ ||
       !frame() ||
       !frame()->document()) {
     NOTREACHED();
     return 0;
   }
@@ skipping 65 matching lines @@
   return password_listeners_.get(input_element);
 }
 
 void WebFrameImpl::ClearPasswordListeners() {
   for (PasswordListenerMap::iterator iter = password_listeners_.begin();
        iter != password_listeners_.end(); ++iter) {
     delete iter->second;
   }
   password_listeners_.clear();
 }