Backed out changeset 81c100a42bb6 (bug 1378342) for linting failures, e.g. in file_abort_controller.html. r=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Tue, 29 Aug 2017 09:17:57 +0200
changeset 377368 d133ea537108e8b7f9c23d951cfd288c964cf6c6
parent 377367 591f78a8d99d548de1a96fad78c4022454cce4a6
child 377369 ec2a82e0ceeb519a6090693b8d8a3106640b6b59
push id94264
push userarchaeopteryx@coole-files.de
push dateTue, 29 Aug 2017 07:18:26 +0000
treeherdermozilla-inbound@d133ea537108 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1378342
milestone57.0a1
backs out81c100a42bb60c4d0a1f0a52cf33ebe250bdbcc3
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
Backed out changeset 81c100a42bb6 (bug 1378342) for linting failures, e.g. in file_abort_controller.html. r=backout
dom/abort/FetchController.cpp
dom/abort/FetchController.h
dom/abort/FetchSignal.cpp
dom/abort/FetchSignal.h
dom/abort/moz.build
dom/abort/tests/file_fetch_controller.html
dom/abort/tests/mochitest.ini
dom/abort/tests/moz.build
dom/abort/tests/test_fetch_controller.html
dom/abort/tests/worker_fetch_controller.js
dom/fetch/FetchController.cpp
dom/fetch/FetchController.h
dom/fetch/FetchSignal.cpp
dom/fetch/FetchSignal.h
dom/fetch/moz.build
dom/moz.build
dom/tests/mochitest/fetch/file_fetch_controller.html
dom/tests/mochitest/fetch/mochitest.ini
dom/tests/mochitest/fetch/test_fetch_controller.html
dom/tests/mochitest/fetch/worker_fetch_controller.js
deleted file mode 100644
--- a/dom/abort/moz.build
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
-
-TEST_DIRS += ['tests']
-
-EXPORTS.mozilla.dom += [
-    'FetchController.h',
-    'FetchSignal.h',
-]
-
-UNIFIED_SOURCES += [
-    'FetchController.cpp',
-    'FetchSignal.cpp',
-]
-
-LOCAL_INCLUDES += [
-    '../workers',
-]
-
-FINAL_LIBRARY = 'xul'
deleted file mode 100644
--- a/dom/abort/tests/mochitest.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[DEFAULT]
-support-files =
-  file_fetch_controller.html
-  worker_fetch_controller.js
-
-[test_fetch_controller.html]
deleted file mode 100644
--- a/dom/abort/tests/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
rename from dom/abort/FetchController.cpp
rename to dom/fetch/FetchController.cpp
--- a/dom/abort/FetchController.cpp
+++ b/dom/fetch/FetchController.cpp
@@ -2,17 +2,16 @@
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 "FetchController.h"
 #include "FetchSignal.h"
 #include "mozilla/dom/FetchControllerBinding.h"
-#include "WorkerPrivate.h"
 
 namespace mozilla {
 namespace dom {
 
 NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(FetchController, mGlobal, mSignal,
                                       mFollowingSignal)
 
 NS_IMPL_CYCLE_COLLECTING_ADDREF(FetchController)
rename from dom/abort/FetchController.h
rename to dom/fetch/FetchController.h
rename from dom/abort/FetchSignal.cpp
rename to dom/fetch/FetchSignal.cpp
rename from dom/abort/FetchSignal.h
rename to dom/fetch/FetchSignal.h
--- a/dom/fetch/moz.build
+++ b/dom/fetch/moz.build
@@ -6,36 +6,40 @@
 
 with Files("**"):
     BUG_COMPONENT = ("Core", "DOM")
 
 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',
     'InternalHeaders.h',
     'InternalRequest.h',
     'InternalResponse.h',
     'Request.h',
     'Response.h',
 ]
 
 UNIFIED_SOURCES += [
     'BodyExtractor.cpp',
     'ChannelInfo.cpp',
     'Fetch.cpp',
     'FetchConsumer.cpp',
+    'FetchController.cpp',
     'FetchDriver.cpp',
     'FetchObserver.cpp',
+    'FetchSignal.cpp',
     'FetchStream.cpp',
     'FetchStreamReader.cpp',
     'FetchUtil.cpp',
     'Headers.cpp',
     'InternalHeaders.cpp',
     'InternalRequest.cpp',
     'InternalResponse.cpp',
     'Request.cpp',
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -37,17 +37,16 @@ interfaces = [
     'smil',
     'push',
     'payments',
 ]
 
 DIRS += ['interfaces/' + i for i in interfaces]
 
 DIRS += [
-    'abort',
     'animation',
     'base',
     'bindings',
     'battery',
     'browser-element',
     'cache',
     'canvas',
     'commandhandler',
rename from dom/abort/tests/file_fetch_controller.html
rename to dom/tests/mochitest/fetch/file_fetch_controller.html
--- a/dom/tests/mochitest/fetch/mochitest.ini
+++ b/dom/tests/mochitest/fetch/mochitest.ini
@@ -1,11 +1,12 @@
 [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
   file_fetch_csp_block_frame.html^headers^
   test_fetch_basic.js
   test_fetch_basic_http.js
   test_fetch_cached_redirect.js
   test_fetch_cors.js
@@ -22,16 +23,17 @@ support-files =
   reroute.js
   reroute.js^headers^
   slow.sjs
   sw_reroute.js
   empty.js
   empty.js^headers^
   worker_temporaryFileBlob.js
   common_temporaryFileBlob.js
+  worker_fetch_controller.js
   common_readableStreams.js
   worker_readableStreams.js
   iframe_readableStreams.html
   !/dom/xhr/tests/file_XHR_binary1.bin
   !/dom/xhr/tests/file_XHR_binary1.bin^headers^
   !/dom/xhr/tests/file_XHR_binary2.bin
   !/dom/xhr/tests/file_XHR_pass1.xml
   !/dom/xhr/tests/file_XHR_pass2.txt
@@ -50,16 +52,17 @@ support-files =
 [test_headers_mainthread.html]
 [test_fetch_basic.html]
 [test_fetch_basic_sw_reroute.html]
 [test_fetch_basic_sw_empty_reroute.html]
 [test_fetch_basic_http.html]
 [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]
 skip-if = toolkit == 'android' && debug # Bug 1210282
 [test_fetch_cors_sw_empty_reroute.html]
 skip-if = toolkit == 'android' && debug # Bug 1210282
 [test_fetch_csp_block.html]
 [test_fetch_observer.html]
rename from dom/abort/tests/test_fetch_controller.html
rename to dom/tests/mochitest/fetch/test_fetch_controller.html
rename from dom/abort/tests/worker_fetch_controller.js
rename to dom/tests/mochitest/fetch/worker_fetch_controller.js