Skip to content

Commit bbe0284

Browse files
author
smolnar
committed
Backed out 2 changesets (bug 1694161) as requested by dev. DONTBUILD CLOSED TREE
Backed out changeset 0fb8a1114e84 (bug 1694161) Backed out changeset 453ce7dffdcc (bug 1694161)
1 parent a839ede commit bbe0284

File tree

11 files changed

+6
-84
lines changed

11 files changed

+6
-84
lines changed

dom/gamepad/GamepadRemapping.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
#include "mozilla/dom/GamepadRemapping.h"
1515
#include "mozilla/dom/GamepadPlatformService.h"
1616

17-
#include <vector>
18-
#include <unordered_map>
19-
2017
namespace mozilla::dom {
2118

2219
// Follow the canonical ordering recommendation for the "Standard Gamepad"

dom/gamepad/cocoa/CocoaGamepad.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@
99

1010
#include "mozilla/dom/GamepadHandle.h"
1111
#include "mozilla/dom/GamepadPlatformService.h"
12-
#include "mozilla/dom/GamepadRemapping.h"
13-
#include "mozilla/ipc/BackgroundParent.h"
1412
#include "mozilla/ArrayUtils.h"
15-
#include "mozilla/Tainting.h"
16-
#include "nsComponentManagerUtils.h"
1713
#include "nsITimer.h"
1814
#include "nsThreadUtils.h"
1915
#include <CoreFoundation/CoreFoundation.h>
@@ -609,7 +605,7 @@ namespace mozilla {
609605
namespace dom {
610606

611607
void StartGamepadMonitoring() {
612-
::mozilla::ipc::AssertIsOnBackgroundThread();
608+
AssertIsOnBackgroundThread();
613609
if (gService) {
614610
return;
615611
}
@@ -619,7 +615,7 @@ void StartGamepadMonitoring() {
619615
}
620616

621617
void StopGamepadMonitoring() {
622-
::mozilla::ipc::AssertIsOnBackgroundThread();
618+
AssertIsOnBackgroundThread();
623619
if (!gService) {
624620
return;
625621
}

dom/plugins/base/nsPluginTags.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include "mozilla/Preferences.h"
1717
#include "mozilla/Unused.h"
1818
#include "nsNetUtil.h"
19-
#include "prenv.h"
2019
#include <cctype>
2120
#include "mozilla/Encoding.h"
2221
#include "mozilla/dom/FakePluginTagInitBinding.h"

dom/plugins/ipc/PluginInstanceParent.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include <stdint.h> // for intptr_t
99

1010
#include "mozilla/BasicEvents.h"
11-
#include "mozilla/D3DMessageUtils.h" // for DxgiAdapterDesc
1211
#include "mozilla/Preferences.h"
1312
#include "mozilla/StaticPrefs_dom.h"
1413
#include "mozilla/Telemetry.h"

gfx/2d/NativeFontResourceMac.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
* License, v. 2.0. If a copy of the MPL was not distributed with this
55
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
66

7-
#include <unordered_map>
87
#include <unordered_set>
98
#include "NativeFontResourceMac.h"
109
#include "UnscaledFontMac.h"

gfx/layers/BufferTexture.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
#include "mozilla/layers/ImageDataSerializer.h"
1818
#include "mozilla/layers/TextureForwarder.h"
1919

20-
#include "gfxPlatform.h"
21-
2220
#ifdef MOZ_WIDGET_GTK
2321
# include "gfxPlatformGtk.h"
2422
#endif

gfx/layers/composite/ImageComposite.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#include "GeckoProfiler.h"
1212
#include "gfxPlatform.h"
13-
#include "nsPrintfCString.h"
1413

1514
namespace mozilla {
1615

gfx/layers/ipc/ContentCompositorBridgeParent.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include "nsTArray.h" // for nsTArray
3737
#include "nsXULAppAPI.h" // for XRE_GetIOMessageLoop
3838
#include "mozilla/Unused.h"
39-
#include "mozilla/StaticPrefs_dom.h"
4039
#include "mozilla/StaticPtr.h"
4140
#include "mozilla/Telemetry.h"
4241
#ifdef MOZ_GECKO_PROFILER

gfx/webrender_bindings/RenderCompositorLayersSWGL.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
#ifndef MOZILLA_GFX_RENDERCOMPOSITOR_Layers_H
88
#define MOZILLA_GFX_RENDERCOMPOSITOR_Layers_H
99

10-
#include <unordered_map>
11-
1210
#include "mozilla/HashFunctions.h"
1311
#include "mozilla/layers/Compositor.h"
1412
#include "mozilla/layers/ScreenshotGrabber.h"

taskcluster/ci/source-test/clang.yml

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ job-defaults:
2323
tooltool-downloads: public
2424
fetches:
2525
toolchain:
26+
- linux64-clang
27+
- linux64-rust
2628
- linux64-cbindgen
2729
- linux64-nasm
2830
- linux64-node
@@ -51,9 +53,7 @@ tidy:
5153
./mach --log-no-times static-analysis check --outgoing --output $HOME/clang-tidy.json --format json
5254
fetches:
5355
toolchain:
54-
- linux64-clang
5556
- linux64-clang-tidy
56-
- linux64-rust
5757
worker:
5858
artifacts:
5959
- type: file
@@ -72,9 +72,7 @@ format:
7272
./mach --log-no-times clang-format --outgoing --output $HOME/clang-format.diff --format diff
7373
fetches:
7474
toolchain:
75-
- linux64-clang
7675
- linux64-clang-tidy
77-
- linux64-rust
7876
worker:
7977
artifacts:
8078
- type: file
@@ -95,19 +93,17 @@ external:
9593
./mach --log-no-times static-analysis check --checks="-*,mozilla-civet-*" --outgoing --output $HOME/clang-tidy.json --format json
9694
fetches:
9795
toolchain:
98-
- linux64-clang
9996
- linux64-clang-tidy-external
100-
- linux64-rust
10197
worker:
10298
artifacts:
10399
- type: file
104100
name: public/code-review/clang-tidy.json
105101
path: /builds/worker/clang-tidy.json
106102

107-
linux64-non-unified:
103+
non-unified:
108104
description: Run syntax test for non-unified build on C/C++ files.
109105
treeherder:
110-
symbol: cpp(non-unified-linux64)
106+
symbol: cpp(non-unified)
111107
tier: 1
112108
attributes:
113109
code-review: false
@@ -119,28 +115,4 @@ linux64-non-unified:
119115
taskcluster/scripts/misc/source-test-clang-non-unified.sh
120116
fetches:
121117
toolchain:
122-
- linux64-clang
123118
- linux64-clang-tidy
124-
- linux64-rust
125-
126-
macosx64-non-unified:
127-
description: Run syntax test for non-unified build on C/C++ files.
128-
treeherder:
129-
symbol: cpp(non-unified-macos64)
130-
tier: 1
131-
attributes:
132-
code-review: false
133-
run-on-projects: ['integration']
134-
run:
135-
cwd: '{checkout}'
136-
command: >-
137-
source taskcluster/scripts/misc/source-test-clang-setup-macos64.sh &&
138-
taskcluster/scripts/misc/source-test-clang-non-unified.sh
139-
fetches:
140-
toolchain:
141-
- linux64-llvm-dsymutil
142-
- linux64-rust-macos
143-
- linux64-rust-size
144-
- linux64-cctools-port
145-
- linux64-clang-macosx-cross
146-
- macosx64-sdk-10.12

taskcluster/scripts/misc/source-test-clang-setup-macos64.sh

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)