Source/web/WebHelperPluginImpl.cpp - Issue 603193005: Move the Widget hierarchy to the Oilpan heap.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/web/WebHelperPluginImpl.cpp

Issue 603193005: Move the Widget hierarchy to the Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Support renderer-less plugin disposal Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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()

{

+#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,