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

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

Issue 4310002: Make PPAPI headers compile with C compilers (gcc on Linux & Mac and MSVS on W... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « webkit/glue/plugins/pepper_audio.cc ('k') | webkit/glue/plugins/pepper_common.h » ('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 "ppapi/c/dev/ppb_buffer_dev.h" 11 #include "ppapi/c/dev/ppb_buffer_dev.h"
12 #include "ppapi/c/pp_instance.h" 12 #include "ppapi/c/pp_instance.h"
13 #include "ppapi/c/pp_module.h" 13 #include "ppapi/c/pp_module.h"
14 #include "ppapi/c/pp_resource.h" 14 #include "ppapi/c/pp_resource.h"
15 #include "webkit/glue/plugins/pepper_common.h"
15 #include "webkit/glue/plugins/pepper_plugin_instance.h" 16 #include "webkit/glue/plugins/pepper_plugin_instance.h"
16 #include "webkit/glue/plugins/pepper_plugin_module.h" 17 #include "webkit/glue/plugins/pepper_plugin_module.h"
17 18
18 namespace pepper { 19 namespace pepper {
19 20
20 namespace { 21 namespace {
21 22
22 PP_Resource Create(PP_Module module_id, int32_t size) { 23 PP_Resource Create(PP_Module module_id, int32_t size) {
23 PluginModule* module = ResourceTracker::Get()->GetModule(module_id); 24 PluginModule* module = ResourceTracker::Get()->GetModule(module_id);
24 if (!module) 25 if (!module)
25 return 0; 26 return 0;
26 27
27 scoped_refptr<Buffer> buffer(new Buffer(module)); 28 scoped_refptr<Buffer> buffer(new Buffer(module));
28 if (!buffer->Init(size)) 29 if (!buffer->Init(size))
29 return 0; 30 return 0;
30 31
31 return buffer->GetReference(); 32 return buffer->GetReference();
32 } 33 }
33 34
34 bool IsBuffer(PP_Resource resource) { 35 PP_Bool IsBuffer(PP_Resource resource) {
35 return !!Resource::GetAs<Buffer>(resource); 36 return BoolToPPBool(!!Resource::GetAs<Buffer>(resource));
36 } 37 }
37 38
38 bool Describe(PP_Resource resource, int32_t* size_in_bytes) { 39 PP_Bool Describe(PP_Resource resource, int32_t* size_in_bytes) {
39 scoped_refptr<Buffer> buffer(Resource::GetAs<Buffer>(resource)); 40 scoped_refptr<Buffer> buffer(Resource::GetAs<Buffer>(resource));
40 if (!buffer) 41 if (!buffer)
41 return false; 42 return PP_FALSE;
42 buffer->Describe(size_in_bytes); 43 buffer->Describe(size_in_bytes);
43 return true; 44 return PP_TRUE;
44 } 45 }
45 46
46 void* Map(PP_Resource resource) { 47 void* Map(PP_Resource resource) {
47 scoped_refptr<Buffer> buffer(Resource::GetAs<Buffer>(resource)); 48 scoped_refptr<Buffer> buffer(Resource::GetAs<Buffer>(resource));
48 if (!buffer) 49 if (!buffer)
49 return NULL; 50 return NULL;
50 return buffer->Map(); 51 return buffer->Map();
51 } 52 }
52 53
53 void Unmap(PP_Resource resource) { 54 void Unmap(PP_Resource resource) {
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 mem_buffer_.reset(); 108 mem_buffer_.reset();
108 } 109 }
109 110
110 void Buffer::Swap(Buffer* other) { 111 void Buffer::Swap(Buffer* other) {
111 swap(other->mem_buffer_, mem_buffer_); 112 swap(other->mem_buffer_, mem_buffer_);
112 std::swap(other->size_, size_); 113 std::swap(other->size_, size_);
113 } 114 }
114 115
115 } // namespace pepper 116 } // namespace pepper
116 117
OLDNEW
« no previous file with comments | « webkit/glue/plugins/pepper_audio.cc ('k') | webkit/glue/plugins/pepper_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698