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

Unified Diff: trunk/src/ppapi/proxy/flash_drm_resource.cc

Issue 22901012: Revert 218305 "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
« no previous file with comments | « trunk/src/ppapi/proxy/flash_drm_resource.h ('k') | trunk/src/ppapi/proxy/flash_file_resource.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ppapi/proxy/flash_drm_resource.cc
===================================================================
--- trunk/src/ppapi/proxy/flash_drm_resource.cc (revision 218542)
+++ trunk/src/ppapi/proxy/flash_drm_resource.cc (working copy)
@@ -7,8 +7,9 @@
#include "base/bind.h"
#include "ppapi/c/pp_errors.h"
#include "ppapi/proxy/dispatch_reply_message.h"
-#include "ppapi/proxy/file_ref_resource.h"
#include "ppapi/proxy/ppapi_messages.h"
+#include "ppapi/proxy/ppb_file_ref_proxy.h"
+#include "ppapi/shared_impl/ppb_file_ref_shared.h"
#include "ppapi/shared_impl/var.h"
namespace ppapi {
@@ -87,14 +88,10 @@
PP_Resource* dest,
scoped_refptr<TrackedCallback> callback,
const ResourceMessageReplyParams& params,
- const FileRefCreateInfo& file_info) {
+ const PPB_FileRef_CreateInfo& file_info) {
if (TrackedCallback::IsPending(callback)) {
- if (params.result() == PP_OK) {
- *dest = FileRefResource::CreateFileRef(
- connection(),
- pp_instance(),
- file_info);
- }
+ if (params.result() == PP_OK)
+ *dest = PPB_FileRef_Proxy::DeserializeFileRef(file_info);
callback->Run(params.result());
}
}
« no previous file with comments | « trunk/src/ppapi/proxy/flash_drm_resource.h ('k') | trunk/src/ppapi/proxy/flash_file_resource.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698