| Index: ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h
|
| diff --git a/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h b/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h
|
| index 145d5171e521a57b4659b6340def45869ea56807..18fb8d1aab951b3f18c79671cfbbc169ff71d168 100644
|
| --- a/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h
|
| +++ b/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h
|
| @@ -69,19 +69,6 @@ class PnaclCoordinator: public CallbackSource<FileStreamData> {
|
| // BitcodeToNative has completed (and the finish_callback called).
|
| PP_FileHandle TakeTranslatedFileHandle();
|
|
|
| - // Run |translate_notify_callback_| with an error condition that is not
|
| - // PPAPI specific. Also set ErrorInfo report.
|
| - void ReportNonPpapiError(PP_NaClError err, const nacl::string& message);
|
| - // Run when faced with a PPAPI error condition. Bring control back to the
|
| - // plugin by invoking the |translate_notify_callback_|.
|
| - // Also set ErrorInfo report.
|
| - void ReportPpapiError(PP_NaClError err,
|
| - int32_t pp_error, const nacl::string& message);
|
| - // Bring control back to the plugin by invoking the
|
| - // |translate_notify_callback_|. This does not set the ErrorInfo report,
|
| - // it is assumed that it was already set.
|
| - void ExitWithError();
|
| -
|
| // Implement FileDownloader's template of the CallbackSource interface.
|
| // This method returns a callback which will be called by the FileDownloader
|
| // to stream the bitcode data as it arrives. The callback
|
| @@ -158,6 +145,20 @@ class PnaclCoordinator: public CallbackSource<FileStreamData> {
|
| void DoUMATimeMeasure(
|
| int32_t pp_error, const nacl::string& event_name, int64_t microsecs);
|
|
|
| + // Bring control back to the plugin by invoking the
|
| + // |translate_notify_callback_|. This does not set the ErrorInfo report,
|
| + // it is assumed that it was already set.
|
| + void ExitWithError();
|
| + // Run |translate_notify_callback_| with an error condition that is not
|
| + // PPAPI specific. Also set ErrorInfo report.
|
| + void ReportNonPpapiError(PP_NaClError err, const nacl::string& message);
|
| + // Run when faced with a PPAPI error condition. Bring control back to the
|
| + // plugin by invoking the |translate_notify_callback_|.
|
| + // Also set ErrorInfo report.
|
| + void ReportPpapiError(PP_NaClError err,
|
| + int32_t pp_error, const nacl::string& message);
|
| +
|
| +
|
| // Keeps track of the pp_error upon entry to TranslateFinished,
|
| // for inspection after cleanup.
|
| int32_t translate_finish_error_;
|
|
|