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

Side by Side Diff: app/surface/accelerated_surface_mac.cc

Issue 3200011: Mac: Fix small leak in iosurface resizing code. (Closed)
Patch Set: Created 10 years, 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "app/surface/accelerated_surface_mac.h" 5 #include "app/surface/accelerated_surface_mac.h"
6 6
7 #include "app/gfx/gl/gl_bindings.h" 7 #include "app/gfx/gl/gl_bindings.h"
8 #include "app/gfx/gl/gl_implementation.h" 8 #include "app/gfx/gl/gl_implementation.h"
9 #include "app/surface/io_surface_support_mac.h" 9 #include "app/surface/io_surface_support_mac.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/scoped_cftyperef.h"
11 #include "gfx/rect.h" 12 #include "gfx/rect.h"
12 13
13 AcceleratedSurface::AcceleratedSurface() 14 AcceleratedSurface::AcceleratedSurface()
14 : allocate_fbo_(false), 15 : allocate_fbo_(false),
15 texture_(0), 16 texture_(0),
16 fbo_(0), 17 fbo_(0),
17 depth_stencil_renderbuffer_(0) { 18 depth_stencil_renderbuffer_(0) {
18 } 19 }
19 20
20 bool AcceleratedSurface::Initialize(gfx::GLContext* share_context, 21 bool AcceleratedSurface::Initialize(gfx::GLContext* share_context,
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 static void AddBooleanValue(CFMutableDictionaryRef dictionary, 103 static void AddBooleanValue(CFMutableDictionaryRef dictionary,
103 const CFStringRef key, 104 const CFStringRef key,
104 bool value) { 105 bool value) {
105 CFDictionaryAddValue(dictionary, key, 106 CFDictionaryAddValue(dictionary, key,
106 (value ? kCFBooleanTrue : kCFBooleanFalse)); 107 (value ? kCFBooleanTrue : kCFBooleanFalse));
107 } 108 }
108 109
109 static void AddIntegerValue(CFMutableDictionaryRef dictionary, 110 static void AddIntegerValue(CFMutableDictionaryRef dictionary,
110 const CFStringRef key, 111 const CFStringRef key,
111 int32 value) { 112 int32 value) {
112 CFNumberRef number = CFNumberCreate(NULL, kCFNumberSInt32Type, &value); 113 scoped_cftyperef<CFNumberRef> number(
113 CFDictionaryAddValue(dictionary, key, number); 114 CFNumberCreate(NULL, kCFNumberSInt32Type, &value));
115 CFDictionaryAddValue(dictionary, key, number.get());
114 } 116 }
115 117
116 void AcceleratedSurface::AllocateRenderBuffers(GLenum target, 118 void AcceleratedSurface::AllocateRenderBuffers(GLenum target,
117 const gfx::Size& size) { 119 const gfx::Size& size) {
118 if (!texture_) { 120 if (!texture_) {
119 // Generate the texture object. 121 // Generate the texture object.
120 glGenTextures(1, &texture_); 122 glGenTextures(1, &texture_);
121 glBindTexture(target, texture_); 123 glBindTexture(target, texture_);
122 glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); 124 glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
123 glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 125 glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 } 321 }
320 return transport_dib_->handle(); 322 return transport_dib_->handle();
321 } 323 }
322 324
323 void AcceleratedSurface::SetTransportDIBAllocAndFree( 325 void AcceleratedSurface::SetTransportDIBAllocAndFree(
324 Callback2<size_t, TransportDIB::Handle*>::Type* allocator, 326 Callback2<size_t, TransportDIB::Handle*>::Type* allocator,
325 Callback1<TransportDIB::Id>::Type* deallocator) { 327 Callback1<TransportDIB::Id>::Type* deallocator) {
326 dib_alloc_callback_.reset(allocator); 328 dib_alloc_callback_.reset(allocator);
327 dib_free_callback_.reset(deallocator); 329 dib_free_callback_.reset(deallocator);
328 } 330 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698