3 files changed, 2 insertions, 7 deletions
diff --git a/webkit/glue/plugins/webplugin_delegate_impl.h b/webkit/glue/plugins/webplugin_delegate_impl.h
index aa856b4..61a41cd 100644
--- a/webkit/glue/plugins/webplugin_delegate_impl.h
+++ b/webkit/glue/plugins/webplugin_delegate_impl.h
@@ -61,8 +61,6 @@ class WebPluginDelegateImpl : public WebPluginDelegate {
   virtual void DidFinishLoadWithReason(NPReason reason);
   virtual int GetProcessId();
 
-  virtual void FlushGeometryUpdates() {
-  }
   virtual void SendJavaScriptStream(const std::string& url,
                                     const std::wstring& result,
                                     bool success, bool notify_needed,
diff --git a/webkit/glue/webplugin_delegate.h b/webkit/glue/webplugin_delegate.h
index ec42432..385044d 100644
--- a/webkit/glue/webplugin_delegate.h
+++ b/webkit/glue/webplugin_delegate.h
@@ -101,8 +101,6 @@ class WebPluginDelegate {
   // Returns the process id of the process that is running the plugin.
   virtual int GetProcessId() = 0;
 
-  virtual void FlushGeometryUpdates() = 0;
-
   // The result of the script execution is returned via this function.
   virtual void SendJavaScriptStream(const std::string& url,
                                     const std::wstring& result,
diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc
index 11f629d..04d8c79 100644
--- a/webkit/glue/webplugin_impl.cc
+++ b/webkit/glue/webplugin_impl.cc
@@ -235,7 +235,6 @@ void WebPluginContainer::setParent(WebCore::ScrollView* view) {
   WebCore::Widget::setParent(view);
   if (view) {
     impl_->setFrameRect(frameRect());
-    impl_->delegate_->FlushGeometryUpdates();
   }
 }
 
@@ -682,7 +681,8 @@ void WebPluginImpl::setFrameRect(const WebCore::IntRect& rect) {
                             webkit_glue::FromIntRect(clip_rect));
 
   // Initiate a download on the plugin url. This should be done for the
-  // first update geometry sequence.
+  // first update geometry sequence. We need to ensure that the plugin
+  // receives the geometry update before it starts receiving data.
   if (first_geometry_update_) {
     first_geometry_update_ = false;
     // An empty url corresponds to an EMBED tag with no src attribute.
@@ -1294,7 +1294,6 @@ bool WebPluginImpl::ReinitializePluginForResponse(
   // Force a geometry update to occur to ensure that the plugin becomes
   // visible.
   widget_->frameRectsChanged();
-  delegate_->FlushGeometryUpdates();
   // The plugin move sequences accumulated via DidMove are sent to the browser
   // whenever the renderer paints. Force a paint here to ensure that changes
   // to the plugin window are propagated to the browser.