diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-15 13:31:49 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-15 13:31:49 +0000 |
| commit | 6de0fd1d935e8c6c9257f1082dbd227acb1a06b1 (patch) | |
| tree | 0ed5bc4ef9c2da0b498c30e562218f4528eaac9e /content/common/np_channel_base.cc | |
| parent | 0f86c358fdb5e47aa9cd4a99b12da5e66507d080 (diff) | |
| download | chromium_src-6de0fd1d935e8c6c9257f1082dbd227acb1a06b1.zip chromium_src-6de0fd1d935e8c6c9257f1082dbd227acb1a06b1.tar.gz chromium_src-6de0fd1d935e8c6c9257f1082dbd227acb1a06b1.tar.bz2 | |
Allow linker initialization of lazy instance
Using the initializer list construct = {0} allows the object to be linker initialized.
Modify the LazyInstance class design to make it a pod aggregate type that can be linker initialized this way. Also combines the instance and state members, in line with the Singleton<> class design.
Introduces a new LAZY_INSTANCE_INITIALIZER macro specifically for using to init all lazy instances + modify all existing callsites to use it. (Old code would no longer compile)
BUG=94925
TEST=existing tests pass. http://build.chromium.org/f/chromium/perf/linux-release/sizes/report.html?history=150&header=chrome-si&graph=chrome-si&rev=-1 should step downward.
TBR=jam@chromium.org,rvargas@chromium.org,darin@chromium.org,ben@chromium.org,apatrick@chromium.org,akalin@chromium.org
Review URL: http://codereview.chromium.org/8491043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110076 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/np_channel_base.cc')
| -rw-r--r-- | content/common/np_channel_base.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/common/np_channel_base.cc b/content/common/np_channel_base.cc index 62ea1e2..7b72119 100644 --- a/content/common/np_channel_base.cc +++ b/content/common/np_channel_base.cc @@ -19,12 +19,12 @@ typedef base::hash_map<std::string, scoped_refptr<NPChannelBase> > ChannelMap; static base::LazyInstance<ChannelMap, base::LeakyLazyInstanceTraits<ChannelMap> > - g_channels(base::LINKER_INITIALIZED); + g_channels = LAZY_INSTANCE_INITIALIZER; typedef std::stack<scoped_refptr<NPChannelBase> > NPChannelRefStack; static base::LazyInstance<NPChannelRefStack, base::LeakyLazyInstanceTraits<NPChannelRefStack> > - g_lazy_channel_stack(base::LINKER_INITIALIZED); + g_lazy_channel_stack = LAZY_INSTANCE_INITIALIZER; static int next_pipe_id = 0; |