Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/pepper/resource_converter.h" | 5 #include "content/renderer/pepper/resource_converter.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "content/public/renderer/renderer_ppapi_host.h" | 9 #include "content/public/renderer/renderer_ppapi_host.h" |
| 10 #include "content/renderer/pepper/pepper_file_system_host.h" | |
| 10 #include "ipc/ipc_message.h" | 11 #include "ipc/ipc_message.h" |
| 12 #include "ppapi/host/ppapi_host.h" | |
| 13 #include "ppapi/host/resource_host.h" | |
| 14 #include "ppapi/proxy/ppapi_messages.h" | |
| 11 #include "ppapi/shared_impl/resource_var.h" | 15 #include "ppapi/shared_impl/resource_var.h" |
| 12 #include "ppapi/shared_impl/scoped_pp_var.h" | 16 #include "ppapi/shared_impl/scoped_pp_var.h" |
| 17 #include "third_party/WebKit/public/platform/WebFileSystem.h" | |
| 18 #include "third_party/WebKit/public/web/WebDOMFileSystem.h" | |
| 13 | 19 |
| 14 namespace { | 20 namespace { |
| 15 | 21 |
| 16 void FlushComplete( | 22 void FlushComplete( |
| 17 const base::Callback<void(bool)>& callback, | 23 const base::Callback<void(bool)>& callback, |
| 18 const std::vector<scoped_refptr<content::HostResourceVar> >& browser_vars, | 24 const std::vector<scoped_refptr<content::HostResourceVar> >& browser_vars, |
| 19 const std::vector<int>& pending_host_ids) { | 25 const std::vector<int>& pending_host_ids) { |
| 20 CHECK(browser_vars.size() == pending_host_ids.size()); | 26 CHECK(browser_vars.size() == pending_host_ids.size()); |
| 21 for (size_t i = 0; i < browser_vars.size(); ++i) { | 27 for (size_t i = 0; i < browser_vars.size(); ++i) { |
| 22 browser_vars[i]->set_pending_browser_host_id(pending_host_ids[i]); | 28 browser_vars[i]->set_pending_browser_host_id(pending_host_ids[i]); |
| 23 } | 29 } |
| 24 callback.Run(true); | 30 callback.Run(true); |
| 25 } | 31 } |
| 26 | 32 |
| 33 // Converts a WebKit::WebFileSystem::Type to a PP_FileSystemType. | |
| 34 PP_FileSystemType WebFileSystemTypeToPPAPI(WebKit::WebFileSystem::Type type) { | |
| 35 switch (type) { | |
| 36 case WebKit::WebFileSystem::TypeTemporary: | |
| 37 return PP_FILESYSTEMTYPE_LOCALTEMPORARY; | |
| 38 case WebKit::WebFileSystem::TypePersistent: | |
| 39 return PP_FILESYSTEMTYPE_LOCALPERSISTENT; | |
| 40 case WebKit::WebFileSystem::TypeIsolated: | |
| 41 return PP_FILESYSTEMTYPE_ISOLATED; | |
| 42 case WebKit::WebFileSystem::TypeExternal: | |
| 43 return PP_FILESYSTEMTYPE_EXTERNAL; | |
| 44 default: | |
| 45 NOTREACHED(); | |
| 46 return PP_FILESYSTEMTYPE_LOCALTEMPORARY; | |
| 47 } | |
| 48 } | |
| 49 | |
| 50 // Given a V8 value containing a DOMFileSystem, creates a resource host and | |
| 51 // returns the resource information for serialization. | |
| 52 // On error, false. | |
| 53 bool DOMFileSystemToResource( | |
| 54 PP_Instance instance, | |
| 55 content::RendererPpapiHost* host, | |
| 56 const WebKit::WebDOMFileSystem& dom_file_system, | |
| 57 int* pending_renderer_id, | |
| 58 scoped_ptr<IPC::Message>* create_message, | |
| 59 scoped_ptr<IPC::Message>* browser_host_create_message) { | |
| 60 // TODO(mgiuca): Ensure that external file systems are supported. | |
| 61 DCHECK(!dom_file_system.isNull()); | |
| 62 | |
| 63 PP_FileSystemType file_system_type = | |
| 64 WebFileSystemTypeToPPAPI(dom_file_system.type()); | |
| 65 GURL root_url = dom_file_system.rootURL(); | |
| 66 | |
| 67 *pending_renderer_id = host->GetPpapiHost()->AddPendingResourceHost( | |
| 68 scoped_ptr<ppapi::host::ResourceHost>( | |
| 69 new content::PepperFileSystemHost(host, instance, 0, root_url, | |
| 70 file_system_type))); | |
| 71 if (*pending_renderer_id == 0) | |
| 72 return false; | |
| 73 | |
| 74 create_message->reset( | |
| 75 new PpapiPluginMsg_FileSystem_CreateFromPendingHost(file_system_type)); | |
| 76 | |
| 77 browser_host_create_message->reset( | |
| 78 new PpapiHostMsg_FileSystem_CreateFromRenderer(root_url.spec(), | |
| 79 file_system_type)); | |
| 80 return true; | |
| 81 } | |
| 82 | |
| 27 } // namespace | 83 } // namespace |
| 28 | 84 |
| 29 namespace content { | 85 namespace content { |
| 30 | 86 |
| 31 ResourceConverter::~ResourceConverter() {} | 87 ResourceConverter::~ResourceConverter() {} |
| 32 | 88 |
| 33 ResourceConverterImpl::ResourceConverterImpl(PP_Instance instance, | 89 ResourceConverterImpl::ResourceConverterImpl(PP_Instance instance, |
| 34 RendererPpapiHost* host) | 90 RendererPpapiHost* host) |
| 35 : instance_(instance), | 91 : instance_(instance), |
| 36 host_(host) { | 92 host_(host) { |
| 37 } | 93 } |
| 38 | 94 |
| 39 ResourceConverterImpl::~ResourceConverterImpl() { | 95 ResourceConverterImpl::~ResourceConverterImpl() { |
| 40 // Verify Flush() was called. | 96 // Verify Flush() was called. |
| 41 DCHECK(browser_host_create_messages_.empty()); | 97 DCHECK(browser_host_create_messages_.empty()); |
| 42 DCHECK(browser_vars.empty()); | 98 DCHECK(browser_vars.empty()); |
| 43 } | 99 } |
| 44 | 100 |
| 45 bool ResourceConverterImpl::FromV8Value(v8::Handle<v8::Object> val, | 101 bool ResourceConverterImpl::FromV8Value(v8::Handle<v8::Object> val, |
| 46 v8::Handle<v8::Context> context, | 102 v8::Handle<v8::Context> context, |
| 47 PP_Var* result, | 103 PP_Var* result, |
| 48 bool* was_resource) { | 104 bool* was_resource) { |
| 49 v8::Context::Scope context_scope(context); | 105 v8::Context::Scope context_scope(context); |
| 50 v8::HandleScope handle_scope(context->GetIsolate()); | 106 v8::HandleScope handle_scope(context->GetIsolate()); |
| 51 | 107 |
| 52 *was_resource = false; | 108 *was_resource = false; |
| 53 // TODO(mgiuca): There are currently no values which can be converted to | |
| 54 // resources. | |
| 55 | 109 |
| 110 WebKit::WebDOMFileSystem dom_file_system = | |
| 111 WebKit::WebDOMFileSystem::fromV8Value(val); | |
| 112 if (!dom_file_system.isNull()) { | |
|
yzshen1
2013/10/23 18:29:24
nit, optional: it seems more clear to check the op
Matt Giuca
2013/10/24 01:00:11
No, I don't want to do that, because this function
| |
| 113 int pending_renderer_id; | |
| 114 scoped_ptr<IPC::Message> create_message; | |
| 115 scoped_ptr<IPC::Message> browser_host_create_message; | |
| 116 if (!DOMFileSystemToResource(instance_, host_, dom_file_system, | |
| 117 &pending_renderer_id, &create_message, | |
| 118 &browser_host_create_message)) { | |
| 119 return false; | |
| 120 } | |
| 121 DCHECK(create_message); | |
| 122 DCHECK(browser_host_create_message); | |
| 123 scoped_refptr<HostResourceVar> result_var = | |
| 124 CreateResourceVarWithBrowserHost( | |
| 125 pending_renderer_id, *create_message, *browser_host_create_message); | |
| 126 *result = result_var->GetPPVar(); | |
| 127 *was_resource = true; | |
| 128 return true; | |
| 129 } | |
| 130 | |
| 131 // The value was not convertible to a resource. Return true with | |
| 132 // |was_resource| set to false. As per the interface of FromV8Value, |result| | |
| 133 // may be left unmodified in this case. | |
| 56 return true; | 134 return true; |
| 57 } | 135 } |
| 58 | 136 |
| 59 void ResourceConverterImpl::Flush(const base::Callback<void(bool)>& callback) { | 137 void ResourceConverterImpl::Flush(const base::Callback<void(bool)>& callback) { |
| 60 host_->CreateBrowserResourceHosts( | 138 host_->CreateBrowserResourceHosts( |
| 61 instance_, | 139 instance_, |
| 62 browser_host_create_messages_, | 140 browser_host_create_messages_, |
| 63 base::Bind(&FlushComplete, callback, browser_vars)); | 141 base::Bind(&FlushComplete, callback, browser_vars)); |
| 64 browser_host_create_messages_.clear(); | 142 browser_host_create_messages_.clear(); |
| 65 browser_vars.clear(); | 143 browser_vars.clear(); |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 77 const IPC::Message& create_message, | 155 const IPC::Message& create_message, |
| 78 const IPC::Message& browser_host_create_message) { | 156 const IPC::Message& browser_host_create_message) { |
| 79 scoped_refptr<HostResourceVar> result = | 157 scoped_refptr<HostResourceVar> result = |
| 80 CreateResourceVar(pending_renderer_id, create_message); | 158 CreateResourceVar(pending_renderer_id, create_message); |
| 81 browser_host_create_messages_.push_back(browser_host_create_message); | 159 browser_host_create_messages_.push_back(browser_host_create_message); |
| 82 browser_vars.push_back(result); | 160 browser_vars.push_back(result); |
| 83 return result; | 161 return result; |
| 84 } | 162 } |
| 85 | 163 |
| 86 } // namespace content | 164 } // namespace content |
| OLD | NEW |