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

Unified Diff: trunk/src/chrome/renderer/pepper/pepper_flash_drm_renderer_host.cc

Issue 23462016: Revert 219911 "Pepper: Move FileRef to the "new" resource proxy." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 4 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
Index: trunk/src/chrome/renderer/pepper/pepper_flash_drm_renderer_host.cc
===================================================================
--- trunk/src/chrome/renderer/pepper/pepper_flash_drm_renderer_host.cc (revision 220164)
+++ trunk/src/chrome/renderer/pepper/pepper_flash_drm_renderer_host.cc (working copy)
@@ -12,6 +12,7 @@
#include "ppapi/host/host_message_context.h"
#include "ppapi/host/ppapi_host.h"
#include "ppapi/proxy/ppapi_messages.h"
+#include "ppapi/proxy/ppb_file_ref_proxy.h"
namespace chrome {
@@ -27,8 +28,7 @@
PP_Instance instance,
PP_Resource resource)
: ResourceHost(host->GetPpapiHost(), instance, resource),
- renderer_ppapi_host_(host),
- weak_factory_(this) {
+ renderer_ppapi_host_(host) {
}
PepperFlashDRMRendererHost::~PepperFlashDRMRendererHost() {
@@ -56,36 +56,14 @@
base::FilePath voucher_file = plugin_dir.Append(
base::FilePath(kVoucherFilename));
- std::vector<IPC::Message> create_msgs;
- create_msgs.push_back(PpapiHostMsg_FileRef_CreateExternal(voucher_file));
-
- renderer_ppapi_host_->CreateBrowserResourceHosts(
- pp_instance(),
- create_msgs,
- base::Bind(&PepperFlashDRMRendererHost::DidCreateFileRefHosts,
- weak_factory_.GetWeakPtr(),
- context->MakeReplyMessageContext(),
- voucher_file));
- return PP_OK_COMPLETIONPENDING;
+ ppapi::PPB_FileRef_CreateInfo create_info;
+ ppapi::proxy::PPB_FileRef_Proxy::SerializeFileRef(
+ plugin_instance->CreateExternalFileReference(voucher_file),
+ &create_info);
+ context->reply_msg =
+ PpapiPluginMsg_FlashDRM_GetVoucherFileReply(create_info);
+ return PP_OK;
}
-void PepperFlashDRMRendererHost::DidCreateFileRefHosts(
- const ppapi::host::ReplyMessageContext& reply_context,
- const base::FilePath& external_path,
- const std::vector<int>& pending_resource_ids) {
- DCHECK(pending_resource_ids.size() == 1);
-
- int pending_resource_id = 0;
- if (pending_resource_ids.size() == 1)
- pending_resource_id = pending_resource_ids[0];
-
- ppapi::FileRefCreateInfo create_info =
- ppapi::MakeExternalFileRefCreateInfo(external_path,
- std::string(),
- pending_resource_id);
- host()->SendReply(reply_context,
- PpapiPluginMsg_FlashDRM_GetVoucherFileReply(create_info));
-}
-
} // namespace chrome

Powered by Google App Engine
This is Rietveld 408576698