Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(283)

Side by Side Diff: ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc

Issue 193313002: Pepper: Move GetSandboxISA() to PPB_NaCl_Private. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes for dmichael Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 490 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 plugin_->nacl_interface()->GetNexeFd( 501 plugin_->nacl_interface()->GetNexeFd(
502 plugin_->pp_instance(), 502 plugin_->pp_instance(),
503 streaming_downloader_->full_url().c_str(), 503 streaming_downloader_->full_url().c_str(),
504 // TODO(dschuff): Get this value from the pnacl json file after it 504 // TODO(dschuff): Get this value from the pnacl json file after it
505 // rolls in from NaCl. 505 // rolls in from NaCl.
506 1, 506 1,
507 pnacl_options_.opt_level(), 507 pnacl_options_.opt_level(),
508 parser.GetHeader("last-modified").c_str(), 508 parser.GetHeader("last-modified").c_str(),
509 parser.GetHeader("etag").c_str(), 509 parser.GetHeader("etag").c_str(),
510 PP_FromBool(parser.CacheControlNoStore()), 510 PP_FromBool(parser.CacheControlNoStore()),
511 GetSandboxISA(), 511 plugin_->nacl_interface()->GetSandboxISA(),
512 "", // No extra compile flags yet. 512 "", // No extra compile flags yet.
513 &is_cache_hit_, 513 &is_cache_hit_,
514 temp_nexe_file_->existing_handle(), 514 temp_nexe_file_->existing_handle(),
515 cb.pp_completion_callback()); 515 cb.pp_completion_callback());
516 if (nexe_fd_err < PP_OK_COMPLETIONPENDING) { 516 if (nexe_fd_err < PP_OK_COMPLETIONPENDING) {
517 ReportPpapiError(PP_NACL_ERROR_PNACL_CREATE_TEMP, nexe_fd_err, 517 ReportPpapiError(PP_NACL_ERROR_PNACL_CREATE_TEMP, nexe_fd_err,
518 nacl::string("Call to GetNexeFd failed")); 518 nacl::string("Call to GetNexeFd failed"));
519 } 519 }
520 } 520 }
521 521
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
690 temp_nexe_file_.get(), 690 temp_nexe_file_.get(),
691 invalid_desc_wrapper_.get(), 691 invalid_desc_wrapper_.get(),
692 &error_info_, 692 &error_info_,
693 resources_.get(), 693 resources_.get(),
694 &pnacl_options_, 694 &pnacl_options_,
695 this, 695 this,
696 plugin_); 696 plugin_);
697 } 697 }
698 698
699 } // namespace plugin 699 } // namespace plugin
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698