diff options
| author | ncbray@chromium.org <ncbray@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 23:00:24 +0000 |
|---|---|---|
| committer | ncbray@chromium.org <ncbray@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 23:00:24 +0000 |
| commit | 128fee2e18fe0939b71328ea17f8c655366383e1 (patch) | |
| tree | c13153ace8de9505f317eb3685ad43c40f6916b9 /ppapi/native_client | |
| parent | 9515727b559a856f5eda2e102e7debc468752aa3 (diff) | |
| download | chromium_src-128fee2e18fe0939b71328ea17f8c655366383e1.zip chromium_src-128fee2e18fe0939b71328ea17f8c655366383e1.tar.gz chromium_src-128fee2e18fe0939b71328ea17f8c655366383e1.tar.bz2 | |
Revert revision 130979.
The instrumentation in this CL served its purpose, and is now being removed.
BUG= http://code.google.com/p/chromium/issues/detail?id=122057
TEST= none
Review URL: http://codereview.chromium.org/10236013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134381 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/native_client')
| -rw-r--r-- | ppapi/native_client/src/trusted/plugin/plugin.cc | 19 | ||||
| -rw-r--r-- | ppapi/native_client/src/trusted/plugin/plugin.h | 2 |
2 files changed, 1 insertions, 20 deletions
diff --git a/ppapi/native_client/src/trusted/plugin/plugin.cc b/ppapi/native_client/src/trusted/plugin/plugin.cc index 3e1ad2f..2fae621 100644 --- a/ppapi/native_client/src/trusted/plugin/plugin.cc +++ b/ppapi/native_client/src/trusted/plugin/plugin.cc @@ -1678,15 +1678,9 @@ void Plugin::ReportLoadError(const ErrorInfo& error_info) { // UMA HistogramEnumerateLoadStatus(error_info.error_code()); - - // Temporary in-the-field debugging. - // TODO(ncbray) remove. - // http://code.google.com/p/chromium/issues/detail?id=122057 - if (error_info.error_code() == ERROR_START_PROXY_CRASH) { - GenerateCrashReportWithoutCrashing(); - } } + void Plugin::ReportLoadAbort() { PLUGIN_PRINTF(("Plugin::ReportLoadAbort\n")); // Set the readyState attribute to indicate we need to start over. @@ -1916,15 +1910,4 @@ void Plugin::AddToConsole(const nacl::string& text) { var_interface->Release(str); } -void Plugin::GenerateCrashReportWithoutCrashing() { -#if NACL_WINDOWS && !defined(NACL_STANDALONE) - typedef void (__cdecl *DumpProcessFunction)(); - // Find the dump function inside chrome.exe and call it. - DumpProcessFunction request_dump = reinterpret_cast<DumpProcessFunction>( - ::GetProcAddress(::GetModuleHandle(NULL), "DumpProcessWithoutCrash")); - if (request_dump) - request_dump(); -#endif -} - } // namespace plugin diff --git a/ppapi/native_client/src/trusted/plugin/plugin.h b/ppapi/native_client/src/trusted/plugin/plugin.h index 6119d5e..2946181 100644 --- a/ppapi/native_client/src/trusted/plugin/plugin.h +++ b/ppapi/native_client/src/trusted/plugin/plugin.h @@ -420,8 +420,6 @@ class Plugin : public pp::InstancePrivate { // Shuts down the proxy for PPAPI nexes. void ShutdownProxy(); // Nexe shutdown + proxy deletion. - void GenerateCrashReportWithoutCrashing(); - ScriptablePlugin* scriptable_plugin_; int argc_; |