Fixes a flash plugin hang caused by opening google finance ticker symbols in ...

chrome/renderer/webplugin_delegate_proxy.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 "chrome/renderer/webplugin_delegate_proxy.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <atlbase.h>
@@ skipping 147 matching lines @@
 }
 
 WebPluginDelegateProxy::WebPluginDelegateProxy(const std::string& mime_type,
                                                const std::string& clsid,
                                                RenderView* render_view)
     : render_view_(render_view),
       plugin_(NULL),
       windowless_(false),
       mime_type_(mime_type),
       clsid_(clsid),
-      send_deferred_update_geometry_(false),
       npobject_(NULL),
       window_script_object_(NULL),
       sad_plugin_(NULL),
       invalidate_pending_(false),
       transparent_(false) {
 }
 
 WebPluginDelegateProxy::~WebPluginDelegateProxy() {
 }
 
@@ skipping 18 matching lines @@
 
   if (channel_host_) {
     channel_host_->RemoveRoute(instance_id_);
     Send(new PluginMsg_DestroyInstance(instance_id_));
   }
 
   render_view_->PluginDestroyed(this);
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
 
-void WebPluginDelegateProxy::FlushGeometryUpdates() {
-  if (send_deferred_update_geometry_) {
-    send_deferred_update_geometry_ = false;
-    Send(new PluginMsg_UpdateGeometry(instance_id_,
-                                      plugin_rect_,
-                                      deferred_clip_rect_,
-                                      TransportDIB::Id(),
-                                      TransportDIB::Id()));
-  }
-}
-
 bool WebPluginDelegateProxy::Initialize(const GURL& url, char** argn,
                                         char** argv, int argc,
                                         WebPlugin* plugin,
                                         bool load_manually) {
   std::string channel_name;
   FilePath plugin_path;
   if (!RenderThread::current()->Send(new ViewHostMsg_OpenChannelToPlugin(
           url, mime_type_, clsid_, webkit_glue::GetWebKitLocale(),
           &channel_name, &plugin_path)))
     return false;
@@ skipping 137 matching lines @@
 void WebPluginDelegateProxy::OnChannelError() {
   if (plugin_)
     plugin_->Invalidate();
   render_view_->PluginCrashed(plugin_path_);
 }
 
 void WebPluginDelegateProxy::UpdateGeometry(
                 const gfx::Rect& window_rect,
                 const gfx::Rect& clip_rect) {
   plugin_rect_ = window_rect;
-  if (!windowless_) {
-    deferred_clip_rect_ = clip_rect;
-    send_deferred_update_geometry_ = true;
-    return;
-  }
 
   // Be careful to explicitly call the default constructors for these ids,
   // as they can be POD on some platforms and we want them initialized.
   TransportDIB::Id transport_store_id = TransportDIB::Id();
   TransportDIB::Id background_store_id = TransportDIB::Id();
 
+  if (windowless_) {
 #if defined(OS_WIN)
-  // TODO(port): use TransportDIB instead of allocating these directly.
-  if (!backing_store_canvas_.get() ||
-      (window_rect.width() != backing_store_canvas_->getDevice()->width() ||
-       window_rect.height() != backing_store_canvas_->getDevice()->height())) {
-    // Create a shared memory section that the plugin paints into
-    // asynchronously.
-    ResetWindowlessBitmaps();
-    if (!window_rect.IsEmpty()) {
-      if (!CreateBitmap(&backing_store_, &backing_store_canvas_) ||
-          !CreateBitmap(&transport_store_, &transport_store_canvas_) ||
-          (transparent_ &&
-           !CreateBitmap(&background_store_, &background_store_canvas_))) {
-        DCHECK(false);
-        ResetWindowlessBitmaps();
-        return;
+    // TODO(port): use TransportDIB instead of allocating these directly.
+    if (!backing_store_canvas_.get() ||
+        (window_rect.width() != backing_store_canvas_->getDevice()->width() ||
+         window_rect.height() != backing_store_canvas_->getDevice()->height())) {
+      // Create a shared memory section that the plugin paints into
+      // asynchronously.
+      ResetWindowlessBitmaps();
+      if (!window_rect.IsEmpty()) {
+        if (!CreateBitmap(&backing_store_, &backing_store_canvas_) ||
+            !CreateBitmap(&transport_store_, &transport_store_canvas_) ||
+            (transparent_ &&
+             !CreateBitmap(&background_store_, &background_store_canvas_))) {
+          DCHECK(false);
+          ResetWindowlessBitmaps();
+          return;
+        }
+
+        // TODO(port): once we use TransportDIB we will properly fill in these
+        // ids; for now we just fill in the HANDLE field.
+        transport_store_id.handle = transport_store_->handle();
+        if (background_store_.get())
+          background_store_id.handle = background_store_->handle();
       }
-
-      // TODO(port): once we use TransportDIB we will properly fill in these
-      // ids; for now we just fill in the HANDLE field.
-      transport_store_id.handle = transport_store_->handle();
-      if (background_store_.get())
-        background_store_id.handle = background_store_->handle();
     }
+#else
+    // TODO(port): refactor our allocation of backing stores.
+    NOTIMPLEMENTED();
+#endif
   }
-#else
-  // TODO(port): refactor our allocation of backing stores.
-  NOTIMPLEMENTED();
-#endif
 
   IPC::Message* msg = new PluginMsg_UpdateGeometry(
       instance_id_, window_rect, clip_rect,
       transport_store_id, background_store_id);
   msg->set_unblock(true);
   Send(msg);
 }
 
 #if defined(OS_WIN)
 // Copied from render_widget.cc
@@ skipping 499 matching lines @@
   plugin_->CancelDocumentLoad();
 }
 
 void WebPluginDelegateProxy::OnInitiateHTTPRangeRequest(
     const std::string& url, const std::string& range_info,
     intptr_t existing_stream, bool notify_needed, intptr_t notify_data) {
   plugin_->InitiateHTTPRangeRequest(url.c_str(), range_info.c_str(),
                                     existing_stream, notify_needed,
                                     notify_data);
 }