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

Side by Side Diff: webkit/plugins/ppapi/resource_tracker.cc

Issue 8059006: Additional update on Pepper IME API and boilerplate thunk/proxy implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make win_shared happy. Created 9 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « webkit/plugins/ppapi/ppb_text_input_impl.cc ('k') | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/plugins/ppapi/resource_tracker.h" 5 #include "webkit/plugins/ppapi/resource_tracker.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <set> 8 #include <set>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/rand_util.h" 11 #include "base/rand_util.h"
12 #include "ppapi/c/pp_resource.h" 12 #include "ppapi/c/pp_resource.h"
13 #include "ppapi/c/pp_var.h" 13 #include "ppapi/c/pp_var.h"
14 #include "ppapi/shared_impl/function_group_base.h" 14 #include "ppapi/shared_impl/function_group_base.h"
15 #include "ppapi/shared_impl/id_assignment.h" 15 #include "ppapi/shared_impl/id_assignment.h"
16 #include "ppapi/shared_impl/tracker_base.h" 16 #include "ppapi/shared_impl/tracker_base.h"
17 #include "webkit/plugins/ppapi/callbacks.h" 17 #include "webkit/plugins/ppapi/callbacks.h"
18 #include "webkit/plugins/ppapi/npobject_var.h" 18 #include "webkit/plugins/ppapi/npobject_var.h"
19 #include "webkit/plugins/ppapi/plugin_module.h" 19 #include "webkit/plugins/ppapi/plugin_module.h"
20 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" 20 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
21 #include "webkit/plugins/ppapi/ppb_char_set_impl.h" 21 #include "webkit/plugins/ppapi/ppb_char_set_impl.h"
22 #include "webkit/plugins/ppapi/ppb_cursor_control_impl.h" 22 #include "webkit/plugins/ppapi/ppb_cursor_control_impl.h"
23 #include "webkit/plugins/ppapi/ppb_font_impl.h" 23 #include "webkit/plugins/ppapi/ppb_font_impl.h"
24 #include "webkit/plugins/ppapi/ppb_text_input_impl.h"
24 #include "webkit/plugins/ppapi/resource_creation_impl.h" 25 #include "webkit/plugins/ppapi/resource_creation_impl.h"
25 #include "webkit/plugins/ppapi/resource_helper.h" 26 #include "webkit/plugins/ppapi/resource_helper.h"
26 27
27 using ppapi::CheckIdType; 28 using ppapi::CheckIdType;
28 using ppapi::MakeTypedId; 29 using ppapi::MakeTypedId;
29 using ppapi::NPObjectVar; 30 using ppapi::NPObjectVar;
30 using ppapi::PPIdType; 31 using ppapi::PPIdType;
31 using ppapi::Var; 32 using ppapi::Var;
32 33
33 namespace webkit { 34 namespace webkit {
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 switch (id) { 138 switch (id) {
138 case ::ppapi::proxy::INTERFACE_ID_PPB_CHAR_SET: 139 case ::ppapi::proxy::INTERFACE_ID_PPB_CHAR_SET:
139 proxy.reset(new PPB_CharSet_Impl(instance)); 140 proxy.reset(new PPB_CharSet_Impl(instance));
140 break; 141 break;
141 case ::ppapi::proxy::INTERFACE_ID_PPB_CURSORCONTROL: 142 case ::ppapi::proxy::INTERFACE_ID_PPB_CURSORCONTROL:
142 proxy.reset(new PPB_CursorControl_Impl(instance)); 143 proxy.reset(new PPB_CursorControl_Impl(instance));
143 break; 144 break;
144 case ::ppapi::proxy::INTERFACE_ID_PPB_FONT: 145 case ::ppapi::proxy::INTERFACE_ID_PPB_FONT:
145 proxy.reset(new PPB_Font_FunctionImpl(instance)); 146 proxy.reset(new PPB_Font_FunctionImpl(instance));
146 break; 147 break;
148 case ::ppapi::proxy::INTERFACE_ID_PPB_TEXT_INPUT:
149 proxy.reset(new PPB_TextInput_Impl(instance));
150 break;
147 case ::ppapi::proxy::INTERFACE_ID_RESOURCE_CREATION: 151 case ::ppapi::proxy::INTERFACE_ID_RESOURCE_CREATION:
148 proxy.reset(new ResourceCreationImpl(instance)); 152 proxy.reset(new ResourceCreationImpl(instance));
149 break; 153 break;
150 default: 154 default:
151 NOTREACHED(); 155 NOTREACHED();
152 } 156 }
153 157
154 return proxy.get(); 158 return proxy.get();
155 } 159 }
156 160
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 } 320 }
317 321
318 // static 322 // static
319 void ResourceTracker::ClearSingletonOverride() { 323 void ResourceTracker::ClearSingletonOverride() {
320 DCHECK(singleton_override_); 324 DCHECK(singleton_override_);
321 singleton_override_ = NULL; 325 singleton_override_ = NULL;
322 } 326 }
323 327
324 } // namespace ppapi 328 } // namespace ppapi
325 } // namespace webkit 329 } // namespace webkit
326
OLDNEW
« no previous file with comments | « webkit/plugins/ppapi/ppb_text_input_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698