diff options
author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-02 21:13:46 +0000 |
---|---|---|
committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-02 21:13:46 +0000 |
commit | fc72bb18b111ff63e57135d97de6d59291f3b7b8 (patch) | |
tree | f7fedf0a0577e38a0486e8bdc88a47a508bf122d /content/common/gpu/client/gl_helper_scaling.cc | |
parent | 7cd76fded67d66fb8ea4f5abce5241ad71d749a9 (diff) | |
download | chromium_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/common/gpu/client/gl_helper_scaling.cc')
-rw-r--r-- | content/common/gpu/client/gl_helper_scaling.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/common/gpu/client/gl_helper_scaling.cc b/content/common/gpu/client/gl_helper_scaling.cc index 220845e..7de3fc0 100644 --- a/content/common/gpu/client/gl_helper_scaling.cc +++ b/content/common/gpu/client/gl_helper_scaling.cc @@ -489,7 +489,7 @@ GLHelperScaling::GetShaderProgram(ShaderType type, bool swizzle) { ShaderProgramKeyType key(type, swizzle); scoped_refptr<ShaderProgram>& cache_entry(shader_programs_[key]); - if (!cache_entry) { + if (!cache_entry.get()) { cache_entry = new ShaderProgram(context_, helper_); std::basic_string<WebKit::WGC3Dchar> vertex_program; std::basic_string<WebKit::WGC3Dchar> fragment_program; |