content/common/socket_stream_dispatcher.cc - Issue 8491043: Allow linker initialization of lazy instance

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

Issue 8491043: Allow linker initialization of lazy instance (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix CrOS Created 9 years, 1 month 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/socket_stream_dispatcher.cc

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

index 6ee499ea0dc89befa0f5fe58f50eea4155abb67a..9a4e426364017f310b7b7f0666f813319b0e0763 100644

--- a/content/common/socket_stream_dispatcher.cc

+++ b/content/common/socket_stream_dispatcher.cc

@@ -67,7 +67,7 @@ class IPCWebSocketStreamHandleBridge

base::LazyInstance<

IDMap<IPCWebSocketStreamHandleBridge>,

base::LeakyLazyInstanceTraits<IDMap<IPCWebSocketStreamHandleBridge> > >

- IPCWebSocketStreamHandleBridge::all_bridges(base::LINKER_INITIALIZED);

+ IPCWebSocketStreamHandleBridge::all_bridges = LINKER_ZERO_INITIALIZED;

/* static */

IPCWebSocketStreamHandleBridge* IPCWebSocketStreamHandleBridge::FromSocketId(