summaryrefslogtreecommitdiffstats
path: root/printing
diff options
context:
space:
mode:
authorjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-15 13:31:49 +0000
committerjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-15 13:31:49 +0000
commit6de0fd1d935e8c6c9257f1082dbd227acb1a06b1 (patch)
tree0ed5bc4ef9c2da0b498c30e562218f4528eaac9e /printing
parent0f86c358fdb5e47aa9cd4a99b12da5e66507d080 (diff)
downloadchromium_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 'printing')
-rw-r--r--printing/backend/print_backend_cups.cc4
-rw-r--r--printing/pdf_metafile_cg_mac.cc2
-rw-r--r--printing/printed_document.cc4
3 files changed, 5 insertions, 5 deletions
diff --git a/printing/backend/print_backend_cups.cc b/printing/backend/print_backend_cups.cc
index a164362..8d30328 100644
--- a/printing/backend/print_backend_cups.cc
+++ b/printing/backend/print_backend_cups.cc
@@ -79,8 +79,8 @@ class GcryptInitializer {
}
};
-static base::LazyInstance<GcryptInitializer> g_gcrypt_initializer(
- base::LINKER_INITIALIZED);
+static base::LazyInstance<GcryptInitializer> g_gcrypt_initializer =
+ LAZY_INSTANCE_INITIALIZER;
} // namespace
#endif // !defined(OS_MACOSX)
diff --git a/printing/pdf_metafile_cg_mac.cc b/printing/pdf_metafile_cg_mac.cc
index ec4b51d..78c1110 100644
--- a/printing/pdf_metafile_cg_mac.cc
+++ b/printing/pdf_metafile_cg_mac.cc
@@ -38,7 +38,7 @@ namespace {
base::LazyInstance<
base::ThreadLocalPointer<struct __CFSet>,
base::LeakyLazyInstanceTraits<base::ThreadLocalPointer<struct __CFSet> > >
- thread_pdf_docs(base::LINKER_INITIALIZED);
+ thread_pdf_docs = LAZY_INSTANCE_INITIALIZER;
} // namespace
diff --git a/printing/printed_document.cc b/printing/printed_document.cc
index fc6e8e3..28a70e9 100644
--- a/printing/printed_document.cc
+++ b/printing/printed_document.cc
@@ -37,8 +37,8 @@ struct PrintDebugDumpPath {
FilePath debug_dump_path;
};
-static base::LazyInstance<PrintDebugDumpPath> g_debug_dump_info(
- base::LINKER_INITIALIZED);
+static base::LazyInstance<PrintDebugDumpPath> g_debug_dump_info =
+ LAZY_INSTANCE_INITIALIZER;
} // namespace