Index: webkit/plugins/ppapi/resource_creation_impl.cc |
diff --git a/webkit/plugins/ppapi/resource_creation_impl.cc b/webkit/plugins/ppapi/resource_creation_impl.cc |
index 47ca3bc4c56ffdd39d3cf6ecf730a30f65942f19..71eeaf3cbd475aa5942cdc3e04aa690d9821b12d 100644 |
--- a/webkit/plugins/ppapi/resource_creation_impl.cc |
+++ b/webkit/plugins/ppapi/resource_creation_impl.cc |
@@ -21,7 +21,6 @@ |
#include "webkit/plugins/ppapi/ppb_scrollbar_impl.h" |
#include "webkit/plugins/ppapi/ppb_tcp_server_socket_private_impl.h" |
#include "webkit/plugins/ppapi/ppb_tcp_socket_private_impl.h" |
-#include "webkit/plugins/ppapi/ppb_url_loader_impl.h" |
#include "webkit/plugins/ppapi/ppb_video_decoder_impl.h" |
#include "webkit/plugins/ppapi/ppb_x509_certificate_private_impl.h" |
#include "webkit/plugins/ppapi/resource_helper.h" |
@@ -84,6 +83,13 @@ PP_Resource ResourceCreationImpl::CreateFileRef( |
return res ? res->GetReference() : 0; |
} |
+PP_Resource ResourceCreationImpl::CreateFileRef( |
+ const ::ppapi::PPB_FileRef_CreateInfo& serialized) { |
+ // When we're in-process, the host resource in the create info *is* the |
+ // resource, so we don't need to do anything. |
+ return serialized.resource.host_resource(); |
+} |
+ |
PP_Resource ResourceCreationImpl::CreateFlashDeviceID(PP_Instance instance) { |
return 0; // Not supported in-process. |
} |
@@ -227,10 +233,6 @@ PP_Resource ResourceCreationImpl::CreateUDPSocketPrivate(PP_Instance instance) { |
return 0; // Not supported in-process. |
} |
-PP_Resource ResourceCreationImpl::CreateURLLoader(PP_Instance instance) { |
- return (new PPB_URLLoader_Impl(instance, false))->GetReference(); |
-} |
- |
PP_Resource ResourceCreationImpl::CreateVideoCapture(PP_Instance instance) { |
return 0; // VideoCapture is not supported in process now. |
} |