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 350 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
361 } | 361 } |
362 | 362 |
363 // We need to allow re-entrancy here, because this may call into Javascript | 363 // We need to allow re-entrancy here, because this may call into Javascript |
364 // (e.g. with a "javascript:" URL), or do things like navigate away from the | 364 // (e.g. with a "javascript:" URL), or do things like navigate away from the |
365 // page, either one of which will need to re-enter into the plugin. | 365 // page, either one of which will need to re-enter into the plugin. |
366 // It is safe, because it is essentially equivalent to NPN_GetURL, where Flash | 366 // It is safe, because it is essentially equivalent to NPN_GetURL, where Flash |
367 // would expect re-entrancy. When running in-process, it does re-enter here. | 367 // would expect re-entrancy. When running in-process, it does re-enter here. |
368 host_dispatcher->set_allow_plugin_reentrancy(); | 368 host_dispatcher->set_allow_plugin_reentrancy(); |
369 | 369 |
370 // Make a temporary request resource. | 370 // Make a temporary request resource. |
371 thunk::EnterFunctionNoLock<thunk::ResourceCreationAPI> enter(instance, true); | 371 thunk::EnterResourceCreation enter(instance); |
372 if (enter.failed()) { | 372 if (enter.failed()) { |
373 *result = PP_ERROR_FAILED; | 373 *result = PP_ERROR_FAILED; |
374 return; | 374 return; |
375 } | 375 } |
376 ScopedPPResource request_resource( | 376 ScopedPPResource request_resource( |
377 ScopedPPResource::PassRef(), | 377 ScopedPPResource::PassRef(), |
378 enter.functions()->CreateURLRequestInfo(instance, data)); | 378 enter.functions()->CreateURLRequestInfo(instance, data)); |
379 | 379 |
380 *result = enter_instance.functions()->GetFlashAPI()->Navigate( | 380 *result = enter_instance.functions()->GetFlashAPI()->Navigate( |
381 instance, request_resource, target.c_str(), from_user_action); | 381 instance, request_resource, target.c_str(), from_user_action); |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
495 formats_array.get(), | 495 formats_array.get(), |
496 data_items_array); | 496 data_items_array); |
497 DLOG_IF(WARNING, result != PP_OK) | 497 DLOG_IF(WARNING, result != PP_OK) |
498 << "Write to clipboard failed unexpectedly."; | 498 << "Write to clipboard failed unexpectedly."; |
499 (void)result; // Prevent warning in release mode. | 499 (void)result; // Prevent warning in release mode. |
500 } | 500 } |
501 } | 501 } |
502 | 502 |
503 } // namespace proxy | 503 } // namespace proxy |
504 } // namespace ppapi | 504 } // namespace ppapi |
OLD | NEW |