diff options
| author | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 20:46:51 +0000 |
|---|---|---|
| committer | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 20:46:51 +0000 |
| commit | a3ece21f3742962e3a18be804699412764ff80d8 (patch) | |
| tree | 1b18743be67998b67fc57b9030d1573820fd6289 /ppapi/native_client | |
| parent | b62e6b73dd3bb5f91b6dd72e26f5d4f59132464f (diff) | |
| download | chromium_src-a3ece21f3742962e3a18be804699412764ff80d8.zip chromium_src-a3ece21f3742962e3a18be804699412764ff80d8.tar.gz chromium_src-a3ece21f3742962e3a18be804699412764ff80d8.tar.bz2 | |
NaCl: Remove Plugin::XYZZY() dead code hack
Without this code, NaCl's "chrome_browser_tests using GYP" Buildbot
phase on Mac was inexplicably failing. However, that Buildbot phase
no longer exists, so we can presumably remove this.
BUG=114431
TEST=Chromium trybots
Review URL: https://chromiumcodereview.appspot.com/10392026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136381 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/native_client')
| -rw-r--r-- | ppapi/native_client/src/trusted/plugin/plugin.cc | 18 | ||||
| -rw-r--r-- | ppapi/native_client/src/trusted/plugin/plugin.h | 3 |
2 files changed, 0 insertions, 21 deletions
diff --git a/ppapi/native_client/src/trusted/plugin/plugin.cc b/ppapi/native_client/src/trusted/plugin/plugin.cc index 2fae621..dbf201d 100644 --- a/ppapi/native_client/src/trusted/plugin/plugin.cc +++ b/ppapi/native_client/src/trusted/plugin/plugin.cc @@ -1623,24 +1623,6 @@ bool Plugin::StreamAsFile(const nacl::string& url, &UpdateDownloadProgress); } -#ifndef HACK_FOR_MACOS_HANG_REMOVED -// The following is needed to avoid a plugin startup hang in the -// MacOS "chrome_browser_tests under gyp" stage. -// TODO(sehr,mseaborn): remove this hack. -void (plugin::Plugin::*pmem)(int32_t, - plugin::FileDownloader*&, - pp::VarPrivate&); -void Plugin::XYZZY(const nacl::string& url, - pp::VarPrivate js_callback) { - UNREFERENCED_PARAMETER(url); - UNREFERENCED_PARAMETER(js_callback); - pp::CompletionCallback open_callback = callback_factory_.NewCallback(pmem, - reinterpret_cast<plugin::FileDownloader*>(NULL), - js_callback); - static_cast<void>(open_callback); -} -#endif // HACK_FOR_MACOS_HANG_REMOVED - void Plugin::ReportLoadSuccess(LengthComputable length_computable, uint64_t loaded_bytes, diff --git a/ppapi/native_client/src/trusted/plugin/plugin.h b/ppapi/native_client/src/trusted/plugin/plugin.h index 2946181..cd79517 100644 --- a/ppapi/native_client/src/trusted/plugin/plugin.h +++ b/ppapi/native_client/src/trusted/plugin/plugin.h @@ -318,9 +318,6 @@ class Plugin : public pp::InstancePrivate { private: NACL_DISALLOW_COPY_AND_ASSIGN(Plugin); -#ifndef HACK_FOR_MACOS_HANG_REMOVED - void XYZZY(const nacl::string& url, pp::VarPrivate js_callback); -#endif // HACK_FOR_MACOS_HANG_REMOVED // Prevent construction and destruction from outside the class: // must use factory New() method instead. explicit Plugin(PP_Instance instance); |