summaryrefslogtreecommitdiffstats
path: root/content/gpu/gpu_main.cc
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-02 21:13:46 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-02 21:13:46 +0000
commitfc72bb18b111ff63e57135d97de6d59291f3b7b8 (patch)
treef7fedf0a0577e38a0486e8bdc88a47a508bf122d /content/gpu/gpu_main.cc
parent7cd76fded67d66fb8ea4f5abce5241ad71d749a9 (diff)
downloadchromium_src-fc72bb18b111ff63e57135d97de6d59291f3b7b8.zip
chromium_src-fc72bb18b111ff63e57135d97de6d59291f3b7b8.tar.gz
chromium_src-fc72bb18b111ff63e57135d97de6d59291f3b7b8.tar.bz2
Update content/ to use scoped_refptr<T>::get() rather than implicit "operator T*"
Linux fixes BUG=110610 TBR=darin Review URL: https://chromiumcodereview.appspot.com/16294003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203624 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/gpu/gpu_main.cc')
-rw-r--r--content/gpu/gpu_main.cc12
1 files changed, 5 insertions, 7 deletions
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index d8a713b8..2bfd51f 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -276,24 +276,22 @@ namespace {
void CreateDummyGlContext() {
scoped_refptr<gfx::GLSurface> surface(
gfx::GLSurface::CreateOffscreenGLSurface(false, gfx::Size(1, 1)));
- if (!surface) {
+ if (!surface.get()) {
VLOG(1) << "gfx::GLSurface::CreateOffscreenGLSurface failed";
return;
}
// On Linux, this is needed to make sure /dev/nvidiactl has
// been opened and its descriptor cached.
- scoped_refptr<gfx::GLContext> context(
- gfx::GLContext::CreateGLContext(NULL,
- surface,
- gfx::PreferDiscreteGpu));
- if (!context) {
+ scoped_refptr<gfx::GLContext> context(gfx::GLContext::CreateGLContext(
+ NULL, surface.get(), gfx::PreferDiscreteGpu));
+ if (!context.get()) {
VLOG(1) << "gfx::GLContext::CreateGLContext failed";
return;
}
// Similarly, this is needed for /dev/nvidia0.
- if (context->MakeCurrent(surface)) {
+ if (context->MakeCurrent(surface.get())) {
context->ReleaseCurrent(surface.get());
} else {
VLOG(1) << "gfx::GLContext::MakeCurrent failed";