[DOM/network] Disable DNS prefetching if document nodePrincipal is systemPrincipal

[IPC] Clean up control flow in WaitableEvent.
[network] Add additional cookie setting checks.
2024-07-10 10:54:53 +02:00 · 2024-07-10 10:54:43 +02:00 · 2024-07-10 10:54:37 +02:00 · 2024-07-10 10:54:24 +02:00 · 2024-07-10 10:54:17 +02:00 · 2024-07-10 10:54:02 +02:00
49189 changed files with 2582915 additions and 3903778 deletions
@@ -187,28 +187,6 @@ devtools/client/framework/test/code_ugly*
 devtools/server/tests/unit/babel_and_browserify_script_with_source_map.js
 devtools/server/tests/unit/setBreakpoint*

-# mobile/android/ exclusions
-mobile/android/tests/
-
-# Uses `#filter substitution`
-mobile/android/b2gdroid/app/b2gdroid.js
-mobile/android/app/mobile.js
-mobile/android/chrome/content/healthreport-prefs.js
-
-# Uses `#expand`
-mobile/android/chrome/content/about.js
-
-# Not much JS to lint and non-standard at that
-mobile/android/installer/
-mobile/android/locales/
-
-# Non-standard `(catch ex if ...)`
-mobile/android/chrome/content/browser.js
-mobile/android/components/Snippets.js
-
-# Bug 1178739: Ignore this file as a quick fix for "Illegal yield expression"
-mobile/android/modules/HomeProvider.jsm
-
 # services/ exclusions

 # Uses `#filter substitution`
@@ -91,9 +91,6 @@ GPATH
 # Git clone directory for updating web-platform-tests
 testing/web-platform/sync/

-# Android Gradle artifacts.
-mobile/android/gradle/.gradle
-
 # XCode project cruft
 embedding/ios/GoannaEmbed/GoannaEmbed.xcodeproj/project.xcworkspace/xcuserdata
 embedding/ios/GoannaEmbed/GoannaEmbed.xcodeproj/xcuserdata
@@ -36,11 +36,6 @@ def FlagsForFile(filename):

    flag_list = shlex.split(out.getvalue())

-    # This flag is added by Fennec for android build and causes ycmd to fail to parse the file.
-    # Removing this flag is a workaround until ycmd starts to handle this flag properly.
-    # https://github.com/Valloric/YouCompleteMe/issues/1490
-    final_flags = [x for x in flag_list if not x.startswith('-march=armv')]
-
    return {
        'flags': final_flags,
        'do_cache': True
@@ -22,4 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.

-Clobber for CSS flow-root implementation
+Clobber for NSS update
@@ -137,16 +137,10 @@ default:: $(BUILD_BACKEND_FILES)
 endif

 install_manifests := \
-  $(addprefix dist/,branding idl include public private sdk xpi-stage) \
+  $(addprefix dist/,branding bin idl include public private sdk xpi-stage) \
  _tests \
  $(NULL)
-# Skip the dist/bin install manifest when using the hybrid
-# FasterMake/RecursiveMake backend. This is a hack until bug 1241744 moves
-# xpidl handling to FasterMake in that case, mechanically making the dist/bin
-# install manifest non-existent (non-existent manifests being skipped)
-ifeq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS)))
-install_manifests += dist/bin
-endif
+
 install_manifest_depends = \
  CLOBBER \
  $(configure_dir)/configure \
@@ -166,45 +160,9 @@ endif
 .PHONY: install-manifests
 install-manifests: $(addprefix install-,$(install_manifests))

-# If we're using the hybrid FasterMake/RecursiveMake backend, we want
-# to recurse in the faster/ directory in parallel of install manifests.
-# But dist/idl needs to happen before (cf. dependencies in
-# config/faster/rules.mk)
-ifneq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS)))
-install-manifests: faster
-.PHONY: faster
-faster: install-dist/idl
-	$(MAKE) -C faster FASTER_RECURSIVE_MAKE=1
-endif
-
-.PHONY: tup
-tup:
-	$(call BUILDSTATUS,TIERS make tup)
-	$(call BUILDSTATUS,TIER_START make)
-	$(MAKE) install-manifests buildid.h source-repo.h
-	$(call BUILDSTATUS,TIER_FINISH make)
-	$(call BUILDSTATUS,TIER_START tup)
-	@$(TUP) $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),,--verbose)
-	$(call BUILDSTATUS,TIER_FINISH tup)
-
-# process_install_manifest needs to be invoked with --no-remove when building
-# js as standalone because automated builds are building nspr separately and
-# that would remove the resulting files.
-# Eventually, a standalone js build would just be able to build nspr itself,
-# removing the need for the former.
-ifdef JS_STANDALONE
-NO_REMOVE=1
-endif
-
-.PHONY: $(addprefix install-,$(subst /,_,$(install_manifests)))
+.PHONY: $(addprefix install-,$(install_manifests))
 $(addprefix install-,$(install_manifests)): install-%: $(install_manifest_depends)
-ifneq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS)))
-	@# If we're using the hybrid FasterMake/RecursiveMake backend, we want
-	@# to ensure the FasterMake end doesn't have install manifests for the
-	@# same directory, because that would blow up
-	$(if $(wildcard _build_manifests/install/$(subst /,_,$*)),$(if $(wildcard faster/install_$(subst /,_,$*)*),$(error FasterMake and RecursiveMake ends of the hybrid build system want to handle $*)))
-endif
-	$(addprefix $(call py_action,process_install_manifest,$(if $(NO_REMOVE),--no-remove )$*) ,$(wildcard _build_manifests/install/$(subst /,_,$*)))
+	$(addprefix $(call py_action,process_install_manifest,--track install_$(subst /,_,$*).track $*) ,$(wildcard _build_manifests/install/$(subst /,_,$*)))

 # Dummy wrapper rule to allow the faster backend to piggy back
 $(addprefix install-,$(subst /,_,$(filter dist/%,$(install_manifests)))): install-dist_%: install-dist/% ;
@@ -217,10 +175,9 @@ install-tests: install-test-files
 .PHONY: run-tests-deps
 run-tests-deps: $(install_manifest_depends)

-# Force --no-remove, because $objdir/_tests is handled by multiple manifests.
 .PHONY: install-test-files
 install-test-files:
-	$(call py_action,process_install_manifest,--no-remove _tests _build_manifests/install/_test_files)
+	$(call py_action,process_install_manifest,--track install__test_files.track _tests _build_manifests/install/_test_files)

 include $(topsrcdir)/build/moz-automation.mk

@@ -240,13 +197,13 @@ ifndef NO_PROFILE_GUIDED_OPTIMIZE
 ifneq ($(OS_ARCH)_$(GNU_CC), WINNT_)
 recurse_pre-export:: install-manifests
 binaries::
-	@$(MAKE) install-manifests NO_REMOVE=1 install_manifests=dist/include
+	@$(MAKE) install-manifests install_manifests=dist/include
 endif
 endif
 else # !MOZ_PROFILE_USE (normal build)
 recurse_pre-export:: install-manifests
 binaries::
-	@$(MAKE) install-manifests NO_REMOVE=1 install_manifests=dist/include
+	@$(MAKE) install-manifests install_manifests=dist/include
 endif

 # For historical reasons that are unknown, $(DIST)/sdk is always blown away
@@ -9,8 +9,6 @@ selective cherry-picking of directly-applicable patches, this repository has its
 own development and holds the base for a maintained platform to be used by XUL
 applications.

-For a list of active projects making use of the Unified XUL Platform, checkout http://thereisonlyxul.org/.
-
 ## Additional documentation

 Additional documentation relevant to this source code can be found in the `/docs`
