OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h" | 5 #include "ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "native_client/src/include/checked_cast.h" | 10 #include "native_client/src/include/checked_cast.h" |
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
493 plugin_->nacl_interface()->GetNexeFd( | 493 plugin_->nacl_interface()->GetNexeFd( |
494 plugin_->pp_instance(), | 494 plugin_->pp_instance(), |
495 streaming_downloader_->url().c_str(), | 495 streaming_downloader_->url().c_str(), |
496 // TODO(dschuff): Get this value from the pnacl json file after it | 496 // TODO(dschuff): Get this value from the pnacl json file after it |
497 // rolls in from NaCl. | 497 // rolls in from NaCl. |
498 1, | 498 1, |
499 pnacl_options_.opt_level(), | 499 pnacl_options_.opt_level(), |
500 parser.GetHeader("last-modified").c_str(), | 500 parser.GetHeader("last-modified").c_str(), |
501 parser.GetHeader("etag").c_str(), | 501 parser.GetHeader("etag").c_str(), |
502 PP_FromBool(parser.CacheControlNoStore()), | 502 PP_FromBool(parser.CacheControlNoStore()), |
| 503 GetSandboxISA(), |
| 504 "", // No extra compile flags yet. |
503 &is_cache_hit_, | 505 &is_cache_hit_, |
504 temp_nexe_file_->existing_handle(), | 506 temp_nexe_file_->existing_handle(), |
505 cb.pp_completion_callback()); | 507 cb.pp_completion_callback()); |
506 if (nexe_fd_err < PP_OK_COMPLETIONPENDING) { | 508 if (nexe_fd_err < PP_OK_COMPLETIONPENDING) { |
507 ReportPpapiError(ERROR_PNACL_CREATE_TEMP, nexe_fd_err, | 509 ReportPpapiError(ERROR_PNACL_CREATE_TEMP, nexe_fd_err, |
508 nacl::string("Call to GetNexeFd failed")); | 510 nacl::string("Call to GetNexeFd failed")); |
509 } | 511 } |
510 } | 512 } |
511 | 513 |
512 void PnaclCoordinator::NexeFdDidOpen(int32_t pp_error) { | 514 void PnaclCoordinator::NexeFdDidOpen(int32_t pp_error) { |
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
680 temp_nexe_file_.get(), | 682 temp_nexe_file_.get(), |
681 invalid_desc_wrapper_.get(), | 683 invalid_desc_wrapper_.get(), |
682 &error_info_, | 684 &error_info_, |
683 resources_.get(), | 685 resources_.get(), |
684 &pnacl_options_, | 686 &pnacl_options_, |
685 this, | 687 this, |
686 plugin_); | 688 plugin_); |
687 } | 689 } |
688 | 690 |
689 } // namespace plugin | 691 } // namespace plugin |
OLD | NEW |