1) Roll WebKit DEPS to 45685

This roll picks up changes to WebCore::Widget which make that a RefCounted class.

2) Mods to plugin handling in our "glue" needed to recover from the above


Review URL: http://codereview.chromium.org/149443

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20440 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 3 deletions

diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc
index 157ecf3..83ee2bc 100644
--- a/webkit/glue/webplugin_impl.cc
+++ b/webkit/glue/webplugin_impl.cc
@@ -335,7 +335,7 @@ void WebPluginContainer::ReadHttpResponseInfo(
   }
 }
 
-WebCore::Widget* WebPluginImpl::Create(const GURL& url,
+PassRefPtr<WebCore::Widget> WebPluginImpl::Create(const GURL& url,
                                        char** argn,
                                        char** argv,
                                        int argc,
@@ -357,7 +357,7 @@ WebCore::Widget* WebPluginImpl::Create(const GURL& url,
 
   WebPluginContainer* container = new WebPluginContainer(webplugin);
   webplugin->SetContainer(container);
-  return container;
+  return adoptRef(container);
 }
 
 WebPluginImpl::WebPluginImpl(WebCore::HTMLPlugInElement* element,
@@ -1380,7 +1380,7 @@ void WebPluginImpl::TearDownPluginInstance(
   // plugin.  Tell the frame we're gone so that it can invalidate all
   // of those sub JSObjects.
   if (frame()) {
-    ASSERT(widget_ != NULL);
+    ASSERT(widget_);
     frame()->script()->cleanupScriptObjectsForPlugin(widget_);
   }