@@ -23,7 +21,7 @@ You are also always welcome to get in touch with our community on the [Pale Moon

 ### A note about trademarks and branding

-Although this repository is licensed under Mozilla Public License v2.0, the
+Although this repository is primarily licensed under Mozilla Public License v2.0, the
 trademarks and brands contained herein remain the property of their respective
 owners. For more details, please see the notifications in the respective directories.

@@ -35,5 +33,7 @@ If you fork this repository to perform your own work on it, please consider offe
 improvement patches upstream to its origin to mutually improve the platform and build
 a future for XUL.

-## Looking for Pale Moon and Basilisk?
-As of [`Issue #969`](https://repo.palemoon.org/MoonchildProductions/UXP/issues/969), release versions `28.9.0` and `2020.03.04` respectively, they have been split off into their own dedicated repositories located at [`MoonchildProductions/Pale-Moon`](https://repo.palemoon.org/MoonchildProductions/Pale-Moon) and [`MoonchildProductions/Basilisk`](https://repo.palemoon.org/MoonchildProductions/Basilisk).
+## Looking for Pale Moon?
+As of [`Issue #969`](https://repo.palemoon.org/MoonchildProductions/UXP/issues/969), release version `28.9.0`,
+applications have been split off into their own dedicated (front-end) repositories, with Pale Moon located at
+[`MoonchildProductions/Pale-Moon`](https://repo.palemoon.org/MoonchildProductions/Pale-Moon).
@@ -15,14 +15,14 @@ What should be considered vulnerabilities or security hazards by default:

 Generally not security vulnerabilities:
 - Null dereferencing crashes;
- Malware extensions (but please do report those on the forum in the extensions board!);
+- Malware extensions (but please do report those on the forum in the add-ons board!);
 - Denial-of-service (AKA "evil trap sites")
 - Browser hangs
 - Issues with non-standard manual configuration (either at build time or by manipulating about:config directly)

 ## Reporting a Vulnerability

-If you find an issue in UXP or the applications it builds on that could impact the security or safety of users please **do not**
+If you find an issue in UXP, or the applications building on it, that could impact the security or safety of users please **do not**
 make an issue on Gitea about it. Gitea does not support restricted viewability for security sensitive bugs.

 If you want to report a security-sensitive issue then please go to the [forum](https://forum.palemoon.org) and report the issue
@@ -33,4 +33,3 @@ except the recipient (not even moderators!).
 You will be informed via private message if the vulnerability report is accepted or declined, with reasoning.
 Security updates occur regularly and are given priority over most other development tasks. In general, they can be solved
 relatively quickly and will be included in the next point release (third digit if not rolled into a more major one).
-
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -5,9 +5,7 @@
 #include "AccIterator.h"

 #include "AccGroupInfo.h"
-#ifdef MOZ_XUL
 #include "XULTreeAccessible.h"
-#endif

 #include "mozilla/dom/HTMLLabelElement.h"

@@ -341,8 +341,6 @@ LogRequest(nsIRequest* aRequest)
      printf("targeted; ");
    if (loadFlags & nsIChannel::LOAD_CALL_CONTENT_SNIFFERS)
      printf("call content sniffers; ");
-    if (loadFlags & nsIChannel::LOAD_CLASSIFY_URI)
-      printf("classify uri; ");
  } else {
    printf("    no request");
  }
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -13,7 +13,6 @@

 #include "mozilla/dom/TabChild.h"
 #include "mozilla/dom/Element.h"
-#include "mozilla/Telemetry.h"

 using namespace mozilla;
 using namespace mozilla::a11y;
@@ -7,6 +7,10 @@
 * ROLE(geckoRole, stringRole, atkRole, macRole, msaaRole, ia2Role, nameRule)
 */

+#ifndef NSAccessibilityCellRole
+#define NSAccessibilityCellRole NSAccessibilityUnknownRole
+#endif
+
 ROLE(NOTHING,
     "nothing",
     ATK_ROLE_UNKNOWN,
@@ -18,10 +18,6 @@
 #include "mozilla/AppUnits.h"
 #include "mozilla/gfx/2D.h"

-#if defined(MOZ_WIDGET_GTK)
-#include "gfxPlatformGtk.h" // xxx - for UseFcFontList
-#endif
-
 using namespace mozilla;
 using namespace mozilla::a11y;

@@ -653,28 +649,14 @@ TextAttrsMgr::FontWeightTextAttr::
  if (font->IsSyntheticBold())
    return 700;

-  bool useFontEntryWeight = true;
-
-  // Under Linux, when gfxPangoFontGroup code is used,
-  // font->GetStyle()->weight will give the absolute weight requested of the
-  // font face. The gfxPangoFontGroup code uses the gfxFontEntry constructor
-  // which doesn't initialize the weight field.
-#if defined(MOZ_WIDGET_GTK)
-  useFontEntryWeight = gfxPlatformGtk::UseFcFontList();
-#endif
-
-  if (useFontEntryWeight) {
-    // On Windows, font->GetStyle()->weight will give the same weight as
-    // fontEntry->Weight(), the weight of the first font in the font group,
-    // which may not be the weight of the font face used to render the
-    // characters. On Mac, font->GetStyle()->weight will just give the same
-    // number as getComputedStyle(). fontEntry->Weight() will give the weight
-    // of the font face used.
-    gfxFontEntry *fontEntry = font->GetFontEntry();
-    return fontEntry->Weight();
-  } else {
-    return font->GetStyle()->weight;
-  }
+  // On Windows, font->GetStyle()->weight will give the same weight as
+  // fontEntry->Weight(), the weight of the first font in the font group,
+  // which may not be the weight of the font face used to render the
+  // characters. On Mac, font->GetStyle()->weight will just give the same
+  // number as getComputedStyle(). fontEntry->Weight() will give the weight
+  // of the font face used.
+  gfxFontEntry *fontEntry = font->GetFontEntry();
+  return fontEntry->Weight();
 }

 ////////////////////////////////////////////////////////////////////////////////
@@ -44,7 +44,9 @@
 #ifdef XP_WIN
 #include "mozilla/a11y/Compatibility.h"
 #include "mozilla/dom/ContentChild.h"
+#ifdef MOZ_ENABLE_NPAPI
 #include "HTMLWin32ObjectAccessible.h"
+#endif
 #include "mozilla/StaticPtr.h"
 #endif

@@ -55,7 +57,9 @@
 #include "nsImageFrame.h"
 #include "nsIObserverService.h"
 #include "nsLayoutUtils.h"
+#ifdef MOZ_ENABLE_NPAPI
 #include "nsPluginFrame.h"
+#endif
 #include "nsSVGPathGeometryFrame.h"
 #include "nsTreeBodyFrame.h"
 #include "nsTreeColumns.h"
@@ -68,7 +72,6 @@
 #include "mozilla/Services.h"
 #include "nsDeckFrame.h"

-#ifdef MOZ_XUL
 #include "XULAlertAccessible.h"
 #include "XULColorPickerAccessible.h"
 #include "XULComboboxAccessible.h"
@@ -79,9 +82,8 @@
 #include "XULSliderAccessible.h"
 #include "XULTabAccessible.h"
 #include "XULTreeGridAccessibleWrap.h"
-#endif

-#if defined(XP_WIN) || defined(MOZ_ACCESSIBILITY_ATK)
+#if (defined(XP_WIN) || defined(MOZ_ACCESSIBILITY_ATK)) && defined(MOZ_ENABLE_NPAPI)
 #include "nsNPAPIPluginInstance.h"
 #endif

@@ -433,6 +435,7 @@ private:
 NS_IMPL_ISUPPORTS(PluginTimerCallBack, nsITimerCallback)
 #endif

+#ifdef MOZ_ENABLE_NPAPI
 already_AddRefed<Accessible>
 nsAccessibilityService::CreatePluginAccessible(nsPluginFrame* aFrame,
                                               nsIContent* aContent,
@@ -495,6 +498,7 @@ nsAccessibilityService::CreatePluginAccessible(nsPluginFrame* aFrame,

  return nullptr;
 }
+#endif // MOZ_ENABLE_NPAPI

 void
 nsAccessibilityService::DeckPanelSwitched(nsIPresShell* aPresShell,
@@ -1356,7 +1360,6 @@ nsAccessibilityService::CreateAccessibleByType(nsIContent* aContent,
  }

  RefPtr<Accessible> accessible;
-#ifdef MOZ_XUL
  // XUL controls
  if (role.EqualsLiteral("xul:alert")) {
    accessible = new XULAlertAccessible(aContent, aDoc);
@@ -1515,7 +1518,6 @@ nsAccessibilityService::CreateAccessibleByType(nsIContent* aContent,
    accessible = new XULToolbarButtonAccessible(aContent, aDoc);

  }
-#endif // MOZ_XUL

  return accessible.forget();
 }
@@ -1642,11 +1644,13 @@ nsAccessibilityService::CreateAccessibleByFrameType(nsIFrame* aFrame,
    case eOuterDocType:
      newAcc = new OuterDocAccessible(aContent, document);
      break;
+#ifdef MOZ_ENABLE_NPAPI
    case ePluginType: {
      nsPluginFrame* pluginFrame = do_QueryFrame(aFrame);
      newAcc = CreatePluginAccessible(pluginFrame, aContent, aContext);
      break;
    }
+#endif
    case eTextLeafType:
      newAcc = new TextLeafAccessibleWrap(aContent, document);
      break;
@@ -1739,7 +1743,6 @@ nsAccessibilityService::HasAccessible(nsIDOMNode* aDOMNode)
 ////////////////////////////////////////////////////////////////////////////////
 // nsAccessibilityService private (DON'T put methods here)

-#ifdef MOZ_XUL
 already_AddRefed<Accessible>
 nsAccessibilityService::CreateAccessibleForXULTree(nsIContent* aContent,
                                                   DocAccessible* aDoc)
@@ -1769,7 +1772,6 @@ nsAccessibilityService::CreateAccessibleForXULTree(nsIContent* aContent,
    new XULTreeGridAccessibleWrap(aContent, aDoc, treeFrame);
  return accessible.forget();
 }
-#endif

 nsAccessibilityService*
 GetOrCreateAccService(uint32_t aNewConsumer)
@@ -20,7 +20,9 @@
 class nsImageFrame;
 class nsIArray;
 class nsIPersistentProperties;
+#ifdef MOZ_ENABLE_NPAPI
 class nsPluginFrame;
+#endif
 class nsITreeView;

 namespace mozilla {
@@ -87,9 +89,11 @@ public:

  Accessible* GetRootDocumentAccessible(nsIPresShell* aPresShell,
                                        bool aCanCreate);
+#ifdef MOZ_ENABLE_NPAPI
  already_AddRefed<Accessible>
    CreatePluginAccessible(nsPluginFrame* aFrame, nsIContent* aContent,
                           Accessible* aContext);
+#endif

  /**
   * Adds/remove ATK root accessible for gtk+ native window to/from children
@@ -274,13 +278,11 @@ private:
    CreateAccessibleByFrameType(nsIFrame* aFrame, nsIContent* aContent,
                                Accessible* aContext);

-#ifdef MOZ_XUL
  /**
   * Create accessible for XUL tree element.
   */
  already_AddRefed<Accessible>
    CreateAccessibleForXULTree(nsIContent* aContent, DocAccessible* aDoc);
-#endif

  /**
   * Reference for accessibility service instance.
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -48,9 +48,7 @@
 #include "mozilla/dom/DocumentType.h"
 #include "mozilla/dom/Element.h"

-#ifdef MOZ_XUL
 #include "nsIXULDocument.h"
-#endif

 using namespace mozilla;
 using namespace mozilla::a11y;
@@ -210,11 +208,9 @@ DocAccessible::NativeRole()
        return roles::CHROME_WINDOW;

      if (itemType == nsIDocShellTreeItem::typeContent) {
-#ifdef MOZ_XUL
        nsCOMPtr<nsIXULDocument> xulDoc(do_QueryInterface(mDocumentNode));
        if (xulDoc)
          return roles::APPLICATION;
-#endif
        return roles::DOCUMENT;
      }
    }
@@ -387,13 +383,11 @@ DocAccessible::URL(nsAString& aURL) const
 void
 DocAccessible::DocType(nsAString& aType) const
 {
-#ifdef MOZ_XUL
  nsCOMPtr<nsIXULDocument> xulDoc(do_QueryInterface(mDocumentNode));
  if (xulDoc) {
    aType.AssignLiteral("window"); // doctype not implemented for XUL at time of writing - causes assertion
    return;
  }
-#endif
  dom::DocumentType* docType = mDocumentNode->GetDoctype();
  if (docType)
    docType->GetPublicId(aType);
@@ -19,9 +19,7 @@
 #include "Relation.h"
 #include "Role.h"
 #include "States.h"
-#ifdef MOZ_XUL
 #include "XULTreeAccessible.h"
-#endif

 #include "mozilla/dom/Element.h"

@@ -43,10 +41,8 @@
 #include "nsFocusManager.h"
 #include "nsGlobalWindow.h"

-#ifdef MOZ_XUL
 #include "nsIXULDocument.h"
 #include "nsIXULWindow.h"
-#endif

 using namespace mozilla;
 using namespace mozilla::a11y;
@@ -102,7 +98,6 @@ RootAccessible::NativeRole()
 }

 // RootAccessible protected member
-#ifdef MOZ_XUL
 uint32_t
 RootAccessible::GetChromeFlags()
 {
@@ -122,7 +117,6 @@ RootAccessible::GetChromeFlags()
  xulWin->GetChromeFlags(&chromeFlags);
  return chromeFlags;
 }
-#endif

 uint64_t
 RootAccessible::NativeState()
@@ -131,7 +125,6 @@ RootAccessible::NativeState()
  if (state & states::DEFUNCT)
    return state;

-#ifdef MOZ_XUL
  uint32_t chromeFlags = GetChromeFlags();
  if (chromeFlags & nsIWebBrowserChrome::CHROME_WINDOW_RESIZE)
    state |= states::SIZEABLE;
@@ -142,7 +135,6 @@ RootAccessible::NativeState()
    state |= states::MOVEABLE;
  if (chromeFlags & nsIWebBrowserChrome::CHROME_MODAL)
    state |= states::MODAL;
-#endif

  nsFocusManager* fm = nsFocusManager::GetFocusManager();
  if (fm && fm->GetActiveWindow() == mDocumentNode->GetWindow())
@@ -292,7 +284,6 @@ RootAccessible::ProcessDOMEvent(nsIDOMEvent* aDOMEvent)
  if (!accessible)
    return;

-#ifdef MOZ_XUL
  XULTreeAccessible* treeAcc = accessible->AsXULTree();
  if (treeAcc) {
    if (eventType.EqualsLiteral("TreeRowCountChanged")) {
@@ -305,7 +296,6 @@ RootAccessible::ProcessDOMEvent(nsIDOMEvent* aDOMEvent)
      return;
    }
  }
-#endif

  if (eventType.EqualsLiteral("RadioStateChange")) {
    uint64_t state = accessible->State();
@@ -341,7 +331,6 @@ RootAccessible::ProcessDOMEvent(nsIDOMEvent* aDOMEvent)
  }

  Accessible* treeItemAcc = nullptr;
-#ifdef MOZ_XUL
  // If it's a tree element, need the currently selected item.
  if (treeAcc) {
    treeItemAcc = accessible->CurrentItem();
@@ -385,29 +374,22 @@ RootAccessible::ProcessDOMEvent(nsIDOMEvent* aDOMEvent)
      nsEventShell::FireEvent(selChangeEvent);
      return;
    }
-  }
-  else
-#endif
-  if (eventType.EqualsLiteral("AlertActive")) {
+  } else if (eventType.EqualsLiteral("AlertActive")) {
    nsEventShell::FireEvent(nsIAccessibleEvent::EVENT_ALERT, accessible);
-  }
-  else if (eventType.EqualsLiteral("popupshown")) {
+  } else if (eventType.EqualsLiteral("popupshown")) {
    HandlePopupShownEvent(accessible);
-  }
-  else if (eventType.EqualsLiteral("DOMMenuInactive")) {
+  } else if (eventType.EqualsLiteral("DOMMenuInactive")) {
    if (accessible->Role() == roles::MENUPOPUP) {
      nsEventShell::FireEvent(nsIAccessibleEvent::EVENT_MENUPOPUP_END,
                              accessible);
    }
-  }
-  else if (eventType.EqualsLiteral("DOMMenuItemActive")) {
+  } else if (eventType.EqualsLiteral("DOMMenuItemActive")) {
    FocusMgr()->ActiveItemChanged(accessible);
 #ifdef A11Y_LOG
    if (logging::IsEnabled(logging::eFocus))
      logging::ActiveItemChangeCausedBy("DOMMenuItemActive", accessible);
 #endif
-  }
-  else if (eventType.EqualsLiteral("DOMMenuItemInactive")) {
+  } else if (eventType.EqualsLiteral("DOMMenuItemInactive")) {
    // Process DOMMenuItemInactive event for autocomplete only because this is
    // unique widget that may acquire focus from autocomplete popup while popup
    // stays open and has no active item. In case of XUL tree autocomplete
@@ -421,8 +403,7 @@ RootAccessible::ProcessDOMEvent(nsIDOMEvent* aDOMEvent)
        logging::ActiveItemChangeCausedBy("DOMMenuItemInactive", accessible);
 #endif
    }
-  }
-  else if (eventType.EqualsLiteral("DOMMenuBarActive")) {  // Always from user input
+  } else if (eventType.EqualsLiteral("DOMMenuBarActive")) {  // Always from user input
    nsEventShell::FireEvent(nsIAccessibleEvent::EVENT_MENU_START,
                            accessible, eFromUserInput);

@@ -440,8 +421,7 @@ RootAccessible::ProcessDOMEvent(nsIDOMEvent* aDOMEvent)
        logging::ActiveItemChangeCausedBy("DOMMenuBarActive", accessible);
 #endif
    }
-  }
-  else if (eventType.EqualsLiteral("DOMMenuBarInactive")) {  // Always from user input
+  } else if (eventType.EqualsLiteral("DOMMenuBarInactive")) {  // Always from user input
    nsEventShell::FireEvent(nsIAccessibleEvent::EVENT_MENU_END,
                            accessible, eFromUserInput);

@@ -450,8 +430,7 @@ RootAccessible::ProcessDOMEvent(nsIDOMEvent* aDOMEvent)
    if (logging::IsEnabled(logging::eFocus))
      logging::ActiveItemChangeCausedBy("DOMMenuBarInactive", accessible);
 #endif
-  }
-  else if (accessible->NeedsDOMUIEvent() &&
+  } else if (accessible->NeedsDOMUIEvent() &&
           eventType.EqualsLiteral("ValueChange")) {
    uint32_t event = accessible->HasNumericValue()
      ? nsIAccessibleEvent::EVENT_VALUE_CHANGE
@@ -650,7 +629,6 @@ RootAccessible::HandlePopupHidingEvent(nsINode* aPopupNode)
  }
 }

-#ifdef MOZ_XUL
 void
 RootAccessible::HandleTreeRowCountChangedEvent(nsIDOMEvent* aEvent,
                                               XULTreeAccessible* aAccessible)
@@ -714,7 +692,6 @@ RootAccessible::HandleTreeInvalidatedEvent(nsIDOMEvent* aEvent,

  aAccessible->TreeViewInvalidated(startRow, endRow, startCol, endCol);
 }
-#endif

 ProxyAccessible*
 RootAccessible::GetPrimaryRemoteTopLevelContentDoc() const
@@ -70,14 +70,12 @@ protected:
   */
  void HandlePopupHidingEvent(nsINode* aNode);

-#ifdef MOZ_XUL
-    void HandleTreeRowCountChangedEvent(nsIDOMEvent* aEvent,
-                                        XULTreeAccessible* aAccessible);
-    void HandleTreeInvalidatedEvent(nsIDOMEvent* aEvent,
-                                    XULTreeAccessible* aAccessible);
+  void HandleTreeRowCountChangedEvent(nsIDOMEvent* aEvent,
+                                      XULTreeAccessible* aAccessible);
+  void HandleTreeInvalidatedEvent(nsIDOMEvent* aEvent,
+                                  XULTreeAccessible* aAccessible);

-    uint32_t GetChromeFlags();
-#endif
+  uint32_t GetChromeFlags();
 };

 inline RootAccessible*
@@ -486,13 +486,14 @@ DocAccessibleParent::SetCOMProxy(const RefPtr<IAccessible>& aCOMProxy)
  IAccessibleHolder holder(Move(ptr));
  Unused << SendParentCOMProxy(holder);
 }
-
+#ifdef MOZ_ENABLE_NPAPI
 bool
 DocAccessibleParent::RecvGetWindowedPluginIAccessible(
      const WindowsHandle& aHwnd, IAccessibleHolder* aPluginCOMProxy)
 {
  return false;
 }
+#endif

 #endif // defined(XP_WIN)

@@ -143,10 +143,11 @@ public:

 #if defined(XP_WIN)
  void SetCOMProxy(const RefPtr<IAccessible>& aCOMProxy);
-
+#ifdef MOZ_ENABLE_NPAPI
  virtual bool RecvGetWindowedPluginIAccessible(
      const WindowsHandle& aHwnd, IAccessibleHolder* aPluginCOMProxy) override;
-#endif
+#endif // MOZ_ENABLE_NPAPI
+#endif // XP_WIN

 private:

@@ -176,7 +177,7 @@ private:
  uint32_t AddSubtree(ProxyAccessible* aParent,
                      const nsTArray<AccessibleData>& aNewTree, uint32_t aIdx,
                      uint32_t aIdxInParent);
-  MOZ_MUST_USE bool CheckDocTree() const;
+  [[nodiscard]] bool CheckDocTree() const;
  xpcAccessibleGeneric* GetXPCAccessible(ProxyAccessible* aProxy);

  nsTArray<DocAccessibleParent*> mChildDocs;
@@ -61,8 +61,10 @@ parent:
   */
  async BindChildDoc(PDocAccessible aChildDoc, uint64_t aID);

+#ifdef MOZ_ENABLE_NPAPI
  sync GetWindowedPluginIAccessible(WindowsHandle aHwnd)
    returns (IAccessibleHolder aPluginCOMProxy);
+#endif

 child:
  async ParentCOMProxy(IAccessibleHolder aParentCOMProxy);
@@ -8,7 +8,7 @@ if CONFIG['COMPILE_ENVIRONMENT']:

 # With --disable-accessibility, we need to compile PDocAccessible.ipdl (which
 # also depends on COMPtrTypes.h), but not the C++.
-IPDL_SOURCES += ['PDocAccessible.ipdl']
+PREPROCESSED_IPDL_SOURCES += ['PDocAccessible.ipdl']
 EXPORTS.mozilla.a11y += ['COMPtrTypes.h']

 if CONFIG['ACCESSIBILITY']:
@@ -64,9 +64,7 @@ this.AccessFu = { // jshint ignore:line
    if (this._enabled) {
      this._disable();
    }
-    if (Utils.MozBuildApp === 'mobile/android') {
-      Services.obs.removeObserver(this, 'Accessibility:Settings');
-    } else if (Utils.win.navigator.mozSettings) {
+    if (Utils.win.navigator.mozSettings) {
      Utils.win.navigator.mozSettings.removeObserver(
        SCREENREADER_SETTING, this.handleEvent);
    }
@@ -585,11 +583,7 @@ var Output = {

  get androidBridge() {
    delete this.androidBridge;
-    if (Utils.MozBuildApp === 'mobile/android') {
-      this.androidBridge = Services.androidBridge;
-    } else {
-      this.androidBridge = null;
-    }
+    this.androidBridge = null;
    return this.androidBridge;
  },

@@ -815,12 +809,6 @@ var Input = {
            target.blur();
          }
        }
-
-        if (Utils.MozBuildApp == 'mobile/android') {
-          // Return focus to native Android browser chrome.
-          Services.androidBridge.handleGeckoMessage(
-              { type: 'ToggleChrome:Focus' });
-        }
        break;
      case aEvent.DOM_VK_RETURN:
        if (this.editState.editing) {
@@ -837,18 +825,9 @@ var Input = {
  },

  moveToPoint: function moveToPoint(aRule, aX, aY) {
-    // XXX: Bug 1013408 - There is no alignment between the chrome window's
-    // viewport size and the content viewport size in Android. This makes
-    // sending mouse events beyond its bounds impossible.
-    if (Utils.MozBuildApp === 'mobile/android') {
-      let mm = Utils.getMessageManager(Utils.CurrentBrowser);
-      mm.sendAsyncMessage('AccessFu:MoveToPoint',
-        {rule: aRule, x: aX, y: aY, origin: 'top'});
-    } else {
-      let win = Utils.win;
-      Utils.winUtils.sendMouseEvent('mousemove',
-        aX - win.mozInnerScreenX, aY - win.mozInnerScreenY, 0, 0, 0);
-    }
+    let win = Utils.win;
+    Utils.winUtils.sendMouseEvent('mousemove',
+      aX - win.mozInnerScreenX, aY - win.mozInnerScreenY, 0, 0, 0);
  },

  moveCursor: function moveCursor(aAction, aRule, aInputType, aAdjustRange) {
@@ -76,8 +76,6 @@ const EDGE = 0.1;
 const TIMEOUT_MULTIPLIER = 1;
 // A single pointer down/up sequence periodically precedes the tripple swipe
 // gesture on Android. This delay acounts for that.
-const IS_ANDROID = Utils.MozBuildApp === 'mobile/android' &&
-  Utils.AndroidSdkVersion >= 14;

 /**
 * A point object containing distance travelled data.
@@ -206,7 +204,7 @@ this.GestureTracker = { // jshint ignore:line
    if (aDetail.type !== 'pointerdown') {
      return;
    }
-    let GestureConstructor = aGesture || (IS_ANDROID ? DoubleTap : Tap);
+    let GestureConstructor = aGesture || Tap;
    this._create(GestureConstructor);
    this._update(aDetail, aTimeStamp);
  },
@@ -786,7 +786,7 @@ this.UtteranceGenerator = {  // jshint ignore:line
    // This is because we expose the checked information on the node itself.
    // XXX: this means the checked state is always appended to the end,
    // regardless of the utterance ordering preference.
-    if ((Utils.AndroidSdkVersion < 16 || Utils.MozBuildApp === 'browser') &&
+    if (Utils.MozBuildApp === 'browser' &&
      aState.contains(States.CHECKABLE)) {
      let checked = aState.contains(States.CHECKED);
      let statetr;
@@ -39,13 +39,6 @@ var PointerRelay = { // jshint ignore:line
    delete this._eventsOfInterest;

    switch (Utils.widgetToolkit) {
-      case 'android':
-        this._eventsOfInterest = {
-          'touchstart' : true,
-          'touchmove' : true,
-          'touchend' : true };
-        break;
-
      default:
        // Desktop.
        this._eventsOfInterest = {
@@ -110,11 +103,6 @@ var PointerRelay = { // jshint ignore:line
      target: aEvent.target
    }];

-    if (Utils.widgetToolkit === 'android' &&
-      changedTouches.length === 1 && changedTouches[0].identifier === 1) {
-      return;
-    }
-
    if (changedTouches.length === 1 &&
        changedTouches[0].identifier === SYNTH_ID) {
      return;
@@ -257,11 +257,8 @@ AndroidPresenter.prototype.pivotChanged =

    let androidEvents = [];

-    let isExploreByTouch = (aReason == Ci.nsIAccessiblePivot.REASON_POINT &&
-                            Utils.AndroidSdkVersion >= 14);
-    let focusEventType = (Utils.AndroidSdkVersion >= 16) ?
-      this.ANDROID_VIEW_ACCESSIBILITY_FOCUSED :
-      this.ANDROID_VIEW_FOCUSED;
+    let isExploreByTouch = (aReason == Ci.nsIAccessiblePivot.REASON_POINT);
+    let focusEventType = this.ANDROID_VIEW_ACCESSIBILITY_FOCUSED;

    if (isExploreByTouch) {
      // This isn't really used by TalkBack so this is a half-hearted attempt
@@ -270,25 +267,21 @@ AndroidPresenter.prototype.pivotChanged =
    }

    let brailleOutput = {};
-    if (Utils.AndroidSdkVersion >= 16) {
-      if (!this._braillePresenter) {
-        this._braillePresenter = new BraillePresenter();
-      }
-      brailleOutput = this._braillePresenter.pivotChanged(aContext, aReason).
-                         details;
+    if (!this._braillePresenter) {
+      this._braillePresenter = new BraillePresenter();
    }
+    brailleOutput = this._braillePresenter.pivotChanged(aContext, aReason).
+                       details;

    if (aReason === Ci.nsIAccessiblePivot.REASON_TEXT) {
-      if (Utils.AndroidSdkVersion >= 16) {
-        let adjustedText = aContext.textAndAdjustedOffsets;
+      let adjustedText = aContext.textAndAdjustedOffsets;

-        androidEvents.push({
-          eventType: this.ANDROID_VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY,
-          text: [adjustedText.text],
-          fromIndex: adjustedText.startOffset,
-          toIndex: adjustedText.endOffset
-        });
-      }
+      androidEvents.push({
+        eventType: this.ANDROID_VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY,
+        text: [adjustedText.text],
+        fromIndex: adjustedText.startOffset,
+        toIndex: adjustedText.endOffset
+      });
    } else {
      let state = Utils.getState(aContext.accessible);
      androidEvents.push({eventType: (isExploreByTouch) ?
@@ -371,7 +364,7 @@ AndroidPresenter.prototype.textSelectionChanged =
                                                 aOldEnd, aIsFromUserInput) {
    let androidEvents = [];

-    if (Utils.AndroidSdkVersion >= 14 && !aIsFromUserInput) {
+    if (!aIsFromUserInput) {
      if (!this._braillePresenter) {
        this._braillePresenter = new BraillePresenter();
      }
@@ -388,7 +381,7 @@ AndroidPresenter.prototype.textSelectionChanged =
      });
    }

-    if (Utils.AndroidSdkVersion >= 16 && aIsFromUserInput) {
+    if (aIsFromUserInput) {
      let [from, to] = aOldStart < aStart ?
        [aOldStart, aStart] : [aStart, aOldStart];
      androidEvents.push({
@@ -407,10 +400,6 @@ AndroidPresenter.prototype.textSelectionChanged =

 AndroidPresenter.prototype.viewportChanged =
  function AndroidPresenter_viewportChanged(aWindow, aCurrentContext) {
-    if (Utils.AndroidSdkVersion < 14) {
-      return null;
-    }
-
    let events = [{
      eventType: this.ANDROID_VIEW_SCROLLED,
      text: [],
@@ -420,7 +409,7 @@ AndroidPresenter.prototype.viewportChanged =
      maxScrollY: aWindow.scrollMaxY
    }];

-    if (Utils.AndroidSdkVersion >= 16 && aCurrentContext) {
+    if (aCurrentContext) {
      let currentAcc = aCurrentContext.accessibleForBounds;
      if (Utils.isAliveAndVisible(currentAcc)) {
        events.push({
@@ -447,8 +436,7 @@ AndroidPresenter.prototype.announce =
    return {
      type: this.type,
      details: [{
-        eventType: (Utils.AndroidSdkVersion >= 16) ?
-          this.ANDROID_ANNOUNCEMENT : this.ANDROID_VIEW_TEXT_CHANGED,
+        eventType: this.ANDROID_ANNOUNCEMENT,
        text: [localizedAnnouncement],
        addedCount: localizedAnnouncement.length,
        removedCount: 0,
@@ -680,7 +668,6 @@ this.Presentation = { // jshint ignore:line
  get presenters() {
    delete this.presenters;
    let presenterMap = {
-      'mobile/android': [VisualPresenter, AndroidPresenter],
      'b2g': [VisualPresenter, B2GPresenter],
      'browser': [VisualPresenter, B2GPresenter, AndroidPresenter]
    };
@@ -33,9 +33,7 @@ this.Utils = { // jshint ignore:line
  _buildAppMap: {
    '{3c2e2abc-06d4-11e1-ac3b-374f68613e61}': 'b2g',
    '{d1bfe7d9-c01e-4237-998b-7b5f960a4314}': 'graphene',
-    '{ec8030f7-c20a-464f-9b0e-13a3a9e97384}': 'browser',
-    '{aa3c5121-dab2-40e2-81ca-7ea25febc110}': 'mobile/android',
-    '{a23983c0-fd0e-11dc-95ff-0800200c9a66}': 'mobile/xul'
+    '{ec8030f7-c20a-464f-9b0e-13a3a9e97384}': 'browser'
  },

  init: function Utils_init(aWindow) {
@@ -111,35 +109,13 @@ this.Utils = { // jshint ignore:line
    return this._ScriptName;
  },

-  get AndroidSdkVersion() {
-    if (!this._AndroidSdkVersion) {
-      if (Services.appinfo.OS == 'Android') {
-        this._AndroidSdkVersion = Services.sysinfo.getPropertyAsInt32(
-          'version');
-      } else {
-        // Most useful in desktop debugging.
-        this._AndroidSdkVersion = 16;
-      }
-    }
-    return this._AndroidSdkVersion;
-  },
-
-  set AndroidSdkVersion(value) {
-    // When we want to mimic another version.
-    this._AndroidSdkVersion = value;
-  },
-
  get BrowserApp() {
    if (!this.win) {
      return null;
    }
    switch (this.MozBuildApp) {
-      case 'mobile/android':
-        return this.win.BrowserApp;
      case 'browser':
        return this.win.gBrowser;
-      case 'b2g':
-        return this.win.shell;
      default:
        return null;
    }
@@ -149,9 +125,6 @@ this.Utils = { // jshint ignore:line
    if (!this.BrowserApp) {
      return null;
    }
-    if (this.MozBuildApp == 'b2g') {
-      return this.BrowserApp.contentBrowser;
-    }
    return this.BrowserApp.selectedBrowser;
  },

@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* vim:expandtab:shiftwidth=4:tabstop=4:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -295,6 +295,7 @@ enum CheckboxValue {

@implementation mozPaneAccessible

+#if defined(MAC_OS_X_VERSION_10_6) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
 - (NSUInteger)accessibilityArrayAttributeCount:(NSString*)attribute
 {
  AccessibleWrap* accWrap = [self getGeckoAccessible];
@@ -313,6 +314,7 @@ enum CheckboxValue {

  return [super accessibilityArrayAttributeCount:attribute];
 }
+#endif

 - (NSArray*)children
 {
@@ -1,6 +1,4 @@
 /* -*- Mode: Objective-C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: Objective-C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: Objective-C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: Objective-C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -49,6 +47,24 @@ ConvertToNSArray(nsTArray<ProxyAccessible*>& aArray)
  return nativeArray;
 }

+// Convert to an object without @ syntax
+static inline id
+ConvertToId(NSInteger val)
+{
+    return [NSString stringWithFormat:@"%i", val];
+}
+
+// Missing from SDK 10.5
+#if !defined(MAC_OS_X_VERSION_10_6) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6)
+#define __IntToNSString(x) ([NSString stringWithFormat:@"%i", x])
+#define NSAccessibilityRowIndexRangeAttribute @"AXRowIndexRange"
+#define NSAccessibilityColumnIndexRangeAttribute @"AXColumnIndexRange"
+#define NSAccessibilityRowHeaderUIElementsAttribute @"AXRowHeaderUIElements"
+#define NSAccessibilityColumnHeaderUIElementsAttribute @"AXColumnHeaderUIElements"
+#define NSAccessibilityRowCountAttribute @"AXRowCount"
+#define NSAccessibilityColumnCountAttribute @"AXColumnCount"
+#endif
+
@implementation mozTablePartAccessible
 - (BOOL)isLayoutTablePart;
 {
@@ -85,10 +101,14 @@ ConvertToNSArray(nsTArray<ProxyAccessible*>& aArray)
 {
  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;

+#if defined(MAC_OS_X_VERSION_10_6) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
  NSArray* additionalAttributes = [super additionalAccessibilityAttributeNames];
  if ([self isLayoutTablePart]) {
    return additionalAttributes;
  }
+#else
+  NSArray* additionalAttributes = [[NSArray alloc] init];
+#endif

  static NSArray* tableAttrs = nil;
  if (!tableAttrs) {
@@ -110,9 +130,9 @@ ConvertToNSArray(nsTArray<ProxyAccessible*>& aArray)
  if (AccessibleWrap* accWrap = [self getGeckoAccessible]) {
    TableAccessible* table = accWrap->AsTable();
    if ([attribute isEqualToString:NSAccessibilityRowCountAttribute])
-      return @(table->RowCount());
+      return ConvertToId(table->RowCount());
    if ([attribute isEqualToString:NSAccessibilityColumnCountAttribute])
-      return @(table->ColCount());
+      return ConvertToId(table->ColCount());
    if ([attribute isEqualToString:NSAccessibilityRowsAttribute]) {
      // Create a new array with the list of table rows.
      NSMutableArray* nativeArray = [[NSMutableArray alloc] init];
@@ -129,9 +149,9 @@ ConvertToNSArray(nsTArray<ProxyAccessible*>& aArray)
    }
  } else if (ProxyAccessible* proxy = [self getProxyAccessible]) {
    if ([attribute isEqualToString:NSAccessibilityRowCountAttribute])
-      return @(proxy->TableRowCount());
+      return ConvertToId(proxy->TableRowCount());
    if ([attribute isEqualToString:NSAccessibilityColumnCountAttribute])
-      return @(proxy->TableColumnCount());
+      return ConvertToId(proxy->TableColumnCount());
    if ([attribute isEqualToString:NSAccessibilityRowsAttribute]) {
      // Create a new array with the list of table rows.
      NSMutableArray* nativeArray = [[NSMutableArray alloc] init];
@@ -157,10 +177,14 @@ ConvertToNSArray(nsTArray<ProxyAccessible*>& aArray)
 {
  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;

+#if defined(MAC_OS_X_VERSION_10_6) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
  NSArray* additionalAttributes = [super additionalAccessibilityAttributeNames];
  if ([self isLayoutTablePart]) {
    return additionalAttributes;
  }
+#else
+  NSArray* additionalAttributes = [[NSArray alloc] init];
+#endif

  static NSArray* tableRowAttrs = nil;
  if (!tableRowAttrs) {
@@ -216,10 +240,14 @@ ConvertToNSArray(nsTArray<ProxyAccessible*>& aArray)
 {
  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;

+#if defined(MAC_OS_X_VERSION_10_6) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
  NSArray* additionalAttributes = [super additionalAccessibilityAttributeNames];
  if ([self isLayoutTablePart]) {
    return additionalAttributes;
  }
+#else
+  NSArray* additionalAttributes = [[NSArray alloc] init];
+#endif

  static NSArray* tableCellAttrs = nil;
  if (!tableCellAttrs) {
@@ -21,12 +21,10 @@ DIRS += [ 'aom',
          'interfaces',
          'ipc',
          'jsat',
-          'xpcom'
+          'xpcom',
+          'xul'
 ]

-if CONFIG['MOZ_XUL']:
-    DIRS += ['xul']
-
 TEST_DIRS += ['tests/mochitest']

 BROWSER_CHROME_MANIFESTS += [
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* vim:expandtab:shiftwidth=4:tabstop=4:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -67,7 +67,7 @@
     * Change scrollbar styles from hidden to auto. That makes us to create an
     * accessible for scroll area.
     */
-    function changeScrollbarStyles(aContainerID, aScrollAreaID)
+    function changeScrollStyles(aContainerID, aScrollAreaID)
    {
      this.container = getAccessible(aContainerID);
      this.scrollAreaNode = getNode(aScrollAreaID);
@@ -77,7 +77,7 @@
        new invokerChecker(EVENT_REORDER, this.container)
      ];

-      this.invoke = function changeScrollbarStyles_invoke()
+      this.invoke = function changeScrollStyles_invoke()
      {
        var accTree =
          { SECTION: [] };
@@ -86,7 +86,7 @@
        this.scrollAreaNode.style.overflow = "auto";
      }

-      this.finalCheck = function changeScrollbarStyles_finalCheck()
+      this.finalCheck = function changeScrollStyles_finalCheck()
      {
        var accTree =
          { SECTION: [ // container
@@ -95,7 +95,7 @@
        testAccessibleTree(this.container, accTree);
      }

-      this.getID = function changeScrollbarStyles_getID()
+      this.getID = function changeScrollStyles_getID()
      {
        return "change scrollbar styles " + prettyName(aScrollAreaID);
      }
@@ -114,7 +114,7 @@
      gQueue = new eventQueue();

      gQueue.push(new changeScrollRange("container", "scrollarea"));
-      gQueue.push(new changeScrollbarStyles("container2", "scrollarea2"));
+      gQueue.push(new changeScrollStyles("container2", "scrollarea2"));

      gQueue.invoke(); // Will call SimpleTest.finish();
    }
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -173,7 +173,7 @@ public: // construction, destruction
  /**
   * Find an accessible by the given child ID in cached documents.
   */
-  MOZ_MUST_USE already_AddRefed<IAccessible>
+  [[nodiscard]] already_AddRefed<IAccessible>
  GetIAccessibleFor(const VARIANT& aVarChild, bool* aIsDefunct);

  virtual void GetNativeInterface(void **aOutAccessible) override;
@@ -198,7 +198,7 @@ protected:
  /**
   * Find a remote accessible by the given child ID.
   */
-  MOZ_MUST_USE already_AddRefed<IAccessible>
+  [[nodiscard]] already_AddRefed<IAccessible>
  GetRemoteIAccessibleFor(const VARIANT& aVarChild);

  /**
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* vim:expandtab:shiftwidth=4:tabstop=4:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* vim:expandtab:shiftwidth=4:tabstop=4:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -35,19 +35,6 @@ a11y::PlatformInit()

  nsWinUtils::MaybeStartWindowEmulation();
  ia2AccessibleText::InitTextChangeData();
-  if (BrowserTabsRemoteAutostart()) {
-    mscom::InterceptorLog::Init();
-    UniquePtr<RegisteredProxy> regProxy(
-        mscom::RegisterProxy(L"ia2marshal.dll"));
-    gRegProxy = regProxy.release();
-    UniquePtr<RegisteredProxy> regAccTlb(
-        mscom::RegisterTypelib(L"oleacc.dll",
-                               RegistrationFlags::eUseSystemDirectory));
-    gRegAccTlb = regAccTlb.release();
-    UniquePtr<RegisteredProxy> regMiscTlb(
-        mscom::RegisterTypelib(L"Accessible.tlb"));
-    gRegMiscTlb = regMiscTlb.release();
-  }
 }

 void
@@ -33,15 +33,18 @@ SOURCES += [
    'RootAccessibleWrap.cpp',
    'ServiceProvider.cpp',
    'TextLeafAccessibleWrap.cpp',
+    'XULListboxAccessibleWrap.cpp',
+    'XULMenuAccessibleWrap.cpp',
+    'XULTreeGridAccessibleWrap.cpp',
 ]

-if CONFIG['MOZ_XUL']:
+if CONFIG['MOZ_ENABLE_NPAPI']:
    SOURCES += [
-        'XULListboxAccessibleWrap.cpp',
-        'XULMenuAccessibleWrap.cpp',
-        'XULTreeGridAccessibleWrap.cpp',
+        'HTMLWin32ObjectAccessible.cpp',
    ]

+
+
 LOCAL_INCLUDES += [
    '/accessible/base',
    '/accessible/generic',
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* vim:expandtab:shiftwidth=4:tabstop=4:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -1,6 +1,4 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:expandtab:shiftwidth=2:tabstop=2:
- */
 /* 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/. */
@@ -21,12 +21,10 @@ builtin(include, build/autoconf/frameptr.m4)dnl
 builtin(include, build/autoconf/compiler-opts.m4)dnl
 builtin(include, build/autoconf/expandlibs.m4)dnl
 builtin(include, build/autoconf/arch.m4)dnl
-builtin(include, build/autoconf/android.m4)dnl
 builtin(include, build/autoconf/zlib.m4)dnl
 builtin(include, build/autoconf/icu.m4)dnl
 builtin(include, build/autoconf/clang-plugin.m4)dnl
 builtin(include, build/autoconf/alloc.m4)dnl
-builtin(include, build/autoconf/ios.m4)dnl
 builtin(include, build/autoconf/sanitize.m4)dnl

 MOZ_PROG_CHECKMSYS()
@@ -1,129 +0,0 @@
-import java.util.regex.Pattern
-
-allprojects {
-    // Expose the per-object-directory configuration to all projects.
-    ext {
-        mozconfig = gradle.mozconfig
-        topsrcdir = gradle.mozconfig.topsrcdir
-        topobjdir = gradle.mozconfig.topobjdir
-    }
-
-    repositories {
-        if (gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORY) {
-            maven {
-                url gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORY
-            }
-        }
-    }
-}
-
-buildDir "${topobjdir}/gradle/build"
-
-buildscript {
-    repositories {
-        if (gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORY) {
-            maven {
-                url gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORY
-            }
-        }
-        // For android-sdk-manager SNAPSHOT releases.
-        maven {
-            url "file://${gradle.mozconfig.topsrcdir}/mobile/android/gradle/m2repo"
-        }
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
-        classpath('com.stanfy.spoon:spoon-gradle-plugin:1.0.4') {
-            // Without these, we get errors linting.
-            exclude module: 'guava'
-        }
-        // Provided in tree.
-        classpath 'com.jakewharton.sdkmanager:gradle-plugin:1.5.0-SNAPSHOT'
-    }
-}
-
-task generateCodeAndResources(type:Exec) {
-    workingDir "${topobjdir}"
-
-    commandLine mozconfig.substs.GMAKE
-    args '-C'
-    args "${topobjdir}/mobile/android/base"
-    args 'gradle-targets'
-
-    // Only show the output if something went wrong.
-    ignoreExitValue = true
-    standardOutput = new ByteArrayOutputStream()
-    errorOutput = standardOutput
-    doLast {
-        if (execResult.exitValue != 0) {
-            throw new GradleException("Process '${commandLine}' finished with non-zero exit value ${execResult.exitValue}:\n\n${standardOutput.toString()}")
-        }
-    }
-}
-
-// Skip unit test for all build variants, unless if it was specifically requested by user.
-// The enabled property for the unit test tasks is reset based on the command line task names just before the task execution.
-// I bet there is a easier/cleaner way to do this, but this gets the job done for now.
-Pattern pattern = Pattern.compile('.*test(.+UnitTest)?.*')
-boolean startTasksIncludeTest = gradle.startParameter.taskNames.any {
-    taskName ->
-        taskName.matches(pattern)
-}
-gradle.taskGraph.beforeTask {
-    Task task ->
-        if (task.name.matches(pattern)) {
-            task.enabled = startTasksIncludeTest
-        }
-}
-
-afterEvaluate {
-    subprojects {
-        if (!hasProperty('android')) {
-            return
-        }
-        android.applicationVariants.all {
-            preBuild.dependsOn rootProject.generateCodeAndResources
-        }
-        android.libraryVariants.all {
-            preBuild.dependsOn rootProject.generateCodeAndResources
-        }
-    }
-}
-
-apply plugin: 'idea'
-
-idea {
-    project {
-        languageLevel = '1.7'
-    }
-
-    module {
-        // Object directories take a huge amount of time for IntelliJ to index.
-        // Exclude them.  Convention is that object directories start with obj.
-        // IntelliJ is clever and will not exclude the parts of the object
-        // directory that are referenced, if there are any.  In practice,
-        // indexing the entirety of the tree is taking too long, so exclude all
-        // but mobile/.
-        def topsrcdirURI = file(topsrcdir).toURI()
-        excludeDirs += files(file(topsrcdir)
-            .listFiles({it.isDirectory()} as FileFilter)
-            .collect({topsrcdirURI.relativize(it.toURI()).toString()}) // Relative paths.
-            .findAll({!it.equals('mobile/')}))
-
-        // If topobjdir is below topsrcdir, hide only some portions of that tree.
-        def topobjdirURI = file(topobjdir).toURI()
-        if (!topsrcdirURI.relativize(topobjdirURI).isAbsolute()) {
-            excludeDirs -= file(topobjdir)
-            excludeDirs += files(file(topobjdir).listFiles())
-            excludeDirs -= file("${topobjdir}/gradle")
-        }
-
-        if (!mozconfig.substs.MOZ_INSTALL_TRACKING) {
-            excludeDirs += file("${topsrcdir}/mobile/android/thirdparty/com/adjust")
-        }
-    }
-}
-
-task wrapper(type: Wrapper) {
-}
@@ -1,54 +0,0 @@
-/* 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/. */
-
-package org.mozilla.gecko.annotationProcessors;
-
-/**
- * Object holding annotation data. Used by GeneratableElementIterator.
- */
-public class AnnotationInfo {
-    public enum ExceptionMode {
-        ABORT,
-        NSRESULT,
-        IGNORE;
-
-        String nativeValue() {
-            return "mozilla::jni::ExceptionMode::" + name();
-        }
-    }
-
-    public enum CallingThread {
-        GECKO,
-        UI,
-        ANY;
-
-        String nativeValue() {
-            return "mozilla::jni::CallingThread::" + name();
-        }
-    }
-
-    public enum DispatchTarget {
-        GECKO,
-        PROXY,
-        CURRENT;
-
-        String nativeValue() {
-            return "mozilla::jni::DispatchTarget::" + name();
-        }
-    }
-
-    public final String wrapperName;
-    public final ExceptionMode exceptionMode;
-    public final CallingThread callingThread;
-    public final DispatchTarget dispatchTarget;
-
-    public AnnotationInfo(String wrapperName, ExceptionMode exceptionMode,
-                          CallingThread callingThread, DispatchTarget dispatchTarget) {
-
-        this.wrapperName = wrapperName;
-        this.exceptionMode = exceptionMode;
-        this.callingThread = callingThread;
-        this.dispatchTarget = dispatchTarget;
-    }
-}
@@ -1,175 +0,0 @@
-/* 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/. */
-
-package org.mozilla.gecko.annotationProcessors;
-
-import org.mozilla.gecko.annotationProcessors.classloader.AnnotatableEntity;
-import org.mozilla.gecko.annotationProcessors.classloader.ClassWithOptions;
-import org.mozilla.gecko.annotationProcessors.classloader.IterableJarLoadingURLClassLoader;
-import org.mozilla.gecko.annotationProcessors.utils.GeneratableElementIterator;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Iterator;
-
-public class AnnotationProcessor {
-    public static final String GENERATED_COMMENT =
-            "// GENERATED CODE\n" +
-            "// Generated by the Java program at /build/annotationProcessors at compile time\n" +
-            "// from annotations on Java methods. To update, change the annotations on the\n" +
-            "// corresponding Java methods and rerun the build. Manually updating this file\n" +
-            "// will cause your build to fail.\n" +
-            "\n";
-
-    private static final StringBuilder headerFile = new StringBuilder(GENERATED_COMMENT);
-    private static final StringBuilder implementationFile = new StringBuilder(GENERATED_COMMENT);
-    private static final StringBuilder nativesFile = new StringBuilder(GENERATED_COMMENT);
-
-    public static void main(String[] args) {
-        // We expect a list of jars on the commandline. If missing, whinge about it.
-        if (args.length <= 2) {
-            System.err.println("Usage: java AnnotationProcessor outprefix jarfiles ...");
-            System.exit(1);
-        }
-
-        final String OUTPUT_PREFIX = args[0];
-        final String SOURCE_FILE = OUTPUT_PREFIX + "JNIWrappers.cpp";
-        final String HEADER_FILE = OUTPUT_PREFIX + "JNIWrappers.h";
-        final String NATIVES_FILE = OUTPUT_PREFIX + "JNINatives.h";
-
-        System.out.println("Processing annotations...");
-
-        // We want to produce the same output as last time as often as possible. Ordering of
-        // generated statements, therefore, needs to be consistent.
-        final String[] jars = Arrays.copyOfRange(args, 1, args.length);
-        Arrays.sort(jars);
-
-        // Start the clock!
-        long s = System.currentTimeMillis();
-
-        // Get an iterator over the classes in the jar files given...
-        Iterator<ClassWithOptions> jarClassIterator = IterableJarLoadingURLClassLoader.getIteratorOverJars(jars);
-
-        headerFile.append(
-                "#ifndef " + getHeaderGuardName(HEADER_FILE) + "\n" +
-                "#define " + getHeaderGuardName(HEADER_FILE) + "\n" +
-                "\n" +
-                "#include \"mozilla/jni/Refs.h\"\n" +
-                "\n" +
-                "namespace mozilla {\n" +
-                "namespace java {\n" +
-                "\n");
-
-        implementationFile.append(
-                "#include \"" + HEADER_FILE + "\"\n" +
-                "#include \"mozilla/jni/Accessors.h\"\n" +
-                "\n" +
-                "namespace mozilla {\n" +
-                "namespace java {\n" +
-                "\n");
-
-        nativesFile.append(
-                "#ifndef " + getHeaderGuardName(NATIVES_FILE) + "\n" +
-                "#define " + getHeaderGuardName(NATIVES_FILE) + "\n" +
-                "\n" +
-                "#include \"" + HEADER_FILE + "\"\n" +
-                "#include \"mozilla/jni/Natives.h\"\n" +
-                "\n" +
-                "namespace mozilla {\n" +
-                "namespace java {\n" +
-                "\n");
-
-        while (jarClassIterator.hasNext()) {
-            generateClass(jarClassIterator.next());
-        }
-
-        implementationFile.append(
-                "} /* java */\n" +
-                "} /* mozilla */\n");
-
-        headerFile.append(
-                "} /* java */\n" +
-                "} /* mozilla */\n" +
-                "#endif // " + getHeaderGuardName(HEADER_FILE) + "\n");
-
-        nativesFile.append(
-                "} /* java */\n" +
-                "} /* mozilla */\n" +
-                "#endif // " + getHeaderGuardName(NATIVES_FILE) + "\n");
-
-        writeOutputFile(SOURCE_FILE, implementationFile);
-        writeOutputFile(HEADER_FILE, headerFile);
-        writeOutputFile(NATIVES_FILE, nativesFile);
-
-        long e = System.currentTimeMillis();
-        System.out.println("Annotation processing complete in " + (e - s) + "ms");
-    }
-
-    private static void generateClass(final ClassWithOptions annotatedClass) {
-        // Get an iterator over the appropriately generated methods of this class
-        final GeneratableElementIterator methodIterator
-                = new GeneratableElementIterator(annotatedClass);
-        final ClassWithOptions[] innerClasses = methodIterator.getInnerClasses();
-
-        if (!methodIterator.hasNext() && innerClasses.length == 0) {
-            return;
-        }
-
-        final CodeGenerator generatorInstance = new CodeGenerator(annotatedClass);
-        generatorInstance.generateClasses(innerClasses);
-
-        // Iterate all annotated members in this class..
-        while (methodIterator.hasNext()) {
-            AnnotatableEntity aElementTuple = methodIterator.next();
-            switch (aElementTuple.mEntityType) {
-                case METHOD:
-                    generatorInstance.generateMethod(aElementTuple);
-                    break;
-                case NATIVE:
-                    generatorInstance.generateNative(aElementTuple);
-                    break;
-                case FIELD:
-                    generatorInstance.generateField(aElementTuple);
-                    break;
-                case CONSTRUCTOR:
-                    generatorInstance.generateConstructor(aElementTuple);
-                    break;
-            }
-        }
-
-        headerFile.append(generatorInstance.getHeaderFileContents());
-        implementationFile.append(generatorInstance.getWrapperFileContents());
-        nativesFile.append(generatorInstance.getNativesFileContents());
-
-        for (ClassWithOptions innerClass : innerClasses) {
-            generateClass(innerClass);
-        }
-    }
-
-    private static String getHeaderGuardName(final String name) {
-        return name.replaceAll("\\W", "_");
-    }
-
-    private static void writeOutputFile(final String name,
-                                        final StringBuilder content) {
-        FileOutputStream outStream = null;
-        try {
-            outStream = new FileOutputStream(name);
-            outStream.write(content.toString().getBytes());
-        } catch (IOException e) {
-            System.err.println("Unable to write " + name + ". Perhaps a permissions issue?");
-            e.printStackTrace(System.err);
-        } finally {
-            if (outStream != null) {
-                try {
-                    outStream.close();
-                } catch (IOException e) {
-                    System.err.println("Unable to close outStream due to "+e);
-                    e.printStackTrace(System.err);
-                }
-            }
-        }
-    }
-}
@@ -1,627 +0,0 @@
-/* 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/. */
-
-package org.mozilla.gecko.annotationProcessors;
-
-import org.mozilla.gecko.annotationProcessors.classloader.AnnotatableEntity;
-import org.mozilla.gecko.annotationProcessors.classloader.ClassWithOptions;
-import org.mozilla.gecko.annotationProcessors.utils.Utils;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Member;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.HashSet;
-
-public class CodeGenerator {
-    private static final Class<?>[] EMPTY_CLASS_ARRAY = new Class<?>[0];
-
-    // Buffers holding the strings to ultimately be written to the output files.
-    private final StringBuilder cpp = new StringBuilder();
-    private final StringBuilder header = new StringBuilder();
-    private final StringBuilder natives = new StringBuilder();
-    private final StringBuilder nativesInits = new StringBuilder();
-
-    private final Class<?> cls;
-    private final String clsName;
-    private AnnotationInfo.CallingThread callingThread = null;
-    private int numNativesInits;
-
-    private final HashSet<String> takenMethodNames = new HashSet<String>();
-
-    public CodeGenerator(ClassWithOptions annotatedClass) {
-        this.cls = annotatedClass.wrappedClass;
-        this.clsName = annotatedClass.generatedName;
-
-        final String unqualifiedName = Utils.getUnqualifiedName(clsName);
-        header.append(
-                "class " + clsName + " : public mozilla::jni::ObjectBase<" +
-                        unqualifiedName + ">\n" +
-                "{\n" +
-                "public:\n" +
-                "    static const char name[];\n" +
-                "\n" +
-                "    explicit " + unqualifiedName + "(const Context& ctx) : ObjectBase<" +
-                        unqualifiedName + ">(ctx) {}\n" +
-                "\n");
-
-        cpp.append(
-                "const char " + clsName + "::name[] =\n" +
-                "        \"" + cls.getName().replace('.', '/') + "\";\n" +
-                "\n");
-
-        natives.append(
-                "template<class Impl>\n" +
-                "class " + clsName + "::Natives : " +
-                        "public mozilla::jni::NativeImpl<" + unqualifiedName + ", Impl>\n" +
-                "{\n" +
-                "public:\n");
-    }
-
-    private String getTraitsName(String uniqueName, boolean includeScope) {
-        return (includeScope ? clsName + "::" : "") + uniqueName + "_t";
-    }
-
-    /**
-     * Return the C++ type name for this class or any class within the chain
-     * of declaring classes, if the target class matches the given type.
-     *
-     * Return null if the given type does not match any class searched.
-     */
-    private String getMatchingClassType(final Class<?> type) {
-        Class<?> cls = this.cls;
-        String clsName = this.clsName;
-
-        while (cls != null) {
-            if (type.equals(cls)) {
-                return clsName;
-            }
-            cls = cls.getDeclaringClass();
-            clsName = clsName.substring(0, Math.max(0, clsName.lastIndexOf("::")));
-        }
-        return null;
-    }
-
-    private String getNativeParameterType(Class<?> type, AnnotationInfo info) {
-        final String clsName = getMatchingClassType(type);
-        if (clsName != null) {
-            return Utils.getUnqualifiedName(clsName) + "::Param";
-        }
-        return Utils.getNativeParameterType(type, info);
-    }
-
-    private String getNativeReturnType(Class<?> type, AnnotationInfo info) {
-        final String clsName = getMatchingClassType(type);
-        if (clsName != null) {
-            return Utils.getUnqualifiedName(clsName) + "::LocalRef";
-        }
-        return Utils.getNativeReturnType(type, info);
-    }
-
-    private void generateMember(AnnotationInfo info, Member member,
-                                String uniqueName, Class<?> type, Class<?>[] argTypes) {
-        final StringBuilder args = new StringBuilder();
-        for (Class<?> argType : argTypes) {
-            args.append("\n                " + getNativeParameterType(argType, info) + ",");
-        }
-        if (args.length() > 0) {
-            args.setLength(args.length() - 1);
-        }
-
-        header.append(
-                "    struct " + getTraitsName(uniqueName, /* includeScope */ false) + " {\n" +
-                "        typedef " + Utils.getUnqualifiedName(clsName) + " Owner;\n" +
-                "        typedef " + getNativeReturnType(type, info) + " ReturnType;\n" +
-                "        typedef " + getNativeParameterType(type, info) + " SetterType;\n" +
-                "        typedef mozilla::jni::Args<" + args + "> Args;\n" +
-                "        static constexpr char name[] = \"" +
-                        Utils.getMemberName(member) + "\";\n" +
-                "        static constexpr char signature[] =\n" +
-                "                \"" + Utils.getSignature(member) + "\";\n" +
-                "        static const bool isStatic = " + Utils.isStatic(member) + ";\n" +
-                "        static const mozilla::jni::ExceptionMode exceptionMode =\n" +
-                "                " + info.exceptionMode.nativeValue() + ";\n" +
-                "        static const mozilla::jni::CallingThread callingThread =\n" +
-                "                " + info.callingThread.nativeValue() + ";\n" +
-                "        static const mozilla::jni::DispatchTarget dispatchTarget =\n" +
-                "                " + info.dispatchTarget.nativeValue() + ";\n" +
-                "    };\n" +
-                "\n");
-
-        cpp.append(
-                "constexpr char " + getTraitsName(uniqueName, /* includeScope */ true) +
-                        "::name[];\n" +
-                "constexpr char " + getTraitsName(uniqueName, /* includeScope */ true) +
-                        "::signature[];\n" +
-                "\n");
-
-        if (this.callingThread == null) {
-            this.callingThread = info.callingThread;
-        } else if (this.callingThread != info.callingThread) {
-            // We have a mix of calling threads, so specify "any" for the whole class.
-            this.callingThread = AnnotationInfo.CallingThread.ANY;
-        }
-    }
-
-    private String getUniqueMethodName(String basename) {
-        String newName = basename;
-        int index = 1;
-
-        while (takenMethodNames.contains(newName)) {
-            newName = basename + (++index);
-        }
-
-        takenMethodNames.add(newName);
-        return newName;
-    }
-
-    /**
-     * Generate a method prototype that includes return and argument types,
-     * without specifiers (static, const, etc.).
-     */
-    private String generatePrototype(String name, Class<?>[] argTypes,
-                                     Class<?> returnType, AnnotationInfo info,
-                                     boolean includeScope, boolean includeArgName,
-                                     boolean isConst) {
-
-        final StringBuilder proto = new StringBuilder();
-        int argIndex = 0;
-
-        proto.append("auto ");
-
-        if (includeScope) {
-            proto.append(clsName).append("::");
-        }
-
-        proto.append(name).append('(');
-
-        for (Class<?> argType : argTypes) {
-            proto.append(getNativeParameterType(argType, info));
-            if (includeArgName) {
-                proto.append(" a").append(argIndex++);
-            }
-            proto.append(", ");
-        }
-
-        if (info.exceptionMode == AnnotationInfo.ExceptionMode.NSRESULT &&
-                !returnType.equals(void.class)) {
-            proto.append(getNativeReturnType(returnType, info)).append('*');
-            if (includeArgName) {
-                proto.append(" a").append(argIndex++);
-            }
-            proto.append(", ");
-        }
-
-        if (proto.substring(proto.length() - 2).equals(", ")) {
-            proto.setLength(proto.length() - 2);
-        }
-
-        proto.append(')');
-
-        if (isConst) {
-            proto.append(" const");
-        }
-
-        if (info.exceptionMode == AnnotationInfo.ExceptionMode.NSRESULT) {
-            proto.append(" -> nsresult");
-        } else {
-            proto.append(" -> ").append(getNativeReturnType(returnType, info));
-        }
-        return proto.toString();
-    }
-
-    /**
-     * Generate a method declaration that includes the prototype with specifiers,
-     * but without the method body.
-     */
-    private String generateDeclaration(String name, Class<?>[] argTypes,
-                                       Class<?> returnType, AnnotationInfo info,
-                                       boolean isStatic) {
-
-        return (isStatic ? "static " : "") +
-            generatePrototype(name, argTypes, returnType, info,
-                              /* includeScope */ false, /* includeArgName */ false,
-                              /* isConst */ !isStatic) + ';';
-    }
-
-    /**
-     * Generate a method definition that includes the prototype with specifiers,
-     * and with the method body.
-     */
-    private String generateDefinition(String accessorName, String name, Class<?>[] argTypes,
-                                      Class<?> returnType, AnnotationInfo info, boolean isStatic) {
-
-        final StringBuilder def = new StringBuilder(
-                generatePrototype(name, argTypes, returnType, info,
-                                  /* includeScope */ true, /* includeArgName */ true,
-                                  /* isConst */ !isStatic));
-        def.append("\n{\n");
-
-
-        // Generate code to handle the return value, if needed.
-        // We initialize rv to NS_OK instead of NS_ERROR_* because loading NS_OK (0) uses
-        // fewer instructions. We are guaranteed to set rv to the correct value later.
-
-        if (info.exceptionMode == AnnotationInfo.ExceptionMode.NSRESULT &&
-                returnType.equals(void.class)) {
-            def.append(
-                    "    nsresult rv = NS_OK;\n" +
-                    "    ");
-
-        } else if (info.exceptionMode == AnnotationInfo.ExceptionMode.NSRESULT) {
-            // Non-void return type
-            final String resultArg = "a" + argTypes.length;
-            def.append(
-                    "    MOZ_ASSERT(" + resultArg + ");\n" +
-                    "    nsresult rv = NS_OK;\n" +
-                    "    *" + resultArg + " = ");
-
-        } else {
-            def.append(
-                    "    return ");
-        }
-
-
-        // Generate a call, e.g., Method<Traits>::Call(a0, a1, a2);
-
-        def.append(accessorName).append("(")
-           .append(Utils.getUnqualifiedName(clsName) +
-                   (isStatic ? "::Context()" : "::mCtx"));
-
-        if (info.exceptionMode == AnnotationInfo.ExceptionMode.NSRESULT) {
-            def.append(", &rv");
-        } else {
-            def.append(", nullptr");
-        }
-
-        // Generate the call argument list.
-        for (int argIndex = 0; argIndex < argTypes.length; argIndex++) {
-            def.append(", a").append(argIndex);
-        }
-
-        def.append(");\n");
-
-
-        if (info.exceptionMode == AnnotationInfo.ExceptionMode.NSRESULT) {
-            def.append("    return rv;\n");
-        }
-
-        return def.append("}").toString();
-    }
-
-    /**
-     * Append the appropriate generated code to the buffers for the method provided.
-     *
-     * @param annotatedMethod The Java method, plus annotation data.
-     */
-    public void generateMethod(AnnotatableEntity annotatedMethod) {
-        // Unpack the tuple and extract some useful fields from the Method..
-        final Method method = annotatedMethod.getMethod();
-        final AnnotationInfo info = annotatedMethod.mAnnotationInfo;
-        final String uniqueName = getUniqueMethodName(info.wrapperName);
-        final Class<?>[] argTypes = method.getParameterTypes();
-        final Class<?> returnType = method.getReturnType();
-
-        if (method.isSynthetic()) {
-            return;
-        }
-
-        // Sanity check
-        if (info.dispatchTarget != AnnotationInfo.DispatchTarget.CURRENT) {
-            throw new IllegalStateException("Invalid dispatch target \"" +
-                    info.dispatchTarget.name().toLowerCase() +
-                    "\" for non-native method " + clsName + "::" + uniqueName);
-        }
-
-        generateMember(info, method, uniqueName, returnType, argTypes);
-
-        final boolean isStatic = Utils.isStatic(method);
-
-        header.append(
-                "    " + generateDeclaration(info.wrapperName, argTypes,
-                                             returnType, info, isStatic) + "\n" +
-                "\n");
-
-        cpp.append(
-                generateDefinition(
-                        "mozilla::jni::Method<" +
-                                getTraitsName(uniqueName, /* includeScope */ false) + ">::Call",
-                        info.wrapperName, argTypes, returnType, info, isStatic) + "\n" +
-                "\n");
-    }
-
-    /**
-     * Append the appropriate generated code to the buffers for the native method provided.
-     *
-     * @param annotatedMethod The Java native method, plus annotation data.
-     */
-    public void generateNative(AnnotatableEntity annotatedMethod) {
-        // Unpack the tuple and extract some useful fields from the Method..
-        final Method method = annotatedMethod.getMethod();
-        final AnnotationInfo info = annotatedMethod.mAnnotationInfo;
-        final String uniqueName = getUniqueMethodName(info.wrapperName);
-        final Class<?>[] argTypes = method.getParameterTypes();
-        final Class<?> returnType = method.getReturnType();
-
-        // Sanity check
-        if (info.exceptionMode != AnnotationInfo.ExceptionMode.ABORT &&
-                info.exceptionMode != AnnotationInfo.ExceptionMode.IGNORE) {
-            throw new IllegalStateException("Invalid exception mode \"" +
-                    info.exceptionMode.name().toLowerCase() +
-                    "\" for native method " + clsName + "::" + uniqueName);
-        }
-        if (info.dispatchTarget != AnnotationInfo.DispatchTarget.CURRENT &&
-                returnType != void.class) {
-            throw new IllegalStateException(
-                    "Must return void when not dispatching to current thread for native method " +
-                     clsName + "::" + uniqueName);
-        }
-
-        generateMember(info, method, uniqueName, returnType, argTypes);
-
-        final String traits = getTraitsName(uniqueName, /* includeScope */ true);
-
-        if (nativesInits.length() > 0) {
-            nativesInits.append(',');
-        }
-
-        nativesInits.append(
-                "\n" +
-                "\n" +
-                "    mozilla::jni::MakeNativeMethod<" + traits + ">(\n" +
-                "            mozilla::jni::NativeStub<" + traits + ", Impl>\n" +
-                "            ::template Wrap<&Impl::" + info.wrapperName + ">)");
-        numNativesInits++;
-    }
-
-    private String getLiteral(Object val, AnnotationInfo info) {
-        final Class<?> type = val.getClass();
-
-        if (type.equals(char.class) || type.equals(Character.class)) {
-            final char c = (char) val;
-            if (c >= 0x20 && c < 0x7F) {
-                return "'" + c + '\'';
-            }
-            return "u'\\u" + Integer.toHexString(0x10000 | (int) c).substring(1) + '\'';
-
-        } else if (type.equals(CharSequence.class) || type.equals(String.class)) {
-            final CharSequence str = (CharSequence) val;
-            final StringBuilder out = new StringBuilder("u\"");
-            for (int i = 0; i < str.length(); i++) {
-                final char c = str.charAt(i);
-                if (c >= 0x20 && c < 0x7F) {
-                    out.append(c);
-                } else {
-                    out.append("\\u").append(Integer.toHexString(0x10000 | (int) c).substring(1));
-                }
-            }
-            return out.append('"').toString();
-        }
-
-        return String.valueOf(val);
-    }
-
-    public void generateField(AnnotatableEntity annotatedField) {
-        final Field field = annotatedField.getField();
-        final AnnotationInfo info = annotatedField.mAnnotationInfo;
-        final String uniqueName = info.wrapperName;
-        final Class<?> type = field.getType();
-
-        // Handles a peculiar case when dealing with enum types. We don't care about this field.
-        // It just gets in the way and stops our code from compiling.
-        if (field.isSynthetic() || field.getName().equals("$VALUES")) {
-            return;
-        }
-
-        // Sanity check
-        if (info.dispatchTarget != AnnotationInfo.DispatchTarget.CURRENT) {
-            throw new IllegalStateException("Invalid dispatch target \"" +
-                    info.dispatchTarget.name().toLowerCase() +
-                    "\" for field " + clsName + "::" + uniqueName);
-        }
-
-        final boolean isStatic = Utils.isStatic(field);
-        final boolean isFinal = Utils.isFinal(field);
-
-        if (isStatic && isFinal && (type.isPrimitive() || type.equals(String.class))) {
-            Object val = null;
-            try {
-                field.setAccessible(true);
-                val = field.get(null);
-            } catch (final IllegalAccessException e) {
-            }
-
-            if (val != null && type.isPrimitive()) {
-                // For static final primitive fields, we can use a "static const" declaration.
-                header.append(
-                    "    static const " + Utils.getNativeReturnType(type, info) +
-                            ' ' + info.wrapperName + " = " + getLiteral(val, info) + ";\n" +
-                    "\n");
-                return;
-
-            } else if (val != null && type.equals(String.class)) {
-                final String nativeType = "char16_t";
-
-                header.append(
-                    "    static const " + nativeType + ' ' + info.wrapperName + "[];\n" +
-                    "\n");
-
-                cpp.append(
-                    "const " + nativeType + ' ' + clsName + "::" + info.wrapperName +
-                            "[] = " + getLiteral(val, info) + ";\n" +
-                    "\n");
-                return;
-            }
-
-            // Fall back to using accessors if we encounter an exception.
-        }
-
-        generateMember(info, field, uniqueName, type, EMPTY_CLASS_ARRAY);
-
-        final Class<?>[] getterArgs = EMPTY_CLASS_ARRAY;
-
-        header.append(
-                "    " + generateDeclaration(info.wrapperName, getterArgs,
-                                             type, info, isStatic) + "\n" +
-                "\n");
-
-        cpp.append(
-                generateDefinition(
-                        "mozilla::jni::Field<" +
-                                getTraitsName(uniqueName, /* includeScope */ false) + ">::Get",
-                        info.wrapperName, getterArgs, type, info, isStatic) + "\n" +
-                "\n");
-
-        if (isFinal) {
-            return;
-        }
-
-        final Class<?>[] setterArgs = new Class<?>[] { type };
-
-        header.append(
-                "    " + generateDeclaration(info.wrapperName, setterArgs,
-                                             void.class, info, isStatic) + "\n" +
-                "\n");
-
-        cpp.append(
-                generateDefinition(
-                        "mozilla::jni::Field<" +
-                                getTraitsName(uniqueName, /* includeScope */ false) + ">::Set",
-                        info.wrapperName, setterArgs, void.class, info, isStatic) + "\n" +
-                "\n");
-    }
-
-    public void generateConstructor(AnnotatableEntity annotatedConstructor) {
-        // Unpack the tuple and extract some useful fields from the Method..
-        final Constructor<?> method = annotatedConstructor.getConstructor();
-        final AnnotationInfo info = annotatedConstructor.mAnnotationInfo;
-        final String wrapperName = "New";
-        final String uniqueName = getUniqueMethodName(wrapperName);
-        final Class<?>[] argTypes = method.getParameterTypes();
-        final Class<?> returnType = cls;
-
-        if (method.isSynthetic()) {
-            return;
-        }
-
-        // Sanity check
-        if (info.dispatchTarget != AnnotationInfo.DispatchTarget.CURRENT) {
-            throw new IllegalStateException("Invalid dispatch target \"" +
-                    info.dispatchTarget.name().toLowerCase() +
-                    "\" for constructor " + clsName + "::" + uniqueName);
-        }
-
-        generateMember(info, method, uniqueName, returnType, argTypes);
-
-        header.append(
-                "    " + generateDeclaration(wrapperName, argTypes,
-                                             returnType, info, /* isStatic */ true) + "\n" +
-                "\n");
-
-        cpp.append(
-                generateDefinition(
-                        "mozilla::jni::Constructor<" +
-                                getTraitsName(uniqueName, /* includeScope */ false) + ">::Call",
-                        wrapperName, argTypes, returnType, info, /* isStatic */ true) + "\n" +
-                "\n");
-    }
-
-    public void generateMembers(Member[] members) {
-        for (Member m : members) {
-            if (!Modifier.isPublic(m.getModifiers())) {
-                continue;
-            }
-
-            String name = Utils.getMemberName(m);
-            name = name.substring(0, 1).toUpperCase() + name.substring(1);
-
-            // Default for SDK bindings.
-            final AnnotationInfo info = new AnnotationInfo(name,
-                    AnnotationInfo.ExceptionMode.NSRESULT,
-                    AnnotationInfo.CallingThread.ANY,
-                    AnnotationInfo.DispatchTarget.CURRENT);
-            final AnnotatableEntity entity = new AnnotatableEntity(m, info);
-
-            if (m instanceof Constructor) {
-                generateConstructor(entity);
-            } else if (m instanceof Method) {
-                generateMethod(entity);
-            } else if (m instanceof Field) {
-                generateField(entity);
-            } else {
-                throw new IllegalArgumentException(
-                        "expected member to be Constructor, Method, or Field");
-            }
-        }
-    }
-
-    public void generateClasses(final ClassWithOptions[] classes) {
-        if (classes.length == 0) {
-            return;
-        }
-
-        for (final ClassWithOptions cls : classes) {
-            // Extract "Inner" from "Outer::Inner".
-            header.append(
-                    "    class " + Utils.getUnqualifiedName(cls.generatedName) + ";\n");
-        }
-        header.append('\n');
-    }
-
-    /**
-     * Get the finalised bytes to go into the generated wrappers file.
-     *
-     * @return The bytes to be written to the wrappers file.
-     */
-    public String getWrapperFileContents() {
-        return cpp.toString();
-    }
-
-    /**
-     * Get the finalised bytes to go into the generated header file.
-     *
-     * @return The bytes to be written to the header file.
-     */
-    public String getHeaderFileContents() {
-        if (this.callingThread == null) {
-            this.callingThread = AnnotationInfo.CallingThread.ANY;
-        }
-
-        header.append(
-                "    static const mozilla::jni::CallingThread callingThread =\n" +
-                "            " + this.callingThread.nativeValue() + ";\n" +
-                "\n");
-
-        if (nativesInits.length() > 0) {
-            header.append(
-                    "    template<class Impl> class Natives;\n");
-        }
-        header.append(
-                "};\n" +
-                "\n");
-        return header.toString();
-    }
-
-    /**
-     * Get the finalised bytes to go into the generated natives header file.
-     *
-     * @return The bytes to be written to the header file.
-     */
-    public String getNativesFileContents() {
-        if (nativesInits.length() == 0) {
-            return "";
-        }
-        natives.append(
-                "    static const JNINativeMethod methods[" + numNativesInits + "];\n" +
-                "};\n" +
-                "\n" +
-                "template<class Impl>\n" +
-                "const JNINativeMethod " + clsName + "::Natives<Impl>::methods[] = {" + nativesInits + '\n' +
-                "};\n" +
-                "\n");
-        return natives.toString();
-    }
-}
@@ -1,10 +0,0 @@
-# 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 $(topsrcdir)/config/rules.mk
-
-# Include Android specific java flags, instead of what's in rules.mk.
-include $(topsrcdir)/config/android-common.mk
-
-export:: annotationProcessors.jar
@@ -1,258 +0,0 @@
-/* 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/. */
-
-package org.mozilla.gecko.annotationProcessors;
-
-import com.android.tools.lint.checks.ApiLookup;
-import com.android.tools.lint.LintCliClient;
-
-import org.mozilla.gecko.annotationProcessors.classloader.AnnotatableEntity;
-import org.mozilla.gecko.annotationProcessors.classloader.ClassWithOptions;
-import org.mozilla.gecko.annotationProcessors.classloader.IterableJarLoadingURLClassLoader;
-import org.mozilla.gecko.annotationProcessors.utils.GeneratableElementIterator;
-import org.mozilla.gecko.annotationProcessors.utils.Utils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.Scanner;
-import java.util.Vector;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Member;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-
-public class SDKProcessor {
-    public static final String GENERATED_COMMENT =
-            "// GENERATED CODE\n" +
-            "// Generated by the Java program at /build/annotationProcessors at compile time\n" +
-            "// from annotations on Java methods. To update, change the annotations on the\n" +
-            "// corresponding Javamethods and rerun the build. Manually updating this file\n" +
-            "// will cause your build to fail.\n" +
-            "\n";
-
-    private static ApiLookup sApiLookup;
-    private static int sMaxSdkVersion;
-
-    public static void main(String[] args) throws Exception {
-        // We expect a list of jars on the commandline. If missing, whinge about it.
-        if (args.length < 5) {
-            System.err.println("Usage: java SDKProcessor sdkjar classlistfile outdir fileprefix max-sdk-version");
-            System.exit(1);
-        }
-
-        System.out.println("Processing platform bindings...");
-
-        String sdkJar = args[0];
-        Vector classes = getClassList(args[1]);
-        String outdir = args[2];
-        String generatedFilePrefix = args[3];
-        sMaxSdkVersion = Integer.parseInt(args[4]);
-
-        LintCliClient lintClient = new LintCliClient();
-        sApiLookup = ApiLookup.get(lintClient);
-
-        // Start the clock!
-        long s = System.currentTimeMillis();
-
-        // Get an iterator over the classes in the jar files given...
-        // Iterator<ClassWithOptions> jarClassIterator = IterableJarLoadingURLClassLoader.getIteratorOverJars(args);
-
-        StringBuilder headerFile = new StringBuilder(GENERATED_COMMENT);
-        headerFile.append(
-                "#ifndef " + generatedFilePrefix + "_h__\n" +
-                "#define " + generatedFilePrefix + "_h__\n" +
-                "\n" +
-                "#include \"mozilla/jni/Refs.h\"\n" +
-                "\n" +
-                "namespace mozilla {\n" +
-                "namespace java {\n" +
-                "namespace sdk {\n" +
-                "\n");
-
-        StringBuilder implementationFile = new StringBuilder(GENERATED_COMMENT);
-        implementationFile.append(
-                "#include \"" + generatedFilePrefix + ".h\"\n" +
-                "#include \"mozilla/jni/Accessors.h\"\n" +
-                "\n" +
-                "namespace mozilla {\n" +
-                "namespace java {\n" +
-                "namespace sdk {\n" +
-                "\n");
-
-        // Used to track the calls to the various class-specific initialisation functions.
-        ClassLoader loader = null;
-        try {
-            loader = URLClassLoader.newInstance(new URL[] { new URL("file://" + sdkJar) },
-                                                SDKProcessor.class.getClassLoader());
-        } catch (Exception e) {
-            throw new RuntimeException(e.toString());
-        }
-
-        for (Iterator<String> i = classes.iterator(); i.hasNext(); ) {
-            String className = i.next();
-            System.out.println("Looking up: " + className);
-
-            generateClass(Class.forName(className, true, loader),
-                          implementationFile,
-                          headerFile);
-        }
-
-        implementationFile.append(
-                "} /* sdk */\n" +
-                "} /* java */\n" +
-                "} /* mozilla */\n");
-
-        headerFile.append(
-                "} /* sdk */\n" +
-                "} /* java */\n" +
-                "} /* mozilla */\n" +
-                "#endif\n");
-
-        writeOutputFiles(outdir, generatedFilePrefix, headerFile, implementationFile);
-        long e = System.currentTimeMillis();
-        System.out.println("SDK processing complete in " + (e - s) + "ms");
-    }
-
-    private static int getAPIVersion(Class<?> cls, Member m) {
-        if (m instanceof Method || m instanceof Constructor) {
-            return sApiLookup.getCallVersion(
-                    cls.getName().replace('.', '/'),
-                    Utils.getMemberName(m),
-                    Utils.getSignature(m));
-        } else if (m instanceof Field) {
-            return sApiLookup.getFieldVersion(
-                    Utils.getClassDescriptor(m.getDeclaringClass()), m.getName());
-        } else {
-            throw new IllegalArgumentException("expected member to be Method, Constructor, or Field");
-        }
-    }
-
-    private static Member[] sortAndFilterMembers(Class<?> cls, Member[] members) {
-        Arrays.sort(members, new Comparator<Member>() {
-            @Override
-            public int compare(Member a, Member b) {
-                return a.getName().compareTo(b.getName());
-            }
-        });
-
-        ArrayList<Member> list = new ArrayList<>();
-        for (Member m : members) {
-            // Sometimes (e.g. Bundle) has methods that moved to/from a superclass in a later SDK
-            // version, so we check for both classes and see if we can find a minimum SDK version.
-            int version = getAPIVersion(cls, m);
-            final int version2 = getAPIVersion(m.getDeclaringClass(), m);
-            if (version2 > 0 && version2 < version) {
-                version = version2;
-            }
-            if (version > sMaxSdkVersion) {
-                System.out.println("Skipping " + m.getDeclaringClass().getName() + "." + m.getName() +
-                    ", version " + version + " > " + sMaxSdkVersion);
-                continue;
-            }
-
-            // Sometimes (e.g. KeyEvent) a field can appear in both a class and a superclass. In
-            // that case we want to filter out the version that appears in the superclass, or
-            // we'll have bindings with duplicate names.
-            try {
-                if (m instanceof Field && !m.equals(cls.getField(m.getName()))) {
-                    // m is a field in a superclass that has been hidden by
-                    // a field with the same name in a subclass.
-                    System.out.println("Skipping " + m.getName() +
-                                       " from " + m.getDeclaringClass());
-                    continue;
-                }
-            } catch (final NoSuchFieldException e) {
-            }
-
-            list.add(m);
-        }
-
-        return list.toArray(new Member[list.size()]);
-    }
-
-    private static void generateClass(Class<?> clazz,
-                                      StringBuilder implementationFile,
-                                      StringBuilder headerFile) {
-        String generatedName = clazz.getSimpleName();
-
-        CodeGenerator generator = new CodeGenerator(new ClassWithOptions(clazz, generatedName));
-
-        generator.generateMembers(sortAndFilterMembers(clazz, clazz.getConstructors()));
-        generator.generateMembers(sortAndFilterMembers(clazz, clazz.getMethods()));
-        generator.generateMembers(sortAndFilterMembers(clazz, clazz.getFields()));
-
-        headerFile.append(generator.getHeaderFileContents());
-        implementationFile.append(generator.getWrapperFileContents());
-    }
-
-    private static Vector<String> getClassList(String path) {
-        Scanner scanner = null;
-        try {
-            scanner = new Scanner(new FileInputStream(path));
-
-            Vector lines = new Vector();
-            while (scanner.hasNextLine()) {
-                lines.add(scanner.nextLine());
-            }
-            return lines;
-        } catch (Exception e) {
-            System.out.println(e.toString());
-            return null;
-        } finally {
-            if (scanner != null) {
-                scanner.close();
-            }
-        }
-    }
-
-    private static void writeOutputFiles(String aOutputDir, String aPrefix, StringBuilder aHeaderFile,
-                                         StringBuilder aImplementationFile) {
-        FileOutputStream implStream = null;
-        try {
-            implStream = new FileOutputStream(new File(aOutputDir, aPrefix + ".cpp"));
-            implStream.write(aImplementationFile.toString().getBytes());
-        } catch (IOException e) {
-            System.err.println("Unable to write " + aOutputDir + ". Perhaps a permissions issue?");
-            e.printStackTrace(System.err);
-        } finally {
-            if (implStream != null) {
-                try {
-                    implStream.close();
-                } catch (IOException e) {
-                    System.err.println("Unable to close implStream due to "+e);
-                    e.printStackTrace(System.err);
-                }
-            }
-        }
-
-        FileOutputStream headerStream = null;
-        try {
-            headerStream = new FileOutputStream(new File(aOutputDir, aPrefix + ".h"));
-            headerStream.write(aHeaderFile.toString().getBytes());
-        } catch (IOException e) {
-            System.err.println("Unable to write " + aOutputDir + ". Perhaps a permissions issue?");
-            e.printStackTrace(System.err);
-        } finally {
-            if (headerStream != null) {
-                try {
-                    headerStream.close();
-                } catch (IOException e) {
-                    System.err.println("Unable to close headerStream due to "+e);
-                    e.printStackTrace(System.err);
-                }
-            }
-        }
-    }
-}
@@ -1,62 +0,0 @@
-/* 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/. */
-
-package org.mozilla.gecko.annotationProcessors.classloader;
-
-import org.mozilla.gecko.annotationProcessors.AnnotationInfo;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Member;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-
-/**
- * Union type to hold either a method, field, or ctor. Allows us to iterate "The generatable stuff", despite
- * the fact that such things can be of either flavour.
- */
-public class AnnotatableEntity {
-    public enum ENTITY_TYPE {METHOD, NATIVE, FIELD, CONSTRUCTOR}
-
-    private final Member mMember;
-    public final ENTITY_TYPE mEntityType;
-
-    public final AnnotationInfo mAnnotationInfo;
-
-    public AnnotatableEntity(Member aObject, AnnotationInfo aAnnotationInfo) {
-        mMember = aObject;
-        mAnnotationInfo = aAnnotationInfo;
-
-        if (aObject instanceof Method) {
-            if (Modifier.isNative(aObject.getModifiers())) {
-                mEntityType = ENTITY_TYPE.NATIVE;
-            } else {
-                mEntityType = ENTITY_TYPE.METHOD;
-            }
-        } else if (aObject instanceof Field) {
-            mEntityType = ENTITY_TYPE.FIELD;
-        } else {
-            mEntityType = ENTITY_TYPE.CONSTRUCTOR;
-        }
-    }
-
-    public Method getMethod() {
-        if (mEntityType != ENTITY_TYPE.METHOD && mEntityType != ENTITY_TYPE.NATIVE) {
-            throw new UnsupportedOperationException("Attempt to cast to unsupported member type.");
-        }
-        return (Method) mMember;
-    }
-    public Field getField() {
-        if (mEntityType != ENTITY_TYPE.FIELD) {
-            throw new UnsupportedOperationException("Attempt to cast to unsupported member type.");
-        }
-        return (Field) mMember;
-    }
-    public Constructor<?> getConstructor() {
-        if (mEntityType != ENTITY_TYPE.CONSTRUCTOR) {
-            throw new UnsupportedOperationException("Attempt to cast to unsupported member type.");
-        }
-        return (Constructor<?>) mMember;
-    }
-}
@@ -1,15 +0,0 @@
-/* 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/. */
-
-package org.mozilla.gecko.annotationProcessors.classloader;
-
-public class ClassWithOptions {
-    public final Class<?> wrappedClass;
-    public final String generatedName;
-
-    public ClassWithOptions(Class<?> someClass, String name) {
-        wrappedClass = someClass;
-        generatedName = name;
-    }
-}
@@ -1,75 +0,0 @@
-/* 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/. */
-
-package org.mozilla.gecko.annotationProcessors.classloader;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-
-/**
- * A classloader which can be initialised with a list of jar files and which can provide an iterator
- * over the top level classes in the jar files it was initialised with.
- * classNames is kept sorted to ensure iteration order is consistent across program invocations.
- * Otherwise, we'd forever be reporting the outdatedness of the generated code as we permute its
- * contents.
- */
-public class IterableJarLoadingURLClassLoader extends URLClassLoader {
-    LinkedList<String> classNames = new LinkedList<String>();
-
-    /**
-     * Create an instance and return its iterator. Provides an iterator over the classes in the jar
-     * files provided as arguments.
-     * Inner classes are not supported.
-     *
-     * @param args A list of jar file names an iterator over the classes of which is desired.
-     * @return An iterator over the top level classes in the jar files provided, in arbitrary order.
-     */
-    public static Iterator<ClassWithOptions> getIteratorOverJars(String[] args) {
-        URL[] urlArray = new URL[args.length];
-        LinkedList<String> aClassNames = new LinkedList<String>();
-
-        for (int i = 0; i < args.length; i++) {
-            try {
-                urlArray[i] = (new File(args[i])).toURI().toURL();
-
-                Enumeration<JarEntry> entries = new JarFile(args[i]).entries();
-                while (entries.hasMoreElements()) {
-                    JarEntry e = entries.nextElement();
-                    String fName = e.getName();
-                    if (!fName.endsWith(".class")) {
-                        continue;
-                    }
-                    final String className = fName.substring(0, fName.length() - 6).replace('/', '.');
-
-                    aClassNames.add(className);
-                }
-            } catch (IOException e) {
-                System.err.println("Error loading jar file \"" + args[i] + '"');
-                e.printStackTrace(System.err);
-            }
-        }
-        Collections.sort(aClassNames);
-        return new JarClassIterator(new IterableJarLoadingURLClassLoader(urlArray, aClassNames));
-    }
-
-    /**
-     * Constructs a classloader capable of loading all classes given as URLs in urls. Used by static
-     * method above.
-     *
-     * @param urls        URLs for all classes the new instance shall be capable of loading.
-     * @param aClassNames A list of names of the classes this instance shall be capable of loading.
-     */
-    protected IterableJarLoadingURLClassLoader(URL[] urls, LinkedList<String> aClassNames) {// Array to populate with URLs for each class in the given jars.
-        super(urls);
-        classNames = aClassNames;
-    }
-}
@@ -1,84 +0,0 @@
-/* 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/. */
-
-package org.mozilla.gecko.annotationProcessors.classloader;
-
-import java.util.Iterator;
-
-/**
- * Class for iterating over an IterableJarLoadingURLClassLoader's classes.
- *
- * This class is not thread safe: use it only from a single thread.
- */
-public class JarClassIterator implements Iterator<ClassWithOptions> {
-    private IterableJarLoadingURLClassLoader mTarget;
-    private Iterator<String> mTargetClassListIterator;
-
-    private ClassWithOptions lookAhead;
-
-    public JarClassIterator(IterableJarLoadingURLClassLoader aTarget) {
-        mTarget = aTarget;
-        mTargetClassListIterator = aTarget.classNames.iterator();
-    }
-
-    @Override
-    public boolean hasNext() {
-        return fillLookAheadIfPossible();
-    }
-
-    @Override
-    public ClassWithOptions next() {
-        if (!fillLookAheadIfPossible()) {
-            throw new IllegalStateException("Failed to look ahead in next()!");
-        }
-        ClassWithOptions next = lookAhead;
-        lookAhead = null;
-        return next;
-    }
-
-    private boolean fillLookAheadIfPossible() {
-        if (lookAhead != null) {
-            return true;
-        }
-
-        if (!mTargetClassListIterator.hasNext()) {
-            return false;
-        }
-
-        String className = mTargetClassListIterator.next();
-        try {
-            Class<?> ret = mTarget.loadClass(className);
-
-            // Incremental builds can leave stale classfiles in the jar. Such classfiles will cause
-            // an exception at this point. We can safely ignore these classes - they cannot possibly
-            // ever be loaded as they conflict with their parent class and will be killed by
-            // Proguard later on anyway.
-            final Class<?> enclosingClass;
-            try {
-                enclosingClass = ret.getEnclosingClass();
-            } catch (IncompatibleClassChangeError e) {
-                return fillLookAheadIfPossible();
-            }
-
-            if (enclosingClass != null) {
-                // Anonymous inner class - unsupported.
-                // Or named inner class, which will be processed when we process the outer class.
-                return fillLookAheadIfPossible();
-            }
-
-            lookAhead = new ClassWithOptions(ret, ret.getSimpleName());
-            return true;
-        } catch (ClassNotFoundException e) {
-            System.err.println("Unable to enumerate class: " + className + ". Corrupted jar file?");
-            e.printStackTrace();
-            System.exit(2);
-        }
-        return false;
-    }
-
-    @Override
-    public void remove() {
-        throw new UnsupportedOperationException("Removal of classes from iterator not supported.");
-    }
-}
@@ -1,23 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# 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/.
-
-jar = add_java_jar('annotationProcessors')
-jar.sources += [
-    'AnnotationInfo.java',
-    'AnnotationProcessor.java',
-    'classloader/AnnotatableEntity.java',
-    'classloader/ClassWithOptions.java',
-    'classloader/IterableJarLoadingURLClassLoader.java',
-    'classloader/JarClassIterator.java',
-    'CodeGenerator.java',
-    'SDKProcessor.java',
-    'utils/AlphabeticAnnotatableEntityComparator.java',
-    'utils/GeneratableElementIterator.java',
-    'utils/Utils.java',
-]
-jar.extra_jars += [
-    CONFIG['ANDROID_TOOLS'] + '/lib/lint.jar',
-    CONFIG['ANDROID_TOOLS'] + '/lib/lint-checks.jar',
-]
@@ -1,81 +0,0 @@
-/* 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/. */
-
-package org.mozilla.gecko.annotationProcessors.utils;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Member;
-import java.lang.reflect.Method;
-import java.util.Comparator;
-
-public class AlphabeticAnnotatableEntityComparator<T extends Member> implements Comparator<T> {
-    @Override
-    public int compare(T aLhs, T aRhs) {
-        // Constructors, Methods, Fields.
-        boolean lIsConstructor = aLhs instanceof Constructor;
-        boolean rIsConstructor = aRhs instanceof Constructor;
-        boolean lIsMethod = aLhs instanceof Method;
-        boolean rIsField = aRhs instanceof Field;
-
-        if (lIsConstructor) {
-            if (!rIsConstructor) {
-                return -1;
-            }
-        } else if (lIsMethod) {
-            if (rIsConstructor) {
-                return 1;
-            } else if (rIsField) {
-                return -1;
-            }
-        } else {
-            if (!rIsField) {
-                return 1;
-            }
-        }
-
-        // Verify these objects are the same type and cast them.
-        if (aLhs instanceof Method) {
-            return compare((Method) aLhs, (Method) aRhs);
-        } else if (aLhs instanceof Field) {
-            return compare((Field) aLhs, (Field) aRhs);
-        } else {
-            return compare((Constructor) aLhs, (Constructor) aRhs);
-        }
-    }
-
-    // Alas, the type system fails us.
-    private static int compare(Method aLhs, Method aRhs) {
-        // Initially, attempt to differentiate the methods be name alone..
-        String lName = aLhs.getName();
-        String rName = aRhs.getName();
-
-        int ret = lName.compareTo(rName);
-        if (ret != 0) {
-            return ret;
-        }
-
-        // The names were the same, so we need to compare signatures to find their uniqueness..
-        lName = Utils.getSignature(aLhs);
-        rName = Utils.getSignature(aRhs);
-
-        return lName.compareTo(rName);
-    }
-
-    private static int compare(Constructor<?> aLhs, Constructor<?> aRhs) {
-        // The names will be the same, so we need to compare signatures to find their uniqueness..
-        String lName = Utils.getSignature(aLhs);
-        String rName = Utils.getSignature(aRhs);
-
-        return lName.compareTo(rName);
-    }
-
-    private static int compare(Field aLhs, Field aRhs) {
-        // Compare field names..
-        String lName = aLhs.getName();
-        String rName = aRhs.getName();
-
-        return lName.compareTo(rName);
-    }
-}