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

Side by Side Diff: webkit/glue/plugins/pepper_buffer.cc

Issue 3014034: Linux: Fix some NULL versus 0 issues to appease gcc-4.5. (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 | « chrome/gpu/gpu_channel.cc ('k') | webkit/glue/plugins/pepper_device_context_2d.cc » ('j') | 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 "webkit/glue/plugins/pepper_buffer.h" 5 #include "webkit/glue/plugins/pepper_buffer.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/scoped_ptr.h" 10 #include "base/scoped_ptr.h"
11 #include "third_party/ppapi/c/pp_instance.h" 11 #include "third_party/ppapi/c/pp_instance.h"
12 #include "third_party/ppapi/c/pp_module.h" 12 #include "third_party/ppapi/c/pp_module.h"
13 #include "third_party/ppapi/c/pp_resource.h" 13 #include "third_party/ppapi/c/pp_resource.h"
14 #include "third_party/ppapi/c/ppb_buffer.h" 14 #include "third_party/ppapi/c/ppb_buffer.h"
15 #include "webkit/glue/plugins/pepper_plugin_instance.h" 15 #include "webkit/glue/plugins/pepper_plugin_instance.h"
16 #include "webkit/glue/plugins/pepper_plugin_module.h" 16 #include "webkit/glue/plugins/pepper_plugin_module.h"
17 17
18 namespace pepper { 18 namespace pepper {
19 19
20 namespace { 20 namespace {
21 21
22 PP_Resource Create(PP_Module module_id, int32_t size) { 22 PP_Resource Create(PP_Module module_id, int32_t size) {
23 PluginModule* module = PluginModule::FromPPModule(module_id); 23 PluginModule* module = PluginModule::FromPPModule(module_id);
24 if (!module) 24 if (!module)
25 return NULL; 25 return 0;
26 26
27 scoped_refptr<Buffer> buffer(new Buffer(module)); 27 scoped_refptr<Buffer> buffer(new Buffer(module));
28 if (!buffer->Init(size)) 28 if (!buffer->Init(size))
29 return NULL; 29 return 0;
30 30
31 return buffer->GetReference(); 31 return buffer->GetReference();
32 } 32 }
33 33
34 bool IsBuffer(PP_Resource resource) { 34 bool IsBuffer(PP_Resource resource) {
35 return !!Resource::GetAs<Buffer>(resource); 35 return !!Resource::GetAs<Buffer>(resource);
36 } 36 }
37 37
38 bool Describe(PP_Resource resource, int32_t* size_in_bytes) { 38 bool Describe(PP_Resource resource, int32_t* size_in_bytes) {
39 scoped_refptr<Buffer> buffer(Resource::GetAs<Buffer>(resource)); 39 scoped_refptr<Buffer> buffer(Resource::GetAs<Buffer>(resource));
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 mem_buffer_.reset(); 107 mem_buffer_.reset();
108 } 108 }
109 109
110 void Buffer::Swap(Buffer* other) { 110 void Buffer::Swap(Buffer* other) {
111 swap(other->mem_buffer_, mem_buffer_); 111 swap(other->mem_buffer_, mem_buffer_);
112 std::swap(other->size_, size_); 112 std::swap(other->size_, size_);
113 } 113 }
114 114
115 } // namespace pepper 115 } // namespace pepper
116 116
OLDNEW
« no previous file with comments | « chrome/gpu/gpu_channel.cc ('k') | webkit/glue/plugins/pepper_device_context_2d.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698