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; | |
kinuko
2013/10/25 05:43:02
In my understanding WebFileSystem::TypeExternal an
Matt Giuca
2013/10/29 12:21:42
I think they are the same. Look at this documentat
| |
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 DCHECK(!dom_file_system.isNull()); | |
61 | |
62 PP_FileSystemType file_system_type = | |
63 WebFileSystemTypeToPPAPI(dom_file_system.type()); | |
64 GURL root_url = dom_file_system.rootURL(); | |
65 | |
66 // External file systems are not currently supported. (Without this check, | |
67 // there would be a CHECK-fail in FileRefResource.) | |
68 // TODO(mgiuca): Support external file systems. | |
69 if (file_system_type == PP_FILESYSTEMTYPE_EXTERNAL) | |
70 return false; | |
71 | |
72 *pending_renderer_id = host->GetPpapiHost()->AddPendingResourceHost( | |
73 scoped_ptr<ppapi::host::ResourceHost>( | |
74 new content::PepperFileSystemHost(host, instance, 0, root_url, | |
75 file_system_type))); | |
76 if (*pending_renderer_id == 0) | |
77 return false; | |
78 | |
79 create_message->reset( | |
80 new PpapiPluginMsg_FileSystem_CreateFromPendingHost(file_system_type)); | |
81 | |
82 browser_host_create_message->reset( | |
83 new PpapiHostMsg_FileSystem_CreateFromRenderer(root_url.spec(), | |
84 file_system_type)); | |
85 return true; | |
86 } | |
87 | |
27 } // namespace | 88 } // namespace |
28 | 89 |
29 namespace content { | 90 namespace content { |
30 | 91 |
31 ResourceConverter::~ResourceConverter() {} | 92 ResourceConverter::~ResourceConverter() {} |
32 | 93 |
33 ResourceConverterImpl::ResourceConverterImpl(PP_Instance instance, | 94 ResourceConverterImpl::ResourceConverterImpl(PP_Instance instance, |
34 RendererPpapiHost* host) | 95 RendererPpapiHost* host) |
35 : instance_(instance), | 96 : instance_(instance), |
36 host_(host) { | 97 host_(host) { |
37 } | 98 } |
38 | 99 |
39 ResourceConverterImpl::~ResourceConverterImpl() { | 100 ResourceConverterImpl::~ResourceConverterImpl() { |
40 // Verify Flush() was called. | 101 // Verify Flush() was called. |
41 DCHECK(browser_host_create_messages_.empty()); | 102 DCHECK(browser_host_create_messages_.empty()); |
42 DCHECK(browser_vars.empty()); | 103 DCHECK(browser_vars.empty()); |
43 } | 104 } |
44 | 105 |
45 bool ResourceConverterImpl::FromV8Value(v8::Handle<v8::Object> val, | 106 bool ResourceConverterImpl::FromV8Value(v8::Handle<v8::Object> val, |
46 v8::Handle<v8::Context> context, | 107 v8::Handle<v8::Context> context, |
47 PP_Var* result, | 108 PP_Var* result, |
48 bool* was_resource) { | 109 bool* was_resource) { |
49 v8::Context::Scope context_scope(context); | 110 v8::Context::Scope context_scope(context); |
50 v8::HandleScope handle_scope(context->GetIsolate()); | 111 v8::HandleScope handle_scope(context->GetIsolate()); |
51 | 112 |
52 *was_resource = false; | 113 *was_resource = false; |
53 // TODO(mgiuca): There are currently no values which can be converted to | |
54 // resources. | |
55 | 114 |
115 WebKit::WebDOMFileSystem dom_file_system = | |
116 WebKit::WebDOMFileSystem::fromV8Value(val); | |
117 if (!dom_file_system.isNull()) { | |
118 int pending_renderer_id; | |
119 scoped_ptr<IPC::Message> create_message; | |
120 scoped_ptr<IPC::Message> browser_host_create_message; | |
121 if (!DOMFileSystemToResource(instance_, host_, dom_file_system, | |
122 &pending_renderer_id, &create_message, | |
123 &browser_host_create_message)) { | |
124 return false; | |
125 } | |
126 DCHECK(create_message); | |
127 DCHECK(browser_host_create_message); | |
128 scoped_refptr<HostResourceVar> result_var = | |
129 CreateResourceVarWithBrowserHost( | |
130 pending_renderer_id, *create_message, *browser_host_create_message); | |
131 *result = result_var->GetPPVar(); | |
132 *was_resource = true; | |
133 return true; | |
134 } | |
135 | |
136 // The value was not convertible to a resource. Return true with | |
137 // |was_resource| set to false. As per the interface of FromV8Value, |result| | |
138 // may be left unmodified in this case. | |
56 return true; | 139 return true; |
57 } | 140 } |
58 | 141 |
59 void ResourceConverterImpl::Flush(const base::Callback<void(bool)>& callback) { | 142 void ResourceConverterImpl::Flush(const base::Callback<void(bool)>& callback) { |
60 host_->CreateBrowserResourceHosts( | 143 host_->CreateBrowserResourceHosts( |
61 instance_, | 144 instance_, |
62 browser_host_create_messages_, | 145 browser_host_create_messages_, |
63 base::Bind(&FlushComplete, callback, browser_vars)); | 146 base::Bind(&FlushComplete, callback, browser_vars)); |
64 browser_host_create_messages_.clear(); | 147 browser_host_create_messages_.clear(); |
65 browser_vars.clear(); | 148 browser_vars.clear(); |
(...skipping 11 matching lines...) Expand all Loading... | |
77 const IPC::Message& create_message, | 160 const IPC::Message& create_message, |
78 const IPC::Message& browser_host_create_message) { | 161 const IPC::Message& browser_host_create_message) { |
79 scoped_refptr<HostResourceVar> result = | 162 scoped_refptr<HostResourceVar> result = |
80 CreateResourceVar(pending_renderer_id, create_message); | 163 CreateResourceVar(pending_renderer_id, create_message); |
81 browser_host_create_messages_.push_back(browser_host_create_message); | 164 browser_host_create_messages_.push_back(browser_host_create_message); |
82 browser_vars.push_back(result); | 165 browser_vars.push_back(result); |
83 return result; | 166 return result; |
84 } | 167 } |
85 | 168 |
86 } // namespace content | 169 } // namespace content |
OLD | NEW |