webkit/plugins/ppapi/message_channel.cc - Issue 9564024: Re-land http://codereview.chromium.org/9403039/, r124106

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/message_channel.cc

Issue 9564024: Re-land http://codereview.chromium.org/9403039/, r124106 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: remove unnecessary change to ppapi_uitest.cc timer_ Created 8 years, 9 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: webkit/plugins/ppapi/message_channel.cc

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

index 3ef05970bb42430a430dbc440639e0578a20d140..db764e562a6d02a49bcb513c77ffec7da18e83e0 100644

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

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

@@ -420,7 +420,8 @@ MessageChannel::~MessageChannel() {

void MessageChannel::SetPassthroughObject(NPObject* passthrough) {

// Retain the passthrough object; We need to ensure it lives as long as this

// MessageChannel.

- WebBindings::retainObject(passthrough);

+ if (passthrough)

+ WebBindings::retainObject(passthrough);

// If we had a passthrough set already, release it. Note that we retain the

// incoming passthrough object first, so that we behave correctly if anyone

« no previous file with comments | « webkit/plugins/ppapi/host_var_tracker.cc ('k') | webkit/plugins/ppapi/npobject_var.h » ('j') | no next file with comments »