Bug 1269162 - part 2 - Move XHRUpload in workers to XMLHttpRequestUploadWorker, r=smaug

--HG--
rename : dom/workers/XMLHttpRequestUpload.cpp => dom/workers/XMLHttpRequestUploadWorker.cpp
rename : dom/workers/XMLHttpRequestUpload.h => dom/workers/XMLHttpRequestUploadWorker.h

dom/bindings/Bindings.conf

@@ -1600,6 +1600,8 @@ DOMInterfaces = {
     'headerFile': 'nsXMLHttpRequest.h'
 },
 {
+    'nativeType': 'mozilla::dom::workers::XMLHttpRequestUploadWorker',
+    'headerFile': 'mozilla/dom/workers/bindings/XMLHttpRequestUploadWorker.h',
     'workers': True,
 }],
 

dom/workers/XMLHttpRequestUploadWorker.cpp

@@ -4,7 +4,7 @@
  * 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/. */
 
-#include "XMLHttpRequestUpload.h"
+#include "XMLHttpRequestUploadWorker.h"
 
 #include "XMLHttpRequestWorker.h"
 
@@ -12,34 +12,34 @@
 
 USING_WORKERS_NAMESPACE
 
-XMLHttpRequestUpload::XMLHttpRequestUpload(XMLHttpRequestWorker* aXHR)
+XMLHttpRequestUploadWorker::XMLHttpRequestUploadWorker(XMLHttpRequestWorker* aXHR)
 : mXHR(aXHR)
 {
 }
 
-XMLHttpRequestUpload::~XMLHttpRequestUpload()
+XMLHttpRequestUploadWorker::~XMLHttpRequestUploadWorker()
 {
 }
 
-NS_IMPL_ADDREF_INHERITED(XMLHttpRequestUpload, nsXHREventTarget)
+NS_IMPL_ADDREF_INHERITED(XMLHttpRequestUploadWorker, nsXHREventTarget)
-NS_IMPL_RELEASE_INHERITED(XMLHttpRequestUpload, nsXHREventTarget)
+NS_IMPL_RELEASE_INHERITED(XMLHttpRequestUploadWorker, nsXHREventTarget)
 
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(XMLHttpRequestUpload)
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(XMLHttpRequestUploadWorker)
 NS_INTERFACE_MAP_END_INHERITING(nsXHREventTarget)
 
