webkit/plugins/ppapi/ppapi_webplugin_impl.cc - Issue 16023019: Only clear script objects during PPAPI WebPluginImpl teardown if it was initialized.

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: webkit/plugins/ppapi/ppapi_webplugin_impl.cc

Issue 16023019: Only clear script objects during PPAPI WebPluginImpl teardown if it was initialized. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 7 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:

View side-by-side diff with in-line comments

Download patch

Index: webkit/plugins/ppapi/ppapi_webplugin_impl.cc

diff --git a/webkit/plugins/ppapi/ppapi_webplugin_impl.cc b/webkit/plugins/ppapi/ppapi_webplugin_impl.cc

index 4ce9527c37a28abd9cf94e76db9d578b6deb5805..f03b0cd2583bb062a29acde3f199c558016c6bfe 100644

--- a/webkit/plugins/ppapi/ppapi_webplugin_impl.cc

+++ b/webkit/plugins/ppapi/ppapi_webplugin_impl.cc

@@ -120,7 +120,8 @@ bool WebPluginImpl::initialize(WebPluginContainer* container) {

void WebPluginImpl::destroy() {

// Tell |container_| to clear references to this plugin's script objects.

- container_->clearScriptObjects();

+ if (container_)

+ container_->clearScriptObjects();

if (instance_) {

::ppapi::PpapiGlobals::Get()->GetVarTracker()->ReleaseVar(instance_object_);

« no previous file with comments | « no previous file | no next file » | no next file with comments »