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

Side by Side Diff: ppapi/proxy/ppb_instance_proxy.cc

Issue 15806016: Update ppapi/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | « ppapi/proxy/plugin_var_tracker_unittest.cc ('k') | ppapi/proxy/ppb_message_loop_proxy.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ppapi/proxy/ppb_instance_proxy.h" 5 #include "ppapi/proxy/ppb_instance_proxy.h"
6 6
7 #include "base/memory/ref_counted.h" 7 #include "base/memory/ref_counted.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "ppapi/c/pp_errors.h" 9 #include "ppapi/c/pp_errors.h"
10 #include "ppapi/c/pp_time.h" 10 #include "ppapi/c/pp_time.h"
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 case FLASH_CLIPBOARD_SINGLETON_ID: 404 case FLASH_CLIPBOARD_SINGLETON_ID:
405 case FLASH_FILE_SINGLETON_ID: 405 case FLASH_FILE_SINGLETON_ID:
406 case FLASH_FULLSCREEN_SINGLETON_ID: 406 case FLASH_FULLSCREEN_SINGLETON_ID:
407 case FLASH_SINGLETON_ID: 407 case FLASH_SINGLETON_ID:
408 case PDF_SINGLETON_ID: 408 case PDF_SINGLETON_ID:
409 NOTREACHED(); 409 NOTREACHED();
410 break; 410 break;
411 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) 411 #endif // !defined(OS_NACL) && !defined(NACL_WIN64)
412 } 412 }
413 413
414 if (!new_singleton) { 414 if (!new_singleton.get()) {
415 // Getting here implies that a constructor is missing in the above switch. 415 // Getting here implies that a constructor is missing in the above switch.
416 NOTREACHED(); 416 NOTREACHED();
417 return NULL; 417 return NULL;
418 } 418 }
419 419
420 data->singleton_resources[id] = new_singleton; 420 data->singleton_resources[id] = new_singleton;
421 return new_singleton.get(); 421 return new_singleton.get();
422 } 422 }
423 423
424 int32_t PPB_Instance_Proxy::RequestInputEvents(PP_Instance instance, 424 int32_t PPB_Instance_Proxy::RequestInputEvents(PP_Instance instance,
(...skipping 829 matching lines...) Expand 10 before | Expand all | Expand 10 after
1254 PP_Instance instance) { 1254 PP_Instance instance) {
1255 InstanceData* data = static_cast<PluginDispatcher*>(dispatcher())-> 1255 InstanceData* data = static_cast<PluginDispatcher*>(dispatcher())->
1256 GetInstanceData(instance); 1256 GetInstanceData(instance);
1257 if (!data) 1257 if (!data)
1258 return; // Instance was probably deleted. 1258 return; // Instance was probably deleted.
1259 data->should_do_request_surrounding_text = false; 1259 data->should_do_request_surrounding_text = false;
1260 } 1260 }
1261 1261
1262 } // namespace proxy 1262 } // namespace proxy
1263 } // namespace ppapi 1263 } // namespace ppapi
OLDNEW
« no previous file with comments | « ppapi/proxy/plugin_var_tracker_unittest.cc ('k') | ppapi/proxy/ppb_message_loop_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698