-NS_IMPL_CYCLE_COLLECTION_INHERITED(XMLHttpRequestUpload, nsXHREventTarget,
+NS_IMPL_CYCLE_COLLECTION_INHERITED(XMLHttpRequestUploadWorker, nsXHREventTarget,
                                    mXHR)
 
 JSObject*
-XMLHttpRequestUpload::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
+XMLHttpRequestUploadWorker::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
 {
   return XMLHttpRequestUploadBinding_workers::Wrap(aCx, this, aGivenProto);
 }
 
 // static
-already_AddRefed<XMLHttpRequestUpload>
+already_AddRefed<XMLHttpRequestUploadWorker>
-XMLHttpRequestUpload::Create(XMLHttpRequestWorker* aXHR)
+XMLHttpRequestUploadWorker::Create(XMLHttpRequestWorker* aXHR)
 {
-  RefPtr<XMLHttpRequestUpload> upload = new XMLHttpRequestUpload(aXHR);
+  RefPtr<XMLHttpRequestUploadWorker> upload = new XMLHttpRequestUploadWorker(aXHR);
   return upload.forget();
 }

dom/workers/XMLHttpRequestUploadWorker.h

@@ -13,22 +13,22 @@ BEGIN_WORKERS_NAMESPACE
 
 class XMLHttpRequestWorker;
 
-class XMLHttpRequestUpload final : public nsXHREventTarget
+class XMLHttpRequestUploadWorker final : public nsXHREventTarget
 {
   RefPtr<XMLHttpRequestWorker> mXHR;
 
-  explicit XMLHttpRequestUpload(XMLHttpRequestWorker* aXHR);
+  explicit XMLHttpRequestUploadWorker(XMLHttpRequestWorker* aXHR);
 
-  ~XMLHttpRequestUpload();
+  ~XMLHttpRequestUploadWorker();
 
 public:
   virtual JSObject*
   WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
-  static already_AddRefed<XMLHttpRequestUpload>
+  static already_AddRefed<XMLHttpRequestUploadWorker>
   Create(XMLHttpRequestWorker* aXHR);
 
-  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(XMLHttpRequestUpload, nsXHREventTarget)
+  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(XMLHttpRequestUploadWorker, nsXHREventTarget)
 
   NS_DECL_ISUPPORTS_INHERITED
 

dom/workers/XMLHttpRequestWorker.cpp

@@ -32,7 +32,7 @@
 #include "WorkerScope.h"
 #include "WorkerPrivate.h"
 #include "WorkerRunnable.h"
-#include "XMLHttpRequestUpload.h"
+#include "XMLHttpRequestUploadWorker.h"
 
 #include "mozilla/UniquePtr.h"
 
@@ -2027,7 +2027,7 @@ XMLHttpRequestWorker::SetMozBackgroundRequest(bool aBackgroundRequest,
   runnable->Dispatch(aRv);
 }
 
-XMLHttpRequestUpload*
+XMLHttpRequestUploadWorker*
 XMLHttpRequestWorker::GetUpload(ErrorResult& aRv)
 {
   mWorkerPrivate->AssertIsOnWorkerThread();
@@ -2038,7 +2038,7 @@ XMLHttpRequestWorker::GetUpload(ErrorResult& aRv)
   }
 
   if (!mUpload) {
-    mUpload = XMLHttpRequestUpload::Create(this);
+    mUpload = XMLHttpRequestUploadWorker::Create(this);
 
     if (!mUpload) {
       aRv.Throw(NS_ERROR_FAILURE);

dom/workers/XMLHttpRequestWorker.h

@@ -26,7 +26,7 @@ BEGIN_WORKERS_NAMESPACE
 
 class Proxy;
 class SendRunnable;
-class XMLHttpRequestUpload;
+class XMLHttpRequestUploadWorker;
 class WorkerPrivate;
 
 class XMLHttpRequestWorker final : public nsXHREventTarget,
@@ -55,7 +55,7 @@ public:
   };
 
 private:
-  RefPtr<XMLHttpRequestUpload> mUpload;
+  RefPtr<XMLHttpRequestUploadWorker> mUpload;
   WorkerPrivate* mWorkerPrivate;
   RefPtr<Proxy> mProxy;
   XMLHttpRequestResponseType mResponseType;
@@ -160,7 +160,7 @@ public:
   void
   SetMozBackgroundRequest(bool aBackgroundRequest, ErrorResult& aRv);
 
-  XMLHttpRequestUpload*
+  XMLHttpRequestUploadWorker*
   GetUpload(ErrorResult& aRv);
 
   void
@@ -239,7 +239,7 @@ public:
     aRv.Throw(NS_ERROR_FAILURE);
   }
 
-  XMLHttpRequestUpload*
+  XMLHttpRequestUploadWorker*
   GetUploadObjectNoCreate() const
   {
     return mUpload;

dom/workers/moz.build

@@ -39,7 +39,7 @@ EXPORTS.mozilla.dom.workers.bindings += [
     'SharedWorker.h',
     'URL.h',
     'WorkerHolder.h',
-    'XMLHttpRequestUpload.h',
+    'XMLHttpRequestUploadWorker.h',
     'XMLHttpRequestWorker.h',
 ]
 
@@ -89,7 +89,7 @@ UNIFIED_SOURCES += [
     'WorkerRunnable.cpp',
     'WorkerScope.cpp',
     'WorkerThread.cpp',
-    'XMLHttpRequestUpload.cpp',
+    'XMLHttpRequestUploadWorker.cpp',
     'XMLHttpRequestWorker.cpp',
 ]