Bug 1269162 - part 7 - A merge error fixed, r=me
authorAndrea Marchesini <amarchesini@mozilla.com>
Mon, 27 Jun 2016 19:25:11 +0200
changeset 342801 7876627840cb368f324b00086a5afc3281648e75
parent 342800 3e53a0aae914100d4b5cb290098f37039317083d
child 342802 6b992274233a5920da21f161f86e8e0beba302eb
push id6389
push userraliiev@mozilla.com
push dateMon, 19 Sep 2016 13:38:22 +0000
treeherdermozilla-beta@01d67bfe6c81 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1269162
milestone50.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1269162 - part 7 - A merge error fixed, r=me
dom/xhr/XMLHttpRequestWorker.h
--- a/dom/xhr/XMLHttpRequestWorker.h
+++ b/dom/xhr/XMLHttpRequestWorker.h
@@ -17,17 +17,17 @@ namespace dom {
 class Proxy;
 class SendRunnable;
 
 namespace workers {
 class WorkerPrivate;
 }
 
 class XMLHttpRequestWorker final : public XMLHttpRequest,
-                                   public worker::WorkerHolder
+                                   public workers::WorkerHolder
 {
 public:
   struct StateData
   {
     nsString mResponseText;
     nsString mResponseURL;
     uint32_t mStatus;
     nsCString mStatusText;