| Index: ppapi/native_client/src/trusted/plugin/plugin_error.h
|
| ===================================================================
|
| --- ppapi/native_client/src/trusted/plugin/plugin_error.h (revision 212679)
|
| +++ ppapi/native_client/src/trusted/plugin/plugin_error.h (working copy)
|
| @@ -115,23 +115,43 @@
|
| void SetReport(PluginErrorCode error_code, const std::string& message) {
|
| error_code_ = error_code;
|
| message_ = message;
|
| + console_message_ = message;
|
| }
|
|
|
| + // console_message is a part of the error that is logged to
|
| + // the JavaScript console but is not reported to JavaScript via
|
| + // the lastError property. This is used to report internal errors which
|
| + // may easily change in new versions of the browser and we don't want apps
|
| + // to come to depend on the details of these errors.
|
| + void SetReportWithConsoleOnlyError(PluginErrorCode error_code,
|
| + const std::string& message,
|
| + const std::string& console_message) {
|
| + error_code_ = error_code;
|
| + message_ = message;
|
| + console_message_ = message + "; " + console_message;
|
| + }
|
| +
|
| PluginErrorCode error_code() const {
|
| return error_code_;
|
| }
|
|
|
| void PrependMessage(const std::string& prefix) {
|
| message_ = prefix + message_;
|
| + console_message_ = prefix + console_message_;
|
| }
|
|
|
| const std::string& message() const {
|
| return message_;
|
| }
|
|
|
| + const std::string& console_message() const {
|
| + return console_message_;
|
| + }
|
| +
|
| private:
|
| PluginErrorCode error_code_;
|
| std::string message_;
|
| + std::string console_message_;
|
| NACL_DISALLOW_COPY_AND_ASSIGN(ErrorInfo);
|
| };
|
|
|
|
|