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

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

Issue 11450025: Revert 171389 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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/ppb_flash_proxy.cc ('k') | ppapi/proxy/resource_message_params.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) 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"
11 #include "ppapi/c/pp_var.h" 11 #include "ppapi/c/pp_var.h"
12 #include "ppapi/c/ppb_audio_config.h" 12 #include "ppapi/c/ppb_audio_config.h"
13 #include "ppapi/c/ppb_instance.h" 13 #include "ppapi/c/ppb_instance.h"
14 #include "ppapi/c/ppb_messaging.h" 14 #include "ppapi/c/ppb_messaging.h"
15 #include "ppapi/c/ppb_mouse_lock.h" 15 #include "ppapi/c/ppb_mouse_lock.h"
16 #include "ppapi/c/private/pp_content_decryptor.h" 16 #include "ppapi/c/private/pp_content_decryptor.h"
17 #include "ppapi/proxy/content_decryptor_private_serializer.h" 17 #include "ppapi/proxy/content_decryptor_private_serializer.h"
18 #include "ppapi/proxy/enter_proxy.h" 18 #include "ppapi/proxy/enter_proxy.h"
19 #include "ppapi/proxy/flash_clipboard_resource.h" 19 #include "ppapi/proxy/flash_clipboard_resource.h"
20 #include "ppapi/proxy/flash_file_resource.h"
20 #include "ppapi/proxy/flash_fullscreen_resource.h" 21 #include "ppapi/proxy/flash_fullscreen_resource.h"
21 #include "ppapi/proxy/flash_resource.h" 22 #include "ppapi/proxy/flash_resource.h"
22 #include "ppapi/proxy/gamepad_resource.h" 23 #include "ppapi/proxy/gamepad_resource.h"
23 #include "ppapi/proxy/host_dispatcher.h" 24 #include "ppapi/proxy/host_dispatcher.h"
24 #include "ppapi/proxy/plugin_dispatcher.h" 25 #include "ppapi/proxy/plugin_dispatcher.h"
25 #include "ppapi/proxy/ppapi_messages.h" 26 #include "ppapi/proxy/ppapi_messages.h"
26 #include "ppapi/proxy/ppb_flash_proxy.h" 27 #include "ppapi/proxy/ppb_flash_proxy.h"
27 #include "ppapi/proxy/serialized_var.h" 28 #include "ppapi/proxy/serialized_var.h"
28 #include "ppapi/shared_impl/ppapi_globals.h" 29 #include "ppapi/shared_impl/ppapi_globals.h"
29 #include "ppapi/shared_impl/ppb_url_util_shared.h" 30 #include "ppapi/shared_impl/ppb_url_util_shared.h"
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 376
376 switch (id) { 377 switch (id) {
377 case GAMEPAD_SINGLETON_ID: 378 case GAMEPAD_SINGLETON_ID:
378 new_singleton = new GamepadResource(connection, instance); 379 new_singleton = new GamepadResource(connection, instance);
379 break; 380 break;
380 // Flash resources aren't needed for NaCl. 381 // Flash resources aren't needed for NaCl.
381 #if !defined(OS_NACL) && !defined(NACL_WIN64) 382 #if !defined(OS_NACL) && !defined(NACL_WIN64)
382 case FLASH_CLIPBOARD_SINGLETON_ID: 383 case FLASH_CLIPBOARD_SINGLETON_ID:
383 new_singleton = new FlashClipboardResource(connection, instance); 384 new_singleton = new FlashClipboardResource(connection, instance);
384 break; 385 break;
386 case FLASH_FILE_SINGLETON_ID:
387 new_singleton = new FlashFileResource(connection, instance);
388 break;
385 case FLASH_FULLSCREEN_SINGLETON_ID: 389 case FLASH_FULLSCREEN_SINGLETON_ID:
386 new_singleton = new FlashFullscreenResource(connection, instance); 390 new_singleton = new FlashFullscreenResource(connection, instance);
387 break; 391 break;
388 case FLASH_SINGLETON_ID: 392 case FLASH_SINGLETON_ID:
389 new_singleton = new FlashResource(connection, instance); 393 new_singleton = new FlashResource(connection, instance);
390 break; 394 break;
391 #else 395 #else
392 case FLASH_CLIPBOARD_SINGLETON_ID: 396 case FLASH_CLIPBOARD_SINGLETON_ID:
397 case FLASH_FILE_SINGLETON_ID:
393 case FLASH_FULLSCREEN_SINGLETON_ID: 398 case FLASH_FULLSCREEN_SINGLETON_ID:
394 case FLASH_SINGLETON_ID: 399 case FLASH_SINGLETON_ID:
395 NOTREACHED(); 400 NOTREACHED();
396 break; 401 break;
397 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) 402 #endif // !defined(OS_NACL) && !defined(NACL_WIN64)
398 } 403 }
399 404
400 if (!new_singleton) { 405 if (!new_singleton) {
401 // Getting here implies that a constructor is missing in the above switch. 406 // Getting here implies that a constructor is missing in the above switch.
402 NOTREACHED(); 407 NOTREACHED();
(...skipping 808 matching lines...) Expand 10 before | Expand all | Expand 10 after
1211 PP_Instance instance) { 1216 PP_Instance instance) {
1212 InstanceData* data = static_cast<PluginDispatcher*>(dispatcher())-> 1217 InstanceData* data = static_cast<PluginDispatcher*>(dispatcher())->
1213 GetInstanceData(instance); 1218 GetInstanceData(instance);
1214 if (!data) 1219 if (!data)
1215 return; // Instance was probably deleted. 1220 return; // Instance was probably deleted.
1216 data->should_do_request_surrounding_text = false; 1221 data->should_do_request_surrounding_text = false;
1217 } 1222 }
1218 1223
1219 } // namespace proxy 1224 } // namespace proxy
1220 } // namespace ppapi 1225 } // namespace ppapi
OLDNEW
« no previous file with comments | « ppapi/proxy/ppb_flash_proxy.cc ('k') | ppapi/proxy/resource_message_params.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698