diff --git a/dom/bindings/Bindings.conf b/dom/bindings/Bindings.conf index 85d198aa4302..779f35d5ea70 100644 --- a/dom/bindings/Bindings.conf +++ b/dom/bindings/Bindings.conf @@ -505,7 +505,6 @@ DOMInterfaces = { }, 'FileReaderSync': { - 'workers': True, 'wrapperCache': False, }, diff --git a/dom/workers/FileReaderSync.cpp b/dom/workers/FileReaderSync.cpp index 4620544e4832..57f5852f6a6a 100644 --- a/dom/workers/FileReaderSync.cpp +++ b/dom/workers/FileReaderSync.cpp @@ -27,7 +27,6 @@ #include "RuntimeService.h" -USING_WORKERS_NAMESPACE using namespace mozilla; using namespace mozilla::dom; using mozilla::dom::Optional; @@ -47,7 +46,7 @@ FileReaderSync::WrapObject(JSContext* aCx, JS::Handle aGivenProto, JS::MutableHandle aReflector) { - return FileReaderSyncBinding_workers::Wrap(aCx, this, aGivenProto, aReflector); + return FileReaderSyncBinding::Wrap(aCx, this, aGivenProto, aReflector); } void diff --git a/dom/workers/FileReaderSync.h b/dom/workers/FileReaderSync.h index 2d097233d83e..db8f9d574ee2 100644 --- a/dom/workers/FileReaderSync.h +++ b/dom/workers/FileReaderSync.h @@ -4,8 +4,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef mozilla_dom_workers_filereadersync_h__ -#define mozilla_dom_workers_filereadersync_h__ +#ifndef mozilla_dom_filereadersync_h__ +#define mozilla_dom_filereadersync_h__ #include "Workers.h" @@ -18,10 +18,6 @@ namespace dom { class Blob; class GlobalObject; template class Optional; -} // namespace dom -} // namespace mozilla - -BEGIN_WORKERS_NAMESPACE class FileReaderSync final { @@ -51,6 +47,7 @@ public: void ReadAsDataURL(Blob& aBlob, nsAString& aResult, ErrorResult& aRv); }; -END_WORKERS_NAMESPACE +} // namespace dom +} // namespace mozilla -#endif // mozilla_dom_workers_filereadersync_h__ +#endif // mozilla_dom_filereadersync_h__ diff --git a/dom/workers/moz.build b/dom/workers/moz.build index 1bd546d48f87..f791cfb2278f 100644 --- a/dom/workers/moz.build +++ b/dom/workers/moz.build @@ -6,6 +6,7 @@ # Public stuff. EXPORTS.mozilla.dom += [ + 'FileReaderSync.h', 'ServiceWorkerCommon.h', 'ServiceWorkerContainer.h', 'ServiceWorkerEvents.h', @@ -29,7 +30,6 @@ EXPORTS.mozilla.dom.workers += [ EXPORTS.mozilla.dom.workers.bindings += [ 'DataStore.h', 'DataStoreCursor.h', - 'FileReaderSync.h', 'Navigator.h', 'Performance.h', 'ServiceWorker.h',