Index: Source/web/WebHelperPluginImpl.cpp |
diff --git a/Source/web/WebHelperPluginImpl.cpp b/Source/web/WebHelperPluginImpl.cpp |
index a86759cf6e17703560e9a96973867079b9f5f179..e8dfba0950bbc96fb6f283536f3fc68bd65445a7 100644 |
--- a/Source/web/WebHelperPluginImpl.cpp |
+++ b/Source/web/WebHelperPluginImpl.cpp |
@@ -57,6 +57,10 @@ WebHelperPluginImpl::WebHelperPluginImpl() |
WebHelperPluginImpl::~WebHelperPluginImpl() |
haraken
2014/10/11 17:33:03
Just to confirm: Isn't it possible that ~WebHelper
sof
2014/10/12 08:16:22
WebHelperPlugin is a wrapping layer that the embed
haraken
2014/10/12 12:56:04
Thanks, understood.
Can we add an ASSERT to verif
sof
2014/10/12 18:35:36
I'm not super comfortable with having such an asse
|
{ |
+#if ENABLE(OILPAN) |
+ if (m_pluginContainer) |
+ m_pluginContainer->dispose(); |
+#endif |
} |
bool WebHelperPluginImpl::initialize(const String& pluginType, WebLocalFrameImpl* frame) |
@@ -69,7 +73,7 @@ bool WebHelperPluginImpl::initialize(const String& pluginType, WebLocalFrameImpl |
Vector<String> attributeNames; |
Vector<String> attributeValues; |
ASSERT(frame->frame()->document()->url().isValid()); |
- m_pluginContainer = adoptRef(toWebPluginContainerImpl(frame->frame()->loader().client()->createPlugin( |
+ m_pluginContainer = adoptRefWillBeNoop(toWebPluginContainerImpl(frame->frame()->loader().client()->createPlugin( |
m_objectElement.get(), |
frame->frame()->document()->url(), |
attributeNames, |