summaryrefslogtreecommitdiffstats
path: root/ppapi/native_client
diff options
context:
space:
mode:
Diffstat (limited to 'ppapi/native_client')
-rw-r--r--ppapi/native_client/src/trusted/plugin/plugin.cc18
-rw-r--r--ppapi/native_client/src/trusted/plugin/plugin.h3
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);