Backed out 2 changesets (bug 1694161) as requested by dev. DONTBUILD CLOSED TREE
authorsmolnar <smolnar@mozilla.com>
Fri, 26 Feb 2021 18:52:04 +0200
changeset 568965 d924e8a0d69f45ff8dfe462325761e02a2878448
parent 568964 0fb8a1114e84d41299e78edcbb1b6a741c7961a0
child 568966 37d93697c5fadcea75bc703bc509f49e0f9fa5c0
push id137311
push usersmolnar@mozilla.com
push dateFri, 26 Feb 2021 16:52:54 +0000
treeherderautoland@d924e8a0d69f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1694161
milestone88.0a1
backs out0fb8a1114e84d41299e78edcbb1b6a741c7961a0
453ce7dffdcc0044b502dc438835597d2be37778
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 2 changesets (bug 1694161) as requested by dev. DONTBUILD CLOSED TREE Backed out changeset 0fb8a1114e84 (bug 1694161) Backed out changeset 453ce7dffdcc (bug 1694161)
dom/gamepad/GamepadRemapping.cpp
dom/gamepad/cocoa/CocoaGamepad.cpp
dom/plugins/base/nsPluginTags.cpp
dom/plugins/ipc/PluginInstanceParent.cpp
gfx/2d/NativeFontResourceMac.cpp
gfx/layers/BufferTexture.cpp
gfx/layers/composite/ImageComposite.cpp
gfx/layers/ipc/ContentCompositorBridgeParent.cpp
gfx/webrender_bindings/RenderCompositorLayersSWGL.h
taskcluster/ci/source-test/clang.yml
taskcluster/scripts/misc/source-test-clang-setup-macos64.sh
--- a/dom/gamepad/GamepadRemapping.cpp
+++ b/dom/gamepad/GamepadRemapping.cpp
@@ -9,19 +9,16 @@
 
 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mozilla/dom/GamepadRemapping.h"
 #include "mozilla/dom/GamepadPlatformService.h"
 
