Backed out changeset 81c100a42bb6 (bug 1378342) for linting failures,…

… e.g. in file_abort_controller.html. r=backout --HG-- rename : dom/abort/FetchController.cpp => dom/fetch/FetchController.cpp rename : dom/abort/FetchController.h => dom/fetch/FetchController.h rename : dom/abort/FetchSignal.cpp => dom/fetch/FetchSignal.cpp rename : dom/abort/FetchSignal.h => dom/fetch/FetchSignal.h rename : dom/abort/tests/file_fetch_controller.html => dom/tests/mochitest/fetch/file_fetch_controller.html rename : dom/abort/tests/test_fetch_controller.html => dom/tests/mochitest/fetch/test_fetch_controller.html rename : dom/abort/tests/worker_fetch_controller.js => dom/tests/mochitest/fetch/worker_fetch_controller.js
dothq · Aug 29, 2017 · 784834c · 784834c
1 parent ffe4336
commit 784834c
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 41 deletions.
diff --git a/dom/abort/moz.build b/dom/abort/moz.build
diff --git a/dom/abort/tests/mochitest.ini b/dom/abort/tests/mochitest.ini
diff --git a/dom/abort/tests/moz.build b/dom/abort/tests/moz.build
diff --git a/dom/abort/FetchController.cpp → dom/fetch/FetchController.cpp b/dom/abort/FetchController.cpp → dom/fetch/FetchController.cpp
@@ -7,7 +7,6 @@
 #include "FetchController.h"
 #include "FetchSignal.h"
 #include "mozilla/dom/FetchControllerBinding.h"
-#include "WorkerPrivate.h"
 
 namespace mozilla {
 namespace dom {

diff --git a/dom/abort/FetchController.h → dom/fetch/FetchController.h b/dom/abort/FetchController.h → dom/fetch/FetchController.h
diff --git a/dom/abort/FetchSignal.cpp → dom/fetch/FetchSignal.cpp b/dom/abort/FetchSignal.cpp → dom/fetch/FetchSignal.cpp
diff --git a/dom/abort/FetchSignal.h → dom/fetch/FetchSignal.h b/dom/abort/FetchSignal.h → dom/fetch/FetchSignal.h
diff --git a/dom/fetch/moz.build b/dom/fetch/moz.build
@@ -11,9 +11,11 @@ EXPORTS.mozilla.dom += [
     'BodyExtractor.h',
     'ChannelInfo.h',
     'Fetch.h',
+    'FetchController.h',
     'FetchDriver.h',
     'FetchIPCTypes.h',
     'FetchObserver.h',
+    'FetchSignal.h',
     'FetchStreamReader.h',
     'FetchUtil.h',
     'Headers.h',
@@ -29,8 +31,10 @@ UNIFIED_SOURCES += [
     'ChannelInfo.cpp',
     'Fetch.cpp',
     'FetchConsumer.cpp',
+    'FetchController.cpp',
     'FetchDriver.cpp',
     'FetchObserver.cpp',
+    'FetchSignal.cpp',
     'FetchStream.cpp',
     'FetchStreamReader.cpp',
     'FetchUtil.cpp',

diff --git a/dom/moz.build b/dom/moz.build
@@ -42,7 +42,6 @@ interfaces = [
 DIRS += ['interfaces/' + i for i in interfaces]
 
 DIRS += [
-    'abort',
     'animation',
     'base',
     'bindings',

diff --git a/dom/abort/tests/file_fetch_controller.html → ...ochitest/fetch/file_fetch_controller.html b/dom/abort/tests/file_fetch_controller.html → ...ochitest/fetch/file_fetch_controller.html
diff --git a/dom/tests/mochitest/fetch/mochitest.ini b/dom/tests/mochitest/fetch/mochitest.ini
@@ -1,6 +1,7 @@
 [DEFAULT]
 support-files =
   fetch_test_framework.js
+  file_fetch_controller.html
   file_fetch_cached_redirect.html
   file_fetch_cached_redirect.html^headers^
   file_fetch_csp_block_frame.html
@@ -27,6 +28,7 @@ support-files =
   empty.js^headers^
   worker_temporaryFileBlob.js
   common_temporaryFileBlob.js
+  worker_fetch_controller.js
   common_readableStreams.js
   worker_readableStreams.js
   iframe_readableStreams.html
@@ -55,6 +57,7 @@ support-files =
 [test_fetch_basic_http_sw_reroute.html]
 [test_fetch_basic_http_sw_empty_reroute.html]
 [test_fetch_cached_redirect.html]
+[test_fetch_controller.html]
 [test_fetch_cors.html]
 skip-if = toolkit == 'android' && debug # Bug 1210282
 [test_fetch_cors_sw_reroute.html]

diff --git a/dom/abort/tests/test_fetch_controller.html → ...ochitest/fetch/test_fetch_controller.html b/dom/abort/tests/test_fetch_controller.html → ...ochitest/fetch/test_fetch_controller.html
diff --git a/dom/abort/tests/worker_fetch_controller.js → ...ochitest/fetch/worker_fetch_controller.js b/dom/abort/tests/worker_fetch_controller.js → ...ochitest/fetch/worker_fetch_controller.js