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 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
485 plugin_->nacl_interface()->GetNexeFd( | 485 plugin_->nacl_interface()->GetNexeFd( |
486 plugin_->pp_instance(), | 486 plugin_->pp_instance(), |
487 streaming_downloader_->url().c_str(), | 487 streaming_downloader_->url().c_str(), |
488 // TODO(dschuff): Get this value from the pnacl json file after it | 488 // TODO(dschuff): Get this value from the pnacl json file after it |
489 // rolls in from NaCl. | 489 // rolls in from NaCl. |
490 1, | 490 1, |
491 pnacl_options_.opt_level(), | 491 pnacl_options_.opt_level(), |
492 parser.GetHeader("last-modified").c_str(), | 492 parser.GetHeader("last-modified").c_str(), |
493 parser.GetHeader("etag").c_str(), | 493 parser.GetHeader("etag").c_str(), |
494 PP_FromBool(parser.CacheControlNoStore()), | 494 PP_FromBool(parser.CacheControlNoStore()), |
| 495 GetSandboxISA(), |
| 496 "", // No extra compile flags yet. |
495 &is_cache_hit_, | 497 &is_cache_hit_, |
496 temp_nexe_file_->existing_handle(), | 498 temp_nexe_file_->existing_handle(), |
497 cb.pp_completion_callback()); | 499 cb.pp_completion_callback()); |
498 if (nexe_fd_err < PP_OK_COMPLETIONPENDING) { | 500 if (nexe_fd_err < PP_OK_COMPLETIONPENDING) { |
499 ReportPpapiError(ERROR_PNACL_CREATE_TEMP, nexe_fd_err, | 501 ReportPpapiError(ERROR_PNACL_CREATE_TEMP, nexe_fd_err, |
500 nacl::string("Call to GetNexeFd failed")); | 502 nacl::string("Call to GetNexeFd failed")); |
501 } | 503 } |
502 } | 504 } |
503 | 505 |
504 void PnaclCoordinator::NexeFdDidOpen(int32_t pp_error) { | 506 void PnaclCoordinator::NexeFdDidOpen(int32_t pp_error) { |
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
664 obj_file_.get(), | 666 obj_file_.get(), |
665 temp_nexe_file_.get(), | 667 temp_nexe_file_.get(), |
666 &error_info_, | 668 &error_info_, |
667 resources_.get(), | 669 resources_.get(), |
668 &pnacl_options_, | 670 &pnacl_options_, |
669 this, | 671 this, |
670 plugin_); | 672 plugin_); |
671 } | 673 } |
672 | 674 |
673 } // namespace plugin | 675 } // namespace plugin |
OLD | NEW |