Chrome side of webkit merge to 40124....

webkit/glue/webplugin_impl.cc

 // Copyright (c) 2006-2008 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 "config.h"
 
 #include "base/compiler_specific.h"
 #include "build/build_config.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
@@ skipping 15 matching lines @@
 #include "HTMLNames.h"
 #include "HTMLPlugInElement.h"
 #include "IntRect.h"
 #include "KURL.h"
 #include "KeyboardEvent.h"
 #include "MouseEvent.h"
 #include "Page.h"
 #include "PlatformContextSkia.h"
 #include "PlatformMouseEvent.h"
 #include "PlatformString.h"
+#include "RenderBox.h"
 #include "ResourceHandle.h"
 #include "ResourceHandleClient.h"
 #include "ResourceResponse.h"
 #include "ScriptController.h"
 #include "ScriptValue.h"
 #include "ScrollView.h"
 #include "Widget.h"
 MSVC_POP_WARNING();
 #undef LOG
 
@@ skipping 580 matching lines @@
   while (WebCore::RenderObject* ro = iterator.Next()) {
     if (ro == plugin_node) {
       // All nodes after this one are higher than plugin.
       higher = true;
     } else if (higher) {
       // Is this a visible iframe?
       WebCore::Node* n = ro->node();
       if (n && n->hasTagName(WebCore::HTMLNames::iframeTag)) {
         if (!ro->style() || ro->style()->visibility() == WebCore::VISIBLE) {
           WebCore::IntPoint point = roundedIntPoint(ro->localToAbsolute());
-          WebCore::IntSize size(ro->width(), ro->height());
+          WebCore::RenderBox* rbox = WebCore::RenderBox::toRenderBox(ro);
+          WebCore::IntSize size(rbox->width(), rbox->height());
           cutouts->append(WebCore::IntRect(point, size));
         }
       }
     }
   }
 }
 
 void WebPluginImpl::setFrameRect(const WebCore::IntRect& rect) {
   if (!parent())
     return;
@@ skipping 762 matching lines @@
     client_index = clients_.erase(client_index);
     if (resource_client)
       resource_client->DidFail();
   }
 
   // This needs to be called now and not in the destructor since the
   // webframe_ might not be valid anymore.
   webframe_->set_plugin_delegate(NULL);
   webframe_ = NULL;
 }