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

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

Issue 418423002: Pepper: Stop using SRPC for irt_open_resource(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: windows fix Created 6 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
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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 // OpenManifestEntry() is waiting on a condvar for this continuation to 169 // OpenManifestEntry() is waiting on a condvar for this continuation to
170 // complete. We Broadcast and awaken OpenManifestEntry() whenever we are done 170 // complete. We Broadcast and awaken OpenManifestEntry() whenever we are done
171 // either here, or in a later MainThreadContinuation step, if there are 171 // either here, or in a later MainThreadContinuation step, if there are
172 // multiple steps. 172 // multiple steps.
173 void PluginReverseInterface::OpenManifestEntry_MainThreadContinuation( 173 void PluginReverseInterface::OpenManifestEntry_MainThreadContinuation(
174 OpenManifestEntryResource* p, 174 OpenManifestEntryResource* p,
175 int32_t err) { 175 int32_t err) {
176 UNREFERENCED_PARAMETER(err); 176 UNREFERENCED_PARAMETER(err);
177 // CallOnMainThread continuations always called with err == PP_OK. 177 // CallOnMainThread continuations always called with err == PP_OK.
178 178
179 // This method should only ever be called from the PNaCl translator, as the
180 // IRT is not available there.
181 CHECK(!service_runtime_->main_service_runtime());
182
179 NaClLog(4, "Entered OpenManifestEntry_MainThreadContinuation\n"); 183 NaClLog(4, "Entered OpenManifestEntry_MainThreadContinuation\n");
180 184
181 // Because p is owned by the callback of this invocation, so it is necessary 185 // Because p is owned by the callback of this invocation, so it is necessary
182 // to create another instance. 186 // to create another instance.
183 OpenManifestEntryResource* open_cont = new OpenManifestEntryResource(*p); 187 OpenManifestEntryResource* open_cont = new OpenManifestEntryResource(*p);
184 pp::CompletionCallback stream_cc = WeakRefNewCallback( 188 pp::CompletionCallback stream_cc = WeakRefNewCallback(
185 anchor_, 189 anchor_,
186 this, 190 this,
187 &PluginReverseInterface::StreamAsFile_MainThreadContinuation, 191 &PluginReverseInterface::StreamAsFile_MainThreadContinuation,
188 open_cont); 192 open_cont);
(...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after
590 594
591 nacl::string ServiceRuntime::GetCrashLogOutput() { 595 nacl::string ServiceRuntime::GetCrashLogOutput() {
592 if (NULL != subprocess_.get()) { 596 if (NULL != subprocess_.get()) {
593 return subprocess_->GetCrashLogOutput(); 597 return subprocess_->GetCrashLogOutput();
594 } else { 598 } else {
595 return std::string(); 599 return std::string();
596 } 600 }
597 } 601 }
598 602
599 } // namespace plugin 603 } // namespace plugin
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698