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_flash_proxy.h" | 5 #include "ppapi/proxy/ppb_flash_proxy.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
9 #include "base/time.h" | 9 #include "base/time.h" |
10 #include "ppapi/c/dev/ppb_font_dev.h" | 10 #include "ppapi/c/dev/ppb_font_dev.h" |
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
349 } | 349 } |
350 | 350 |
351 // We need to allow re-entrancy here, because this may call into Javascript | 351 // We need to allow re-entrancy here, because this may call into Javascript |
352 // (e.g. with a "javascript:" URL), or do things like navigate away from the | 352 // (e.g. with a "javascript:" URL), or do things like navigate away from the |
353 // page, either one of which will need to re-enter into the plugin. | 353 // page, either one of which will need to re-enter into the plugin. |
354 // It is safe, because it is essentially equivalent to NPN_GetURL, where Flash | 354 // It is safe, because it is essentially equivalent to NPN_GetURL, where Flash |
355 // would expect re-entrancy. When running in-process, it does re-enter here. | 355 // would expect re-entrancy. When running in-process, it does re-enter here. |
356 host_dispatcher->set_allow_plugin_reentrancy(); | 356 host_dispatcher->set_allow_plugin_reentrancy(); |
357 | 357 |
358 // Make a temporary request resource. | 358 // Make a temporary request resource. |
359 thunk::EnterFunctionNoLock<thunk::ResourceCreationAPI> enter(instance, true); | 359 thunk::EnterResourceCreation enter(instance); |
360 if (enter.failed()) { | 360 if (enter.failed()) { |
361 *result = PP_ERROR_FAILED; | 361 *result = PP_ERROR_FAILED; |
362 return; | 362 return; |
363 } | 363 } |
364 ScopedPPResource request_resource( | 364 ScopedPPResource request_resource( |
365 ScopedPPResource::PassRef(), | 365 ScopedPPResource::PassRef(), |
366 enter.functions()->CreateURLRequestInfo(instance, data)); | 366 enter.functions()->CreateURLRequestInfo(instance, data)); |
367 | 367 |
368 *result = enter_instance.functions()->GetFlashAPI()->Navigate( | 368 *result = enter_instance.functions()->GetFlashAPI()->Navigate( |
369 instance, request_resource, target.c_str(), from_user_action); | 369 instance, request_resource, target.c_str(), from_user_action); |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
483 formats_array.get(), | 483 formats_array.get(), |
484 data_items_array); | 484 data_items_array); |
485 DLOG_IF(WARNING, result != PP_OK) | 485 DLOG_IF(WARNING, result != PP_OK) |
486 << "Write to clipboard failed unexpectedly."; | 486 << "Write to clipboard failed unexpectedly."; |
487 (void)result; // Prevent warning in release mode. | 487 (void)result; // Prevent warning in release mode. |
488 } | 488 } |
489 } | 489 } |
490 | 490 |
491 } // namespace proxy | 491 } // namespace proxy |
492 } // namespace ppapi | 492 } // namespace ppapi |
OLD | NEW |