| 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 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 268 | 268 |
| 269 void ResourceConverterImpl::Flush(const base::Callback<void(bool)>& callback) { | 269 void ResourceConverterImpl::Flush(const base::Callback<void(bool)>& callback) { |
| 270 host_->CreateBrowserResourceHosts( | 270 host_->CreateBrowserResourceHosts( |
| 271 instance_, | 271 instance_, |
| 272 browser_host_create_messages_, | 272 browser_host_create_messages_, |
| 273 base::Bind(&FlushComplete, callback, browser_vars_)); | 273 base::Bind(&FlushComplete, callback, browser_vars_)); |
| 274 browser_host_create_messages_.clear(); | 274 browser_host_create_messages_.clear(); |
| 275 browser_vars_.clear(); | 275 browser_vars_.clear(); |
| 276 } | 276 } |
| 277 | 277 |
| 278 bool ResourceConverterImpl::FlushSync() { |
| 279 if (!browser_host_create_messages_.empty()) { |
| 280 // TODO(dmichael): Make these work; we have to make a synchronous path to |
| 281 // create browser-side hosts. crbug.com/367896 |
| 282 return false; |
| 283 } |
| 284 return true; |
| 285 } |
| 286 |
| 278 bool ResourceConverterImpl::ToV8Value(const PP_Var& var, | 287 bool ResourceConverterImpl::ToV8Value(const PP_Var& var, |
| 279 v8::Handle<v8::Context> context, | 288 v8::Handle<v8::Context> context, |
| 280 v8::Handle<v8::Value>* result) { | 289 v8::Handle<v8::Value>* result) { |
| 281 DCHECK(var.type == PP_VARTYPE_RESOURCE); | 290 DCHECK(var.type == PP_VARTYPE_RESOURCE); |
| 282 | 291 |
| 283 ResourceVar* resource = ResourceVar::FromPPVar(var); | 292 ResourceVar* resource = ResourceVar::FromPPVar(var); |
| 284 if (!resource) { | 293 if (!resource) { |
| 285 NOTREACHED(); | 294 NOTREACHED(); |
| 286 return false; | 295 return false; |
| 287 } | 296 } |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 const IPC::Message& create_message, | 344 const IPC::Message& create_message, |
| 336 const IPC::Message& browser_host_create_message) { | 345 const IPC::Message& browser_host_create_message) { |
| 337 scoped_refptr<HostResourceVar> result = | 346 scoped_refptr<HostResourceVar> result = |
| 338 CreateResourceVar(pending_renderer_id, create_message); | 347 CreateResourceVar(pending_renderer_id, create_message); |
| 339 browser_host_create_messages_.push_back(browser_host_create_message); | 348 browser_host_create_messages_.push_back(browser_host_create_message); |
| 340 browser_vars_.push_back(result); | 349 browser_vars_.push_back(result); |
| 341 return result; | 350 return result; |
| 342 } | 351 } |
| 343 | 352 |
| 344 } // namespace content | 353 } // namespace content |
| OLD | NEW |