| OLD | NEW |
| 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 373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 384 case FLASH_CLIPBOARD_SINGLETON_ID: | 384 case FLASH_CLIPBOARD_SINGLETON_ID: |
| 385 new_singleton = new FlashClipboardResource(connection, instance); | 385 new_singleton = new FlashClipboardResource(connection, instance); |
| 386 break; | 386 break; |
| 387 case FLASH_FILE_SINGLETON_ID: | 387 case FLASH_FILE_SINGLETON_ID: |
| 388 new_singleton = new FlashFileResource(connection, instance); | 388 new_singleton = new FlashFileResource(connection, instance); |
| 389 break; | 389 break; |
| 390 case FLASH_FULLSCREEN_SINGLETON_ID: | 390 case FLASH_FULLSCREEN_SINGLETON_ID: |
| 391 new_singleton = new FlashFullscreenResource(connection, instance); | 391 new_singleton = new FlashFullscreenResource(connection, instance); |
| 392 break; | 392 break; |
| 393 case FLASH_SINGLETON_ID: | 393 case FLASH_SINGLETON_ID: |
| 394 new_singleton = new FlashResource(connection, instance); | 394 new_singleton = new FlashResource(connection, instance, |
| 395 static_cast<PluginDispatcher*>(dispatcher())); |
| 395 break; | 396 break; |
| 396 #else | 397 #else |
| 397 case FLASH_CLIPBOARD_SINGLETON_ID: | 398 case FLASH_CLIPBOARD_SINGLETON_ID: |
| 398 case FLASH_FILE_SINGLETON_ID: | 399 case FLASH_FILE_SINGLETON_ID: |
| 399 case FLASH_FULLSCREEN_SINGLETON_ID: | 400 case FLASH_FULLSCREEN_SINGLETON_ID: |
| 400 case FLASH_SINGLETON_ID: | 401 case FLASH_SINGLETON_ID: |
| 401 NOTREACHED(); | 402 NOTREACHED(); |
| 402 break; | 403 break; |
| 403 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) | 404 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) |
| 404 } | 405 } |
| (...skipping 849 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1254 PP_Instance instance) { | 1255 PP_Instance instance) { |
| 1255 InstanceData* data = static_cast<PluginDispatcher*>(dispatcher())-> | 1256 InstanceData* data = static_cast<PluginDispatcher*>(dispatcher())-> |
| 1256 GetInstanceData(instance); | 1257 GetInstanceData(instance); |
| 1257 if (!data) | 1258 if (!data) |
| 1258 return; // Instance was probably deleted. | 1259 return; // Instance was probably deleted. |
| 1259 data->should_do_request_surrounding_text = false; | 1260 data->should_do_request_surrounding_text = false; |
| 1260 } | 1261 } |
| 1261 | 1262 |
| 1262 } // namespace proxy | 1263 } // namespace proxy |
| 1263 } // namespace ppapi | 1264 } // namespace ppapi |
| OLD | NEW |