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

Unified Diff: ppapi/proxy/ppb_flash_proxy.cc

Issue 10913257: Convert url request info to new proxy API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 8 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/proxy/ppb_flash_proxy.h ('k') | ppapi/proxy/ppb_url_loader_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/ppb_flash_proxy.cc
diff --git a/ppapi/proxy/ppb_flash_proxy.cc b/ppapi/proxy/ppb_flash_proxy.cc
index 3ea9c220075244ba31e440bfe532d00b80c8435d..eeddaf335cddcf0179a3d7bfab46b1107ea3acd7 100644
--- a/ppapi/proxy/ppb_flash_proxy.cc
+++ b/ppapi/proxy/ppb_flash_proxy.cc
@@ -202,12 +202,17 @@ int32_t PPB_Flash_Proxy::Navigate(PP_Instance instance,
request_info, true);
if (enter.failed())
return PP_ERROR_BADRESOURCE;
+ return Navigate(instance, enter.object()->GetData(), target,
+ from_user_action);
+}
+int32_t PPB_Flash_Proxy::Navigate(PP_Instance instance,
+ const URLRequestInfoData& data,
+ const char* target,
+ PP_Bool from_user_action) {
int32_t result = PP_ERROR_FAILED;
dispatcher()->Send(new PpapiHostMsg_PPBFlash_Navigate(
- API_ID_PPB_FLASH,
- instance, enter.object()->GetData(), target, from_user_action,
- &result));
+ API_ID_PPB_FLASH, instance, data, target, from_user_action, &result));
return result;
}
@@ -658,7 +663,7 @@ void PPB_Flash_Proxy::OnHostMsgGetProxyForURL(PP_Instance instance,
}
void PPB_Flash_Proxy::OnHostMsgNavigate(PP_Instance instance,
- const PPB_URLRequestInfo_Data& data,
+ const URLRequestInfoData& data,
const std::string& target,
PP_Bool from_user_action,
int32_t* result) {
@@ -684,19 +689,8 @@ void PPB_Flash_Proxy::OnHostMsgNavigate(PP_Instance instance,
// It is safe, because it is essentially equivalent to NPN_GetURL, where Flash
// would expect re-entrancy. When running in-process, it does re-enter here.
host_dispatcher->set_allow_plugin_reentrancy();
-
- // Make a temporary request resource.
- thunk::EnterResourceCreation enter(instance);
- if (enter.failed()) {
- *result = PP_ERROR_FAILED;
- return;
- }
- ScopedPPResource request_resource(
- ScopedPPResource::PassRef(),
- enter.functions()->CreateURLRequestInfo(instance, data));
-
*result = enter_instance.functions()->GetFlashAPI()->Navigate(
- instance, request_resource, target.c_str(), from_user_action);
+ instance, data, target.c_str(), from_user_action);
}
void PPB_Flash_Proxy::OnHostMsgRunMessageLoop(PP_Instance instance) {
« no previous file with comments | « ppapi/proxy/ppb_flash_proxy.h ('k') | ppapi/proxy/ppb_url_loader_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698