content/common/np_channel_base.cc - Issue 10824388: Retry channel setup for NPAPI plugins.

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: content/common/np_channel_base.cc

Issue 10824388: Retry channel setup for NPAPI plugins. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge oops. This time tried compiling before... Created 8 years, 4 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: content/common/np_channel_base.cc

diff --git a/content/common/np_channel_base.cc b/content/common/np_channel_base.cc

index 625677fcb82165f9e09dae7dee68f70dddae06d2..509c34102034345a6d372316d8b435c0b0cd3c3e 100644

--- a/content/common/np_channel_base.cc

+++ b/content/common/np_channel_base.cc

@@ -118,10 +118,10 @@ bool NPChannelBase::Init(base::MessageLoopProxy* ipc_message_loop,

bool create_pipe_now,

base::WaitableEvent* shutdown_event) {

#if defined(OS_POSIX)

- // Check the validity of fd for bug investigation. Remove after fixed.

- // See crbug.com/97285 for details.

- if (mode_ == IPC::Channel::MODE_CLIENT)

- CHECK_NE(-1, channel_handle_.socket.fd);

+ // Attempting to initialize with an invalid channel handle.

+ // See http://crbug.com/97285 for details.

+ if (mode_ == IPC::Channel::MODE_CLIENT && -1 == channel_handle_.socket.fd)

+ return false;

#endif

channel_.reset(new IPC::SyncChannel(

« no previous file with comments | « no previous file | content/renderer/webplugin_delegate_proxy.cc » ('j') | no next file with comments »