chrome/renderer/ggl/ggl.cc - Issue 5682008: Make members of Singleton<T> private and only visible to the singleton type.

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: chrome/renderer/ggl/ggl.cc

Issue 5682008: Make members of Singleton<T> private and only visible to the singleton type. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 10 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/chromeos/login/signed_settings_helper.cc ('K') | « chrome/renderer/extensions/renderer_extension_bindings.cc ('k') | chrome/renderer/render_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/renderer/ggl/ggl.cc

diff --git a/chrome/renderer/ggl/ggl.cc b/chrome/renderer/ggl/ggl.cc

index 577e853fab24f7292d5fe7cc63551efc177cada8..c95bbb583f82d722124d505414de5e455f20bb02 100644

--- a/chrome/renderer/ggl/ggl.cc

+++ b/chrome/renderer/ggl/ggl.cc

@@ -4,8 +4,8 @@

#include "build/build_config.h"

+#include "base/lazy_instance.h"

#include "base/ref_counted.h"

-#include "base/singleton.h"

#include "base/weak_ptr.h"

#include "chrome/renderer/command_buffer_proxy.h"

#include "chrome/renderer/ggl/ggl.h"

@@ -48,6 +48,10 @@ class GLES2Initializer {

private:

DISALLOW_COPY_AND_ASSIGN(GLES2Initializer);

};

+static base::LazyInstance<GLES2Initializer> g_gles2_initializer(

+ base::LINKER_INITIALIZED);

} // namespace anonymous

// Manages a GL context.

@@ -163,7 +167,7 @@ bool Context::Initialize(gfx::NativeViewId view,

return false;

// Ensure the gles2 library is initialized first in a thread safe way.

- Singleton<GLES2Initializer>::get();

+ g_gles2_initializer.Get();

// Allocate a frame buffer ID with respect to the parent.

if (parent_.get()) {