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 "content/renderer/pepper/pepper_file_system_host.h" |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 blink::WebFileSystemType blink_type; | 134 blink::WebFileSystemType blink_type; |
135 if (!FileApiFileSystemTypeToWebFileSystemType(type, &blink_type)) | 135 if (!FileApiFileSystemTypeToWebFileSystemType(type, &blink_type)) |
136 return false; | 136 return false; |
137 blink::WebLocalFrame* frame = blink::WebLocalFrame::frameForContext(context); | 137 blink::WebLocalFrame* frame = blink::WebLocalFrame::frameForContext(context); |
138 blink::WebDOMFileSystem web_dom_file_system = blink::WebDOMFileSystem::create( | 138 blink::WebDOMFileSystem web_dom_file_system = blink::WebDOMFileSystem::create( |
139 frame, | 139 frame, |
140 blink_type, | 140 blink_type, |
141 blink::WebString::fromUTF8(name), | 141 blink::WebString::fromUTF8(name), |
142 root_url, | 142 root_url, |
143 blink::WebDOMFileSystem::SerializableTypeSerializable); | 143 blink::WebDOMFileSystem::SerializableTypeSerializable); |
144 *dom_file_system = web_dom_file_system.toV8Value(); | 144 *dom_file_system = |
| 145 web_dom_file_system.toV8Value(context->Global(), context->GetIsolate()); |
145 return true; | 146 return true; |
146 } | 147 } |
147 | 148 |
148 bool ResourceHostToDOMMediaStreamVideoTrack( | 149 bool ResourceHostToDOMMediaStreamVideoTrack( |
149 content::PepperMediaStreamVideoTrackHost* host, | 150 content::PepperMediaStreamVideoTrackHost* host, |
150 v8::Handle<v8::Context> context, | 151 v8::Handle<v8::Context> context, |
151 v8::Handle<v8::Value>* dom_video_track) { | 152 v8::Handle<v8::Value>* dom_video_track) { |
152 // TODO(ronghuawu): Implement this once crbug/352219 is resolved. | 153 // TODO(ronghuawu): Implement this once crbug/352219 is resolved. |
153 // blink::WebMediaStreamTrack track = host->track(); | 154 // blink::WebMediaStreamTrack track = host->track(); |
154 // *dom_video_track = track.toV8Value(); | 155 // *dom_video_track = track.toV8Value(); |
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
334 const IPC::Message& create_message, | 335 const IPC::Message& create_message, |
335 const IPC::Message& browser_host_create_message) { | 336 const IPC::Message& browser_host_create_message) { |
336 scoped_refptr<HostResourceVar> result = | 337 scoped_refptr<HostResourceVar> result = |
337 CreateResourceVar(pending_renderer_id, create_message); | 338 CreateResourceVar(pending_renderer_id, create_message); |
338 browser_host_create_messages_.push_back(browser_host_create_message); | 339 browser_host_create_messages_.push_back(browser_host_create_message); |
339 browser_vars_.push_back(result); | 340 browser_vars_.push_back(result); |
340 return result; | 341 return result; |
341 } | 342 } |
342 | 343 |
343 } // namespace content | 344 } // namespace content |
OLD | NEW |