Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(326)

Side by Side Diff: ui/gl/gl_image_ref_counted_memory.cc

Issue 496313004: Remove implicit conversions from scoped_refptr to T* in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/gl/gl_image_ref_counted_memory.h" 5 #include "ui/gl/gl_image_ref_counted_memory.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/ref_counted_memory.h" 8 #include "base/memory/ref_counted_memory.h"
9 9
10 namespace gfx { 10 namespace gfx {
11 11
12 GLImageRefCountedMemory::GLImageRefCountedMemory(const gfx::Size& size, 12 GLImageRefCountedMemory::GLImageRefCountedMemory(const gfx::Size& size,
13 unsigned internalformat) 13 unsigned internalformat)
14 : GLImageMemory(size, internalformat) { 14 : GLImageMemory(size, internalformat) {
15 } 15 }
16 16
17 GLImageRefCountedMemory::~GLImageRefCountedMemory() { 17 GLImageRefCountedMemory::~GLImageRefCountedMemory() {
18 DCHECK(!ref_counted_memory_); 18 DCHECK(!ref_counted_memory_.get());
19 } 19 }
20 20
21 bool GLImageRefCountedMemory::Initialize( 21 bool GLImageRefCountedMemory::Initialize(
22 base::RefCountedMemory* ref_counted_memory) { 22 base::RefCountedMemory* ref_counted_memory) {
23 if (!HasValidFormat()) 23 if (!HasValidFormat())
24 return false; 24 return false;
25 25
26 DCHECK(!ref_counted_memory_); 26 DCHECK(!ref_counted_memory_.get());
27 ref_counted_memory_ = ref_counted_memory; 27 ref_counted_memory_ = ref_counted_memory;
28 GLImageMemory::Initialize(ref_counted_memory_->front()); 28 GLImageMemory::Initialize(ref_counted_memory_->front());
29 return true; 29 return true;
30 } 30 }
31 31
32 void GLImageRefCountedMemory::Destroy(bool have_context) { 32 void GLImageRefCountedMemory::Destroy(bool have_context) {
33 GLImageMemory::Destroy(have_context); 33 GLImageMemory::Destroy(have_context);
34 ref_counted_memory_ = NULL; 34 ref_counted_memory_ = NULL;
35 } 35 }
36 36
37 } // namespace gfx 37 } // namespace gfx
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698