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

Unified Diff: webkit/plugins/ppapi/ppb_flash_impl.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 | « webkit/plugins/ppapi/ppb_flash_impl.h ('k') | webkit/plugins/ppapi/ppb_url_loader_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/ppapi/ppb_flash_impl.cc
diff --git a/webkit/plugins/ppapi/ppb_flash_impl.cc b/webkit/plugins/ppapi/ppb_flash_impl.cc
index 7b7a74a2ef4753ab359434536054e5f19ef1e835..94a85a6d745724c6b62f77cfcc04f7caf58fd7ee 100644
--- a/webkit/plugins/ppapi/ppb_flash_impl.cc
+++ b/webkit/plugins/ppapi/ppb_flash_impl.cc
@@ -20,6 +20,7 @@
#include "ppapi/thunk/enter.h"
#include "ppapi/thunk/ppb_file_ref_api.h"
#include "ppapi/thunk/ppb_image_data_api.h"
+#include "ppapi/thunk/ppb_url_request_info_api.h"
#include "skia/ext/platform_canvas.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkMatrix.h"
@@ -39,7 +40,6 @@
#include "webkit/plugins/ppapi/plugin_module.h"
#include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
#include "webkit/plugins/ppapi/ppb_file_ref_impl.h"
-#include "webkit/plugins/ppapi/ppb_url_request_info_impl.h"
#include "webkit/plugins/ppapi/resource_helper.h"
#include "webkit/plugins/ppapi/ppb_image_data_impl.h"
@@ -197,12 +197,17 @@ int32_t PPB_Flash_Impl::Navigate(PP_Instance instance,
EnterResourceNoLock<PPB_URLRequestInfo_API> enter(request_info, true);
if (enter.failed())
return PP_ERROR_BADRESOURCE;
- PPB_URLRequestInfo_Impl* request =
- static_cast<PPB_URLRequestInfo_Impl*>(enter.object());
+ return Navigate(instance, enter.object()->GetData(), target,
+ from_user_action);
+}
+int32_t PPB_Flash_Impl::Navigate(PP_Instance instance,
+ const ::ppapi::URLRequestInfoData& data,
+ const char* target,
+ PP_Bool from_user_action) {
if (!target)
return PP_ERROR_BADARGUMENT;
- return instance_->Navigate(request, target, PP_ToBool(from_user_action));
+ return instance_->Navigate(data, target, PP_ToBool(from_user_action));
}
void PPB_Flash_Impl::RunMessageLoop(PP_Instance instance) {
« no previous file with comments | « webkit/plugins/ppapi/ppb_flash_impl.h ('k') | webkit/plugins/ppapi/ppb_url_loader_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698