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

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

Issue 22839005: disable pnacl by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Code review changes Created 7 years, 4 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
« no previous file with comments | « ppapi/native_client/src/trusted/plugin/plugin_error.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The Chromium Authors. All rights reserved. 2 * Copyright (c) 2012 The Chromium Authors. All rights reserved.
3 * Use of this source code is governed by a BSD-style license that can be 3 * Use of this source code is governed by a BSD-style license that can be
4 * found in the LICENSE file. 4 * found in the LICENSE file.
5 */ 5 */
6 6
7 #define NACL_LOG_MODULE_NAME "Plugin::ServiceRuntime" 7 #define NACL_LOG_MODULE_NAME "Plugin::ServiceRuntime"
8 8
9 #include "ppapi/native_client/src/trusted/plugin/service_runtime.h" 9 #include "ppapi/native_client/src/trusted/plugin/service_runtime.h"
10 10
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 pnacl_coordinator_.reset( 348 pnacl_coordinator_.reset(
349 PnaclCoordinator::BitcodeToNative(plugin_, 349 PnaclCoordinator::BitcodeToNative(plugin_,
350 mapped_url, 350 mapped_url,
351 pnacl_options, 351 pnacl_options,
352 translate_callback)); 352 translate_callback));
353 } else { 353 } else {
354 nacl::MutexLocker take(&mu_); 354 nacl::MutexLocker take(&mu_);
355 *p->op_complete_ptr = true; // done... 355 *p->op_complete_ptr = true; // done...
356 p->file_info->desc = -1; // but failed. 356 p->file_info->desc = -1; // but failed.
357 p->error_info->SetReport(ERROR_PNACL_NOT_ENABLED, 357 p->error_info->SetReport(ERROR_PNACL_NOT_ENABLED,
358 "ServiceRuntime: GetPnaclFd failed -- pnacl " 358 "ServiceRuntime: GetPnaclFd failed -- pnacl not "
359 "disabled with --disable-pnacl."); 359 "enabled with --enable-pnacl.");
360 NaClXCondVarBroadcast(&cv_); 360 NaClXCondVarBroadcast(&cv_);
361 return; 361 return;
362 } 362 }
363 } 363 }
364 // p is deleted automatically 364 // p is deleted automatically
365 } 365 }
366 366
367 void PluginReverseInterface::StreamAsFile_MainThreadContinuation( 367 void PluginReverseInterface::StreamAsFile_MainThreadContinuation(
368 OpenManifestEntryResource* p, 368 OpenManifestEntryResource* p,
369 int32_t result) { 369 int32_t result) {
(...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
875 875
876 nacl::string ServiceRuntime::GetCrashLogOutput() { 876 nacl::string ServiceRuntime::GetCrashLogOutput() {
877 if (NULL != subprocess_.get()) { 877 if (NULL != subprocess_.get()) {
878 return subprocess_->GetCrashLogOutput(); 878 return subprocess_->GetCrashLogOutput();
879 } else { 879 } else {
880 return std::string(); 880 return std::string();
881 } 881 }
882 } 882 }
883 883
884 } // namespace plugin 884 } // namespace plugin
OLDNEW
« no previous file with comments | « ppapi/native_client/src/trusted/plugin/plugin_error.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698