-#include <vector>
-#include <unordered_map>
-
 namespace mozilla::dom {
 
 // Follow the canonical ordering recommendation for the "Standard Gamepad"
 // from https://www.w3.org/TR/gamepad/#remapping.
 enum CanonicalButtonIndex {
   BUTTON_INDEX_PRIMARY,
   BUTTON_INDEX_SECONDARY,
   BUTTON_INDEX_TERTIARY,
--- a/dom/gamepad/cocoa/CocoaGamepad.cpp
+++ b/dom/gamepad/cocoa/CocoaGamepad.cpp
@@ -4,21 +4,17 @@
  * 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/. */
 
 // mostly derived from the Allegro source code at:
 // http://alleg.svn.sourceforge.net/viewvc/alleg/allegro/branches/4.9/src/macosx/hidjoy.m?revision=13760&view=markup
 
 #include "mozilla/dom/GamepadHandle.h"
 #include "mozilla/dom/GamepadPlatformService.h"
-#include "mozilla/dom/GamepadRemapping.h"
-#include "mozilla/ipc/BackgroundParent.h"
 #include "mozilla/ArrayUtils.h"
-#include "mozilla/Tainting.h"
-#include "nsComponentManagerUtils.h"
 #include "nsITimer.h"
 #include "nsThreadUtils.h"
 #include <CoreFoundation/CoreFoundation.h>
 #include <IOKit/hid/IOHIDBase.h>
 #include <IOKit/hid/IOHIDKeys.h>
 #include <IOKit/hid/IOHIDManager.h>
 
 #include <stdio.h>
@@ -604,27 +600,27 @@ void DarwinGamepadService::SetLightIndic
 }
 
 }  // namespace
 
 namespace mozilla {
 namespace dom {
 
 void StartGamepadMonitoring() {
-  ::mozilla::ipc::AssertIsOnBackgroundThread();
+  AssertIsOnBackgroundThread();
   if (gService) {
     return;
   }
 
   gService = new DarwinGamepadService();
   gService->Startup();
 }
 
 void StopGamepadMonitoring() {
-  ::mozilla::ipc::AssertIsOnBackgroundThread();
+  AssertIsOnBackgroundThread();
   if (!gService) {
     return;
   }
 
   // Calling Shutdown() will delete gService as well
   gService->Shutdown();
 }
 
--- a/dom/plugins/base/nsPluginTags.cpp
+++ b/dom/plugins/base/nsPluginTags.cpp
@@ -11,17 +11,16 @@
 #include "nsPluginHost.h"
 #include "nsIBlocklistService.h"
 #include "nsPluginLogging.h"
 #include "nsNPAPIPlugin.h"
 #include "nsCharSeparatedTokenizer.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Unused.h"
 #include "nsNetUtil.h"
-#include "prenv.h"
 #include <cctype>
 #include "mozilla/Encoding.h"
 #include "mozilla/dom/FakePluginTagInitBinding.h"
 #include "mozilla/StaticPrefs_plugin.h"
 
 #if defined(XP_MACOSX) && defined(MOZ_SANDBOX)
 #  include "mozilla/SandboxSettings.h"
 #  include "nsCocoaFeatures.h"
--- a/dom/plugins/ipc/PluginInstanceParent.cpp
+++ b/dom/plugins/ipc/PluginInstanceParent.cpp
@@ -3,17 +3,16 @@
  * 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 "mozilla/DebugOnly.h"
 #include <stdint.h>  // for intptr_t
 
 #include "mozilla/BasicEvents.h"
-#include "mozilla/D3DMessageUtils.h"  // for DxgiAdapterDesc
 #include "mozilla/Preferences.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/ToString.h"
 #include "mozilla/dom/Element.h"
 #include "PluginInstanceParent.h"
 #include "BrowserStreamParent.h"
 #include "PluginBackgroundDestroyer.h"
--- a/gfx/2d/NativeFontResourceMac.cpp
+++ b/gfx/2d/NativeFontResourceMac.cpp
@@ -1,15 +1,14 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* 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 <unordered_map>
 #include <unordered_set>
 #include "NativeFontResourceMac.h"
 #include "UnscaledFontMac.h"
 #include "Types.h"
 
 #include "mozilla/RefPtr.h"
 #include "mozilla/DataMutex.h"
 
--- a/gfx/layers/BufferTexture.cpp
+++ b/gfx/layers/BufferTexture.cpp
@@ -12,18 +12,16 @@
 #include "mozilla/fallible.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/gfx/Logging.h"
 #include "mozilla/layers/CompositableForwarder.h"
 #include "mozilla/layers/ISurfaceAllocator.h"
 #include "mozilla/layers/ImageDataSerializer.h"
 #include "mozilla/layers/TextureForwarder.h"
 
-#include "gfxPlatform.h"
-
 #ifdef MOZ_WIDGET_GTK
 #  include "gfxPlatformGtk.h"
 #endif
 
 using mozilla::ipc::IShmemAllocator;
 
 namespace mozilla {
 namespace layers {
--- a/gfx/layers/composite/ImageComposite.cpp
+++ b/gfx/layers/composite/ImageComposite.cpp
@@ -5,17 +5,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ImageComposite.h"
 
 #include <inttypes.h>
 
 #include "GeckoProfiler.h"
 #include "gfxPlatform.h"
-#include "nsPrintfCString.h"
 
 namespace mozilla {
 
 using namespace gfx;
 
 namespace layers {
 
 /* static */ const float ImageComposite::BIAS_TIME_MS = 1.0f;
--- a/gfx/layers/ipc/ContentCompositorBridgeParent.cpp
+++ b/gfx/layers/ipc/ContentCompositorBridgeParent.cpp
@@ -31,17 +31,16 @@
 #include "mozilla/layers/WebRenderBridgeParent.h"
 #include "mozilla/layers/AsyncImagePipelineManager.h"
 #include "mozilla/webgpu/WebGPUParent.h"
 #include "mozilla/mozalloc.h"  // for operator new, etc
 #include "nsDebug.h"           // for NS_ASSERTION, etc
 #include "nsTArray.h"          // for nsTArray
 #include "nsXULAppAPI.h"       // for XRE_GetIOMessageLoop
 #include "mozilla/Unused.h"
-#include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/Telemetry.h"
 #ifdef MOZ_GECKO_PROFILER
 #  include "mozilla/BaseProfilerMarkerTypes.h"
 #endif
 
 namespace mozilla {
 
--- a/gfx/webrender_bindings/RenderCompositorLayersSWGL.h
+++ b/gfx/webrender_bindings/RenderCompositorLayersSWGL.h
@@ -2,18 +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/. */
 
 #ifndef MOZILLA_GFX_RENDERCOMPOSITOR_Layers_H
 #define MOZILLA_GFX_RENDERCOMPOSITOR_Layers_H
 
-#include <unordered_map>
-
 #include "mozilla/HashFunctions.h"
 #include "mozilla/layers/Compositor.h"
 #include "mozilla/layers/ScreenshotGrabber.h"
 #include "mozilla/webrender/RenderCompositor.h"
 #include "mozilla/webrender/RenderTextureHost.h"
 
 namespace mozilla {
 
--- a/taskcluster/ci/source-test/clang.yml
+++ b/taskcluster/ci/source-test/clang.yml
@@ -18,16 +18,18 @@ job-defaults:
     treeherder:
         kind: other
         tier: 2
     run:
         using: run-task
         tooltool-downloads: public
     fetches:
         toolchain:
+            - linux64-clang
+            - linux64-rust
             - linux64-cbindgen
             - linux64-nasm
             - linux64-node
     when:
         # Extension list from https://hg.mozilla.org/mozilla-central/file/default/python/mozbuild/mozbuild/mach_commands.py#l1664
         files-changed:
             - '**/*.c'
             - '**/*.cpp'
@@ -46,19 +48,17 @@ tidy:
         symbol: cpp(clang-tidy)
     run:
         cwd: '{checkout}'
         command: >-
             source taskcluster/scripts/misc/source-test-clang-setup.sh &&
             ./mach --log-no-times static-analysis check --outgoing --output $HOME/clang-tidy.json --format json
     fetches:
         toolchain:
-            - linux64-clang
             - linux64-clang-tidy
-            - linux64-rust
     worker:
         artifacts:
             - type: file
               name: public/code-review/clang-tidy.json
               path: /builds/worker/clang-tidy.json
 
 format:
     description: Run clang-format on C/C++ patches
@@ -67,19 +67,17 @@ format:
     run:
         cwd: '{checkout}'
         command: >-
             source taskcluster/scripts/misc/source-test-clang-setup.sh &&
             ./mach --log-no-times clang-format --outgoing --output $HOME/clang-format.json --format json &&
             ./mach --log-no-times clang-format --outgoing --output $HOME/clang-format.diff --format diff
     fetches:
         toolchain:
-            - linux64-clang
             - linux64-clang-tidy
-            - linux64-rust
     worker:
         artifacts:
             - type: file
               name: public/code-review/clang-format.json
               path: /builds/worker/clang-format.json
             - type: file
               name: public/code-review/clang-format.diff
               path: /builds/worker/clang-format.diff
@@ -90,57 +88,31 @@ external:
         symbol: cpp(clang-tidy-external)
     run:
         cwd: '{checkout}'
         command: >-
             source taskcluster/scripts/misc/source-test-clang-setup.sh &&
             ./mach --log-no-times static-analysis check --checks="-*,mozilla-civet-*" --outgoing --output $HOME/clang-tidy.json --format json
     fetches:
         toolchain:
-            - linux64-clang
             - linux64-clang-tidy-external
-            - linux64-rust
     worker:
         artifacts:
             - type: file
               name: public/code-review/clang-tidy.json
               path: /builds/worker/clang-tidy.json
 
-linux64-non-unified:
+non-unified:
     description: Run syntax test for non-unified build on C/C++ files.
     treeherder:
-        symbol: cpp(non-unified-linux64)
+        symbol: cpp(non-unified)
         tier: 1
     attributes:
         code-review: false
     run-on-projects: ['integration']
     run:
         cwd: '{checkout}'
         command: >-
             source taskcluster/scripts/misc/source-test-clang-setup.sh &&
             taskcluster/scripts/misc/source-test-clang-non-unified.sh
     fetches:
         toolchain:
-            - linux64-clang
             - linux64-clang-tidy
-            - linux64-rust
-
-macosx64-non-unified:
-    description: Run syntax test for non-unified build on C/C++ files.
-    treeherder:
-        symbol: cpp(non-unified-macos64)
-        tier: 1
-    attributes:
-        code-review: false
-    run-on-projects: ['integration']
-    run:
-        cwd: '{checkout}'
-        command: >-
-            source taskcluster/scripts/misc/source-test-clang-setup-macos64.sh &&
-            taskcluster/scripts/misc/source-test-clang-non-unified.sh
-    fetches:
-        toolchain:
-            - linux64-llvm-dsymutil
-            - linux64-rust-macos
-            - linux64-rust-size
-            - linux64-cctools-port
-            - linux64-clang-macosx-cross
-            - macosx64-sdk-10.12
deleted file mode 100644
--- a/taskcluster/scripts/misc/source-test-clang-setup-macos64.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-source $HOME/checkouts/gecko/taskcluster/scripts/misc/source-test-common.sh
-
-# Add clang-tidy to PATH
-export PATH=$MOZ_FETCHES_DIR/clang-tidy/bin:$PATH
-export PATH=$MOZ_FETCHES_DIR/cctools/bin:$MOZ_FETCHES_DIR/llvm-dsymutil/bin:$PATH
-
-# Use toolchain clang
-export LD_LIBRARY_PATH=$MOZ_FETCHES_DIR/clang/lib
-
-# Write custom mozconfig
-export MOZCONFIG=$GECKO_PATH/mozconfig
-
-# Add to mozconfig all the appropriate options
-cat <<EOT >> $MOZCONFIG
-# Enable debug mode
-ac_add_options --enable-debug
-# Enable GC zeal, a testing and debugging feature that helps find GC-related bugs in JSAPI applications.
-ac_add_options --enable-gczeal
-# Do not treat warnings as errors
-ac_add_options --disable-warnings-as-errors
-
-export MACOS_SDK_DIR=$MOZ_FETCHES_DIR/MacOSX10.12.sdk
-
-export DSYMUTIL=$GECKO_PATH/build/macosx/llvm-dsymutil
-mk_add_options "export REAL_DSYMUTIL=$MOZ_FETCHES_DIR/llvm-dsymutil/bin/dsymutil"
-
-ac_add_options --target=x86_64-apple-darwin
-
-EOT
-
-# Mach lookup clang-tidy in clang-tools
-mkdir -p $MOZBUILD_STATE_PATH/clang-tools
-ln -s $MOZ_FETCHES_DIR/clang-tidy $MOZBUILD_STATE_PATH/clang-tools/clang-tidy