From a6ae35ba912465cc39b058e86446f244710bbc40 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Sat, 8 May 2021 20:59:55 +0000
Subject: [PATCH 1/4] Issue #1751 -- Remove cocoa support code from /dom

---
 dom/gamepad/cocoa/CocoaGamepad.cpp            | 590 ------------------
 dom/gamepad/moz.build                         |   4 -
 dom/geolocation/moz.build                     |   4 -
 dom/media/standalone/moz.build                |   3 -
 .../systemservices/OSXRunLoopSingleton.cpp    |  44 --
 .../systemservices/OSXRunLoopSingleton.h      |  25 -
 dom/media/systemservices/moz.build            |   4 -
 .../cocoa/OSXSpeechSynthesizerModule.cpp      |  56 --
 .../synth/cocoa/OSXSpeechSynthesizerService.h |  43 --
 .../cocoa/OSXSpeechSynthesizerService.mm      | 498 ---------------
 dom/media/webspeech/synth/cocoa/moz.build     |  11 -
 dom/media/webspeech/synth/moz.build           |   3 -
 dom/moz.build                                 |   2 +-
 dom/plugins/base/moz.build                    |   6 -
 dom/plugins/base/nsPluginsDirDarwin.cpp       | 572 -----------------
 dom/system/mac/CoreLocationLocationProvider.h |  59 --
 .../mac/CoreLocationLocationProvider.mm       | 268 --------
 dom/system/mac/moz.build                      |  14 -
 dom/system/moz.build                          |   2 -
 dom/xbl/builtin/mac/jar.mn                    |   6 -
 dom/xbl/builtin/mac/moz.build                 |   6 -
 dom/xbl/builtin/mac/platformHTMLBindings.xml  |  72 ---
 dom/xbl/builtin/moz.build                     |   2 -
 23 files changed, 1 insertion(+), 2293 deletions(-)
 delete mode 100644 dom/gamepad/cocoa/CocoaGamepad.cpp
 delete mode 100644 dom/media/systemservices/OSXRunLoopSingleton.cpp
 delete mode 100644 dom/media/systemservices/OSXRunLoopSingleton.h
 delete mode 100644 dom/media/webspeech/synth/cocoa/OSXSpeechSynthesizerModule.cpp
 delete mode 100644 dom/media/webspeech/synth/cocoa/OSXSpeechSynthesizerService.h
 delete mode 100644 dom/media/webspeech/synth/cocoa/OSXSpeechSynthesizerService.mm
 delete mode 100644 dom/media/webspeech/synth/cocoa/moz.build
 delete mode 100644 dom/plugins/base/nsPluginsDirDarwin.cpp
 delete mode 100644 dom/system/mac/CoreLocationLocationProvider.h
 delete mode 100644 dom/system/mac/CoreLocationLocationProvider.mm
 delete mode 100644 dom/system/mac/moz.build
 delete mode 100644 dom/xbl/builtin/mac/jar.mn
 delete mode 100644 dom/xbl/builtin/mac/moz.build
 delete mode 100644 dom/xbl/builtin/mac/platformHTMLBindings.xml

diff --git a/dom/gamepad/cocoa/CocoaGamepad.cpp b/dom/gamepad/cocoa/CocoaGamepad.cpp
deleted file mode 100644
index eb6eda9a17..0000000000
--- a/dom/gamepad/cocoa/CocoaGamepad.cpp
+++ /dev/null
@@ -1,590 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-// mostly derived from the Allegro source code at:
-// http://alleg.svn.sourceforge.net/viewvc/alleg/allegro/branches/4.9/src/macosx/hidjoy.m?revision=13760&view=markup
-
-#include "mozilla/dom/Gamepad.h"
-#include "mozilla/dom/GamepadPlatformService.h"
-#include "mozilla/ArrayUtils.h"
-#include "mozilla/Unused.h"
-#include "nsThreadUtils.h"
-#include <CoreFoundation/CoreFoundation.h>
-#include <IOKit/hid/IOHIDBase.h>
-#include <IOKit/hid/IOHIDKeys.h>
-#include <IOKit/hid/IOHIDManager.h>
-
-#include <stdio.h>
-#include <vector>
-
-namespace {
-
-using namespace mozilla;
-using namespace mozilla::dom;
-using std::vector;
-
-struct Button {
-  int id;
-  bool analog;
-  IOHIDElementRef element;
-  CFIndex min;
-  CFIndex max;
-
-  Button(int aId, IOHIDElementRef aElement, CFIndex aMin, CFIndex aMax) :
-    id(aId),
-    analog((aMax - aMin) > 1),
-    element(aElement),
-    min(aMin),
-    max(aMax) {}
-};
-
-struct Axis {
-  int id;
-  IOHIDElementRef element;
-  uint32_t usagePage;
-  uint32_t usage;
-  CFIndex min;
-  CFIndex max;
-};
-
-typedef bool dpad_buttons[4];
-
-// These values can be found in the USB HID Usage Tables:
-// http://www.usb.org/developers/hidpage
-const unsigned kDesktopUsagePage = 0x01;
-const unsigned kSimUsagePage = 0x02;
-const unsigned kAcceleratorUsage = 0xC4;
-const unsigned kBrakeUsage = 0xC5;
-const unsigned kJoystickUsage = 0x04;
-const unsigned kGamepadUsage = 0x05;
-const unsigned kAxisUsageMin = 0x30;
-const unsigned kAxisUsageMax = 0x35;
-const unsigned kDpadUsage = 0x39;
-const unsigned kButtonUsagePage = 0x09;
-const unsigned kConsumerPage = 0x0C;
-const unsigned kHomeUsage = 0x223;
-const unsigned kBackUsage = 0x224;
-
-
-class Gamepad {
- private:
-  IOHIDDeviceRef mDevice;
-  nsTArray<Button> buttons;
-  nsTArray<Axis> axes;
-  IOHIDElementRef mDpad;
-  dpad_buttons mDpadState;
-
- public:
-  Gamepad() : mDevice(nullptr), mDpad(nullptr), mSuperIndex(-1) {}
-  bool operator==(IOHIDDeviceRef device) const { return mDevice == device; }
-  bool empty() const { return mDevice == nullptr; }
-  void clear()
-  {
-    mDevice = nullptr;
-    buttons.Clear();
-    axes.Clear();
-    mDpad = nullptr;
-    mSuperIndex = -1;
-  }
-  void init(IOHIDDeviceRef device);
-  size_t numButtons() { return buttons.Length() + (mDpad ? 4 : 0); }
-  size_t numAxes() { return axes.Length(); }
-
-  // Index given by our superclass.
-  uint32_t mSuperIndex;
-
-  bool isDpad(IOHIDElementRef element) const
-  {
-    return element == mDpad;
-  }
-
-  const dpad_buttons& getDpadState() const
-  {
-    return mDpadState;
-  }
-
-  void setDpadState(const dpad_buttons& dpadState)
-  {
-    for (unsigned i = 0; i < ArrayLength(mDpadState); i++) {
-      mDpadState[i] = dpadState[i];
-    }
-  }
-
-  const Button* lookupButton(IOHIDElementRef element) const
-  {
-    for (unsigned i = 0; i < buttons.Length(); i++) {
-      if (buttons[i].element == element)
-        return &buttons[i];
-    }
-    return nullptr;
-  }
-
-  const Axis* lookupAxis(IOHIDElementRef element) const
-  {
-    for (unsigned i = 0; i < axes.Length(); i++) {
-      if (axes[i].element == element)
-        return &axes[i];
-    }
-    return nullptr;
-  }
-};
-
-class AxisComparator {
-public:
-  bool Equals(const Axis& a1, const Axis& a2) const
-  {
-    return a1.usagePage == a2.usagePage && a1.usage == a2.usage;
-  }
-  bool LessThan(const Axis& a1, const Axis& a2) const
-  {
-    if (a1.usagePage == a2.usagePage) {
-      return a1.usage < a2.usage;
-    }
-    return a1.usagePage < a2.usagePage;
-  }
-};
-
-void Gamepad::init(IOHIDDeviceRef device)
-{
-  clear();
-  mDevice = device;
-
-  CFArrayRef elements = IOHIDDeviceCopyMatchingElements(device,
-                                                        nullptr,
-                                                        kIOHIDOptionsTypeNone);
-  CFIndex n = CFArrayGetCount(elements);
-  for (CFIndex i = 0; i < n; i++) {
-    IOHIDElementRef element = (IOHIDElementRef)CFArrayGetValueAtIndex(elements,
-                                                                      i);
-    uint32_t usagePage = IOHIDElementGetUsagePage(element);
-    uint32_t usage = IOHIDElementGetUsage(element);
-
-    if (usagePage == kDesktopUsagePage &&
-        usage >= kAxisUsageMin &&
-        usage <= kAxisUsageMax)
-    {
-      Axis axis = { int(axes.Length()),
-                    element,
-                    usagePage,
-                    usage,
-                    IOHIDElementGetLogicalMin(element),
-                    IOHIDElementGetLogicalMax(element) };
-      axes.AppendElement(axis);
-    } else if (usagePage == kDesktopUsagePage && usage == kDpadUsage &&
-               // Don't know how to handle d-pads that return weird values.
-               IOHIDElementGetLogicalMax(element) - IOHIDElementGetLogicalMin(element) == 7) {
-      mDpad = element;
-    } else if ((usagePage == kSimUsagePage &&
-                 (usage == kAcceleratorUsage ||
-                  usage == kBrakeUsage)) ||
-               (usagePage == kButtonUsagePage) ||
-               (usagePage == kConsumerPage &&
-                 (usage == kHomeUsage ||
-                  usage == kBackUsage))) {
-      Button button(int(buttons.Length()), element, IOHIDElementGetLogicalMin(element), IOHIDElementGetLogicalMax(element));
-      buttons.AppendElement(button);
-    } else {
-      //TODO: handle other usage pages
-    }
-  }
-
-  AxisComparator comparator;
-  axes.Sort(comparator);
-  for (unsigned i = 0; i < axes.Length(); i++) {
-    axes[i].id = i;
-  }
-}
-
-class DarwinGamepadService {
- private:
-  IOHIDManagerRef mManager;
-  vector<Gamepad> mGamepads;
-
-  //Workaround to support running in background thread
-  CFRunLoopRef mMonitorRunLoop;
-  nsCOMPtr<nsIThread> mMonitorThread;
-
-  static void DeviceAddedCallback(void* data, IOReturn result,
-                                  void* sender, IOHIDDeviceRef device);
-  static void DeviceRemovedCallback(void* data, IOReturn result,
-                                    void* sender, IOHIDDeviceRef device);
-  static void InputValueChangedCallback(void* data, IOReturn result,
-                                        void* sender, IOHIDValueRef newValue);
-
-  void DeviceAdded(IOHIDDeviceRef device);
-  void DeviceRemoved(IOHIDDeviceRef device);
-  void InputValueChanged(IOHIDValueRef value);
-  void StartupInternal();
-
- public:
-  DarwinGamepadService();
-  ~DarwinGamepadService();
-  void Startup();
-  void Shutdown();
-  friend class DarwinGamepadServiceStartupRunnable;
-};
-
-class DarwinGamepadServiceStartupRunnable final : public Runnable
-{
- private:
-  ~DarwinGamepadServiceStartupRunnable() {}
-  // This Runnable schedules startup of DarwinGamepadService
-  // in a new thread, pointer to DarwinGamepadService is only
-  // used by this Runnable within its thread.
-  DarwinGamepadService MOZ_NON_OWNING_REF *mService;
- public:
-  explicit DarwinGamepadServiceStartupRunnable(DarwinGamepadService *service)
-             : mService(service) {}
-  NS_IMETHOD Run() override
-  {
-    MOZ_ASSERT(mService);
-    mService->StartupInternal();
-    return NS_OK;
-  }
-};
-
-void
-DarwinGamepadService::DeviceAdded(IOHIDDeviceRef device)
-{
-  RefPtr<GamepadPlatformService> service =
-    GamepadPlatformService::GetParentService();
-  if (!service) {
-    return;
-  }
-
-  size_t slot = size_t(-1);
-  for (size_t i = 0; i < mGamepads.size(); i++) {
-    if (mGamepads[i] == device)
-      return;
-    if (slot == size_t(-1) && mGamepads[i].empty())
-      slot = i;
-  }
-
-  if (slot == size_t(-1)) {
-    slot = mGamepads.size();
-    mGamepads.push_back(Gamepad());
-  }
-  mGamepads[slot].init(device);
-
-  // Gather some identifying information
-  CFNumberRef vendorIdRef =
-    (CFNumberRef)IOHIDDeviceGetProperty(device, CFSTR(kIOHIDVendorIDKey));
-  CFNumberRef productIdRef =
-    (CFNumberRef)IOHIDDeviceGetProperty(device, CFSTR(kIOHIDProductIDKey));
-  CFStringRef productRef =
-    (CFStringRef)IOHIDDeviceGetProperty(device, CFSTR(kIOHIDProductKey));
-  int vendorId, productId;
-  CFNumberGetValue(vendorIdRef, kCFNumberIntType, &vendorId);
-  CFNumberGetValue(productIdRef, kCFNumberIntType, &productId);
-  char product_name[128];
-  CFStringGetCString(productRef, product_name,
-                     sizeof(product_name), kCFStringEncodingASCII);
-  char buffer[256];
-  sprintf(buffer, "%x-%x-%s", vendorId, productId, product_name);
-  uint32_t index = service->AddGamepad(buffer,
-                                       mozilla::dom::GamepadMappingType::_empty,
-                                       (int)mGamepads[slot].numButtons(),
-                                       (int)mGamepads[slot].numAxes());
-  mGamepads[slot].mSuperIndex = index;
-}
-
-void
-DarwinGamepadService::DeviceRemoved(IOHIDDeviceRef device)
-{
-  RefPtr<GamepadPlatformService> service =
-    GamepadPlatformService::GetParentService();
-  if (!service) {
-    return;
-  }
-  for (size_t i = 0; i < mGamepads.size(); i++) {
-    if (mGamepads[i] == device) {
-      service->RemoveGamepad(mGamepads[i].mSuperIndex);
-      mGamepads[i].clear();
-      return;
-    }
-  }
-}
-
-/*
- * Given a value from a d-pad (POV hat in USB HID terminology),
- * represent it as 4 buttons, one for each cardinal direction.
- */
-static void
-UnpackDpad(int dpad_value, int min, int max, dpad_buttons& buttons)
-{
-  const unsigned kUp = 0;
-  const unsigned kDown = 1;
-  const unsigned kLeft = 2;
-  const unsigned kRight = 3;
-
-  // Different controllers have different ways of representing
-  // "nothing is pressed", but they're all outside the range of values.
-  if (dpad_value < min || dpad_value > max) {
-    // Nothing is pressed.
-    return;
-  }
-
-  // Normalize value to start at 0.
-  int value = dpad_value - min;
-
-  // Value will be in the range 0-7. The value represents the
-  // position of the d-pad around a circle, with 0 being straight up,
-  // 2 being right, 4 being straight down, and 6 being left.
-  if (value < 2 || value > 6) {
-    buttons[kUp] = true;
-  }
-  if (value > 2 && value < 6) {
-    buttons[kDown] = true;
-  }
-  if (value > 4) {
-    buttons[kLeft] = true;
-  }
-  if (value > 0 && value < 4) {
-    buttons[kRight] = true;
-  }
-}
-
-void
-DarwinGamepadService::InputValueChanged(IOHIDValueRef value)
-{
-  RefPtr<GamepadPlatformService> service =
-    GamepadPlatformService::GetParentService();
-  if (!service) {
-    return;
-  }
-
-  uint32_t value_length = IOHIDValueGetLength(value);
-  if (value_length > 4) {
-    // Workaround for bizarre issue with PS3 controllers that try to return
-    // massive (30+ byte) values and crash IOHIDValueGetIntegerValue
-    return;
-  }
-  IOHIDElementRef element = IOHIDValueGetElement(value);
-  IOHIDDeviceRef device = IOHIDElementGetDevice(element);
-
-  for (unsigned i = 0; i < mGamepads.size(); i++) {
-    Gamepad &gamepad = mGamepads[i];
-    if (gamepad == device) {
-      if (gamepad.isDpad(element)) {
-        const dpad_buttons& oldState = gamepad.getDpadState();
-        dpad_buttons newState = { false, false, false, false };
-        UnpackDpad(IOHIDValueGetIntegerValue(value),
-                   IOHIDElementGetLogicalMin(element),
-                   IOHIDElementGetLogicalMax(element),
-                   newState);
-        const int numButtons = gamepad.numButtons();
-        for (unsigned b = 0; b < ArrayLength(newState); b++) {
-          if (newState[b] != oldState[b]) {
-            service->NewButtonEvent(gamepad.mSuperIndex,
-                                    numButtons - 4 + b,
-                                    newState[b]);
-          }
-        }
-        gamepad.setDpadState(newState);
-      } else if (const Axis* axis = gamepad.lookupAxis(element)) {
-        double d = IOHIDValueGetIntegerValue(value);
-        double v = 2.0f * (d - axis->min) /
-          (double)(axis->max - axis->min) - 1.0f;
-        service->NewAxisMoveEvent(gamepad.mSuperIndex, axis->id, v);
-      } else if (const Button* button = gamepad.lookupButton(element)) {
-        int iv = IOHIDValueGetIntegerValue(value);
-        bool pressed = iv != 0;
-        double v = 0;
-        if (button->analog) {
-          double dv = iv;
-          v = (dv - button->min) / (double)(button->max - button->min);
-        } else {
-          v = pressed ? 1.0 : 0.0;
-        }
-        service->NewButtonEvent(gamepad.mSuperIndex, button->id, pressed, v);
-      }
-      return;
-    }
-  }
-}
-
-void
-DarwinGamepadService::DeviceAddedCallback(void* data, IOReturn result,
-                                         void* sender, IOHIDDeviceRef device)
-{
-  DarwinGamepadService* service = (DarwinGamepadService*)data;
-  service->DeviceAdded(device);
-}
-
-void
-DarwinGamepadService::DeviceRemovedCallback(void* data, IOReturn result,
-                                           void* sender, IOHIDDeviceRef device)
-{
-  DarwinGamepadService* service = (DarwinGamepadService*)data;
-  service->DeviceRemoved(device);
-}
-
-void
-DarwinGamepadService::InputValueChangedCallback(void* data,
-                                               IOReturn result,
-                                               void* sender,
-                                               IOHIDValueRef newValue)
-{
-  DarwinGamepadService* service = (DarwinGamepadService*)data;
-  service->InputValueChanged(newValue);
-}
-
-static CFMutableDictionaryRef
-MatchingDictionary(UInt32 inUsagePage, UInt32 inUsage)
-{
-  CFMutableDictionaryRef dict =
-    CFDictionaryCreateMutable(kCFAllocatorDefault,
-                              0,
-                              &kCFTypeDictionaryKeyCallBacks,
-                              &kCFTypeDictionaryValueCallBacks);
-  if (!dict)
-    return nullptr;
-  CFNumberRef number = CFNumberCreate(kCFAllocatorDefault,
-                                      kCFNumberIntType,
-                                      &inUsagePage);
-  if (!number) {
-    CFRelease(dict);
-    return nullptr;
-  }
-  CFDictionarySetValue(dict, CFSTR(kIOHIDDeviceUsagePageKey), number);
-  CFRelease(number);
-
-  number = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &inUsage);
-  if (!number) {
-    CFRelease(dict);
-    return nullptr;
-  }
-  CFDictionarySetValue(dict, CFSTR(kIOHIDDeviceUsageKey), number);
-  CFRelease(number);
-
-  return dict;
-}
-
-DarwinGamepadService::DarwinGamepadService() : mManager(nullptr) {}
-
-DarwinGamepadService::~DarwinGamepadService()
-{
-  if (mManager != nullptr)
-    CFRelease(mManager);
-}
-
-void
-DarwinGamepadService::StartupInternal()
-{
-  if (mManager != nullptr)
-    return;
-
-  IOHIDManagerRef manager = IOHIDManagerCreate(kCFAllocatorDefault,
-                                               kIOHIDOptionsTypeNone);
-
-  CFMutableDictionaryRef criteria_arr[2];
-  criteria_arr[0] = MatchingDictionary(kDesktopUsagePage,
-                                       kJoystickUsage);
-  if (!criteria_arr[0]) {
-    CFRelease(manager);
-    return;
-  }
-
-  criteria_arr[1] = MatchingDictionary(kDesktopUsagePage,
-                                       kGamepadUsage);
-  if (!criteria_arr[1]) {
-    CFRelease(criteria_arr[0]);
-    CFRelease(manager);
-    return;
-  }
-
-  CFArrayRef criteria =
-    CFArrayCreate(kCFAllocatorDefault, (const void**)criteria_arr, 2, nullptr);
-  if (!criteria) {
-    CFRelease(criteria_arr[1]);
-    CFRelease(criteria_arr[0]);
-    CFRelease(manager);
-    return;
-  }
-
-  IOHIDManagerSetDeviceMatchingMultiple(manager, criteria);
-  CFRelease(criteria);
-  CFRelease(criteria_arr[1]);
-  CFRelease(criteria_arr[0]);
-
-  IOHIDManagerRegisterDeviceMatchingCallback(manager,
-                                             DeviceAddedCallback,
-                                             this);
-  IOHIDManagerRegisterDeviceRemovalCallback(manager,
-                                            DeviceRemovedCallback,
-                                            this);
-  IOHIDManagerRegisterInputValueCallback(manager,
-                                         InputValueChangedCallback,
-                                         this);
-  IOHIDManagerScheduleWithRunLoop(manager,
-                                  CFRunLoopGetCurrent(),
-                                  kCFRunLoopDefaultMode);
-  IOReturn rv = IOHIDManagerOpen(manager, kIOHIDOptionsTypeNone);
-  if (rv != kIOReturnSuccess) {
-    CFRelease(manager);
-    return;
-  }
-
-  mManager = manager;
-
-  // We held the handle of the CFRunLoop to make sure we
-  // can shut it down explicitly by CFRunLoopStop in another
-  // thread.
-  mMonitorRunLoop = CFRunLoopGetCurrent();
-
-  // CFRunLoopRun() is a blocking message loop when it's called in
-  // non-main thread so this thread cannot receive any other runnables
-  // and nsITimer timeout events after it's called.
-  CFRunLoopRun();
-}
-
-void DarwinGamepadService::Startup()
-{
-  Unused << NS_NewThread(getter_AddRefs(mMonitorThread),
-                         new DarwinGamepadServiceStartupRunnable(this));
-}
-
-void DarwinGamepadService::Shutdown()
-{
-  IOHIDManagerRef manager = (IOHIDManagerRef)mManager;
-  CFRunLoopStop(mMonitorRunLoop);
-  if (manager) {
-    IOHIDManagerClose(manager, 0);
-    CFRelease(manager);
-    mManager = nullptr;
-  }
-  mMonitorThread->Shutdown();
-}
-
-} // namespace
-
-namespace mozilla {
-namespace dom {
-
-DarwinGamepadService* gService = nullptr;
-
-void StartGamepadMonitoring()
-{
-  if (gService) {
-    return;
-  }
-
-  gService = new DarwinGamepadService();
-  gService->Startup();
-}
-
-void StopGamepadMonitoring()
-{
-  if (!gService) {
-    return;
-  }
-
-  gService->Shutdown();
-  delete gService;
-  gService = nullptr;
-}
-
-} // namespace dom
-} // namespace mozilla
diff --git a/dom/gamepad/moz.build b/dom/gamepad/moz.build
index b8e3a855b2..15205e4c83 100644
--- a/dom/gamepad/moz.build
+++ b/dom/gamepad/moz.build
@@ -48,10 +48,6 @@ if CONFIG['MOZ_GAMEPAD']:
         SOURCES += [
             'fallback/FallbackGamepad.cpp'
         ]
-    elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'cocoa':
-        SOURCES += [
-            'cocoa/CocoaGamepad.cpp'
-        ]
     elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'windows':
         SOURCES += [
             'windows/WindowsGamepad.cpp'
diff --git a/dom/geolocation/moz.build b/dom/geolocation/moz.build
index 0230875223..d8ecf1ac17 100644
--- a/dom/geolocation/moz.build
+++ b/dom/geolocation/moz.build
@@ -29,10 +29,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     LOCAL_INCLUDES += [
         '/dom/system/android',
     ]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    LOCAL_INCLUDES += [
-        '/dom/system/mac',
-    ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     LOCAL_INCLUDES += [
         '/dom/system/windows',
diff --git a/dom/media/standalone/moz.build b/dom/media/standalone/moz.build
index 7ef15adaa9..5ec7e82c20 100644
--- a/dom/media/standalone/moz.build
+++ b/dom/media/standalone/moz.build
@@ -13,9 +13,6 @@ SOURCES += [
     '../VideoSegment.cpp',
 ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    UNIFIED_SOURCES += ['../systemservices/OSXRunLoopSingleton.cpp']
-
 LOCAL_INCLUDES += [
     '/caps',
     '/dom/base',
diff --git a/dom/media/systemservices/OSXRunLoopSingleton.cpp b/dom/media/systemservices/OSXRunLoopSingleton.cpp
deleted file mode 100644
index 6211d5c127..0000000000
--- a/dom/media/systemservices/OSXRunLoopSingleton.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "OSXRunLoopSingleton.h"
-#include <mozilla/StaticMutex.h>
-
-#include <AudioUnit/AudioUnit.h>
-#include <CoreAudio/AudioHardware.h>
-#include <CoreAudio/HostTime.h>
-#include <CoreFoundation/CoreFoundation.h>
-
-static bool gRunLoopSet = false;
-static mozilla::StaticMutex gMutex;
-
-void mozilla_set_coreaudio_notification_runloop_if_needed()
-{
-  mozilla::StaticMutexAutoLock lock(gMutex);
-  if (gRunLoopSet) {
-    return;
-  }
-
-  /* This is needed so that AudioUnit listeners get called on this thread, and
-   * not the main thread. If we don't do that, they are not called, or a crash
-   * occur, depending on the OSX version. */
-  AudioObjectPropertyAddress runloop_address = {
-    kAudioHardwarePropertyRunLoop,
-    kAudioObjectPropertyScopeGlobal,
-    kAudioObjectPropertyElementMaster
-  };
-
-  CFRunLoopRef run_loop = nullptr;
-
-  OSStatus r;
-  r = AudioObjectSetPropertyData(kAudioObjectSystemObject,
-                                 &runloop_address,
-                                 0, NULL, sizeof(CFRunLoopRef), &run_loop);
-  if (r != noErr) {
-    NS_WARNING("Could not make global CoreAudio notifications use their own thread.");
-  }
-
-  gRunLoopSet = true;
-}
diff --git a/dom/media/systemservices/OSXRunLoopSingleton.h b/dom/media/systemservices/OSXRunLoopSingleton.h
deleted file mode 100644
index d06365e146..0000000000
--- a/dom/media/systemservices/OSXRunLoopSingleton.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef OSXRUNLOOPSINGLETON_H_
-#define OSXRUNLOOPSINGLETON_H_
-
-#include <mozilla/Types.h>
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-/* This function tells CoreAudio to use its own thread for device change
- * notifications, and can be called from any thread without external
- * synchronization. */
-void MOZ_EXPORT
-mozilla_set_coreaudio_notification_runloop_if_needed();
-
-#if defined(__cplusplus)
-}
-#endif
-
-#endif // OSXRUNLOOPSINGLETON_H_
diff --git a/dom/media/systemservices/moz.build b/dom/media/systemservices/moz.build
index aa07b291a9..7d566c42ce 100644
--- a/dom/media/systemservices/moz.build
+++ b/dom/media/systemservices/moz.build
@@ -38,10 +38,6 @@ if CONFIG['OS_TARGET'] == 'Android':
         'OpenSLESProvider.cpp',
     ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-  SOURCES += ['OSXRunLoopSingleton.cpp']
-  EXPORTS += ['OSXRunLoopSingleton.h']
-
 if CONFIG['_MSC_VER']:
     DEFINES['__PRETTY_FUNCTION__'] = '__FUNCSIG__'
 
diff --git a/dom/media/webspeech/synth/cocoa/OSXSpeechSynthesizerModule.cpp b/dom/media/webspeech/synth/cocoa/OSXSpeechSynthesizerModule.cpp
deleted file mode 100644
index ef69170003..0000000000
--- a/dom/media/webspeech/synth/cocoa/OSXSpeechSynthesizerModule.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "mozilla/ModuleUtils.h"
-#include "nsIClassInfoImpl.h"
-
-#include "OSXSpeechSynthesizerService.h"
-
-using namespace mozilla::dom;
-
-#define OSXSPEECHSYNTHESIZERSERVICE_CID \
-  {0x914e73b4, 0x6337, 0x4bef, {0x97, 0xf3, 0x4d, 0x06, 0x9e, 0x05, 0x3a, 0x12}}
-
-#define OSXSPEECHSYNTHESIZERSERVICE_CONTRACTID "@mozilla.org/synthsystem;1"
-
-// Defines OSXSpeechSynthesizerServiceConstructor
-NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(OSXSpeechSynthesizerService,
-                                         OSXSpeechSynthesizerService::GetInstanceForService)
-
-// Defines kOSXSERVICE_CID
-NS_DEFINE_NAMED_CID(OSXSPEECHSYNTHESIZERSERVICE_CID);
-
-static const mozilla::Module::CIDEntry kCIDs[] = {
-  { &kOSXSPEECHSYNTHESIZERSERVICE_CID, true, nullptr, OSXSpeechSynthesizerServiceConstructor },
-  { nullptr }
-};
-
-static const mozilla::Module::ContractIDEntry kContracts[] = {
-  { OSXSPEECHSYNTHESIZERSERVICE_CONTRACTID, &kOSXSPEECHSYNTHESIZERSERVICE_CID },
-  { nullptr }
-};
-
-static const mozilla::Module::CategoryEntry kCategories[] = {
-  { "speech-synth-started", "OSX Speech Synth", OSXSPEECHSYNTHESIZERSERVICE_CONTRACTID },
-  { nullptr }
-};
-
-static void
-UnloadOSXSpeechSynthesizerModule()
-{
-  OSXSpeechSynthesizerService::Shutdown();
-}
-
-static const mozilla::Module kModule = {
-  mozilla::Module::kVersion,
-  kCIDs,
-  kContracts,
-  kCategories,
-  nullptr,
-  nullptr,
-  UnloadOSXSpeechSynthesizerModule
-};
-
-NSMODULE_DEFN(osxsynth) = &kModule;
diff --git a/dom/media/webspeech/synth/cocoa/OSXSpeechSynthesizerService.h b/dom/media/webspeech/synth/cocoa/OSXSpeechSynthesizerService.h
deleted file mode 100644
index ba04f0fecb..0000000000
--- a/dom/media/webspeech/synth/cocoa/OSXSpeechSynthesizerService.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef mozilla_dom_OsxSpeechSynthesizerService_h
-#define mozilla_dom_OsxSpeechSynthesizerService_h
-
-#include "nsISpeechService.h"
-#include "nsIObserver.h"
-#include "mozilla/StaticPtr.h"
-
-namespace mozilla {
-namespace dom {
-
-class OSXSpeechSynthesizerService final : public nsISpeechService
-                                        , public nsIObserver
-{
-public:
-  NS_DECL_THREADSAFE_ISUPPORTS
-  NS_DECL_NSISPEECHSERVICE
-  NS_DECL_NSIOBSERVER
-
-  bool Init();
-
-  static OSXSpeechSynthesizerService* GetInstance();
-  static already_AddRefed<OSXSpeechSynthesizerService> GetInstanceForService();
-  static void Shutdown();
-
-private:
-  OSXSpeechSynthesizerService();
-  virtual ~OSXSpeechSynthesizerService();
-
-  bool RegisterVoices();
-
-  bool mInitialized;
-  static mozilla::StaticRefPtr<OSXSpeechSynthesizerService> sSingleton;
-};
-
-} // namespace dom
-} // namespace mozilla
-
-#endif
diff --git a/dom/media/webspeech/synth/cocoa/OSXSpeechSynthesizerService.mm b/dom/media/webspeech/synth/cocoa/OSXSpeechSynthesizerService.mm
deleted file mode 100644
index ec752e00f0..0000000000
--- a/dom/media/webspeech/synth/cocoa/OSXSpeechSynthesizerService.mm
+++ /dev/null
@@ -1,498 +0,0 @@
-/* -*- Mode: Objective-C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "nsISupports.h"
-#include "nsServiceManagerUtils.h"
-#include "nsObjCExceptions.h"
-#include "nsCocoaUtils.h"
-#include "nsThreadUtils.h"
-#include "mozilla/dom/nsSynthVoiceRegistry.h"
-#include "mozilla/dom/nsSpeechTask.h"
-#include "mozilla/Preferences.h"
-#include "mozilla/Assertions.h"
-#include "OSXSpeechSynthesizerService.h"
-
-#import <Cocoa/Cocoa.h>
-
-// We can escape the default delimiters ("[[" and "]]") by temporarily
-// changing the delimiters just before they appear, and changing them back
-// just after.
-#define DLIM_ESCAPE_START "[[dlim (( ))]]"
-#define DLIM_ESCAPE_END "((dlim [[ ]]))"
-
-using namespace mozilla;
-
-class SpeechTaskCallback final : public nsISpeechTaskCallback
-{
-public:
-  SpeechTaskCallback(nsISpeechTask* aTask,
-                     NSSpeechSynthesizer* aSynth,
-                     const nsTArray<size_t>& aOffsets)
-    : mTask(aTask)
-    , mSpeechSynthesizer(aSynth)
-    , mOffsets(aOffsets)
-  {
-    mStartingTime = TimeStamp::Now();
-  }
-
-  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-  NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(SpeechTaskCallback, nsISpeechTaskCallback)
-
-  NS_DECL_NSISPEECHTASKCALLBACK
-
-  void OnWillSpeakWord(uint32_t aIndex);
-  void OnError(uint32_t aIndex);
-  void OnDidFinishSpeaking();
-
-private:
-  virtual ~SpeechTaskCallback()
-  {
-    [mSpeechSynthesizer release];
-  }
-
-  float GetTimeDurationFromStart();
-
-  nsCOMPtr<nsISpeechTask> mTask;
-  NSSpeechSynthesizer* mSpeechSynthesizer;
-  TimeStamp mStartingTime;
-  uint32_t mCurrentIndex;
-  nsTArray<size_t> mOffsets;
-};
-
-NS_IMPL_CYCLE_COLLECTION(SpeechTaskCallback, mTask);
-
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(SpeechTaskCallback)
-  NS_INTERFACE_MAP_ENTRY(nsISpeechTaskCallback)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsISpeechTaskCallback)
-NS_INTERFACE_MAP_END
-
-NS_IMPL_CYCLE_COLLECTING_ADDREF(SpeechTaskCallback)
-NS_IMPL_CYCLE_COLLECTING_RELEASE(SpeechTaskCallback)
-
-NS_IMETHODIMP
-SpeechTaskCallback::OnCancel()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  [mSpeechSynthesizer stopSpeaking];
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-SpeechTaskCallback::OnPause()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  [mSpeechSynthesizer pauseSpeakingAtBoundary:NSSpeechImmediateBoundary];
-  if (!mTask) {
-    // When calling pause() on child porcess, it may not receive end event
-    // from chrome process yet.
-    return NS_ERROR_FAILURE;
-  }
-  mTask->DispatchPause(GetTimeDurationFromStart(), mCurrentIndex);
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-SpeechTaskCallback::OnResume()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  [mSpeechSynthesizer continueSpeaking];
-  if (!mTask) {
-    // When calling resume() on child porcess, it may not receive end event
-    // from chrome process yet.
-    return NS_ERROR_FAILURE;
-  }
-  mTask->DispatchResume(GetTimeDurationFromStart(), mCurrentIndex);
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-SpeechTaskCallback::OnVolumeChanged(float aVolume)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  [mSpeechSynthesizer setObject:[NSNumber numberWithFloat:aVolume]
-                    forProperty:NSSpeechVolumeProperty error:nil];
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-float
-SpeechTaskCallback::GetTimeDurationFromStart()
-{
-  TimeDuration duration = TimeStamp::Now() - mStartingTime;
-  return duration.ToMilliseconds();
-}
-
-void
-SpeechTaskCallback::OnWillSpeakWord(uint32_t aIndex)
-{
-  mCurrentIndex = aIndex < mOffsets.Length() ? mOffsets[aIndex] : mCurrentIndex;
-  if (!mTask) {
-    return;
-  }
-  mTask->DispatchBoundary(NS_LITERAL_STRING("word"),
-                          GetTimeDurationFromStart(), mCurrentIndex);
-}
-
-void
-SpeechTaskCallback::OnError(uint32_t aIndex)
-{
-  if (!mTask) {
-    return;
-  }
-  mTask->DispatchError(GetTimeDurationFromStart(), aIndex);
-}
-
-void
-SpeechTaskCallback::OnDidFinishSpeaking()
-{
-  mTask->DispatchEnd(GetTimeDurationFromStart(), mCurrentIndex);
-  // no longer needed
-  [mSpeechSynthesizer setDelegate:nil];
-  mTask = nullptr;
-}
-
-@interface SpeechDelegate : NSObject<NSSpeechSynthesizerDelegate>
-{
-@private
-  SpeechTaskCallback* mCallback;
-}
-
-  - (id)initWithCallback:(SpeechTaskCallback*)aCallback;
-@end
-
-@implementation SpeechDelegate
-- (id)initWithCallback:(SpeechTaskCallback*)aCallback
-{
-  [super init];
-  mCallback = aCallback;
-  return self;
-}
-
-- (void)speechSynthesizer:(NSSpeechSynthesizer *)aSender
-            willSpeakWord:(NSRange)aRange ofString:(NSString*)aString
-{
-  mCallback->OnWillSpeakWord(aRange.location);
-}
-
-- (void)speechSynthesizer:(NSSpeechSynthesizer *)aSender
-        didFinishSpeaking:(BOOL)aFinishedSpeaking
-{
-  mCallback->OnDidFinishSpeaking();
-}
-
-- (void)speechSynthesizer:(NSSpeechSynthesizer*)aSender
- didEncounterErrorAtIndex:(NSUInteger)aCharacterIndex
-                 ofString:(NSString*)aString
-                  message:(NSString*)aMessage
-{
-  mCallback->OnError(aCharacterIndex);
-}
-@end
-
-namespace mozilla {
-namespace dom {
-
-struct OSXVoice
-{
-  OSXVoice() : mIsDefault(false)
-  {
-  }
-
-  nsString mUri;
-  nsString mName;
-  nsString mLocale;
-  bool mIsDefault;
-};
-
-class RegisterVoicesRunnable final : public Runnable
-{
-public:
-  RegisterVoicesRunnable(OSXSpeechSynthesizerService* aSpeechService,
-                         nsTArray<OSXVoice>& aList)
-    : mSpeechService(aSpeechService)
-    , mVoices(aList)
-  {
-  }
-
-  NS_IMETHOD Run() override;
-
-private:
-  ~RegisterVoicesRunnable()
-  {
-  }
-
-  // This runnable always use sync mode.  It is unnecesarry to reference object
-  OSXSpeechSynthesizerService* mSpeechService;
-  nsTArray<OSXVoice>& mVoices;
-};
-
-NS_IMETHODIMP
-RegisterVoicesRunnable::Run()
-{
-  nsresult rv;
-  nsCOMPtr<nsISynthVoiceRegistry> registry =
-    do_GetService(NS_SYNTHVOICEREGISTRY_CONTRACTID, &rv);
-  if (!registry) {
-    return rv;
-  }
-
-  for (OSXVoice voice : mVoices) {
-    rv = registry->AddVoice(mSpeechService, voice.mUri, voice.mName, voice.mLocale, true, false);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      continue;
-    }
-
-    if (voice.mIsDefault) {
-      registry->SetDefaultVoice(voice.mUri, true);
-    }
-  }
-
-  registry->NotifyVoicesChanged();
-
-  return NS_OK;
-}
-
-class EnumVoicesRunnable final : public Runnable
-{
-public:
-  explicit EnumVoicesRunnable(OSXSpeechSynthesizerService* aSpeechService)
-    : mSpeechService(aSpeechService)
-  {
-  }
-
-  NS_IMETHOD Run() override;
-
-private:
-  ~EnumVoicesRunnable()
-  {
-  }
-
-  RefPtr<OSXSpeechSynthesizerService> mSpeechService;
-};
-
-NS_IMETHODIMP
-EnumVoicesRunnable::Run()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  AutoTArray<OSXVoice, 64> list;
-
-  NSArray* voices = [NSSpeechSynthesizer availableVoices];
-  NSString* defaultVoice = [NSSpeechSynthesizer defaultVoice];
-
-  for (NSString* voice in voices) {
-    OSXVoice item;
-
-    NSDictionary* attr = [NSSpeechSynthesizer attributesForVoice:voice];
-
-    nsAutoString identifier;
-    nsCocoaUtils::GetStringForNSString([attr objectForKey:NSVoiceIdentifier],
-                                       identifier);
-
-    nsCocoaUtils::GetStringForNSString([attr objectForKey:NSVoiceName], item.mName);
-
-    nsCocoaUtils::GetStringForNSString(
-      [attr objectForKey:NSVoiceLocaleIdentifier], item.mLocale);
-    item.mLocale.ReplaceChar('_', '-');
-
-    item.mUri.AssignLiteral("urn:moz-tts:osx:");
-    item.mUri.Append(identifier);
-
-    if ([voice isEqualToString:defaultVoice]) {
-      item.mIsDefault = true;
-    }
-
-    list.AppendElement(item);
-  }
-
-  RefPtr<RegisterVoicesRunnable> runnable = new RegisterVoicesRunnable(mSpeechService, list);
-  NS_DispatchToMainThread(runnable, NS_DISPATCH_SYNC);
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-StaticRefPtr<OSXSpeechSynthesizerService> OSXSpeechSynthesizerService::sSingleton;
-
-NS_INTERFACE_MAP_BEGIN(OSXSpeechSynthesizerService)
-  NS_INTERFACE_MAP_ENTRY(nsISpeechService)
-  NS_INTERFACE_MAP_ENTRY(nsIObserver)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsISpeechService)
-NS_INTERFACE_MAP_END
-
-NS_IMPL_ADDREF(OSXSpeechSynthesizerService)
-NS_IMPL_RELEASE(OSXSpeechSynthesizerService)
-
-OSXSpeechSynthesizerService::OSXSpeechSynthesizerService()
-  : mInitialized(false)
-{
-}
-
-OSXSpeechSynthesizerService::~OSXSpeechSynthesizerService()
-{
-}
-
-bool
-OSXSpeechSynthesizerService::Init()
-{
-  if (Preferences::GetBool("media.webspeech.synth.test") ||
-      !Preferences::GetBool("media.webspeech.synth.enabled")) {
-    // When test is enabled, we shouldn't add OS backend (Bug 1160844)
-    return false;
-  }
-
-  nsCOMPtr<nsIThread> thread;
-  if (NS_FAILED(NS_NewNamedThread("SpeechWorker", getter_AddRefs(thread)))) {
-  	return false;
-  }
-
-  // Get all the voices and register in the SynthVoiceRegistry
-  nsCOMPtr<nsIRunnable> runnable = new EnumVoicesRunnable(this);
-  thread->Dispatch(runnable, NS_DISPATCH_NORMAL);
-
-  mInitialized = true;
-  return true;
-}
-
-NS_IMETHODIMP
-OSXSpeechSynthesizerService::Speak(const nsAString& aText,
-                                   const nsAString& aUri,
-                                   float aVolume,
-                                   float aRate,
-                                   float aPitch,
-                                   nsISpeechTask* aTask)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  MOZ_ASSERT(StringBeginsWith(aUri, NS_LITERAL_STRING("urn:moz-tts:osx:")),
-             "OSXSpeechSynthesizerService doesn't allow this voice URI");
-
-  NSSpeechSynthesizer* synth = [[NSSpeechSynthesizer alloc] init];
-  // strlen("urn:moz-tts:osx:") == 16
-  NSString* identifier = nsCocoaUtils::ToNSString(Substring(aUri, 16));
-  [synth setVoice:identifier];
-
-  // default rate is 180-220
-  [synth setObject:[NSNumber numberWithInt:aRate * 200]
-         forProperty:NSSpeechRateProperty error:nil];
-  // volume allows 0.0-1.0
-  [synth setObject:[NSNumber numberWithFloat:aVolume]
-         forProperty:NSSpeechVolumeProperty error:nil];
-  // Use default pitch value to calculate this
-  NSNumber* defaultPitch =
-    [synth objectForProperty:NSSpeechPitchBaseProperty error:nil];
-  if (defaultPitch) {
-    int newPitch = [defaultPitch intValue] * (aPitch / 2 + 0.5);
-    [synth setObject:[NSNumber numberWithInt:newPitch]
-           forProperty:NSSpeechPitchBaseProperty error:nil];
-  }
-
-  nsAutoString escapedText;
-  // We need to map the the offsets from the given text to the escaped text.
-  // The index of the offsets array is the position in the escaped text,
-  // the element value is the position in the user-supplied text.
-  nsTArray<size_t> offsets;
-  offsets.SetCapacity(aText.Length());
-
-  // This loop looks for occurances of "[[" or "]]", escapes them, and
-  // populates the offsets array to supply a map to the original offsets.
-  for (size_t i = 0; i < aText.Length(); i++) {
-    if (aText.Length() > i + 1 &&
-        ((aText[i] == ']' && aText[i+1] == ']') ||
-         (aText[i] == '[' && aText[i+1] == '['))) {
-      escapedText.AppendLiteral(DLIM_ESCAPE_START);
-      offsets.AppendElements(strlen(DLIM_ESCAPE_START));
-      escapedText.Append(aText[i]);
-      offsets.AppendElement(i);
-      escapedText.Append(aText[++i]);
-      offsets.AppendElement(i);
-      escapedText.AppendLiteral(DLIM_ESCAPE_END);
-      offsets.AppendElements(strlen(DLIM_ESCAPE_END));
-    } else {
-      escapedText.Append(aText[i]);
-      offsets.AppendElement(i);
-    }
-  }
-
-  RefPtr<SpeechTaskCallback> callback = new SpeechTaskCallback(aTask, synth, offsets);
-  nsresult rv = aTask->Setup(callback, 0, 0, 0);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  SpeechDelegate* delegate = [[SpeechDelegate alloc] initWithCallback:callback];
-  [synth setDelegate:delegate];
-  [delegate release ];
-
-  NSString* text = nsCocoaUtils::ToNSString(escapedText);
-  BOOL success = [synth startSpeakingString:text];
-  NS_ENSURE_TRUE(success, NS_ERROR_FAILURE);
-
-  aTask->DispatchStart();
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-OSXSpeechSynthesizerService::GetServiceType(SpeechServiceType* aServiceType)
-{
-  *aServiceType = nsISpeechService::SERVICETYPE_INDIRECT_AUDIO;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-OSXSpeechSynthesizerService::Observe(nsISupports* aSubject, const char* aTopic,
-                                     const char16_t* aData)
-{
-  return NS_OK;
-}
-
-OSXSpeechSynthesizerService*
-OSXSpeechSynthesizerService::GetInstance()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  if (XRE_GetProcessType() != GeckoProcessType_Default) {
-    return nullptr;
-  }
-
-  if (!sSingleton) {
-    RefPtr<OSXSpeechSynthesizerService> speechService =
-      new OSXSpeechSynthesizerService();
-    if (speechService->Init()) {
-      sSingleton = speechService;
-    }
-  }
-  return sSingleton;
-}
-
-already_AddRefed<OSXSpeechSynthesizerService>
-OSXSpeechSynthesizerService::GetInstanceForService()
-{
-  RefPtr<OSXSpeechSynthesizerService> speechService = GetInstance();
-  return speechService.forget();
-}
-
-void
-OSXSpeechSynthesizerService::Shutdown()
-{
-  if (!sSingleton) {
-    return;
-  }
-  sSingleton = nullptr;
-}
-
-} // namespace dom
-} // namespace mozilla
diff --git a/dom/media/webspeech/synth/cocoa/moz.build b/dom/media/webspeech/synth/cocoa/moz.build
deleted file mode 100644
index 6953a81e95..0000000000
--- a/dom/media/webspeech/synth/cocoa/moz.build
+++ /dev/null
@@ -1,11 +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/.
-
-SOURCES += [
-  'OSXSpeechSynthesizerModule.cpp',
-  'OSXSpeechSynthesizerService.mm'
-]
-
-FINAL_LIBRARY = 'xul'
diff --git a/dom/media/webspeech/synth/moz.build b/dom/media/webspeech/synth/moz.build
index 6603689261..9784686dfe 100644
--- a/dom/media/webspeech/synth/moz.build
+++ b/dom/media/webspeech/synth/moz.build
@@ -32,9 +32,6 @@ SOURCES += [
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     DIRS += ['windows']
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    DIRS += ['cocoa']
-
 if CONFIG['MOZ_SYNTH_SPEECHD']:
     DIRS += ['speechd']
 
diff --git a/dom/moz.build b/dom/moz.build
index f02a4a5d6f..b324de2cb0 100644
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -112,6 +112,6 @@ TEST_DIRS += [
     'imptests',
 ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'cocoa', 'windows', 'android'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'windows', 'android'):
     TEST_DIRS += ['plugins/test']
 
diff --git a/dom/plugins/base/moz.build b/dom/plugins/base/moz.build
index 08f87d56a3..11649a8626 100644
--- a/dom/plugins/base/moz.build
+++ b/dom/plugins/base/moz.build
@@ -56,11 +56,6 @@ if CONFIG['OS_ARCH'] == 'WINNT':
         'nsPluginNativeWindowWin.cpp',
         'nsPluginsDirWin.cpp',
     ]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    SOURCES += [
-        'nsPluginNativeWindow.cpp',
-        'nsPluginsDirDarwin.cpp',
-    ]
 else:
     SOURCES += [
         'nsPluginsDirUnix.cpp',
@@ -82,7 +77,6 @@ LOCAL_INCLUDES += [
     '/layout/xul',
     '/netwerk/base',
     '/widget',
-    '/widget/cocoa',
     '/xpcom/base',
 ]
 
diff --git a/dom/plugins/base/nsPluginsDirDarwin.cpp b/dom/plugins/base/nsPluginsDirDarwin.cpp
deleted file mode 100644
index 0085eec0d6..0000000000
--- a/dom/plugins/base/nsPluginsDirDarwin.cpp
+++ /dev/null
@@ -1,572 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-/*
-  nsPluginsDirDarwin.cpp
-  
-  Mac OS X implementation of the nsPluginsDir/nsPluginsFile classes.
-  
-  by Patrick C. Beard.
- */
-
-#include "GeckoChildProcessHost.h"
-#include "base/process_util.h"
-
-#include "prlink.h"
-#include "prnetdb.h"
-#include "nsXPCOM.h"
-
-#include "nsPluginsDir.h"
-#include "nsNPAPIPlugin.h"
-#include "nsPluginsDirUtils.h"
-
-#include "nsILocalFileMac.h"
-#include "mozilla/UniquePtr.h"
-
-#include "nsCocoaFeatures.h"
-
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-#include <Carbon/Carbon.h>
-#include <CoreServices/CoreServices.h>
-#include <mach-o/loader.h>
-#include <mach-o/fat.h>
-
-typedef NS_NPAPIPLUGIN_CALLBACK(const char *, NP_GETMIMEDESCRIPTION) ();
-typedef NS_NPAPIPLUGIN_CALLBACK(OSErr, BP_GETSUPPORTEDMIMETYPES) (BPSupportedMIMETypes *mimeInfo, UInt32 flags);
-
-/*
-** Returns a CFBundleRef if the path refers to a Mac OS X bundle directory.
-** The caller is responsible for calling CFRelease() to deallocate.
-*/
-static CFBundleRef getPluginBundle(const char* path)
-{
-  CFBundleRef bundle = nullptr;
-  CFStringRef pathRef = ::CFStringCreateWithCString(nullptr, path,
-                                                    kCFStringEncodingUTF8);
-  if (pathRef) {
-    CFURLRef bundleURL = ::CFURLCreateWithFileSystemPath(nullptr, pathRef,
-                                                         kCFURLPOSIXPathStyle,
-                                                         true);
-    if (bundleURL) {
-      bundle = ::CFBundleCreate(nullptr, bundleURL);
-      ::CFRelease(bundleURL);
-    }
-    ::CFRelease(pathRef);
-  }
-  return bundle;
-}
-
-static nsresult toCFURLRef(nsIFile* file, CFURLRef& outURL)
-{
-  nsCOMPtr<nsILocalFileMac> lfm = do_QueryInterface(file);
-  if (!lfm)
-    return NS_ERROR_FAILURE;
-  CFURLRef url;
-  nsresult rv = lfm->GetCFURL(&url);
-  if (NS_SUCCEEDED(rv))
-    outURL = url;
-  
-  return rv;
-}
-
-bool nsPluginsDir::IsPluginFile(nsIFile* file)
-{
-  nsCString fileName;
-  file->GetNativeLeafName(fileName);
-  /*
-   * Don't load the VDP fake plugin, to avoid tripping a bad bug in OS X
-   * 10.5.3 (see bug 436575).
-   */
-  if (!strcmp(fileName.get(), "VerifiedDownloadPlugin.plugin")) {
-    NS_WARNING("Preventing load of VerifiedDownloadPlugin.plugin (see bug 436575)");
-    return false;
-  }
-  return true;
-}
-
-// Caller is responsible for freeing returned buffer.
-static char* CFStringRefToUTF8Buffer(CFStringRef cfString)
-{
-  const char* buffer = ::CFStringGetCStringPtr(cfString, kCFStringEncodingUTF8);
-  if (buffer) {
-    return PL_strdup(buffer);
-  }
-
-  int bufferLength =
-    ::CFStringGetMaximumSizeForEncoding(::CFStringGetLength(cfString),
-                                        kCFStringEncodingUTF8) + 1;
-  char* newBuffer = static_cast<char*>(moz_xmalloc(bufferLength));
-  if (!newBuffer) {
-    return nullptr;
-  }
-
-  if (!::CFStringGetCString(cfString, newBuffer, bufferLength,
-                            kCFStringEncodingUTF8)) {
-    free(newBuffer);
-    return nullptr;
-  }
-
-  newBuffer = static_cast<char*>(moz_xrealloc(newBuffer,
-                                              strlen(newBuffer) + 1));
-  return newBuffer;
-}
-
-class AutoCFTypeObject {
-public:
-  explicit AutoCFTypeObject(CFTypeRef aObject)
-  {
-    mObject = aObject;
-  }
-  ~AutoCFTypeObject()
-  {
-    ::CFRelease(mObject);
-  }
-private:
-  CFTypeRef mObject;
-};
-
-static Boolean MimeTypeEnabled(CFDictionaryRef mimeDict) {
-  if (!mimeDict) {
-    return true;
-  }
-  
-  CFTypeRef value;
-  if (::CFDictionaryGetValueIfPresent(mimeDict, CFSTR("WebPluginTypeEnabled"), &value)) {
-    if (value && ::CFGetTypeID(value) == ::CFBooleanGetTypeID()) {
-      return ::CFBooleanGetValue(static_cast<CFBooleanRef>(value));
-    }
-  }
-  return true;
-}
-
-static CFDictionaryRef ParsePlistForMIMETypesFilename(CFBundleRef bundle)
-{
-  CFTypeRef mimeFileName = ::CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("WebPluginMIMETypesFilename"));
-  if (!mimeFileName || ::CFGetTypeID(mimeFileName) != ::CFStringGetTypeID()) {
-    return nullptr;
-  }
-  
-  FSRef homeDir;
-  if (::FSFindFolder(kUserDomain, kCurrentUserFolderType, kDontCreateFolder, &homeDir) != noErr) {
-    return nullptr;
-  }
-  
-  CFURLRef userDirURL = ::CFURLCreateFromFSRef(kCFAllocatorDefault, &homeDir);
-  if (!userDirURL) {
-    return nullptr;
-  }
-  
-  AutoCFTypeObject userDirURLAutorelease(userDirURL);
-  CFStringRef mimeFilePath = ::CFStringCreateWithFormat(kCFAllocatorDefault, nullptr, CFSTR("Library/Preferences/%@"), static_cast<CFStringRef>(mimeFileName));
-  if (!mimeFilePath) {
-    return nullptr;
-  }
-  
-  AutoCFTypeObject mimeFilePathAutorelease(mimeFilePath);
-  CFURLRef mimeFileURL = ::CFURLCreateWithFileSystemPathRelativeToBase(kCFAllocatorDefault, mimeFilePath, kCFURLPOSIXPathStyle, false, userDirURL);
-  if (!mimeFileURL) {
-    return nullptr;
-  }
-  
-  AutoCFTypeObject mimeFileURLAutorelease(mimeFileURL);
-  SInt32 errorCode = 0;
-  CFDataRef mimeFileData = nullptr;
-  Boolean result = ::CFURLCreateDataAndPropertiesFromResource(kCFAllocatorDefault, mimeFileURL, &mimeFileData, nullptr, nullptr, &errorCode);
-  if (!result) {
-    return nullptr;
-  }
-  
-  AutoCFTypeObject mimeFileDataAutorelease(mimeFileData);
-  if (errorCode != 0) {
-    return nullptr;
-  }
-  
-  CFPropertyListRef propertyList = ::CFPropertyListCreateFromXMLData(kCFAllocatorDefault, mimeFileData, kCFPropertyListImmutable, nullptr);
-  if (!propertyList) {
-    return nullptr;
-  }
-  
-  AutoCFTypeObject propertyListAutorelease(propertyList);
-  if (::CFGetTypeID(propertyList) != ::CFDictionaryGetTypeID()) {
-    return nullptr;
-  }
-
-  CFTypeRef mimeTypes = ::CFDictionaryGetValue(static_cast<CFDictionaryRef>(propertyList), CFSTR("WebPluginMIMETypes"));
-  if (!mimeTypes || ::CFGetTypeID(mimeTypes) != ::CFDictionaryGetTypeID() || ::CFDictionaryGetCount(static_cast<CFDictionaryRef>(mimeTypes)) == 0) {
-    return nullptr;
-  }
-  
-  return static_cast<CFDictionaryRef>(::CFRetain(mimeTypes));
-}
-
-static void ParsePlistPluginInfo(nsPluginInfo& info, CFBundleRef bundle)
-{
-  CFDictionaryRef mimeDict = ParsePlistForMIMETypesFilename(bundle);
-  
-  if (!mimeDict) {
-    CFTypeRef mimeTypes = ::CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("WebPluginMIMETypes"));
-    if (!mimeTypes || ::CFGetTypeID(mimeTypes) != ::CFDictionaryGetTypeID() || ::CFDictionaryGetCount(static_cast<CFDictionaryRef>(mimeTypes)) == 0)
-      return;
-    mimeDict = static_cast<CFDictionaryRef>(::CFRetain(mimeTypes));
-  }
-  
-  AutoCFTypeObject mimeDictAutorelease(mimeDict);
-  int mimeDictKeyCount = ::CFDictionaryGetCount(mimeDict);
-
-  // Allocate memory for mime data
-  int mimeDataArraySize = mimeDictKeyCount * sizeof(char*);
-  info.fMimeTypeArray = static_cast<char**>(moz_xmalloc(mimeDataArraySize));
-  if (!info.fMimeTypeArray)
-    return;
-  memset(info.fMimeTypeArray, 0, mimeDataArraySize);
-  info.fExtensionArray = static_cast<char**>(moz_xmalloc(mimeDataArraySize));
-  if (!info.fExtensionArray)
-    return;
-  memset(info.fExtensionArray, 0, mimeDataArraySize);
-  info.fMimeDescriptionArray = static_cast<char**>(moz_xmalloc(mimeDataArraySize));
-  if (!info.fMimeDescriptionArray)
-    return;
-  memset(info.fMimeDescriptionArray, 0, mimeDataArraySize);
-
-  // Allocate memory for mime dictionary keys and values
-  mozilla::UniquePtr<CFTypeRef[]> keys(new CFTypeRef[mimeDictKeyCount]);
-  if (!keys)
-    return;
-  mozilla::UniquePtr<CFTypeRef[]> values(new CFTypeRef[mimeDictKeyCount]);
-  if (!values)
-    return;
-  
-  info.fVariantCount = 0;
-
-  ::CFDictionaryGetKeysAndValues(mimeDict, keys.get(), values.get());
-  for (int i = 0; i < mimeDictKeyCount; i++) {
-    CFTypeRef mimeString = keys[i];
-    if (!mimeString || ::CFGetTypeID(mimeString) != ::CFStringGetTypeID()) {
-      continue;
-    }
-    CFTypeRef mimeDict = values[i];
-    if (mimeDict && ::CFGetTypeID(mimeDict) == ::CFDictionaryGetTypeID()) {
-      if (!MimeTypeEnabled(static_cast<CFDictionaryRef>(mimeDict))) {
-        continue;
-      }
-      info.fMimeTypeArray[info.fVariantCount] = CFStringRefToUTF8Buffer(static_cast<CFStringRef>(mimeString));
-      if (!info.fMimeTypeArray[info.fVariantCount]) {
-        continue;
-      }
-      CFTypeRef extensions = ::CFDictionaryGetValue(static_cast<CFDictionaryRef>(mimeDict), CFSTR("WebPluginExtensions"));
-      if (extensions && ::CFGetTypeID(extensions) == ::CFArrayGetTypeID()) {
-        int extensionCount = ::CFArrayGetCount(static_cast<CFArrayRef>(extensions));
-        CFMutableStringRef extensionList = ::CFStringCreateMutable(kCFAllocatorDefault, 0);
-        for (int j = 0; j < extensionCount; j++) {
-          CFTypeRef extension = ::CFArrayGetValueAtIndex(static_cast<CFArrayRef>(extensions), j);
-          if (extension && ::CFGetTypeID(extension) == ::CFStringGetTypeID()) {
-            if (j > 0)
-              ::CFStringAppend(extensionList, CFSTR(","));
-            ::CFStringAppend(static_cast<CFMutableStringRef>(extensionList), static_cast<CFStringRef>(extension));
-          }
-        }
-        info.fExtensionArray[info.fVariantCount] = CFStringRefToUTF8Buffer(static_cast<CFStringRef>(extensionList));
-        ::CFRelease(extensionList);
-      }
-      CFTypeRef description = ::CFDictionaryGetValue(static_cast<CFDictionaryRef>(mimeDict), CFSTR("WebPluginTypeDescription"));
-      if (description && ::CFGetTypeID(description) == ::CFStringGetTypeID())
-        info.fMimeDescriptionArray[info.fVariantCount] = CFStringRefToUTF8Buffer(static_cast<CFStringRef>(description));
-    }
-    info.fVariantCount++;
-  }
-}
-
-nsPluginFile::nsPluginFile(nsIFile *spec)
-    : mPlugin(spec)
-{
-}
-
-nsPluginFile::~nsPluginFile() {}
-
-nsresult nsPluginFile::LoadPlugin(PRLibrary **outLibrary)
-{
-  if (!mPlugin)
-    return NS_ERROR_NULL_POINTER;
-
-  // 64-bit NSPR does not (yet) support bundles.  So in 64-bit builds we need
-  // (for now) to load the bundle's executable.  However this can cause
-  // problems:  CFBundleCreate() doesn't run the bundle's executable's
-  // initialization code, while NSAddImage() and dlopen() do run it.  So using
-  // NSPR's dyld loading mechanisms here (NSAddImage() or dlopen()) can cause
-  // a bundle's initialization code to run earlier than expected, and lead to
-  // crashes.  See bug 577967.
-#ifdef __LP64__
-  char executablePath[PATH_MAX];
-  executablePath[0] = '\0';
-  nsAutoCString bundlePath;
-  mPlugin->GetNativePath(bundlePath);
-  CFStringRef pathRef = ::CFStringCreateWithCString(nullptr, bundlePath.get(),
-                                                    kCFStringEncodingUTF8);
-  if (pathRef) {
-    CFURLRef bundleURL = ::CFURLCreateWithFileSystemPath(nullptr, pathRef,
-                                                         kCFURLPOSIXPathStyle,
-                                                         true);
-    if (bundleURL) {
-      CFBundleRef bundle = ::CFBundleCreate(nullptr, bundleURL);
-      if (bundle) {
-        CFURLRef executableURL = ::CFBundleCopyExecutableURL(bundle);
-        if (executableURL) {
-          if (!::CFURLGetFileSystemRepresentation(executableURL, true, (UInt8*)&executablePath, PATH_MAX))
-            executablePath[0] = '\0';
-          ::CFRelease(executableURL);
-        }
-        ::CFRelease(bundle);
-      }
-      ::CFRelease(bundleURL);
-    }
-    ::CFRelease(pathRef); 
-  }
-#else
-  nsAutoCString bundlePath;
-  mPlugin->GetNativePath(bundlePath);
-  const char *executablePath = bundlePath.get();
-#endif
-
-  *outLibrary = PR_LoadLibrary(executablePath);
-  pLibrary = *outLibrary;
-  if (!pLibrary) {
-    return NS_ERROR_FAILURE;
-  }
-#ifdef DEBUG
-  printf("[loaded plugin %s]\n", bundlePath.get());
-#endif
-  return NS_OK;
-}
-
-static char* p2cstrdup(StringPtr pstr)
-{
-  int len = pstr[0];
-  char* cstr = static_cast<char*>(moz_xmalloc(len + 1));
-  if (cstr) {
-    memmove(cstr, pstr + 1, len);
-    cstr[len] = '\0';
-  }
-  return cstr;
-}
-
-static char* GetNextPluginStringFromHandle(Handle h, short *index)
-{
-  char *ret = p2cstrdup((unsigned char*)(*h + *index));
-  *index += (ret ? strlen(ret) : 0) + 1;
-  return ret;
-}
-
-static bool IsCompatibleArch(nsIFile *file)
-{
-  CFURLRef pluginURL = nullptr;
-  if (NS_FAILED(toCFURLRef(file, pluginURL)))
-    return false;
-  
-  bool isPluginFile = false;
-
-  CFBundleRef pluginBundle = ::CFBundleCreate(kCFAllocatorDefault, pluginURL);
-  if (pluginBundle) {
-    UInt32 packageType, packageCreator;
-    ::CFBundleGetPackageInfo(pluginBundle, &packageType, &packageCreator);
-    if (packageType == 'BRPL' || packageType == 'IEPL' || packageType == 'NSPL') {
-      // Get path to plugin as a C string.
-      char executablePath[PATH_MAX];
-      executablePath[0] = '\0';
-      if (!::CFURLGetFileSystemRepresentation(pluginURL, true, (UInt8*)&executablePath, PATH_MAX)) {
-        executablePath[0] = '\0';
-      }
-
-      uint32_t pluginLibArchitectures;
-      nsresult rv = mozilla::ipc::GeckoChildProcessHost::GetArchitecturesForBinary(executablePath, &pluginLibArchitectures);
-      if (NS_FAILED(rv)) {
-        return false;
-      }
-
-      uint32_t supportedArchitectures =
-#ifdef __LP64__
-          mozilla::ipc::GeckoChildProcessHost::GetSupportedArchitecturesForProcessType(GeckoProcessType_Plugin);
-#else
-          base::GetCurrentProcessArchitecture();
-#endif
-
-      // Consider the plugin architecture valid if there is any overlap in the masks.
-      isPluginFile = !!(supportedArchitectures & pluginLibArchitectures);
-    }
-    ::CFRelease(pluginBundle);
-  }
-
-  ::CFRelease(pluginURL);
-  return isPluginFile;
-}
-
-/**
- * Obtains all of the information currently available for this plugin.
- */
-nsresult nsPluginFile::GetPluginInfo(nsPluginInfo& info, PRLibrary **outLibrary)
-{
-  *outLibrary = nullptr;
-
-  nsresult rv = NS_OK;
-
-  if (!IsCompatibleArch(mPlugin)) {
-      return NS_ERROR_FAILURE;
-  }
-
-  // clear out the info, except for the first field.
-  memset(&info, 0, sizeof(info));
-
-  // Try to get a bundle reference.
-  nsAutoCString path;
-  if (NS_FAILED(rv = mPlugin->GetNativePath(path)))
-    return rv;
-  CFBundleRef bundle = getPluginBundle(path.get());
-
-  // fill in full path
-  info.fFullPath = PL_strdup(path.get());
-
-  // fill in file name
-  nsAutoCString fileName;
-  if (NS_FAILED(rv = mPlugin->GetNativeLeafName(fileName)))
-    return rv;
-  info.fFileName = PL_strdup(fileName.get());
-
-  // Get fName
-  if (bundle) {
-    CFTypeRef name = ::CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("WebPluginName"));
-    if (name && ::CFGetTypeID(name) == ::CFStringGetTypeID())
-      info.fName = CFStringRefToUTF8Buffer(static_cast<CFStringRef>(name));
-  }
-
-  // Get fDescription
-  if (bundle) {
-    CFTypeRef description = ::CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("WebPluginDescription"));
-    if (description && ::CFGetTypeID(description) == ::CFStringGetTypeID())
-      info.fDescription = CFStringRefToUTF8Buffer(static_cast<CFStringRef>(description));
-  }
-
-  // Get fVersion
-  if (bundle) {
-    // Look for the release version first
-    CFTypeRef version = ::CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("CFBundleShortVersionString"));
-    if (!version) // try the build version
-      version = ::CFBundleGetValueForInfoDictionaryKey(bundle, kCFBundleVersionKey);
-    if (version && ::CFGetTypeID(version) == ::CFStringGetTypeID())
-      info.fVersion = CFStringRefToUTF8Buffer(static_cast<CFStringRef>(version));
-  }
-
-  // The last thing we need to do is get MIME data
-  // fVariantCount, fMimeTypeArray, fExtensionArray, fMimeDescriptionArray
-
-  // First look for data in a bundle plist
-  if (bundle) {
-    ParsePlistPluginInfo(info, bundle);
-    ::CFRelease(bundle);
-    if (info.fVariantCount > 0)
-      return NS_OK;
-  }
-
-  // Don't load "fbplugin" or any plugins whose name starts with "fbplugin_"
-  // (Facebook plugins) if we're running on OS X 10.10 (Yosemite) or later.
-  // A "fbplugin" file crashes on load, in the call to LoadPlugin() below.
-  // See bug 1086977.
-  if (nsCocoaFeatures::OnYosemiteOrLater()) {
-    if (fileName.EqualsLiteral("fbplugin") ||
-        StringBeginsWith(fileName, NS_LITERAL_CSTRING("fbplugin_"))) {
-      nsAutoCString msg;
-      msg.AppendPrintf("Preventing load of %s (see bug 1086977)",
-                       fileName.get());
-      NS_WARNING(msg.get());
-      return NS_ERROR_FAILURE;
-    }
-  }
-
-  // It's possible that our plugin has 2 entry points that'll give us mime type
-  // info. Quicktime does this to get around the need of having admin rights to
-  // change mime info in the resource fork. We need to use this info instead of
-  // the resource. See bug 113464.
-
-  // Sadly we have to load the library for this to work.
-  rv = LoadPlugin(outLibrary);
-  if (NS_FAILED(rv))
-    return rv;
-
-  // Try to get data from NP_GetMIMEDescription
-  if (pLibrary) {
-    NP_GETMIMEDESCRIPTION pfnGetMimeDesc = (NP_GETMIMEDESCRIPTION)PR_FindFunctionSymbol(pLibrary, NP_GETMIMEDESCRIPTION_NAME); 
-    if (pfnGetMimeDesc)
-      ParsePluginMimeDescription(pfnGetMimeDesc(), info);
-    if (info.fVariantCount)
-      return NS_OK;
-  }
-
-  // We'll fill this in using BP_GetSupportedMIMETypes and/or resource fork data
-  BPSupportedMIMETypes mi = {kBPSupportedMIMETypesStructVers_1, nullptr, nullptr};
-
-  // Try to get data from BP_GetSupportedMIMETypes
-  if (pLibrary) {
-    BP_GETSUPPORTEDMIMETYPES pfnMime = (BP_GETSUPPORTEDMIMETYPES)PR_FindFunctionSymbol(pLibrary, "BP_GetSupportedMIMETypes");
-    if (pfnMime && noErr == pfnMime(&mi, 0) && mi.typeStrings) {
-      info.fVariantCount = (**(short**)mi.typeStrings) / 2;
-      ::HLock(mi.typeStrings);
-      if (mi.infoStrings)  // it's possible some plugins have infoStrings missing
-        ::HLock(mi.infoStrings);
-    }
-  }
-
-  // Fill in the info struct based on the data in the BPSupportedMIMETypes struct
-  int variantCount = info.fVariantCount;
-  info.fMimeTypeArray = static_cast<char**>(moz_xmalloc(variantCount * sizeof(char*)));
-  if (!info.fMimeTypeArray)
-    return NS_ERROR_OUT_OF_MEMORY;
-  info.fExtensionArray = static_cast<char**>(moz_xmalloc(variantCount * sizeof(char*)));
-  if (!info.fExtensionArray)
-    return NS_ERROR_OUT_OF_MEMORY;
-  if (mi.infoStrings) {
-    info.fMimeDescriptionArray = static_cast<char**>(moz_xmalloc(variantCount * sizeof(char*)));
-    if (!info.fMimeDescriptionArray)
-      return NS_ERROR_OUT_OF_MEMORY;
-  }
-  short mimeIndex = 2;
-  short descriptionIndex = 2;
-  for (int i = 0; i < variantCount; i++) {
-    info.fMimeTypeArray[i] = GetNextPluginStringFromHandle(mi.typeStrings, &mimeIndex);
-    info.fExtensionArray[i] = GetNextPluginStringFromHandle(mi.typeStrings, &mimeIndex);
-    if (mi.infoStrings)
-      info.fMimeDescriptionArray[i] = GetNextPluginStringFromHandle(mi.infoStrings, &descriptionIndex);
-  }
-
-  ::HUnlock(mi.typeStrings);
-  ::DisposeHandle(mi.typeStrings);
-  if (mi.infoStrings) {
-    ::HUnlock(mi.infoStrings);
-    ::DisposeHandle(mi.infoStrings);
-  }
-
-  return NS_OK;
-}
-
-nsresult nsPluginFile::FreePluginInfo(nsPluginInfo& info)
-{
-  free(info.fName);
-  free(info.fDescription);
-  int variantCount = info.fVariantCount;
-  for (int i = 0; i < variantCount; i++) {
-    free(info.fMimeTypeArray[i]);
-    free(info.fExtensionArray[i]);
-    free(info.fMimeDescriptionArray[i]);
-  }
-  free(info.fMimeTypeArray);
-  free(info.fMimeDescriptionArray);
-  free(info.fExtensionArray);
-  free(info.fFileName);
-  free(info.fFullPath);
-  free(info.fVersion);
-
-  return NS_OK;
-}
diff --git a/dom/system/mac/CoreLocationLocationProvider.h b/dom/system/mac/CoreLocationLocationProvider.h
deleted file mode 100644
index 979bc916d8..0000000000
--- a/dom/system/mac/CoreLocationLocationProvider.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "nsCOMPtr.h"
-#include "nsIGeolocationProvider.h"
-
-
-/*
- * The CoreLocationObjects class contains the CoreLocation objects
- * we'll need.
- *
- * Declaring them directly in CoreLocationLocationProvider
- * would require Objective-C++ syntax, which would contaminate all
- * files that include this header and require them to be Objective-C++
- * as well.
- *
- * The solution then is to forward-declare CoreLocationObjects here and
- * hold a pointer to it in CoreLocationLocationProvider, and only actually
- * define it in CoreLocationLocationProvider.mm, thus making it safe
- * for nsGeolocation.cpp, which is C++-only, to include this header.
- */
-class CoreLocationObjects;
-class MLSFallback;
-
-class CoreLocationLocationProvider
-  : public nsIGeolocationProvider
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIGEOLOCATIONPROVIDER
-
-  CoreLocationLocationProvider();
-  void NotifyError(uint16_t aErrorCode);
-  void Update(nsIDOMGeoPosition* aSomewhere);
-  void CreateMLSFallbackProvider();
-  void CancelMLSFallbackProvider();
-
-private:
-  virtual ~CoreLocationLocationProvider();
-
-  CoreLocationObjects* mCLObjects;
-  nsCOMPtr<nsIGeolocationUpdate> mCallback;
-  RefPtr<MLSFallback> mMLSFallbackProvider;
-
-  class MLSUpdate : public nsIGeolocationUpdate
-  {
-  public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIGEOLOCATIONUPDATE
-
-    explicit MLSUpdate(CoreLocationLocationProvider& parentProvider);
-
-  private:
-    CoreLocationLocationProvider& mParentLocationProvider;
-    virtual ~MLSUpdate();
-  };
-};
diff --git a/dom/system/mac/CoreLocationLocationProvider.mm b/dom/system/mac/CoreLocationLocationProvider.mm
deleted file mode 100644
index 7a3feba97b..0000000000
--- a/dom/system/mac/CoreLocationLocationProvider.mm
+++ /dev/null
@@ -1,268 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
-/* 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 "nsAutoPtr.h"
-#include "nsCOMPtr.h"
-#include "nsGeoPosition.h"
-#include "nsIConsoleService.h"
-#include "nsServiceManagerUtils.h"
-#include "nsIDOMGeoPositionError.h"
-#include "CoreLocationLocationProvider.h"
-#include "nsCocoaFeatures.h"
-#include "prtime.h"
-#include "MLSFallback.h"
-
-#include <CoreLocation/CLError.h>
-#include <CoreLocation/CLLocation.h>
-#include <CoreLocation/CLLocationManager.h>
-#include <CoreLocation/CLLocationManagerDelegate.h>
-
-#include <objc/objc.h>
-#include <objc/objc-runtime.h>
-
-#include "nsObjCExceptions.h"
-
-using namespace mozilla;
-
-static const CLLocationAccuracy kHIGH_ACCURACY = kCLLocationAccuracyBest;
-static const CLLocationAccuracy kDEFAULT_ACCURACY = kCLLocationAccuracyNearestTenMeters;
-
-@interface LocationDelegate : NSObject <CLLocationManagerDelegate>
-{
-  CoreLocationLocationProvider* mProvider;
-}
-
-- (id)init:(CoreLocationLocationProvider*)aProvider;
-- (void)locationManager:(CLLocationManager*)aManager
-  didFailWithError:(NSError *)aError;
-- (void)locationManager:(CLLocationManager*)aManager didUpdateLocations:(NSArray*)locations;
-
-@end
-
-@implementation LocationDelegate
-- (id) init:(CoreLocationLocationProvider*) aProvider
-{
-  if ((self = [super init])) {
-    mProvider = aProvider;
-  }
-
-  return self;
-}
-
-- (void)locationManager:(CLLocationManager*)aManager
-  didFailWithError:(NSError *)aError
-{
-  nsCOMPtr<nsIConsoleService> console =
-    do_GetService(NS_CONSOLESERVICE_CONTRACTID);
-
-  NS_ENSURE_TRUE_VOID(console);
-
-  NSString* message =
-    [@"Failed to acquire position: " stringByAppendingString: [aError localizedDescription]];
-
-  console->LogStringMessage(NS_ConvertUTF8toUTF16([message UTF8String]).get());
-
-  if ([aError code] == kCLErrorDenied) {
-    mProvider->NotifyError(nsIDOMGeoPositionError::PERMISSION_DENIED);
-    return;
-  }
-
-  // The CL provider does not fallback to GeoIP, so use NetworkGeolocationProvider for this.
-  // The concept here is: on error, hand off geolocation to MLS, which will then report
-  // back a location or error. We can't call this with no delay however, as this method
-  // is called with an error code of 0 in both failed geolocation cases, and also when
-  // geolocation is not immediately available.
-  // The 2 sec delay is arbitrarily large enough that CL has a reasonable head start and
-  // if it is likely to succeed, it should complete before the MLS provider.
-  // Take note that in locationManager:didUpdateLocations: the handoff to MLS is stopped.
-  mProvider->CreateMLSFallbackProvider();
-}
-
-- (void)locationManager:(CLLocationManager*)aManager didUpdateLocations:(NSArray*)aLocations
-{
-  if (aLocations.count < 1) {
-    return;
-  }
-
-  mProvider->CancelMLSFallbackProvider();
-
-  CLLocation* location = [aLocations objectAtIndex:0];
-
-  nsCOMPtr<nsIDOMGeoPosition> geoPosition =
-    new nsGeoPosition(location.coordinate.latitude,
-                      location.coordinate.longitude,
-                      location.altitude,
-                      location.horizontalAccuracy,
-                      location.verticalAccuracy,
-                      location.course,
-                      location.speed,
-                      PR_Now() / PR_USEC_PER_MSEC);
-
-  mProvider->Update(geoPosition);
-}
-@end
-
-NS_IMPL_ISUPPORTS(CoreLocationLocationProvider::MLSUpdate, nsIGeolocationUpdate);
-
-CoreLocationLocationProvider::MLSUpdate::MLSUpdate(CoreLocationLocationProvider& parentProvider)
-  : mParentLocationProvider(parentProvider)
-{
-}
-
-CoreLocationLocationProvider::MLSUpdate::~MLSUpdate()
-{
-}
-
-NS_IMETHODIMP
-CoreLocationLocationProvider::MLSUpdate::Update(nsIDOMGeoPosition *position)
-{
-  nsCOMPtr<nsIDOMGeoPositionCoords> coords;
-  position->GetCoords(getter_AddRefs(coords));
-  if (!coords) {
-    return NS_ERROR_FAILURE;
-  }
-  mParentLocationProvider.Update(position);
-  return NS_OK;
-}
-NS_IMETHODIMP
-CoreLocationLocationProvider::MLSUpdate::NotifyError(uint16_t error)
-{
-  mParentLocationProvider.NotifyError(error);
-  return NS_OK;
-}
-class CoreLocationObjects {
-public:
-  nsresult Init(CoreLocationLocationProvider* aProvider) {
-    mLocationManager = [[CLLocationManager alloc] init];
-    NS_ENSURE_TRUE(mLocationManager, NS_ERROR_NOT_AVAILABLE);
-
-    mLocationDelegate = [[LocationDelegate alloc] init:aProvider];
-    NS_ENSURE_TRUE(mLocationDelegate, NS_ERROR_NOT_AVAILABLE);
-
-    mLocationManager.desiredAccuracy = kDEFAULT_ACCURACY;
-    mLocationManager.delegate = mLocationDelegate;
-
-    return NS_OK;
-  }
-
-  ~CoreLocationObjects() {
-    if (mLocationManager) {
-      [mLocationManager release];
-    }
-
-    if (mLocationDelegate) {
-      [mLocationDelegate release];
-    }
-  }
-
-  LocationDelegate* mLocationDelegate;
-  CLLocationManager* mLocationManager;
-};
-
-NS_IMPL_ISUPPORTS(CoreLocationLocationProvider, nsIGeolocationProvider)
-
-CoreLocationLocationProvider::CoreLocationLocationProvider()
-  : mCLObjects(nullptr), mMLSFallbackProvider(nullptr)
-{
-}
-
-CoreLocationLocationProvider::~CoreLocationLocationProvider()
-{
-}
-
-NS_IMETHODIMP
-CoreLocationLocationProvider::Startup()
-{
-  if (!mCLObjects) {
-    nsAutoPtr<CoreLocationObjects> clObjs(new CoreLocationObjects());
-
-    nsresult rv = clObjs->Init(this);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    mCLObjects = clObjs.forget();
-  }
-
-  // Must be stopped before starting or response (success or failure) is not guaranteed
-  [mCLObjects->mLocationManager stopUpdatingLocation];
-  [mCLObjects->mLocationManager startUpdatingLocation];
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-CoreLocationLocationProvider::Watch(nsIGeolocationUpdate* aCallback)
-{
-  if (mCallback) {
-    return NS_OK;
-  }
-
-  mCallback = aCallback;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-CoreLocationLocationProvider::Shutdown()
-{
-  NS_ENSURE_STATE(mCLObjects);
-
-  [mCLObjects->mLocationManager stopUpdatingLocation];
-
-  delete mCLObjects;
-  mCLObjects = nullptr;
-
-  if (mMLSFallbackProvider) {
-    mMLSFallbackProvider->Shutdown();
-    mMLSFallbackProvider = nullptr;
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-CoreLocationLocationProvider::SetHighAccuracy(bool aEnable)
-{
-  NS_ENSURE_STATE(mCLObjects);
-
-  mCLObjects->mLocationManager.desiredAccuracy =
-    (aEnable ? kHIGH_ACCURACY : kDEFAULT_ACCURACY);
-
-  return NS_OK;
-}
-
-void
-CoreLocationLocationProvider::Update(nsIDOMGeoPosition* aSomewhere)
-{
-  if (aSomewhere && mCallback) {
-    mCallback->Update(aSomewhere);
-  }
-}
-
-void
-CoreLocationLocationProvider::NotifyError(uint16_t aErrorCode)
-{
-  mCallback->NotifyError(aErrorCode);
-}
-
-void
-CoreLocationLocationProvider::CreateMLSFallbackProvider()
-{
-  if (mMLSFallbackProvider) {
-    return;
-  }
-
-  mMLSFallbackProvider = new MLSFallback();
-  mMLSFallbackProvider->Startup(new MLSUpdate(*this));
-}
-
-void
-CoreLocationLocationProvider::CancelMLSFallbackProvider()
-{
-  if (!mMLSFallbackProvider) {
-    return;
-  }
-
-  mMLSFallbackProvider->Shutdown();
-  mMLSFallbackProvider = nullptr;
-}
diff --git a/dom/system/mac/moz.build b/dom/system/mac/moz.build
deleted file mode 100644
index 08b7c2151e..0000000000
--- a/dom/system/mac/moz.build
+++ /dev/null
@@ -1,14 +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/.
-
-SOURCES += ['CoreLocationLocationProvider.mm']
-
-include('/ipc/chromium/chromium-config.mozbuild')
-
-FINAL_LIBRARY = 'xul'
-LOCAL_INCLUDES += [
-    '/dom/geolocation',
-]
-
diff --git a/dom/system/moz.build b/dom/system/moz.build
index bde685e4fc..fb41fd4f2d 100644
--- a/dom/system/moz.build
+++ b/dom/system/moz.build
@@ -7,8 +7,6 @@ toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
 
 if toolkit == 'windows':
     DIRS += ['windows']
-elif toolkit == 'cocoa':
-    DIRS += ['mac']
 elif toolkit == 'android':
     DIRS += ['android']
 elif toolkit in ('gtk2', 'gtk3'):
diff --git a/dom/xbl/builtin/mac/jar.mn b/dom/xbl/builtin/mac/jar.mn
deleted file mode 100644
index 9f05c2dd6c..0000000000
--- a/dom/xbl/builtin/mac/jar.mn
+++ /dev/null
@@ -1,6 +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/.
-
-toolkit.jar:
-* content/global/platformHTMLBindings.xml   (platformHTMLBindings.xml)
diff --git a/dom/xbl/builtin/mac/moz.build b/dom/xbl/builtin/mac/moz.build
deleted file mode 100644
index 635fa39c99..0000000000
--- a/dom/xbl/builtin/mac/moz.build
+++ /dev/null
@@ -1,6 +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_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/dom/xbl/builtin/mac/platformHTMLBindings.xml b/dom/xbl/builtin/mac/platformHTMLBindings.xml
deleted file mode 100644
index b705923999..0000000000
--- a/dom/xbl/builtin/mac/platformHTMLBindings.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.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/. -->
-
-
-<bindings id="htmlBindings"
-   xmlns="http://www.mozilla.org/xbl"
-   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <binding id="inputFields" bindToUntrustedContent="true">
-    <handlers>
-      <handler event="keypress" key="c" modifiers="accel" command="cmd_copy"/>
-      <handler event="keypress" key="x" modifiers="accel" command="cmd_cut"/>
-      <handler event="keypress" key="v" modifiers="accel" command="cmd_paste"/>
-      <handler event="keypress" key="z" modifiers="accel" command="cmd_undo"/>
-      <handler event="keypress" key="z" modifiers="accel,shift" command="cmd_redo"/>
-      <handler event="keypress" key="a" modifiers="accel" command="cmd_selectAll"/>
-    </handlers>
-  </binding>
-
-  <binding id="textAreas" bindToUntrustedContent="true">
-    <handlers>
-      <handler event="keypress" key="c" modifiers="accel" command="cmd_copy"/>
-      <handler event="keypress" key="x" modifiers="accel" command="cmd_cut"/>
-      <handler event="keypress" key="v" modifiers="accel" command="cmd_paste"/>
-      <handler event="keypress" key="z" modifiers="accel" command="cmd_undo"/>
-      <handler event="keypress" key="z" modifiers="accel,shift" command="cmd_redo"/>
-      <handler event="keypress" key="a" modifiers="accel" command="cmd_selectAll"/>
-    </handlers>
-  </binding>
-
-  <binding id="browser">
-    <handlers>
-#include ../browser-base.inc
-      <handler event="keypress" keycode="VK_PAGE_UP" command="cmd_scrollPageUp"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" command="cmd_scrollPageDown"/>
-      <handler event="keypress" keycode="VK_HOME" command="cmd_scrollTop" /> 
-      <handler event="keypress" keycode="VK_END"  command="cmd_scrollBottom" /> 
-
-      <handler event="keypress" keycode="VK_LEFT" modifiers="alt" command="cmd_moveLeft2" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="alt" command="cmd_moveRight2" />
-      <handler event="keypress" keycode="VK_LEFT" modifiers="alt,shift" command="cmd_selectLeft2" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="alt,shift" command="cmd_selectRight2" />
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift" command="cmd_selectLeft" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift" command="cmd_selectRight" />
-      <handler event="keypress" keycode="VK_UP" modifiers="alt,shift" command="cmd_selectUp2" />
-      <handler event="keypress" keycode="VK_DOWN" modifiers="alt,shift" command="cmd_selectDown2" />
-      <handler event="keypress" keycode="VK_UP" modifiers="shift" command="cmd_selectUp" />
-      <handler event="keypress" keycode="VK_DOWN" modifiers="shift" command="cmd_selectDown" />
-      <handler event="keypress" keycode="VK_UP" modifiers="accel" command="cmd_moveUp2"/>
-      <handler event="keypress" keycode="VK_DOWN" modifiers="accel" command="cmd_moveDown2"/>
-    </handlers>
-  </binding>
-
-  <binding id="editor">
-    <handlers>
-      <handler event="keypress" key=" " modifiers="shift" command="cmd_scrollPageUp" />
-      <handler event="keypress" key=" " command="cmd_scrollPageDown" />
-
-      <handler event="keypress" key="z" command="cmd_undo" modifiers="accel"/>
-      <handler event="keypress" key="z" command="cmd_redo" modifiers="accel,shift" />
-      <handler event="keypress" key="x" command="cmd_cut" modifiers="accel"/>
-      <handler event="keypress" key="c" command="cmd_copy" modifiers="accel"/>
-      <handler event="keypress" key="v" command="cmd_paste" modifiers="accel"/>
-      <handler event="keypress" key="v" command="cmd_pasteNoFormatting" modifiers="accel,shift"/>
-      <handler event="keypress" key="a" command="cmd_selectAll" modifiers="accel"/>
-      <handler event="keypress" key="v" command="cmd_pasteNoFormatting" modifiers="accel,alt,shift"/>
-    </handlers>
-  </binding>
-
-</bindings>
diff --git a/dom/xbl/builtin/moz.build b/dom/xbl/builtin/moz.build
index 23e3285d49..c51001b4c9 100644
--- a/dom/xbl/builtin/moz.build
+++ b/dom/xbl/builtin/moz.build
@@ -5,8 +5,6 @@
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     DIRS += ['win']
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    DIRS += ['mac']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     DIRS += ['android']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):

From 3a4e65f1de962b8a1a72d28635c56788c2bf1da6 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Sat, 8 May 2021 21:00:49 +0000
Subject: [PATCH 2/4] Issue #1751 -- Remove cocoa and uikit widget support code

---
 widget/cocoa/ComplexTextInputPanel.h          |   48 -
 widget/cocoa/ComplexTextInputPanel.mm         |  261 -
 widget/cocoa/CustomCocoaEvents.h              |   18 -
 widget/cocoa/GfxInfo.h                        |   95 -
 widget/cocoa/GfxInfo.mm                       |  426 --
 widget/cocoa/NativeKeyBindings.h              |   48 -
 widget/cocoa/NativeKeyBindings.mm             |  292 -
 widget/cocoa/OSXNotificationCenter.h          |   55 -
 widget/cocoa/OSXNotificationCenter.mm         |  589 --
 widget/cocoa/RectTextureImage.h               |   80 -
 widget/cocoa/RectTextureImage.mm              |  171 -
 widget/cocoa/SwipeTracker.h                   |   95 -
 widget/cocoa/SwipeTracker.mm                  |  219 -
 widget/cocoa/TextInputHandler.h               | 1194 ----
 widget/cocoa/TextInputHandler.mm              | 4533 ------------
 widget/cocoa/VibrancyManager.h                |  120 -
 widget/cocoa/VibrancyManager.mm               |  244 -
 widget/cocoa/ViewRegion.h                     |   52 -
 widget/cocoa/ViewRegion.mm                    |   70 -
 widget/cocoa/WidgetTraceEvent.mm              |   85 -
 widget/cocoa/crashtests/373122-1-inner.html   |   39 -
 widget/cocoa/crashtests/373122-1.html         |    9 -
 widget/cocoa/crashtests/397209-1.html         |    7 -
 widget/cocoa/crashtests/403296-1.xhtml        |   10 -
 widget/cocoa/crashtests/419737-1.html         |    8 -
 widget/cocoa/crashtests/435223-1.html         |    8 -
 widget/cocoa/crashtests/444260-1.xul          |    3 -
 widget/cocoa/crashtests/444864-1.html         |    6 -
 widget/cocoa/crashtests/449111-1.html         |    4 -
 widget/cocoa/crashtests/460349-1.xhtml        |    4 -
 widget/cocoa/crashtests/460387-1.html         |    2 -
 widget/cocoa/crashtests/464589-1.html         |   20 -
 widget/cocoa/crashtests/crashtests.list       |   11 -
 widget/cocoa/cursors/arrowN.png               |  Bin 256 -> 0 bytes
 widget/cocoa/cursors/arrowN@2x.png            |  Bin 655 -> 0 bytes
 widget/cocoa/cursors/arrowS.png               |  Bin 256 -> 0 bytes
 widget/cocoa/cursors/arrowS@2x.png            |  Bin 649 -> 0 bytes
 widget/cocoa/cursors/cell.png                 |  Bin 268 -> 0 bytes
 widget/cocoa/cursors/cell@2x.png              |  Bin 647 -> 0 bytes
 widget/cocoa/cursors/colResize.png            |  Bin 321 -> 0 bytes
 widget/cocoa/cursors/colResize@2x.png         |  Bin 836 -> 0 bytes
 widget/cocoa/cursors/help.png                 |  Bin 723 -> 0 bytes
 widget/cocoa/cursors/help@2x.png              |  Bin 1693 -> 0 bytes
 widget/cocoa/cursors/move.png                 |  Bin 284 -> 0 bytes
 widget/cocoa/cursors/move@2x.png              |  Bin 621 -> 0 bytes
 widget/cocoa/cursors/rowResize.png            |  Bin 331 -> 0 bytes
 widget/cocoa/cursors/rowResize@2x.png         |  Bin 852 -> 0 bytes
 widget/cocoa/cursors/sizeNE.png               |  Bin 279 -> 0 bytes
 widget/cocoa/cursors/sizeNE@2x.png            |  Bin 794 -> 0 bytes
 widget/cocoa/cursors/sizeNESW.png             |  Bin 300 -> 0 bytes
 widget/cocoa/cursors/sizeNESW@2x.png          |  Bin 975 -> 0 bytes
 widget/cocoa/cursors/sizeNS.png               |  Bin 282 -> 0 bytes
 widget/cocoa/cursors/sizeNS@2x.png            |  Bin 660 -> 0 bytes
 widget/cocoa/cursors/sizeNW.png               |  Bin 278 -> 0 bytes
 widget/cocoa/cursors/sizeNW@2x.png            |  Bin 790 -> 0 bytes
 widget/cocoa/cursors/sizeNWSE.png             |  Bin 295 -> 0 bytes
 widget/cocoa/cursors/sizeNWSE@2x.png          |  Bin 976 -> 0 bytes
 widget/cocoa/cursors/sizeSE.png               |  Bin 270 -> 0 bytes
 widget/cocoa/cursors/sizeSE@2x.png            |  Bin 802 -> 0 bytes
 widget/cocoa/cursors/sizeSW.png               |  Bin 271 -> 0 bytes
 widget/cocoa/cursors/sizeSW@2x.png            |  Bin 806 -> 0 bytes
 widget/cocoa/cursors/vtIBeam.png              |  Bin 120 -> 0 bytes
 widget/cocoa/cursors/vtIBeam@2x.png           |  Bin 336 -> 0 bytes
 widget/cocoa/cursors/zoomIn.png               |  Bin 655 -> 0 bytes
 widget/cocoa/cursors/zoomIn@2x.png            |  Bin 1717 -> 0 bytes
 widget/cocoa/cursors/zoomOut.png              |  Bin 650 -> 0 bytes
 widget/cocoa/cursors/zoomOut@2x.png           |  Bin 1714 -> 0 bytes
 widget/cocoa/moz.build                        |  140 -
 widget/cocoa/mozView.h                        |   62 -
 widget/cocoa/nsAppShell.h                     |   71 -
 widget/cocoa/nsAppShell.mm                    |  907 ---
 widget/cocoa/nsBidiKeyboard.h                 |   24 -
 widget/cocoa/nsBidiKeyboard.mm                |   42 -
 widget/cocoa/nsChangeObserver.h               |   44 -
 widget/cocoa/nsChildView.h                    |  666 --
 widget/cocoa/nsChildView.mm                   | 6151 -----------------
 widget/cocoa/nsClipboard.h                    |   55 -
 widget/cocoa/nsClipboard.mm                   |  775 ---
 widget/cocoa/nsCocoaDebugUtils.h              |  136 -
 widget/cocoa/nsCocoaDebugUtils.mm             |  284 -
 widget/cocoa/nsCocoaFeatures.h                |   46 -
 widget/cocoa/nsCocoaFeatures.mm               |  209 -
 widget/cocoa/nsCocoaUtils.h                   |  389 --
 widget/cocoa/nsCocoaUtils.mm                  | 1022 ---
 widget/cocoa/nsCocoaWindow.h                  |  426 --
 widget/cocoa/nsCocoaWindow.mm                 | 3881 -----------
 widget/cocoa/nsColorPicker.h                  |   50 -
 widget/cocoa/nsColorPicker.mm                 |  188 -
 widget/cocoa/nsCursorManager.h                |   65 -
 widget/cocoa/nsCursorManager.mm               |  308 -
 widget/cocoa/nsDeviceContextSpecX.h           |   41 -
 widget/cocoa/nsDeviceContextSpecX.mm          |  165 -
 widget/cocoa/nsDragService.h                  |   55 -
 widget/cocoa/nsDragService.mm                 |  669 --
 widget/cocoa/nsFilePicker.h                   |   74 -
 widget/cocoa/nsFilePicker.mm                  |  676 --
 widget/cocoa/nsIdleServiceX.h                 |   33 -
 widget/cocoa/nsIdleServiceX.mm                |   77 -
 widget/cocoa/nsLookAndFeel.h                  |   46 -
 widget/cocoa/nsLookAndFeel.mm                 |  584 --
 widget/cocoa/nsMacCursor.h                    |  105 -
 widget/cocoa/nsMacCursor.mm                   |  382 -
 widget/cocoa/nsMacDockSupport.h               |   41 -
 widget/cocoa/nsMacDockSupport.mm              |  174 -
 widget/cocoa/nsMacWebAppUtils.h               |   22 -
 widget/cocoa/nsMacWebAppUtils.mm              |   82 -
 widget/cocoa/nsMenuBarX.h                     |  128 -
 widget/cocoa/nsMenuBarX.mm                    |  979 ---
 widget/cocoa/nsMenuBaseX.h                    |   79 -
 widget/cocoa/nsMenuGroupOwnerX.h              |   61 -
 widget/cocoa/nsMenuGroupOwnerX.mm             |  261 -
 widget/cocoa/nsMenuItemIconX.h                |   66 -
 widget/cocoa/nsMenuItemIconX.mm               |  466 --
 widget/cocoa/nsMenuItemX.h                    |   75 -
 widget/cocoa/nsMenuItemX.mm                   |  369 -
 widget/cocoa/nsMenuUtilsX.h                   |   31 -
 widget/cocoa/nsMenuUtilsX.mm                  |  223 -
 widget/cocoa/nsMenuX.h                        |  101 -
 widget/cocoa/nsMenuX.mm                       | 1051 ---
 widget/cocoa/nsNativeThemeCocoa.h             |  178 -
 widget/cocoa/nsNativeThemeCocoa.mm            | 3961 -----------
 widget/cocoa/nsNativeThemeColors.h            |   57 -
 widget/cocoa/nsPIWidgetCocoa.idl              |   37 -
 widget/cocoa/nsPrintDialogX.h                 |   68 -
 widget/cocoa/nsPrintDialogX.mm                |  682 --
 widget/cocoa/nsPrintOptionsX.h                |   44 -
 widget/cocoa/nsPrintOptionsX.mm               |  349 -
 widget/cocoa/nsPrintSettingsX.h               |   82 -
 widget/cocoa/nsPrintSettingsX.mm              |  272 -
 widget/cocoa/nsSandboxViolationSink.h         |   36 -
 widget/cocoa/nsSandboxViolationSink.mm        |  115 -
 widget/cocoa/nsScreenCocoa.h                  |   41 -
 widget/cocoa/nsScreenCocoa.mm                 |  147 -
 widget/cocoa/nsScreenManagerCocoa.h           |   33 -
 widget/cocoa/nsScreenManagerCocoa.mm          |  152 -
 widget/cocoa/nsSound.h                        |   27 -
 widget/cocoa/nsSound.mm                       |  108 -
 widget/cocoa/nsStandaloneNativeMenu.h         |   40 -
 widget/cocoa/nsStandaloneNativeMenu.mm        |  213 -
 widget/cocoa/nsSystemStatusBarCocoa.h         |   40 -
 widget/cocoa/nsSystemStatusBarCocoa.mm        |   74 -
 widget/cocoa/nsToolkit.h                      |   53 -
 widget/cocoa/nsToolkit.mm                     |  326 -
 widget/cocoa/nsWidgetFactory.mm               |  219 -
 widget/cocoa/nsWindowMap.h                    |   62 -
 widget/cocoa/nsWindowMap.mm                   |  311 -
 .../cocoa/resources/MainMenu.nib/classes.nib  |    4 -
 widget/cocoa/resources/MainMenu.nib/info.nib  |   21 -
 .../resources/MainMenu.nib/keyedobjects.nib   |  Bin 1877 -> 0 bytes
 widget/moz.build                              |   22 +-
 widget/nsIMacDockSupport.idl                  |   39 -
 widget/nsIMacWebAppUtils.idl                  |   35 -
 widget/nsISystemStatusBar.idl                 |   36 -
 widget/uikit/GfxInfo.cpp                      |  222 -
 widget/uikit/GfxInfo.h                        |   78 -
 widget/uikit/moz.build                        |   18 -
 widget/uikit/nsAppShell.h                     |   57 -
 widget/uikit/nsAppShell.mm                    |  271 -
 widget/uikit/nsLookAndFeel.h                  |   35 -
 widget/uikit/nsLookAndFeel.mm                 |  401 --
 widget/uikit/nsScreenManager.h                |   60 -
 widget/uikit/nsScreenManager.mm               |  146 -
 widget/uikit/nsWidgetFactory.mm               |   71 -
 widget/uikit/nsWindow.h                       |  125 -
 widget/uikit/nsWindow.mm                      |  862 ---
 165 files changed, 4 insertions(+), 42109 deletions(-)
 delete mode 100644 widget/cocoa/ComplexTextInputPanel.h
 delete mode 100644 widget/cocoa/ComplexTextInputPanel.mm
 delete mode 100644 widget/cocoa/CustomCocoaEvents.h
 delete mode 100644 widget/cocoa/GfxInfo.h
 delete mode 100644 widget/cocoa/GfxInfo.mm
 delete mode 100644 widget/cocoa/NativeKeyBindings.h
 delete mode 100644 widget/cocoa/NativeKeyBindings.mm
 delete mode 100644 widget/cocoa/OSXNotificationCenter.h
 delete mode 100644 widget/cocoa/OSXNotificationCenter.mm
 delete mode 100644 widget/cocoa/RectTextureImage.h
 delete mode 100644 widget/cocoa/RectTextureImage.mm
 delete mode 100644 widget/cocoa/SwipeTracker.h
 delete mode 100644 widget/cocoa/SwipeTracker.mm
 delete mode 100644 widget/cocoa/TextInputHandler.h
 delete mode 100644 widget/cocoa/TextInputHandler.mm
 delete mode 100644 widget/cocoa/VibrancyManager.h
 delete mode 100644 widget/cocoa/VibrancyManager.mm
 delete mode 100644 widget/cocoa/ViewRegion.h
 delete mode 100644 widget/cocoa/ViewRegion.mm
 delete mode 100644 widget/cocoa/WidgetTraceEvent.mm
 delete mode 100644 widget/cocoa/crashtests/373122-1-inner.html
 delete mode 100644 widget/cocoa/crashtests/373122-1.html
 delete mode 100644 widget/cocoa/crashtests/397209-1.html
 delete mode 100644 widget/cocoa/crashtests/403296-1.xhtml
 delete mode 100644 widget/cocoa/crashtests/419737-1.html
 delete mode 100644 widget/cocoa/crashtests/435223-1.html
 delete mode 100644 widget/cocoa/crashtests/444260-1.xul
 delete mode 100644 widget/cocoa/crashtests/444864-1.html
 delete mode 100644 widget/cocoa/crashtests/449111-1.html
 delete mode 100644 widget/cocoa/crashtests/460349-1.xhtml
 delete mode 100644 widget/cocoa/crashtests/460387-1.html
 delete mode 100644 widget/cocoa/crashtests/464589-1.html
 delete mode 100644 widget/cocoa/crashtests/crashtests.list
 delete mode 100644 widget/cocoa/cursors/arrowN.png
 delete mode 100644 widget/cocoa/cursors/arrowN@2x.png
 delete mode 100644 widget/cocoa/cursors/arrowS.png
 delete mode 100644 widget/cocoa/cursors/arrowS@2x.png
 delete mode 100644 widget/cocoa/cursors/cell.png
 delete mode 100644 widget/cocoa/cursors/cell@2x.png
 delete mode 100644 widget/cocoa/cursors/colResize.png
 delete mode 100644 widget/cocoa/cursors/colResize@2x.png
 delete mode 100644 widget/cocoa/cursors/help.png
 delete mode 100644 widget/cocoa/cursors/help@2x.png
 delete mode 100644 widget/cocoa/cursors/move.png
 delete mode 100644 widget/cocoa/cursors/move@2x.png
 delete mode 100644 widget/cocoa/cursors/rowResize.png
 delete mode 100644 widget/cocoa/cursors/rowResize@2x.png
 delete mode 100644 widget/cocoa/cursors/sizeNE.png
 delete mode 100644 widget/cocoa/cursors/sizeNE@2x.png
 delete mode 100644 widget/cocoa/cursors/sizeNESW.png
 delete mode 100644 widget/cocoa/cursors/sizeNESW@2x.png
 delete mode 100644 widget/cocoa/cursors/sizeNS.png
 delete mode 100644 widget/cocoa/cursors/sizeNS@2x.png
 delete mode 100644 widget/cocoa/cursors/sizeNW.png
 delete mode 100644 widget/cocoa/cursors/sizeNW@2x.png
 delete mode 100644 widget/cocoa/cursors/sizeNWSE.png
 delete mode 100644 widget/cocoa/cursors/sizeNWSE@2x.png
 delete mode 100644 widget/cocoa/cursors/sizeSE.png
 delete mode 100644 widget/cocoa/cursors/sizeSE@2x.png
 delete mode 100644 widget/cocoa/cursors/sizeSW.png
 delete mode 100644 widget/cocoa/cursors/sizeSW@2x.png
 delete mode 100644 widget/cocoa/cursors/vtIBeam.png
 delete mode 100644 widget/cocoa/cursors/vtIBeam@2x.png
 delete mode 100644 widget/cocoa/cursors/zoomIn.png
 delete mode 100644 widget/cocoa/cursors/zoomIn@2x.png
 delete mode 100644 widget/cocoa/cursors/zoomOut.png
 delete mode 100644 widget/cocoa/cursors/zoomOut@2x.png
 delete mode 100644 widget/cocoa/moz.build
 delete mode 100644 widget/cocoa/mozView.h
 delete mode 100644 widget/cocoa/nsAppShell.h
 delete mode 100644 widget/cocoa/nsAppShell.mm
 delete mode 100644 widget/cocoa/nsBidiKeyboard.h
 delete mode 100644 widget/cocoa/nsBidiKeyboard.mm
 delete mode 100644 widget/cocoa/nsChangeObserver.h
 delete mode 100644 widget/cocoa/nsChildView.h
 delete mode 100644 widget/cocoa/nsChildView.mm
 delete mode 100644 widget/cocoa/nsClipboard.h
 delete mode 100644 widget/cocoa/nsClipboard.mm
 delete mode 100644 widget/cocoa/nsCocoaDebugUtils.h
 delete mode 100644 widget/cocoa/nsCocoaDebugUtils.mm
 delete mode 100644 widget/cocoa/nsCocoaFeatures.h
 delete mode 100644 widget/cocoa/nsCocoaFeatures.mm
 delete mode 100644 widget/cocoa/nsCocoaUtils.h
 delete mode 100644 widget/cocoa/nsCocoaUtils.mm
 delete mode 100644 widget/cocoa/nsCocoaWindow.h
 delete mode 100644 widget/cocoa/nsCocoaWindow.mm
 delete mode 100644 widget/cocoa/nsColorPicker.h
 delete mode 100644 widget/cocoa/nsColorPicker.mm
 delete mode 100644 widget/cocoa/nsCursorManager.h
 delete mode 100644 widget/cocoa/nsCursorManager.mm
 delete mode 100644 widget/cocoa/nsDeviceContextSpecX.h
 delete mode 100644 widget/cocoa/nsDeviceContextSpecX.mm
 delete mode 100644 widget/cocoa/nsDragService.h
 delete mode 100644 widget/cocoa/nsDragService.mm
 delete mode 100644 widget/cocoa/nsFilePicker.h
 delete mode 100644 widget/cocoa/nsFilePicker.mm
 delete mode 100644 widget/cocoa/nsIdleServiceX.h
 delete mode 100644 widget/cocoa/nsIdleServiceX.mm
 delete mode 100644 widget/cocoa/nsLookAndFeel.h
 delete mode 100644 widget/cocoa/nsLookAndFeel.mm
 delete mode 100644 widget/cocoa/nsMacCursor.h
 delete mode 100644 widget/cocoa/nsMacCursor.mm
 delete mode 100644 widget/cocoa/nsMacDockSupport.h
 delete mode 100644 widget/cocoa/nsMacDockSupport.mm
 delete mode 100644 widget/cocoa/nsMacWebAppUtils.h
 delete mode 100644 widget/cocoa/nsMacWebAppUtils.mm
 delete mode 100644 widget/cocoa/nsMenuBarX.h
 delete mode 100644 widget/cocoa/nsMenuBarX.mm
 delete mode 100644 widget/cocoa/nsMenuBaseX.h
 delete mode 100644 widget/cocoa/nsMenuGroupOwnerX.h
 delete mode 100644 widget/cocoa/nsMenuGroupOwnerX.mm
 delete mode 100644 widget/cocoa/nsMenuItemIconX.h
 delete mode 100644 widget/cocoa/nsMenuItemIconX.mm
 delete mode 100644 widget/cocoa/nsMenuItemX.h
 delete mode 100644 widget/cocoa/nsMenuItemX.mm
 delete mode 100644 widget/cocoa/nsMenuUtilsX.h
 delete mode 100644 widget/cocoa/nsMenuUtilsX.mm
 delete mode 100644 widget/cocoa/nsMenuX.h
 delete mode 100644 widget/cocoa/nsMenuX.mm
 delete mode 100644 widget/cocoa/nsNativeThemeCocoa.h
 delete mode 100644 widget/cocoa/nsNativeThemeCocoa.mm
 delete mode 100644 widget/cocoa/nsNativeThemeColors.h
 delete mode 100644 widget/cocoa/nsPIWidgetCocoa.idl
 delete mode 100644 widget/cocoa/nsPrintDialogX.h
 delete mode 100644 widget/cocoa/nsPrintDialogX.mm
 delete mode 100644 widget/cocoa/nsPrintOptionsX.h
 delete mode 100644 widget/cocoa/nsPrintOptionsX.mm
 delete mode 100644 widget/cocoa/nsPrintSettingsX.h
 delete mode 100644 widget/cocoa/nsPrintSettingsX.mm
 delete mode 100644 widget/cocoa/nsSandboxViolationSink.h
 delete mode 100644 widget/cocoa/nsSandboxViolationSink.mm
 delete mode 100644 widget/cocoa/nsScreenCocoa.h
 delete mode 100644 widget/cocoa/nsScreenCocoa.mm
 delete mode 100644 widget/cocoa/nsScreenManagerCocoa.h
 delete mode 100644 widget/cocoa/nsScreenManagerCocoa.mm
 delete mode 100644 widget/cocoa/nsSound.h
 delete mode 100644 widget/cocoa/nsSound.mm
 delete mode 100644 widget/cocoa/nsStandaloneNativeMenu.h
 delete mode 100644 widget/cocoa/nsStandaloneNativeMenu.mm
 delete mode 100644 widget/cocoa/nsSystemStatusBarCocoa.h
 delete mode 100644 widget/cocoa/nsSystemStatusBarCocoa.mm
 delete mode 100644 widget/cocoa/nsToolkit.h
 delete mode 100644 widget/cocoa/nsToolkit.mm
 delete mode 100644 widget/cocoa/nsWidgetFactory.mm
 delete mode 100644 widget/cocoa/nsWindowMap.h
 delete mode 100644 widget/cocoa/nsWindowMap.mm
 delete mode 100644 widget/cocoa/resources/MainMenu.nib/classes.nib
 delete mode 100644 widget/cocoa/resources/MainMenu.nib/info.nib
 delete mode 100644 widget/cocoa/resources/MainMenu.nib/keyedobjects.nib
 delete mode 100644 widget/nsIMacDockSupport.idl
 delete mode 100644 widget/nsIMacWebAppUtils.idl
 delete mode 100644 widget/nsISystemStatusBar.idl
 delete mode 100644 widget/uikit/GfxInfo.cpp
 delete mode 100644 widget/uikit/GfxInfo.h
 delete mode 100644 widget/uikit/moz.build
 delete mode 100644 widget/uikit/nsAppShell.h
 delete mode 100644 widget/uikit/nsAppShell.mm
 delete mode 100644 widget/uikit/nsLookAndFeel.h
 delete mode 100644 widget/uikit/nsLookAndFeel.mm
 delete mode 100644 widget/uikit/nsScreenManager.h
 delete mode 100644 widget/uikit/nsScreenManager.mm
 delete mode 100644 widget/uikit/nsWidgetFactory.mm
 delete mode 100644 widget/uikit/nsWindow.h
 delete mode 100644 widget/uikit/nsWindow.mm

diff --git a/widget/cocoa/ComplexTextInputPanel.h b/widget/cocoa/ComplexTextInputPanel.h
deleted file mode 100644
index 648e6d9114..0000000000
--- a/widget/cocoa/ComplexTextInputPanel.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2009 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Modified by Josh Aas of Mozilla Corporation.
- */
-
-#ifndef ComplexTextInputPanel_h_
-#define ComplexTextInputPanel_h_
-
-#include "nsString.h"
-#include "npapi.h"
-
-class ComplexTextInputPanel
-{
-public:
-  static ComplexTextInputPanel* GetSharedComplexTextInputPanel();
-  virtual void PlacePanel(int32_t x, int32_t y) = 0; // Bottom left coordinate of plugin in screen coords
-  virtual void InterpretKeyEvent(void* aEvent, nsAString& aOutText) = 0;
-  virtual bool IsInComposition() = 0;
-  virtual void* GetInputContext() = 0;
-  virtual void CancelComposition() = 0;
-
-protected:
-  virtual ~ComplexTextInputPanel() {};
-};
-
-#endif // ComplexTextInputPanel_h_
diff --git a/widget/cocoa/ComplexTextInputPanel.mm b/widget/cocoa/ComplexTextInputPanel.mm
deleted file mode 100644
index a4b58955e2..0000000000
--- a/widget/cocoa/ComplexTextInputPanel.mm
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * Copyright (C) 2009 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- *
- * Modified by Josh Aas of Mozilla Corporation.
- */
-
-#import "ComplexTextInputPanel.h"
-
-#import <Cocoa/Cocoa.h>
-
-#include <algorithm>
-#include "mozilla/Preferences.h"
-#include "nsChildView.h"
-
-using namespace mozilla;
-
-extern "C" OSStatus TSMProcessRawKeyEvent(EventRef anEvent);
-
-#define kInputWindowHeight 20
-
-@interface ComplexTextInputPanelImpl : NSPanel {
-  NSTextView *mInputTextView;
-}
-
-+ (ComplexTextInputPanelImpl*)sharedComplexTextInputPanelImpl;
-
-- (NSTextInputContext*)inputContext;
-- (void)interpretKeyEvent:(NSEvent*)event string:(NSString**)string;
-- (void)cancelComposition;
-- (BOOL)inComposition;
-
-// This places the text input panel fully onscreen and below the lower left
-// corner of the focused plugin.
-- (void)adjustTo:(NSPoint)point;
-
-@end
-
-@implementation ComplexTextInputPanelImpl
-
-+ (ComplexTextInputPanelImpl*)sharedComplexTextInputPanelImpl
-{
-  static ComplexTextInputPanelImpl *sComplexTextInputPanelImpl;
-  if (!sComplexTextInputPanelImpl)
-    sComplexTextInputPanelImpl = [[ComplexTextInputPanelImpl alloc] init];
-  return sComplexTextInputPanelImpl;
-}
-
-- (id)init
-{
-  // In the original Apple code the style mask is given by a function which is not open source.
-  // What could possibly be worth hiding in that function, I do not know.
-  // Courtesy of gdb: stylemask: 011000011111, 0x61f
-  self = [super initWithContentRect:NSZeroRect styleMask:0x61f backing:NSBackingStoreBuffered defer:YES];
-  if (!self)
-    return nil;
-
-  // Set the frame size.
-  NSRect visibleFrame = [[NSScreen mainScreen] visibleFrame];
-  NSRect frame = NSMakeRect(visibleFrame.origin.x, visibleFrame.origin.y, visibleFrame.size.width, kInputWindowHeight);
-
-  [self setFrame:frame display:NO];
-
-  mInputTextView = [[NSTextView alloc] initWithFrame:[self.contentView frame]];        
-  mInputTextView.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable | NSViewMaxXMargin | NSViewMinXMargin | NSViewMaxYMargin | NSViewMinYMargin;
-
-  NSScrollView* scrollView = [[NSScrollView alloc] initWithFrame:[self.contentView frame]];
-  scrollView.documentView = mInputTextView;
-  self.contentView = scrollView;
-  [scrollView release];
-
-  [self setFloatingPanel:YES];
-
-  [[NSNotificationCenter defaultCenter] addObserver:self
-                                           selector:@selector(keyboardInputSourceChanged:)
-                                               name:NSTextInputContextKeyboardSelectionDidChangeNotification
-                                             object:nil];
-
-  return self;
-}
-
-- (void)dealloc
-{
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
-  
-  [mInputTextView release];
-  
-  [super dealloc];
-}
-
-- (void)keyboardInputSourceChanged:(NSNotification *)notification
-{
-  static int8_t sDoCancel = -1;
-  if (!sDoCancel || ![self inComposition]) {
-    return;
-  }
-  if (sDoCancel < 0) {
-    bool cancelComposition = false;
-    static const char* kPrefName =
-      "ui.plugin.cancel_composition_at_input_source_changed";
-    nsresult rv = Preferences::GetBool(kPrefName, &cancelComposition);
-    NS_ENSURE_SUCCESS(rv, );
-    sDoCancel = cancelComposition ? 1 : 0;
-  }
-  if (sDoCancel) {
-    [self cancelComposition];
-  }
-}
-
-- (void)interpretKeyEvent:(NSEvent*)event string:(NSString**)string
-{
-  *string = nil;
-
-  if (![[mInputTextView inputContext] handleEvent:event]) {
-    return;
-  }
-
-  if ([mInputTextView hasMarkedText]) {
-    // Don't show the input method window for dead keys
-    if ([[event characters] length] > 0) {
-      [self orderFront:nil];
-    }
-    return;
-  } else {
-    [self orderOut:nil];
-
-    NSString *text = [[mInputTextView textStorage] string];
-    if ([text length] > 0) {
-      *string = [[text copy] autorelease];
-    }
-  }
-
-  [mInputTextView setString:@""];
-}
-
-- (NSTextInputContext*)inputContext
-{
-  return [mInputTextView inputContext];
-}
-
-- (void)cancelComposition
-{
-  [mInputTextView setString:@""];
-  [self orderOut:nil];
-}
-
-- (BOOL)inComposition
-{
-  return [mInputTextView hasMarkedText];
-}
-
-- (void)adjustTo:(NSPoint)point
-{
-  NSRect selfRect = [self frame];
-  NSRect rect = NSMakeRect(point.x,
-                           point.y - selfRect.size.height,
-                           500,
-                           selfRect.size.height);
-
-  // Adjust to screen.
-  NSRect screenRect = [[NSScreen mainScreen] visibleFrame];
-  if (rect.origin.x < screenRect.origin.x) {
-    rect.origin.x = screenRect.origin.x;
-  }
-  if (rect.origin.y < screenRect.origin.y) {
-    rect.origin.y = screenRect.origin.y;
-  }
-  CGFloat xMostOfScreen = screenRect.origin.x + screenRect.size.width;
-  CGFloat yMostOfScreen = screenRect.origin.y + screenRect.size.height;
-  CGFloat xMost = rect.origin.x + rect.size.width;
-  CGFloat yMost = rect.origin.y + rect.size.height;
-  if (xMostOfScreen < xMost) {
-    rect.origin.x -= xMost - xMostOfScreen;
-  }
-  if (yMostOfScreen < yMost) {
-    rect.origin.y -= yMost - yMostOfScreen;
-  }
-
-  [self setFrame:rect display:[self isVisible]];
-}
-
-@end
-
-class ComplexTextInputPanelPrivate : public ComplexTextInputPanel
-{
-public:
-  ComplexTextInputPanelPrivate();
-
-  virtual void InterpretKeyEvent(void* aEvent, nsAString& aOutText);
-  virtual bool IsInComposition();
-  virtual void PlacePanel(int32_t x, int32_t y);
-  virtual void* GetInputContext() { return [mPanel inputContext]; }
-  virtual void CancelComposition() { [mPanel cancelComposition]; }
-
-private:
-  ~ComplexTextInputPanelPrivate();
-  ComplexTextInputPanelImpl* mPanel;
-};
-
-ComplexTextInputPanelPrivate::ComplexTextInputPanelPrivate()
-{
-  mPanel = [[ComplexTextInputPanelImpl alloc] init];
-}
-
-ComplexTextInputPanelPrivate::~ComplexTextInputPanelPrivate()
-{
-  [mPanel release];
-}
-
-ComplexTextInputPanel*
-ComplexTextInputPanel::GetSharedComplexTextInputPanel()
-{
-  static ComplexTextInputPanelPrivate *sComplexTextInputPanelPrivate;
-  if (!sComplexTextInputPanelPrivate) {
-    sComplexTextInputPanelPrivate = new ComplexTextInputPanelPrivate();
-  }
-  return sComplexTextInputPanelPrivate;
-}
-
-void
-ComplexTextInputPanelPrivate::InterpretKeyEvent(void* aEvent, nsAString& aOutText)
-{
-  NSString* textString = nil;
-  [mPanel interpretKeyEvent:(NSEvent*)aEvent string:&textString];
-
-  if (textString) {
-    nsCocoaUtils::GetStringForNSString(textString, aOutText);
-  }
-}
-
-bool
-ComplexTextInputPanelPrivate::IsInComposition()
-{
-  return !![mPanel inComposition];
-}
-
-void
-ComplexTextInputPanelPrivate::PlacePanel(int32_t x, int32_t y)
-{
-  [mPanel adjustTo:NSMakePoint(x, y)];
-}
diff --git a/widget/cocoa/CustomCocoaEvents.h b/widget/cocoa/CustomCocoaEvents.h
deleted file mode 100644
index 0043f0d695..0000000000
--- a/widget/cocoa/CustomCocoaEvents.h
+++ /dev/null
@@ -1,18 +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/. */
-
-/*
- * This file defines constants to be used in the "subtype" field of
- * NSApplicationDefined type NSEvents.
- */
-
-#ifndef WIDGET_COCOA_CUSTOMCOCOAEVENTS_H_
-#define WIDGET_COCOA_CUSTOMCOCOAEVENTS_H_
-
-// Empty event, just used for prodding the event loop into responding.
-const short kEventSubtypeNone = 0;
-// Tracer event, used for timing the event loop responsiveness.
-const short kEventSubtypeTrace = 1;
-
-#endif /* WIDGET_COCOA_CUSTOMCOCOAEVENTS_H_ */
diff --git a/widget/cocoa/GfxInfo.h b/widget/cocoa/GfxInfo.h
deleted file mode 100644
index 05bdad158b..0000000000
--- a/widget/cocoa/GfxInfo.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* vim: se cin sw=2 ts=2 et : */
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef __mozilla_widget_GfxInfo_h__
-#define __mozilla_widget_GfxInfo_h__
-
-#include "GfxInfoBase.h"
-
-#include "nsString.h"
-
-namespace mozilla {
-namespace widget {
-
-class GfxInfo : public GfxInfoBase
-{
-public:
-
-  GfxInfo();
-  // We only declare the subset of nsIGfxInfo that we actually implement. The
-  // rest is brought forward from GfxInfoBase.
-  NS_IMETHOD GetD2DEnabled(bool *aD2DEnabled) override;
-  NS_IMETHOD GetDWriteEnabled(bool *aDWriteEnabled) override;
-  NS_IMETHOD GetDWriteVersion(nsAString & aDwriteVersion) override;
-  NS_IMETHOD GetCleartypeParameters(nsAString & aCleartypeParams) override;
-  NS_IMETHOD GetAdapterDescription(nsAString & aAdapterDescription) override;
-  NS_IMETHOD GetAdapterDriver(nsAString & aAdapterDriver) override;
-  NS_IMETHOD GetAdapterVendorID(nsAString & aAdapterVendorID) override;
-  NS_IMETHOD GetAdapterDeviceID(nsAString & aAdapterDeviceID) override;
-  NS_IMETHOD GetAdapterSubsysID(nsAString & aAdapterSubsysID) override;
-  NS_IMETHOD GetAdapterRAM(nsAString & aAdapterRAM) override;
-  NS_IMETHOD GetAdapterDriverVersion(nsAString & aAdapterDriverVersion) override;
-  NS_IMETHOD GetAdapterDriverDate(nsAString & aAdapterDriverDate) override;
-  NS_IMETHOD GetAdapterDescription2(nsAString & aAdapterDescription) override;
-  NS_IMETHOD GetAdapterDriver2(nsAString & aAdapterDriver) override;
-  NS_IMETHOD GetAdapterVendorID2(nsAString & aAdapterVendorID) override;
-  NS_IMETHOD GetAdapterDeviceID2(nsAString & aAdapterDeviceID) override;
-  NS_IMETHOD GetAdapterSubsysID2(nsAString & aAdapterSubsysID) override;
-  NS_IMETHOD GetAdapterRAM2(nsAString & aAdapterRAM) override;
-  NS_IMETHOD GetAdapterDriverVersion2(nsAString & aAdapterDriverVersion) override;
-  NS_IMETHOD GetAdapterDriverDate2(nsAString & aAdapterDriverDate) override;
-  NS_IMETHOD GetIsGPU2Active(bool *aIsGPU2Active) override;
-
-  using GfxInfoBase::GetFeatureStatus;
-  using GfxInfoBase::GetFeatureSuggestedDriverVersion;
-  using GfxInfoBase::GetWebGLParameter;
-
-  virtual nsresult Init() override;
-
-#ifdef DEBUG
-  NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_NSIGFXINFODEBUG
-#endif
-
-  virtual uint32_t OperatingSystemVersion() override { return mOSXVersion; }
-
-  nsresult FindMonitors(JSContext* cx, JS::HandleObject array) override;
-
-protected:
-
-  virtual ~GfxInfo() {}
-
-  virtual nsresult GetFeatureStatusImpl(int32_t aFeature,
-                                        int32_t *aStatus,
-                                        nsAString & aSuggestedDriverVersion,
-                                        const nsTArray<GfxDriverInfo>& aDriverInfo,
-                                        nsACString &aFailureId,
-                                        OperatingSystem* aOS = nullptr) override;
-  virtual const nsTArray<GfxDriverInfo>& GetGfxDriverInfo() override;
-
-private:
-
-  void GetDeviceInfo();
-  void GetSelectedCityInfo();
-  void AddCrashReportAnnotations();
-
-  nsString mAdapterRAMString;
-  nsString mDeviceID;
-  nsString mDriverVersion;
-  nsString mDriverDate;
-  nsString mDeviceKey;
-
-  nsString mAdapterVendorID;
-  nsString mAdapterDeviceID;
-
-  uint32_t mOSXVersion;
-};
-
-} // namespace widget
-} // namespace mozilla
-
-#endif /* __mozilla_widget_GfxInfo_h__ */
diff --git a/widget/cocoa/GfxInfo.mm b/widget/cocoa/GfxInfo.mm
deleted file mode 100644
index 97bb4c8324..0000000000
--- a/widget/cocoa/GfxInfo.mm
+++ /dev/null
@@ -1,426 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include <OpenGL/OpenGL.h>
-#include <OpenGL/CGLRenderers.h>
-
-#include "mozilla/ArrayUtils.h"
-
-#include "GfxInfo.h"
-#include "nsUnicharUtils.h"
-#include "nsCocoaFeatures.h"
-#include "mozilla/Preferences.h"
-#include <algorithm>
-
-#import <Foundation/Foundation.h>
-#import <IOKit/IOKitLib.h>
-#import <Cocoa/Cocoa.h>
-
-using namespace mozilla;
-using namespace mozilla::widget;
-
-#ifdef DEBUG
-NS_IMPL_ISUPPORTS_INHERITED(GfxInfo, GfxInfoBase, nsIGfxInfoDebug)
-#endif
-
-GfxInfo::GfxInfo()
-{
-}
-
-static OperatingSystem
-OSXVersionToOperatingSystem(uint32_t aOSXVersion) {
-  switch (nsCocoaFeatures::ExtractMajorVersion(aOSXVersion)) {
-    case 10:
-      switch (nsCocoaFeatures::ExtractMinorVersion(aOSXVersion)) {
-        case 6:
-          return OperatingSystem::OSX10_6;
-        case 7:
-          return OperatingSystem::OSX10_7;
-        case 8:
-          return OperatingSystem::OSX10_8;
-        case 9:
-          return OperatingSystem::OSX10_9;
-        case 10:
-          return OperatingSystem::OSX10_10;
-        case 11:
-          return OperatingSystem::OSX10_11;
-        case 12:
-          return OperatingSystem::OSX10_12;
-        case 13:
-          return OperatingSystem::OSX10_13;
-        case 14:
-          return OperatingSystem::OSX10_14;
-        case 15:
-          return OperatingSystem::OSX10_15;
-        case 16:
-          // Depending on the SDK version, we either get 10.16 or 11.0.
-          // Normalize this to 11.0.
-          return OperatingSystem::OSX11_0;
-        default:
-          break;
-      }
-      break;
-    case 11:
-      switch (nsCocoaFeatures::ExtractMinorVersion(aOSXVersion)) {
-        case 0:
-          return OperatingSystem::OSX11_0;
-        default:
-          break;
-      }
-      break;
-  }
-
-  return OperatingSystem::Unknown;
-}
-// The following three functions are derived from Chromium code
-static CFTypeRef SearchPortForProperty(io_registry_entry_t dspPort,
-                                       CFStringRef propertyName)
-{
-  return IORegistryEntrySearchCFProperty(dspPort,
-                                         kIOServicePlane,
-                                         propertyName,
-                                         kCFAllocatorDefault,
-                                         kIORegistryIterateRecursively |
-                                         kIORegistryIterateParents);
-}
-
-static uint32_t IntValueOfCFData(CFDataRef d)
-{
-  uint32_t value = 0;
-
-  if (d) {
-    const uint32_t *vp = reinterpret_cast<const uint32_t*>(CFDataGetBytePtr(d));
-    if (vp != NULL)
-      value = *vp;
-  }
-
-  return value;
-}
-
-void
-GfxInfo::GetDeviceInfo()
-{
-  io_registry_entry_t dsp_port = CGDisplayIOServicePort(kCGDirectMainDisplay);
-  CFTypeRef vendor_id_ref = SearchPortForProperty(dsp_port, CFSTR("vendor-id"));
-  if (vendor_id_ref) {
-    mAdapterVendorID.AppendPrintf("0x%04x", IntValueOfCFData((CFDataRef)vendor_id_ref));
-    CFRelease(vendor_id_ref);
-  }
-  CFTypeRef device_id_ref = SearchPortForProperty(dsp_port, CFSTR("device-id"));
-  if (device_id_ref) {
-    mAdapterDeviceID.AppendPrintf("0x%04x", IntValueOfCFData((CFDataRef)device_id_ref));
-    CFRelease(device_id_ref);
-  }
-}
-
-nsresult
-GfxInfo::Init()
-{
-  nsresult rv = GfxInfoBase::Init();
-
-  // Calling CGLQueryRendererInfo causes us to switch to the discrete GPU
-  // even when we don't want to. We'll avoid doing so for now and just
-  // use the device ids.
-
-  GetDeviceInfo();
-
-  AddCrashReportAnnotations();
-
-  mOSXVersion = nsCocoaFeatures::macOSVersion();
-
-  return rv;
-}
-
-NS_IMETHODIMP
-GfxInfo::GetD2DEnabled(bool *aEnabled)
-{
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-GfxInfo::GetDWriteEnabled(bool *aEnabled)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* readonly attribute DOMString DWriteVersion; */
-NS_IMETHODIMP
-GfxInfo::GetDWriteVersion(nsAString & aDwriteVersion)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* readonly attribute DOMString cleartypeParameters; */
-NS_IMETHODIMP
-GfxInfo::GetCleartypeParameters(nsAString & aCleartypeParams)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* readonly attribute DOMString adapterDescription; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterDescription(nsAString & aAdapterDescription)
-{
-  aAdapterDescription.AssignLiteral("");
-  return NS_OK;
-}
-
-/* readonly attribute DOMString adapterDescription2; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterDescription2(nsAString & aAdapterDescription)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* readonly attribute DOMString adapterRAM; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterRAM(nsAString & aAdapterRAM)
-{
-  aAdapterRAM = mAdapterRAMString;
-  return NS_OK;
-}
-
-/* readonly attribute DOMString adapterRAM2; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterRAM2(nsAString & aAdapterRAM)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* readonly attribute DOMString adapterDriver; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterDriver(nsAString & aAdapterDriver)
-{
-  aAdapterDriver.AssignLiteral("");
-  return NS_OK;
-}
-
-/* readonly attribute DOMString adapterDriver2; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterDriver2(nsAString & aAdapterDriver)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* readonly attribute DOMString adapterDriverVersion; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterDriverVersion(nsAString & aAdapterDriverVersion)
-{
-  aAdapterDriverVersion.AssignLiteral("");
-  return NS_OK;
-}
-
-/* readonly attribute DOMString adapterDriverVersion2; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterDriverVersion2(nsAString & aAdapterDriverVersion)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* readonly attribute DOMString adapterDriverDate; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterDriverDate(nsAString & aAdapterDriverDate)
-{
-  aAdapterDriverDate.AssignLiteral("");
-  return NS_OK;
-}
-
-/* readonly attribute DOMString adapterDriverDate2; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterDriverDate2(nsAString & aAdapterDriverDate)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* readonly attribute DOMString adapterVendorID; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterVendorID(nsAString & aAdapterVendorID)
-{
-  aAdapterVendorID = mAdapterVendorID;
-  return NS_OK;
-}
-
-/* readonly attribute DOMString adapterVendorID2; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterVendorID2(nsAString & aAdapterVendorID)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* readonly attribute DOMString adapterDeviceID; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterDeviceID(nsAString & aAdapterDeviceID)
-{
-  aAdapterDeviceID = mAdapterDeviceID;
-  return NS_OK;
-}
-
-/* readonly attribute DOMString adapterDeviceID2; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterDeviceID2(nsAString & aAdapterDeviceID)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* readonly attribute DOMString adapterSubsysID; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterSubsysID(nsAString & aAdapterSubsysID)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* readonly attribute DOMString adapterSubsysID2; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterSubsysID2(nsAString & aAdapterSubsysID)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* readonly attribute boolean isGPU2Active; */
-NS_IMETHODIMP
-GfxInfo::GetIsGPU2Active(bool* aIsGPU2Active)
-{
-  return NS_ERROR_FAILURE;
-}
-
-void
-GfxInfo::AddCrashReportAnnotations()
-{
-  /*** STUB ***/
-}
-
-// We don't support checking driver versions on Mac.
-#define IMPLEMENT_MAC_DRIVER_BLOCKLIST(os, vendor, device, features, blockOn, ruleId) \
-  APPEND_TO_DRIVER_BLOCKLIST(os, vendor, device, features, blockOn,           \
-                             DRIVER_COMPARISON_IGNORED, V(0,0,0,0), ruleId, "")
-
-
-const nsTArray<GfxDriverInfo>&
-GfxInfo::GetGfxDriverInfo()
-{
-  if (!mDriverInfo->Length()) {
-    IMPLEMENT_MAC_DRIVER_BLOCKLIST(OperatingSystem::OSX,
-      (nsAString&) GfxDriverInfo::GetDeviceVendor(VendorATI), GfxDriverInfo::allDevices,
-      nsIGfxInfo::FEATURE_WEBGL_MSAA, nsIGfxInfo::FEATURE_BLOCKED_OS_VERSION, "FEATURE_FAILURE_MAC_ATI_NO_MSAA");
-    IMPLEMENT_MAC_DRIVER_BLOCKLIST(OperatingSystem::OSX,
-      (nsAString&) GfxDriverInfo::GetDeviceVendor(VendorATI), (GfxDeviceFamily*) GfxDriverInfo::GetDeviceFamily(RadeonX1000),
-      nsIGfxInfo::FEATURE_OPENGL_LAYERS, nsIGfxInfo::FEATURE_BLOCKED_DEVICE, "FEATURE_FAILURE_MAC_RADEONX1000_NO_TEXTURE2D");
-    IMPLEMENT_MAC_DRIVER_BLOCKLIST(OperatingSystem::OSX,
-      (nsAString&) GfxDriverInfo::GetDeviceVendor(VendorNVIDIA), (GfxDeviceFamily*) GfxDriverInfo::GetDeviceFamily(Geforce7300GT),
-      nsIGfxInfo::FEATURE_WEBGL_OPENGL, nsIGfxInfo::FEATURE_BLOCKED_DEVICE, "FEATURE_FAILURE_MAC_7300_NO_WEBGL");
-  }
-  return *mDriverInfo;
-}
-
-nsresult
-GfxInfo::GetFeatureStatusImpl(int32_t aFeature,
-                              int32_t* aStatus,
-                              nsAString& aSuggestedDriverVersion,
-                              const nsTArray<GfxDriverInfo>& aDriverInfo,
-                              nsACString& aFailureId,
-                              OperatingSystem* aOS /* = nullptr */)
-{
-  NS_ENSURE_ARG_POINTER(aStatus);
-  aSuggestedDriverVersion.SetIsVoid(true);
-  *aStatus = nsIGfxInfo::FEATURE_STATUS_UNKNOWN;
-  OperatingSystem os = OSXVersionToOperatingSystem(mOSXVersion);
-  if (aOS)
-    *aOS = os;
-
-  if (mShutdownOccurred) {
-    return NS_OK;
-  }
-
-  // Don't evaluate special cases when we're evaluating the downloaded blocklist.
-  if (!aDriverInfo.Length()) {
-    if (aFeature == nsIGfxInfo::FEATURE_WEBGL_MSAA) {
-      // Blacklist all ATI cards on OSX, except for
-      // 0x6760 and 0x9488
-      if (mAdapterVendorID.Equals(GfxDriverInfo::GetDeviceVendor(VendorATI), nsCaseInsensitiveStringComparator()) &&
-          (mAdapterDeviceID.LowerCaseEqualsLiteral("0x6760") ||
-           mAdapterDeviceID.LowerCaseEqualsLiteral("0x9488"))) {
-        *aStatus = nsIGfxInfo::FEATURE_STATUS_OK;
-        return NS_OK;
-      }
-    } else if (aFeature == nsIGfxInfo::FEATURE_CANVAS2D_ACCELERATION) {
-      // See bug 1249659
-      switch(os) {
-        case OperatingSystem::OSX10_5:
-        case OperatingSystem::OSX10_6:
-        case OperatingSystem::OSX10_7:
-          *aStatus = nsIGfxInfo::FEATURE_BLOCKED_OS_VERSION;
-          aFailureId = "FEATURE_FAILURE_CANVAS_OSX_VERSION";
-          break;
-        default:
-          *aStatus = nsIGfxInfo::FEATURE_STATUS_OK;
-          break;
-      }
-      return NS_OK;
-    }
-  }
-
-  return GfxInfoBase::GetFeatureStatusImpl(aFeature, aStatus, aSuggestedDriverVersion, aDriverInfo, aFailureId, &os);
-}
-
-nsresult
-GfxInfo::FindMonitors(JSContext* aCx, JS::HandleObject aOutArray)
-{
-  // Getting the refresh rate is a little hard on OS X. We could use
-  // CVDisplayLinkGetNominalOutputVideoRefreshPeriod, but that's a little
-  // involved. Ideally we could query it from vsync. For now, we leave it out.
-  int32_t deviceCount = 0;
-  for (NSScreen* screen in [NSScreen screens]) {
-    NSRect rect = [screen frame];
-
-    JS::Rooted<JSObject*> obj(aCx, JS_NewPlainObject(aCx));
-
-    JS::Rooted<JS::Value> screenWidth(aCx, JS::Int32Value((int)rect.size.width));
-    JS_SetProperty(aCx, obj, "screenWidth", screenWidth);
-
-    JS::Rooted<JS::Value> screenHeight(aCx, JS::Int32Value((int)rect.size.height));
-    JS_SetProperty(aCx, obj, "screenHeight", screenHeight);
-
-    JS::Rooted<JS::Value> scale(aCx, JS::NumberValue(nsCocoaUtils::GetBackingScaleFactor(screen)));
-    JS_SetProperty(aCx, obj, "scale", scale);
-
-    JS::Rooted<JS::Value> element(aCx, JS::ObjectValue(*obj));
-    JS_SetElement(aCx, aOutArray, deviceCount++, element);
-  }
-  return NS_OK;
-}
-
-#ifdef DEBUG
-
-// Implement nsIGfxInfoDebug
-
-/* void spoofVendorID (in DOMString aVendorID); */
-NS_IMETHODIMP GfxInfo::SpoofVendorID(const nsAString & aVendorID)
-{
-  mAdapterVendorID = aVendorID;
-  return NS_OK;
-}
-
-/* void spoofDeviceID (in unsigned long aDeviceID); */
-NS_IMETHODIMP GfxInfo::SpoofDeviceID(const nsAString & aDeviceID)
-{
-  mAdapterDeviceID = aDeviceID;
-  return NS_OK;
-}
-
-/* void spoofDriverVersion (in DOMString aDriverVersion); */
-NS_IMETHODIMP GfxInfo::SpoofDriverVersion(const nsAString & aDriverVersion)
-{
-  mDriverVersion = aDriverVersion;
-  return NS_OK;
-}
-
-/* void spoofOSVersion (in unsigned long aVersion); */
-NS_IMETHODIMP GfxInfo::SpoofOSVersion(uint32_t aVersion)
-{
-  mOSXVersion = aVersion;
-  return NS_OK;
-}
-
-#endif
diff --git a/widget/cocoa/NativeKeyBindings.h b/widget/cocoa/NativeKeyBindings.h
deleted file mode 100644
index d1ba2c3701..0000000000
--- a/widget/cocoa/NativeKeyBindings.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef mozilla_widget_NativeKeyBindings_h_
-#define mozilla_widget_NativeKeyBindings_h_
-
-#import <Cocoa/Cocoa.h>
-#include "mozilla/Attributes.h"
-#include "mozilla/EventForwards.h"
-#include "nsDataHashtable.h"
-#include "nsIWidget.h"
-
-namespace mozilla {
-namespace widget {
-
-typedef nsDataHashtable<nsPtrHashKey<struct objc_selector>, CommandInt>
-  SelectorCommandHashtable;
-
-class NativeKeyBindings final
-{
-  typedef nsIWidget::NativeKeyBindingsType NativeKeyBindingsType;
-  typedef nsIWidget::DoCommandCallback DoCommandCallback;
-
-public:
-  static NativeKeyBindings* GetInstance(NativeKeyBindingsType aType);
-  static void Shutdown();
-
-  void Init(NativeKeyBindingsType aType);
-
-  bool Execute(const WidgetKeyboardEvent& aEvent,
-               DoCommandCallback aCallback,
-               void* aCallbackData);
-
-private:
-  NativeKeyBindings();
-
-  SelectorCommandHashtable mSelectorToCommand;
-
-  static NativeKeyBindings* sInstanceForSingleLineEditor;
-  static NativeKeyBindings* sInstanceForMultiLineEditor;
-}; // NativeKeyBindings
-
-} // namespace widget
-} // namespace mozilla
-
-#endif // mozilla_widget_NativeKeyBindings_h_
diff --git a/widget/cocoa/NativeKeyBindings.mm b/widget/cocoa/NativeKeyBindings.mm
deleted file mode 100644
index 2f4ecadff0..0000000000
--- a/widget/cocoa/NativeKeyBindings.mm
+++ /dev/null
@@ -1,292 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "NativeKeyBindings.h"
-
-#include "nsTArray.h"
-#include "nsCocoaUtils.h"
-#include "mozilla/Logging.h"
-#include "mozilla/TextEvents.h"
-
-namespace mozilla {
-namespace widget {
-
-PRLogModuleInfo* gNativeKeyBindingsLog = nullptr;
-
-NativeKeyBindings* NativeKeyBindings::sInstanceForSingleLineEditor = nullptr;
-NativeKeyBindings* NativeKeyBindings::sInstanceForMultiLineEditor = nullptr;
-
-// static
-NativeKeyBindings*
-NativeKeyBindings::GetInstance(NativeKeyBindingsType aType)
-{
-  switch (aType) {
-    case nsIWidget::NativeKeyBindingsForSingleLineEditor:
-      if (!sInstanceForSingleLineEditor) {
-        sInstanceForSingleLineEditor = new NativeKeyBindings();
-        sInstanceForSingleLineEditor->Init(aType);
-      }
-      return sInstanceForSingleLineEditor;
-    case nsIWidget::NativeKeyBindingsForMultiLineEditor:
-    case nsIWidget::NativeKeyBindingsForRichTextEditor:
-      if (!sInstanceForMultiLineEditor) {
-        sInstanceForMultiLineEditor = new NativeKeyBindings();
-        sInstanceForMultiLineEditor->Init(aType);
-      }
-      return sInstanceForMultiLineEditor;
-    default:
-      MOZ_CRASH("Not implemented");
-      return nullptr;
-  }
-}
-
-// static
-void
-NativeKeyBindings::Shutdown()
-{
-  delete sInstanceForSingleLineEditor;
-  sInstanceForSingleLineEditor = nullptr;
-  delete sInstanceForMultiLineEditor;
-  sInstanceForMultiLineEditor = nullptr;
-}
-
-NativeKeyBindings::NativeKeyBindings()
-{
-}
-
-#define SEL_TO_COMMAND(aSel, aCommand) \
-  mSelectorToCommand.Put( \
-    reinterpret_cast<struct objc_selector *>(@selector(aSel)), aCommand)
-
-void
-NativeKeyBindings::Init(NativeKeyBindingsType aType)
-{
-  if (!gNativeKeyBindingsLog) {
-    gNativeKeyBindingsLog = PR_NewLogModule("NativeKeyBindings");
-  }
-
-  MOZ_LOG(gNativeKeyBindingsLog, LogLevel::Info,
-    ("%p NativeKeyBindings::Init", this));
-
-  // Many selectors have a one-to-one mapping to a Gecko command. Those mappings
-  // are registered in mSelectorToCommand.
-
-  // Selectors from NSResponder's "Responding to Action Messages" section and
-  // from NSText's "Action Methods for Editing" section
-
-  // TODO: Improves correctness of left / right meaning
-  // TODO: Add real paragraph motions
-
-  // SEL_TO_COMMAND(cancelOperation:, );
-  // SEL_TO_COMMAND(capitalizeWord:, );
-  // SEL_TO_COMMAND(centerSelectionInVisibleArea:, );
-  // SEL_TO_COMMAND(changeCaseOfLetter:, );
-  // SEL_TO_COMMAND(complete:, );
-  SEL_TO_COMMAND(copy:, CommandCopy);
-  // SEL_TO_COMMAND(copyFont:, );
-  // SEL_TO_COMMAND(copyRuler:, );
-  SEL_TO_COMMAND(cut:, CommandCut);
-  SEL_TO_COMMAND(delete:, CommandDelete);
-  SEL_TO_COMMAND(deleteBackward:, CommandDeleteCharBackward);
-  // SEL_TO_COMMAND(deleteBackwardByDecomposingPreviousCharacter:, );
-  SEL_TO_COMMAND(deleteForward:, CommandDeleteCharForward);
-
-  // TODO: deleteTo* selectors are also supposed to add text to a kill buffer
-  SEL_TO_COMMAND(deleteToBeginningOfLine:, CommandDeleteToBeginningOfLine);
-  SEL_TO_COMMAND(deleteToBeginningOfParagraph:, CommandDeleteToBeginningOfLine);
-  SEL_TO_COMMAND(deleteToEndOfLine:, CommandDeleteToEndOfLine);
-  SEL_TO_COMMAND(deleteToEndOfParagraph:, CommandDeleteToEndOfLine);
-  // SEL_TO_COMMAND(deleteToMark:, );
-
-  SEL_TO_COMMAND(deleteWordBackward:, CommandDeleteWordBackward);
-  SEL_TO_COMMAND(deleteWordForward:, CommandDeleteWordForward);
-  // SEL_TO_COMMAND(indent:, );
-  // SEL_TO_COMMAND(insertBacktab:, );
-  // SEL_TO_COMMAND(insertContainerBreak:, );
-  // SEL_TO_COMMAND(insertLineBreak:, );
-  // SEL_TO_COMMAND(insertNewline:, );
-  // SEL_TO_COMMAND(insertNewlineIgnoringFieldEditor:, );
-  // SEL_TO_COMMAND(insertParagraphSeparator:, );
-  // SEL_TO_COMMAND(insertTab:, );
-  // SEL_TO_COMMAND(insertTabIgnoringFieldEditor:, );
-  // SEL_TO_COMMAND(insertDoubleQuoteIgnoringSubstitution:, );
-  // SEL_TO_COMMAND(insertSingleQuoteIgnoringSubstitution:, );
-  // SEL_TO_COMMAND(lowercaseWord:, );
-  SEL_TO_COMMAND(moveBackward:, CommandCharPrevious);
-  SEL_TO_COMMAND(moveBackwardAndModifySelection:, CommandSelectCharPrevious);
-  if (aType == nsIWidget::NativeKeyBindingsForSingleLineEditor) {
-    SEL_TO_COMMAND(moveDown:, CommandEndLine);
-  } else {
-    SEL_TO_COMMAND(moveDown:, CommandLineNext);
-  }
-  SEL_TO_COMMAND(moveDownAndModifySelection:, CommandSelectLineNext);
-  SEL_TO_COMMAND(moveForward:, CommandCharNext);
-  SEL_TO_COMMAND(moveForwardAndModifySelection:, CommandSelectCharNext);
-  SEL_TO_COMMAND(moveLeft:, CommandCharPrevious);
-  SEL_TO_COMMAND(moveLeftAndModifySelection:, CommandSelectCharPrevious);
-  SEL_TO_COMMAND(moveParagraphBackwardAndModifySelection:,
-    CommandSelectBeginLine);
-  SEL_TO_COMMAND(moveParagraphForwardAndModifySelection:, CommandSelectEndLine);
-  SEL_TO_COMMAND(moveRight:, CommandCharNext);
-  SEL_TO_COMMAND(moveRightAndModifySelection:, CommandSelectCharNext);
-  SEL_TO_COMMAND(moveToBeginningOfDocument:, CommandMoveTop);
-  SEL_TO_COMMAND(moveToBeginningOfDocumentAndModifySelection:,
-    CommandSelectTop);
-  SEL_TO_COMMAND(moveToBeginningOfLine:, CommandBeginLine);
-  SEL_TO_COMMAND(moveToBeginningOfLineAndModifySelection:,
-    CommandSelectBeginLine);
-  SEL_TO_COMMAND(moveToBeginningOfParagraph:, CommandBeginLine);
-  SEL_TO_COMMAND(moveToBeginningOfParagraphAndModifySelection:,
-    CommandSelectBeginLine);
-  SEL_TO_COMMAND(moveToEndOfDocument:, CommandMoveBottom);
-  SEL_TO_COMMAND(moveToEndOfDocumentAndModifySelection:, CommandSelectBottom);
-  SEL_TO_COMMAND(moveToEndOfLine:, CommandEndLine);
-  SEL_TO_COMMAND(moveToEndOfLineAndModifySelection:, CommandSelectEndLine);
-  SEL_TO_COMMAND(moveToEndOfParagraph:, CommandEndLine);
-  SEL_TO_COMMAND(moveToEndOfParagraphAndModifySelection:, CommandSelectEndLine);
-  SEL_TO_COMMAND(moveToLeftEndOfLine:, CommandBeginLine);
-  SEL_TO_COMMAND(moveToLeftEndOfLineAndModifySelection:,
-    CommandSelectBeginLine);
-  SEL_TO_COMMAND(moveToRightEndOfLine:, CommandEndLine);
-  SEL_TO_COMMAND(moveToRightEndOfLineAndModifySelection:, CommandSelectEndLine);
-  if (aType == nsIWidget::NativeKeyBindingsForSingleLineEditor) {
-    SEL_TO_COMMAND(moveUp:, CommandBeginLine);
-  } else {
-    SEL_TO_COMMAND(moveUp:, CommandLinePrevious);
-  }
-  SEL_TO_COMMAND(moveUpAndModifySelection:, CommandSelectLinePrevious);
-  SEL_TO_COMMAND(moveWordBackward:, CommandWordPrevious);
-  SEL_TO_COMMAND(moveWordBackwardAndModifySelection:,
-    CommandSelectWordPrevious);
-  SEL_TO_COMMAND(moveWordForward:, CommandWordNext);
-  SEL_TO_COMMAND(moveWordForwardAndModifySelection:, CommandSelectWordNext);
-  SEL_TO_COMMAND(moveWordLeft:, CommandWordPrevious);
-  SEL_TO_COMMAND(moveWordLeftAndModifySelection:, CommandSelectWordPrevious);
-  SEL_TO_COMMAND(moveWordRight:, CommandWordNext);
-  SEL_TO_COMMAND(moveWordRightAndModifySelection:, CommandSelectWordNext);
-  SEL_TO_COMMAND(pageDown:, CommandMovePageDown);
-  SEL_TO_COMMAND(pageDownAndModifySelection:, CommandSelectPageDown);
-  SEL_TO_COMMAND(pageUp:, CommandMovePageUp);
-  SEL_TO_COMMAND(pageUpAndModifySelection:, CommandSelectPageUp);
-  SEL_TO_COMMAND(paste:, CommandPaste);
-  // SEL_TO_COMMAND(pasteFont:, );
-  // SEL_TO_COMMAND(pasteRuler:, );
-  SEL_TO_COMMAND(scrollLineDown:, CommandScrollLineDown);
-  SEL_TO_COMMAND(scrollLineUp:, CommandScrollLineUp);
-  SEL_TO_COMMAND(scrollPageDown:, CommandScrollPageDown);
-  SEL_TO_COMMAND(scrollPageUp:, CommandScrollPageUp);
-  SEL_TO_COMMAND(scrollToBeginningOfDocument:, CommandScrollTop);
-  SEL_TO_COMMAND(scrollToEndOfDocument:, CommandScrollBottom);
-  SEL_TO_COMMAND(selectAll:, CommandSelectAll);
-  // selectLine: is complex, see KeyDown
-  if (aType == nsIWidget::NativeKeyBindingsForSingleLineEditor) {
-    SEL_TO_COMMAND(selectParagraph:, CommandSelectAll);
-  }
-  // SEL_TO_COMMAND(selectToMark:, );
-  // selectWord: is complex, see KeyDown
-  // SEL_TO_COMMAND(setMark:, );
-  // SEL_TO_COMMAND(showContextHelp:, );
-  // SEL_TO_COMMAND(supplementalTargetForAction:sender:, );
-  // SEL_TO_COMMAND(swapWithMark:, );
-  // SEL_TO_COMMAND(transpose:, );
-  // SEL_TO_COMMAND(transposeWords:, );
-  // SEL_TO_COMMAND(uppercaseWord:, );
-  // SEL_TO_COMMAND(yank:, );
-}
-
-#undef SEL_TO_COMMAND
-
-bool
-NativeKeyBindings::Execute(const WidgetKeyboardEvent& aEvent,
-                           DoCommandCallback aCallback,
-                           void* aCallbackData)
-{
-  MOZ_LOG(gNativeKeyBindingsLog, LogLevel::Info,
-    ("%p NativeKeyBindings::KeyPress", this));
-
-  // Recover the current event, which should always be the key down we are
-  // responding to.
-
-  NSEvent* cocoaEvent = reinterpret_cast<NSEvent*>(aEvent.mNativeKeyEvent);
-
-  if (!cocoaEvent || [cocoaEvent type] != NSKeyDown) {
-    MOZ_LOG(gNativeKeyBindingsLog, LogLevel::Info,
-      ("%p NativeKeyBindings::KeyPress, no Cocoa key down event", this));
-
-    return false;
-  }
-
-  MOZ_LOG(gNativeKeyBindingsLog, LogLevel::Info,
-    ("%p NativeKeyBindings::KeyPress, interpreting", this));
-
-  AutoTArray<KeyBindingsCommand, 2> bindingCommands;
-  nsCocoaUtils::GetCommandsFromKeyEvent(cocoaEvent, bindingCommands);
-
-  MOZ_LOG(gNativeKeyBindingsLog, LogLevel::Info,
-    ("%p NativeKeyBindings::KeyPress, bindingCommands=%u",
-     this, bindingCommands.Length()));
-
-  AutoTArray<Command, 4> geckoCommands;
-
-  for (uint32_t i = 0; i < bindingCommands.Length(); i++) {
-    SEL selector = bindingCommands[i].selector;
-
-    if (MOZ_LOG_TEST(gNativeKeyBindingsLog, LogLevel::Info)) {
-      NSString* selectorString = NSStringFromSelector(selector);
-      nsAutoString nsSelectorString;
-      nsCocoaUtils::GetStringForNSString(selectorString, nsSelectorString);
-
-      MOZ_LOG(gNativeKeyBindingsLog, LogLevel::Info,
-        ("%p NativeKeyBindings::KeyPress, selector=%s",
-         this, NS_LossyConvertUTF16toASCII(nsSelectorString).get()));
-    }
-
-    // Try to find a simple mapping in the hashtable
-    Command geckoCommand = static_cast<Command>(mSelectorToCommand.Get(
-      reinterpret_cast<struct objc_selector*>(selector)));
-
-    if (geckoCommand) {
-      geckoCommands.AppendElement(geckoCommand);
-    } else if (selector == @selector(selectLine:)) {
-      // This is functional, but Cocoa's version is direction-less in that
-      // selection direction is not determined until some future directed action
-      // is taken. See bug 282097, comment 79 for more details.
-      geckoCommands.AppendElement(CommandBeginLine);
-      geckoCommands.AppendElement(CommandSelectEndLine);
-    } else if (selector == @selector(selectWord:)) {
-      // This is functional, but Cocoa's version is direction-less in that
-      // selection direction is not determined until some future directed action
-      // is taken. See bug 282097, comment 79 for more details.
-      geckoCommands.AppendElement(CommandWordPrevious);
-      geckoCommands.AppendElement(CommandSelectWordNext);
-    }
-  }
-
-  if (geckoCommands.IsEmpty()) {
-    MOZ_LOG(gNativeKeyBindingsLog, LogLevel::Info,
-      ("%p NativeKeyBindings::KeyPress, handled=false", this));
-
-    return false;
-  }
-
-  for (uint32_t i = 0; i < geckoCommands.Length(); i++) {
-    Command geckoCommand = geckoCommands[i];
-
-    MOZ_LOG(gNativeKeyBindingsLog, LogLevel::Info,
-      ("%p NativeKeyBindings::KeyPress, command=%s",
-       this, WidgetKeyboardEvent::GetCommandStr(geckoCommand)));
-
-    // Execute the Gecko command
-    aCallback(geckoCommand, aCallbackData);
-  }
-
-  MOZ_LOG(gNativeKeyBindingsLog, LogLevel::Info,
-    ("%p NativeKeyBindings::KeyPress, handled=true", this));
-
-  return true;
-}
-
-} // namespace widget
-} // namespace mozilla
diff --git a/widget/cocoa/OSXNotificationCenter.h b/widget/cocoa/OSXNotificationCenter.h
deleted file mode 100644
index 30767b5c55..0000000000
--- a/widget/cocoa/OSXNotificationCenter.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef OSXNotificationCenter_h
-#define OSXNotificationCenter_h
-
-#import <Foundation/Foundation.h>
-#include "nsIAlertsService.h"
-#include "imgINotificationObserver.h"
-#include "nsITimer.h"
-#include "nsTArray.h"
-#include "mozilla/RefPtr.h"
-
-@class mozNotificationCenterDelegate;
-
-#if !defined(MAC_OS_X_VERSION_10_8) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_8)
-typedef NSInteger NSUserNotificationActivationType;
-#endif
-
-namespace mozilla {
-
-class OSXNotificationInfo;
-
-class OSXNotificationCenter : public nsIAlertsService,
-                              public nsIAlertsIconData,
-                              public nsIAlertNotificationImageListener
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIALERTSSERVICE
-  NS_DECL_NSIALERTSICONDATA
-  NS_DECL_NSIALERTNOTIFICATIONIMAGELISTENER
-
-  OSXNotificationCenter();
-
-  nsresult Init();
-  void CloseAlertCocoaString(NSString *aAlertName);
-  void OnActivate(NSString *aAlertName, NSUserNotificationActivationType aActivationType,
-                  unsigned long long aAdditionalActionIndex);
-  void ShowPendingNotification(OSXNotificationInfo *osxni);
-
-protected:
-  virtual ~OSXNotificationCenter();
-
-private:
-  mozNotificationCenterDelegate *mDelegate;
-  nsTArray<RefPtr<OSXNotificationInfo> > mActiveAlerts;
-  nsTArray<RefPtr<OSXNotificationInfo> > mPendingAlerts;
-};
-
-} // namespace mozilla
-
-#endif // OSXNotificationCenter_h
diff --git a/widget/cocoa/OSXNotificationCenter.mm b/widget/cocoa/OSXNotificationCenter.mm
deleted file mode 100644
index e9e36a96be..0000000000
--- a/widget/cocoa/OSXNotificationCenter.mm
+++ /dev/null
@@ -1,589 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "OSXNotificationCenter.h"
-#import <AppKit/AppKit.h>
-#include "imgIRequest.h"
-#include "imgIContainer.h"
-#include "nsICancelable.h"
-#include "nsIStringBundle.h"
-#include "nsNetUtil.h"
-#import "nsCocoaUtils.h"
-#include "nsComponentManagerUtils.h"
-#include "nsContentUtils.h"
-#include "nsObjCExceptions.h"
-#include "nsString.h"
-#include "nsCOMPtr.h"
-#include "nsIObserver.h"
-
-using namespace mozilla;
-
-#define MAX_NOTIFICATION_NAME_LEN 5000
-
-#if !defined(MAC_OS_X_VERSION_10_8) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_8)
-@protocol NSUserNotificationCenterDelegate
-@end
-static NSString * const NSUserNotificationDefaultSoundName = @"DefaultSoundName";
-enum {
-  NSUserNotificationActivationTypeNone = 0,
-  NSUserNotificationActivationTypeContentsClicked = 1,
-  NSUserNotificationActivationTypeActionButtonClicked = 2,
-};
-#endif
-
-#if !defined(MAC_OS_X_VERSION_10_9) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_9)
-enum {
-  NSUserNotificationActivationTypeReplied = 3,
-};
-#endif
-
-#if !defined(MAC_OS_X_VERSION_10_10) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_10)
-enum {
-  NSUserNotificationActivationTypeAdditionalActionClicked = 4
-};
-#endif
-
-@protocol FakeNSUserNotification <NSObject>
-@property (copy) NSString* title;
-@property (copy) NSString* subtitle;
-@property (copy) NSString* informativeText;
-@property (copy) NSString* actionButtonTitle;
-@property (copy) NSDictionary* userInfo;
-@property (copy) NSDate* deliveryDate;
-@property (copy) NSTimeZone* deliveryTimeZone;
-@property (copy) NSDateComponents* deliveryRepeatInterval;
-@property (readonly) NSDate* actualDeliveryDate;
-@property (readonly, getter=isPresented) BOOL presented;
-@property (readonly, getter=isRemote) BOOL remote;
-@property (copy) NSString* soundName;
-@property BOOL hasActionButton;
-@property (readonly) NSUserNotificationActivationType activationType;
-@property (copy) NSString *otherButtonTitle;
-@property (copy) NSImage *contentImage;
-@end
-
-@protocol FakeNSUserNotificationCenter <NSObject>
-+ (id<FakeNSUserNotificationCenter>)defaultUserNotificationCenter;
-@property (assign) id <NSUserNotificationCenterDelegate> delegate;
-@property (copy) NSArray *scheduledNotifications;
-- (void)scheduleNotification:(id<FakeNSUserNotification>)notification;
-- (void)removeScheduledNotification:(id<FakeNSUserNotification>)notification;
-@property (readonly) NSArray *deliveredNotifications;
-- (void)deliverNotification:(id<FakeNSUserNotification>)notification;
-- (void)removeDeliveredNotification:(id<FakeNSUserNotification>)notification;
-- (void)removeAllDeliveredNotifications;
-- (void)_removeAllDisplayedNotifications;
-- (void)_removeDisplayedNotification:(id<FakeNSUserNotification>)notification;
-@end
-
-@interface mozNotificationCenterDelegate : NSObject <NSUserNotificationCenterDelegate>
-{
-  OSXNotificationCenter *mOSXNC;
-}
-  - (id)initWithOSXNC:(OSXNotificationCenter*)osxnc;
-@end
-
-@implementation mozNotificationCenterDelegate
-
-- (id)initWithOSXNC:(OSXNotificationCenter*)osxnc
-{
-  [super init];
-  // We should *never* outlive this OSXNotificationCenter.
-  mOSXNC = osxnc;
-  return self;
-}
-
-- (void)userNotificationCenter:(id<FakeNSUserNotificationCenter>)center
-        didDeliverNotification:(id<FakeNSUserNotification>)notification
-{
-
-}
-
-- (void)userNotificationCenter:(id<FakeNSUserNotificationCenter>)center
-       didActivateNotification:(id<FakeNSUserNotification>)notification
-{
-  unsigned long long additionalActionIndex = ULLONG_MAX;
-  if ([notification respondsToSelector:@selector(_alternateActionIndex)]) {
-    NSNumber *alternateActionIndex = [(NSObject*)notification valueForKey:@"_alternateActionIndex"];
-    additionalActionIndex = [alternateActionIndex unsignedLongLongValue];
-  }
-  mOSXNC->OnActivate([[notification userInfo] valueForKey:@"name"],
-                     notification.activationType,
-                     additionalActionIndex);
-}
-
-- (BOOL)userNotificationCenter:(id<FakeNSUserNotificationCenter>)center
-     shouldPresentNotification:(id<FakeNSUserNotification>)notification
-{
-  return YES;
-}
-
-// This is an undocumented method that we need for parity with Safari.
-// Apple bug #15440664.
-- (void)userNotificationCenter:(id<FakeNSUserNotificationCenter>)center
-  didRemoveDeliveredNotifications:(NSArray *)notifications
-{
-  for (id<FakeNSUserNotification> notification in notifications) {
-    NSString *name = [[notification userInfo] valueForKey:@"name"];
-    mOSXNC->CloseAlertCocoaString(name);
-  }
-}
-
-// This is an undocumented method that we need to be notified if a user clicks the close button.
-- (void)userNotificationCenter:(id<FakeNSUserNotificationCenter>)center
-  didDismissAlert:(id<FakeNSUserNotification>)notification
-{
-  NSString *name = [[notification userInfo] valueForKey:@"name"];
-  mOSXNC->CloseAlertCocoaString(name);
-}
-
-@end
-
-namespace mozilla {
-
-enum {
-  OSXNotificationActionDisable = 0,
-  OSXNotificationActionSettings = 1,
-};
-
-class OSXNotificationInfo final : public nsISupports {
-private:
-  virtual ~OSXNotificationInfo();
-
-public:
-  NS_DECL_ISUPPORTS
-  OSXNotificationInfo(NSString *name, nsIObserver *observer,
-                      const nsAString & alertCookie);
-
-  NSString *mName;
-  nsCOMPtr<nsIObserver> mObserver;
-  nsString mCookie;
-  RefPtr<nsICancelable> mIconRequest;
-  id<FakeNSUserNotification> mPendingNotifiction;
-};
-
-NS_IMPL_ISUPPORTS0(OSXNotificationInfo)
-
-OSXNotificationInfo::OSXNotificationInfo(NSString *name, nsIObserver *observer,
-                                         const nsAString & alertCookie)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  NS_ASSERTION(name, "Cannot create OSXNotificationInfo without a name!");
-  mName = [name retain];
-  mObserver = observer;
-  mCookie = alertCookie;
-  mPendingNotifiction = nil;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-OSXNotificationInfo::~OSXNotificationInfo()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  [mName release];
-  [mPendingNotifiction release];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-static id<FakeNSUserNotificationCenter> GetNotificationCenter() {
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  Class c = NSClassFromString(@"NSUserNotificationCenter");
-  return [c performSelector:@selector(defaultUserNotificationCenter)];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-OSXNotificationCenter::OSXNotificationCenter()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  mDelegate = [[mozNotificationCenterDelegate alloc] initWithOSXNC:this];
-  GetNotificationCenter().delegate = mDelegate;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-OSXNotificationCenter::~OSXNotificationCenter()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  [GetNotificationCenter() removeAllDeliveredNotifications];
-  [mDelegate release];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-NS_IMPL_ISUPPORTS(OSXNotificationCenter, nsIAlertsService, nsIAlertsIconData,
-                  nsIAlertNotificationImageListener)
-
-nsresult OSXNotificationCenter::Init()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  return (!!NSClassFromString(@"NSUserNotification")) ? NS_OK : NS_ERROR_FAILURE;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-OSXNotificationCenter::ShowAlertNotification(const nsAString & aImageUrl, const nsAString & aAlertTitle,
-                                             const nsAString & aAlertText, bool aAlertTextClickable,
-                                             const nsAString & aAlertCookie,
-                                             nsIObserver * aAlertListener,
-                                             const nsAString & aAlertName,
-                                             const nsAString & aBidi,
-                                             const nsAString & aLang,
-                                             const nsAString & aData,
-                                             nsIPrincipal * aPrincipal,
-                                             bool aInPrivateBrowsing,
-                                             bool aRequireInteraction)
-{
-  nsCOMPtr<nsIAlertNotification> alert =
-    do_CreateInstance(ALERT_NOTIFICATION_CONTRACTID);
-  NS_ENSURE_TRUE(alert, NS_ERROR_FAILURE);
-  nsresult rv = alert->Init(aAlertName, aImageUrl, aAlertTitle,
-                            aAlertText, aAlertTextClickable,
-                            aAlertCookie, aBidi, aLang, aData,
-                            aPrincipal, aInPrivateBrowsing,
-                            aRequireInteraction);
-  NS_ENSURE_SUCCESS(rv, rv);
-  return ShowAlert(alert, aAlertListener);
-}
-
-NS_IMETHODIMP
-OSXNotificationCenter::ShowPersistentNotification(const nsAString& aPersistentData,
-                                                  nsIAlertNotification* aAlert,
-                                                  nsIObserver* aAlertListener)
-{
-  return ShowAlert(aAlert, aAlertListener);
-}
-
-NS_IMETHODIMP
-OSXNotificationCenter::ShowAlert(nsIAlertNotification* aAlert,
-                                 nsIObserver* aAlertListener)
-{
-  return ShowAlertWithIconData(aAlert, aAlertListener, 0, nullptr);
-}
-
-NS_IMETHODIMP
-OSXNotificationCenter::ShowAlertWithIconData(nsIAlertNotification* aAlert,
-                                             nsIObserver* aAlertListener,
-                                             uint32_t aIconSize,
-                                             const uint8_t* aIconData)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  NS_ENSURE_ARG(aAlert);
-
-  Class unClass = NSClassFromString(@"NSUserNotification");
-  id<FakeNSUserNotification> notification = [[unClass alloc] init];
-
-  nsAutoString title;
-  nsresult rv = aAlert->GetTitle(title);
-  NS_ENSURE_SUCCESS(rv, rv);
-  notification.title = nsCocoaUtils::ToNSString(title);
-
-  nsAutoString hostPort;
-  rv = aAlert->GetSource(hostPort);
-  NS_ENSURE_SUCCESS(rv, rv);
-  nsCOMPtr<nsIStringBundle> bundle;
-  nsCOMPtr<nsIStringBundleService> sbs = do_GetService(NS_STRINGBUNDLE_CONTRACTID);
-  sbs->CreateBundle("chrome://alerts/locale/alert.properties", getter_AddRefs(bundle));
-
-  if (!hostPort.IsEmpty() && bundle) {
-    const char16_t* formatStrings[] = { hostPort.get() };
-    nsXPIDLString notificationSource;
-    bundle->FormatStringFromName(u"source.label",
-                                 formatStrings,
-                                 ArrayLength(formatStrings),
-                                 getter_Copies(notificationSource));
-    notification.subtitle = nsCocoaUtils::ToNSString(notificationSource);
-  }
-
-  nsAutoString text;
-  rv = aAlert->GetText(text);
-  NS_ENSURE_SUCCESS(rv, rv);
-  notification.informativeText = nsCocoaUtils::ToNSString(text);
-
-  notification.soundName = NSUserNotificationDefaultSoundName;
-  notification.hasActionButton = NO;
-
-  // If this is not an application/extension alert, show additional actions dealing with permissions.
-  bool isActionable;
-  if (bundle && NS_SUCCEEDED(aAlert->GetActionable(&isActionable)) && isActionable) {
-    nsXPIDLString closeButtonTitle, actionButtonTitle, disableButtonTitle, settingsButtonTitle;
-    bundle->GetStringFromName(u"closeButton.title",
-                              getter_Copies(closeButtonTitle));
-    bundle->GetStringFromName(u"actionButton.label",
-                              getter_Copies(actionButtonTitle));
-    if (!hostPort.IsEmpty()) {
-      const char16_t* formatStrings[] = { hostPort.get() };
-      bundle->FormatStringFromName(u"webActions.disableForOrigin.label",
-                                   formatStrings,
-                                   ArrayLength(formatStrings),
-                                   getter_Copies(disableButtonTitle));
-    }
-    bundle->GetStringFromName(u"webActions.settings.label",
-                              getter_Copies(settingsButtonTitle));
-
-    notification.otherButtonTitle = nsCocoaUtils::ToNSString(closeButtonTitle);
-
-    // OS X 10.8 only shows action buttons if the "Alerts" style is set in
-    // Notification Center preferences, and doesn't support the alternate
-    // action menu.
-    if ([notification respondsToSelector:@selector(set_showsButtons:)] &&
-        [notification respondsToSelector:@selector(set_alwaysShowAlternateActionMenu:)] &&
-        [notification respondsToSelector:@selector(set_alternateActionButtonTitles:)]) {
-
-      notification.hasActionButton = YES;
-      notification.actionButtonTitle = nsCocoaUtils::ToNSString(actionButtonTitle);
-
-      [(NSObject*)notification setValue:@(YES) forKey:@"_showsButtons"];
-      [(NSObject*)notification setValue:@(YES) forKey:@"_alwaysShowAlternateActionMenu"];
-      [(NSObject*)notification setValue:@[
-                                          nsCocoaUtils::ToNSString(disableButtonTitle),
-                                          nsCocoaUtils::ToNSString(settingsButtonTitle)
-                                          ]
-                               forKey:@"_alternateActionButtonTitles"];
-    }
-  }
-  nsAutoString name;
-  rv = aAlert->GetName(name);
-  // Don't let an alert name be more than MAX_NOTIFICATION_NAME_LEN characters.
-  // More than that shouldn't be necessary and userInfo (assigned to below) has
-  // a length limit of 16k on OS X 10.11. Exception thrown if limit exceeded.
-  if (name.Length() > MAX_NOTIFICATION_NAME_LEN) {
-    return NS_ERROR_FAILURE;
-  }
-
-  NS_ENSURE_SUCCESS(rv, rv);
-  NSString *alertName = nsCocoaUtils::ToNSString(name);
-  if (!alertName) {
-    return NS_ERROR_FAILURE;
-  }
-  notification.userInfo = [NSDictionary dictionaryWithObjects:[NSArray arrayWithObjects:alertName, nil]
-                                                      forKeys:[NSArray arrayWithObjects:@"name", nil]];
-
-  nsAutoString cookie;
-  rv = aAlert->GetCookie(cookie);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  OSXNotificationInfo *osxni = new OSXNotificationInfo(alertName, aAlertListener, cookie);
-
-  // Show the favicon if supported on this version of OS X.
-  if (aIconSize > 0 &&
-      [notification respondsToSelector:@selector(set_identityImage:)] &&
-      [notification respondsToSelector:@selector(set_identityImageHasBorder:)]) {
-
-    NSData *iconData = [NSData dataWithBytes:aIconData length:aIconSize];
-    NSImage *icon = [[[NSImage alloc] initWithData:iconData] autorelease];
-
-    [(NSObject*)notification setValue:icon forKey:@"_identityImage"];
-    [(NSObject*)notification setValue:@(NO) forKey:@"_identityImageHasBorder"];
-  }
-
-  bool inPrivateBrowsing;
-  rv = aAlert->GetInPrivateBrowsing(&inPrivateBrowsing);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // Show the notification without waiting for an image if there is no icon URL or
-  // notification icons are not supported on this version of OS X.
-  if (![unClass instancesRespondToSelector:@selector(setContentImage:)]) {
-    CloseAlertCocoaString(alertName);
-    mActiveAlerts.AppendElement(osxni);
-    [GetNotificationCenter() deliverNotification:notification];
-    [notification release];
-    if (aAlertListener) {
-      aAlertListener->Observe(nullptr, "alertshow", cookie.get());
-    }
-  } else {
-    mPendingAlerts.AppendElement(osxni);
-    osxni->mPendingNotifiction = notification;
-    // Wait six seconds for the image to load.
-    rv = aAlert->LoadImage(6000, this, osxni,
-                           getter_AddRefs(osxni->mIconRequest));
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      ShowPendingNotification(osxni);
-    }
-  }
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-OSXNotificationCenter::CloseAlert(const nsAString& aAlertName,
-                                  nsIPrincipal* aPrincipal)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  NSString *alertName = nsCocoaUtils::ToNSString(aAlertName);
-  CloseAlertCocoaString(alertName);
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-void
-OSXNotificationCenter::CloseAlertCocoaString(NSString *aAlertName)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!aAlertName) {
-    return; // Can't do anything without a name
-  }
-
-  NSArray *notifications = [GetNotificationCenter() deliveredNotifications];
-  for (id<FakeNSUserNotification> notification in notifications) {
-    NSString *name = [[notification userInfo] valueForKey:@"name"];
-    if ([name isEqualToString:aAlertName]) {
-      [GetNotificationCenter() removeDeliveredNotification:notification];
-      [GetNotificationCenter() _removeDisplayedNotification:notification];
-      break;
-    }
-  }
-
-  for (unsigned int i = 0; i < mActiveAlerts.Length(); i++) {
-    OSXNotificationInfo *osxni = mActiveAlerts[i];
-    if ([aAlertName isEqualToString:osxni->mName]) {
-      if (osxni->mObserver) {
-        osxni->mObserver->Observe(nullptr, "alertfinished", osxni->mCookie.get());
-      }
-      if (osxni->mIconRequest) {
-        osxni->mIconRequest->Cancel(NS_BINDING_ABORTED);
-        osxni->mIconRequest = nullptr;
-      }
-      mActiveAlerts.RemoveElementAt(i);
-      break;
-    }
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void
-OSXNotificationCenter::OnActivate(NSString *aAlertName,
-                                  NSUserNotificationActivationType aActivationType,
-                                  unsigned long long aAdditionalActionIndex)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!aAlertName) {
-    return; // Can't do anything without a name
-  }
-
-  for (unsigned int i = 0; i < mActiveAlerts.Length(); i++) {
-    OSXNotificationInfo *osxni = mActiveAlerts[i];
-    if ([aAlertName isEqualToString:osxni->mName]) {
-      if (osxni->mObserver) {
-        switch ((int)aActivationType) {
-          case NSUserNotificationActivationTypeAdditionalActionClicked:
-          case NSUserNotificationActivationTypeActionButtonClicked:
-            switch (aAdditionalActionIndex) {
-              case OSXNotificationActionDisable:
-                osxni->mObserver->Observe(nullptr, "alertdisablecallback", osxni->mCookie.get());
-                break;
-              case OSXNotificationActionSettings:
-                osxni->mObserver->Observe(nullptr, "alertsettingscallback", osxni->mCookie.get());
-                break;
-              default:
-                NS_WARNING("Unknown NSUserNotification additional action clicked");
-                break;
-            }
-            break;
-          default:
-            osxni->mObserver->Observe(nullptr, "alertclickcallback", osxni->mCookie.get());
-            break;
-        }
-      }
-      return;
-    }
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void
-OSXNotificationCenter::ShowPendingNotification(OSXNotificationInfo *osxni)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (osxni->mIconRequest) {
-    osxni->mIconRequest->Cancel(NS_BINDING_ABORTED);
-    osxni->mIconRequest = nullptr;
-  }
-
-  CloseAlertCocoaString(osxni->mName);
-
-  for (unsigned int i = 0; i < mPendingAlerts.Length(); i++) {
-    if (mPendingAlerts[i] == osxni) {
-      mActiveAlerts.AppendElement(osxni);
-      mPendingAlerts.RemoveElementAt(i);
-      break;
-    }
-  }
-
-  [GetNotificationCenter() deliverNotification:osxni->mPendingNotifiction];
-
-  if (osxni->mObserver) {
-    osxni->mObserver->Observe(nullptr, "alertshow", osxni->mCookie.get());
-  }
-
-  [osxni->mPendingNotifiction release];
-  osxni->mPendingNotifiction = nil;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-NS_IMETHODIMP
-OSXNotificationCenter::OnImageMissing(nsISupports* aUserData)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  OSXNotificationInfo *osxni = static_cast<OSXNotificationInfo*>(aUserData);
-  if (osxni->mPendingNotifiction) {
-    // If there was an error getting the image, or the request timed out, show
-    // the notification without a content image.
-    ShowPendingNotification(osxni);
-  }
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-OSXNotificationCenter::OnImageReady(nsISupports* aUserData,
-                                    imgIRequest* aRequest)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  nsCOMPtr<imgIContainer> image;
-  nsresult rv = aRequest->GetImage(getter_AddRefs(image));
-  if (NS_WARN_IF(NS_FAILED(rv) || !image)) {
-    return rv;
-  }
-
-  OSXNotificationInfo *osxni = static_cast<OSXNotificationInfo*>(aUserData);
-  if (!osxni->mPendingNotifiction) {
-    return NS_ERROR_FAILURE;
-  }
-
-  NSImage *cocoaImage = nil;
-  nsCocoaUtils::CreateNSImageFromImageContainer(image, imgIContainer::FRAME_FIRST, &cocoaImage, 1.0f);
-  (osxni->mPendingNotifiction).contentImage = cocoaImage;
-  [cocoaImage release];
-  ShowPendingNotification(osxni);
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-} // namespace mozilla
diff --git a/widget/cocoa/RectTextureImage.h b/widget/cocoa/RectTextureImage.h
deleted file mode 100644
index 022b216c6b..0000000000
--- a/widget/cocoa/RectTextureImage.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef RectTextureImage_h_
-#define RectTextureImage_h_
-
-#include "mozilla/RefPtr.h"
-
-class MacIOSurface;
-
-namespace mozilla {
-
-namespace gl {
-class GLContext;
-} // namespace gl
-
-namespace widget {
-
-// Manages a texture which can resize dynamically, binds to the
-// LOCAL_GL_TEXTURE_RECTANGLE_ARB texture target and is automatically backed
-// by a power-of-two size GL texture. The latter two features are used for
-// compatibility with older Mac hardware which we block GL layers on.
-// RectTextureImages are used both for accelerated GL layers drawing and for
-// OMTC BasicLayers drawing.
-class RectTextureImage {
-public:
-  RectTextureImage();
-
-  virtual ~RectTextureImage();
-
-  already_AddRefed<gfx::DrawTarget>
-    BeginUpdate(const LayoutDeviceIntSize& aNewSize,
-                const LayoutDeviceIntRegion& aDirtyRegion =
-                  LayoutDeviceIntRegion());
-  void EndUpdate();
-
-  void UpdateIfNeeded(const LayoutDeviceIntSize& aNewSize,
-                      const LayoutDeviceIntRegion& aDirtyRegion,
-                      void (^aCallback)(gfx::DrawTarget*,
-                                        const LayoutDeviceIntRegion&))
-  {
-    RefPtr<gfx::DrawTarget> drawTarget = BeginUpdate(aNewSize, aDirtyRegion);
-    if (drawTarget) {
-      aCallback(drawTarget, GetUpdateRegion());
-      EndUpdate();
-    }
-  }
-
-  void UpdateFromCGContext(const LayoutDeviceIntSize& aNewSize,
-                           const LayoutDeviceIntRegion& aDirtyRegion,
-                           CGContextRef aCGContext);
-
-  LayoutDeviceIntRegion GetUpdateRegion() {
-    MOZ_ASSERT(mInUpdate, "update region only valid during update");
-    return mUpdateRegion;
-  }
-
-  void Draw(mozilla::layers::GLManager* aManager,
-            const LayoutDeviceIntPoint& aLocation,
-            const gfx::Matrix4x4& aTransform = gfx::Matrix4x4());
-
-
-protected:
-  void DeleteTexture();
-  void BindIOSurfaceToTexture(gl::GLContext* aGL);
-
-  RefPtr<MacIOSurface> mIOSurface;
-  gl::GLContext* mGLContext;
-  LayoutDeviceIntRegion mUpdateRegion;
-  LayoutDeviceIntSize mBufferSize;
-  GLuint mTexture;
-  bool mInUpdate;
-};
-
-} // namespace widget
-} // namespace mozilla
-
-#endif // RectTextureImage_h_
diff --git a/widget/cocoa/RectTextureImage.mm b/widget/cocoa/RectTextureImage.mm
deleted file mode 100644
index c67af97d0a..0000000000
--- a/widget/cocoa/RectTextureImage.mm
+++ /dev/null
@@ -1,171 +0,0 @@
-/* -*- Mode: objc; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "RectTextureImage.h"
-
-#include "gfxUtils.h"
-#include "GLContextCGL.h"
-#include "mozilla/layers/GLManager.h"
-#include "mozilla/gfx/MacIOSurface.h"
-#include "OGLShaderProgram.h"
-#include "ScopedGLHelpers.h"
-
-namespace mozilla {
-namespace widget {
-
-RectTextureImage::RectTextureImage()
-  : mGLContext(nullptr)
-  , mTexture(0)
-  , mInUpdate(false)
-{
-}
-
-RectTextureImage::~RectTextureImage()
-{
-  DeleteTexture();
-}
-
-already_AddRefed<gfx::DrawTarget>
-RectTextureImage::BeginUpdate(const LayoutDeviceIntSize& aNewSize,
-                              const LayoutDeviceIntRegion& aDirtyRegion)
-{
-  MOZ_ASSERT(!mInUpdate, "Beginning update during update!");
-  mUpdateRegion = aDirtyRegion;
-  bool needRecreate = false;
-  if (aNewSize != mBufferSize) {
-    mBufferSize = aNewSize;
-    mUpdateRegion =
-      LayoutDeviceIntRect(LayoutDeviceIntPoint(0, 0), aNewSize);
-    needRecreate = true;
-  }
-
-  if (mUpdateRegion.IsEmpty()) {
-    return nullptr;
-  }
-
-  if (!mIOSurface || needRecreate) {
-    DeleteTexture();
-    mIOSurface = MacIOSurface::CreateIOSurface(mBufferSize.width,
-                                               mBufferSize.height);
-
-    if (!mIOSurface) {
-      return nullptr;
-    }
-  }
-
-  mInUpdate = true;
-
-  mIOSurface->Lock(false);
-  unsigned char* ioData = (unsigned char*)mIOSurface->GetBaseAddress();
-  gfx::IntSize size(mBufferSize.width, mBufferSize.height);
-  int32_t stride = mIOSurface->GetBytesPerRow();
-  gfx::SurfaceFormat format = gfx::SurfaceFormat::B8G8R8A8;
-  RefPtr<gfx::DrawTarget> drawTarget =
-    gfx::Factory::CreateDrawTargetForData(gfx::BackendType::SKIA,
-                                          ioData, size,
-                                          stride, format);
-  return drawTarget.forget();
-}
-
-void
-RectTextureImage::EndUpdate()
-{
-  MOZ_ASSERT(mInUpdate, "Ending update while not in update");
-  mIOSurface->Unlock(false);
-  mInUpdate = false;
-}
-
-void
-RectTextureImage::UpdateFromCGContext(const LayoutDeviceIntSize& aNewSize,
-                                      const LayoutDeviceIntRegion& aDirtyRegion,
-                                      CGContextRef aCGContext)
-{
-  gfx::IntSize size = gfx::IntSize(CGBitmapContextGetWidth(aCGContext),
-                                   CGBitmapContextGetHeight(aCGContext));
-  RefPtr<gfx::DrawTarget> dt = BeginUpdate(aNewSize, aDirtyRegion);
-  if (dt) {
-    gfx::Rect rect(0, 0, size.width, size.height);
-    gfxUtils::ClipToRegion(dt, GetUpdateRegion().ToUnknownRegion());
-    RefPtr<gfx::SourceSurface> sourceSurface =
-      dt->CreateSourceSurfaceFromData(static_cast<uint8_t *>(CGBitmapContextGetData(aCGContext)),
-                                      size,
-                                      CGBitmapContextGetBytesPerRow(aCGContext),
-                                      gfx::SurfaceFormat::B8G8R8A8);
-    dt->DrawSurface(sourceSurface, rect, rect,
-                    gfx::DrawSurfaceOptions(),
-                    gfx::DrawOptions(1.0, gfx::CompositionOp::OP_SOURCE));
-    dt->PopClip();
-    EndUpdate();
-  }
-}
-
-void
-RectTextureImage::Draw(layers::GLManager* aManager,
-                       const LayoutDeviceIntPoint& aLocation,
-                       const gfx::Matrix4x4& aTransform)
-{
-  gl::GLContext* gl = aManager->gl();
-
-  BindIOSurfaceToTexture(gl);
-
-  layers::ShaderProgramOGL* program =
-    aManager->GetProgram(LOCAL_GL_TEXTURE_RECTANGLE_ARB,
-                         gfx::SurfaceFormat::R8G8B8A8);
-
-  gl->fActiveTexture(LOCAL_GL_TEXTURE0);
-  gl::ScopedBindTexture texture(gl, mTexture, LOCAL_GL_TEXTURE_RECTANGLE_ARB);
-
-  aManager->ActivateProgram(program);
-  program->SetProjectionMatrix(aManager->GetProjMatrix());
-  program->SetLayerTransform(gfx::Matrix4x4(aTransform).PostTranslate(aLocation.x, aLocation.y, 0));
-  program->SetTextureTransform(gfx::Matrix4x4());
-  program->SetRenderOffset(nsIntPoint(0, 0));
-  program->SetTexCoordMultiplier(mBufferSize.width, mBufferSize.height);
-  program->SetTextureUnit(0);
-
-  aManager->BindAndDrawQuad(program,
-                            gfx::Rect(0.0, 0.0, mBufferSize.width, mBufferSize.height),
-                            gfx::Rect(0.0, 0.0, 1.0f, 1.0f));
-}
-
-void
-RectTextureImage::DeleteTexture()
-{
-  if (mTexture) {
-    MOZ_ASSERT(mGLContext);
-    mGLContext->MakeCurrent();
-    mGLContext->fDeleteTextures(1, &mTexture);
-    mTexture = 0;
-  }
-}
-
-void
-RectTextureImage::BindIOSurfaceToTexture(gl::GLContext* aGL)
-{
-  if (!mTexture) {
-    MOZ_ASSERT(aGL);
-    aGL->fGenTextures(1, &mTexture);
-    aGL->fActiveTexture(LOCAL_GL_TEXTURE0);
-    gl::ScopedBindTexture texture(aGL, mTexture, LOCAL_GL_TEXTURE_RECTANGLE_ARB);
-    aGL->fTexParameteri(LOCAL_GL_TEXTURE_RECTANGLE_ARB,
-                        LOCAL_GL_TEXTURE_MIN_FILTER,
-                        LOCAL_GL_LINEAR);
-    aGL->fTexParameteri(LOCAL_GL_TEXTURE_RECTANGLE_ARB,
-                        LOCAL_GL_TEXTURE_MAG_FILTER,
-                        LOCAL_GL_LINEAR);
-    aGL->fTexParameteri(LOCAL_GL_TEXTURE_RECTANGLE_ARB,
-                        LOCAL_GL_TEXTURE_WRAP_T,
-                        LOCAL_GL_CLAMP_TO_EDGE);
-    aGL->fTexParameteri(LOCAL_GL_TEXTURE_RECTANGLE_ARB,
-                        LOCAL_GL_TEXTURE_WRAP_S,
-                        LOCAL_GL_CLAMP_TO_EDGE);
-
-    mIOSurface->CGLTexImageIOSurface2D(gl::GLContextCGL::Cast(aGL)->GetCGLContext());
-    mGLContext = aGL;
-  }
-}
-
-} // namespace widget
-} // namespace mozilla
diff --git a/widget/cocoa/SwipeTracker.h b/widget/cocoa/SwipeTracker.h
deleted file mode 100644
index 78940d15cc..0000000000
--- a/widget/cocoa/SwipeTracker.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef SwipeTracker_h
-#define SwipeTracker_h
-
-#include "EventForwards.h"
-#include "mozilla/layers/AxisPhysicsMSDModel.h"
-#include "mozilla/RefPtr.h"
-#include "mozilla/TimeStamp.h"
-#include "nsRefreshDriver.h"
-#include "Units.h"
-
-class nsIPresShell;
-
-namespace mozilla {
-
-class PanGestureInput;
-
-/**
- * SwipeTracker turns PanGestureInput events into swipe events
- * (WidgetSimpleGestureEvent) and dispatches them into Gecko.
- * The swiping behavior mirrors the behavior of the Cocoa API
- * -[NSEvent trackSwipeEventWithOptions:dampenAmountThresholdMin:max:usingHandler:].
- * The advantage of using this class over the Cocoa API is that this class
- * properly supports submitting queued up events to it, and that it hopefully
- * doesn't intermittently break scrolling the way the Cocoa API does (bug 927702).
- *
- * The swipe direction is either left or right. It is determined before the
- * SwipeTracker is created and stays fixed during the swipe.
- * During the swipe, the swipe has a current "value" which is between 0 and the
- * target value. The target value is either 1 (swiping left) or -1 (swiping
- * right) - see SwipeSuccessTargetValue().
- * A swipe can either succeed or fail. If it succeeds, the swipe animation
- * animates towards the success target value; if it fails, it animates back to
- * a value of 0. A swipe can only succeed if the user is swiping in an allowed
- * direction. (Since both the allowed directions and the swipe direction are
- * known at swipe start time, it's clear from the beginning whether a swipe is
- * doomed to fail. In that case, the purpose of the SwipeTracker is to simulate
- * a bounce-back animation.)
- */
-class SwipeTracker final : public nsARefreshObserver {
-public:
-  NS_INLINE_DECL_REFCOUNTING(SwipeTracker, override)
-
-  SwipeTracker(nsChildView& aWidget,
-               const PanGestureInput& aSwipeStartEvent,
-               uint32_t aAllowedDirections,
-               uint32_t aSwipeDirection);
-
-  void Destroy();
-
-  nsEventStatus ProcessEvent(const PanGestureInput& aEvent);
-  void CancelSwipe();
-
-  static WidgetSimpleGestureEvent
-    CreateSwipeGestureEvent(EventMessage aMsg, nsIWidget* aWidget,
-                            const LayoutDeviceIntPoint& aPosition);
-
-
-  // nsARefreshObserver
-  void WillRefresh(mozilla::TimeStamp aTime) override;
-
-protected:
-  ~SwipeTracker();
-
-  bool SwipingInAllowedDirection() const { return mAllowedDirections & mSwipeDirection; }
-  double SwipeSuccessTargetValue() const;
-  double ClampToAllowedRange(double aGestureAmount) const;
-  bool ComputeSwipeSuccess() const;
-  void StartAnimating(double aTargetValue);
-  void SwipeFinished();
-  void UnregisterFromRefreshDriver();
-  bool SendSwipeEvent(EventMessage aMsg, uint32_t aDirection, double aDelta);
-
-  nsChildView& mWidget;
-  RefPtr<nsRefreshDriver> mRefreshDriver;
-  layers::AxisPhysicsMSDModel mAxis;
-  const LayoutDeviceIntPoint mEventPosition;
-  TimeStamp mLastEventTimeStamp;
-  TimeStamp mLastAnimationFrameTime;
-  const uint32_t mAllowedDirections;
-  const uint32_t mSwipeDirection;
-  double mGestureAmount;
-  double mCurrentVelocity;
-  bool mEventsAreControllingSwipe;
-  bool mEventsHaveStartedNewGesture;
-  bool mRegisteredWithRefreshDriver;
-};
-
-} // namespace mozilla
-
-#endif // SwipeTracker_h
diff --git a/widget/cocoa/SwipeTracker.mm b/widget/cocoa/SwipeTracker.mm
deleted file mode 100644
index 51169171a4..0000000000
--- a/widget/cocoa/SwipeTracker.mm
+++ /dev/null
@@ -1,219 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "SwipeTracker.h"
-
-#include "InputData.h"
-#include "mozilla/TimeStamp.h"
-#include "mozilla/TouchEvents.h"
-#include "nsAlgorithm.h"
-#include "nsChildView.h"
-#include "UnitTransforms.h"
-
-// These values were tweaked to make the physics feel similar to the native swipe.
-static const double kSpringForce = 250.0;
-static const double kVelocityTwitchTolerance = 0.0000001;
-static const double kWholePagePixelSize = 1000.0;
-static const double kRubberBandResistanceFactor = 4.0;
-static const double kSwipeSuccessThreshold = 0.25;
-static const double kSwipeSuccessVelocityContribution = 0.3;
-
-namespace mozilla {
-
-static already_AddRefed<nsRefreshDriver>
-GetRefreshDriver(nsIWidget& aWidget)
-{
-  nsIWidgetListener* widgetListener = aWidget.GetWidgetListener();
-  nsIPresShell* presShell = widgetListener ? widgetListener->GetPresShell() : nullptr;
-  nsPresContext* presContext = presShell ? presShell->GetPresContext() : nullptr;
-  RefPtr<nsRefreshDriver> refreshDriver = presContext ? presContext->RefreshDriver() : nullptr;
-  return refreshDriver.forget();
-}
-
-SwipeTracker::SwipeTracker(nsChildView& aWidget,
-                           const PanGestureInput& aSwipeStartEvent,
-                           uint32_t aAllowedDirections,
-                           uint32_t aSwipeDirection)
-  : mWidget(aWidget)
-  , mRefreshDriver(GetRefreshDriver(mWidget))
-  , mAxis(0.0, 0.0, 0.0, kSpringForce, 1.0)
-  , mEventPosition(RoundedToInt(ViewAs<LayoutDevicePixel>(aSwipeStartEvent.mPanStartPoint,
-                                  PixelCastJustification::LayoutDeviceIsScreenForUntransformedEvent)))
-  , mLastEventTimeStamp(aSwipeStartEvent.mTimeStamp)
-  , mAllowedDirections(aAllowedDirections)
-  , mSwipeDirection(aSwipeDirection)
-  , mGestureAmount(0.0)
-  , mCurrentVelocity(0.0)
-  , mEventsAreControllingSwipe(true)
-  , mEventsHaveStartedNewGesture(false)
-  , mRegisteredWithRefreshDriver(false)
-{
-  SendSwipeEvent(eSwipeGestureStart, 0, 0.0);
-  ProcessEvent(aSwipeStartEvent);
-}
-
-void
-SwipeTracker::Destroy()
-{
-  UnregisterFromRefreshDriver();
-}
-
-SwipeTracker::~SwipeTracker()
-{
-  MOZ_ASSERT(!mRegisteredWithRefreshDriver, "Destroy needs to be called before deallocating");
-}
-
-double
-SwipeTracker::SwipeSuccessTargetValue() const
-{
-  return (mSwipeDirection == nsIDOMSimpleGestureEvent::DIRECTION_RIGHT) ? -1.0 : 1.0;
-}
-
-double
-SwipeTracker::ClampToAllowedRange(double aGestureAmount) const
-{
-  // gestureAmount needs to stay between -1 and 0 when swiping right and
-  // between 0 and 1 when swiping left.
-  double min = (mSwipeDirection == nsIDOMSimpleGestureEvent::DIRECTION_RIGHT) ? -1.0 : 0.0;
-  double max = (mSwipeDirection == nsIDOMSimpleGestureEvent::DIRECTION_LEFT) ? 1.0 : 0.0;
-  return clamped(aGestureAmount, min, max);
-}
-
-bool
-SwipeTracker::ComputeSwipeSuccess() const
-{
-  double targetValue = SwipeSuccessTargetValue();
-
-  // If the fingers were moving away from the target direction when they were
-  // lifted from the touchpad, abort the swipe.
-  if (mCurrentVelocity * targetValue < -kVelocityTwitchTolerance) {
-    return false;
-  }
-
-  return (mGestureAmount * targetValue +
-          mCurrentVelocity * targetValue * kSwipeSuccessVelocityContribution) >= kSwipeSuccessThreshold;
-}
-
-nsEventStatus
-SwipeTracker::ProcessEvent(const PanGestureInput& aEvent)
-{
-  // If the fingers have already been lifted, don't process this event for swiping.
-  if (!mEventsAreControllingSwipe) {
-    // Return nsEventStatus_eConsumeNoDefault for events from the swipe gesture
-    // and nsEventStatus_eIgnore for events of subsequent scroll gestures.
-    if (aEvent.mType == PanGestureInput::PANGESTURE_MAYSTART ||
-        aEvent.mType == PanGestureInput::PANGESTURE_START) {
-      mEventsHaveStartedNewGesture = true;
-    }
-    return mEventsHaveStartedNewGesture ? nsEventStatus_eIgnore : nsEventStatus_eConsumeNoDefault;
-  }
-
-  double delta = -aEvent.mPanDisplacement.x / mWidget.BackingScaleFactor() / kWholePagePixelSize;
-  if (!SwipingInAllowedDirection()) {
-    delta /= kRubberBandResistanceFactor;
-  }
-  mGestureAmount = ClampToAllowedRange(mGestureAmount + delta);
-  SendSwipeEvent(eSwipeGestureUpdate, 0, mGestureAmount);
-
-  if (aEvent.mType != PanGestureInput::PANGESTURE_END) {
-    double elapsedSeconds = std::max(0.008, (aEvent.mTimeStamp - mLastEventTimeStamp).ToSeconds());
-    mCurrentVelocity = delta / elapsedSeconds;
-    mLastEventTimeStamp = aEvent.mTimeStamp;
-  } else {
-    mEventsAreControllingSwipe = false;
-    bool didSwipeSucceed = SwipingInAllowedDirection() && ComputeSwipeSuccess();
-    double targetValue = 0.0;
-    if (didSwipeSucceed) {
-      SendSwipeEvent(eSwipeGesture, mSwipeDirection, 0.0);
-      targetValue = SwipeSuccessTargetValue();
-    }
-    StartAnimating(targetValue);
-  }
-
-  return nsEventStatus_eConsumeNoDefault;
-}
-
-void
-SwipeTracker::StartAnimating(double aTargetValue)
-{
-  mAxis.SetPosition(mGestureAmount);
-  mAxis.SetDestination(aTargetValue);
-  mAxis.SetVelocity(mCurrentVelocity);
-
-  mLastAnimationFrameTime = TimeStamp::Now();
-
-  // Add ourselves as a refresh driver observer. The refresh driver
-  // will call WillRefresh for each animation frame until we
-  // unregister ourselves.
-  MOZ_ASSERT(!mRegisteredWithRefreshDriver);
-  if (mRefreshDriver) {
-    mRefreshDriver->AddRefreshObserver(this, Flush_Style);
-    mRegisteredWithRefreshDriver = true;
-  }
-}
-
-void
-SwipeTracker::WillRefresh(mozilla::TimeStamp aTime)
-{
-  TimeStamp now = TimeStamp::Now();
-  mAxis.Simulate(now - mLastAnimationFrameTime);
-  mLastAnimationFrameTime = now;
-
-  bool isFinished = mAxis.IsFinished(1.0 / kWholePagePixelSize);
-  mGestureAmount = (isFinished ? mAxis.GetDestination() : mAxis.GetPosition());
-  SendSwipeEvent(eSwipeGestureUpdate, 0, mGestureAmount);
-
-  if (isFinished) {
-    UnregisterFromRefreshDriver();
-    SwipeFinished();
-  }
-}
-
-void
-SwipeTracker::CancelSwipe()
-{
-  SendSwipeEvent(eSwipeGestureEnd, 0, 0.0);
-}
-
-void SwipeTracker::SwipeFinished()
-{
-  SendSwipeEvent(eSwipeGestureEnd, 0, 0.0);
-  mWidget.SwipeFinished();
-}
-
-void
-SwipeTracker::UnregisterFromRefreshDriver()
-{
-  if (mRegisteredWithRefreshDriver) {
-    MOZ_ASSERT(mRefreshDriver, "How were we able to register, then?");
-    mRefreshDriver->RemoveRefreshObserver(this, Flush_Style);
-  }
-  mRegisteredWithRefreshDriver = false;
-}
-
-/* static */ WidgetSimpleGestureEvent
-SwipeTracker::CreateSwipeGestureEvent(EventMessage aMsg, nsIWidget* aWidget,
-                                      const LayoutDeviceIntPoint& aPosition)
-{
-  WidgetSimpleGestureEvent geckoEvent(true, aMsg, aWidget);
-  geckoEvent.mModifiers = 0;
-  geckoEvent.mTimeStamp = TimeStamp::Now();
-  geckoEvent.mRefPoint = aPosition;
-  geckoEvent.buttons = 0;
-  return geckoEvent;
-}
-
-bool
-SwipeTracker::SendSwipeEvent(EventMessage aMsg, uint32_t aDirection, double aDelta)
-{
-  WidgetSimpleGestureEvent geckoEvent =
-    CreateSwipeGestureEvent(aMsg, &mWidget, mEventPosition);
-  geckoEvent.mDirection = aDirection;
-  geckoEvent.mDelta = aDelta;
-  geckoEvent.mAllowedDirections = mAllowedDirections;
-  return mWidget.DispatchWindowEvent(geckoEvent);
-}
-
-} // namespace mozilla
diff --git a/widget/cocoa/TextInputHandler.h b/widget/cocoa/TextInputHandler.h
deleted file mode 100644
index 86da354abb..0000000000
--- a/widget/cocoa/TextInputHandler.h
+++ /dev/null
@@ -1,1194 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef TextInputHandler_h_
-#define TextInputHandler_h_
-
-#include "nsCocoaUtils.h"
-
-#import <Carbon/Carbon.h>
-#import <Cocoa/Cocoa.h>
-#include "mozView.h"
-#include "nsString.h"
-#include "nsCOMPtr.h"
-#include "nsITimer.h"
-#include "nsTArray.h"
-#include "mozilla/EventForwards.h"
-#include "mozilla/TextEventDispatcherListener.h"
-#include "WritingModes.h"
-
-class nsChildView;
-
-namespace mozilla {
-namespace widget {
-
-// Key code constants
-enum
-{
-#if !defined(MAC_OS_X_VERSION_10_12) || \
-  MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12
-  kVK_RightCommand    = 0x36, // right command key
-#endif
-
-  kVK_PC_PrintScreen     = kVK_F13,
-  kVK_PC_ScrollLock      = kVK_F14,
-  kVK_PC_Pause           = kVK_F15,
-
-  kVK_PC_Insert          = kVK_Help,
-  kVK_PC_Backspace       = kVK_Delete,
-  kVK_PC_Delete          = kVK_ForwardDelete,
-
-  kVK_PC_ContextMenu     = 0x6E,
-
-  kVK_Powerbook_KeypadEnter = 0x34  // Enter on Powerbook's keyboard is different
-};
-
-/**
- * TISInputSourceWrapper is a wrapper for the TISInputSourceRef.  If we get the
- * TISInputSourceRef from InputSourceID, we need to release the CFArray instance
- * which is returned by TISCreateInputSourceList.  However, when we release the
- * list, we cannot access the TISInputSourceRef.  So, it's not usable, and it
- * may cause the memory leak bugs.  nsTISInputSource automatically releases the
- * list when the instance is destroyed.
- */
-class TISInputSourceWrapper
-{
-public:
-  static TISInputSourceWrapper& CurrentInputSource();
-  /**
-   * Shutdown() should be called when nobody doesn't need to use this class.
-   */
-  static void Shutdown();
-
-  TISInputSourceWrapper()
-  {
-    mInputSourceList = nullptr;
-    Clear();
-  }
-
-  explicit TISInputSourceWrapper(const char* aID)
-  {
-    mInputSourceList = nullptr;
-    InitByInputSourceID(aID);
-  }
-
-  explicit TISInputSourceWrapper(SInt32 aLayoutID)
-  {
-    mInputSourceList = nullptr;
-    InitByLayoutID(aLayoutID);
-  }
-
-  explicit TISInputSourceWrapper(TISInputSourceRef aInputSource)
-  {
-    mInputSourceList = nullptr;
-    InitByTISInputSourceRef(aInputSource);
-  }
-
-  ~TISInputSourceWrapper() { Clear(); }
-
-  void InitByInputSourceID(const char* aID);
-  void InitByInputSourceID(const nsAFlatString &aID);
-  void InitByInputSourceID(const CFStringRef aID);
-  /**
-   * InitByLayoutID() initializes the keyboard layout by the layout ID.
-   *
-   * @param aLayoutID             An ID of keyboard layout.
-   *                                0: US
-   *                                1: Greek
-   *                                2: German
-   *                                3: Swedish-Pro
-   *                                4: Dvorak-Qwerty Cmd
-   *                                5: Thai
-   *                                6: Arabic
-   *                                7: French
-   *                                8: Hebrew
-   *                                9: Lithuanian
-   *                               10: Norwegian
-   *                               11: Spanish
-   * @param aOverrideKeyboard     When testing set to TRUE, otherwise, set to
-   *                              FALSE.  When TRUE, we use an ANSI keyboard
-   *                              instead of the actual keyboard.
-   */
-  void InitByLayoutID(SInt32 aLayoutID, bool aOverrideKeyboard = false);
-  void InitByCurrentInputSource();
-  void InitByCurrentKeyboardLayout();
-  void InitByCurrentASCIICapableInputSource();
-  void InitByCurrentASCIICapableKeyboardLayout();
-  void InitByCurrentInputMethodKeyboardLayoutOverride();
-  void InitByTISInputSourceRef(TISInputSourceRef aInputSource);
-  void InitByLanguage(CFStringRef aLanguage);
-
-  /**
-   * If the instance is initialized with a keyboard layout input source,
-   * returns it.
-   * If the instance is initialized with an IME mode input source, the result
-   * references the keyboard layout for the IME mode.  However, this can be
-   * initialized only when the IME mode is actually selected.  I.e, if IME mode
-   * input source is initialized with LayoutID or SourceID, this returns null.
-   */
-  TISInputSourceRef GetKeyboardLayoutInputSource() const
-  {
-    return mKeyboardLayout;
-  }
-  const UCKeyboardLayout* GetUCKeyboardLayout();
-
-  bool IsOpenedIMEMode();
-  bool IsIMEMode();
-  bool IsKeyboardLayout();
-
-  bool IsASCIICapable()
-  {
-    NS_ENSURE_TRUE(mInputSource, false);
-    return GetBoolProperty(kTISPropertyInputSourceIsASCIICapable);
-  }
-
-  bool IsEnabled()
-  {
-    NS_ENSURE_TRUE(mInputSource, false);
-    return GetBoolProperty(kTISPropertyInputSourceIsEnabled);
-  }
-
-  bool GetLanguageList(CFArrayRef &aLanguageList);
-  bool GetPrimaryLanguage(CFStringRef &aPrimaryLanguage);
-  bool GetPrimaryLanguage(nsAString &aPrimaryLanguage);
-
-  bool GetLocalizedName(CFStringRef &aName)
-  {
-    NS_ENSURE_TRUE(mInputSource, false);
-    return GetStringProperty(kTISPropertyLocalizedName, aName);
-  }
-
-  bool GetLocalizedName(nsAString &aName)
-  {
-    NS_ENSURE_TRUE(mInputSource, false);
-    return GetStringProperty(kTISPropertyLocalizedName, aName);
-  }
-
-  bool GetInputSourceID(CFStringRef &aID)
-  {
-    NS_ENSURE_TRUE(mInputSource, false);
-    return GetStringProperty(kTISPropertyInputSourceID, aID);
-  }
-
-  bool GetInputSourceID(nsAString &aID)
-  {
-    NS_ENSURE_TRUE(mInputSource, false);
-    return GetStringProperty(kTISPropertyInputSourceID, aID);
-  }
-
-  bool GetBundleID(CFStringRef &aBundleID)
-  {
-    NS_ENSURE_TRUE(mInputSource, false);
-    return GetStringProperty(kTISPropertyBundleID, aBundleID);
-  }
-
-  bool GetBundleID(nsAString &aBundleID)
-  {
-    NS_ENSURE_TRUE(mInputSource, false);
-    return GetStringProperty(kTISPropertyBundleID, aBundleID);
-  }
-
-  bool GetInputSourceType(CFStringRef &aType)
-  {
-    NS_ENSURE_TRUE(mInputSource, false);
-    return GetStringProperty(kTISPropertyInputSourceType, aType);
-  }
-
-  bool GetInputSourceType(nsAString &aType)
-  {
-    NS_ENSURE_TRUE(mInputSource, false);
-    return GetStringProperty(kTISPropertyInputSourceType, aType);
-  }
-
-  bool IsForRTLLanguage();
-  bool IsInitializedByCurrentInputSource();
-
-  enum {
-    // 40 is an actual result of the ::LMGetKbdType() when we connect an
-    // unknown keyboard and set the keyboard type to ANSI manually on the
-    // set up dialog.
-    eKbdType_ANSI = 40
-  };
-
-  void Select();
-  void Clear();
-
-  /**
-   * InitKeyEvent() initializes aKeyEvent for aNativeKeyEvent.
-   *
-   * @param aNativeKeyEvent       A native key event for which you want to
-   *                              dispatch a Gecko key event.
-   * @param aKeyEvent             The result -- a Gecko key event initialized
-   *                              from the native key event.
-   * @param aInsertString         If caller expects that the event will cause
-   *                              a character to be input (say in an editor),
-   *                              the caller should set this.  Otherwise,
-   *                              if caller sets null to this, this method will
-   *                              compute the character to be input from
-   *                              characters of aNativeKeyEvent.
-   */
-  void InitKeyEvent(NSEvent *aNativeKeyEvent, WidgetKeyboardEvent& aKeyEvent,
-                    const nsAString *aInsertString = nullptr);
-
-  /**
-   * WillDispatchKeyboardEvent() computes aKeyEvent.mAlternativeCharCodes and
-   * recompute aKeyEvent.mCharCode if it's necessary.
-   *
-   * @param aNativeKeyEvent       A native key event for which you want to
-   *                              dispatch a Gecko key event.
-   * @param aInsertString         If caller expects that the event will cause
-   *                              a character to be input (say in an editor),
-   *                              the caller should set this.  Otherwise,
-   *                              if caller sets null to this, this method will
-   *                              compute the character to be input from
-   *                              characters of aNativeKeyEvent.
-   * @param aKeyEvent             The result -- a Gecko key event initialized
-   *                              from the native key event.  This must be
-   *                              eKeyPress event.
-   */
-  void WillDispatchKeyboardEvent(NSEvent* aNativeKeyEvent,
-                                 const nsAString* aInsertString,
-                                 WidgetKeyboardEvent& aKeyEvent);
-
-  /**
-   * ComputeGeckoKeyCode() returns Gecko keycode for aNativeKeyCode on current
-   * keyboard layout.
-   *
-   * @param aNativeKeyCode        A native keycode.
-   * @param aKbType               A native Keyboard Type value.  Typically,
-   *                              this is a result of ::LMGetKbdType().
-   * @param aCmdIsPressed         TRUE if Cmd key is pressed.  Otherwise, FALSE.
-   * @return                      The computed Gecko keycode.
-   */
-  uint32_t ComputeGeckoKeyCode(UInt32 aNativeKeyCode, UInt32 aKbType,
-                               bool aCmdIsPressed);
-
-  /**
-   * ComputeGeckoKeyNameIndex() returns Gecko key name index for the key.
-   *
-   * @param aNativeKeyCode        A native keycode.
-   */
-  static KeyNameIndex ComputeGeckoKeyNameIndex(UInt32 aNativeKeyCode);
-
-  /**
-   * ComputeGeckoCodeNameIndex() returns Gecko code name index for the key.
-   *
-   * @param aNativeKeyCode        A native keycode.
-   */
-  static CodeNameIndex ComputeGeckoCodeNameIndex(UInt32 aNativeKeyCode);
-
-protected:
-  /**
-   * TranslateToString() computes the inputted text from the native keyCode,
-   * modifier flags and keyboard type.
-   *
-   * @param aKeyCode              A native keyCode.
-   * @param aModifiers            Combination of native modifier flags.
-   * @param aKbType               A native Keyboard Type value.  Typically,
-   *                              this is a result of ::LMGetKbdType().
-   * @param aStr                  Result, i.e., inputted text.
-   *                              The result can be two or more characters.
-   * @return                      If succeeded, TRUE.  Otherwise, FALSE.
-   *                              Even if TRUE, aStr can be empty string.
-   */
-  bool TranslateToString(UInt32 aKeyCode, UInt32 aModifiers,
-                           UInt32 aKbType, nsAString &aStr);
-
-  /**
-   * TranslateToChar() computes the inputted character from the native keyCode,
-   * modifier flags and keyboard type.  If two or more characters would be
-   * input, this returns 0.
-   *
-   * @param aKeyCode              A native keyCode.
-   * @param aModifiers            Combination of native modifier flags.
-   * @param aKbType               A native Keyboard Type value.  Typically,
-   *                              this is a result of ::LMGetKbdType().
-   * @return                      If succeeded and the result is one character,
-   *                              returns the charCode of it.  Otherwise,
-   *                              returns 0.
-   */
-  uint32_t TranslateToChar(UInt32 aKeyCode, UInt32 aModifiers, UInt32 aKbType);
-
-  /**
-   * ComputeInsertString() computes string to be inserted with the key event.
-   *
-   * @param aNativeKeyEvent     The native key event which causes our keyboard
-   *                            event(s).
-   * @param aKeyEvent           A Gecko key event which was partially
-   *                            initialized with aNativeKeyEvent.
-   * @param aInsertString       The string to be inputting by aNativeKeyEvent.
-   *                            This should be specified by InsertText().
-   *                            In other words, if the key event doesn't cause
-   *                            a call of InsertText(), this can be nullptr.
-   * @param aResult             The string which should be set to charCode of
-   *                            keypress event(s).
-   */
-  void ComputeInsertStringForCharCode(NSEvent* aNativeKeyEvent,
-                                      const WidgetKeyboardEvent& aKeyEvent,
-                                      const nsAString* aInsertString,
-                                      nsAString& aResult);
-
-  /**
-   * IsPrintableKeyEvent() returns true if aNativeKeyEvent is caused by
-   * a printable key.  Otherwise, returns false.
-   */
-  bool IsPrintableKeyEvent(NSEvent* aNativeKeyEvent) const;
-
-  /**
-   * GetKbdType() returns physical keyboard type.
-   */
-  UInt32 GetKbdType() const;
-
-  bool GetBoolProperty(const CFStringRef aKey);
-  bool GetStringProperty(const CFStringRef aKey, CFStringRef &aStr);
-  bool GetStringProperty(const CFStringRef aKey, nsAString &aStr);
-
-  TISInputSourceRef mInputSource;
-  TISInputSourceRef mKeyboardLayout;
-  CFArrayRef mInputSourceList;
-  const UCKeyboardLayout* mUCKeyboardLayout;
-  int8_t mIsRTL;
-
-  bool mOverrideKeyboard;
-
-  static TISInputSourceWrapper* sCurrentInputSource;
-};
-
-/**
- * TextInputHandlerBase is a base class of IMEInputHandler and TextInputHandler.
- * Utility methods should be implemented this level.
- */
-
-class TextInputHandlerBase : public TextEventDispatcherListener
-{
-public:
-  /**
-   * Other TextEventDispatcherListener methods should be implemented in
-   * IMEInputHandler.
-   */
-  NS_DECL_ISUPPORTS
-
-  /**
-   * DispatchEvent() dispatches aEvent on mWidget.
-   *
-   * @param aEvent                An event which you want to dispatch.
-   * @return                      TRUE if the event is consumed by web contents
-   *                              or chrome contents.  Otherwise, FALSE.
-   */
-  bool DispatchEvent(WidgetGUIEvent& aEvent);
-
-  /**
-   * SetSelection() dispatches eSetSelection event for the aRange.
-   *
-   * @param aRange                The range which will be selected.
-   * @return                      TRUE if setting selection is succeeded and
-   *                              the widget hasn't been destroyed.
-   *                              Otherwise, FALSE.
-   */
-  bool SetSelection(NSRange& aRange);
-
-  /**
-   * InitKeyEvent() initializes aKeyEvent for aNativeKeyEvent.
-   *
-   * @param aNativeKeyEvent       A native key event for which you want to
-   *                              dispatch a Gecko key event.
-   * @param aKeyEvent             The result -- a Gecko key event initialized
-   *                              from the native key event.
-   * @param aInsertString         If caller expects that the event will cause
-   *                              a character to be input (say in an editor),
-   *                              the caller should set this.  Otherwise,
-   *                              if caller sets null to this, this method will
-   *                              compute the character to be input from
-   *                              characters of aNativeKeyEvent.
-   */
-  void InitKeyEvent(NSEvent *aNativeKeyEvent, WidgetKeyboardEvent& aKeyEvent,
-                    const nsAString *aInsertString = nullptr);
-
-  /**
-   * SynthesizeNativeKeyEvent() is an implementation of
-   * nsIWidget::SynthesizeNativeKeyEvent().  See the document in nsIWidget.h
-   * for the detail.
-   */
-  nsresult SynthesizeNativeKeyEvent(int32_t aNativeKeyboardLayout,
-                                    int32_t aNativeKeyCode,
-                                    uint32_t aModifierFlags,
-                                    const nsAString& aCharacters,
-                                    const nsAString& aUnmodifiedCharacters);
-
-  /**
-   * Utility method intended for testing. Attempts to construct a native key
-   * event that would have been generated during an actual key press. This
-   * *does not dispatch* the native event. Instead, it is attached to the
-   * |mNativeKeyEvent| field of the Gecko event that is passed in.
-   * @param aKeyEvent  Gecko key event to attach the native event to
-   */
-  NS_IMETHOD AttachNativeKeyEvent(WidgetKeyboardEvent& aKeyEvent);
-
-  /**
-   * GetWindowLevel() returns the window level of current focused (in Gecko)
-   * window.  E.g., if an <input> element in XUL panel has focus, this returns
-   * the XUL panel's window level.
-   */
-  NSInteger GetWindowLevel();
-
-  /**
-   * IsSpecialGeckoKey() checks whether aNativeKeyCode is mapped to a special
-   * Gecko keyCode.  A key is "special" if it isn't used for text input.
-   *
-   * @param aNativeKeyCode        A native keycode.
-   * @return                      If the keycode is mapped to a special key,
-   *                              TRUE.  Otherwise, FALSE.
-   */
-  static bool IsSpecialGeckoKey(UInt32 aNativeKeyCode);
-
-
-  /**
-   * EnableSecureEventInput() and DisableSecureEventInput() wrap the Carbon
-   * Event Manager APIs with the same names.  In addition they keep track of
-   * how many times we've called them (in the same process) -- unlike the
-   * Carbon Event Manager APIs, which only keep track of how many times they've
-   * been called from any and all processes.
-   *
-   * The Carbon Event Manager's IsSecureEventInputEnabled() returns whether
-   * secure event input mode is enabled (in any process).  This class's
-   * IsSecureEventInputEnabled() returns whether we've made any calls to
-   * EnableSecureEventInput() that are not (yet) offset by the calls we've
-   * made to DisableSecureEventInput().
-   */
-  static void EnableSecureEventInput();
-  static void DisableSecureEventInput();
-  static bool IsSecureEventInputEnabled();
-
-  /**
-   * EnsureSecureEventInputDisabled() calls DisableSecureEventInput() until
-   * our call count becomes 0.
-   */
-  static void EnsureSecureEventInputDisabled();
-
-public:
-   /**
-   * mWidget must not be destroyed without OnDestroyWidget being called.
-   *
-   * @param aDestroyingWidget     Destroying widget.  This might not be mWidget.
-   * @return                      This result doesn't have any meaning for
-   *                              callers.  When aDstroyingWidget isn't the same
-   *                              as mWidget, FALSE.  Then, inherited methods in
-   *                              sub classes should return from this method
-   *                              without cleaning up.
-   */
-  virtual bool OnDestroyWidget(nsChildView* aDestroyingWidget);
-
-protected:
-  // The creator of this instance, client and its text event dispatcher.
-  // These members must not be nullptr after initialized until
-  // OnDestroyWidget() is called.
-  nsChildView* mWidget; // [WEAK]
-  RefPtr<TextEventDispatcher> mDispatcher;
-
-  // The native view for mWidget.
-  // This view handles the actual text inputting.
-  NSView<mozView>* mView; // [STRONG]
-
-  TextInputHandlerBase(nsChildView* aWidget, NSView<mozView> *aNativeView);
-  virtual ~TextInputHandlerBase();
-
-  bool Destroyed() { return !mWidget; }
-
-  /**
-   * mCurrentKeyEvent indicates what key event we are handling.  While
-   * handling a native keydown event, we need to store the event for insertText,
-   * doCommandBySelector and various action message handlers of NSResponder
-   * such as [NSResponder insertNewline:sender].
-   */
-  struct KeyEventState
-  {
-    // Handling native key event
-    NSEvent* mKeyEvent;
-    // String specified by InsertText().  This is not null only during a
-    // call of InsertText().
-    nsAString* mInsertString;
-    // String which are included in [mKeyEvent characters] and already handled
-    // by InsertText() call(s).
-    nsString mInsertedString;
-    // Whether keydown event was consumed by web contents or chrome contents.
-    bool mKeyDownHandled;
-    // Whether keypress event was dispatched for mKeyEvent.
-    bool mKeyPressDispatched;
-    // Whether keypress event was consumed by web contents or chrome contents.
-    bool mKeyPressHandled;
-    // Whether the key event causes other key events via IME or something.
-    bool mCausedOtherKeyEvents;
-    // Whether the key event causes composition change or committing
-    // composition.  So, even if InsertText() is called, this may be false
-    // if it dispatches keypress event.
-    bool mCompositionDispatched;
-
-    KeyEventState() : mKeyEvent(nullptr)
-    {
-      Clear();
-    }    
-
-    explicit KeyEventState(NSEvent* aNativeKeyEvent) : mKeyEvent(nullptr)
-    {
-      Clear();
-      Set(aNativeKeyEvent);
-    }
-
-    KeyEventState(const KeyEventState &aOther) = delete;
-
-    ~KeyEventState()
-    {
-      Clear();
-    }
-
-    void Set(NSEvent* aNativeKeyEvent)
-    {
-      NS_PRECONDITION(aNativeKeyEvent, "aNativeKeyEvent must not be NULL");
-      Clear();
-      mKeyEvent = [aNativeKeyEvent retain];
-    }
-
-    void Clear()
-    {
-      if (mKeyEvent) {
-        [mKeyEvent release];
-        mKeyEvent = nullptr;
-      }
-      mInsertString = nullptr;
-      mInsertedString.Truncate();
-      mKeyDownHandled = false;
-      mKeyPressDispatched = false;
-      mKeyPressHandled = false;
-      mCausedOtherKeyEvents = false;
-      mCompositionDispatched = false;
-    }
-
-    bool IsDefaultPrevented() const
-    {
-      return mKeyDownHandled || mKeyPressHandled || mCausedOtherKeyEvents ||
-             mCompositionDispatched;
-    }
-
-    bool CanDispatchKeyPressEvent() const
-    {
-      return !mKeyPressDispatched && !IsDefaultPrevented();
-    }
-
-    void InitKeyEvent(TextInputHandlerBase* aHandler,
-                      WidgetKeyboardEvent& aKeyEvent);
-
-    /**
-     * GetUnhandledString() returns characters of the event which have not been
-     * handled with InsertText() yet. For example, if there is a composition
-     * caused by a dead key press like '`' and it's committed by some key
-     * combinations like |Cmd+v|, then, the |v|'s KeyDown event's |characters|
-     * is |`v|.  Then, after |`| is committed with a call of InsertString(),
-     * this returns only 'v'.
-     */
-    void GetUnhandledString(nsAString& aUnhandledString) const;
-  };
-
-  /**
-   * Helper classes for guaranteeing cleaning mCurrentKeyEvent
-   */
-  class AutoKeyEventStateCleaner
-  {
-  public:
-    explicit AutoKeyEventStateCleaner(TextInputHandlerBase* aHandler) :
-      mHandler(aHandler)
-    {
-    }
-
-    ~AutoKeyEventStateCleaner()
-    {
-      mHandler->RemoveCurrentKeyEvent();
-    }
-  private:
-    RefPtr<TextInputHandlerBase> mHandler;
-  };
-
-  class MOZ_STACK_CLASS AutoInsertStringClearer
-  {
-  public:
-    explicit AutoInsertStringClearer(KeyEventState* aState)
-      : mState(aState)
-    {
-    }
-    ~AutoInsertStringClearer();
-
-  private:
-    KeyEventState* mState;
-  };
-
-  /**
-   * mCurrentKeyEvents stores all key events which are being processed.
-   * When we call interpretKeyEvents, IME may generate other key events.
-   * mCurrentKeyEvents[0] is the latest key event.
-   */
-  nsTArray<KeyEventState*> mCurrentKeyEvents;
-
-  /**
-   * mFirstKeyEvent must be used for first key event.  This member prevents
-   * memory fragmentation for most key events.
-   */
-  KeyEventState mFirstKeyEvent;
-
-  /**
-   * PushKeyEvent() adds the current key event to mCurrentKeyEvents.
-   */
-  KeyEventState* PushKeyEvent(NSEvent* aNativeKeyEvent)
-  {
-    uint32_t nestCount = mCurrentKeyEvents.Length();
-    for (uint32_t i = 0; i < nestCount; i++) {
-      // When the key event is caused by another key event, all key events
-      // which are being handled should be marked as "consumed".
-      mCurrentKeyEvents[i]->mCausedOtherKeyEvents = true;
-    }
-
-    KeyEventState* keyEvent = nullptr;
-    if (nestCount == 0) {
-      mFirstKeyEvent.Set(aNativeKeyEvent);
-      keyEvent = &mFirstKeyEvent;
-    } else {
-      keyEvent = new KeyEventState(aNativeKeyEvent);
-    }
-    return *mCurrentKeyEvents.AppendElement(keyEvent);
-  }
-
-  /**
-   * RemoveCurrentKeyEvent() removes the current key event from
-   * mCurrentKeyEvents.
-   */
-  void RemoveCurrentKeyEvent()
-  {
-    NS_ASSERTION(mCurrentKeyEvents.Length() > 0,
-                 "RemoveCurrentKeyEvent() is called unexpectedly");
-    KeyEventState* keyEvent = GetCurrentKeyEvent();
-    mCurrentKeyEvents.RemoveElementAt(mCurrentKeyEvents.Length() - 1);
-    if (keyEvent == &mFirstKeyEvent) {
-      keyEvent->Clear();
-    } else {
-      delete keyEvent;
-    }
-  }
-
-  /**
-   * GetCurrentKeyEvent() returns current processing key event.
-   */
-  KeyEventState* GetCurrentKeyEvent()
-  {
-    if (mCurrentKeyEvents.Length() == 0) {
-      return nullptr;
-    }
-    return mCurrentKeyEvents[mCurrentKeyEvents.Length() - 1];
-  }
-
-  struct KeyboardLayoutOverride final
-  {
-    int32_t mKeyboardLayout;
-    bool mOverrideEnabled;
-
-    KeyboardLayoutOverride() :
-      mKeyboardLayout(0), mOverrideEnabled(false)
-    {
-    }
-  };
-
-  const KeyboardLayoutOverride& KeyboardLayoutOverrideRef() const
-  {
-    return mKeyboardOverride;
-  }
-
-  /**
-   * IsPrintableChar() checks whether the unicode character is
-   * a non-printable ASCII character or not.  Note that this returns
-   * TRUE even if aChar is a non-printable UNICODE character.
-   *
-   * @param aChar                 A unicode character.
-   * @return                      TRUE if aChar is a printable ASCII character
-   *                              or a unicode character.  Otherwise, i.e,
-   *                              if aChar is a non-printable ASCII character,
-   *                              FALSE.
-   */
-  static bool IsPrintableChar(char16_t aChar);
-
-  /**
-   * IsNormalCharInputtingEvent() checks whether aKeyEvent causes text input.
-   *
-   * @param aKeyEvent             A key event.
-   * @return                      TRUE if the key event causes text input.
-   *                              Otherwise, FALSE.
-   */
-  static bool IsNormalCharInputtingEvent(const WidgetKeyboardEvent& aKeyEvent);
-
-  /**
-   * IsModifierKey() checks whether the native keyCode is for a modifier key.
-   *
-   * @param aNativeKeyCode        A native keyCode.
-   * @return                      TRUE if aNativeKeyCode is for a modifier key.
-   *                              Otherwise, FALSE.
-   */
-  static bool IsModifierKey(UInt32 aNativeKeyCode);
-
-private:
-  KeyboardLayoutOverride mKeyboardOverride;
-
-  static int32_t sSecureEventInputCount;
-};
-
-/**
- * IMEInputHandler manages:
- *   1. The IME/keyboard layout statement of nsChildView.
- *   2. The IME composition statement of nsChildView.
- * And also provides the methods which controls the current IME transaction of
- * the instance.
- *
- * Note that an nsChildView handles one or more NSView's events.  E.g., even if
- * a text editor on XUL panel element, the input events handled on the parent
- * (or its ancestor) widget handles it (the native focus is set to it).  The
- * actual focused view is notified by OnFocusChangeInGecko.
- */
-
-class IMEInputHandler : public TextInputHandlerBase
-{
-public:
-  // TextEventDispatcherListener methods
-  NS_IMETHOD NotifyIME(TextEventDispatcher* aTextEventDispatcher,
-                       const IMENotification& aNotification) override;
-  NS_IMETHOD_(void) OnRemovedFrom(
-                      TextEventDispatcher* aTextEventDispatcher) override;
-  NS_IMETHOD_(void) WillDispatchKeyboardEvent(
-                      TextEventDispatcher* aTextEventDispatcher,
-                      WidgetKeyboardEvent& aKeyboardEvent,
-                      uint32_t aIndexOfKeypress,
-                      void* aData) override;
-
-public:
-  virtual bool OnDestroyWidget(nsChildView* aDestroyingWidget) override;
-
-  virtual void OnFocusChangeInGecko(bool aFocus);
-
-  void OnSelectionChange(const IMENotification& aIMENotification);
-
-  /**
-   * Call [NSTextInputContext handleEvent] for mouse event support of IME
-   */
-  bool OnHandleEvent(NSEvent* aEvent);
-
-  /**
-   * SetMarkedText() is a handler of setMarkedText of NSTextInput.
-   *
-   * @param aAttrString           This mut be an instance of NSAttributedString.
-   *                              If the aString parameter to
-   *                              [ChildView setMarkedText:setSelectedRange:]
-   *                              isn't an instance of NSAttributedString,
-   *                              create an NSAttributedString from it and pass
-   *                              that instead.
-   * @param aSelectedRange        Current selected range (or caret position).
-   * @param aReplacementRange     The range which will be replaced with the
-   *                              aAttrString instead of current marked range.
-   */
-  void SetMarkedText(NSAttributedString* aAttrString,
-                     NSRange& aSelectedRange,
-                     NSRange* aReplacementRange = nullptr);
-
-  /**
-   * GetAttributedSubstringFromRange() returns an NSAttributedString instance
-   * which is allocated as autorelease for aRange.
-   *
-   * @param aRange                The range of string which you want.
-   * @param aActualRange          The actual range of the result.
-   * @return                      The string in aRange.  If the string is empty,
-   *                              this returns nil.  If succeeded, this returns
-   *                              an instance which is allocated as autorelease.
-   *                              If this has some troubles, returns nil.
-   */
-  NSAttributedString* GetAttributedSubstringFromRange(
-                        NSRange& aRange,
-                        NSRange* aActualRange = nullptr);
-
-  /**
-   * SelectedRange() returns current selected range.
-   *
-   * @return                      If an editor has focus, this returns selection
-   *                              range in the editor.  Otherwise, this returns
-   *                              selection range  in the focused document.
-   */
-  NSRange SelectedRange();
-
-  /**
-   * DrawsVerticallyForCharacterAtIndex() returns whether the character at
-   * the given index is being rendered vertically.
-   *
-   * @param aCharIndex            The character offset to query.
-   *
-   * @return                      True if writing-mode is vertical at the given
-   *                              character offset; otherwise false.
-   */
-  bool DrawsVerticallyForCharacterAtIndex(uint32_t aCharIndex);
-
-  /**
-   * FirstRectForCharacterRange() returns first *character* rect in the range.
-   * Cocoa needs the first line rect in the range, but we cannot compute it
-   * on current implementation.
-   *
-   * @param aRange                A range of text to examine.  Its position is
-   *                              an offset from the beginning of the focused
-   *                              editor or document.
-   * @param aActualRange          If this is not null, this returns the actual
-   *                              range used for computing the result.
-   * @return                      An NSRect containing the first character in
-   *                              aRange, in screen coordinates.
-   *                              If the length of aRange is 0, the width will
-   *                              be 0.
-   */
-  NSRect FirstRectForCharacterRange(NSRange& aRange,
-                                    NSRange* aActualRange = nullptr);
-
-  /**
-   * CharacterIndexForPoint() returns an offset of a character at aPoint.
-   * XXX This isn't implemented, always returns 0.
-   *
-   * @param                       The point in screen coordinates.
-   * @return                      The offset of the character at aPoint from
-   *                              the beginning of the focused editor or
-   *                              document.
-   */
-  NSUInteger CharacterIndexForPoint(NSPoint& aPoint);
-
-  /**
-   * GetValidAttributesForMarkedText() returns attributes which we support.
-   *
-   * @return                      Always empty array for now.
-   */
-  NSArray* GetValidAttributesForMarkedText();
-
-  bool HasMarkedText();
-  NSRange MarkedRange();
-
-  bool IsIMEComposing() { return mIsIMEComposing; }
-  bool IsIMEOpened();
-  bool IsIMEEnabled() { return mIsIMEEnabled; }
-  bool IsASCIICapableOnly() { return mIsASCIICapableOnly; }
-  bool IgnoreIMECommit() { return mIgnoreIMECommit; }
-
-  bool IgnoreIMEComposition()
-  {
-    // Ignore the IME composition events when we're pending to discard the
-    // composition and we are not to handle the IME composition now.
-    return (mPendingMethods & kDiscardIMEComposition) &&
-           (mIsInFocusProcessing || !IsFocused());
-  }
-
-  void CommitIMEComposition();
-  void CancelIMEComposition();
-
-  void EnableIME(bool aEnableIME);
-  void SetIMEOpenState(bool aOpen);
-  void SetASCIICapableOnly(bool aASCIICapableOnly);
-
-  /**
-   * True if OSX believes that our view has keyboard focus.
-   */
-  bool IsFocused();
-
-  static CFArrayRef CreateAllIMEModeList();
-  static void DebugPrintAllIMEModes();
-
-  // Don't use ::TSMGetActiveDocument() API directly, the document may not
-  // be what you want.
-  static TSMDocumentID GetCurrentTSMDocumentID();
-
-protected:
-  // We cannot do some jobs in the given stack by some reasons.
-  // Following flags and the timer provide the execution pending mechanism,
-  // See the comment in nsCocoaTextInputHandler.mm.
-  nsCOMPtr<nsITimer> mTimer;
-  enum {
-    kNotifyIMEOfFocusChangeInGecko = 1,
-    kDiscardIMEComposition         = 2,
-    kSyncASCIICapableOnly          = 4
-  };
-  uint32_t mPendingMethods;
-
-  IMEInputHandler(nsChildView* aWidget, NSView<mozView> *aNativeView);
-  virtual ~IMEInputHandler();
-
-  void ResetTimer();
-
-  virtual void ExecutePendingMethods();
-
-  /**
-   * InsertTextAsCommittingComposition() commits current composition.  If there
-   * is no composition, this starts a composition and commits it immediately.
-   *
-   * @param aAttrString           A string which is committed.
-   * @param aReplacementRange     The range which will be replaced with the
-   *                              aAttrString instead of current selection.
-   */
-  void InsertTextAsCommittingComposition(NSAttributedString* aAttrString,
-                                         NSRange* aReplacementRange);
-
-private:
-  // If mIsIMEComposing is true, the composition string is stored here.
-  NSString* mIMECompositionString;
-  // If mIsIMEComposing is true, the start offset of the composition string.
-  uint32_t mIMECompositionStart;
-
-  NSRange mMarkedRange;
-  NSRange mSelectedRange;
-
-  NSRange mRangeForWritingMode; // range within which mWritingMode applies
-  mozilla::WritingMode mWritingMode;
-
-  bool mIsIMEComposing;
-  bool mIsIMEEnabled;
-  bool mIsASCIICapableOnly;
-  bool mIgnoreIMECommit;
-  // This flag is enabled by OnFocusChangeInGecko, and will be cleared by
-  // ExecutePendingMethods.  When this is true, IsFocus() returns TRUE.  At
-  // that time, the focus processing in Gecko might not be finished yet.  So,
-  // you cannot use WidgetQueryContentEvent or something.
-  bool mIsInFocusProcessing;
-  bool mIMEHasFocus;
-
-  void KillIMEComposition();
-  void SendCommittedText(NSString *aString);
-  void OpenSystemPreferredLanguageIME();
-
-  // Pending methods
-  void NotifyIMEOfFocusChangeInGecko();
-  void DiscardIMEComposition();
-  void SyncASCIICapableOnly();
-
-  static bool sStaticMembersInitialized;
-  static CFStringRef sLatestIMEOpenedModeInputSourceID;
-  static void InitStaticMembers();
-  static void OnCurrentTextInputSourceChange(CFNotificationCenterRef aCenter,
-                                             void* aObserver,
-                                             CFStringRef aName,
-                                             const void* aObject,
-                                             CFDictionaryRef aUserInfo);
-
-  static void FlushPendingMethods(nsITimer* aTimer, void* aClosure);
-
-  /**
-   * ConvertToTextRangeStyle converts the given native underline style to
-   * our defined text range type.
-   *
-   * @param aUnderlineStyle       NSUnderlineStyleSingle or
-   *                              NSUnderlineStyleThick.
-   * @param aSelectedRange        Current selected range (or caret position).
-   * @return                      NS_TEXTRANGE_*.
-   */
-  TextRangeType ConvertToTextRangeType(uint32_t aUnderlineStyle,
-                                       NSRange& aSelectedRange);
-
-  /**
-   * GetRangeCount() computes the range count of aAttrString.
-   *
-   * @param aAttrString           An NSAttributedString instance whose number of
-   *                              NSUnderlineStyleAttributeName ranges you with
-   *                              to know.
-   * @return                      The count of NSUnderlineStyleAttributeName
-   *                              ranges in aAttrString.
-   */
-  uint32_t GetRangeCount(NSAttributedString *aString);
-
-  /**
-   * CreateTextRangeArray() returns text ranges for clauses and/or caret.
-   *
-   * @param aAttrString           An NSAttributedString instance which indicates
-   *                              current composition string.
-   * @param aSelectedRange        Current selected range (or caret position).
-   * @return                      The result is set to the
-   *                              NSUnderlineStyleAttributeName ranges in
-   *                              aAttrString.
-   */
-  already_AddRefed<mozilla::TextRangeArray>
-    CreateTextRangeArray(NSAttributedString *aAttrString,
-                         NSRange& aSelectedRange);
-
-  /**
-   * DispatchCompositionStartEvent() dispatches a compositionstart event and
-   * initializes the members indicating composition state.
-   *
-   * @return                      true if it can continues handling composition.
-   *                              Otherwise, e.g., canceled by the web page,
-   *                              this returns false.
-   */
-  bool DispatchCompositionStartEvent();
-
-  /**
-   * DispatchCompositionChangeEvent() dispatches a compositionchange event on
-   * mWidget and modifies the members indicating composition state.
-   *
-   * @param aText                 User text input.
-   * @param aAttrString           An NSAttributedString instance which indicates
-   *                              current composition string.
-   * @param aSelectedRange        Current selected range (or caret position).
-   *
-   * @return                      true if it can continues handling composition.
-   *                              Otherwise, e.g., canceled by the web page,
-   *                              this returns false.
-   */
-  bool DispatchCompositionChangeEvent(const nsString& aText,
-                                      NSAttributedString* aAttrString,
-                                      NSRange& aSelectedRange);
-
-  /**
-   * DispatchCompositionCommitEvent() dispatches a compositioncommit event or
-   * compositioncommitasis event.  If aCommitString is null, dispatches
-   * compositioncommitasis event.  I.e., if aCommitString is null, this
-   * commits the composition with the last data.  Otherwise, commits the
-   * composition with aCommitString value.
-   *
-   * @return                      true if the widget isn't destroyed.
-   *                              Otherwise, false.
-   */
-  bool DispatchCompositionCommitEvent(const nsAString* aCommitString = nullptr);
-
-  // The focused IME handler.  Please note that the handler might lost the
-  // actual focus by deactivating the application.  If we are active, this
-  // must have the actual focused handle.
-  // We cannot access to the NSInputManager during we aren't active, so, the
-  // focused handler can have an IME transaction even if we are deactive.
-  static IMEInputHandler* sFocusedIMEHandler;
-
-  static bool sCachedIsForRTLLangage;
-};
-
-/**
- * TextInputHandler implements the NSTextInput protocol.
- */
-class TextInputHandler : public IMEInputHandler
-{
-public:
-  static NSUInteger sLastModifierState;
-
-  static CFArrayRef CreateAllKeyboardLayoutList();
-  static void DebugPrintAllKeyboardLayouts();
-
-  TextInputHandler(nsChildView* aWidget, NSView<mozView> *aNativeView);
-  virtual ~TextInputHandler();
-
-  /**
-   * KeyDown event handler.
-   *
-   * @param aNativeEvent          A native NSKeyDown event.
-   * @return                      TRUE if the event is consumed by web contents
-   *                              or chrome contents.  Otherwise, FALSE.
-   */
-  bool HandleKeyDownEvent(NSEvent* aNativeEvent);
-
-  /**
-   * KeyUp event handler.
-   *
-   * @param aNativeEvent          A native NSKeyUp event.
-   */
-  void HandleKeyUpEvent(NSEvent* aNativeEvent);
-
-  /**
-   * FlagsChanged event handler.
-   *
-   * @param aNativeEvent          A native NSFlagsChanged event.
-   */
-  void HandleFlagsChanged(NSEvent* aNativeEvent);
-
-  /**
-   * Insert the string to content.  I.e., this is a text input event handler.
-   * If this is called during keydown event handling, this may dispatch a
-   * eKeyPress event.  If this is called during composition, this commits
-   * the composition by the aAttrString.
-   *
-   * @param aAttrString           An inserted string.
-   * @param aReplacementRange     The range which will be replaced with the
-   *                              aAttrString instead of current selection.
-   */
-  void InsertText(NSAttributedString *aAttrString,
-                  NSRange* aReplacementRange = nullptr);
-
-  /**
-   * doCommandBySelector event handler.
-   *
-   * @param aSelector             A selector of the command.
-   * @return                      TRUE if the command is consumed.  Otherwise,
-   *                              FALSE.
-   */
-  bool DoCommandBySelector(const char* aSelector);
-
-  /**
-   * KeyPressWasHandled() checks whether keypress event was handled or not.
-   *
-   * @return                      TRUE if keypress event for latest native key
-   *                              event was handled.  Otherwise, FALSE.
-   *                              If this handler isn't handling any key events,
-   *                              always returns FALSE.
-   */
-  bool KeyPressWasHandled()
-  {
-    KeyEventState* currentKeyEvent = GetCurrentKeyEvent();
-    return currentKeyEvent && currentKeyEvent->mKeyPressHandled;
-  }
-
-protected:
-  // Stores the association of device dependent modifier flags with a modifier
-  // keyCode.  Being device dependent, this association may differ from one kind
-  // of hardware to the next.
-  struct ModifierKey
-  {
-    NSUInteger flags;
-    unsigned short keyCode;
-
-    ModifierKey(NSUInteger aFlags, unsigned short aKeyCode) :
-      flags(aFlags), keyCode(aKeyCode)
-    {
-    }
-
-    NSUInteger GetDeviceDependentFlags() const
-    {
-      return (flags & ~NSDeviceIndependentModifierFlagsMask);
-    }
-
-    NSUInteger GetDeviceIndependentFlags() const
-    {
-      return (flags & NSDeviceIndependentModifierFlagsMask);
-    }
-  };
-  typedef nsTArray<ModifierKey> ModifierKeyArray;
-  ModifierKeyArray mModifierKeys;
-
-  /**
-   * GetModifierKeyForNativeKeyCode() returns the stored ModifierKey for
-   * the key.
-   */
-  const ModifierKey*
-    GetModifierKeyForNativeKeyCode(unsigned short aKeyCode) const;
-
-  /**
-   * GetModifierKeyForDeviceDependentFlags() returns the stored ModifierKey for
-   * the device dependent flags.
-   */
-  const ModifierKey*
-    GetModifierKeyForDeviceDependentFlags(NSUInteger aFlags) const;
-
-  /**
-   * DispatchKeyEventForFlagsChanged() dispatches keydown event or keyup event
-   * for the aNativeEvent.
-   *
-   * @param aNativeEvent          A native flagschanged event which you want to
-   *                              dispatch our key event for.
-   * @param aDispatchKeyDown      TRUE if you want to dispatch a keydown event.
-   *                              Otherwise, i.e., to dispatch keyup event,
-   *                              FALSE.
-   */
-  void DispatchKeyEventForFlagsChanged(NSEvent* aNativeEvent,
-                                       bool aDispatchKeyDown);
-};
-
-} // namespace widget
-} // namespace mozilla
-
-#endif // TextInputHandler_h_
diff --git a/widget/cocoa/TextInputHandler.mm b/widget/cocoa/TextInputHandler.mm
deleted file mode 100644
index 348d99ab69..0000000000
--- a/widget/cocoa/TextInputHandler.mm
+++ /dev/null
@@ -1,4533 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "TextInputHandler.h"
-
-#include "mozilla/Logging.h"
-
-#include "mozilla/ArrayUtils.h"
-#include "mozilla/AutoRestore.h"
-#include "mozilla/MiscEvents.h"
-#include "mozilla/MouseEvents.h"
-#include "mozilla/TextEventDispatcher.h"
-#include "mozilla/TextEvents.h"
-
-#include "nsChildView.h"
-#include "nsObjCExceptions.h"
-#include "nsBidiUtils.h"
-#include "nsToolkit.h"
-#include "nsCocoaUtils.h"
-#include "WidgetUtils.h"
-#include "nsPrintfCString.h"
-#include "ComplexTextInputPanel.h"
-
-using namespace mozilla;
-using namespace mozilla::widget;
-
-LazyLogModule gLog("TextInputHandlerWidgets");
-
-static const char*
-OnOrOff(bool aBool)
-{
-  return aBool ? "ON" : "off";
-}
-
-static const char*
-TrueOrFalse(bool aBool)
-{
-  return aBool ? "TRUE" : "FALSE";
-}
-
-static const char*
-GetKeyNameForNativeKeyCode(unsigned short aNativeKeyCode)
-{
-  switch (aNativeKeyCode) {
-    case kVK_Escape:              return "Escape";
-    case kVK_RightCommand:        return "Right-Command";
-    case kVK_Command:             return "Command";
-    case kVK_Shift:               return "Shift";
-    case kVK_CapsLock:            return "CapsLock";
-    case kVK_Option:              return "Option";
-    case kVK_Control:             return "Control";
-    case kVK_RightShift:          return "Right-Shift";
-    case kVK_RightOption:         return "Right-Option";
-    case kVK_RightControl:        return "Right-Control";
-    case kVK_ANSI_KeypadClear:    return "Clear";
-
-    case kVK_F1:                  return "F1";
-    case kVK_F2:                  return "F2";
-    case kVK_F3:                  return "F3";
-    case kVK_F4:                  return "F4";
-    case kVK_F5:                  return "F5";
-    case kVK_F6:                  return "F6";
-    case kVK_F7:                  return "F7";
-    case kVK_F8:                  return "F8";
-    case kVK_F9:                  return "F9";
-    case kVK_F10:                 return "F10";
-    case kVK_F11:                 return "F11";
-    case kVK_F12:                 return "F12";
-    case kVK_F13:                 return "F13/PrintScreen";
-    case kVK_F14:                 return "F14/ScrollLock";
-    case kVK_F15:                 return "F15/Pause";
-
-    case kVK_ANSI_Keypad0:        return "NumPad-0";
-    case kVK_ANSI_Keypad1:        return "NumPad-1";
-    case kVK_ANSI_Keypad2:        return "NumPad-2";
-    case kVK_ANSI_Keypad3:        return "NumPad-3";
-    case kVK_ANSI_Keypad4:        return "NumPad-4";
-    case kVK_ANSI_Keypad5:        return "NumPad-5";
-    case kVK_ANSI_Keypad6:        return "NumPad-6";
-    case kVK_ANSI_Keypad7:        return "NumPad-7";
-    case kVK_ANSI_Keypad8:        return "NumPad-8";
-    case kVK_ANSI_Keypad9:        return "NumPad-9";
-
-    case kVK_ANSI_KeypadMultiply: return "NumPad-*";
-    case kVK_ANSI_KeypadPlus:     return "NumPad-+";
-    case kVK_ANSI_KeypadMinus:    return "NumPad--";
-    case kVK_ANSI_KeypadDecimal:  return "NumPad-.";
-    case kVK_ANSI_KeypadDivide:   return "NumPad-/";
-    case kVK_ANSI_KeypadEquals:   return "NumPad-=";
-    case kVK_ANSI_KeypadEnter:    return "NumPad-Enter";
-    case kVK_Return:              return "Return";
-    case kVK_Powerbook_KeypadEnter: return "NumPad-EnterOnPowerBook";
-
-    case kVK_PC_Insert:           return "Insert/Help";
-    case kVK_PC_Delete:           return "Delete";
-    case kVK_Tab:                 return "Tab";
-    case kVK_PC_Backspace:        return "Backspace";
-    case kVK_Home:                return "Home";
-    case kVK_End:                 return "End";
-    case kVK_PageUp:              return "PageUp";
-    case kVK_PageDown:            return "PageDown";
-    case kVK_LeftArrow:           return "LeftArrow";
-    case kVK_RightArrow:          return "RightArrow";
-    case kVK_UpArrow:             return "UpArrow";
-    case kVK_DownArrow:           return "DownArrow";
-    case kVK_PC_ContextMenu:      return "ContextMenu";
-
-    case kVK_Function:            return "Function";
-    case kVK_VolumeUp:            return "VolumeUp";
-    case kVK_VolumeDown:          return "VolumeDown";
-    case kVK_Mute:                return "Mute";
-
-    case kVK_ISO_Section:         return "ISO_Section";
-
-    case kVK_JIS_Yen:             return "JIS_Yen";
-    case kVK_JIS_Underscore:      return "JIS_Underscore";
-    case kVK_JIS_KeypadComma:     return "JIS_KeypadComma";
-    case kVK_JIS_Eisu:            return "JIS_Eisu";
-    case kVK_JIS_Kana:            return "JIS_Kana";
-
-    case kVK_ANSI_A:              return "A";
-    case kVK_ANSI_B:              return "B";
-    case kVK_ANSI_C:              return "C";
-    case kVK_ANSI_D:              return "D";
-    case kVK_ANSI_E:              return "E";
-    case kVK_ANSI_F:              return "F";
-    case kVK_ANSI_G:              return "G";
-    case kVK_ANSI_H:              return "H";
-    case kVK_ANSI_I:              return "I";
-    case kVK_ANSI_J:              return "J";
-    case kVK_ANSI_K:              return "K";
-    case kVK_ANSI_L:              return "L";
-    case kVK_ANSI_M:              return "M";
-    case kVK_ANSI_N:              return "N";
-    case kVK_ANSI_O:              return "O";
-    case kVK_ANSI_P:              return "P";
-    case kVK_ANSI_Q:              return "Q";
-    case kVK_ANSI_R:              return "R";
-    case kVK_ANSI_S:              return "S";
-    case kVK_ANSI_T:              return "T";
-    case kVK_ANSI_U:              return "U";
-    case kVK_ANSI_V:              return "V";
-    case kVK_ANSI_W:              return "W";
-    case kVK_ANSI_X:              return "X";
-    case kVK_ANSI_Y:              return "Y";
-    case kVK_ANSI_Z:              return "Z";
-
-    case kVK_ANSI_1:              return "1";
-    case kVK_ANSI_2:              return "2";
-    case kVK_ANSI_3:              return "3";
-    case kVK_ANSI_4:              return "4";
-    case kVK_ANSI_5:              return "5";
-    case kVK_ANSI_6:              return "6";
-    case kVK_ANSI_7:              return "7";
-    case kVK_ANSI_8:              return "8";
-    case kVK_ANSI_9:              return "9";
-    case kVK_ANSI_0:              return "0";
-    case kVK_ANSI_Equal:          return "Equal";
-    case kVK_ANSI_Minus:          return "Minus";
-    case kVK_ANSI_RightBracket:   return "RightBracket";
-    case kVK_ANSI_LeftBracket:    return "LeftBracket";
-    case kVK_ANSI_Quote:          return "Quote";
-    case kVK_ANSI_Semicolon:      return "Semicolon";
-    case kVK_ANSI_Backslash:      return "Backslash";
-    case kVK_ANSI_Comma:          return "Comma";
-    case kVK_ANSI_Slash:          return "Slash";
-    case kVK_ANSI_Period:         return "Period";
-    case kVK_ANSI_Grave:          return "Grave";
-
-    default:                      return "undefined";
-  }
-}
-
-static const char*
-GetCharacters(const NSString* aString)
-{
-  nsAutoString str;
-  nsCocoaUtils::GetStringForNSString(aString, str);
-  if (str.IsEmpty()) {
-    return "";
-  }
-
-  nsAutoString escapedStr;
-  for (uint32_t i = 0; i < str.Length(); i++) {
-    char16_t ch = str[i];
-    if (ch < 0x20) {
-      nsPrintfCString utf8str("(U+%04X)", ch);
-      escapedStr += NS_ConvertUTF8toUTF16(utf8str);
-    } else if (ch <= 0x7E) {
-      escapedStr += ch;
-    } else {
-      nsPrintfCString utf8str("(U+%04X)", ch);
-      escapedStr += ch;
-      escapedStr += NS_ConvertUTF8toUTF16(utf8str);
-    }
-  }
-
-  // the result will be freed automatically by cocoa.
-  NSString* result = nsCocoaUtils::ToNSString(escapedStr);
-  return [result UTF8String];
-}
-
-static const char*
-GetCharacters(const CFStringRef aString)
-{
-  const NSString* str = reinterpret_cast<const NSString*>(aString);
-  return GetCharacters(str);
-}
-
-static const char*
-GetNativeKeyEventType(NSEvent* aNativeEvent)
-{
-  switch ([aNativeEvent type]) {
-    case NSKeyDown:      return "NSKeyDown";
-    case NSKeyUp:        return "NSKeyUp";
-    case NSFlagsChanged: return "NSFlagsChanged";
-    default:             return "not key event";
-  }
-}
-
-static const char*
-GetGeckoKeyEventType(const WidgetEvent& aEvent)
-{
-  switch (aEvent.mMessage) {
-    case eKeyDown:       return "eKeyDown";
-    case eKeyUp:         return "eKeyUp";
-    case eKeyPress:      return "eKeyPress";
-    default:             return "not key event";
-  }
-}
-
-static const char*
-GetWindowLevelName(NSInteger aWindowLevel)
-{
-  switch (aWindowLevel) {
-    case kCGBaseWindowLevelKey:
-      return "kCGBaseWindowLevelKey (NSNormalWindowLevel)";
-    case kCGMinimumWindowLevelKey:
-      return "kCGMinimumWindowLevelKey";
-    case kCGDesktopWindowLevelKey:
-      return "kCGDesktopWindowLevelKey";
-    case kCGBackstopMenuLevelKey:
-      return "kCGBackstopMenuLevelKey";
-    case kCGNormalWindowLevelKey:
-      return "kCGNormalWindowLevelKey";
-    case kCGFloatingWindowLevelKey:
-      return "kCGFloatingWindowLevelKey (NSFloatingWindowLevel)";
-    case kCGTornOffMenuWindowLevelKey:
-      return "kCGTornOffMenuWindowLevelKey (NSSubmenuWindowLevel, NSTornOffMenuWindowLevel)";
-    case kCGDockWindowLevelKey:
-      return "kCGDockWindowLevelKey (NSDockWindowLevel)";
-    case kCGMainMenuWindowLevelKey:
-      return "kCGMainMenuWindowLevelKey (NSMainMenuWindowLevel)";
-    case kCGStatusWindowLevelKey:
-      return "kCGStatusWindowLevelKey (NSStatusWindowLevel)";
-    case kCGModalPanelWindowLevelKey:
-      return "kCGModalPanelWindowLevelKey (NSModalPanelWindowLevel)";
-    case kCGPopUpMenuWindowLevelKey:
-      return "kCGPopUpMenuWindowLevelKey (NSPopUpMenuWindowLevel)";
-    case kCGDraggingWindowLevelKey:
-      return "kCGDraggingWindowLevelKey";
-    case kCGScreenSaverWindowLevelKey:
-      return "kCGScreenSaverWindowLevelKey (NSScreenSaverWindowLevel)";
-    case kCGMaximumWindowLevelKey:
-      return "kCGMaximumWindowLevelKey";
-    case kCGOverlayWindowLevelKey:
-      return "kCGOverlayWindowLevelKey";
-    case kCGHelpWindowLevelKey:
-      return "kCGHelpWindowLevelKey";
-    case kCGUtilityWindowLevelKey:
-      return "kCGUtilityWindowLevelKey";
-    case kCGDesktopIconWindowLevelKey:
-      return "kCGDesktopIconWindowLevelKey";
-    case kCGCursorWindowLevelKey:
-      return "kCGCursorWindowLevelKey";
-    case kCGNumberOfWindowLevelKeys:
-      return "kCGNumberOfWindowLevelKeys";
-    default:
-      return "unknown window level";
-  }
-}
-
-static bool
-IsControlChar(uint32_t aCharCode)
-{
-  return aCharCode < ' ' || aCharCode == 0x7F;
-}
-
-static uint32_t gHandlerInstanceCount = 0;
-
-static void
-EnsureToLogAllKeyboardLayoutsAndIMEs()
-{
-  static bool sDone = false;
-  if (!sDone) {
-    sDone = true;
-    TextInputHandler::DebugPrintAllKeyboardLayouts();
-    IMEInputHandler::DebugPrintAllIMEModes();
-  }
-}
-
-#pragma mark -
-
-
-/******************************************************************************
- *
- *  TISInputSourceWrapper implementation
- *
- ******************************************************************************/
-
-TISInputSourceWrapper* TISInputSourceWrapper::sCurrentInputSource = nullptr;
-
-// static
-TISInputSourceWrapper&
-TISInputSourceWrapper::CurrentInputSource()
-{
-  if (!sCurrentInputSource) {
-    sCurrentInputSource = new TISInputSourceWrapper();
-  }
-  if (!sCurrentInputSource->IsInitializedByCurrentInputSource()) {
-    sCurrentInputSource->InitByCurrentInputSource();
-  }
-  return *sCurrentInputSource;
-}
-
-// static
-void
-TISInputSourceWrapper::Shutdown()
-{
-  if (!sCurrentInputSource) {
-    return;
-  }
-  sCurrentInputSource->Clear();
-  delete sCurrentInputSource;
-  sCurrentInputSource = nullptr;
-}
-
-bool
-TISInputSourceWrapper::TranslateToString(UInt32 aKeyCode, UInt32 aModifiers,
-                                         UInt32 aKbType, nsAString &aStr)
-{
-  aStr.Truncate();
-
-  const UCKeyboardLayout* UCKey = GetUCKeyboardLayout();
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p TISInputSourceWrapper::TranslateToString, aKeyCode=0x%X, "
-     "aModifiers=0x%X, aKbType=0x%X UCKey=%p\n    "
-     "Shift: %s, Ctrl: %s, Opt: %s, Cmd: %s, CapsLock: %s, NumLock: %s",
-     this, aKeyCode, aModifiers, aKbType, UCKey,
-     OnOrOff(aModifiers & shiftKey), OnOrOff(aModifiers & controlKey),
-     OnOrOff(aModifiers & optionKey), OnOrOff(aModifiers & cmdKey),
-     OnOrOff(aModifiers & alphaLock),
-     OnOrOff(aModifiers & kEventKeyModifierNumLockMask)));
-
-  NS_ENSURE_TRUE(UCKey, false);
-
-  UInt32 deadKeyState = 0;
-  UniCharCount len;
-  UniChar chars[5];
-  OSStatus err = ::UCKeyTranslate(UCKey, aKeyCode,
-                                  kUCKeyActionDown, aModifiers >> 8,
-                                  aKbType, kUCKeyTranslateNoDeadKeysMask,
-                                  &deadKeyState, 5, &len, chars);
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p TISInputSourceWrapper::TranslateToString, err=0x%X, len=%llu",
-     this, err, len));
-
-  NS_ENSURE_TRUE(err == noErr, false);
-  if (len == 0) {
-    return true;
-  }
-  NS_ENSURE_TRUE(EnsureStringLength(aStr, len), false);
-  NS_ASSERTION(sizeof(char16_t) == sizeof(UniChar),
-               "size of char16_t and size of UniChar are different");
-  memcpy(aStr.BeginWriting(), chars, len * sizeof(char16_t));
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p TISInputSourceWrapper::TranslateToString, aStr=\"%s\"",
-     this, NS_ConvertUTF16toUTF8(aStr).get()));
-
-  return true;
-}
-
-uint32_t
-TISInputSourceWrapper::TranslateToChar(UInt32 aKeyCode, UInt32 aModifiers,
-                                       UInt32 aKbType)
-{
-  nsAutoString str;
-  if (!TranslateToString(aKeyCode, aModifiers, aKbType, str) ||
-      str.Length() != 1) {
-    return 0;
-  }
-  return static_cast<uint32_t>(str.CharAt(0));
-}
-
-void
-TISInputSourceWrapper::InitByInputSourceID(const char* aID)
-{
-  Clear();
-  if (!aID)
-    return;
-
-  CFStringRef idstr = ::CFStringCreateWithCString(kCFAllocatorDefault, aID,
-                                                  kCFStringEncodingASCII);
-  InitByInputSourceID(idstr);
-  ::CFRelease(idstr);
-}
-
-void
-TISInputSourceWrapper::InitByInputSourceID(const nsAFlatString &aID)
-{
-  Clear();
-  if (aID.IsEmpty())
-    return;
-  CFStringRef idstr = ::CFStringCreateWithCharacters(kCFAllocatorDefault,
-                                                     reinterpret_cast<const UniChar*>(aID.get()),
-                                                     aID.Length());
-  InitByInputSourceID(idstr);
-  ::CFRelease(idstr);
-}
-
-void
-TISInputSourceWrapper::InitByInputSourceID(const CFStringRef aID)
-{
-  Clear();
-  if (!aID)
-    return;
-  const void* keys[] = { kTISPropertyInputSourceID };
-  const void* values[] = { aID };
-  CFDictionaryRef filter =
-  ::CFDictionaryCreate(kCFAllocatorDefault, keys, values, 1, NULL, NULL);
-  NS_ASSERTION(filter, "failed to create the filter");
-  mInputSourceList = ::TISCreateInputSourceList(filter, true);
-  ::CFRelease(filter);
-  if (::CFArrayGetCount(mInputSourceList) > 0) {
-    mInputSource = static_cast<TISInputSourceRef>(
-      const_cast<void *>(::CFArrayGetValueAtIndex(mInputSourceList, 0)));
-    if (IsKeyboardLayout()) {
-      mKeyboardLayout = mInputSource;
-    }
-  }
-}
-
-void
-TISInputSourceWrapper::InitByLayoutID(SInt32 aLayoutID,
-                                      bool aOverrideKeyboard)
-{
-  // NOTE: Doument new layout IDs in TextInputHandler.h when you add ones.
-  switch (aLayoutID) {
-    case 0:
-      InitByInputSourceID("com.apple.keylayout.US");
-      break;
-    case 1:
-      InitByInputSourceID("com.apple.keylayout.Greek");
-      break;
-    case 2:
-      InitByInputSourceID("com.apple.keylayout.German");
-      break;
-    case 3:
-      InitByInputSourceID("com.apple.keylayout.Swedish-Pro");
-      break;
-    case 4:
-      InitByInputSourceID("com.apple.keylayout.DVORAK-QWERTYCMD");
-      break;
-    case 5:
-      InitByInputSourceID("com.apple.keylayout.Thai");
-      break;
-    case 6:
-      InitByInputSourceID("com.apple.keylayout.Arabic");
-      break;
-    case 7:
-      InitByInputSourceID("com.apple.keylayout.ArabicPC");
-      break;
-    case 8:
-      InitByInputSourceID("com.apple.keylayout.French");
-      break;
-    case 9:
-      InitByInputSourceID("com.apple.keylayout.Hebrew");
-      break;
-    case 10:
-      InitByInputSourceID("com.apple.keylayout.Lithuanian");
-      break;
-    case 11:
-      InitByInputSourceID("com.apple.keylayout.Norwegian");
-      break;
-    case 12:
-      InitByInputSourceID("com.apple.keylayout.Spanish");
-      break;
-    default:
-      Clear();
-      break;
-  }
-  mOverrideKeyboard = aOverrideKeyboard;
-}
-
-void
-TISInputSourceWrapper::InitByCurrentInputSource()
-{
-  Clear();
-  mInputSource = ::TISCopyCurrentKeyboardInputSource();
-  mKeyboardLayout = ::TISCopyInputMethodKeyboardLayoutOverride();
-  if (!mKeyboardLayout) {
-    mKeyboardLayout = ::TISCopyCurrentKeyboardLayoutInputSource();
-  }
-  // If this causes composition, the current keyboard layout may input non-ASCII
-  // characters such as Japanese Kana characters or Hangul characters.
-  // However, we need to set ASCII characters to DOM key events for consistency
-  // with other platforms.
-  if (IsOpenedIMEMode()) {
-    TISInputSourceWrapper tis(mKeyboardLayout);
-    if (!tis.IsASCIICapable()) {
-      mKeyboardLayout =
-        ::TISCopyCurrentASCIICapableKeyboardLayoutInputSource();
-    }
-  }
-}
-
-void
-TISInputSourceWrapper::InitByCurrentKeyboardLayout()
-{
-  Clear();
-  mInputSource = ::TISCopyCurrentKeyboardLayoutInputSource();
-  mKeyboardLayout = mInputSource;
-}
-
-void
-TISInputSourceWrapper::InitByCurrentASCIICapableInputSource()
-{
-  Clear();
-  mInputSource = ::TISCopyCurrentASCIICapableKeyboardInputSource();
-  mKeyboardLayout = ::TISCopyInputMethodKeyboardLayoutOverride();
-  if (mKeyboardLayout) {
-    TISInputSourceWrapper tis(mKeyboardLayout);
-    if (!tis.IsASCIICapable()) {
-      mKeyboardLayout = nullptr;
-    }
-  }
-  if (!mKeyboardLayout) {
-    mKeyboardLayout =
-      ::TISCopyCurrentASCIICapableKeyboardLayoutInputSource();
-  }
-}
-
-void
-TISInputSourceWrapper::InitByCurrentASCIICapableKeyboardLayout()
-{
-  Clear();
-  mInputSource = ::TISCopyCurrentASCIICapableKeyboardLayoutInputSource();
-  mKeyboardLayout = mInputSource;
-}
-
-void
-TISInputSourceWrapper::InitByCurrentInputMethodKeyboardLayoutOverride()
-{
-  Clear();
-  mInputSource = ::TISCopyInputMethodKeyboardLayoutOverride();
-  mKeyboardLayout = mInputSource;
-}
-
-void
-TISInputSourceWrapper::InitByTISInputSourceRef(TISInputSourceRef aInputSource)
-{
-  Clear();
-  mInputSource = aInputSource;
-  if (IsKeyboardLayout()) {
-    mKeyboardLayout = mInputSource;
-  }
-}
-
-void
-TISInputSourceWrapper::InitByLanguage(CFStringRef aLanguage)
-{
-  Clear();
-  mInputSource = ::TISCopyInputSourceForLanguage(aLanguage);
-  if (IsKeyboardLayout()) {
-    mKeyboardLayout = mInputSource;
-  }
-}
-
-const UCKeyboardLayout*
-TISInputSourceWrapper::GetUCKeyboardLayout()
-{
-  NS_ENSURE_TRUE(mKeyboardLayout, nullptr);
-  if (mUCKeyboardLayout) {
-    return mUCKeyboardLayout;
-  }
-  CFDataRef uchr = static_cast<CFDataRef>(
-    ::TISGetInputSourceProperty(mKeyboardLayout,
-                                kTISPropertyUnicodeKeyLayoutData));
-
-  // We should be always able to get the layout here.
-  NS_ENSURE_TRUE(uchr, nullptr);
-  mUCKeyboardLayout =
-    reinterpret_cast<const UCKeyboardLayout*>(CFDataGetBytePtr(uchr));
-  return mUCKeyboardLayout;
-}
-
-bool
-TISInputSourceWrapper::GetBoolProperty(const CFStringRef aKey)
-{
-  CFBooleanRef ret = static_cast<CFBooleanRef>(
-    ::TISGetInputSourceProperty(mInputSource, aKey));
-  return ::CFBooleanGetValue(ret);
-}
-
-bool
-TISInputSourceWrapper::GetStringProperty(const CFStringRef aKey,
-                                         CFStringRef &aStr)
-{
-  aStr = static_cast<CFStringRef>(
-    ::TISGetInputSourceProperty(mInputSource, aKey));
-  return aStr != nullptr;
-}
-
-bool
-TISInputSourceWrapper::GetStringProperty(const CFStringRef aKey,
-                                         nsAString &aStr)
-{
-  CFStringRef str;
-  GetStringProperty(aKey, str);
-  nsCocoaUtils::GetStringForNSString((const NSString*)str, aStr);
-  return !aStr.IsEmpty();
-}
-
-bool
-TISInputSourceWrapper::IsOpenedIMEMode()
-{
-  NS_ENSURE_TRUE(mInputSource, false);
-  if (!IsIMEMode())
-    return false;
-  return !IsASCIICapable();
-}
-
-bool
-TISInputSourceWrapper::IsIMEMode()
-{
-  NS_ENSURE_TRUE(mInputSource, false);
-  CFStringRef str;
-  GetInputSourceType(str);
-  NS_ENSURE_TRUE(str, false);
-  return ::CFStringCompare(kTISTypeKeyboardInputMode,
-                           str, 0) == kCFCompareEqualTo;
-}
-
-bool
-TISInputSourceWrapper::IsKeyboardLayout()
-{
-  NS_ENSURE_TRUE(mInputSource, false);
-  CFStringRef str;
-  GetInputSourceType(str);
-  NS_ENSURE_TRUE(str, false);
-  return ::CFStringCompare(kTISTypeKeyboardLayout,
-                           str, 0) == kCFCompareEqualTo;
-}
-
-bool
-TISInputSourceWrapper::GetLanguageList(CFArrayRef &aLanguageList)
-{
-  NS_ENSURE_TRUE(mInputSource, false);
-  aLanguageList = static_cast<CFArrayRef>(
-    ::TISGetInputSourceProperty(mInputSource,
-                                kTISPropertyInputSourceLanguages));
-  return aLanguageList != nullptr;
-}
-
-bool
-TISInputSourceWrapper::GetPrimaryLanguage(CFStringRef &aPrimaryLanguage)
-{
-  NS_ENSURE_TRUE(mInputSource, false);
-  CFArrayRef langList;
-  NS_ENSURE_TRUE(GetLanguageList(langList), false);
-  if (::CFArrayGetCount(langList) == 0)
-    return false;
-  aPrimaryLanguage =
-    static_cast<CFStringRef>(::CFArrayGetValueAtIndex(langList, 0));
-  return aPrimaryLanguage != nullptr;
-}
-
-bool
-TISInputSourceWrapper::GetPrimaryLanguage(nsAString &aPrimaryLanguage)
-{
-  NS_ENSURE_TRUE(mInputSource, false);
-  CFStringRef primaryLanguage;
-  NS_ENSURE_TRUE(GetPrimaryLanguage(primaryLanguage), false);
-  nsCocoaUtils::GetStringForNSString((const NSString*)primaryLanguage,
-                                     aPrimaryLanguage);
-  return !aPrimaryLanguage.IsEmpty();
-}
-
-bool
-TISInputSourceWrapper::IsForRTLLanguage()
-{
-  if (mIsRTL < 0) {
-    // Get the input character of the 'A' key of ANSI keyboard layout.
-    nsAutoString str;
-    bool ret = TranslateToString(kVK_ANSI_A, 0, eKbdType_ANSI, str);
-    NS_ENSURE_TRUE(ret, ret);
-    char16_t ch = str.IsEmpty() ? char16_t(0) : str.CharAt(0);
-    mIsRTL = UCS2_CHAR_IS_BIDI(ch);
-  }
-  return mIsRTL != 0;
-}
-
-bool
-TISInputSourceWrapper::IsInitializedByCurrentInputSource()
-{
-  return mInputSource == ::TISCopyCurrentKeyboardInputSource();
-}
-
-void
-TISInputSourceWrapper::Select()
-{
-  if (!mInputSource)
-    return;
-  ::TISSelectInputSource(mInputSource);
-}
-
-void
-TISInputSourceWrapper::Clear()
-{
-  // Clear() is always called when TISInputSourceWrappper is created.
-  EnsureToLogAllKeyboardLayoutsAndIMEs();
-
-  if (mInputSourceList) {
-    ::CFRelease(mInputSourceList);
-  }
-  mInputSourceList = nullptr;
-  mInputSource = nullptr;
-  mKeyboardLayout = nullptr;
-  mIsRTL = -1;
-  mUCKeyboardLayout = nullptr;
-  mOverrideKeyboard = false;
-}
-
-bool
-TISInputSourceWrapper::IsPrintableKeyEvent(NSEvent* aNativeKeyEvent) const
-{
-  UInt32 nativeKeyCode = [aNativeKeyEvent keyCode];
-
-  bool isPrintableKey = !TextInputHandler::IsSpecialGeckoKey(nativeKeyCode);
-  if (isPrintableKey &&
-      [aNativeKeyEvent type] != NSKeyDown &&
-      [aNativeKeyEvent type] != NSKeyUp) {
-    NS_WARNING("Why the printable key doesn't cause NSKeyDown or NSKeyUp?");
-    isPrintableKey = false;
-  }
-  return isPrintableKey;
-}
-
-UInt32
-TISInputSourceWrapper::GetKbdType() const
-{
-  // If a keyboard layout override is set, we also need to force the keyboard
-  // type to something ANSI to avoid test failures on machines with JIS
-  // keyboards (since the pair of keyboard layout and physical keyboard type
-  // form the actual key layout).  This assumes that the test setting the
-  // override was written assuming an ANSI keyboard.
-  return mOverrideKeyboard ? eKbdType_ANSI : ::LMGetKbdType();
-}
-
-void
-TISInputSourceWrapper::ComputeInsertStringForCharCode(
-                         NSEvent* aNativeKeyEvent,
-                         const WidgetKeyboardEvent& aKeyEvent,
-                         const nsAString* aInsertString,
-                         nsAString& aResult)
-{
-  if (aInsertString) {
-    // If the caller expects that the aInsertString will be input, we shouldn't
-    // change it.
-    aResult = *aInsertString;
-  } else if (IsPrintableKeyEvent(aNativeKeyEvent)) {
-    // If IME is open, [aNativeKeyEvent characters] may be a character
-    // which will be appended to the composition string.  However, especially,
-    // while IME is disabled, most users and developers expect the key event
-    // works as IME closed.  So, we should compute the aResult with
-    // the ASCII capable keyboard layout.
-    // NOTE: Such keyboard layouts typically change the layout to its ASCII
-    //       capable layout when Command key is pressed.  And we don't worry
-    //       when Control key is pressed too because it causes inputting
-    //       control characters.
-    // Additionally, if the key event doesn't input any text, the event may be
-    // dead key event.  In this case, the charCode value should be the dead
-    // character.
-    UInt32 nativeKeyCode = [aNativeKeyEvent keyCode];
-    if ((!aKeyEvent.IsMeta() && !aKeyEvent.IsControl() && IsOpenedIMEMode()) ||
-        ![[aNativeKeyEvent characters] length]) {
-      UInt32 state =
-        nsCocoaUtils::ConvertToCarbonModifier([aNativeKeyEvent modifierFlags]);
-      uint32_t ch = TranslateToChar(nativeKeyCode, state, GetKbdType());
-      if (ch) {
-        aResult = ch;
-      }
-    } else {
-      // If the caller isn't sure what string will be input, let's use
-      // characters of NSEvent.
-      nsCocoaUtils::GetStringForNSString([aNativeKeyEvent characters], aResult);
-    }
-
-    // If control key is pressed and the eventChars is a non-printable control
-    // character, we should convert it to ASCII alphabet.
-    if (aKeyEvent.IsControl() &&
-        !aResult.IsEmpty() && aResult[0] <= char16_t(26)) {
-      aResult = (aKeyEvent.IsShift() ^ aKeyEvent.IsCapsLocked()) ?
-        static_cast<char16_t>(aResult[0] + ('A' - 1)) :
-        static_cast<char16_t>(aResult[0] + ('a' - 1));
-    }
-    // If Meta key is pressed, it may cause to switch the keyboard layout like
-    // Arabic, Russian, Hebrew, Greek and Dvorak-QWERTY.
-    else if (aKeyEvent.IsMeta() &&
-             !(aKeyEvent.IsControl() || aKeyEvent.IsAlt())) {
-      UInt32 kbType = GetKbdType();
-      UInt32 numLockState =
-        aKeyEvent.IsNumLocked() ? kEventKeyModifierNumLockMask : 0;
-      UInt32 capsLockState = aKeyEvent.IsCapsLocked() ? alphaLock : 0;
-      UInt32 shiftState = aKeyEvent.IsShift() ? shiftKey : 0;
-      uint32_t uncmdedChar =
-        TranslateToChar(nativeKeyCode, numLockState, kbType);
-      uint32_t cmdedChar =
-        TranslateToChar(nativeKeyCode, cmdKey | numLockState, kbType);
-      // If we can make a good guess at the characters that the user would
-      // expect this key combination to produce (with and without Shift) then
-      // use those characters.  This also corrects for CapsLock.
-      uint32_t ch = 0;
-      if (uncmdedChar == cmdedChar) {
-        // The characters produced with Command seem similar to those without
-        // Command.
-        ch = TranslateToChar(nativeKeyCode,
-                             shiftState | capsLockState | numLockState, kbType);
-      } else {
-        TISInputSourceWrapper USLayout("com.apple.keylayout.US");
-        uint32_t uncmdedUSChar =
-          USLayout.TranslateToChar(nativeKeyCode, numLockState, kbType);
-        // If it looks like characters from US keyboard layout when Command key
-        // is pressed, we should compute a character in the layout.
-        if (uncmdedUSChar == cmdedChar) {
-          ch = USLayout.TranslateToChar(nativeKeyCode,
-                          shiftState | capsLockState | numLockState, kbType);
-        }
-      }
-
-      // If there is a more preferred character for the commanded key event,
-      // we should use it.
-      if (ch) {
-        aResult = ch;
-      }
-    }
-  }
-
-  // Remove control characters which shouldn't be inputted on editor.
-  // XXX Currently, we don't find any cases inserting control characters with
-  //     printable character.  So, just checking first character is enough.
-  if (!aResult.IsEmpty() && IsControlChar(aResult[0])) {
-    aResult.Truncate();
-  }
-}
-
-void
-TISInputSourceWrapper::InitKeyEvent(NSEvent *aNativeKeyEvent,
-                                    WidgetKeyboardEvent& aKeyEvent,
-                                    const nsAString *aInsertString)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p TISInputSourceWrapper::InitKeyEvent, aNativeKeyEvent=%p, "
-     "aKeyEvent.mMessage=%s, aInsertString=%p, IsOpenedIMEMode()=%s",
-     this, aNativeKeyEvent, GetGeckoKeyEventType(aKeyEvent), aInsertString,
-     TrueOrFalse(IsOpenedIMEMode())));
-
-  NS_ENSURE_TRUE(aNativeKeyEvent, );
-
-  nsCocoaUtils::InitInputEvent(aKeyEvent, aNativeKeyEvent);
-
-  // This is used only while dispatching the event (which is a synchronous
-  // call), so there is no need to retain and release this data.
-  aKeyEvent.mNativeKeyEvent = aNativeKeyEvent;
-
-  // Fill in fields used for Cocoa NPAPI plugins
-  if ([aNativeKeyEvent type] == NSKeyDown ||
-      [aNativeKeyEvent type] == NSKeyUp) {
-    aKeyEvent.mNativeKeyCode = [aNativeKeyEvent keyCode];
-    aKeyEvent.mNativeModifierFlags = [aNativeKeyEvent modifierFlags];
-    nsAutoString nativeChars;
-    nsCocoaUtils::GetStringForNSString([aNativeKeyEvent characters], nativeChars);
-    aKeyEvent.mNativeCharacters.Assign(nativeChars);
-    nsAutoString nativeCharsIgnoringModifiers;
-    nsCocoaUtils::GetStringForNSString([aNativeKeyEvent charactersIgnoringModifiers], nativeCharsIgnoringModifiers);
-    aKeyEvent.mNativeCharactersIgnoringModifiers.Assign(nativeCharsIgnoringModifiers);
-  } else if ([aNativeKeyEvent type] == NSFlagsChanged) {
-    aKeyEvent.mNativeKeyCode = [aNativeKeyEvent keyCode];
-    aKeyEvent.mNativeModifierFlags = [aNativeKeyEvent modifierFlags];
-  }
-
-  aKeyEvent.mRefPoint = LayoutDeviceIntPoint(0, 0);
-  aKeyEvent.mIsChar = false; // XXX not used in XP level
-
-  UInt32 kbType = GetKbdType();
-  UInt32 nativeKeyCode = [aNativeKeyEvent keyCode];
-
-  aKeyEvent.mKeyCode =
-    ComputeGeckoKeyCode(nativeKeyCode, kbType, aKeyEvent.IsMeta());
-
-  switch (nativeKeyCode) {
-    case kVK_Command:
-    case kVK_Shift:
-    case kVK_Option:
-    case kVK_Control:
-      aKeyEvent.mLocation = nsIDOMKeyEvent::DOM_KEY_LOCATION_LEFT;
-      break;
-
-    case kVK_RightCommand:
-    case kVK_RightShift:
-    case kVK_RightOption:
-    case kVK_RightControl:
-      aKeyEvent.mLocation = nsIDOMKeyEvent::DOM_KEY_LOCATION_RIGHT;
-      break;
-
-    case kVK_ANSI_Keypad0:
-    case kVK_ANSI_Keypad1:
-    case kVK_ANSI_Keypad2:
-    case kVK_ANSI_Keypad3:
-    case kVK_ANSI_Keypad4:
-    case kVK_ANSI_Keypad5:
-    case kVK_ANSI_Keypad6:
-    case kVK_ANSI_Keypad7:
-    case kVK_ANSI_Keypad8:
-    case kVK_ANSI_Keypad9:
-    case kVK_ANSI_KeypadMultiply:
-    case kVK_ANSI_KeypadPlus:
-    case kVK_ANSI_KeypadMinus:
-    case kVK_ANSI_KeypadDecimal:
-    case kVK_ANSI_KeypadDivide:
-    case kVK_ANSI_KeypadEquals:
-    case kVK_ANSI_KeypadEnter:
-    case kVK_JIS_KeypadComma:
-    case kVK_Powerbook_KeypadEnter:
-      aKeyEvent.mLocation = nsIDOMKeyEvent::DOM_KEY_LOCATION_NUMPAD;
-      break;
-
-    default:
-      aKeyEvent.mLocation = nsIDOMKeyEvent::DOM_KEY_LOCATION_STANDARD;
-      break;
-  }
-
-  aKeyEvent.mIsRepeat =
-    ([aNativeKeyEvent type] == NSKeyDown) ? [aNativeKeyEvent isARepeat] : false;
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p TISInputSourceWrapper::InitKeyEvent, "
-     "shift=%s, ctrl=%s, alt=%s, meta=%s",
-     this, OnOrOff(aKeyEvent.IsShift()), OnOrOff(aKeyEvent.IsControl()),
-     OnOrOff(aKeyEvent.IsAlt()), OnOrOff(aKeyEvent.IsMeta())));
-
-  if (IsPrintableKeyEvent(aNativeKeyEvent)) {
-    aKeyEvent.mKeyNameIndex = KEY_NAME_INDEX_USE_STRING;
-    // If insertText calls this method, let's use the string.
-    if (aInsertString && !aInsertString->IsEmpty() &&
-        !IsControlChar((*aInsertString)[0])) {
-      aKeyEvent.mKeyValue = *aInsertString;
-    }
-    // If meta key is pressed, the printable key layout may be switched from
-    // non-ASCII capable layout to ASCII capable, or from Dvorak to QWERTY.
-    // KeyboardEvent.key value should be the switched layout's character.
-    else if (aKeyEvent.IsMeta()) {
-      nsCocoaUtils::GetStringForNSString([aNativeKeyEvent characters],
-                                         aKeyEvent.mKeyValue);
-    }
-    // If control key is pressed, some keys may produce printable character via
-    // [aNativeKeyEvent characters].  Otherwise, translate input character of
-    // the key without control key.
-    else if (aKeyEvent.IsControl()) {
-      nsCocoaUtils::GetStringForNSString([aNativeKeyEvent characters],
-                                         aKeyEvent.mKeyValue);
-      if (aKeyEvent.mKeyValue.IsEmpty() ||
-          IsControlChar(aKeyEvent.mKeyValue[0])) {
-        NSUInteger cocoaState =
-          [aNativeKeyEvent modifierFlags] & ~NSControlKeyMask;
-        UInt32 carbonState = nsCocoaUtils::ConvertToCarbonModifier(cocoaState);
-        aKeyEvent.mKeyValue =
-          TranslateToChar(nativeKeyCode, carbonState, kbType);
-      }
-    }
-    // Otherwise, KeyboardEvent.key expose
-    // [aNativeKeyEvent characters] value.  However, if IME is open and the
-    // keyboard layout isn't ASCII capable, exposing the non-ASCII character
-    // doesn't match with other platform's behavior.  For the compatibility
-    // with other platform's Gecko, we need to set a translated character.
-    else if (IsOpenedIMEMode()) {
-      UInt32 state =
-        nsCocoaUtils::ConvertToCarbonModifier([aNativeKeyEvent modifierFlags]);
-      aKeyEvent.mKeyValue = TranslateToChar(nativeKeyCode, state, kbType);
-    } else {
-      nsCocoaUtils::GetStringForNSString([aNativeKeyEvent characters],
-                                         aKeyEvent.mKeyValue);
-      // If the key value is empty, the event may be a dead key event.
-      // If TranslateToChar() returns non-zero value, that means that
-      // the key may input a character with different dead key state.
-      if (aKeyEvent.mKeyValue.IsEmpty()) {
-        NSUInteger cocoaState = [aNativeKeyEvent modifierFlags];
-        UInt32 carbonState = nsCocoaUtils::ConvertToCarbonModifier(cocoaState);
-        if (TranslateToChar(nativeKeyCode, carbonState, kbType)) {
-          aKeyEvent.mKeyNameIndex = KEY_NAME_INDEX_Dead;
-        }
-      }
-    }
-
-    // Last resort.  If .key value becomes empty string, we should use
-    // charactersIgnoringModifiers, if it's available.
-    if (aKeyEvent.mKeyNameIndex == KEY_NAME_INDEX_USE_STRING &&
-        (aKeyEvent.mKeyValue.IsEmpty() ||
-         IsControlChar(aKeyEvent.mKeyValue[0]))) {
-      nsCocoaUtils::GetStringForNSString(
-        [aNativeKeyEvent charactersIgnoringModifiers], aKeyEvent.mKeyValue);
-      // But don't expose it if it's a control character.
-      if (!aKeyEvent.mKeyValue.IsEmpty() &&
-          IsControlChar(aKeyEvent.mKeyValue[0])) {
-        aKeyEvent.mKeyValue.Truncate();
-      }
-    }
-  } else {
-    // Compute the key for non-printable keys and some special printable keys.
-    aKeyEvent.mKeyNameIndex = ComputeGeckoKeyNameIndex(nativeKeyCode);
-  }
-
-  aKeyEvent.mCodeNameIndex = ComputeGeckoCodeNameIndex(nativeKeyCode);
-  MOZ_ASSERT(aKeyEvent.mCodeNameIndex != CODE_NAME_INDEX_USE_STRING);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK
-}
-
-void
-TISInputSourceWrapper::WillDispatchKeyboardEvent(
-                         NSEvent* aNativeKeyEvent,
-                         const nsAString* aInsertString,
-                         WidgetKeyboardEvent& aKeyEvent)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  // Nothing to do here if the native key event is neither NSKeyDown nor
-  // NSKeyUp because accessing [aNativeKeyEvent characters] causes throwing
-  // an exception.
-  if ([aNativeKeyEvent type] != NSKeyDown &&
-      [aNativeKeyEvent type] != NSKeyUp) {
-    return;
-  }
-
-  UInt32 kbType = GetKbdType();
-
-  if (MOZ_LOG_TEST(gLog, LogLevel::Info)) {
-    nsAutoString chars;
-    nsCocoaUtils::GetStringForNSString([aNativeKeyEvent characters], chars);
-    NS_ConvertUTF16toUTF8 utf8Chars(chars);
-    char16_t uniChar = static_cast<char16_t>(aKeyEvent.mCharCode);
-    MOZ_LOG(gLog, LogLevel::Info,
-      ("%p TISInputSourceWrapper::WillDispatchKeyboardEvent, "
-       "aNativeKeyEvent=%p, [aNativeKeyEvent characters]=\"%s\", "
-       "aKeyEvent={ mMessage=%s, mCharCode=0x%X(%s) }, kbType=0x%X, "
-       "IsOpenedIMEMode()=%s",
-       this, aNativeKeyEvent, utf8Chars.get(),
-       GetGeckoKeyEventType(aKeyEvent), aKeyEvent.mCharCode,
-       uniChar ? NS_ConvertUTF16toUTF8(&uniChar, 1).get() : "",
-       kbType, TrueOrFalse(IsOpenedIMEMode())));
-  }
-
-  nsAutoString insertStringForCharCode;
-  ComputeInsertStringForCharCode(aNativeKeyEvent, aKeyEvent, aInsertString,
-                                 insertStringForCharCode);
-
-  // The mCharCode was set from mKeyValue. However, for example, when Ctrl key
-  // is pressed, its value should indicate an ASCII character for backward
-  // compatibility rather than inputting character without the modifiers.
-  // Therefore, we need to modify mCharCode value here.
-  uint32_t charCode =
-    insertStringForCharCode.IsEmpty() ? 0 : insertStringForCharCode[0];
-  aKeyEvent.SetCharCode(charCode);
-  // this is not a special key  XXX not used in XP
-  aKeyEvent.mIsChar = (aKeyEvent.mMessage == eKeyPress);
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p TISInputSourceWrapper::WillDispatchKeyboardEvent, "
-     "aKeyEvent.mKeyCode=0x%X, aKeyEvent.mCharCode=0x%X",
-     this, aKeyEvent.mKeyCode, aKeyEvent.mCharCode));
-
-  TISInputSourceWrapper USLayout("com.apple.keylayout.US");
-  bool isRomanKeyboardLayout = IsASCIICapable();
-
-  UInt32 key = [aNativeKeyEvent keyCode];
-
-  // Caps lock and num lock modifier state:
-  UInt32 lockState = 0;
-  if ([aNativeKeyEvent modifierFlags] & NSAlphaShiftKeyMask) {
-    lockState |= alphaLock;
-  }
-  if ([aNativeKeyEvent modifierFlags] & NSNumericPadKeyMask) {
-    lockState |= kEventKeyModifierNumLockMask;
-  }
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p TISInputSourceWrapper::WillDispatchKeyboardEvent, "
-     "isRomanKeyboardLayout=%s, key=0x%X",
-     this, TrueOrFalse(isRomanKeyboardLayout), kbType, key));
-
-  nsString str;
-
-  // normal chars
-  uint32_t unshiftedChar = TranslateToChar(key, lockState, kbType);
-  UInt32 shiftLockMod = shiftKey | lockState;
-  uint32_t shiftedChar = TranslateToChar(key, shiftLockMod, kbType);
-
-  // characters generated with Cmd key
-  // XXX we should remove CapsLock state, which changes characters from
-  //     Latin to Cyrillic with Russian layout on 10.4 only when Cmd key
-  //     is pressed.
-  UInt32 numState = (lockState & ~alphaLock); // only num lock state
-  uint32_t uncmdedChar = TranslateToChar(key, numState, kbType);
-  UInt32 shiftNumMod = numState | shiftKey;
-  uint32_t uncmdedShiftChar = TranslateToChar(key, shiftNumMod, kbType);
-  uint32_t uncmdedUSChar = USLayout.TranslateToChar(key, numState, kbType);
-  UInt32 cmdNumMod = cmdKey | numState;
-  uint32_t cmdedChar = TranslateToChar(key, cmdNumMod, kbType);
-  UInt32 cmdShiftNumMod = shiftKey | cmdNumMod;
-  uint32_t cmdedShiftChar = TranslateToChar(key, cmdShiftNumMod, kbType);
-
-  // Is the keyboard layout changed by Cmd key?
-  // E.g., Arabic, Russian, Hebrew, Greek and Dvorak-QWERTY.
-  bool isCmdSwitchLayout = uncmdedChar != cmdedChar;
-  // Is the keyboard layout for Latin, but Cmd key switches the layout?
-  // I.e., Dvorak-QWERTY
-  bool isDvorakQWERTY = isCmdSwitchLayout && isRomanKeyboardLayout;
-
-  // If the current keyboard is not Dvorak-QWERTY or Cmd is not pressed,
-  // we should append unshiftedChar and shiftedChar for handling the
-  // normal characters.  These are the characters that the user is most
-  // likely to associate with this key.
-  if ((unshiftedChar || shiftedChar) &&
-      (!aKeyEvent.IsMeta() || !isDvorakQWERTY)) {
-    AlternativeCharCode altCharCodes(unshiftedChar, shiftedChar);
-    aKeyEvent.mAlternativeCharCodes.AppendElement(altCharCodes);
-  }
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p TISInputSourceWrapper::WillDispatchKeyboardEvent, "
-     "aKeyEvent.isMeta=%s, isDvorakQWERTY=%s, "
-     "unshiftedChar=U+%X, shiftedChar=U+%X",
-     this, OnOrOff(aKeyEvent.IsMeta()), TrueOrFalse(isDvorakQWERTY),
-     unshiftedChar, shiftedChar));
-
-  // Most keyboard layouts provide the same characters in the NSEvents
-  // with Command+Shift as with Command.  However, with Command+Shift we
-  // want the character on the second level.  e.g. With a US QWERTY
-  // layout, we want "?" when the "/","?" key is pressed with
-  // Command+Shift.
-
-  // On a German layout, the OS gives us '/' with Cmd+Shift+SS(eszett)
-  // even though Cmd+SS is 'SS' and Shift+'SS' is '?'.  This '/' seems
-  // like a hack to make the Cmd+"?" event look the same as the Cmd+"?"
-  // event on a US keyboard.  The user thinks they are typing Cmd+"?", so
-  // we'll prefer the "?" character, replacing mCharCode with shiftedChar
-  // when Shift is pressed.  However, in case there is a layout where the
-  // character unique to Cmd+Shift is the character that the user expects,
-  // we'll send it as an alternative char.
-  bool hasCmdShiftOnlyChar =
-    cmdedChar != cmdedShiftChar && uncmdedShiftChar != cmdedShiftChar;
-  uint32_t originalCmdedShiftChar = cmdedShiftChar;
-
-  // If we can make a good guess at the characters that the user would
-  // expect this key combination to produce (with and without Shift) then
-  // use those characters.  This also corrects for CapsLock, which was
-  // ignored above.
-  if (!isCmdSwitchLayout) {
-    // The characters produced with Command seem similar to those without
-    // Command.
-    if (unshiftedChar) {
-      cmdedChar = unshiftedChar;
-    }
-    if (shiftedChar) {
-      cmdedShiftChar = shiftedChar;
-    }
-  } else if (uncmdedUSChar == cmdedChar) {
-    // It looks like characters from a US layout are provided when Command
-    // is down.
-    uint32_t ch = USLayout.TranslateToChar(key, lockState, kbType);
-    if (ch) {
-      cmdedChar = ch;
-    }
-    ch = USLayout.TranslateToChar(key, shiftLockMod, kbType);
-    if (ch) {
-      cmdedShiftChar = ch;
-    }
-  }
-
-  // If the current keyboard layout is switched by the Cmd key,
-  // we should append cmdedChar and shiftedCmdChar that are
-  // Latin char for the key.
-  // If the keyboard layout is Dvorak-QWERTY, we should append them only when
-  // command key is pressed because when command key isn't pressed, uncmded
-  // chars have been appended already.
-  if ((cmdedChar || cmdedShiftChar) && isCmdSwitchLayout &&
-      (aKeyEvent.IsMeta() || !isDvorakQWERTY)) {
-    AlternativeCharCode altCharCodes(cmdedChar, cmdedShiftChar);
-    aKeyEvent.mAlternativeCharCodes.AppendElement(altCharCodes);
-  }
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p TISInputSourceWrapper::WillDispatchKeyboardEvent, "
-     "hasCmdShiftOnlyChar=%s, isCmdSwitchLayout=%s, isDvorakQWERTY=%s, "
-     "cmdedChar=U+%X, cmdedShiftChar=U+%X",
-     this, TrueOrFalse(hasCmdShiftOnlyChar), TrueOrFalse(isDvorakQWERTY),
-     TrueOrFalse(isDvorakQWERTY), cmdedChar, cmdedShiftChar));
-  // Special case for 'SS' key of German layout. See the comment of
-  // hasCmdShiftOnlyChar definition for the detail.
-  if (hasCmdShiftOnlyChar && originalCmdedShiftChar) {
-    AlternativeCharCode altCharCodes(0, originalCmdedShiftChar);
-    aKeyEvent.mAlternativeCharCodes.AppendElement(altCharCodes);
-  }
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p TISInputSourceWrapper::WillDispatchKeyboardEvent, "
-     "hasCmdShiftOnlyChar=%s, originalCmdedShiftChar=U+%X",
-     this, TrueOrFalse(hasCmdShiftOnlyChar), originalCmdedShiftChar));
-
-  NS_OBJC_END_TRY_ABORT_BLOCK
-}
-
-uint32_t
-TISInputSourceWrapper::ComputeGeckoKeyCode(UInt32 aNativeKeyCode,
-                                           UInt32 aKbType,
-                                           bool aCmdIsPressed)
-{
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p TISInputSourceWrapper::ComputeGeckoKeyCode, aNativeKeyCode=0x%X, "
-     "aKbType=0x%X, aCmdIsPressed=%s, IsOpenedIMEMode()=%s, "
-     "IsASCIICapable()=%s",
-     this, aNativeKeyCode, aKbType, TrueOrFalse(aCmdIsPressed),
-     TrueOrFalse(IsOpenedIMEMode()), TrueOrFalse(IsASCIICapable())));
-
-  switch (aNativeKeyCode) {
-    case kVK_Space:             return NS_VK_SPACE;
-    case kVK_Escape:            return NS_VK_ESCAPE;
-
-    // modifiers
-    case kVK_RightCommand:
-    case kVK_Command:           return NS_VK_META;
-    case kVK_RightShift:
-    case kVK_Shift:             return NS_VK_SHIFT;
-    case kVK_CapsLock:          return NS_VK_CAPS_LOCK;
-    case kVK_RightControl:
-    case kVK_Control:           return NS_VK_CONTROL;
-    case kVK_RightOption:
-    case kVK_Option:            return NS_VK_ALT;
-
-    case kVK_ANSI_KeypadClear:  return NS_VK_CLEAR;
-
-    // function keys
-    case kVK_F1:                return NS_VK_F1;
-    case kVK_F2:                return NS_VK_F2;
-    case kVK_F3:                return NS_VK_F3;
-    case kVK_F4:                return NS_VK_F4;
-    case kVK_F5:                return NS_VK_F5;
-    case kVK_F6:                return NS_VK_F6;
-    case kVK_F7:                return NS_VK_F7;
-    case kVK_F8:                return NS_VK_F8;
-    case kVK_F9:                return NS_VK_F9;
-    case kVK_F10:               return NS_VK_F10;
-    case kVK_F11:               return NS_VK_F11;
-    case kVK_F12:               return NS_VK_F12;
-    // case kVK_F13:               return NS_VK_F13;  // clash with the 3 below
-    // case kVK_F14:               return NS_VK_F14;
-    // case kVK_F15:               return NS_VK_F15;
-    case kVK_F16:               return NS_VK_F16;
-    case kVK_F17:               return NS_VK_F17;
-    case kVK_F18:               return NS_VK_F18;
-    case kVK_F19:               return NS_VK_F19;
-
-    case kVK_PC_Pause:          return NS_VK_PAUSE;
-    case kVK_PC_ScrollLock:     return NS_VK_SCROLL_LOCK;
-    case kVK_PC_PrintScreen:    return NS_VK_PRINTSCREEN;
-
-    // keypad
-    case kVK_ANSI_Keypad0:      return NS_VK_NUMPAD0;
-    case kVK_ANSI_Keypad1:      return NS_VK_NUMPAD1;
-    case kVK_ANSI_Keypad2:      return NS_VK_NUMPAD2;
-    case kVK_ANSI_Keypad3:      return NS_VK_NUMPAD3;
-    case kVK_ANSI_Keypad4:      return NS_VK_NUMPAD4;
-    case kVK_ANSI_Keypad5:      return NS_VK_NUMPAD5;
-    case kVK_ANSI_Keypad6:      return NS_VK_NUMPAD6;
-    case kVK_ANSI_Keypad7:      return NS_VK_NUMPAD7;
-    case kVK_ANSI_Keypad8:      return NS_VK_NUMPAD8;
-    case kVK_ANSI_Keypad9:      return NS_VK_NUMPAD9;
-
-    case kVK_ANSI_KeypadMultiply: return NS_VK_MULTIPLY;
-    case kVK_ANSI_KeypadPlus:     return NS_VK_ADD;
-    case kVK_ANSI_KeypadMinus:    return NS_VK_SUBTRACT;
-    case kVK_ANSI_KeypadDecimal:  return NS_VK_DECIMAL;
-    case kVK_ANSI_KeypadDivide:   return NS_VK_DIVIDE;
-
-    case kVK_JIS_KeypadComma:   return NS_VK_SEPARATOR;
-
-    // IME keys
-    case kVK_JIS_Eisu:          return NS_VK_EISU;
-    case kVK_JIS_Kana:          return NS_VK_KANA;
-
-    // these may clash with forward delete and help
-    case kVK_PC_Insert:         return NS_VK_INSERT;
-    case kVK_PC_Delete:         return NS_VK_DELETE;
-
-    case kVK_PC_Backspace:      return NS_VK_BACK;
-    case kVK_Tab:               return NS_VK_TAB;
-
-    case kVK_Home:              return NS_VK_HOME;
-    case kVK_End:               return NS_VK_END;
-
-    case kVK_PageUp:            return NS_VK_PAGE_UP;
-    case kVK_PageDown:          return NS_VK_PAGE_DOWN;
-
-    case kVK_LeftArrow:         return NS_VK_LEFT;
-    case kVK_RightArrow:        return NS_VK_RIGHT;
-    case kVK_UpArrow:           return NS_VK_UP;
-    case kVK_DownArrow:         return NS_VK_DOWN;
-
-    case kVK_PC_ContextMenu:    return NS_VK_CONTEXT_MENU;
-
-    case kVK_ANSI_1:            return NS_VK_1;
-    case kVK_ANSI_2:            return NS_VK_2;
-    case kVK_ANSI_3:            return NS_VK_3;
-    case kVK_ANSI_4:            return NS_VK_4;
-    case kVK_ANSI_5:            return NS_VK_5;
-    case kVK_ANSI_6:            return NS_VK_6;
-    case kVK_ANSI_7:            return NS_VK_7;
-    case kVK_ANSI_8:            return NS_VK_8;
-    case kVK_ANSI_9:            return NS_VK_9;
-    case kVK_ANSI_0:            return NS_VK_0;
-
-    case kVK_ANSI_KeypadEnter:
-    case kVK_Return:
-    case kVK_Powerbook_KeypadEnter: return NS_VK_RETURN;
-  }
-
-  // If Cmd key is pressed, that causes switching keyboard layout temporarily.
-  // E.g., Dvorak-QWERTY.  Therefore, if Cmd key is pressed, we should honor it.
-  UInt32 modifiers = aCmdIsPressed ? cmdKey : 0;
-
-  uint32_t charCode = TranslateToChar(aNativeKeyCode, modifiers, aKbType);
-
-  // Special case for Mac.  Mac inputs Yen sign (U+00A5) directly instead of
-  // Back slash (U+005C).  We should return NS_VK_BACK_SLASH for compatibility
-  // with other platforms.
-  // XXX How about Won sign (U+20A9) which has same problem as Yen sign?
-  if (charCode == 0x00A5) {
-    return NS_VK_BACK_SLASH;
-  }
-
-  uint32_t keyCode = WidgetUtils::ComputeKeyCodeFromChar(charCode);
-  if (keyCode) {
-    return keyCode;
-  }
-
-  // If the unshifed char isn't an ASCII character, use shifted char.
-  charCode = TranslateToChar(aNativeKeyCode, modifiers | shiftKey, aKbType);
-  keyCode = WidgetUtils::ComputeKeyCodeFromChar(charCode);
-  if (keyCode) {
-    return keyCode;
-  }
-
-  // If this is ASCII capable, give up to compute it.
-  if (IsASCIICapable()) {
-    return 0;
-  }
-
-  // Retry with ASCII capable keyboard layout.
-  TISInputSourceWrapper currentKeyboardLayout;
-  currentKeyboardLayout.InitByCurrentASCIICapableKeyboardLayout();
-  NS_ENSURE_TRUE(mInputSource != currentKeyboardLayout.mInputSource, 0);
-  keyCode = currentKeyboardLayout.ComputeGeckoKeyCode(aNativeKeyCode, aKbType,
-                                                      aCmdIsPressed);
-
-  // However, if keyCode isn't for an alphabet keys or a numeric key, we should
-  // ignore it.  For example, comma key of Thai layout is same as close-square-
-  // bracket key of US layout and an unicode character key of Thai layout is
-  // same as comma key of US layout.  If we return NS_VK_COMMA for latter key,
-  // web application developers cannot distinguish with the former key.
-  return ((keyCode >= NS_VK_A && keyCode <= NS_VK_Z) ||
-          (keyCode >= NS_VK_0 && keyCode <= NS_VK_9)) ? keyCode : 0;
-}
-
-// static
-KeyNameIndex
-TISInputSourceWrapper::ComputeGeckoKeyNameIndex(UInt32 aNativeKeyCode)
-{
-  // NOTE:
-  //   When unsupported keys like Convert, Nonconvert of Japanese keyboard is
-  //   pressed:
-  //     on 10.6.x, 'A' key event is fired (and also actually 'a' is inserted).
-  //     on 10.7.x, Nothing happens.
-  //     on 10.8.x, Nothing happens.
-  //     on 10.9.x, FlagsChanged event is fired with keyCode 0xFF.
-  switch (aNativeKeyCode) {
-
-#define NS_NATIVE_KEY_TO_DOM_KEY_NAME_INDEX(aNativeKey, aKeyNameIndex) \
-    case aNativeKey: return aKeyNameIndex;
-
-#include "NativeKeyToDOMKeyName.h"
-
-#undef NS_NATIVE_KEY_TO_DOM_KEY_NAME_INDEX
-
-    default:
-      return KEY_NAME_INDEX_Unidentified;
-  }
-}
-
-// static
-CodeNameIndex
-TISInputSourceWrapper::ComputeGeckoCodeNameIndex(UInt32 aNativeKeyCode)
-{
-  switch (aNativeKeyCode) {
-
-#define NS_NATIVE_KEY_TO_DOM_CODE_NAME_INDEX(aNativeKey, aCodeNameIndex) \
-    case aNativeKey: return aCodeNameIndex;
-
-#include "NativeKeyToDOMCodeName.h"
-
-#undef NS_NATIVE_KEY_TO_DOM_CODE_NAME_INDEX
-
-    default:
-      return CODE_NAME_INDEX_UNKNOWN;
-  }
-}
-
-
-#pragma mark -
-
-
-/******************************************************************************
- *
- *  TextInputHandler implementation (static methods)
- *
- ******************************************************************************/
-
-NSUInteger TextInputHandler::sLastModifierState = 0;
-
-// static
-CFArrayRef
-TextInputHandler::CreateAllKeyboardLayoutList()
-{
-  const void* keys[] = { kTISPropertyInputSourceType };
-  const void* values[] = { kTISTypeKeyboardLayout };
-  CFDictionaryRef filter =
-    ::CFDictionaryCreate(kCFAllocatorDefault, keys, values, 1, NULL, NULL);
-  NS_ASSERTION(filter, "failed to create the filter");
-  CFArrayRef list = ::TISCreateInputSourceList(filter, true);
-  ::CFRelease(filter);
-  return list;
-}
-
-// static
-void
-TextInputHandler::DebugPrintAllKeyboardLayouts()
-{
-  if (MOZ_LOG_TEST(gLog, LogLevel::Info)) {
-    CFArrayRef list = CreateAllKeyboardLayoutList();
-    MOZ_LOG(gLog, LogLevel::Info, ("Keyboard layout configuration:"));
-    CFIndex idx = ::CFArrayGetCount(list);
-    TISInputSourceWrapper tis;
-    for (CFIndex i = 0; i < idx; ++i) {
-      TISInputSourceRef inputSource = static_cast<TISInputSourceRef>(
-        const_cast<void *>(::CFArrayGetValueAtIndex(list, i)));
-      tis.InitByTISInputSourceRef(inputSource);
-      nsAutoString name, isid;
-      tis.GetLocalizedName(name);
-      tis.GetInputSourceID(isid);
-      MOZ_LOG(gLog, LogLevel::Info,
-        ("  %s\t<%s>%s%s\n",
-         NS_ConvertUTF16toUTF8(name).get(),
-         NS_ConvertUTF16toUTF8(isid).get(),
-         tis.IsASCIICapable() ? "" : "\t(Isn't ASCII capable)",
-         tis.IsKeyboardLayout() && tis.GetUCKeyboardLayout() ?
-           "" : "\t(uchr is NOT AVAILABLE)"));
-    }
-    ::CFRelease(list);
-  }
-}
-
-
-#pragma mark -
-
-
-/******************************************************************************
- *
- *  TextInputHandler implementation
- *
- ******************************************************************************/
-
-TextInputHandler::TextInputHandler(nsChildView* aWidget,
-                                   NSView<mozView> *aNativeView) :
-  IMEInputHandler(aWidget, aNativeView)
-{
-  EnsureToLogAllKeyboardLayoutsAndIMEs();
-  [mView installTextInputHandler:this];
-}
-
-TextInputHandler::~TextInputHandler()
-{
-  [mView uninstallTextInputHandler];
-}
-
-bool
-TextInputHandler::HandleKeyDownEvent(NSEvent* aNativeEvent)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  if (Destroyed()) {
-    MOZ_LOG(gLog, LogLevel::Info,
-      ("%p TextInputHandler::HandleKeyDownEvent, "
-       "widget has been already destroyed", this));
-    return false;
-  }
-
-  // Insert empty line to the log for easier to read.
-  MOZ_LOG(gLog, LogLevel::Info, (""));
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p TextInputHandler::HandleKeyDownEvent, aNativeEvent=%p, "
-     "type=%s, keyCode=%lld (0x%X), modifierFlags=0x%X, characters=\"%s\", "
-     "charactersIgnoringModifiers=\"%s\"",
-     this, aNativeEvent, GetNativeKeyEventType(aNativeEvent),
-     [aNativeEvent keyCode], [aNativeEvent keyCode],
-     [aNativeEvent modifierFlags], GetCharacters([aNativeEvent characters]),
-     GetCharacters([aNativeEvent charactersIgnoringModifiers])));
-
-  // Except when Command key is pressed, we should hide mouse cursor until
-  // next mousemove.  Handling here means that:
-  // - Don't hide mouse cursor at pressing modifier key
-  // - Hide mouse cursor even if the key event will be handled by IME (i.e.,
-  //   even without dispatching eKeyPress events)
-  // - Hide mouse cursor even when a plugin has focus
-  if (!([aNativeEvent modifierFlags] & NSCommandKeyMask)) {
-    [NSCursor setHiddenUntilMouseMoves:YES];
-  }
-
-  RefPtr<nsChildView> widget(mWidget);
-
-  KeyEventState* currentKeyEvent = PushKeyEvent(aNativeEvent);
-  AutoKeyEventStateCleaner remover(this);
-
-  ComplexTextInputPanel* ctiPanel = ComplexTextInputPanel::GetSharedComplexTextInputPanel();
-  if (ctiPanel && ctiPanel->IsInComposition()) {
-    nsAutoString committed;
-    ctiPanel->InterpretKeyEvent(aNativeEvent, committed);
-    if (!committed.IsEmpty()) {
-      nsresult rv = mDispatcher->BeginNativeInputTransaction();
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        MOZ_LOG(gLog, LogLevel::Error,
-          ("%p IMEInputHandler::HandleKeyDownEvent, "
-           "FAILED, due to BeginNativeInputTransaction() failure "
-           "at dispatching keydown for ComplexTextInputPanel", this));
-        return false;
-      }
-
-      WidgetKeyboardEvent imeEvent(true, eKeyDown, widget);
-      currentKeyEvent->InitKeyEvent(this, imeEvent);
-      imeEvent.mPluginTextEventString.Assign(committed);
-      nsEventStatus status = nsEventStatus_eIgnore;
-      mDispatcher->DispatchKeyboardEvent(eKeyDown, imeEvent, status,
-                                         currentKeyEvent);
-    }
-    return true;
-  }
-
-  NSResponder* firstResponder = [[mView window] firstResponder];
-
-  nsresult rv = mDispatcher->BeginNativeInputTransaction();
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-      MOZ_LOG(gLog, LogLevel::Error,
-        ("%p IMEInputHandler::HandleKeyDownEvent, "
-         "FAILED, due to BeginNativeInputTransaction() failure "
-         "at dispatching keydown for ordinal cases", this));
-    return false;
-  }
-
-  WidgetKeyboardEvent keydownEvent(true, eKeyDown, widget);
-  currentKeyEvent->InitKeyEvent(this, keydownEvent);
-
-  nsEventStatus status = nsEventStatus_eIgnore;
-  mDispatcher->DispatchKeyboardEvent(eKeyDown, keydownEvent, status,
-                                     currentKeyEvent);
-  currentKeyEvent->mKeyDownHandled =
-    (status == nsEventStatus_eConsumeNoDefault);
-
-  if (Destroyed()) {
-    MOZ_LOG(gLog, LogLevel::Info,
-      ("%p TextInputHandler::HandleKeyDownEvent, "
-       "widget was destroyed by keydown event", this));
-    return currentKeyEvent->IsDefaultPrevented();
-  }
-
-  // The key down event may have shifted the focus, in which
-  // case we should not fire the key press.
-  // XXX This is a special code only on Cocoa widget, why is this needed?
-  if (firstResponder != [[mView window] firstResponder]) {
-    MOZ_LOG(gLog, LogLevel::Info,
-      ("%p TextInputHandler::HandleKeyDownEvent, "
-       "view lost focus by keydown event", this));
-    return currentKeyEvent->IsDefaultPrevented();
-  }
-
-  if (currentKeyEvent->IsDefaultPrevented()) {
-    MOZ_LOG(gLog, LogLevel::Info,
-      ("%p TextInputHandler::HandleKeyDownEvent, "
-       "keydown event's default is prevented", this));
-    return true;
-  }
-
-  // Let Cocoa interpret the key events, caching IsIMEComposing first.
-  bool wasComposing = IsIMEComposing();
-  bool interpretKeyEventsCalled = false;
-  // Don't call interpretKeyEvents when a plugin has focus.  If we call it,
-  // for example, a character is inputted twice during a composition in e10s
-  // mode.
-  if (!widget->IsPluginFocused() && (IsIMEEnabled() || IsASCIICapableOnly())) {
-    MOZ_LOG(gLog, LogLevel::Info,
-      ("%p TextInputHandler::HandleKeyDownEvent, calling interpretKeyEvents",
-       this));
-    [mView interpretKeyEvents:[NSArray arrayWithObject:aNativeEvent]];
-    interpretKeyEventsCalled = true;
-    MOZ_LOG(gLog, LogLevel::Info,
-      ("%p TextInputHandler::HandleKeyDownEvent, called interpretKeyEvents",
-       this));
-  }
-
-  if (Destroyed()) {
-    MOZ_LOG(gLog, LogLevel::Info,
-      ("%p TextInputHandler::HandleKeyDownEvent, widget was destroyed",
-       this));
-    return currentKeyEvent->IsDefaultPrevented();
-  }
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p TextInputHandler::HandleKeyDownEvent, wasComposing=%s, "
-     "IsIMEComposing()=%s",
-     this, TrueOrFalse(wasComposing), TrueOrFalse(IsIMEComposing())));
-
-  if (currentKeyEvent->CanDispatchKeyPressEvent() &&
-      !wasComposing && !IsIMEComposing()) {
-    rv = mDispatcher->BeginNativeInputTransaction();
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-        MOZ_LOG(gLog, LogLevel::Error,
-          ("%p IMEInputHandler::HandleKeyDownEvent, "
-           "FAILED, due to BeginNativeInputTransaction() failure "
-           "at dispatching keypress", this));
-      return false;
-    }
-
-    WidgetKeyboardEvent keypressEvent(true, eKeyPress, widget);
-    currentKeyEvent->InitKeyEvent(this, keypressEvent);
-
-    // If we called interpretKeyEvents and this isn't normal character input
-    // then IME probably ate the event for some reason. We do not want to
-    // send a key press event in that case.
-    // TODO:
-    // There are some other cases which IME eats the current event.
-    // 1. If key events were nested during calling interpretKeyEvents, it means
-    //    that IME did something.  Then, we should do nothing.
-    // 2. If one or more commands are called like "deleteBackward", we should
-    //    dispatch keypress event at that time.  Note that the command may have
-    //    been a converted or generated action by IME.  Then, we shouldn't do
-    //    our default action for this key.
-    if (!(interpretKeyEventsCalled &&
-          IsNormalCharInputtingEvent(keypressEvent))) {
-      currentKeyEvent->mKeyPressDispatched =
-        mDispatcher->MaybeDispatchKeypressEvents(keypressEvent, status,
-                                                 currentKeyEvent);
-      currentKeyEvent->mKeyPressHandled =
-        (status == nsEventStatus_eConsumeNoDefault);
-      currentKeyEvent->mKeyPressDispatched = true;
-      MOZ_LOG(gLog, LogLevel::Info,
-        ("%p TextInputHandler::HandleKeyDownEvent, keypress event dispatched",
-         this));
-    }
-  }
-
-  // Note: mWidget might have become null here. Don't count on it from here on.
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p TextInputHandler::HandleKeyDownEvent, "
-     "keydown handled=%s, keypress handled=%s, causedOtherKeyEvents=%s, "
-     "compositionDispatched=%s",
-     this, TrueOrFalse(currentKeyEvent->mKeyDownHandled),
-     TrueOrFalse(currentKeyEvent->mKeyPressHandled),
-     TrueOrFalse(currentKeyEvent->mCausedOtherKeyEvents),
-     TrueOrFalse(currentKeyEvent->mCompositionDispatched)));
-  // Insert empty line to the log for easier to read.
-  MOZ_LOG(gLog, LogLevel::Info, (""));
-  return currentKeyEvent->IsDefaultPrevented();
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(false);
-}
-
-void
-TextInputHandler::HandleKeyUpEvent(NSEvent* aNativeEvent)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p TextInputHandler::HandleKeyUpEvent, aNativeEvent=%p, "
-     "type=%s, keyCode=%lld (0x%X), modifierFlags=0x%X, characters=\"%s\", "
-     "charactersIgnoringModifiers=\"%s\", "
-     "IsIMEComposing()=%s",
-     this, aNativeEvent, GetNativeKeyEventType(aNativeEvent),
-     [aNativeEvent keyCode], [aNativeEvent keyCode],
-     [aNativeEvent modifierFlags], GetCharacters([aNativeEvent characters]),
-     GetCharacters([aNativeEvent charactersIgnoringModifiers]),
-     TrueOrFalse(IsIMEComposing())));
-
-  if (Destroyed()) {
-    MOZ_LOG(gLog, LogLevel::Info,
-      ("%p TextInputHandler::HandleKeyUpEvent, "
-       "widget has been already destroyed", this));
-    return;
-  }
-
-  nsresult rv = mDispatcher->BeginNativeInputTransaction();
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-      MOZ_LOG(gLog, LogLevel::Error,
-        ("%p IMEInputHandler::HandleKeyUpEvent, "
-         "FAILED, due to BeginNativeInputTransaction() failure", this));
-    return;
-  }
-
-  WidgetKeyboardEvent keyupEvent(true, eKeyUp, mWidget);
-  InitKeyEvent(aNativeEvent, keyupEvent);
-
-  KeyEventState currentKeyEvent(aNativeEvent);
-  nsEventStatus status = nsEventStatus_eIgnore;
-  mDispatcher->DispatchKeyboardEvent(eKeyUp, keyupEvent, status,
-                                     &currentKeyEvent);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void
-TextInputHandler::HandleFlagsChanged(NSEvent* aNativeEvent)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (Destroyed()) {
-    MOZ_LOG(gLog, LogLevel::Info,
-      ("%p TextInputHandler::HandleFlagsChanged, "
-       "widget has been already destroyed", this));
-    return;
-  }
-
-  RefPtr<nsChildView> kungFuDeathGrip(mWidget);
-  mozilla::Unused << kungFuDeathGrip; // Not referenced within this function
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p TextInputHandler::HandleFlagsChanged, aNativeEvent=%p, "
-     "type=%s, keyCode=%s (0x%X), modifierFlags=0x%08X, "
-     "sLastModifierState=0x%08X, IsIMEComposing()=%s",
-     this, aNativeEvent, GetNativeKeyEventType(aNativeEvent),
-     GetKeyNameForNativeKeyCode([aNativeEvent keyCode]), [aNativeEvent keyCode],
-     [aNativeEvent modifierFlags], sLastModifierState,
-     TrueOrFalse(IsIMEComposing())));
-
-  MOZ_ASSERT([aNativeEvent type] == NSFlagsChanged);
-
-  NSUInteger diff = [aNativeEvent modifierFlags] ^ sLastModifierState;
-  // Device dependent flags for left-control key, both shift keys, both command
-  // keys and both option keys have been defined in Next's SDK.  But we
-  // shouldn't use it directly as far as possible since Cocoa SDK doesn't
-  // define them.  Fortunately, we need them only when we dispatch keyup
-  // events.  So, we can usually know the actual relation between keyCode and
-  // device dependent flags.  However, we need to remove following flags first
-  // since the differences don't indicate modifier key state.
-  // NX_STYLUSPROXIMITYMASK: Probably used for pen like device.
-  // kCGEventFlagMaskNonCoalesced (= NX_NONCOALSESCEDMASK): See the document for
-  // Quartz Event Services.
-  diff &= ~(NX_STYLUSPROXIMITYMASK | kCGEventFlagMaskNonCoalesced);
-
-  switch ([aNativeEvent keyCode]) {
-    // CapsLock state and other modifier states are different:
-    // CapsLock state does not revert when the CapsLock key goes up, as the
-    // modifier state does for other modifier keys on key up.
-    case kVK_CapsLock: {
-      // Fire key down event for caps lock.
-      DispatchKeyEventForFlagsChanged(aNativeEvent, true);
-      // XXX should we fire keyup event too? The keyup event for CapsLock key
-      // is never dispatched on Gecko.
-      // XXX WebKit dispatches keydown event when CapsLock is locked, otherwise,
-      // keyup event.  If we do so, we cannot keep the consistency with other
-      // platform's behavior...
-      break;
-    }
-
-    // If the event is caused by pressing or releasing a modifier key, just
-    // dispatch the key's event.
-    case kVK_Shift:
-    case kVK_RightShift:
-    case kVK_Command:
-    case kVK_RightCommand:
-    case kVK_Control:
-    case kVK_RightControl:
-    case kVK_Option:
-    case kVK_RightOption:
-    case kVK_Help: {
-      // We assume that at most one modifier is changed per event if the event
-      // is caused by pressing or releasing a modifier key.
-      bool isKeyDown = ([aNativeEvent modifierFlags] & diff) != 0;
-      DispatchKeyEventForFlagsChanged(aNativeEvent, isKeyDown);
-      // XXX Some applications might send the event with incorrect device-
-      //     dependent flags.
-      if (isKeyDown && ((diff & ~NSDeviceIndependentModifierFlagsMask) != 0)) {
-        unsigned short keyCode = [aNativeEvent keyCode];
-        const ModifierKey* modifierKey =
-          GetModifierKeyForDeviceDependentFlags(diff);
-        if (modifierKey && modifierKey->keyCode != keyCode) {
-          // Although, we're not sure the actual cause of this case, the stored
-          // modifier information and the latest key event information may be
-          // mismatched. Then, let's reset the stored information.
-          // NOTE: If this happens, it may fail to handle NSFlagsChanged event
-          // in the default case (below). However, it's the rare case handler
-          // and this case occurs rarely. So, we can ignore the edge case bug.
-          NS_WARNING("Resetting stored modifier key information");
-          mModifierKeys.Clear();
-          modifierKey = nullptr;
-        }
-        if (!modifierKey) {
-          mModifierKeys.AppendElement(ModifierKey(diff, keyCode));
-        }
-      }
-      break;
-    }
-
-    // Currently we don't support Fn key since other browsers don't dispatch
-    // events for it and we don't have keyCode for this key.
-    // It should be supported when we implement .key and .char.
-    case kVK_Function:
-      break;
-
-    // If the event is caused by something else than pressing or releasing a
-    // single modifier key (for example by the app having been deactivated
-    // using command-tab), use the modifiers themselves to determine which
-    // key's event to dispatch, and whether it's a keyup or keydown event.
-    // In all cases we assume one or more modifiers are being deactivated
-    // (never activated) -- otherwise we'd have received one or more events
-    // corresponding to a single modifier key being pressed.
-    default: {
-      NSUInteger modifiers = sLastModifierState;
-      for (int32_t bit = 0; bit < 32; ++bit) {
-        NSUInteger flag = 1 << bit;
-        if (!(diff & flag)) {
-          continue;
-        }
-
-        // Given correct information from the application, a flag change here
-        // will normally be a deactivation (except for some lockable modifiers
-        // such as CapsLock).  But some applications (like VNC) can send an
-        // activating event with a zero keyCode.  So we need to check for that
-        // here.
-        bool dispatchKeyDown = ((flag & [aNativeEvent modifierFlags]) != 0);
-
-        unsigned short keyCode = 0;
-        if (flag & NSDeviceIndependentModifierFlagsMask) {
-          switch (flag) {
-            case NSAlphaShiftKeyMask:
-              keyCode = kVK_CapsLock;
-              dispatchKeyDown = true;
-              break;
-
-            case NSNumericPadKeyMask:
-              // NSNumericPadKeyMask is fired by VNC a lot. But not all of
-              // these events can really be Clear key events, so we just ignore
-              // them.
-              continue;
-
-            case NSHelpKeyMask:
-              keyCode = kVK_Help;
-              break;
-
-            case NSFunctionKeyMask:
-              // An NSFunctionKeyMask change here will normally be a
-              // deactivation.  But sometimes it will be an activation send (by
-              // VNC for example) with a zero keyCode.
-              continue;
-
-            // These cases (NSShiftKeyMask, NSControlKeyMask, NSAlternateKeyMask
-            // and NSCommandKeyMask) should be handled by the other branch of
-            // the if statement, below (which handles device dependent flags).
-            // However, some applications (like VNC) can send key events without
-            // any device dependent flags, so we handle them here instead.
-            case NSShiftKeyMask:
-              keyCode = (modifiers & 0x0004) ? kVK_RightShift : kVK_Shift;
-              break;
-            case NSControlKeyMask:
-              keyCode = (modifiers & 0x2000) ? kVK_RightControl : kVK_Control;
-              break;
-            case NSAlternateKeyMask:
-              keyCode = (modifiers & 0x0040) ? kVK_RightOption : kVK_Option;
-              break;
-            case NSCommandKeyMask:
-              keyCode = (modifiers & 0x0010) ? kVK_RightCommand : kVK_Command;
-              break;
-
-            default:
-              continue;
-          }
-        } else {
-          const ModifierKey* modifierKey =
-            GetModifierKeyForDeviceDependentFlags(flag);
-          if (!modifierKey) {
-            // See the note above (in the other branch of the if statement)
-            // about the NSShiftKeyMask, NSControlKeyMask, NSAlternateKeyMask
-            // and NSCommandKeyMask cases.
-            continue;
-          }
-          keyCode = modifierKey->keyCode;
-        }
-
-        // Remove flags
-        modifiers &= ~flag;
-        switch (keyCode) {
-          case kVK_Shift: {
-            const ModifierKey* modifierKey =
-              GetModifierKeyForNativeKeyCode(kVK_RightShift);
-            if (!modifierKey ||
-                !(modifiers & modifierKey->GetDeviceDependentFlags())) {
-              modifiers &= ~NSShiftKeyMask;
-            }
-            break;
-          }
-          case kVK_RightShift: {
-            const ModifierKey* modifierKey =
-              GetModifierKeyForNativeKeyCode(kVK_Shift);
-            if (!modifierKey ||
-                !(modifiers & modifierKey->GetDeviceDependentFlags())) {
-              modifiers &= ~NSShiftKeyMask;
-            }
-            break;
-          }
-          case kVK_Command: {
-            const ModifierKey* modifierKey =
-              GetModifierKeyForNativeKeyCode(kVK_RightCommand);
-            if (!modifierKey ||
-                !(modifiers & modifierKey->GetDeviceDependentFlags())) {
-              modifiers &= ~NSCommandKeyMask;
-            }
-            break;
-          }
-          case kVK_RightCommand: {
-            const ModifierKey* modifierKey =
-              GetModifierKeyForNativeKeyCode(kVK_Command);
-            if (!modifierKey ||
-                !(modifiers & modifierKey->GetDeviceDependentFlags())) {
-              modifiers &= ~NSCommandKeyMask;
-            }
-            break;
-          }
-          case kVK_Control: {
-            const ModifierKey* modifierKey =
-              GetModifierKeyForNativeKeyCode(kVK_RightControl);
-            if (!modifierKey ||
-                !(modifiers & modifierKey->GetDeviceDependentFlags())) {
-              modifiers &= ~NSControlKeyMask;
-            }
-            break;
-          }
-          case kVK_RightControl: {
-            const ModifierKey* modifierKey =
-              GetModifierKeyForNativeKeyCode(kVK_Control);
-            if (!modifierKey ||
-                !(modifiers & modifierKey->GetDeviceDependentFlags())) {
-              modifiers &= ~NSControlKeyMask;
-            }
-            break;
-          }
-          case kVK_Option: {
-            const ModifierKey* modifierKey =
-              GetModifierKeyForNativeKeyCode(kVK_RightOption);
-            if (!modifierKey ||
-                !(modifiers & modifierKey->GetDeviceDependentFlags())) {
-              modifiers &= ~NSAlternateKeyMask;
-            }
-            break;
-          }
-          case kVK_RightOption: {
-            const ModifierKey* modifierKey =
-              GetModifierKeyForNativeKeyCode(kVK_Option);
-            if (!modifierKey ||
-                !(modifiers & modifierKey->GetDeviceDependentFlags())) {
-              modifiers &= ~NSAlternateKeyMask;
-            }
-            break;
-          }
-          case kVK_Help:
-            modifiers &= ~NSHelpKeyMask;
-            break;
-          default:
-            break;
-        }
-
-        NSEvent* event =
-          [NSEvent keyEventWithType:NSFlagsChanged
-                           location:[aNativeEvent locationInWindow]
-                      modifierFlags:modifiers
-                          timestamp:[aNativeEvent timestamp]
-                       windowNumber:[aNativeEvent windowNumber]
-                            context:[aNativeEvent context]
-                         characters:@""
-        charactersIgnoringModifiers:@""
-                          isARepeat:NO
-                            keyCode:keyCode];
-        DispatchKeyEventForFlagsChanged(event, dispatchKeyDown);
-        if (Destroyed()) {
-          break;
-        }
-
-        // Stop if focus has changed.
-        // Check to see if mView is still the first responder.
-        if (![mView isFirstResponder]) {
-          break;
-        }
-
-      }
-      break;
-    }
-  }
-
-  // Be aware, the widget may have been destroyed.
-  sLastModifierState = [aNativeEvent modifierFlags];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-const TextInputHandler::ModifierKey*
-TextInputHandler::GetModifierKeyForNativeKeyCode(unsigned short aKeyCode) const
-{
-  for (ModifierKeyArray::index_type i = 0; i < mModifierKeys.Length(); ++i) {
-    if (mModifierKeys[i].keyCode == aKeyCode) {
-      return &((ModifierKey&)mModifierKeys[i]);
-    }
-  }
-  return nullptr;
-}
-
-const TextInputHandler::ModifierKey*
-TextInputHandler::GetModifierKeyForDeviceDependentFlags(NSUInteger aFlags) const
-{
-  for (ModifierKeyArray::index_type i = 0; i < mModifierKeys.Length(); ++i) {
-    if (mModifierKeys[i].GetDeviceDependentFlags() ==
-          (aFlags & ~NSDeviceIndependentModifierFlagsMask)) {
-      return &((ModifierKey&)mModifierKeys[i]);
-    }
-  }
-  return nullptr;
-}
-
-void
-TextInputHandler::DispatchKeyEventForFlagsChanged(NSEvent* aNativeEvent,
-                                                  bool aDispatchKeyDown)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (Destroyed()) {
-    return;
-  }
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p TextInputHandler::DispatchKeyEventForFlagsChanged, aNativeEvent=%p, "
-     "type=%s, keyCode=%s (0x%X), aDispatchKeyDown=%s, IsIMEComposing()=%s",
-     this, aNativeEvent, GetNativeKeyEventType(aNativeEvent),
-     GetKeyNameForNativeKeyCode([aNativeEvent keyCode]), [aNativeEvent keyCode],
-     TrueOrFalse(aDispatchKeyDown), TrueOrFalse(IsIMEComposing())));
-
-  if ([aNativeEvent type] != NSFlagsChanged || IsIMEComposing()) {
-    return;
-  }
-
-  nsresult rv = mDispatcher->BeginNativeInputTransaction();
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-      MOZ_LOG(gLog, LogLevel::Error,
-        ("%p IMEInputHandler::DispatchKeyEventForFlagsChanged, "
-         "FAILED, due to BeginNativeInputTransaction() failure", this));
-    return;
-  }
-
-  EventMessage message = aDispatchKeyDown ? eKeyDown : eKeyUp;
-
-  // Fire a key event.
-  WidgetKeyboardEvent keyEvent(true, message, mWidget);
-  InitKeyEvent(aNativeEvent, keyEvent);
-
-  // Attach a plugin event, in case keyEvent gets dispatched to a plugin.  Only
-  // one field is needed -- the type.  The other fields can be constructed as
-  // the need arises.  But Gecko doesn't have anything equivalent to the
-  // NPCocoaEventFlagsChanged type, and this needs to be passed accurately to
-  // any plugin to which this event is sent.
-  NPCocoaEvent cocoaEvent;
-  nsCocoaUtils::InitNPCocoaEvent(&cocoaEvent);
-  cocoaEvent.type = NPCocoaEventFlagsChanged;
-  keyEvent.mPluginEvent.Copy(cocoaEvent);
-
-  KeyEventState currentKeyEvent(aNativeEvent);
-  nsEventStatus status = nsEventStatus_eIgnore;
-  mDispatcher->DispatchKeyboardEvent(message, keyEvent, status,
-                                     &currentKeyEvent);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void
-TextInputHandler::InsertText(NSAttributedString* aAttrString,
-                             NSRange* aReplacementRange)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (Destroyed()) {
-    return;
-  }
-
-  KeyEventState* currentKeyEvent = GetCurrentKeyEvent();
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p TextInputHandler::InsertText, aAttrString=\"%s\", "
-     "aReplacementRange=%p { location=%llu, length=%llu }, "
-     "IsIMEComposing()=%s, IgnoreIMEComposition()=%s, "
-     "keyevent=%p, keydownHandled=%s, keypressDispatched=%s, "
-     "causedOtherKeyEvents=%s, compositionDispatched=%s",
-     this, GetCharacters([aAttrString string]), aReplacementRange,
-     aReplacementRange ? aReplacementRange->location : 0,
-     aReplacementRange ? aReplacementRange->length : 0,
-     TrueOrFalse(IsIMEComposing()), TrueOrFalse(IgnoreIMEComposition()),
-     currentKeyEvent ? currentKeyEvent->mKeyEvent : nullptr,
-     currentKeyEvent ?
-       TrueOrFalse(currentKeyEvent->mKeyDownHandled) : "N/A",
-     currentKeyEvent ?
-       TrueOrFalse(currentKeyEvent->mKeyPressDispatched) : "N/A",
-     currentKeyEvent ?
-       TrueOrFalse(currentKeyEvent->mCausedOtherKeyEvents) : "N/A",
-     currentKeyEvent ?
-       TrueOrFalse(currentKeyEvent->mCompositionDispatched) : "N/A"));
-
-  if (IgnoreIMEComposition()) {
-    return;
-  }
-
-  InputContext context = mWidget->GetInputContext();
-  bool isEditable = (context.mIMEState.mEnabled == IMEState::ENABLED ||
-                     context.mIMEState.mEnabled == IMEState::PASSWORD);
-  NSRange selectedRange = SelectedRange();
-
-  nsAutoString str;
-  nsCocoaUtils::GetStringForNSString([aAttrString string], str);
-
-  AutoInsertStringClearer clearer(currentKeyEvent);
-  if (currentKeyEvent) {
-    currentKeyEvent->mInsertString = &str;
-  }
-
-  if (!IsIMEComposing() && str.IsEmpty()) {
-    // nothing to do if there is no content which can be removed.
-    if (!isEditable) {
-      return;
-    }
-    // If replacement range is specified, we need to remove the range.
-    // Otherwise, we need to remove the selected range if it's not collapsed.
-    if (aReplacementRange && aReplacementRange->location != NSNotFound) {
-      // nothing to do since the range is collapsed.
-      if (aReplacementRange->length == 0) {
-        return;
-      }
-      // If the replacement range is different from current selected range,
-      // select the range.
-      if (!NSEqualRanges(selectedRange, *aReplacementRange)) {
-        NS_ENSURE_TRUE_VOID(SetSelection(*aReplacementRange));
-      }
-      selectedRange = SelectedRange();
-    }
-    NS_ENSURE_TRUE_VOID(selectedRange.location != NSNotFound);
-    if (selectedRange.length == 0) {
-      return; // nothing to do
-    }
-    // If this is caused by a key input, the keypress event which will be
-    // dispatched later should cause the delete.  Therefore, nothing to do here.
-    // Although, we're not sure if such case is actually possible.
-    if (!currentKeyEvent) {
-      return;
-    }
-    // Delete the selected range.
-    RefPtr<TextInputHandler> kungFuDeathGrip(this);
-    WidgetContentCommandEvent deleteCommandEvent(true, eContentCommandDelete,
-                                                 mWidget);
-    DispatchEvent(deleteCommandEvent);
-    NS_ENSURE_TRUE_VOID(deleteCommandEvent.mSucceeded);
-    // Be aware! The widget might be destroyed here.
-    return;
-  }
-
-  bool isReplacingSpecifiedRange =
-    isEditable && aReplacementRange &&
-    aReplacementRange->location != NSNotFound &&
-    !NSEqualRanges(selectedRange, *aReplacementRange);
-
-  // If this is not caused by pressing a key, there is a composition or
-  // replacing a range which is different from current selection, let's
-  // insert the text as committing a composition.
-  // If InsertText() is called two or more times, we should insert all
-  // text with composition events.
-  // XXX When InsertText() is called multiple times, Chromium dispatches
-  //     only one composition event.  So, we need to store InsertText()
-  //     calls and flush later.
-  if (!currentKeyEvent || currentKeyEvent->mCompositionDispatched ||
-      IsIMEComposing() || isReplacingSpecifiedRange) {
-    InsertTextAsCommittingComposition(aAttrString, aReplacementRange);
-    if (currentKeyEvent) {
-      currentKeyEvent->mCompositionDispatched = true;
-    }
-    return;
-  }
-
-  // Don't let the same event be fired twice when hitting
-  // enter/return for Bug 420502.  However, Korean IME (or some other
-  // simple IME) may work without marked text.  For example, composing
-  // character may be inserted as committed text and it's modified with
-  // aReplacementRange.  When a keydown starts new composition with
-  // committing previous character, InsertText() may be called twice,
-  // one is for committing previous character and then, inserting new
-  // composing character as committed character.  In the latter case,
-  // |CanDispatchKeyPressEvent()| returns true but we need to dispatch
-  // keypress event for the new character.  So, when IME tries to insert
-  // printable characters, we should ignore current key event state even
-  // after the keydown has already caused dispatching composition event.
-  // XXX Anyway, we should sort out around this at fixing bug 1338460.
-  if (currentKeyEvent && !currentKeyEvent->CanDispatchKeyPressEvent() &&
-      (str.IsEmpty() || (str.Length() == 1 && !IsPrintableChar(str[0])))) {
-    return;
-  }
-
-  // XXX Shouldn't we hold mDispatcher instead of mWidget?
-  RefPtr<nsChildView> widget(mWidget);
-  nsresult rv = mDispatcher->BeginNativeInputTransaction();
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-      MOZ_LOG(gLog, LogLevel::Error,
-        ("%p IMEInputHandler::HandleKeyUpEvent, "
-         "FAILED, due to BeginNativeInputTransaction() failure", this));
-    return;
-  }
-
-  // Dispatch keypress event with char instead of compositionchange event
-  WidgetKeyboardEvent keypressEvent(true, eKeyPress, widget);
-  // XXX Why do we need to dispatch keypress event for not inputting any
-  //     string?  If it wants to delete the specified range, should we
-  //     dispatch an eContentCommandDelete event instead?  Because this
-  //     must not be caused by a key operation, a part of IME's processing.
-  keypressEvent.mIsChar = IsPrintableChar(str.CharAt(0));
-
-  // Don't set other modifiers from the current event, because here in
-  // -insertText: they've already been taken into account in creating
-  // the input string.
-
-  if (currentKeyEvent) {
-    currentKeyEvent->InitKeyEvent(this, keypressEvent);
-  } else {
-    nsCocoaUtils::InitInputEvent(keypressEvent, static_cast<NSEvent*>(nullptr));
-    keypressEvent.mKeyNameIndex = KEY_NAME_INDEX_USE_STRING;
-    keypressEvent.mKeyValue = str;
-    // FYI: TextEventDispatcher will set mKeyCode to 0 for printable key's
-    //      keypress events even if they don't cause inputting non-empty string.
-  }
-
-  // Remove basic modifiers from keypress event because if they are included,
-  // nsPlaintextEditor ignores the event.
-  keypressEvent.mModifiers &= ~(MODIFIER_CONTROL |
-                                MODIFIER_ALT |
-                                MODIFIER_META);
-
-  // TODO:
-  // If mCurrentKeyEvent.mKeyEvent is null, the text should be inputted as
-  // composition events.
-  nsEventStatus status = nsEventStatus_eIgnore;
-  bool keyPressDispatched =
-    mDispatcher->MaybeDispatchKeypressEvents(keypressEvent, status,
-                                             currentKeyEvent);
-  bool keyPressHandled = (status == nsEventStatus_eConsumeNoDefault);
-
-  // Note: mWidget might have become null here. Don't count on it from here on.
-
-  if (currentKeyEvent) {
-    currentKeyEvent->mKeyPressHandled = keyPressHandled;
-    currentKeyEvent->mKeyPressDispatched = keyPressDispatched;
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-bool
-TextInputHandler::DoCommandBySelector(const char* aSelector)
-{
-  RefPtr<nsChildView> widget(mWidget);
-
-  KeyEventState* currentKeyEvent = GetCurrentKeyEvent();
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p TextInputHandler::DoCommandBySelector, aSelector=\"%s\", "
-     "Destroyed()=%s, keydownHandled=%s, keypressHandled=%s, "
-     "causedOtherKeyEvents=%s",
-     this, aSelector ? aSelector : "", TrueOrFalse(Destroyed()),
-     currentKeyEvent ?
-       TrueOrFalse(currentKeyEvent->mKeyDownHandled) : "N/A",
-     currentKeyEvent ?
-       TrueOrFalse(currentKeyEvent->mKeyPressHandled) : "N/A",
-     currentKeyEvent ?
-       TrueOrFalse(currentKeyEvent->mCausedOtherKeyEvents) : "N/A"));
-
-  if (currentKeyEvent && currentKeyEvent->CanDispatchKeyPressEvent()) {
-    nsresult rv = mDispatcher->BeginNativeInputTransaction();
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-        MOZ_LOG(gLog, LogLevel::Error,
-          ("%p IMEInputHandler::DoCommandBySelector, "
-           "FAILED, due to BeginNativeInputTransaction() failure "
-           "at dispatching keypress", this));
-      return false;
-    }
-
-    WidgetKeyboardEvent keypressEvent(true, eKeyPress, widget);
-    currentKeyEvent->InitKeyEvent(this, keypressEvent);
-
-    nsEventStatus status = nsEventStatus_eIgnore;
-    currentKeyEvent->mKeyPressDispatched =
-      mDispatcher->MaybeDispatchKeypressEvents(keypressEvent, status,
-                                               currentKeyEvent);
-    currentKeyEvent->mKeyPressHandled =
-      (status == nsEventStatus_eConsumeNoDefault);
-    MOZ_LOG(gLog, LogLevel::Info,
-      ("%p TextInputHandler::DoCommandBySelector, keypress event "
-       "dispatched, Destroyed()=%s, keypressHandled=%s",
-       this, TrueOrFalse(Destroyed()),
-       TrueOrFalse(currentKeyEvent->mKeyPressHandled)));
-  }
-
-  return (!Destroyed() && currentKeyEvent &&
-          currentKeyEvent->IsDefaultPrevented());
-}
-
-
-#pragma mark -
-
-
-/******************************************************************************
- *
- *  IMEInputHandler implementation (static methods)
- *
- ******************************************************************************/
-
-bool IMEInputHandler::sStaticMembersInitialized = false;
-bool IMEInputHandler::sCachedIsForRTLLangage = false;
-CFStringRef IMEInputHandler::sLatestIMEOpenedModeInputSourceID = nullptr;
-IMEInputHandler* IMEInputHandler::sFocusedIMEHandler = nullptr;
-
-// static
-void
-IMEInputHandler::InitStaticMembers()
-{
-  if (sStaticMembersInitialized)
-    return;
-  sStaticMembersInitialized = true;
-  // We need to check the keyboard layout changes on all applications.
-  CFNotificationCenterRef center = ::CFNotificationCenterGetDistributedCenter();
-  // XXX Don't we need to remove the observer at shut down?
-  // Mac Dev Center's document doesn't say how to remove the observer if
-  // the second parameter is NULL.
-  ::CFNotificationCenterAddObserver(center, NULL,
-      OnCurrentTextInputSourceChange,
-      kTISNotifySelectedKeyboardInputSourceChanged, NULL,
-      CFNotificationSuspensionBehaviorDeliverImmediately);
-  // Initiailize with the current keyboard layout
-  OnCurrentTextInputSourceChange(NULL, NULL,
-                                 kTISNotifySelectedKeyboardInputSourceChanged,
-                                 NULL, NULL);
-}
-
-// static
-void
-IMEInputHandler::OnCurrentTextInputSourceChange(CFNotificationCenterRef aCenter,
-                                                void* aObserver,
-                                                CFStringRef aName,
-                                                const void* aObject,
-                                                CFDictionaryRef aUserInfo)
-{
-  // Cache the latest IME opened mode to sLatestIMEOpenedModeInputSourceID.
-  TISInputSourceWrapper tis;
-  tis.InitByCurrentInputSource();
-  if (tis.IsOpenedIMEMode()) {
-    tis.GetInputSourceID(sLatestIMEOpenedModeInputSourceID);
-  }
-
-  if (MOZ_LOG_TEST(gLog, LogLevel::Info)) {
-    static CFStringRef sLastTIS = nullptr;
-    CFStringRef newTIS;
-    tis.GetInputSourceID(newTIS);
-    if (!sLastTIS ||
-        ::CFStringCompare(sLastTIS, newTIS, 0) != kCFCompareEqualTo) {
-      TISInputSourceWrapper tis1, tis2, tis3, tis4, tis5;
-      tis1.InitByCurrentKeyboardLayout();
-      tis2.InitByCurrentASCIICapableInputSource();
-      tis3.InitByCurrentASCIICapableKeyboardLayout();
-      tis4.InitByCurrentInputMethodKeyboardLayoutOverride();
-      tis5.InitByTISInputSourceRef(tis.GetKeyboardLayoutInputSource());
-      CFStringRef is0 = nullptr, is1 = nullptr, is2 = nullptr, is3 = nullptr,
-                  is4 = nullptr, is5 = nullptr, type0 = nullptr,
-                  lang0 = nullptr, bundleID0 = nullptr;
-      tis.GetInputSourceID(is0);
-      tis1.GetInputSourceID(is1);
-      tis2.GetInputSourceID(is2);
-      tis3.GetInputSourceID(is3);
-      tis4.GetInputSourceID(is4);
-      tis5.GetInputSourceID(is5);
-      tis.GetInputSourceType(type0);
-      tis.GetPrimaryLanguage(lang0);
-      tis.GetBundleID(bundleID0);
-
-      MOZ_LOG(gLog, LogLevel::Info,
-        ("IMEInputHandler::OnCurrentTextInputSourceChange,\n"
-         "  Current Input Source is changed to:\n"
-         "    currentInputContext=%p\n"
-         "    %s\n"
-         "      type=%s %s\n"
-         "      overridden keyboard layout=%s\n"
-         "      used keyboard layout for translation=%s\n"
-         "    primary language=%s\n"
-         "    bundle ID=%s\n"
-         "    current ASCII capable Input Source=%s\n"
-         "    current Keyboard Layout=%s\n"
-         "    current ASCII capable Keyboard Layout=%s",
-         [NSTextInputContext currentInputContext], GetCharacters(is0),
-         GetCharacters(type0), tis.IsASCIICapable() ? "- ASCII capable " : "",
-         GetCharacters(is4), GetCharacters(is5),
-         GetCharacters(lang0), GetCharacters(bundleID0),
-         GetCharacters(is2), GetCharacters(is1), GetCharacters(is3)));
-    }
-    sLastTIS = newTIS;
-  }
-
-  /**
-   * When the direction is changed, all the children are notified.
-   * No need to treat the initial case separately because it is covered
-   * by the general case (sCachedIsForRTLLangage is initially false)
-   */
-  if (sCachedIsForRTLLangage != tis.IsForRTLLanguage()) {
-    WidgetUtils::SendBidiKeyboardInfoToContent();
-    sCachedIsForRTLLangage = tis.IsForRTLLanguage();
-  }
-}
-
-// static
-void
-IMEInputHandler::FlushPendingMethods(nsITimer* aTimer, void* aClosure)
-{
-  NS_ASSERTION(aClosure, "aClosure is null");
-  static_cast<IMEInputHandler*>(aClosure)->ExecutePendingMethods();
-}
-
-// static
-CFArrayRef
-IMEInputHandler::CreateAllIMEModeList()
-{
-  const void* keys[] = { kTISPropertyInputSourceType };
-  const void* values[] = { kTISTypeKeyboardInputMode };
-  CFDictionaryRef filter =
-    ::CFDictionaryCreate(kCFAllocatorDefault, keys, values, 1, NULL, NULL);
-  NS_ASSERTION(filter, "failed to create the filter");
-  CFArrayRef list = ::TISCreateInputSourceList(filter, true);
-  ::CFRelease(filter);
-  return list;
-}
-
-// static
-void
-IMEInputHandler::DebugPrintAllIMEModes()
-{
-  if (MOZ_LOG_TEST(gLog, LogLevel::Info)) {
-    CFArrayRef list = CreateAllIMEModeList();
-    MOZ_LOG(gLog, LogLevel::Info, ("IME mode configuration:"));
-    CFIndex idx = ::CFArrayGetCount(list);
-    TISInputSourceWrapper tis;
-    for (CFIndex i = 0; i < idx; ++i) {
-      TISInputSourceRef inputSource = static_cast<TISInputSourceRef>(
-        const_cast<void *>(::CFArrayGetValueAtIndex(list, i)));
-      tis.InitByTISInputSourceRef(inputSource);
-      nsAutoString name, isid;
-      tis.GetLocalizedName(name);
-      tis.GetInputSourceID(isid);
-      MOZ_LOG(gLog, LogLevel::Info,
-        ("  %s\t<%s>%s%s\n",
-         NS_ConvertUTF16toUTF8(name).get(),
-         NS_ConvertUTF16toUTF8(isid).get(),
-         tis.IsASCIICapable() ? "" : "\t(Isn't ASCII capable)",
-         tis.IsEnabled() ? "" : "\t(Isn't Enabled)"));
-    }
-    ::CFRelease(list);
-  }
-}
-
-//static
-TSMDocumentID
-IMEInputHandler::GetCurrentTSMDocumentID()
-{
-  // At least on Mac OS X 10.6.x and 10.7.x, ::TSMGetActiveDocument() has a bug.
-  // The result of ::TSMGetActiveDocument() isn't modified for new active text
-  // input context until [NSTextInputContext currentInputContext] is called.
-  // Therefore, we need to call it here.
-  [NSTextInputContext currentInputContext];
-  return ::TSMGetActiveDocument();
-}
-
-
-#pragma mark -
-
-
-/******************************************************************************
- *
- *  IMEInputHandler implementation #1
- *    The methods are releated to the pending methods.  Some jobs should be
- *    run after the stack is finished, e.g, some methods cannot run the jobs
- *    during processing the focus event.  And also some other jobs should be
- *    run at the next focus event is processed.
- *    The pending methods are recorded in mPendingMethods.  They are executed
- *    by ExecutePendingMethods via FlushPendingMethods.
- *
- ******************************************************************************/
-
-NS_IMETHODIMP
-IMEInputHandler::NotifyIME(TextEventDispatcher* aTextEventDispatcher,
-                           const IMENotification& aNotification)
-{
-  switch (aNotification.mMessage) {
-    case REQUEST_TO_COMMIT_COMPOSITION:
-      CommitIMEComposition();
-      return NS_OK;
-    case REQUEST_TO_CANCEL_COMPOSITION:
-      CancelIMEComposition();
-      return NS_OK;
-    case NOTIFY_IME_OF_FOCUS:
-      if (IsFocused()) {
-        nsIWidget* widget = aTextEventDispatcher->GetWidget();
-        if (widget && widget->GetInputContext().IsPasswordEditor()) {
-          EnableSecureEventInput();
-        } else {
-          EnsureSecureEventInputDisabled();
-        }
-      }
-      OnFocusChangeInGecko(true);
-      return NS_OK;
-    case NOTIFY_IME_OF_BLUR:
-      OnFocusChangeInGecko(false);
-      return NS_OK;
-    case NOTIFY_IME_OF_SELECTION_CHANGE:
-      OnSelectionChange(aNotification);
-      return NS_OK;
-    default:
-      return NS_ERROR_NOT_IMPLEMENTED;
-  }
-}
-
-NS_IMETHODIMP_(void)
-IMEInputHandler::OnRemovedFrom(TextEventDispatcher* aTextEventDispatcher)
-{
-  // XXX When input transaction is being stolen by add-on, what should we do?
-}
-
-NS_IMETHODIMP_(void)
-IMEInputHandler::WillDispatchKeyboardEvent(
-                   TextEventDispatcher* aTextEventDispatcher,
-                   WidgetKeyboardEvent& aKeyboardEvent,
-                   uint32_t aIndexOfKeypress,
-                   void* aData)
-{
-  // If the keyboard event is not caused by a native key event, we can do
-  // nothing here.
-  if (!aData) {
-    return;
-  }
-
-  KeyEventState* currentKeyEvent = static_cast<KeyEventState*>(aData);
-  NSEvent* nativeEvent = currentKeyEvent->mKeyEvent;
-  nsAString* insertString = currentKeyEvent->mInsertString;
-  if (KeyboardLayoutOverrideRef().mOverrideEnabled) {
-    TISInputSourceWrapper tis;
-    tis.InitByLayoutID(KeyboardLayoutOverrideRef().mKeyboardLayout, true);
-    tis.WillDispatchKeyboardEvent(nativeEvent, insertString, aKeyboardEvent);
-    return;
-  }
-  TISInputSourceWrapper::CurrentInputSource().
-    WillDispatchKeyboardEvent(nativeEvent, insertString, aKeyboardEvent);
-}
-
-void
-IMEInputHandler::NotifyIMEOfFocusChangeInGecko()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::NotifyIMEOfFocusChangeInGecko, "
-     "Destroyed()=%s, IsFocused()=%s, inputContext=%p",
-     this, TrueOrFalse(Destroyed()), TrueOrFalse(IsFocused()),
-     mView ? [mView inputContext] : nullptr));
-
-  if (Destroyed()) {
-    return;
-  }
-
-  if (!IsFocused()) {
-    // retry at next focus event
-    mPendingMethods |= kNotifyIMEOfFocusChangeInGecko;
-    return;
-  }
-
-  MOZ_ASSERT(mView);
-  NSTextInputContext* inputContext = [mView inputContext];
-  NS_ENSURE_TRUE_VOID(inputContext);
-
-  // When an <input> element on a XUL <panel> element gets focus from an <input>
-  // element on the opener window of the <panel> element, the owner window
-  // still has native focus.  Therefore, IMEs may store the opener window's
-  // level at this time because they don't know the actual focus is moved to
-  // different window.  If IMEs try to get the newest window level after the
-  // focus change, we return the window level of the XUL <panel>'s widget.
-  // Therefore, let's emulate the native focus change.  Then, IMEs can refresh
-  // the stored window level.
-  [inputContext deactivate];
-  [inputContext activate];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void
-IMEInputHandler::DiscardIMEComposition()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::DiscardIMEComposition, "
-     "Destroyed()=%s, IsFocused()=%s, mView=%p, inputContext=%p",
-     this, TrueOrFalse(Destroyed()), TrueOrFalse(IsFocused()),
-     mView, mView ? [mView inputContext] : nullptr));
-
-  if (Destroyed()) {
-    return;
-  }
-
-  if (!IsFocused()) {
-    // retry at next focus event
-    mPendingMethods |= kDiscardIMEComposition;
-    return;
-  }
-
-  NS_ENSURE_TRUE_VOID(mView);
-  NSTextInputContext* inputContext = [mView inputContext];
-  NS_ENSURE_TRUE_VOID(inputContext);
-  mIgnoreIMECommit = true;
-  [inputContext discardMarkedText];
-  mIgnoreIMECommit = false;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK
-}
-
-void
-IMEInputHandler::SyncASCIICapableOnly()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::SyncASCIICapableOnly, "
-     "Destroyed()=%s, IsFocused()=%s, mIsASCIICapableOnly=%s, "
-     "GetCurrentTSMDocumentID()=%p",
-     this, TrueOrFalse(Destroyed()), TrueOrFalse(IsFocused()),
-     TrueOrFalse(mIsASCIICapableOnly), GetCurrentTSMDocumentID()));
-
-  if (Destroyed()) {
-    return;
-  }
-
-  if (!IsFocused()) {
-    // retry at next focus event
-    mPendingMethods |= kSyncASCIICapableOnly;
-    return;
-  }
-
-  TSMDocumentID doc = GetCurrentTSMDocumentID();
-  if (!doc) {
-    // retry
-    mPendingMethods |= kSyncASCIICapableOnly;
-    NS_WARNING("Application is active but there is no active document");
-    ResetTimer();
-    return;
-  }
-
-  if (mIsASCIICapableOnly) {
-    CFArrayRef ASCIICapableTISList = ::TISCreateASCIICapableInputSourceList();
-    ::TSMSetDocumentProperty(doc,
-                             kTSMDocumentEnabledInputSourcesPropertyTag,
-                             sizeof(CFArrayRef),
-                             &ASCIICapableTISList);
-    ::CFRelease(ASCIICapableTISList);
-  } else {
-    ::TSMRemoveDocumentProperty(doc,
-                                kTSMDocumentEnabledInputSourcesPropertyTag);
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void
-IMEInputHandler::ResetTimer()
-{
-  NS_ASSERTION(mPendingMethods != 0,
-               "There are not pending methods, why this is called?");
-  if (mTimer) {
-    mTimer->Cancel();
-  } else {
-    mTimer = do_CreateInstance(NS_TIMER_CONTRACTID);
-    NS_ENSURE_TRUE(mTimer, );
-  }
-  mTimer->InitWithFuncCallback(FlushPendingMethods, this, 0,
-                               nsITimer::TYPE_ONE_SHOT);
-}
-
-void
-IMEInputHandler::ExecutePendingMethods()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (mTimer) {
-    mTimer->Cancel();
-    mTimer = nullptr;
-  }
-
-  if (![[NSApplication sharedApplication] isActive]) {
-    mIsInFocusProcessing = false;
-    // If we're not active, we should retry at focus event
-    return;
-  }
-
-  uint32_t pendingMethods = mPendingMethods;
-  // First, reset the pending method flags because if each methods cannot
-  // run now, they can reentry to the pending flags by theirselves.
-  mPendingMethods = 0;
-
-  if (pendingMethods & kDiscardIMEComposition)
-    DiscardIMEComposition();
-  if (pendingMethods & kSyncASCIICapableOnly)
-    SyncASCIICapableOnly();
-  if (pendingMethods & kNotifyIMEOfFocusChangeInGecko) {
-    NotifyIMEOfFocusChangeInGecko();
-  }
-
-  mIsInFocusProcessing = false;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-#pragma mark -
-
-
-/******************************************************************************
- *
- * IMEInputHandler implementation (native event handlers)
- *
- ******************************************************************************/
-
-TextRangeType
-IMEInputHandler::ConvertToTextRangeType(uint32_t aUnderlineStyle,
-                                        NSRange& aSelectedRange)
-{
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::ConvertToTextRangeType, "
-     "aUnderlineStyle=%llu, aSelectedRange.length=%llu,",
-     this, aUnderlineStyle, aSelectedRange.length));
-
-  // We assume that aUnderlineStyle is NSUnderlineStyleSingle or
-  // NSUnderlineStyleThick.  NSUnderlineStyleThick should indicate a selected
-  // clause.  Otherwise, should indicate non-selected clause.
-
-  if (aSelectedRange.length == 0) {
-    switch (aUnderlineStyle) {
-      case NSUnderlineStyleSingle:
-        return TextRangeType::eRawClause;
-      case NSUnderlineStyleThick:
-        return TextRangeType::eSelectedRawClause;
-      default:
-        NS_WARNING("Unexpected line style");
-        return TextRangeType::eSelectedRawClause;
-    }
-  }
-
-  switch (aUnderlineStyle) {
-    case NSUnderlineStyleSingle:
-      return TextRangeType::eConvertedClause;
-    case NSUnderlineStyleThick:
-      return TextRangeType::eSelectedClause;
-    default:
-      NS_WARNING("Unexpected line style");
-      return TextRangeType::eSelectedClause;
-  }
-}
-
-uint32_t
-IMEInputHandler::GetRangeCount(NSAttributedString *aAttrString)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  // Iterate through aAttrString for the NSUnderlineStyleAttributeName and
-  // count the different segments adjusting limitRange as we go.
-  uint32_t count = 0;
-  NSRange effectiveRange;
-  NSRange limitRange = NSMakeRange(0, [aAttrString length]);
-  while (limitRange.length > 0) {
-    [aAttrString  attribute:NSUnderlineStyleAttributeName 
-                    atIndex:limitRange.location 
-      longestEffectiveRange:&effectiveRange
-                    inRange:limitRange];
-    limitRange =
-      NSMakeRange(NSMaxRange(effectiveRange), 
-                  NSMaxRange(limitRange) - NSMaxRange(effectiveRange));
-    count++;
-  }
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::GetRangeCount, aAttrString=\"%s\", count=%llu",
-     this, GetCharacters([aAttrString string]), count));
-
-  return count;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(0);
-}
-
-already_AddRefed<mozilla::TextRangeArray>
-IMEInputHandler::CreateTextRangeArray(NSAttributedString *aAttrString,
-                                      NSRange& aSelectedRange)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  RefPtr<mozilla::TextRangeArray> textRangeArray =
-                                      new mozilla::TextRangeArray();
-
-  // Note that we shouldn't append ranges when composition string
-  // is empty because it may cause TextComposition confused.
-  if (![aAttrString length]) {
-    return textRangeArray.forget();
-  }
-
-  // Convert the Cocoa range into the TextRange Array used in Gecko.
-  // Iterate through the attributed string and map the underline attribute to
-  // Gecko IME textrange attributes.  We may need to change the code here if
-  // we change the implementation of validAttributesForMarkedText.
-  NSRange limitRange = NSMakeRange(0, [aAttrString length]);
-  uint32_t rangeCount = GetRangeCount(aAttrString);
-  for (uint32_t i = 0; i < rangeCount && limitRange.length > 0; i++) {
-    NSRange effectiveRange;
-    id attributeValue = [aAttrString attribute:NSUnderlineStyleAttributeName
-                                       atIndex:limitRange.location
-                         longestEffectiveRange:&effectiveRange
-                                       inRange:limitRange];
-
-    TextRange range;
-    range.mStartOffset = effectiveRange.location;
-    range.mEndOffset = NSMaxRange(effectiveRange);
-    range.mRangeType =
-      ConvertToTextRangeType([attributeValue intValue], aSelectedRange);
-    textRangeArray->AppendElement(range);
-
-    MOZ_LOG(gLog, LogLevel::Info,
-      ("%p IMEInputHandler::CreateTextRangeArray, "
-       "range={ mStartOffset=%llu, mEndOffset=%llu, mRangeType=%s }",
-       this, range.mStartOffset, range.mEndOffset,
-       ToChar(range.mRangeType)));
-
-    limitRange =
-      NSMakeRange(NSMaxRange(effectiveRange), 
-                  NSMaxRange(limitRange) - NSMaxRange(effectiveRange));
-  }
-
-  // Get current caret position.
-  TextRange range;
-  range.mStartOffset = aSelectedRange.location + aSelectedRange.length;
-  range.mEndOffset = range.mStartOffset;
-  range.mRangeType = TextRangeType::eCaret;
-  textRangeArray->AppendElement(range);
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::CreateTextRangeArray, "
-     "range={ mStartOffset=%llu, mEndOffset=%llu, mRangeType=%s }",
-     this, range.mStartOffset, range.mEndOffset,
-     ToChar(range.mRangeType)));
-
-  return textRangeArray.forget();
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSNULL;
-}
-
-bool
-IMEInputHandler::DispatchCompositionStartEvent()
-{
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::DispatchCompositionStartEvent, "
-     "mSelectedRange={ location=%llu, length=%llu }, Destroyed()=%s, "
-     "mView=%p, mWidget=%p, inputContext=%p, mIsIMEComposing=%s",
-     this,  SelectedRange().location, mSelectedRange.length,
-     TrueOrFalse(Destroyed()), mView, mWidget,
-     mView ? [mView inputContext] : nullptr, TrueOrFalse(mIsIMEComposing)));
-
-  RefPtr<IMEInputHandler> kungFuDeathGrip(this);
-
-  nsresult rv = mDispatcher->BeginNativeInputTransaction();
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    MOZ_LOG(gLog, LogLevel::Error,
-      ("%p IMEInputHandler::DispatchCompositionStartEvent, "
-       "FAILED, due to BeginNativeInputTransaction() failure", this));
-    return false;
-  }
-
-  NS_ASSERTION(!mIsIMEComposing, "There is a composition already");
-  mIsIMEComposing = true;
-
-  nsEventStatus status;
-  rv = mDispatcher->StartComposition(status);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    MOZ_LOG(gLog, LogLevel::Error,
-      ("%p IMEInputHandler::DispatchCompositionStartEvent, "
-       "FAILED, due to StartComposition() failure", this));
-    return false;
-  }
-
-  if (Destroyed()) {
-    MOZ_LOG(gLog, LogLevel::Info,
-      ("%p IMEInputHandler::DispatchCompositionStartEvent, "
-       "destroyed by compositionstart event", this));
-    return false;
-  }
-
-  // FYI: compositionstart may cause committing composition by the webapp.
-  if (!mIsIMEComposing) {
-    return false;
-  }
-
-  // FYI: The selection range might have been modified by a compositionstart
-  //      event handler.
-  mIMECompositionStart = SelectedRange().location;
-  return true;
-}
-
-bool
-IMEInputHandler::DispatchCompositionChangeEvent(const nsString& aText,
-                                                NSAttributedString* aAttrString,
-                                                NSRange& aSelectedRange)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::DispatchCompositionChangeEvent, "
-     "aText=\"%s\", aAttrString=\"%s\", "
-     "aSelectedRange={ location=%llu, length=%llu }, Destroyed()=%s, mView=%p, "
-     "mWidget=%p, inputContext=%p, mIsIMEComposing=%s",
-     this, NS_ConvertUTF16toUTF8(aText).get(),
-     GetCharacters([aAttrString string]),
-     aSelectedRange.location, aSelectedRange.length,
-     TrueOrFalse(Destroyed()), mView, mWidget,
-     mView ? [mView inputContext] : nullptr, TrueOrFalse(mIsIMEComposing)));
-
-  NS_ENSURE_TRUE(!Destroyed(), false);
-
-  NS_ASSERTION(mIsIMEComposing, "We're not in composition");
-
-  RefPtr<IMEInputHandler> kungFuDeathGrip(this);
-
-  nsresult rv = mDispatcher->BeginNativeInputTransaction();
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    MOZ_LOG(gLog, LogLevel::Error,
-      ("%p IMEInputHandler::DispatchCompositionChangeEvent, "
-       "FAILED, due to BeginNativeInputTransaction() failure", this));
-    return false;
-  }
-
-  RefPtr<TextRangeArray> rangeArray =
-    CreateTextRangeArray(aAttrString, aSelectedRange);
-
-  rv = mDispatcher->SetPendingComposition(aText, rangeArray);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    MOZ_LOG(gLog, LogLevel::Error,
-      ("%p IMEInputHandler::DispatchCompositionChangeEvent, "
-       "FAILED, due to SetPendingComposition() failure", this));
-    return false;
-  }
-
-  mSelectedRange.location = mIMECompositionStart + aSelectedRange.location;
-  mSelectedRange.length = aSelectedRange.length;
-
-  if (mIMECompositionString) {
-    [mIMECompositionString release];
-  }
-  mIMECompositionString = [[aAttrString string] retain];
-
-  nsEventStatus status;
-  rv = mDispatcher->FlushPendingComposition(status);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    MOZ_LOG(gLog, LogLevel::Error,
-      ("%p IMEInputHandler::DispatchCompositionChangeEvent, "
-       "FAILED, due to FlushPendingComposition() failure", this));
-    return false;
-  }
-
-  if (Destroyed()) {
-    MOZ_LOG(gLog, LogLevel::Info,
-      ("%p IMEInputHandler::DispatchCompositionChangeEvent, "
-       "destroyed by compositionchange event", this));
-    return false;
-  }
-
-  // FYI: compositionstart may cause committing composition by the webapp.
-  return mIsIMEComposing;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(false);
-}
-
-bool
-IMEInputHandler::DispatchCompositionCommitEvent(const nsAString* aCommitString)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::DispatchCompositionCommitEvent, "
-     "aCommitString=0x%p (\"%s\"), Destroyed()=%s, mView=%p, mWidget=%p, "
-     "inputContext=%p, mIsIMEComposing=%s",
-     this, aCommitString,
-     aCommitString ? NS_ConvertUTF16toUTF8(*aCommitString).get() : "",
-     TrueOrFalse(Destroyed()), mView, mWidget,
-     mView ? [mView inputContext] : nullptr, TrueOrFalse(mIsIMEComposing)));
-
-  NS_ASSERTION(mIsIMEComposing, "We're not in composition");
-
-  RefPtr<IMEInputHandler> kungFuDeathGrip(this);
-
-  if (!Destroyed()) {
-    // IME may query selection immediately after this, however, in e10s mode,
-    // OnSelectionChange() will be called asynchronously.  Until then, we
-    // should emulate expected selection range if the webapp does nothing.
-    mSelectedRange.location = mIMECompositionStart;
-    if (aCommitString) {
-      mSelectedRange.location += aCommitString->Length();
-    } else if (mIMECompositionString) {
-      nsAutoString commitString;
-      nsCocoaUtils::GetStringForNSString(mIMECompositionString, commitString);
-      mSelectedRange.location += commitString.Length();
-    }
-    mSelectedRange.length = 0;
-
-    nsresult rv = mDispatcher->BeginNativeInputTransaction();
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      MOZ_LOG(gLog, LogLevel::Error,
-        ("%p IMEInputHandler::DispatchCompositionCommitEvent, "
-         "FAILED, due to BeginNativeInputTransaction() failure", this));
-    } else {
-      nsEventStatus status;
-      rv = mDispatcher->CommitComposition(status, aCommitString);
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        MOZ_LOG(gLog, LogLevel::Error,
-          ("%p IMEInputHandler::DispatchCompositionCommitEvent, "
-           "FAILED, due to BeginNativeInputTransaction() failure", this));
-      }
-    }
-  }
-
-  mIsIMEComposing = false;
-  mIMECompositionStart = UINT32_MAX;
-  if (mIMECompositionString) {
-    [mIMECompositionString release];
-    mIMECompositionString = nullptr;
-  }
-
-  if (Destroyed()) {
-    MOZ_LOG(gLog, LogLevel::Info,
-      ("%p IMEInputHandler::DispatchCompositionCommitEvent, "
-       "destroyed by compositioncommit event", this));
-    return false;
-  }
-
-  return true;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(false);
-}
-
-void
-IMEInputHandler::InsertTextAsCommittingComposition(
-                   NSAttributedString* aAttrString,
-                   NSRange* aReplacementRange)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::InsertTextAsCommittingComposition, "
-     "aAttrString=\"%s\", aReplacementRange=%p { location=%llu, length=%llu }, "
-     "Destroyed()=%s, IsIMEComposing()=%s, "
-     "mMarkedRange={ location=%llu, length=%llu }",
-     this, GetCharacters([aAttrString string]), aReplacementRange,
-     aReplacementRange ? aReplacementRange->location : 0,
-     aReplacementRange ? aReplacementRange->length : 0,
-     TrueOrFalse(Destroyed()), TrueOrFalse(IsIMEComposing()),
-     mMarkedRange.location, mMarkedRange.length));
-
-  if (IgnoreIMECommit()) {
-    MOZ_CRASH("IMEInputHandler::InsertTextAsCommittingComposition() must not"
-              "be called while canceling the composition");
-  }
-
-  if (Destroyed()) {
-    return;
-  }
-
-  // First, commit current composition with the latest composition string if the
-  // replacement range is different from marked range.
-  if (IsIMEComposing() && aReplacementRange &&
-      aReplacementRange->location != NSNotFound &&
-      !NSEqualRanges(MarkedRange(), *aReplacementRange)) {
-    if (!DispatchCompositionCommitEvent()) {
-      MOZ_LOG(gLog, LogLevel::Info,
-        ("%p IMEInputHandler::InsertTextAsCommittingComposition, "
-         "destroyed by commiting composition for setting replacement range",
-         this));
-      return;
-    }
-  }
-
-  RefPtr<IMEInputHandler> kungFuDeathGrip(this);
-
-  nsString str;
-  nsCocoaUtils::GetStringForNSString([aAttrString string], str);
-
-  if (!IsIMEComposing()) {
-    // If there is no selection and replacement range is specified, set the
-    // range as selection.
-    if (aReplacementRange && aReplacementRange->location != NSNotFound &&
-        !NSEqualRanges(SelectedRange(), *aReplacementRange)) {
-      NS_ENSURE_TRUE_VOID(SetSelection(*aReplacementRange));
-    }
-
-    if (!DispatchCompositionStartEvent()) {
-      MOZ_LOG(gLog, LogLevel::Info,
-        ("%p IMEInputHandler::InsertTextAsCommittingComposition, "
-         "cannot continue handling composition after compositionstart", this));
-      return;
-    }
-  }
-
-  if (!DispatchCompositionCommitEvent(&str)) {
-    MOZ_LOG(gLog, LogLevel::Info,
-      ("%p IMEInputHandler::InsertTextAsCommittingComposition, "
-       "destroyed by compositioncommit event", this));
-    return;
-  }
-
-  mMarkedRange = NSMakeRange(NSNotFound, 0);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void
-IMEInputHandler::SetMarkedText(NSAttributedString* aAttrString,
-                               NSRange& aSelectedRange,
-                               NSRange* aReplacementRange)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  KeyEventState* currentKeyEvent = GetCurrentKeyEvent();
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::SetMarkedText, "
-     "aAttrString=\"%s\", aSelectedRange={ location=%llu, length=%llu }, "
-     "aReplacementRange=%p { location=%llu, length=%llu }, "
-     "Destroyed()=%s, IgnoreIMEComposition()=%s, IsIMEComposing()=%s, "
-     "mMarkedRange={ location=%llu, length=%llu }, keyevent=%p, "
-     "keydownHandled=%s, keypressDispatched=%s, causedOtherKeyEvents=%s, "
-     "compositionDispatched=%s",
-     this, GetCharacters([aAttrString string]),
-     aSelectedRange.location, aSelectedRange.length, aReplacementRange,
-     aReplacementRange ? aReplacementRange->location : 0,
-     aReplacementRange ? aReplacementRange->length : 0,
-     TrueOrFalse(Destroyed()), TrueOrFalse(IgnoreIMEComposition()),
-     TrueOrFalse(IsIMEComposing()),
-     mMarkedRange.location, mMarkedRange.length,
-     currentKeyEvent ? currentKeyEvent->mKeyEvent : nullptr,
-     currentKeyEvent ?
-       TrueOrFalse(currentKeyEvent->mKeyDownHandled) : "N/A",
-     currentKeyEvent ?
-       TrueOrFalse(currentKeyEvent->mKeyPressDispatched) : "N/A",
-     currentKeyEvent ?
-       TrueOrFalse(currentKeyEvent->mCausedOtherKeyEvents) : "N/A",
-     currentKeyEvent ?
-       TrueOrFalse(currentKeyEvent->mCompositionDispatched) : "N/A"));
-
-  // If SetMarkedText() is called during handling a key press, that means that
-  // the key event caused this composition.  So, keypress event shouldn't
-  // be dispatched later, let's mark the key event causing composition event.
-  if (currentKeyEvent) {
-    currentKeyEvent->mCompositionDispatched = true;
-  }
-
-  if (Destroyed() || IgnoreIMEComposition()) {
-    return;
-  }
-
-  RefPtr<IMEInputHandler> kungFuDeathGrip(this);
-
-  // First, commit current composition with the latest composition string if the
-  // replacement range is different from marked range.
-  if (IsIMEComposing() && aReplacementRange &&
-      aReplacementRange->location != NSNotFound &&
-      !NSEqualRanges(MarkedRange(), *aReplacementRange)) {
-    AutoRestore<bool> ignoreIMECommit(mIgnoreIMECommit);
-    mIgnoreIMECommit = false;
-    if (!DispatchCompositionCommitEvent()) {
-      MOZ_LOG(gLog, LogLevel::Info,
-        ("%p IMEInputHandler::SetMarkedText, "
-         "destroyed by commiting composition for setting replacement range",
-         this));
-      return;
-    }
-  }
-
-  nsString str;
-  nsCocoaUtils::GetStringForNSString([aAttrString string], str);
-
-  mMarkedRange.length = str.Length();
-
-  if (!IsIMEComposing() && !str.IsEmpty()) {
-    // If there is no selection and replacement range is specified, set the
-    // range as selection.
-    if (aReplacementRange && aReplacementRange->location != NSNotFound &&
-        !NSEqualRanges(SelectedRange(), *aReplacementRange)) {
-      NS_ENSURE_TRUE_VOID(SetSelection(*aReplacementRange));
-    }
-
-    mMarkedRange.location = SelectedRange().location;
-
-    if (!DispatchCompositionStartEvent()) {
-      MOZ_LOG(gLog, LogLevel::Info,
-        ("%p IMEInputHandler::SetMarkedText, cannot continue handling "
-         "composition after dispatching compositionstart", this));
-      return;
-    }
-  }
-
-  if (!str.IsEmpty()) {
-    if (!DispatchCompositionChangeEvent(str, aAttrString, aSelectedRange)) {
-      MOZ_LOG(gLog, LogLevel::Info,
-        ("%p IMEInputHandler::SetMarkedText, cannot continue handling "
-         "composition after dispatching compositionchange", this));
-    }
-    return;
-  }
-
-  // If the composition string becomes empty string, we should commit
-  // current composition.
-  if (!DispatchCompositionCommitEvent(&EmptyString())) {
-    MOZ_LOG(gLog, LogLevel::Info,
-      ("%p IMEInputHandler::SetMarkedText, "
-       "destroyed by compositioncommit event", this));
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-NSAttributedString*
-IMEInputHandler::GetAttributedSubstringFromRange(NSRange& aRange,
-                                                 NSRange* aActualRange)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::GetAttributedSubstringFromRange, "
-     "aRange={ location=%llu, length=%llu }, aActualRange=%p, Destroyed()=%s",
-     this, aRange.location, aRange.length, aActualRange,
-     TrueOrFalse(Destroyed())));
-
-  if (aActualRange) {
-    *aActualRange = NSMakeRange(NSNotFound, 0);
-  }
-
-  if (Destroyed() || aRange.location == NSNotFound || aRange.length == 0) {
-    return nil;
-  }
-
-  RefPtr<IMEInputHandler> kungFuDeathGrip(this);
-
-  // If we're in composing, the queried range may be in the composition string.
-  // In such case, we should use mIMECompositionString since if the composition
-  // string is handled by a remote process, the content cache may be out of
-  // date.
-  // XXX Should we set composition string attributes?  Although, Blink claims
-  //     that some attributes of marked text are supported, but they return
-  //     just marked string without any style.  So, let's keep current behavior
-  //     at least for now.
-  NSUInteger compositionLength =
-    mIMECompositionString ? [mIMECompositionString length] : 0;
-  if (mIMECompositionStart != UINT32_MAX &&
-      mIMECompositionStart >= aRange.location &&
-      mIMECompositionStart + compositionLength <=
-        aRange.location + aRange.length) {
-    NSRange range =
-      NSMakeRange(aRange.location - mIMECompositionStart, aRange.length);
-    NSString* nsstr = [mIMECompositionString substringWithRange:range];
-    NSMutableAttributedString* result =
-      [[[NSMutableAttributedString alloc] initWithString:nsstr
-                                              attributes:nil] autorelease];
-    // XXX We cannot return font information in this case.  However, this
-    //     case must occur only when IME tries to confirm if composing string
-    //     is handled as expected.
-    if (aActualRange) {
-      *aActualRange = aRange;
-    }
-
-    if (MOZ_LOG_TEST(gLog, LogLevel::Info)) {
-      nsAutoString str;
-      nsCocoaUtils::GetStringForNSString(nsstr, str);
-      MOZ_LOG(gLog, LogLevel::Info,
-        ("%p IMEInputHandler::GetAttributedSubstringFromRange, "
-         "computed with mIMECompositionString (result string=\"%s\")",
-         this, NS_ConvertUTF16toUTF8(str).get()));
-    }
-    return result;
-  }
-
-  nsAutoString str;
-  WidgetQueryContentEvent textContent(true, eQueryTextContent, mWidget);
-  WidgetQueryContentEvent::Options options;
-  int64_t startOffset = aRange.location;
-  if (IsIMEComposing()) {
-    // The composition may be at different offset from the selection start
-    // offset at dispatching compositionstart because start of composition
-    // is fixed when composition string becomes non-empty in the editor.
-    // Therefore, we need to use query event which is relative to insertion
-    // point.
-    options.mRelativeToInsertionPoint = true;
-    startOffset -= mIMECompositionStart;
-  }
-  textContent.InitForQueryTextContent(startOffset, aRange.length, options);
-  textContent.RequestFontRanges();
-  DispatchEvent(textContent);
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::GetAttributedSubstringFromRange, "
-     "textContent={ mSucceeded=%s, mReply={ mString=\"%s\", mOffset=%u } }",
-     this, TrueOrFalse(textContent.mSucceeded),
-     NS_ConvertUTF16toUTF8(textContent.mReply.mString).get(),
-     textContent.mReply.mOffset));
-
-  if (!textContent.mSucceeded) {
-    return nil;
-  }
-
-  // We don't set vertical information at this point.  If required,
-  // OS will calls drawsVerticallyForCharacterAtIndex.
-  NSMutableAttributedString* result =
-    nsCocoaUtils::GetNSMutableAttributedString(textContent.mReply.mString,
-                                               textContent.mReply.mFontRanges,
-                                               false,
-                                               mWidget->BackingScaleFactor());
-  if (aActualRange) {
-    aActualRange->location = textContent.mReply.mOffset;
-    aActualRange->length = textContent.mReply.mString.Length();
-  }
-  return result;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-bool
-IMEInputHandler::HasMarkedText()
-{
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::HasMarkedText, "
-     "mMarkedRange={ location=%llu, length=%llu }",
-     this, mMarkedRange.location, mMarkedRange.length));
-
-  return (mMarkedRange.location != NSNotFound) && (mMarkedRange.length != 0);
-}
-
-NSRange
-IMEInputHandler::MarkedRange()
-{
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::MarkedRange, "
-     "mMarkedRange={ location=%llu, length=%llu }",
-     this, mMarkedRange.location, mMarkedRange.length));
-
-  if (!HasMarkedText()) {
-    return NSMakeRange(NSNotFound, 0);
-  }
-  return mMarkedRange;
-}
-
-NSRange
-IMEInputHandler::SelectedRange()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::SelectedRange, Destroyed()=%s, mSelectedRange={ "
-     "location=%llu, length=%llu }",
-     this, TrueOrFalse(Destroyed()), mSelectedRange.location,
-     mSelectedRange.length));
-
-  if (Destroyed()) {
-    return mSelectedRange;
-  }
-
-  if (mSelectedRange.location != NSNotFound) {
-    MOZ_ASSERT(mIMEHasFocus);
-    return mSelectedRange;
-  }
-
-  RefPtr<IMEInputHandler> kungFuDeathGrip(this);
-
-  WidgetQueryContentEvent selection(true, eQuerySelectedText, mWidget);
-  DispatchEvent(selection);
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::SelectedRange, selection={ mSucceeded=%s, "
-     "mReply={ mOffset=%u, mString.Length()=%u } }",
-     this, TrueOrFalse(selection.mSucceeded), selection.mReply.mOffset,
-     selection.mReply.mString.Length()));
-
-  if (!selection.mSucceeded) {
-    return mSelectedRange;
-  }
-
-  mWritingMode = selection.GetWritingMode();
-  mRangeForWritingMode = NSMakeRange(selection.mReply.mOffset,
-                                     selection.mReply.mString.Length());
-
-  if (mIMEHasFocus) {
-    mSelectedRange = mRangeForWritingMode;
-  }
-
-  return mRangeForWritingMode;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(mSelectedRange);
-}
-
-bool
-IMEInputHandler::DrawsVerticallyForCharacterAtIndex(uint32_t aCharIndex)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  if (Destroyed()) {
-    return false;
-  }
-
-  if (mRangeForWritingMode.location == NSNotFound) {
-    // Update cached writing-mode value for the current selection.
-    SelectedRange();
-  }
-
-  if (aCharIndex < mRangeForWritingMode.location ||
-      aCharIndex > mRangeForWritingMode.location + mRangeForWritingMode.length) {
-    // It's not clear to me whether this ever happens in practice, but if an
-    // IME ever wants to query writing mode at an offset outside the current
-    // selection, the writing-mode value may not be correct for the index.
-    // In that case, use FirstRectForCharacterRange to get a fresh value.
-    // This does more work than strictly necessary (we don't need the rect here),
-    // but should be a rare case.
-    NS_WARNING("DrawsVerticallyForCharacterAtIndex not using cached writing mode");
-    NSRange range = NSMakeRange(aCharIndex, 1);
-    NSRange actualRange;
-    FirstRectForCharacterRange(range, &actualRange);
-  }
-
-  return mWritingMode.IsVertical();
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(false);
-}
-
-NSRect
-IMEInputHandler::FirstRectForCharacterRange(NSRange& aRange,
-                                            NSRange* aActualRange)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::FirstRectForCharacterRange, Destroyed()=%s, "
-     "aRange={ location=%llu, length=%llu }, aActualRange=%p }",
-     this, TrueOrFalse(Destroyed()), aRange.location, aRange.length,
-     aActualRange));
-
-  // XXX this returns first character rect or caret rect, it is limitation of
-  // now. We need more work for returns first line rect. But current
-  // implementation is enough for IMEs.
-
-  NSRect rect = NSMakeRect(0.0, 0.0, 0.0, 0.0);
-  NSRange actualRange = NSMakeRange(NSNotFound, 0);
-  if (aActualRange) {
-    *aActualRange = actualRange;
-  }
-  if (Destroyed() || aRange.location == NSNotFound) {
-    return rect;
-  }
-
-  RefPtr<IMEInputHandler> kungFuDeathGrip(this);
-
-  LayoutDeviceIntRect r;
-  bool useCaretRect = (aRange.length == 0);
-  if (!useCaretRect) {
-    WidgetQueryContentEvent charRect(true, eQueryTextRect, mWidget);
-    WidgetQueryContentEvent::Options options;
-    int64_t startOffset = aRange.location;
-    if (IsIMEComposing()) {
-      // The composition may be at different offset from the selection start
-      // offset at dispatching compositionstart because start of composition
-      // is fixed when composition string becomes non-empty in the editor.
-      // Therefore, we need to use query event which is relative to insertion
-      // point.
-      options.mRelativeToInsertionPoint = true;
-      startOffset -= mIMECompositionStart;
-    }
-    charRect.InitForQueryTextRect(startOffset, 1, options);
-    DispatchEvent(charRect);
-    if (charRect.mSucceeded) {
-      r = charRect.mReply.mRect;
-      actualRange.location = charRect.mReply.mOffset;
-      actualRange.length = charRect.mReply.mString.Length();
-      mWritingMode = charRect.GetWritingMode();
-      mRangeForWritingMode = actualRange;
-    } else {
-      useCaretRect = true;
-    }
-  }
-
-  if (useCaretRect) {
-    WidgetQueryContentEvent caretRect(true, eQueryCaretRect, mWidget);
-    WidgetQueryContentEvent::Options options;
-    int64_t startOffset = aRange.location;
-    if (IsIMEComposing()) {
-      // The composition may be at different offset from the selection start
-      // offset at dispatching compositionstart because start of composition
-      // is fixed when composition string becomes non-empty in the editor.
-      // Therefore, we need to use query event which is relative to insertion
-      // point.
-      options.mRelativeToInsertionPoint = true;
-      startOffset -= mIMECompositionStart;
-    }
-    caretRect.InitForQueryCaretRect(startOffset, options);
-    DispatchEvent(caretRect);
-    if (!caretRect.mSucceeded) {
-      return rect;
-    }
-    r = caretRect.mReply.mRect;
-    r.width = 0;
-    actualRange.location = caretRect.mReply.mOffset;
-    actualRange.length = 0;
-  }
-
-  nsIWidget* rootWidget = mWidget->GetTopLevelWidget();
-  NSWindow* rootWindow =
-    static_cast<NSWindow*>(rootWidget->GetNativeData(NS_NATIVE_WINDOW));
-  NSView* rootView =
-    static_cast<NSView*>(rootWidget->GetNativeData(NS_NATIVE_WIDGET));
-  if (!rootWindow || !rootView) {
-    return rect;
-  }
-  rect = nsCocoaUtils::DevPixelsToCocoaPoints(r, mWidget->BackingScaleFactor());
-  rect = [rootView convertRect:rect toView:nil];
-  rect.origin = nsCocoaUtils::ConvertPointToScreen(rootWindow, rect.origin);
-
-  if (aActualRange) {
-    *aActualRange = actualRange;
-  }
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::FirstRectForCharacterRange, "
-     "useCaretRect=%s rect={ x=%f, y=%f, width=%f, height=%f }, "
-     "actualRange={ location=%llu, length=%llu }",
-     this, TrueOrFalse(useCaretRect), rect.origin.x, rect.origin.y,
-     rect.size.width, rect.size.height, actualRange.location,
-     actualRange.length));
-
-  return rect;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NSMakeRect(0.0, 0.0, 0.0, 0.0));
-}
-
-NSUInteger
-IMEInputHandler::CharacterIndexForPoint(NSPoint& aPoint)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::CharacterIndexForPoint, aPoint={ x=%f, y=%f }",
-     this, aPoint.x, aPoint.y));
-
-  NSWindow* mainWindow = [NSApp mainWindow];
-  if (!mWidget || !mainWindow) {
-    return NSNotFound;
-  }
-
-  WidgetQueryContentEvent charAt(true, eQueryCharacterAtPoint, mWidget);
-  NSPoint ptInWindow = nsCocoaUtils::ConvertPointFromScreen(mainWindow, aPoint);
-  NSPoint ptInView = [mView convertPoint:ptInWindow fromView:nil];
-  charAt.mRefPoint.x =
-    static_cast<int32_t>(ptInView.x) * mWidget->BackingScaleFactor();
-  charAt.mRefPoint.y =
-    static_cast<int32_t>(ptInView.y) * mWidget->BackingScaleFactor();
-  mWidget->DispatchWindowEvent(charAt);
-  if (!charAt.mSucceeded ||
-      charAt.mReply.mOffset == WidgetQueryContentEvent::NOT_FOUND ||
-      charAt.mReply.mOffset >= static_cast<uint32_t>(NSNotFound)) {
-    return NSNotFound;
-  }
-
-  return charAt.mReply.mOffset;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NSNotFound);
-}
-
-extern "C" {
-extern NSString *NSTextInputReplacementRangeAttributeName;
-}
-
-NSArray*
-IMEInputHandler::GetValidAttributesForMarkedText()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::GetValidAttributesForMarkedText", this));
-
-  // Return same attributes as Chromium (see render_widget_host_view_mac.mm)
-  // because most IMEs must be tested with Safari (OS default) and Chrome
-  // (having most market share).  Therefore, we need to follow their behavior.
-  // XXX It might be better to reuse an array instance for this result because
-  //     this may be called a lot.  Note that Chromium does so.
-  return [NSArray arrayWithObjects:NSUnderlineStyleAttributeName,
-                                   NSUnderlineColorAttributeName,
-                                   NSMarkedClauseSegmentAttributeName,
-                                   NSTextInputReplacementRangeAttributeName,
-                                   nil];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-
-#pragma mark -
-
-
-/******************************************************************************
- *
- *  IMEInputHandler implementation #2
- *
- ******************************************************************************/
-
-IMEInputHandler::IMEInputHandler(nsChildView* aWidget,
-                                 NSView<mozView> *aNativeView)
-  : TextInputHandlerBase(aWidget, aNativeView)
-  , mPendingMethods(0)
-  , mIMECompositionString(nullptr)
-  , mIMECompositionStart(UINT32_MAX)
-  , mIsIMEComposing(false)
-  , mIsIMEEnabled(true)
-  , mIsASCIICapableOnly(false)
-  , mIgnoreIMECommit(false)
-  , mIsInFocusProcessing(false)
-  , mIMEHasFocus(false)
-{
-  InitStaticMembers();
-
-  mMarkedRange.location = NSNotFound;
-  mMarkedRange.length = 0;
-  mSelectedRange.location = NSNotFound;
-  mSelectedRange.length = 0;
-}
-
-IMEInputHandler::~IMEInputHandler()
-{
-  if (mTimer) {
-    mTimer->Cancel();
-    mTimer = nullptr;
-  }
-  if (sFocusedIMEHandler == this) {
-    sFocusedIMEHandler = nullptr;
-  }
-  if (mIMECompositionString) {
-    [mIMECompositionString release];
-    mIMECompositionString = nullptr;
-  }
-}
-
-void
-IMEInputHandler::OnFocusChangeInGecko(bool aFocus)
-{
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::OnFocusChangeInGecko, aFocus=%s, Destroyed()=%s, "
-     "sFocusedIMEHandler=%p",
-     this, TrueOrFalse(aFocus), TrueOrFalse(Destroyed()), sFocusedIMEHandler));
-
-  mSelectedRange.location = NSNotFound; // Marking dirty
-  mIMEHasFocus = aFocus;
-
-  // This is called when the native focus is changed and when the native focus
-  // isn't changed but the focus is changed in Gecko.
-  if (!aFocus) {
-    if (sFocusedIMEHandler == this)
-      sFocusedIMEHandler = nullptr;
-    return;
-  }
-
-  sFocusedIMEHandler = this;
-  mIsInFocusProcessing = true;
-
-  // We need to notify IME of focus change in Gecko as native focus change
-  // because the window level of the focused element in Gecko may be changed.
-  mPendingMethods |= kNotifyIMEOfFocusChangeInGecko;
-  ResetTimer();
-}
-
-bool
-IMEInputHandler::OnDestroyWidget(nsChildView* aDestroyingWidget)
-{
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::OnDestroyWidget, aDestroyingWidget=%p, "
-     "sFocusedIMEHandler=%p, IsIMEComposing()=%s",
-     this, aDestroyingWidget, sFocusedIMEHandler,
-     TrueOrFalse(IsIMEComposing())));
-
-  // If we're not focused, the focused IMEInputHandler may have been
-  // created by another widget/nsChildView.
-  if (sFocusedIMEHandler && sFocusedIMEHandler != this) {
-    sFocusedIMEHandler->OnDestroyWidget(aDestroyingWidget);
-  }
-
-  if (!TextInputHandlerBase::OnDestroyWidget(aDestroyingWidget)) {
-    return false;
-  }
-
-  if (IsIMEComposing()) {
-    // If our view is in the composition, we should clean up it.
-    CancelIMEComposition();
-  }
-
-  mSelectedRange.location = NSNotFound; // Marking dirty
-  mIMEHasFocus = false;
-
-  return true;
-}
-
-void
-IMEInputHandler::SendCommittedText(NSString *aString)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::SendCommittedText, mView=%p, mWidget=%p, "
-     "inputContext=%p, mIsIMEComposing=%s",
-     this, mView, mWidget, mView ? [mView inputContext] : nullptr,
-     TrueOrFalse(mIsIMEComposing), mWidget));
-
-  NS_ENSURE_TRUE(mWidget, );
-  // XXX We should send the string without mView.
-  if (!mView) {
-    return;
-  }
-
-  NSAttributedString* attrStr =
-    [[NSAttributedString alloc] initWithString:aString];
-  if ([mView conformsToProtocol:@protocol(NSTextInputClient)]) {
-    NSObject<NSTextInputClient>* textInputClient =
-      static_cast<NSObject<NSTextInputClient>*>(mView);
-    [textInputClient insertText:attrStr
-               replacementRange:NSMakeRange(NSNotFound, 0)];
-  }
-
-  // Last resort.  If we cannot retrieve NSTextInputProtocol from mView
-  // or blocking to call our InsertText(), we should call InsertText()
-  // directly to commit composition forcibly.
-  if (mIsIMEComposing) {
-    MOZ_LOG(gLog, LogLevel::Info,
-      ("%p IMEInputHandler::SendCommittedText, trying to insert text directly "
-       "due to IME not calling our InsertText()", this));
-    static_cast<TextInputHandler*>(this)->InsertText(attrStr);
-    MOZ_ASSERT(!mIsIMEComposing);
-  }
-
-  [attrStr release];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void
-IMEInputHandler::KillIMEComposition()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::KillIMEComposition, mView=%p, mWidget=%p, "
-     "inputContext=%p, mIsIMEComposing=%s, "
-     "Destroyed()=%s, IsFocused()=%s",
-     this, mView, mWidget, mView ? [mView inputContext] : nullptr,
-     TrueOrFalse(mIsIMEComposing), TrueOrFalse(Destroyed()),
-     TrueOrFalse(IsFocused())));
-
-  if (Destroyed()) {
-    return;
-  }
-
-  if (IsFocused()) {
-    NS_ENSURE_TRUE_VOID(mView);
-    NSTextInputContext* inputContext = [mView inputContext];
-    NS_ENSURE_TRUE_VOID(inputContext);
-    [inputContext discardMarkedText];
-    return;
-  }
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::KillIMEComposition, Pending...", this));
-
-  // Commit the composition internally.
-  SendCommittedText(mIMECompositionString);
-  NS_ASSERTION(!mIsIMEComposing, "We're still in a composition");
-  // The pending method will be fired by the next focus event.
-  mPendingMethods |= kDiscardIMEComposition;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void
-IMEInputHandler::CommitIMEComposition()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!IsIMEComposing())
-    return;
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::CommitIMEComposition, mIMECompositionString=%s",
-     this, GetCharacters(mIMECompositionString)));
-
-  KillIMEComposition();
-
-  if (!IsIMEComposing())
-    return;
-
-  // If the composition is still there, KillIMEComposition only kills the
-  // composition in TSM.  We also need to finish the our composition too.
-  SendCommittedText(mIMECompositionString);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void
-IMEInputHandler::CancelIMEComposition()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!IsIMEComposing())
-    return;
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::CancelIMEComposition, mIMECompositionString=%s",
-     this, GetCharacters(mIMECompositionString)));
-
-  // For canceling the current composing, we need to ignore the param of
-  // insertText.  But this code is ugly...
-  mIgnoreIMECommit = true;
-  KillIMEComposition();
-  mIgnoreIMECommit = false;
-
-  if (!IsIMEComposing())
-    return;
-
-  // If the composition is still there, KillIMEComposition only kills the
-  // composition in TSM.  We also need to kill the our composition too.
-  SendCommittedText(@"");
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-bool
-IMEInputHandler::IsFocused()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  NS_ENSURE_TRUE(!Destroyed(), false);
-  NSWindow* window = [mView window];
-  NS_ENSURE_TRUE(window, false);
-  return [window firstResponder] == mView &&
-         [window isKeyWindow] &&
-         [[NSApplication sharedApplication] isActive];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(false);
-}
-
-bool
-IMEInputHandler::IsIMEOpened()
-{
-  TISInputSourceWrapper tis;
-  tis.InitByCurrentInputSource();
-  return tis.IsOpenedIMEMode();
-}
-
-void
-IMEInputHandler::SetASCIICapableOnly(bool aASCIICapableOnly)
-{
-  if (aASCIICapableOnly == mIsASCIICapableOnly)
-    return;
-
-  CommitIMEComposition();
-  mIsASCIICapableOnly = aASCIICapableOnly;
-  SyncASCIICapableOnly();
-}
-
-void
-IMEInputHandler::EnableIME(bool aEnableIME)
-{
-  if (aEnableIME == mIsIMEEnabled)
-    return;
-
-  CommitIMEComposition();
-  mIsIMEEnabled = aEnableIME;
-}
-
-void
-IMEInputHandler::SetIMEOpenState(bool aOpenIME)
-{
-  if (!IsFocused() || IsIMEOpened() == aOpenIME)
-    return;
-
-  if (!aOpenIME) {
-    TISInputSourceWrapper tis;
-    tis.InitByCurrentASCIICapableInputSource();
-    tis.Select();
-    return;
-  }
-
-  // If we know the latest IME opened mode, we should select it.
-  if (sLatestIMEOpenedModeInputSourceID) {
-    TISInputSourceWrapper tis;
-    tis.InitByInputSourceID(sLatestIMEOpenedModeInputSourceID);
-    tis.Select();
-    return;
-  }
-
-  // XXX If the current input source is a mode of IME, we should turn on it,
-  // but we haven't found such way...
-
-  // Finally, we should refer the system locale but this is a little expensive,
-  // we shouldn't retry this (if it was succeeded, we already set
-  // sLatestIMEOpenedModeInputSourceID at that time).
-  static bool sIsPrefferredIMESearched = false;
-  if (sIsPrefferredIMESearched)
-    return;
-  sIsPrefferredIMESearched = true;
-  OpenSystemPreferredLanguageIME();
-}
-
-void
-IMEInputHandler::OpenSystemPreferredLanguageIME()
-{
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::OpenSystemPreferredLanguageIME", this));
-
-  CFArrayRef langList = ::CFLocaleCopyPreferredLanguages();
-  if (!langList) {
-    MOZ_LOG(gLog, LogLevel::Info,
-      ("%p IMEInputHandler::OpenSystemPreferredLanguageIME, langList is NULL",
-       this));
-    return;
-  }
-  CFIndex count = ::CFArrayGetCount(langList);
-  for (CFIndex i = 0; i < count; i++) {
-    CFLocaleRef locale =
-      ::CFLocaleCreate(kCFAllocatorDefault,
-          static_cast<CFStringRef>(::CFArrayGetValueAtIndex(langList, i)));
-    if (!locale) {
-      continue;
-    }
-
-    bool changed = false;
-    CFStringRef lang = static_cast<CFStringRef>(
-      ::CFLocaleGetValue(locale, kCFLocaleLanguageCode));
-    NS_ASSERTION(lang, "lang is null");
-    if (lang) {
-      TISInputSourceWrapper tis;
-      tis.InitByLanguage(lang);
-      if (tis.IsOpenedIMEMode()) {
-        if (MOZ_LOG_TEST(gLog, LogLevel::Info)) {
-          CFStringRef foundTIS;
-          tis.GetInputSourceID(foundTIS);
-          MOZ_LOG(gLog, LogLevel::Info,
-            ("%p IMEInputHandler::OpenSystemPreferredLanguageIME, "
-             "foundTIS=%s, lang=%s",
-             this, GetCharacters(foundTIS), GetCharacters(lang)));
-        }
-        tis.Select();
-        changed = true;
-      }
-    }
-    ::CFRelease(locale);
-    if (changed) {
-      break;
-    }
-  }
-  ::CFRelease(langList);
-}
-
-void
-IMEInputHandler::OnSelectionChange(const IMENotification& aIMENotification)
-{
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p IMEInputHandler::OnSelectionChange", this));
-
-  if (aIMENotification.mSelectionChangeData.mOffset == UINT32_MAX) {
-    mSelectedRange.location = NSNotFound;
-    mSelectedRange.length = 0;
-    mRangeForWritingMode.location = NSNotFound;
-    mRangeForWritingMode.length = 0;
-    return;
-  }
-
-  mWritingMode = aIMENotification.mSelectionChangeData.GetWritingMode();
-  mRangeForWritingMode =
-    NSMakeRange(aIMENotification.mSelectionChangeData.mOffset,
-                aIMENotification.mSelectionChangeData.Length());
-  if (mIMEHasFocus) {
-    mSelectedRange = mRangeForWritingMode;
-  }
-}
-
-bool
-IMEInputHandler::OnHandleEvent(NSEvent* aEvent)
-{
-  if (!IsFocused()) {
-    return false;
-  }
-  NSTextInputContext* inputContext = [mView inputContext];
-  return [inputContext handleEvent:aEvent];
-}
-
-#pragma mark -
-
-
-/******************************************************************************
- *
- *  TextInputHandlerBase implementation
- *
- ******************************************************************************/
-
-int32_t TextInputHandlerBase::sSecureEventInputCount = 0;
-
-NS_IMPL_ISUPPORTS(TextInputHandlerBase,
-                  TextEventDispatcherListener,
-                  nsISupportsWeakReference)
-
-TextInputHandlerBase::TextInputHandlerBase(nsChildView* aWidget,
-                                           NSView<mozView> *aNativeView)
-  : mWidget(aWidget)
-  , mDispatcher(aWidget->GetTextEventDispatcher())
-{
-  gHandlerInstanceCount++;
-  mView = [aNativeView retain];
-}
-
-TextInputHandlerBase::~TextInputHandlerBase()
-{
-  [mView release];
-  if (--gHandlerInstanceCount == 0) {
-    TISInputSourceWrapper::Shutdown();
-  }
-}
-
-bool
-TextInputHandlerBase::OnDestroyWidget(nsChildView* aDestroyingWidget)
-{
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p TextInputHandlerBase::OnDestroyWidget, "
-     "aDestroyingWidget=%p, mWidget=%p",
-     this, aDestroyingWidget, mWidget));
-
-  if (aDestroyingWidget != mWidget) {
-    return false;
-  }
-
-  mWidget = nullptr;
-  mDispatcher = nullptr;
-  return true;
-}
-
-bool
-TextInputHandlerBase::DispatchEvent(WidgetGUIEvent& aEvent)
-{
-  return mWidget->DispatchWindowEvent(aEvent);
-}
-
-void
-TextInputHandlerBase::InitKeyEvent(NSEvent *aNativeKeyEvent,
-                                   WidgetKeyboardEvent& aKeyEvent,
-                                   const nsAString* aInsertString)
-{
-  NS_ASSERTION(aNativeKeyEvent, "aNativeKeyEvent must not be NULL");
-
-  if (mKeyboardOverride.mOverrideEnabled) {
-    TISInputSourceWrapper tis;
-    tis.InitByLayoutID(mKeyboardOverride.mKeyboardLayout, true);
-    tis.InitKeyEvent(aNativeKeyEvent, aKeyEvent, aInsertString);
-    return;
-  }
-  TISInputSourceWrapper::CurrentInputSource().
-    InitKeyEvent(aNativeKeyEvent, aKeyEvent, aInsertString);
-}
-
-nsresult
-TextInputHandlerBase::SynthesizeNativeKeyEvent(
-                        int32_t aNativeKeyboardLayout,
-                        int32_t aNativeKeyCode,
-                        uint32_t aModifierFlags,
-                        const nsAString& aCharacters,
-                        const nsAString& aUnmodifiedCharacters)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  static const uint32_t sModifierFlagMap[][2] = {
-    { nsIWidget::CAPS_LOCK,       NSAlphaShiftKeyMask },
-    { nsIWidget::SHIFT_L,         NSShiftKeyMask      | 0x0002 },
-    { nsIWidget::SHIFT_R,         NSShiftKeyMask      | 0x0004 },
-    { nsIWidget::CTRL_L,          NSControlKeyMask    | 0x0001 },
-    { nsIWidget::CTRL_R,          NSControlKeyMask    | 0x2000 },
-    { nsIWidget::ALT_L,           NSAlternateKeyMask  | 0x0020 },
-    { nsIWidget::ALT_R,           NSAlternateKeyMask  | 0x0040 },
-    { nsIWidget::COMMAND_L,       NSCommandKeyMask    | 0x0008 },
-    { nsIWidget::COMMAND_R,       NSCommandKeyMask    | 0x0010 },
-    { nsIWidget::NUMERIC_KEY_PAD, NSNumericPadKeyMask },
-    { nsIWidget::HELP,            NSHelpKeyMask },
-    { nsIWidget::FUNCTION,        NSFunctionKeyMask }
-  };
-
-  uint32_t modifierFlags = 0;
-  for (uint32_t i = 0; i < ArrayLength(sModifierFlagMap); ++i) {
-    if (aModifierFlags & sModifierFlagMap[i][0]) {
-      modifierFlags |= sModifierFlagMap[i][1];
-    }
-  }
-
-  NSInteger windowNumber = [[mView window] windowNumber];
-  bool sendFlagsChangedEvent = IsModifierKey(aNativeKeyCode);
-  NSEventType eventType = sendFlagsChangedEvent ? NSFlagsChanged : NSKeyDown;
-  NSEvent* downEvent =
-    [NSEvent     keyEventWithType:eventType
-                         location:NSMakePoint(0,0)
-                    modifierFlags:modifierFlags
-                        timestamp:0
-                     windowNumber:windowNumber
-                          context:[NSGraphicsContext currentContext]
-                       characters:nsCocoaUtils::ToNSString(aCharacters)
-      charactersIgnoringModifiers:nsCocoaUtils::ToNSString(aUnmodifiedCharacters)
-                        isARepeat:NO
-                          keyCode:aNativeKeyCode];
-
-  NSEvent* upEvent = sendFlagsChangedEvent ?
-    nil : nsCocoaUtils::MakeNewCocoaEventWithType(NSKeyUp, downEvent);
-
-  if (downEvent && (sendFlagsChangedEvent || upEvent)) {
-    KeyboardLayoutOverride currentLayout = mKeyboardOverride;
-    mKeyboardOverride.mKeyboardLayout = aNativeKeyboardLayout;
-    mKeyboardOverride.mOverrideEnabled = true;
-    [NSApp sendEvent:downEvent];
-    if (upEvent) {
-      [NSApp sendEvent:upEvent];
-    }
-    // processKeyDownEvent and keyUp block exceptions so we're sure to
-    // reach here to restore mKeyboardOverride
-    mKeyboardOverride = currentLayout;
-  }
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NSInteger
-TextInputHandlerBase::GetWindowLevel()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p TextInputHandlerBase::GetWindowLevel, Destryoed()=%s",
-     this, TrueOrFalse(Destroyed())));
-
-  if (Destroyed()) {
-    return NSNormalWindowLevel;
-  }
-
-  // When an <input> element on a XUL <panel> is focused, the actual focused view
-  // is the panel's parent view (mView). But the editor is displayed on the
-  // popped-up widget's view (editorView).  We want the latter's window level.
-  NSView<mozView>* editorView = mWidget->GetEditorView();
-  NS_ENSURE_TRUE(editorView, NSNormalWindowLevel);
-  NSInteger windowLevel = [[editorView window] level];
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p TextInputHandlerBase::GetWindowLevel, windowLevel=%s (%X)",
-     this, GetWindowLevelName(windowLevel), windowLevel));
-
-  return windowLevel;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NSNormalWindowLevel);
-}
-
-NS_IMETHODIMP
-TextInputHandlerBase::AttachNativeKeyEvent(WidgetKeyboardEvent& aKeyEvent)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  // Don't try to replace a native event if one already exists.
-  // OS X doesn't have an OS modifier, can't make a native event.
-  if (aKeyEvent.mNativeKeyEvent || aKeyEvent.mModifiers & MODIFIER_OS) {
-    return NS_OK;
-  }
-
-  MOZ_LOG(gLog, LogLevel::Info,
-    ("%p TextInputHandlerBase::AttachNativeKeyEvent, key=0x%X, char=0x%X, "
-     "mod=0x%X", this, aKeyEvent.mKeyCode, aKeyEvent.mCharCode,
-     aKeyEvent.mModifiers));
-
-  NSEventType eventType;
-  if (aKeyEvent.mMessage == eKeyUp) {
-    eventType = NSKeyUp;
-  } else {
-    eventType = NSKeyDown;
-  }
-
-  static const uint32_t sModifierFlagMap[][2] = {
-    { MODIFIER_SHIFT,    NSShiftKeyMask },
-    { MODIFIER_CONTROL,  NSControlKeyMask },
-    { MODIFIER_ALT,      NSAlternateKeyMask },
-    { MODIFIER_ALTGRAPH, NSAlternateKeyMask },
-    { MODIFIER_META,     NSCommandKeyMask },
-    { MODIFIER_CAPSLOCK, NSAlphaShiftKeyMask },
-    { MODIFIER_NUMLOCK,  NSNumericPadKeyMask }
-  };
-
-  NSUInteger modifierFlags = 0;
-  for (uint32_t i = 0; i < ArrayLength(sModifierFlagMap); ++i) {
-    if (aKeyEvent.mModifiers & sModifierFlagMap[i][0]) {
-      modifierFlags |= sModifierFlagMap[i][1];
-    }
-  }
-
-  NSInteger windowNumber = [[mView window] windowNumber];
-
-  NSString* characters;
-  if (aKeyEvent.mCharCode) {
-    characters = [NSString stringWithCharacters:
-      reinterpret_cast<const unichar*>(&(aKeyEvent.mCharCode)) length:1];
-  } else {
-    uint32_t cocoaCharCode =
-      nsCocoaUtils::ConvertGeckoKeyCodeToMacCharCode(aKeyEvent.mKeyCode);
-    characters = [NSString stringWithCharacters:
-      reinterpret_cast<const unichar*>(&cocoaCharCode) length:1];
-  }
-
-  aKeyEvent.mNativeKeyEvent =
-    [NSEvent     keyEventWithType:eventType
-                         location:NSMakePoint(0,0)
-                    modifierFlags:modifierFlags
-                        timestamp:0
-                     windowNumber:windowNumber
-                          context:[NSGraphicsContext currentContext]
-                       characters:characters
-      charactersIgnoringModifiers:characters
-                        isARepeat:NO
-                          keyCode:0]; // Native key code not currently needed
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-bool
-TextInputHandlerBase::SetSelection(NSRange& aRange)
-{
-  MOZ_ASSERT(!Destroyed());
-
-  RefPtr<TextInputHandlerBase> kungFuDeathGrip(this);
-  WidgetSelectionEvent selectionEvent(true, eSetSelection, mWidget);
-  selectionEvent.mOffset = aRange.location;
-  selectionEvent.mLength = aRange.length;
-  selectionEvent.mReversed = false;
-  selectionEvent.mExpandToClusterBoundary = false;
-  DispatchEvent(selectionEvent);
-  NS_ENSURE_TRUE(selectionEvent.mSucceeded, false);
-  return !Destroyed();
-}
-
-/* static */ bool
-TextInputHandlerBase::IsPrintableChar(char16_t aChar)
-{
-  return (aChar >= 0x20 && aChar <= 0x7E) || aChar >= 0xA0;
-}
-
-
-/* static */ bool
-TextInputHandlerBase::IsSpecialGeckoKey(UInt32 aNativeKeyCode)
-{
-  // this table is used to determine which keys are special and should not
-  // generate a charCode
-  switch (aNativeKeyCode) {
-    // modifiers - we don't get separate events for these yet
-    case kVK_Escape:
-    case kVK_Shift:
-    case kVK_RightShift:
-    case kVK_Command:
-    case kVK_RightCommand:
-    case kVK_CapsLock:
-    case kVK_Control:
-    case kVK_RightControl:
-    case kVK_Option:
-    case kVK_RightOption:
-    case kVK_ANSI_KeypadClear:
-    case kVK_Function:
-
-    // function keys
-    case kVK_F1:
-    case kVK_F2:
-    case kVK_F3:
-    case kVK_F4:
-    case kVK_F5:
-    case kVK_F6:
-    case kVK_F7:
-    case kVK_F8:
-    case kVK_F9:
-    case kVK_F10:
-    case kVK_F11:
-    case kVK_F12:
-    case kVK_PC_Pause:
-    case kVK_PC_ScrollLock:
-    case kVK_PC_PrintScreen:
-    case kVK_F16:
-    case kVK_F17:
-    case kVK_F18:
-    case kVK_F19:
-
-    case kVK_PC_Insert:
-    case kVK_PC_Delete:
-    case kVK_Tab:
-    case kVK_PC_Backspace:
-    case kVK_PC_ContextMenu:
-
-    case kVK_JIS_Eisu:
-    case kVK_JIS_Kana:
-
-    case kVK_Home:
-    case kVK_End:
-    case kVK_PageUp:
-    case kVK_PageDown:
-    case kVK_LeftArrow:
-    case kVK_RightArrow:
-    case kVK_UpArrow:
-    case kVK_DownArrow:
-    case kVK_Return:
-    case kVK_ANSI_KeypadEnter:
-    case kVK_Powerbook_KeypadEnter:
-      return true;
-  }
-  return false;
-}
-
-/* static */ bool
-TextInputHandlerBase::IsNormalCharInputtingEvent(
-                        const WidgetKeyboardEvent& aKeyEvent)
-{
-  // this is not character inputting event, simply.
-  if (aKeyEvent.mNativeCharacters.IsEmpty() ||
-      aKeyEvent.IsMeta()) {
-    return false;
-  }
-  return !IsControlChar(aKeyEvent.mNativeCharacters[0]);
-}
-
-/* static */ bool
-TextInputHandlerBase::IsModifierKey(UInt32 aNativeKeyCode)
-{
-  switch (aNativeKeyCode) {
-    case kVK_CapsLock:
-    case kVK_RightCommand:
-    case kVK_Command:
-    case kVK_Shift:
-    case kVK_Option:
-    case kVK_Control:
-    case kVK_RightShift:
-    case kVK_RightOption:
-    case kVK_RightControl:
-    case kVK_Function:
-      return true;
-  }
-  return false;
-}
-
-/* static */ void
-TextInputHandlerBase::EnableSecureEventInput()
-{
-  sSecureEventInputCount++;
-  ::EnableSecureEventInput();
-}
-
-/* static */ void
-TextInputHandlerBase::DisableSecureEventInput()
-{
-  if (!sSecureEventInputCount) {
-    return;
-  }
-  sSecureEventInputCount--;
-  ::DisableSecureEventInput();
-}
-
-/* static */ bool
-TextInputHandlerBase::IsSecureEventInputEnabled()
-{
-  NS_ASSERTION(!!sSecureEventInputCount == !!::IsSecureEventInputEnabled(),
-               "Some other process has enabled secure event input");
-  return !!sSecureEventInputCount;
-}
-
-/* static */ void
-TextInputHandlerBase::EnsureSecureEventInputDisabled()
-{
-  while (sSecureEventInputCount) {
-    TextInputHandlerBase::DisableSecureEventInput();
-  }
-}
-
-#pragma mark -
-
-
-/******************************************************************************
- *
- *  TextInputHandlerBase::KeyEventState implementation
- *
- ******************************************************************************/
-
-void
-TextInputHandlerBase::KeyEventState::InitKeyEvent(
-                                       TextInputHandlerBase* aHandler,
-                                       WidgetKeyboardEvent& aKeyEvent)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  MOZ_ASSERT(aHandler);
-  MOZ_RELEASE_ASSERT(mKeyEvent);
-
-  NSEvent* nativeEvent = mKeyEvent;
-  if (!mInsertedString.IsEmpty()) {
-    nsAutoString unhandledString;
-    GetUnhandledString(unhandledString);
-    NSString* unhandledNSString =
-      nsCocoaUtils::ToNSString(unhandledString);
-    // If the key event's some characters were already handled by
-    // InsertString() calls, we need to create a dummy event which doesn't
-    // include the handled characters.
-    nativeEvent =
-      [NSEvent keyEventWithType:[mKeyEvent type]
-                       location:[mKeyEvent locationInWindow]
-                  modifierFlags:[mKeyEvent modifierFlags]
-                      timestamp:[mKeyEvent timestamp]
-                   windowNumber:[mKeyEvent windowNumber]
-                        context:[mKeyEvent context]
-                     characters:unhandledNSString
-    charactersIgnoringModifiers:[mKeyEvent charactersIgnoringModifiers]
-                      isARepeat:[mKeyEvent isARepeat]
-                        keyCode:[mKeyEvent keyCode]];
-  }
-
-  aHandler->InitKeyEvent(nativeEvent, aKeyEvent, mInsertString);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void
-TextInputHandlerBase::KeyEventState::GetUnhandledString(
-                                       nsAString& aUnhandledString) const
-{
-  aUnhandledString.Truncate();
-  if (NS_WARN_IF(!mKeyEvent)) {
-    return;
-  }
-  nsAutoString characters;
-  nsCocoaUtils::GetStringForNSString([mKeyEvent characters],
-                                     characters);
-  if (characters.IsEmpty()) {
-    return;
-  }
-  if (mInsertedString.IsEmpty()) {
-    aUnhandledString = characters;
-    return;
-  }
-
-  // The insertes string must match with the start of characters.
-  MOZ_ASSERT(StringBeginsWith(characters, mInsertedString));
-
-  aUnhandledString = nsDependentSubstring(characters, mInsertedString.Length());
-}
-
-#pragma mark -
-
-
-/******************************************************************************
- *
- *  TextInputHandlerBase::AutoInsertStringClearer implementation
- *
- ******************************************************************************/
-
-TextInputHandlerBase::AutoInsertStringClearer::~AutoInsertStringClearer()
-{
-  if (mState && mState->mInsertString) {
-    // If inserting string is a part of characters of the event,
-    // we should record it as inserted string.
-    nsAutoString characters;
-    nsCocoaUtils::GetStringForNSString([mState->mKeyEvent characters],
-                                       characters);
-    nsAutoString insertedString(mState->mInsertedString);
-    insertedString += *mState->mInsertString;
-    if (StringBeginsWith(characters, insertedString)) {
-      mState->mInsertedString = insertedString;
-    }
-  }
-  if (mState) {
-    mState->mInsertString = nullptr;
-  }
-}
diff --git a/widget/cocoa/VibrancyManager.h b/widget/cocoa/VibrancyManager.h
deleted file mode 100644
index 04b1ad1cda..0000000000
--- a/widget/cocoa/VibrancyManager.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef VibrancyManager_h
-#define VibrancyManager_h
-
-#include "mozilla/Assertions.h"
-#include "nsClassHashtable.h"
-#include "nsRegion.h"
-#include "nsTArray.h"
-#include "ViewRegion.h"
-
-#import <Foundation/NSGeometry.h>
-
-@class NSColor;
-@class NSView;
-class nsChildView;
-
-namespace mozilla {
-
-enum class VibrancyType {
-  LIGHT,
-  DARK,
-  TOOLTIP,
-  MENU,
-  HIGHLIGHTED_MENUITEM,
-  SHEET,
-  SOURCE_LIST,
-  SOURCE_LIST_SELECTION,
-  ACTIVE_SOURCE_LIST_SELECTION
-};
-
-/**
- * VibrancyManager takes care of updating the vibrant regions of a window.
- * Vibrancy is a visual look that was introduced on OS X starting with 10.10.
- * An app declares vibrant window regions to the window server, and the window
- * server will display a blurred rendering of the screen contents from behind
- * the window in these areas, behind the actual window contents. Consequently,
- * the effect is only visible in areas where the window contents are not
- * completely opaque. Usually this is achieved by clearing the background of
- * the window prior to drawing in the vibrant areas. This is possible even if
- * the window is declared as opaque.
- */
-class VibrancyManager {
-public:
-  /**
-   * Create a new VibrancyManager instance and provide it with an NSView
-   * to attach NSVisualEffectViews to.
-   *
-   * @param aCoordinateConverter  The nsChildView to use for converting
-   *   nsIntRect device pixel coordinates into Cocoa NSRect coordinates. Must
-   *   outlive this VibrancyManager instance.
-   * @param aContainerView  The view that's going to be the superview of the
-   *   NSVisualEffectViews which will be created for vibrant regions.
-   */
-  VibrancyManager(const nsChildView& aCoordinateConverter,
-                  NSView* aContainerView)
-    : mCoordinateConverter(aCoordinateConverter)
-    , mContainerView(aContainerView)
-  {
-    MOZ_ASSERT(SystemSupportsVibrancy(),
-               "Don't instantiate this if !SystemSupportsVibrancy()");
-  }
-
-  /**
-   * Update the placement of the NSVisualEffectViews inside the container
-   * NSView so that they cover aRegion, and create new NSVisualEffectViews
-   * or remove existing ones as needed.
-   * @param aType   The vibrancy type to use in the region.
-   * @param aRegion The vibrant area, in device pixels.
-   */
-  void UpdateVibrantRegion(VibrancyType aType,
-                           const LayoutDeviceIntRegion& aRegion);
-
-  bool HasVibrantRegions() { return !mVibrantRegions.IsEmpty(); }
-
-  /**
-   * Return the fill color that should be drawn on top of the cleared window
-   * parts. Usually this would be drawn by -[NSVisualEffectView drawRect:].
-   * The returned color is opaque if the system-wide "Reduce transparency"
-   * preference is set.
-   */
-  NSColor* VibrancyFillColorForType(VibrancyType aType);
-
-  /**
-   * Return the font smoothing background color that should be used for text
-   * drawn on top of the vibrant window parts.
-   */
-  NSColor* VibrancyFontSmoothingBackgroundColorForType(VibrancyType aType);
-
-  /**
-   * Check whether the operating system supports vibrancy at all.
-   * You may only create a VibrancyManager instance if this returns true.
-   * @return Whether VibrancyManager can be used on this OS.
-   */
-  static bool SystemSupportsVibrancy();
-
-  /**
-   * Create an NSVisualEffectView for the specified vibrancy type. The return
-   * value is not autoreleased. We return an object of type NSView* because we
-   * compile with an SDK that does not contain a definition for
-   * NSVisualEffectView.
-   * @param aIsContainer Whether this NSView will have child views. This value
-   *                     affects hit testing: Container views will pass through
-   *                     hit testing requests to their children, and leaf views
-   *                     will be transparent to hit testing.
-   */
-  static NSView* CreateEffectView(VibrancyType aType, BOOL aIsContainer = NO);
-
-protected:
-  const nsChildView& mCoordinateConverter;
-  NSView* mContainerView;
-  nsClassHashtable<nsUint32HashKey, ViewRegion> mVibrantRegions;
-};
-
-} // namespace mozilla
-
-#endif // VibrancyManager_h
diff --git a/widget/cocoa/VibrancyManager.mm b/widget/cocoa/VibrancyManager.mm
deleted file mode 100644
index d02338eb6b..0000000000
--- a/widget/cocoa/VibrancyManager.mm
+++ /dev/null
@@ -1,244 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "VibrancyManager.h"
-#include "nsChildView.h"
-#import <objc/message.h>
-
-using namespace mozilla;
-
-void
-VibrancyManager::UpdateVibrantRegion(VibrancyType aType,
-                                     const LayoutDeviceIntRegion& aRegion)
-{
-  if (aRegion.IsEmpty()) {
-    mVibrantRegions.Remove(uint32_t(aType));
-    return;
-  }
-  auto& vr = *mVibrantRegions.LookupOrAdd(uint32_t(aType));
-  vr.UpdateRegion(aRegion, mCoordinateConverter, mContainerView, ^() {
-    return this->CreateEffectView(aType);
-  });
-}
-
-@interface NSView(CurrentFillColor)
-- (NSColor*)_currentFillColor;
-@end
-
-static NSColor*
-AdjustedColor(NSColor* aFillColor, VibrancyType aType)
-{
-  if (aType == VibrancyType::MENU && [aFillColor alphaComponent] == 1.0) {
-    // The opaque fill color that's used for the menu background when "Reduce
-    // vibrancy" is checked in the system accessibility prefs is too dark.
-    // This is probably because we're not using the right material for menus,
-    // see VibrancyManager::CreateEffectView.
-    return [NSColor colorWithDeviceWhite:0.96 alpha:1.0];
-  }
-  return aFillColor;
-}
-
-NSColor*
-VibrancyManager::VibrancyFillColorForType(VibrancyType aType)
-{
-  NSView* view = mVibrantRegions.LookupOrAdd(uint32_t(aType))->GetAnyView();
-
-  if (view && [view respondsToSelector:@selector(_currentFillColor)]) {
-    // -[NSVisualEffectView _currentFillColor] is the color that the view
-    // draws in its drawRect implementation.
-    return AdjustedColor([view _currentFillColor], aType);
-  }
-  return [NSColor whiteColor];
-}
-
-@interface NSView(FontSmoothingBackgroundColor)
-- (NSColor*)fontSmoothingBackgroundColor;
-@end
-
-NSColor*
-VibrancyManager::VibrancyFontSmoothingBackgroundColorForType(VibrancyType aType)
-{
-  NSView* view = mVibrantRegions.LookupOrAdd(uint32_t(aType))->GetAnyView();
-
-  if (view && [view respondsToSelector:@selector(fontSmoothingBackgroundColor)]) {
-    return [view fontSmoothingBackgroundColor];
-  }
-  return [NSColor clearColor];
-}
-
-static NSView*
-HitTestNil(id self, SEL _cmd, NSPoint aPoint)
-{
-  // This view must be transparent to mouse events.
-  return nil;
-}
-
-static BOOL
-AllowsVibrancyYes(id self, SEL _cmd)
-{
-  // Means that the foreground is blended using a vibrant blend mode.
-  return YES;
-}
-
-static Class
-CreateEffectViewClass(BOOL aForegroundVibrancy, BOOL aIsContainer)
-{
-  // Create a class that inherits from NSVisualEffectView and overrides the
-  // methods -[NSView hitTest:] and  -[NSVisualEffectView allowsVibrancy].
-  Class NSVisualEffectViewClass = NSClassFromString(@"NSVisualEffectView");
-  const char* className = aForegroundVibrancy
-    ? "EffectViewWithForegroundVibrancy" : "EffectViewWithoutForegroundVibrancy";
-  Class EffectViewClass = objc_allocateClassPair(NSVisualEffectViewClass, className, 0);
-  if (!aIsContainer) {
-    class_addMethod(EffectViewClass, @selector(hitTest:), (IMP)HitTestNil,
-                    "@@:{CGPoint=dd}");
-  }
-  if (aForegroundVibrancy) {
-    // Override the -[NSView allowsVibrancy] method to return YES.
-    class_addMethod(EffectViewClass, @selector(allowsVibrancy), (IMP)AllowsVibrancyYes, "I@:");
-  }
-  return EffectViewClass;
-}
-
-static id
-AppearanceForVibrancyType(VibrancyType aType)
-{
-  Class NSAppearanceClass = NSClassFromString(@"NSAppearance");
-  switch (aType) {
-    case VibrancyType::LIGHT:
-    case VibrancyType::TOOLTIP:
-    case VibrancyType::MENU:
-    case VibrancyType::HIGHLIGHTED_MENUITEM:
-    case VibrancyType::SHEET:
-    case VibrancyType::SOURCE_LIST:
-    case VibrancyType::SOURCE_LIST_SELECTION:
-    case VibrancyType::ACTIVE_SOURCE_LIST_SELECTION:
-      return [NSAppearanceClass performSelector:@selector(appearanceNamed:)
-                                     withObject:@"NSAppearanceNameVibrantLight"];
-    case VibrancyType::DARK:
-      return [NSAppearanceClass performSelector:@selector(appearanceNamed:)
-                                     withObject:@"NSAppearanceNameVibrantDark"];
-  }
-}
-
-#if !defined(MAC_OS_X_VERSION_10_10) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_10
-enum {
-  NSVisualEffectStateFollowsWindowActiveState,
-  NSVisualEffectStateActive,
-  NSVisualEffectStateInactive
-};
-
-enum {
-  NSVisualEffectMaterialTitlebar = 3
-};
-#endif
-
-#if !defined(MAC_OS_X_VERSION_10_11) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_11
-enum {
-  NSVisualEffectMaterialMenu = 5,
-  NSVisualEffectMaterialSidebar = 7
-};
-#endif
-
-static NSUInteger
-VisualEffectStateForVibrancyType(VibrancyType aType)
-{
-  switch (aType) {
-    case VibrancyType::TOOLTIP:
-    case VibrancyType::MENU:
-    case VibrancyType::HIGHLIGHTED_MENUITEM:
-    case VibrancyType::SHEET:
-      // Tooltip and menu windows are never "key" and sheets always looks
-      // active, so we need to tell the vibrancy effect to look active
-      // regardless of window state.
-      return NSVisualEffectStateActive;
-    default:
-      return NSVisualEffectStateFollowsWindowActiveState;
-  }
-}
-
-static BOOL
-HasVibrantForeground(VibrancyType aType)
-{
-  switch (aType) {
-    case VibrancyType::MENU:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-#if !defined(MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12
-enum {
-  NSVisualEffectMaterialSelection = 4
-};
-#endif
-
-@interface NSView(NSVisualEffectViewMethods)
-- (void)setState:(NSUInteger)state;
-- (void)setMaterial:(NSUInteger)material;
-- (void)setEmphasized:(BOOL)emphasized;
-@end
-
-NSView*
-VibrancyManager::CreateEffectView(VibrancyType aType, BOOL aIsContainer)
-{
-  static Class EffectViewWithoutForegroundVibrancy = CreateEffectViewClass(NO, NO);
-  static Class EffectViewWithForegroundVibrancy = CreateEffectViewClass(YES, NO);
-  static Class EffectViewContainer = CreateEffectViewClass(NO, YES);
-
-  // Pick the right NSVisualEffectView subclass for the desired vibrancy mode.
-  // For "container" views, never use foreground vibrancy, because returning
-  // YES from allowsVibrancy forces on foreground vibrancy for all descendant
-  // views which can have unintended effects.
-  Class EffectViewClass = aIsContainer
-                              ? EffectViewContainer
-                              : (HasVibrantForeground(aType) ? EffectViewWithForegroundVibrancy
-                                                             : EffectViewWithoutForegroundVibrancy);
-  NSView* effectView = [[EffectViewClass alloc] initWithFrame:NSZeroRect];
-  [effectView performSelector:@selector(setAppearance:)
-                   withObject:AppearanceForVibrancyType(aType)];
-  [effectView setState:VisualEffectStateForVibrancyType(aType)];
-
-  BOOL canUseElCapitanMaterials = nsCocoaFeatures::OnElCapitanOrLater();
-  if (aType == VibrancyType::MENU) {
-    // Before 10.11 there is no material that perfectly matches the menu
-    // look. Of all available material types, NSVisualEffectMaterialTitlebar
-    // is the one that comes closest.
-    [effectView setMaterial:canUseElCapitanMaterials ? NSVisualEffectMaterialMenu
-                                                     : NSVisualEffectMaterialTitlebar];
-  } else if (aType == VibrancyType::SOURCE_LIST && canUseElCapitanMaterials) {
-    [effectView setMaterial:NSVisualEffectMaterialSidebar];
-  } else if (aType == VibrancyType::HIGHLIGHTED_MENUITEM ||
-             aType == VibrancyType::SOURCE_LIST_SELECTION ||
-             aType == VibrancyType::ACTIVE_SOURCE_LIST_SELECTION) {
-    [effectView setMaterial:NSVisualEffectMaterialSelection];
-    if ([effectView respondsToSelector:@selector(setEmphasized:)] &&
-        aType != VibrancyType::SOURCE_LIST_SELECTION) {
-      [effectView setEmphasized:YES];
-    }
-  }
-
-  return effectView;
-}
-
-static bool
-ComputeSystemSupportsVibrancy()
-{
-#ifdef __x86_64__
-  return NSClassFromString(@"NSAppearance") &&
-      NSClassFromString(@"NSVisualEffectView");
-#else
-  // objc_allocateClassPair doesn't work in 32 bit mode, so turn off vibrancy.
-  return false;
-#endif
-}
-
-/* static */ bool
-VibrancyManager::SystemSupportsVibrancy()
-{
-  static bool supportsVibrancy = ComputeSystemSupportsVibrancy();
-  return supportsVibrancy;
-}
diff --git a/widget/cocoa/ViewRegion.h b/widget/cocoa/ViewRegion.h
deleted file mode 100644
index 9ff7e6d091..0000000000
--- a/widget/cocoa/ViewRegion.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef ViewRegion_h
-#define ViewRegion_h
-
-#include "Units.h"
-#include "nsTArray.h"
-
-@class NSView;
-
-namespace mozilla {
-
-/**
- * Manages a set of NSViews to cover a LayoutDeviceIntRegion.
- */
-class ViewRegion {
-public:
-  ~ViewRegion();
-
-  mozilla::LayoutDeviceIntRegion Region() { return mRegion; }
-
-  /**
-   * Update the region.
-   * @param aRegion  The new region.
-   * @param aCoordinateConverter  The nsChildView to use for converting
-   *   LayoutDeviceIntRect device pixel coordinates into Cocoa NSRect coordinates.
-   * @param aContainerView  The view that's going to be the superview of the
-   *   NSViews which will be created for this region.
-   * @param aViewCreationCallback  A block that instantiates new NSViews.
-   * @return  Whether or not the region changed.
-   */
-  bool UpdateRegion(const mozilla::LayoutDeviceIntRegion& aRegion,
-                    const nsChildView& aCoordinateConverter,
-                    NSView* aContainerView,
-                    NSView* (^aViewCreationCallback)());
-
-  /**
-   * Return an NSView from the region, if there is any.
-   */
-  NSView* GetAnyView() { return mViews.Length() > 0 ? mViews[0] : nil; }
-
-private:
-  mozilla::LayoutDeviceIntRegion mRegion;
-  nsTArray<NSView*> mViews;
-};
-
-} // namespace mozilla
-
-#endif // ViewRegion_h
diff --git a/widget/cocoa/ViewRegion.mm b/widget/cocoa/ViewRegion.mm
deleted file mode 100644
index 455d54fdad..0000000000
--- a/widget/cocoa/ViewRegion.mm
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "ViewRegion.h"
-#import <Cocoa/Cocoa.h>
-
-using namespace mozilla;
-
-ViewRegion::~ViewRegion()
-{
-  for (size_t i = 0; i < mViews.Length(); i++) {
-    [mViews[i] removeFromSuperview];
-  }
-}
-
-bool
-ViewRegion::UpdateRegion(const LayoutDeviceIntRegion& aRegion,
-                         const nsChildView& aCoordinateConverter,
-                         NSView* aContainerView,
-                         NSView* (^aViewCreationCallback)())
-{
-  if (mRegion == aRegion) {
-    return false;
-  }
-
-  // We need to construct the required region using as many EffectViews
-  // as necessary. We try to update the geometry of existing views if
-  // possible, or create new ones or remove old ones if the number of
-  // rects in the region has changed.
-
-  nsTArray<NSView*> viewsToRecycle;
-  mViews.SwapElements(viewsToRecycle);
-  // The mViews array is now empty.
-
-  size_t i = 0;
-  for (auto iter = aRegion.RectIter();
-       !iter.Done() || i < viewsToRecycle.Length();
-       i++) {
-    if (!iter.Done()) {
-      NSView* view = nil;
-      NSRect rect = aCoordinateConverter.DevPixelsToCocoaPoints(iter.Get());
-      if (i < viewsToRecycle.Length()) {
-        view = viewsToRecycle[i];
-      } else {
-        view = aViewCreationCallback();
-        [aContainerView addSubview:view];
-
-        // Now that the view is in the view hierarchy, it'll be kept alive by
-        // its superview, so we can drop our reference.
-        [view release];
-      }
-      if (!NSEqualRects(rect, [view frame])) {
-        [view setFrame:rect];
-      }
-      [view setNeedsDisplay:YES];
-      mViews.AppendElement(view);
-      iter.Next();
-    } else {
-      // Our new region is made of fewer rects than the old region, so we can
-      // remove this view. We only have a weak reference to it, so removing it
-      // from the view hierarchy will release it.
-      [viewsToRecycle[i] removeFromSuperview];
-    }
-  }
-
-  mRegion = aRegion;
-  return true;
-}
diff --git a/widget/cocoa/WidgetTraceEvent.mm b/widget/cocoa/WidgetTraceEvent.mm
deleted file mode 100644
index 7023a17ba0..0000000000
--- a/widget/cocoa/WidgetTraceEvent.mm
+++ /dev/null
@@ -1,85 +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 <Cocoa/Cocoa.h>
-#include "CustomCocoaEvents.h"
-#include <Foundation/NSAutoreleasePool.h>
-#include <mozilla/CondVar.h>
-#include <mozilla/Mutex.h>
-#include "mozilla/WidgetTraceEvent.h"
-
-using mozilla::CondVar;
-using mozilla::Mutex;
-using mozilla::MutexAutoLock;
-
-namespace {
-
-Mutex* sMutex = NULL;
-CondVar* sCondVar = NULL;
-bool sTracerProcessed = false;
-
-} // namespace
-
-namespace mozilla {
-
-bool InitWidgetTracing()
-{
-  sMutex = new Mutex("Event tracer thread mutex");
-  sCondVar = new CondVar(*sMutex, "Event tracer thread condvar");
-  return sMutex && sCondVar;
-}
-
-void CleanUpWidgetTracing()
-{
-  delete sMutex;
-  delete sCondVar;
-  sMutex = NULL;
-  sCondVar = NULL;
-}
-
-// This function is called from the main (UI) thread.
-void SignalTracerThread()
-{
-  if (!sMutex || !sCondVar)
-    return;
-  MutexAutoLock lock(*sMutex);
-  if (!sTracerProcessed) {
-    sTracerProcessed = true;
-    sCondVar->Notify();
-  }
-}
-
-// This function is called from the background tracer thread.
-bool FireAndWaitForTracerEvent()
-{
-  MOZ_ASSERT(sMutex && sCondVar, "Tracing not initialized!");
-  NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
-  MutexAutoLock lock(*sMutex);
-  if (sTracerProcessed) {
-    // Things are out of sync. This is likely because we're in
-    // the middle of shutting down. Just return false and hope the
-    // tracer thread is quitting anyway.
-    return false;
-  }
-
-  // Post an application-defined event to the main thread's event queue
-  // and wait for it to get processed.
-  [NSApp postEvent:[NSEvent otherEventWithType:NSApplicationDefined
-                                      location:NSMakePoint(0,0)
-                                 modifierFlags:0
-                                     timestamp:0
-                                  windowNumber:0
-                                       context:NULL
-                                       subtype:kEventSubtypeTrace
-                                         data1:0
-                                         data2:0]
-             atStart:NO];
-  while (!sTracerProcessed)
-    sCondVar->Wait();
-  sTracerProcessed = false;
-  [pool release];
-  return true;
-}
-
-}  // namespace mozilla
diff --git a/widget/cocoa/crashtests/373122-1-inner.html b/widget/cocoa/crashtests/373122-1-inner.html
deleted file mode 100644
index 5c14166b75..0000000000
--- a/widget/cocoa/crashtests/373122-1-inner.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<html>
-<head>
-
-<script>
-function boom()
-{
-  document.body.style.position = "fixed"
-  
-  setTimeout(boom2, 1);
-}
-
-function boom2()
-{
-  lappy = document.getElementById("lappy");
-  lappy.style.display = "none"
-
-  setTimeout(boom3, 200);
-}
-
-function boom3()
-{
-  dump("Reloading\n");
-  location.reload();
-}
-
-</script>
-
-
-</head>
-
-
-<body bgcolor="black" onload="boom()">
-
-  <span style="overflow: scroll; display: -moz-box;"></span>
-
-  <embed id="lappy" src="" width=550 height=400 TYPE="application/x-shockwave-flash" ></embed>
- 
-</body>
-</html>
diff --git a/widget/cocoa/crashtests/373122-1.html b/widget/cocoa/crashtests/373122-1.html
deleted file mode 100644
index a57e5f4249..0000000000
--- a/widget/cocoa/crashtests/373122-1.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html class="reftest-wait">
-<head>
-<script>
-setTimeout('document.documentElement.className = ""', 1000);
-</script>
-<body>
-<iframe src="373122-1-inner.html"></iframe>
-</body>
-</html>
diff --git a/widget/cocoa/crashtests/397209-1.html b/widget/cocoa/crashtests/397209-1.html
deleted file mode 100644
index 554b2dac72..0000000000
--- a/widget/cocoa/crashtests/397209-1.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<head>
-</head>
-<body>
-<button style="width: 8205em;"></button>
-</body>
-</html>
diff --git a/widget/cocoa/crashtests/403296-1.xhtml b/widget/cocoa/crashtests/403296-1.xhtml
deleted file mode 100644
index 800eaa3558..0000000000
--- a/widget/cocoa/crashtests/403296-1.xhtml
+++ /dev/null
@@ -1,10 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml" 
-      class="reftest-wait"  
-      style="margin: 12em; padding: 20px 10em; opacity: 0.2; font-size: 11.2px; -moz-appearance: toolbar; white-space: nowrap;"><body 
-      style="position: absolute;" 
-      onload="setTimeout(function() { document.body.removeChild(document.getElementById('tr')); document.documentElement.removeAttribute('class'); }, 30);">
-
-xxx
-yyy
-
-<tr id="tr">300</tr></body></html>
diff --git a/widget/cocoa/crashtests/419737-1.html b/widget/cocoa/crashtests/419737-1.html
deleted file mode 100644
index fe6e4532b4..0000000000
--- a/widget/cocoa/crashtests/419737-1.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-</head>
-<body>
-<div><span style="-moz-appearance: radio; padding: 15000px;"></span></div>
-</body>
-</html>
diff --git a/widget/cocoa/crashtests/435223-1.html b/widget/cocoa/crashtests/435223-1.html
deleted file mode 100644
index 1bbc27ba01..0000000000
--- a/widget/cocoa/crashtests/435223-1.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-</head>
-<body>
-<div style="min-width: -moz-max-content;"><div style="-moz-appearance: button;"><div style="margin: 0 100%;"></div></div></div>
-</body>
-</html>
diff --git a/widget/cocoa/crashtests/444260-1.xul b/widget/cocoa/crashtests/444260-1.xul
deleted file mode 100644
index f1a84023df..0000000000
--- a/widget/cocoa/crashtests/444260-1.xul
+++ /dev/null
@@ -1,3 +0,0 @@
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<hbox><button width="7788025414616">S</button></hbox>
-</window>
diff --git a/widget/cocoa/crashtests/444864-1.html b/widget/cocoa/crashtests/444864-1.html
deleted file mode 100644
index f8bac76e6a..0000000000
--- a/widget/cocoa/crashtests/444864-1.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<div style="padding: 10px;"><input type="button" value="Go" style="letter-spacing: 331989pt;"></div>
-</body>
-</html>
diff --git a/widget/cocoa/crashtests/449111-1.html b/widget/cocoa/crashtests/449111-1.html
deleted file mode 100644
index 4494591803..0000000000
--- a/widget/cocoa/crashtests/449111-1.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<html>
-<head></head>
-<body><div style="display: -moz-box; word-spacing: 549755813889px;"><button>T </button></div></body>
-</html>
diff --git a/widget/cocoa/crashtests/460349-1.xhtml b/widget/cocoa/crashtests/460349-1.xhtml
deleted file mode 100644
index cc9b9700c7..0000000000
--- a/widget/cocoa/crashtests/460349-1.xhtml
+++ /dev/null
@@ -1,4 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head></head>
-<body><div><mstyle xmlns="http://www.w3.org/1998/Math/MathML" style="-moz-appearance: button;"/></div></body>
-</html>
diff --git a/widget/cocoa/crashtests/460387-1.html b/widget/cocoa/crashtests/460387-1.html
deleted file mode 100644
index cab7e7eb32..0000000000
--- a/widget/cocoa/crashtests/460387-1.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE html>
-<html><head></head><body><div style="display: table; padding: 625203mm; -moz-appearance: menulist;"></div></body></html>
diff --git a/widget/cocoa/crashtests/464589-1.html b/widget/cocoa/crashtests/464589-1.html
deleted file mode 100644
index d25d92315d..0000000000
--- a/widget/cocoa/crashtests/464589-1.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html>
-<head>
-<script type="text/javascript">
-
-function boom()
-{
-  var o2 = document.createElement("option");
-  document.getElementById("o1").appendChild(o2);
-  o2.style.padding = "131072cm";
-}
-
-</script>
-</head>
-
-<body onload="boom();">
-
-<select><option id="o1" style="height: 0cm;"></option></select>
-
-</body>
-</html>
diff --git a/widget/cocoa/crashtests/crashtests.list b/widget/cocoa/crashtests/crashtests.list
deleted file mode 100644
index b65fe01394..0000000000
--- a/widget/cocoa/crashtests/crashtests.list
+++ /dev/null
@@ -1,11 +0,0 @@
-skip-if(!cocoaWidget) load 373122-1.html # bug 1300017
-load 397209-1.html
-load 403296-1.xhtml
-load 419737-1.html
-load 435223-1.html
-load 444260-1.xul
-load 444864-1.html
-load 449111-1.html
-load 460349-1.xhtml
-load 460387-1.html
-load 464589-1.html
diff --git a/widget/cocoa/cursors/arrowN.png b/widget/cocoa/cursors/arrowN.png
deleted file mode 100644
index 5ca8ec5ac6b815cc849c70098a05334e7aa9a4e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 256
zcmV+b0ssDqP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0002TNkl<Zc-rlh
zF$;r03`Tp9K|vRxqPRLZy12S__W%EwYm`?INtfv1&;}kHUoh{uQy($Lq}(GoSuR0P
zM9DzNE)fKVR*_oQWWgh_hSv<<U|oMCK7l>_tHdJ^rDBl9{<y>=$dooxd(k0lmCP$>
zlu22PJ6Py7UV$j3(krtenCX??BMLnDR7OKE(i7h$Q|xds1jE*&{(_`}Lh0k7){Ne1
zL9TSX^Dmgl^78_|2L|@gk;zrRYhkwq<Yd7maMTY7lJN#OFmT>DItnfT0000<MNUMn
GLSTX!e{4qp

diff --git a/widget/cocoa/cursors/arrowN@2x.png b/widget/cocoa/cursors/arrowN@2x.png
deleted file mode 100644
index d00e87636c1ec8a9eb468ffa3e6ef2fcf0eaf038..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 655
zcmV;A0&x9_P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00073Nkl<ZXx{Cb
zv2MaJ5Qd3?7G8k455U%`TPGxzO5J(?iVlcUngAh5&-7gVIyvAVJ2h%7{lX-+b6?JO
z{vcFURlQr5>fLxb3y>s9RB8-x^BMRT0CG|3na5H>r{k9PabzI*DJIwfYsfO+m2Q*N
zP3X1&<Q?RI5)u3zo!@EcIzkv;+gPn<0D|wEz)2$t=o5f-eFPwVg!r>5WC{MBG^T)8
zmaOSxV{YROLIntZDW4+%vGfh0JO;0)%^L=9t8<%?FNkXZ8U^13f)y0ts^CLHsJ4O+
z1);9Um;o3z4gL(o5CBw&3?#xL4Cun|7c523^*oO?K+EBpg{D*JWEE`tya!LU622+i
zBBnASJ&>lPC(?}cN?JHfp9Qy_ao;JAHEClJ|K2cCNh(M=>A;`4!#KI<Q}9?-&9%G%
zV9-YnKpVA;l#;%<eyL>KHs$(`$2!))cm*&J2#|_kE)|4M1waYc@d{uDv}Iri!Mg&;
zJ~9J6SBPsffOCHjpRQ|QFZ#;05PS-mEEwfbzf^2}j%@%)2m^vD9mc5Z*Esm@SBVaw
z1Ly#(yOYZ<)OfcE2~gPp&iMaQ^oarhA8sxWvc{$@6ae1IlRqL~|44c!%}Fn;IUjoj
z-{U0<zA{jN$I&KD|CG2PeXursECbI}#FBv$yp492TMl?lTCvuAY|CwOVV|Q|111A0
zK%lmK&SW5}HDFBH0jAMbC<FUkz!a)t*+%PLbn0GQqT5DsE5#RgeBnP@>~l0$!sT7T
p>r=S%LeT@n_P>a33UvSh$~P3DweOCmeq8_n002ovPDHLkV1nAL9dZBw

diff --git a/widget/cocoa/cursors/arrowS.png b/widget/cocoa/cursors/arrowS.png
deleted file mode 100644
index 9b2d19e0fdaf93421fb50fe2b0af11ac6ccb347c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 256
zcmV+b0ssDqP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0002TNkl<Zc-rli
zK?=hl5Jf9wp^$8ZloYpF1cZ=fAQ#B}FJ!;)3&qZAL{dtHx0xU2iB9mAQfkUIg39%M
z0s}hWKu;WNrdq&8Ln>CTF{>6h5ZE;H5(H+|f*#C*U}jb=7{DS3mYn?sO$6oqk6;r7
z8?z1=h2V4kDG>h$jlhD5O+=VYz-k2#uuBrwc79{EN8~{Sr*H=+Gp{`&!=2s1O38ck
zm6_FCvLuP%AhB$&5tI@S0`Wz2g+P82EaB{n>j$6AraS=@vT)pN3FNK-0000<MNUMn
GLSTaBXk``v

diff --git a/widget/cocoa/cursors/arrowS@2x.png b/widget/cocoa/cursors/arrowS@2x.png
deleted file mode 100644
index 5d011c1fd1483309677f1c50ce9577d65def7fef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 649
zcmV;40(Sk0P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0006|Nkl<ZXx{Bw
zOK!q25XIr!WiP-9y6u7`-B5b$o}d?C-BkrG(C`Uy$I`fZ8U^xUf{bKKPY`2I-ph>b
znTW(%+qq{XojY$)Kok%KTxiCapwPAl3?pH51$@6B7fc9A(mg_-F<|)XUV)e(1Q;Oi
z2#**K41YZU5heryNZw&Ur{kKiA}k4Cj3xK2SwvS$gk}i25E)h&Kjg7VC>}^4?nmc#
zFlZxK4@oE<=r-^`H>5RSU;&pkzmQF6YryY9WevB|ptey{(O#nU^fgc7rUGIz7X?HC
zQGkBVU*(=^wL;R6yg#&hkO%c@9At8iJlxDJ1o(nw2%r55cKTw@0CJ<&1Q>Kb<@G6H
z!+HKEVL|vHyq6hrV|eU>=Pub+D#FmT<^f8NAGH@F+iX3A{^Or+IKK1-qwEcb_-))Y
z$*Uv4${K)f`~;y<-4Kjr8?rXAZEd3#kh@PJFsUO#ke{F}K&LGa<ct#`V;qUdOBE4<
zyqj|bJ14NO?g9DaGrswOuqW(@(CZ};g1j5M<GBYAQri=CLkOS#kxBeAwnXf$h_E2<
z#%y8U4g`2Fv=%}Z1nfb;+Jgwrk+>i~$FU$_4+88h7IB$~S;00s(<a|E8!Z#@<3NO`
zKz{1`HOXI-PM3-JCaj3~vxEE2eX8WItp|!kq(TJ3lTWqCYZNr+M7UjM1M$A$K2`Es
z6`2%q;1Ee+t4z7?ph;e{q?CtT28Y}ph|9w&sG1m4jSLREqadGak#DQ0w?a&={nX=Y
jl_=m=0z&(1O;P&;13z2u1p4>y00000NkvXXu0mjfJqaGF

diff --git a/widget/cocoa/cursors/cell.png b/widget/cocoa/cursors/cell.png
deleted file mode 100644
index 5284eaec576e1181775c883adc50d544823578ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 268
zcmV+n0rUQeP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0002fNkl<Zc-q~S
zJqp7x3`QI15{M5_yms)KAt%VtHAC0j{}`zZuZs|Nun2|--XfX2pf5j<<2WwmMuLm#
zlwc5^!YE8I(i<8C^neS6+*X7<Q)in5qY!hO`U_&7xdp7`tp)TZw}4e7Eua_93+zCH
z@DgT2Ff$8A@TR~H6qEq$;0pp3XuZtf3jzXd6%c$?;8+oY`id6eBW%J~*bTwXY~$>r
zR#Xf*ayN;mWi<pVv&7k`LhkUGI$t#Zrvm(+3d#(=5NNAF2X6=3|A*tKzJee2h_A<c
S4Y2zF0000<MNUMnLSTY_*=<Sy

diff --git a/widget/cocoa/cursors/cell@2x.png b/widget/cocoa/cursors/cell@2x.png
deleted file mode 100644
index 5e6738cff779e133b66c73bd80c05b3bae35ed7a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 647
zcmV;20(kw2P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0006`Nkl<Zc-rlm
z&r9P#7=}%|q(7)y45Eitd#F%LS%P?|9^5@h5n)#kJt%tc;{X3A)K_={A`360#xZUJ
z&!v1b^F4LacVgC7t5v0`1!{p>;JXP_<SIoVfd(`I_?)`0BS6zM`9q|lCEB6`Z9Yq>
zK?sq^0!8yFjrPQ*=!-4r^I4CYw2+7`kQB}HO>c;mVT0O2BKahNf7T{!i8hUGTLINj
z+h%NHdMH((AyT$RCWb|$udbH@Luz}BZNwI6vA=i4*a=Xx%a~SdfhJp_F9u?21yn<A
zpRvu@0v&#7_Qg*pK+Qg5I$uGc%bp&I+zC)KVobMO0iUofu`YJl+s96TnlWS6nZqV_
zxPVXCE)8Vt>4}&-0cs|U$(W<-5<6VLCu}BmXykycapnZ5$r&?Xjw~Rtjetp5hY_&&
z#P$LvVapKki5((f61J?%Cw72<N!SuDm)Ic!CSl9Ed}4<R6bZX0W)TEttW9FSQy{`k
zYy<+gPy_+9g~D&*Bk@aIh-<MFH{w>@iwE)O1gLpn%q?>)ne&1*j{Hp={xf>W#HZr7
zIA_62@s}p<oB%aT##}PTIdh(}#-aZi4G*#*-^!FDan8YP&hcO&uABfh3&zZuBWKPj
zYYcsmg&!p{{-guW^CK3U(7*|eIe`VWIb+9S#GC`x$jniqdWX5nAEzt(KvO?bzU86b
z@Cgs~{xXRjmay^uH|i7n5153FCEyeL3{1kt67Y#V1Cy|^1bkxeJ>wF#e!=m-zha8<
hlCOTvS_^!Xz!PFP&F$Pjh$jF5002ovPDHLkV1g|KBF_K-

diff --git a/widget/cocoa/cursors/colResize.png b/widget/cocoa/cursors/colResize.png
deleted file mode 100644
index 4e3e19e223f915e6c0246071b717a14d07647b66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 321
zcmV-H0lxl;P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00039Nkl<Zc-qaC
zu?mAQ5I`$rP-qvSf@HOm;wA`Ao%9#_4gLSwp6~?mVvt5l1CNwDbB|t3yo}>`D!&n&
zICcpl!3c?Pg@jlXETGVBT#YG4E?AHVmZB50z>*6S(2~L-D9G&;xceRpccF3!Dsr*j
z55FK{QM%}NqXfkGow6o!3v}^pF38+7J7dh5k|5YD&SHi?rX^Zngp>!rVc9OD1eoms
z0!uBoK<ENm)cFL4zgG&wY6IWQ&KUE+T3Y1UWT8efFMcTju|@IPzsXus3a#+mdQHi-
zLaB=HIcP#IJhl!Rxm+Ezv#yHZ%Z{NgyF;#PTGB&9EII6hL%{+pG4t=A%<%C6sZ}0>
T(3wME00000NkvXXu0mjf|00M@

diff --git a/widget/cocoa/cursors/colResize@2x.png b/widget/cocoa/cursors/colResize@2x.png
deleted file mode 100644
index 6a92cf68063e51617c26edbe98147c3e85660bf3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 836
zcmV-K1H1f*P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0009ENkl<Zc-rlm
zQE$^Q6opCY+60w0Wn>#w3oW7(9T}tBkjjcmr%7A)FpZZ<NP9th;)(zNR!+p3WF@)m
zwlQ)Mz0xOb*0p_3;@Xb=Xg;6+)2t1w4HRS@MtGz|9;aYA^Hxc?A-D`GpbC5t5T9ig
z=Frdz7%{|GD6|F|AOz1y$g&!9DuxNC;ThrsP@g{#Ne&1M6P{}WW#Cg-q%aUM*JoYN
z_3){1XgmiUL#T;qpu^l6>y}&(AD?6V1?Vdb^qCt1-^DQUNc!o&0<pqC%-qylus*$J
zS7}3d8Ek+6gvOISR2Vn}ef}MSfNhoUjo4akCGi`4^-n;<5cUp?6b42~uJM0^ZTW0F
zV`ABm#0TIhXr^YDA($u(Ou#Tzx5+kxJQK@?BtFcWF8O576b8<~NSI#3JQK@?Bz{Mj
z-=|=vFfapCp^cq96Msv5p0I0$f$Nk}l?nUev%<cD8-;<JB-hN-ny@RL<OOrIdDcyo
zjQveR5O3drY@%W8n@Za4L6y_mme84fWD{G|Qq^obJY(oI1@SISG>xI;X?K^=3K@vB
zyVnw5Rh{FnzXC(3Pc3y&UDyCPcK9Pc77XZy5a@vqVCrBRowDy<dI+h1#GnlZU<A$|
zSjc`R2nM7)N&Gn&vG2C<Bi2o$pbPfF7|i~#mH3e$7?AU_;%Dq@pM6WysD2>>ufYNM
z3@(MC@EzPK4BRETLK~Ot<A8lC7BbCNB5UFzr}J;%R$<^a$<3*Mkrpp+C5oH)1WwU!
z;msV&PT8hXd~p*oI09n}+vzdeiuK})o9KdF@E&|z_Jby=%QkjFS1-P}i3qenk5k=n
z(N9V+WZfRyimZ!gh#&P}n@{fTq966F(*@hoM?J6>;<1WhVxeP|d-2k-3a}pH!4_zx
z4z|Qda+uqa4z}DLEefGMT6BK6%PH{-XPYZBW7(17aM$heIv7ys37C)*mJJlg>uxVN
zDDVx~12NfSSx0ff;r5CNY;r+rgO{Yuvdz3Jru8M?|9;K7+(q{~e#b8X0dlvc>f^lt
O0000<MNUMnLSTZDvV$i8

diff --git a/widget/cocoa/cursors/help.png b/widget/cocoa/cursors/help.png
deleted file mode 100644
index 5e5416b4e368e04bb7f1d063b438aa323a370ce3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 723
zcmV;^0xbQBP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0007-Nkl<Zc-qBP
zO=}ua6zxcLAbz!lqNKLiNOpeUvZRZGr9}k)L5nWLRn`(n{)co`s5>Q)MPdtXje&@u
zb|JKgMH)@iAOW#z_4XckSq#rHbYc78;4t@|bA0#S_vRiEtrh>qV2$fe1BG#)p)xiY
z7C=0!BBtDJpf9{pC=_1wdc6;m$>jTDv6uk7zTq8W$dQaB16kY@4u>E2`~8nBG~e6X
zBcIPls;UwY2n6Wh;D8Y0oJ=ehbAltdl7S>13WXduH#fyxE=P8|9SKWev)KqaoLd4%
zHjxdmReQJF&48#V3WDVEc<A`}m@Y3bX)qX2KA)$ptt~<fImo@ZxX6GD4Lt)mZ)7r=
z5DU%m?+^wY4hK!AQ))Jw#Puhv)6-MUPWVsF!G#92Bm?36sMTtHLVX2UV}jp!JWg2S
z@mLc_pTLEN(2@*P#^z`=YN3gGbx)_$gmrXuq<N1a02dn2k_^Pwp3mp=875_!cr+R%
z9#iUcI^=S>G%=IOMBqY0Xh{YZ#`Y?MMx#Mkkw`>}Su7Ts&1Pe0KugzvN3OlBL<WNa
z+GsMKrMTbkr{Qq;L*GD@s8*{T%1yo-XmY(?Kh!UgXmTo*dXJG4W2!-^RHF0q^Q8w4
z95#8U-()eS3}3ZcJrM^@BUCIFC4<|81`fEZ##9kod+KyLU$xuqS~i;{tJSJo7Q`UV
zxnIEnS7<0JuL?AZ57z5)x%}no>S}@ddc9sU8jWN&n<*F!(*FKFAy%nW3U0UiEjZFu
zp?BFa9ty%vB9YiVJ3IS)eSO{G5&q4i_=|7QpLmx{CU=p8TyR!jcCv{bTNZVF$#}zv
z0OEN^#GWx8+=~D82S+sRi5S0aKs;|ECVg=J%O`W4>km{^mHw>2>}>!5002ovPDHLk
FV1o1LMkD|L

diff --git a/widget/cocoa/cursors/help@2x.png b/widget/cocoa/cursors/help@2x.png
deleted file mode 100644
index 0ac53a973386bfe552f27201174ecce63bf1ab7c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1693
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

diff --git a/widget/cocoa/cursors/move.png b/widget/cocoa/cursors/move.png
deleted file mode 100644
index 1360f822777ee41f649fe9275ebb7b3d9f0cd8e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 284
zcmV+%0ptFOP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0002vNkl<Zc-qC4
zK?;K~5Jelv!nF%G9wFidasY!T>8|%*rPJ~u(%?g@wgV62EdJApl3ULCQhp=2ur>>v
z;f+Rk^-d8ug|=DsTC3-_3pl(}@Eff=kbr>0K>~uk;Vh{I7+$J~7R3??@X2+(7eUnn
zi3GTzD(InPDey)MGiQpVHGCzIxj#YB8_lY~hzCX#N#ON*!AKt)_|UcPmHT7_Wq90V
zV>IR+pXqFjw8?9dX~T~;t%cWuS~5sN;lrLE4acQ$919Crk`^;h5Do&C1S5(7;ol!P
iMlayN`NxrYWjz7e$SD;$@K)*o0000<MNUMnLSTZrA9lh3

diff --git a/widget/cocoa/cursors/move@2x.png b/widget/cocoa/cursors/move@2x.png
deleted file mode 100644
index ad146e48636763fb1cdf33351a924648e3da4821..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 621
zcmV-z0+RiSP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0006sNkl<Zc-rln
zL2JS=7=~9{kxdX(@E|C75d?3Z)LlJT{2N0UJM8~ox-ak^B$;oGZ?O>!yx?M3o=1~5
z<@2qos;ACNAPIpdZZ84)^;*kZ$e8p50Nt_VmIBGqmpxJ-enS}~fP0qr3eCMnU*X0?
z{$D{L9=;3MLFF~qhxfXWXi0#>e^`dqmFC{V7)Z1sz~M(8u!}D-ijWWmba+8R7f|6v
z30**f*CliT30{}b1tfS~LKoohyis7ZdI?>C!|MWELKmoCHkYrzEZ=nkZj2jy@i&!F
z1UP&Mc8(A@$K34h6yWfPx`b}t*i0Z6zHxzg2`-RX3Y;8=WU}VMC5B)rz{Uk&+OrG@
z{G%lXVCvi=ki&SKkiZyBITN^CK7Gr?vP@tJEy2<UTNWi?*|xZew?v?R30W4Fjpfk7
zW%Pi#7i0<XO>CK3R`?{!nj6`#3lSjW0{9YhuE4-HF~5vjW|p<(({dt5i6565fpA<1
zf5KdA%<W%B<8Ne^`4tIu2{HJ2<c&<1-~u{47l@ZA8+@QC8N70wW)geLv4Ka*qh)^$
zUVotB61zYm9)8E*b%A<`JzGwE+3-)kF##lIV-t9`VVi%bmn3v}T|ku(;dOy~CCY!`
z%XoNQ;9iNX<=`F6whUepkXk4)!y#<rppgywW<GoZHL|e4VVU9>yhIl0^9vlwlv#rk
z6VC7xWbBuiQmhjPMLtX4#V_(DUg+j!)@Q5KXD+Xw8j$t}uA@@(%qG-;00000NkvXX
Hu0mjfhkg@w

diff --git a/widget/cocoa/cursors/rowResize.png b/widget/cocoa/cursors/rowResize.png
deleted file mode 100644
index 4c16bb8bd662a0878a309094dfed2ddd9b7cf407..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 331
zcmV-R0kr;!P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0003JNkl<Zc-qa?
zu?oU46op{}8Cs}IK|#9Ksl}}zI63JmIEkz8{|NC{4zx(>rAEQPC#6a6!K6)QA%vfL
z{`|20Pk@6*CLZov0Zv8Bp!T@dJ(m{H7hkIIldhL$hytb*H$tWbc$6v>Gn_8}NkE2G
zP#Xrl+*={D1Nt{5M}Y;_*y9pegNyps8e1TThl>Sx%)@Bw1B@|q_*g)WN`pS4XDj5f
zfCBXw0%{ba0SQxN1ZaxT;eZp)xZ)OB<eU1=8hb!DK1Et&4XDwgv;KjKwy06PEVBKY
zS|6J6n%W;4wr{qIt?{ARTLl^%BWrL}UkRVI*<quQVe!qh&CU*Ku#+ZIJpI5yCH;Z(
d=SOCGy90Di+8IkF4<-Nr002ovPDHLkV1fz{j*S2S

diff --git a/widget/cocoa/cursors/rowResize@2x.png b/widget/cocoa/cursors/rowResize@2x.png
deleted file mode 100644
index b48f03ae0d347f748c2691c5a32a061c14fae585..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 852
zcmV-a1FQUrP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0009UNkl<Zc-rln
z+e;fk6o(tL<|1htZPKPio1_@2HdfPAuvn-fczICT2SF)83erOV|M%^0;S-k8?O{93
zW>XyaKsGaH&gX9CvXe()7|t~RkHCzU2Z31^pgj<$0CNt72&aC21Y$`S#k?qqGL*Ph
zyp@@%0B!C|J|N+$sD+g1Z?2U^;7UN|0&ep2q9PuP#n36yH9o6Q7m4W!xXD+=6Y(re
zDA8xssX7vw3M3`p5N#*n2v?#_T}L82fi%gdlJF6jMDp24ATWXCGm=0cljQv+`~`y8
zP}wq)Pb1Na4Y7frfc@WJ5R0Kv+=Q*dJh9;11uubuvpgu>j`j5EE#Q{e98scAL_`XK
zc+vsEDx$`-`doCxy4Vp1;!IqM@0LJRhq`C9-62+o*bVxs(0Aa-SOO$}H}R%;DZ1i~
z7>Ye{B)*8N6arVYIU>f8m|gm4-Vs5<5-2#2OFc|kk_0^B)SbtwU<m|R*F`G_0xeM|
zr@#`J!?Y%zij`QPEQt%OkV}o+<}86Sqd{A&=0IRow8^P#2^6_i4Y4dXav-olE)8-k
zS^`zEBwmR@4g?0|vLvdh1*ZBXwgv1*XsQDCBV>Px#YlV>r{XKK=r=JI*Gx<|;-~m!
z2}E_Mdqdl6F(&3EeVo$g$oLZ5!>Cv%&?j+7@N+u4pwltQ{4fPnhq`0hUJ&b?*oX8r
zqHkjuH6}6w^m!KFi`@w>=6300K%XndL}o7~SeLvI9fH0U!wD>>hs5rS4t+L_rG(#N
z?q6+a(l6%xm($(b<+S&flI1ipQ!J-FHZ*k96Ys>H$EJRd7(HU9*wA=xDY?~aj1~uf
z@ml48wrj*Pwv-dt)N|Vh;-ffD@nY+kHUnaKZ0bE<tBBWPi?RFEe6^@L)ZL=(1YWE7
zNu2y)s66pY-WKqeV4r*^dG^1)$=d?{5}VAZ`?2KrxwdH~?<wFf5t}2n#Ru5tTGvQE
zQ-Q<-4zbMG-iIF7IN&gn&rl%oh>4-G4XvajraYVzCm!;NI^286m#2g7)W@uOJ*hVj
ex*vXO;FRB3(u>{v?2?uM0000<MNUMnLSTZ>9+W-+

diff --git a/widget/cocoa/cursors/sizeNE.png b/widget/cocoa/cursors/sizeNE.png
deleted file mode 100644
index f62c046575c830a21d7663d4db225accd275b913..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 279
zcmV+y0qFjTP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0002qNkl<Zc-rmL
zy$XXc7=_^mGN{DGL4+()9E3uLLKiz0YU$Q%=>1<q`VJo`iejRrQ2N0$B*Qt7pPh5=
zqrO+L(RddqXv8o`dyMRBsL%q9)Xj{P>Cl20R)R)k-y#kzNKiVNiGm7dO~D@ROhJt_
zq(H%-lAuis6e1MEaG8LDad<uqm-S0JyzXFW_!Bp@xZ>>liZrr`@CQz)uty2&`wyb-
z-H*bLC}5BX&z~#>XnJRSm+%~sgpJ1Qh)|=!1&1Z!zL%WAifl=^?=#hiM0dvP3g+iu
du$3Pucmw!wX%mWe*wz35002ovPDHLkV1jLRdW!%6

diff --git a/widget/cocoa/cursors/sizeNE@2x.png b/widget/cocoa/cursors/sizeNE@2x.png
deleted file mode 100644
index 98d19e9efa143a3bbbe0e572ff24ff11138f8324..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 794
zcmV+#1LgdQP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0008vNkl<Zc-rlm
z&5zPR7{;BpEVO)!1&qM52?tr&4Qn>Ks0lH~h<fp+@$UbBUq0${c*sm9os^Pkag)Bu
z??5w4pWn;ObXcB6QS_uK1fGn*e_DlrsRVI|djbv-Bol$SaY6}Q0vDh{d=Mnyb8MM^
z>nTDa2LTzLL8_nuTHrb8fENZj9Mb|#Py-c;P$D}4*?oqOEEMH^MM7jP;PPexXju>l
zDNzAl9s(Y3R_C-BYJrYH9Y5sMs<AOn_Md<h=z=krDGq4`CZNwXQO--C%#MW=n1ct!
zA&tN_7=RWV<L0%9tNiFkU<Q_8tvDPja0@QEJNelO5DIv_SsM)4#bt!rZnuwz@Ir`V
z1QuY-W&~#wh)}!TZli@iM&J#&;)W39Ifa756pB#${odGl*LBY>Aj8XTv<dnQzex&@
zI*WiQd;|0terF2rI1a<g%3VM|K7eL&c)n)P&1UncIOqa*HUv_KM;*dTwD8)({;Nvp
zyO3Rh<na5H;s1c&;8%>m4Y;(qjq2h36T@#g?kD&GzJYbj!)^+OwjX3%u*sd*(bmRy
z@CkeXON9sREcDXWQ9?iO)Ik`rQiflHkKASE;F`?%dd6`hd8D=`AfL3U!lO9uD|pXy
z&V(TcWCX@!2zsCms<w{P4&SJDZ1=V4wPyGmZjXH~&^GC?<6Z7NE#<3a$&LW054$r_
z9MXpGaSa8)CshWnlRydY0%2VM+{a1CGKOy`;XG2}`&Y<?65avA>J(y_1z1HfmC*SL
zLpvHS@nmor-o_#>X~*R$cndzqg#RKJtTDV$4~6l_vb>GT@4b{*DdAV(9hk?2FR9^8
z7|Q;Gj1p5$r+cyhuff<99;B|UjuKrkV5cYK3cLa#$M|~ZPcQq2xjJYwY>$MzR=3-E
z`^RaIYr@y|@EWg`IYtYAegV^eqszp!hvzSl{x<=_>%}iLg+L*YNfkeI7XpPqA#i5?
Y0W#W>Kis2_oB#j-07*qoM6N<$f^DmA>;M1&

diff --git a/widget/cocoa/cursors/sizeNESW.png b/widget/cocoa/cursors/sizeNESW.png
deleted file mode 100644
index 0a077fa67414f7e3d4271614b7e6db84833d4f5f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 300
zcmV+{0n`48P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0002<Nkl<Zc-q~S
z!3u&v6h#wUIK#LX+(^vARSUr{2ohS=H}wDCFx}uTq{s8&3=(wV5R}~`zBhPEDILn6
z2oB6HK?Q2yKmhHE033g>as@SL(?%$(a|I6cEE4eh9=KeA2SZ{MK?I>ha0bhUU<7TB
zpyHiH78MF)c>}uda>f*BtLRD4%JKQ4!<d1#iu{vO{scF$fGe1dEt0GFiBf(C6NnuA
zz;f#x*n?#G1$4aL6Z<6d4n`Jfk7Z(c!!nT^fgB{u3k6cbXYPR>dj@(q&}@O@Hq2bV
y$BIR)q7w5Quq1+UMO0SN6qLSHY(YVOFL(o3yc^cNOT_p90000<MNUMnLSTX&LVN81

diff --git a/widget/cocoa/cursors/sizeNESW@2x.png b/widget/cocoa/cursors/sizeNESW@2x.png
deleted file mode 100644
index 31bca3c90187ab0d3ff6761feb358776bbddddcb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 975
zcmV;=12FuFP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000A)Nkl<Zc-rlm
zS#Q%o6ov7U#ZKBdq-|2ENm>+yT9eX72)a-KVhi*E#8$*R|Np&N%y~E?U5#uxb}~jq
zxzZ;!sS}@XJf69&??q8`r&$ZE1=a%M#T}}(KvG%6CQc4)ViBVP^0Sr*T>@oLB_8lo
z@OW&6pLK<hWn4gpXOJ4$1Od1YT3{=I7LN%)1JwB)WhJqs0FTqrN1x%N6%^$?Az_&o
zaCkBw1S=5OrbHFEMF_Y&*#@UYR|~WV^7t;NR-FT58@~cVU<d4jP&i~27=RA%iAqrd
z6^__81s;Pl;gCh(2<(A?1LG8R6W4g@dmseoU@ROK6*vZcu1=mg0YU+nCu@Q|j^cTQ
znog&;D!gS`iwK;6eGZ2I&jcdWY&M%{;TI7YfdeiGevwniS5qiL&FAyPk#`)Y5CJO=
zJ-k>(8=%ARleF+CV*+|p=E{akBHD*d&}R5qT6j?_6^L!jB9v&hO2h?a&ih8z@RP~p
zRygPar^^b+#>^LAT<22hks1h8cvNC|+qP9md1L>P68b8XS3pjSy58G}?y<?AcloP%
zQh2`B!~X`qz)g(6ko!O@uRs~p7_uF6f-dQ6;YninDUbUCuE9qzj@j%EK{xM4=7^he
z8}t$`bC@B#yf;39*WePI3(mA&Xjiooc?AM~$w1y{dSwhh1~0&fz0wg0`8worJ=Id@
z74UfZy5LX?nl-$-LLa~d`<wwo?vWnYCtc9y^sVJ-rya4Q_Q5bFY-)IIdW{)=$mOxa
z?{AV8M|_7XPayuZEaes0;)t9GfppTtx4Cclaye$;4dRRN4zThH9Dvg-0<swXQVYK+
z!nvfxO|nYLBD}q<z=(OWhQ9_^;0bsjM!w3>wuVDo6<mflEue@03f_RH;GtL&JvFEG
zrZ65^#b1FdZAaybBEl!2%Dh0jM5uODIr==Oae>xSs}M^F_(ciGjjRujqa~~ODa2Mn
z{%yMgi8_}`$FzXW6E(PF4%oZA1Y>rR-@y&}34VZY;4?eSSKt{4ISqHz`Y#2tRGxOa
z4qB=oqQnKmy#?<D@A%$pu0GGf33wzLvkmQkoyG(#;L4Vo5(9RQ#|$^pIOY383af^#
z&FScKV4NZZ9G=XhL<@9yPxLu04s`f_pTfJGI!(PXGb+Hcg+!GB8d)D$P`(!Tz{0eE
xB_v#)yprvaQF3EuP{90yyY*w%|4rad^A`#E&}=?wNyY#G002ovPDHLkV1i%myQBaB

diff --git a/widget/cocoa/cursors/sizeNS.png b/widget/cocoa/cursors/sizeNS.png
deleted file mode 100644
index 0419be0af797e40d6089b8421b4242d15ce431ed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 282
zcmV+#0p<RQP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0002tNkl<Zc-qC4
z!3u*g42D<8p_g8SiL&bsf*@W7!oagv-~VB{f8z&bWD}B&20kba<b$S7PdVqmQbynm
zlOO;Akq8LC5(E~lGUK`CUa$zX;x!Au;JV%<7J**;qr@T*P_dB4{<y><h@j1kz36SP
z1<@*KzzwWQ4_4+Ht3W^kS1>DrnYjeS+GGJ|Fe-wPIk7c)iv&7F&@sm-ASir9Z1UkX
zWs}X<^yr~^u4&{Wn!b#R$@9>JW1t6%(u0M$3W#gifq{~J@xe3fG)WKcq*sdjKOAr&
gh7YIAm+AlXACnbt4p~|!kN^Mx07*qoM6N<$f?n5nEdT%j

diff --git a/widget/cocoa/cursors/sizeNS@2x.png b/widget/cocoa/cursors/sizeNS@2x.png
deleted file mode 100644
index e48fd0cb3a461667e2280e008b62872d14e69f30..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 660
zcmV;F0&D$=P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00078Nkl<Zc-rln
zVN1e57{}X|nyp$nl8}r^AO%4qd!Zm!P#`ksZNBaMe~0xS{6%>%@94baf*t%I=5u$?
z&)R$*uY<BI|24IM_X3`bTHv>#nj2IoV*C<d(jkbzA&Gb`@Ihc#Y{-OLpj~oQKZ6!u
z3pMs~FTms*O!ll4qq+v#j0t@akjWo|i}IIIy~Y?ycpxB>?}&seq(nzbxEIh*UQ5Ec
zfPV7&5-tUFlK+#08v%9lMiSNp^piK2uq6<H2poZ=R1BH0Mts7xBM{gT;JeQ~jRoXb
z{}${BgrEsdKo{JC9K3)6e1UJ3Ko!H-f^&1O)#chv5V{b^zylbAckl_88UjnkzH{ya
z$ZQM9TIU>GapQaN3|>K@Ay6>(nR7F)b-r0E*}REcAm)ab;2I3U6L`}Qcw_94b1%78
z3|e+?;&r*)<hvEKK<j}!FxC(lGq%UMG1qEx?a+<@C1k_G%{w3iBMpHO$T+7h8y@1c
z8f}0C^g*s6kTW&`jct3?0=2*%1nQgE<HxA^2bsNMZv8=Ky_DFufG8!b7IUYoVs38@
z&AOO7bytnDoHlJKos`qEp#dr1wMQ^BXzFKNBLk^uXzaF>n@=7v|HIcRbMZtHEv18|
z9^9}YnSw(1CT34C<=h+FO}&wXdGh80CK3k8+pUFE5{oU#FLovGx|mZ*Ou)xR@*iNb
zD|vSU>OZGGoAnWxkP)x-W%53pkx7YFaW?=%GT=3Nz~Rp^t2|-?Dd>_^9x-`&PAm`k
uKwKdY`FuX;Rvxqdx0CvyqW)Kd9RfenDKI|(n51F=0000<MNUMnLSTZJ+bDkk

diff --git a/widget/cocoa/cursors/sizeNW.png b/widget/cocoa/cursors/sizeNW.png
deleted file mode 100644
index 8f5faee5f756a6ac11ae3bb2014a8016df08a02d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 278
zcmV+x0qOpUP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0002pNkl<Zc-q~Q
zu?oU46h#eWNJ_hOC_<JZ9SQ{p!9_<w#m#T<|Gy#L;T8fmhCI#E3#XwiyhGkgHs1T9
z6c_w6Nr3_ySWtszhVPdDl~kZX<G+M5EfrYcSm*<Ocfd*oH5e8I;SPFGNd*lUV*;!<
zuqz=5B?EV=eikrGk}WVmNoNoie?=tSEXh7a;0P}4`4v1<lB|0`NzZ`}-~b*GNei^(
zCRe0p&-aup-3yZz#G_cCqvRgU=Ohp$B@;Na_?X$Ew1fp6X)}hLOgJM$bj~rAXZ->^
c3a}=@8#Ht<O!xK#i~s-t07*qoM6N<$f*D6=VgLXD

diff --git a/widget/cocoa/cursors/sizeNW@2x.png b/widget/cocoa/cursors/sizeNW@2x.png
deleted file mode 100644
index 3a80e7ce9133d61fc4f7f77810c6a3339a02293b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 790
zcmV+x1L^#UP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0008rNkl<Zc-rlm
zOK;Oa6h`qQv7L7ac_5lJk+Ps6twL253P=?~hyWXQRP6cxd-CeH_@)|NTqm~1ju9T|
zD3W6-_sqRBa~(g~?RNh(g+ML@ay<TT0gKqgNq|i(l8Jz&1?++{@PH2jP}xHOd{PD_
zO~w)dm>1B3FEfZ5Xo41a3OeA~BXoFA3p79#__{>e0+tqh02(_3Lz7?@(iL!l&l&6*
z2)+d>oD?T*0h>QmV>t}9Kn_6$KV)guIVo-y0v>CA0H%y3N${`081$4t78!7W&$OR_
z8RLl?{97=mK$jWyvJwcmlbnJJ#uO*`CAeV*Ml8i@R*Tr-g6nYh7W)J&%X*Mluh)Ne
z7!;T>i)~JdoBlRR0WQ1=xD*0=B{rMQiudPRz;T>MCAQnG%7iMRiYTGu3Sb-}p)xT5
zO>G;c#E}HlP}gkRj*{5$zCLJ3i7W(O>%r<{wOX-E81!KhP1#nYCLnepIrG2Of|U{y
zj!22Lw$W2?9uoXda0h<Hl-Nc~m_Nvd;7lG;<SY0Neo$haP$Cc#Mq7#JU@F>!8;$qi
zBlxCjJ&A-^*oFkyN`sNsn9cb)BXe*GK7gf?h}m{@L0#{YOtsTho}hh}(wL0E2^oPY
zxB&0Kmn0J6q&6Z@(jFyS+>v^mtqy3D4j6E|J=Y~zCULS*<HXsf9x0VX1=LB6nF&Y*
zG?}HbCb5i?&<8WvS7l^Mz}6(nz$YHBxkO1e7{p|cgbe=5sDP9Zf2}yg7PypXMo5Gm
zgtuS;CPqt0ibzBgW<^M-h5b1s_)p*(oQZb3lyng%=|!YODMVrp-hf*%^Vi~e*}yiM
zd_+l%!Aq9P6<KiR$7T<*<RdH-0R!uT7tF?#OjtI(G+GJMnW%#{Mf#-6YjxAjoM{Oc
zc%0#yI7<S4=ZfHuED(K`c;v5ttMmMV!y>khx?a4YDFh0EgGTY9yAUV@3W1z+56MU!
Uv&<naDgXcg07*qoM6N<$f(D>eqyPW_

diff --git a/widget/cocoa/cursors/sizeNWSE.png b/widget/cocoa/cursors/sizeNWSE.png
deleted file mode 100644
index 0574a584c196e6698cf140c109eda79052a4ab65..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 295
zcmV+?0oeYDP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0002)Nkl<Zc-q~S
zu?oW=6h$j!h@yKTODGPRIt20sg%&!s-_Za6278Aa2t3ULQ<q*i1QYO}Udbt?)RaFF
zG>i}!&;biP2rC?0emAv(4urH5%DP&C1p_A%@cjU6t-ynr5o}j50#_>tU@8gle1OYu
z1yT~ZQgc|q<RoX%15<kj+sQvW5)T{^6)v_2Ea1jHzk_!{5_1(+?*Szv4>W=qJcWeG
zS6IKvj(Bdzl@hf8LZHNeo|2i{RT4}fNP!-+EkK<>j{_G@)J!m@QtHn@R+#mDt#G{P
tEs`l!ID%<~<3Ya%G6#P~6f{hG!53Vd8`cnp8>|2T002ovPDHLkV1gxwYefJ6

diff --git a/widget/cocoa/cursors/sizeNWSE@2x.png b/widget/cocoa/cursors/sizeNWSE@2x.png
deleted file mode 100644
index 9a0a276c34b502ff09066b53320fefefabd2c6e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 976
zcmV;>126oEP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000A*Nkl<Zc-rlm
zYflqF6o%bPce~rNy;Df&1yf^e0iiJ}AW<VK$_I%zjNkqL-|1z2P2MpllU3R&yV%%C
zo&fE#bDlk?GiSSZ;y7MvRst)5m4NtTiN^mWU=f=*2H3<RnFv@SU>A762YC>H@EQV;
zCmzTN8H;nKCm@3N7(@}2Kp9j)4b+q1dsQAAfda@&iL?bQ5qtom_y&fM5Lrm%Mg&|=
z7=gwO1Yc%pdB90qz~)3nmP1PfG7Ea}Etb|AFN&LmfX|xW06oTH68r#k!MYO2A_ER5
zDuXT1XFT%;{}k*{puvp#SqTJONjhMUG0hYF88~DH+APIFCLdx7gq*Ys_OBDLEbF(#
zcs#y}F(}Yy7Aw3cu3AR35U7J~FcbnaNlYe_5s&}31suouqr`MNRhdvF6v`61bpec7
zBvd9gKuIj4dP`v?k(vO<tP&F**94K=ku@CR>P_IH0tYf!IYy(=m4SrHgvVfW#0U8p
zBdGy26_Bfte&v5?AK2Ko?L-L<DN*LK8ju1gigSmu0W=k;aUa-C2>ud$1K*_tgZ`Vu
zl*euI{1w&RCiG54S#G8qSqnVSH!1QCoP!HWj5P@zU82MDw-PQ;lX3-?lWp2cY=WNF
z9vlje!AtO7)%u(g13h@L^fttY-Z2q~c#^hg%y#&*Pj<i%JOgKQO6Wn$-+R1xWhG$J
zP8XQQCR5!dZLme!oNNyqfwv|S`fI<+mUC7?U?Pwcw~}R0XG`2rA3jn88(eO8r3A)w
z28l!|o~t8vaL449Qb~khjTE)zF9aoKsVgMTG>KV|0{c8)-BiF95+2ACpRc(@Nk)`V
znK(9(kOBu_+e|=80J*&rTf?P<%EVpp5S)PXSd2LYhQ<QAh>qTb35h@~z4yQ)@Ctks
z4jBu`f6&n-xN^xI9Gn<rAVUE{ft<F3547NyLLgKEF~@?dQ0-PqC|+=IW9+DnEDHe#
z_@KCG@bX@Iu2#ZeNCDYDtuy@t@EE*c=lTJB0$;#aa7jLc3wF5AS^qt88|ni)1%brx
zQrA=i2=23%pMVo~t*78Mcq2Ha<PjK(KB&f>-^)V4;Y1<R-lRm20qs)e01P$uS@V4!
z-_lxX7g%Wv=nY_nrL@U_IxMU01iE~Gi)B+|@BuH1ldeGW1CauV3?7J-#H}QQXZfTn
yklX+oJd*N(r+u|zr67>a1Hsi})@2Y_YJLJ3V$fzumVXTZ0000<MNUMnLSTZV6`+~`

diff --git a/widget/cocoa/cursors/sizeSE.png b/widget/cocoa/cursors/sizeSE.png
deleted file mode 100644
index 6a1948f521461a580090d5e145a4bd732461ff39..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 270
zcmV+p0rCEcP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0002hNkl<Zc-rlh
zu?oU46h#eWFeP0&ltLB}heE+Y=;Q||PWt~J^SsIp6ha^mlC2jG<aKzbd1-nOk*4f|
zUC>ZaDMbPUEI1MiOf7+7(?OWun$JuPfdvB_|KWPfNOS@=32ds6C<Wl2kxamYj<|S6
zsu6(&JTsDuFsyrEwTC={D|jUmW+M#1l?VzY>5hQc2)2?5+`vbWj9>=6RuCmV&b+#S
z>A;zdnh8#liT(`II1s=J9^f5ez3RTAG?v>BeA79?Iw<b}lm1y9$Ix%^s+(LZUzgt0
Ury?JjvH$=807*qoM6N<$f~Em#8~^|S

diff --git a/widget/cocoa/cursors/sizeSE@2x.png b/widget/cocoa/cursors/sizeSE@2x.png
deleted file mode 100644
index 7d637f4be6d2c28db8d01198bfe2aec9c220897c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 802
zcmV+-1Ks?IP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0008%Nkl<Zc-rlm
z{cF=e9L7y9ZIdi6eYFm|b%lajoz@}>oic?@hrc+6FaQ5vA<VY%>3D|6m&DuZo$VwC
zA6Akhc|OVaUe?~pvg}q<3X}q+Kq*iPlmewdDex}@Hnf!jdh>`c@W^HgXrUFTfGVhw
zDhPnOk`dQkn}7@-FmMEtjBWXu$7<{&B#bx_kl`yJ1b0Cr6K#2n=R)?S#QFqe_z0w+
zlNGe(IrfQ!#Cim@vI!ZiD*|7_w&1ZYNadSYhkyqZsIfFUIpHlxI26!Ir%@c<ERi>`
z(Y!ot3izBJ6Vua|5{t!Ru1Rd`5&}hjPr($mBf#=ukf8;M3J6Gr*ALmR%414M*b@LR
zO%k5x6-lHZ1`&zHS`urL3V2pa2n@g&9En;tNnEhseb538(h?7&4ibIf+Ze<Fh<L*X
z;1PHYPF9rI1HC0VYe<*(+2Vuqtxuz1A3Oz9aLRBul^DtJnp{U4FUrY6#!`9)4mFAS
zbtLBV`416V|2zacpe_WgZY89|R7&Wfukd~U@~;Rl1s;Q4(B!?8lg*rvIM5~Vgl9z(
zN+||rcp<=R^*PXE3j#Nm_(+ML28kkpF~?ZjhQP{i!XWV{ffr!lOn~P+F|fDAn0Ny|
zWoWb6>_SMG1SYNpiX>7lQbUG#56;AZ-3$RD%PHo-+v6H>D8g@;0HJ`sQun|}guh(^
z*9vc*g<5MVq3kakCxO0L$Xp6=pTsS(1%VOhiLHcN0qtv+dwl&*z$@?$oPy8b9DD`e
zz<2TmoUzXl>wn1EEaijoT?+)7K%4uRhu}H4+;2Ih9)lC`LF1T`Q!vr?K`oHj+D@BR
zWyKrCeC=IMr9%cf0AsGO6Tz4@KVtt~v6T*h=Tbm!D-zIPh#dy%v#bU=?DKq&Wz%B#
zhz~`%6JVo&(j>MRq7Ir2)y{+Gn(Uiu|4K4E%g4Ha`P=G{L?AX0fw1V?Z8rku-wM<U
g_{1as=PxwB0JkqW5&m^e%K!iX07*qoM6N<$f@;-i9smFU

diff --git a/widget/cocoa/cursors/sizeSW.png b/widget/cocoa/cursors/sizeSW.png
deleted file mode 100644
index 5dd054dd464a1476ccceef8982929e58293e6b83..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 271
zcmV+q0r38bP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0002iNkl<Zc-rlg
zu?mAQ6h#}zU?f>Oh>)d}41&<1(5W9_>D2!J$D~)d!y^#z5xe=|fIQ?JN$`|&{wqh|
z2(+{3GzSc@pd%KTy#j{PbLOni+?keuln)fI$cWVk>hdxWLANC!&)9*UcraGvPgQ{O
zkU5m3iu?s;?GZT;DUgv;{suQNXfN3pU#yUC3j{D>S(AUk9gKy%Js|G{cqwlW5bm#_
zFU7h$s0;&_mVg5hJir1zf`$7CoH`)?14<H@1d02=_lnW~$sPoO=iUON4CqG__yL^4
Vq1v%H6n6js002ovPDHLkV1fvkaxee@

diff --git a/widget/cocoa/cursors/sizeSW@2x.png b/widget/cocoa/cursors/sizeSW@2x.png
deleted file mode 100644
index 5ac63c25c6f7821a75482f0bd7bda005cc4d76e8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 806
zcmV+>1KIqEP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0008*Nkl<Zc-rlm
z|7+7g7{*PmUy`n_?b6x}>uMpOPFuSn3Y{_sPKUoJqVE6yD~8%OK85Fn<G7I4<cvZB
zA6ReK=J}-Wy}hP)k|g=BsRSy4N}v*`1S)|_pc2R{@DCrAK%T=Rz5&Ne7qFi|3#~v6
zG(eLyKpiNNaVe1f0_ovv3><=X!ejF{$C{i&iE;(Z@O2P?yP%gC$7YQG3pke&<q4SK
zL(l;O32l)Wa89U8lp<hWc?KIY>zaW#m=Z(I4Wyjh3FHr-CNW?+HGu+Nkpi9#+k(vq
zpC!?gQYuD(!Hia@h%Xr7_a*##y<S<uXT1w;wpc%pfZ4<Apuv*_pvkcssTUAF216;M
zq6Cx{u4VM_76?fTbZp^0&)X*a3l{>uglFKcancC%NCXZU{%2NrV{Kf3IhYh(LOx$;
zk0FPa9zG(+e;ED>yaJEGeQgofide)-tLuS;v`CyV{Ew{goG0P0!2&!34_&lT5$J*=
z5KCyYhF7cA?UvzJTKID?0~1#tWD11f06YLsm^W=9Ccf`$p($ezztF?G+Da&Pmk5l(
zR1Yi2W2KZeJl~<E5q_$NceR-lfj(<=ZV}if{4YM|Lyqvd1t#D$MIa;mZdcx=z!~#z
z6@Ix~N=y9+UK=&PuP<2HSCuPZU)Z0)B{%~yI0PMA`0@m@CC=IFk3q!Otn1;+7s!@4
z0VCs+*5`?x3q+PKw6jE60`fsN2D2pRQAP>LR$?T3o&qG=vfptn;PXTsc8{3d<N{o?
z!+Zrd<U9BVzJO1h^A@}WPg#cd<TlFR5@_&>MY12F#Dd}8f%h6$9J>T>xK(}*9`X5o
zO`zslz%#z*4j3Y4SDAr1g>+6iKBaKX7CK}(wm`$OWp*N<c(RZZ5zA==#w?483CG72
zKB9aNwDs+SYXK=Ekq8)|!z+0}p?(Sx=X5E*r-fIt=XWcRes?*LFY_6MARs&6jdpQk
k%O`4A%-;m6UuZ1+23<DIZN2|^`v3p{07*qoM6N<$f-h=i_5c6?

diff --git a/widget/cocoa/cursors/vtIBeam.png b/widget/cocoa/cursors/vtIBeam.png
deleted file mode 100644
index ee7528c595ad264a0d63f048a31deb1bb5ed84f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 120
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj_MR?|As)w*fBgS%&#Y^Bcm?ZX
zF&;;5i33h4Qf;pKe{~O}bK0FQe06YnqlizC%H=EUhm|L}7k>h&3lL{!IDWkKynk2V
Q8=z4Pp00i_>zopr0P=e$EdT%j

diff --git a/widget/cocoa/cursors/vtIBeam@2x.png b/widget/cocoa/cursors/vtIBeam@2x.png
deleted file mode 100644
index 41c47af116acb9570776a457f238e2b12a2eeec2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 336
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezr3(Fp7J+IEGZ*dVAfF>rj9I%Z2$K
z98D2b?9%HOEM?yysPn~PqsK$eOUulT2unI{*d!3UeTLJ94JUTF%xu-X`|#xTKP-Yj
zUkW%dFtR`i2X{u<Sz!#0HSBxE8mz^5oA2{ntlZ9E5@A-%;&bt41VfgNwhSYyRW|nl
zuG4a}Tz7B&Q+eUzf%Gu3hKS+=hi0o??lJ9DR5*B!N4DwQ3R4E-3r}Wkezs_0KC7&y
zRkP@V{`}`lcGd|u^yympGE7YS|7rWS%RVM69}0SHEN<s>Tz*n8DvRZ&#h;GrQjXKa
z8n{lMdSI?<rG1+H<{d!;_vaTsX&Dx=^ysV?YWgC>xbbA_I_}T<4EutFki5Xam|w~C
YcVaG^jL6DhU`R1|y85}Sb4q9e0N#>(wEzGB

diff --git a/widget/cocoa/cursors/zoomIn.png b/widget/cocoa/cursors/zoomIn.png
deleted file mode 100644
index 275bf1c69deca4473b598927233865ac83616fac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 655
zcmV;A0&x9_P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00073Nkl<Zc-qBP
z&x=w~6i)m#lP+QwHN!Me)<7|#MlPIj5kW~zE@l@Bu7Xzm3xbOltwLQ4v=JA<Y^OiK
zjY~mrqYjiw;6@PyefnORp3e6;3sLO8MydlJUe5W>IrpCX-RBh|`m6YFW@FeHZpKxH
zSFkBQyKpXLNZ!cha(BAjZq6`_i`i`U9pH7n)9JiN3><JTQ`}Rp*I((nKFDUX6b^^U
z>-7TW8a|E<!2wrttQW6VtFPPb_AD3-lFQ|yWHL#-V*qQ@hZs2ET5V#(kyEME!FW8@
zP{8N&QLR>^MS~BqKp;S)(MU_D(+^}^Hr4L0HJi;-?9}OWQlrrzF=)+%7-A*|+*Ygg
z0lBJEKp8uO!QeCI9FNBdwyFUP9B_xj;TPmejg<!Z-I`9PKQLqLY_9MUVBomjZsME?
zaz)N74I1D7(*{u1WHQl_iyF!X{eJ%|j-5y(lp_KMT+V56>@I33M^rACKSJkLFB#lQ
zrE-Q`)KFe>EEYTFOB+LikRm@OS~U0&^ZWe-ZZsM_;oLn)RVh=({X(JeR`t-Zfw@!R
z_qJTJ?Y9q&vCVjt&*$H1nx<zm8486$<ned_bIm^N++f~flN+iBXP0Mx6HOwK$jefx
zbl&Ur+N`dhtQLbmbl-}_;wL`A8!5Wj<hs=++ZY$)knxQ1LhzLFnDK;hvZBcr!=e0K
z%bo0qLiQm=S?|g3L&ouZ6It&ff1N*^4ftf{e#Y}TIUiYVVCm~CGe2NNr1-t%5v|_@
p1$PBo%a^=<69<Y49OC<T_6urrK18TuHU<Cy002ovPDHLkV1goUH6Q>0

diff --git a/widget/cocoa/cursors/zoomIn@2x.png b/widget/cocoa/cursors/zoomIn@2x.png
deleted file mode 100644
index fdd3f8e71d4eda8cabb8789ffdca66ce8068b27e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1717
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
LNkvXXu0mjfNNq9j

diff --git a/widget/cocoa/cursors/zoomOut.png b/widget/cocoa/cursors/zoomOut.png
deleted file mode 100644
index 19d2d89125e4d1812b5397bb285f34cfcef8d818..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 650
zcmV;50(Jd~P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0006}Nkl<Zc-qBP
zziV1i6t4Iytqvtan~(+?(?COt8tP!{PztSt#35Tza4K}lzaThd=v369&_x^yS=&Fr
z#ZeGk)Iw{e;GzhEK7B8-dU`%NLwVHP7em_vA70M=&N=s<^WEnSBKoWNZ)RiI8E(cc
zhF5S?e0Je1We8r$<#OBIZZ~Hb#+TV_b`J2m-syDSVGkT|mr3ra*Xyr!T_0q#Sqg{4
z<n?-i`5Hdn8-fF_#8^*WtybT(+wEB}7$ld=Mag86_{0F#b07A=0oQ5~8?Ky6rS`_-
zv4#XbpO0#_8kr3~>;(b=8jVI;I-Pzb?Xsy(f4kXizQ;+OPA4@Q4O(Q_0|(qztMvh~
zs#`!A>x04IEBYLd$4O=2fIA!xzads~EHudP{&YIMK#y@U82kPR7&vaXn>c2ISdsHW
zgT{BRS^&zLOeQ*FkwaOa-|v6NwG)X1sSF%&Ii|(250FFIqH?+X5jwXzWN<5$${Avj
zLpkJFEOy948$*JSB0nZF8+_RF`~3uNG#WkT*iA@PDO1L7p-?zgJv1EPw|U@qONMN_
z^r11<7?1P${98@a^h_p0p-_lC9uF{IvkxaXm}f3>SM}iR^6c-SNF)+@RVtM}^?JQF
ztLrDL#o!O!k7BX-nQw3+NzFy>SS_-Kb}^nXUNVjZFBs1l&l$%HimWmm%FngTWL*@p
z11ZXSQ-1duheTv9uz~pN{Nb#?Cq4Hw4oHmGPpuZP^!1gV?=d2h{Gp;nOBF%F4Z*5n
k$V(M*AgRD1zJF)G01ekxEQLv)^8f$<07*qoM6N<$f)zI?TmS$7

diff --git a/widget/cocoa/cursors/zoomOut@2x.png b/widget/cocoa/cursors/zoomOut@2x.png
deleted file mode 100644
index 0ed46ce75e1e1435a0d7d91a55e12633dde3a086..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1714
zcmV;j22J^iP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000JgNkl<Zc-rM!
zTTfJ16z<G0Gt3R4ARq&S)<#jPZMZ1l4cipbv{qZwL}_D88a1hDlfKah+caq+AwZ18
zKEj*$W{m9*FcC3*Xi?uP7fqC;RE$Ij%EjIFk#Cco?ZjaY2Z-rPzPLGOpS9L^_P6%l
zXOC|vrCw{i_5}Xd<}u(+2CL8No0V{ez%K|0f`Uv7LEiJTuXi=c=%jr}h{=TnQ9+g<
zTaY7o6JR@=_oD0@<g-3a1{z+;<aOd<Bo>Rsa&O+ed2n=e^upBC)E~36v;V$$@nRZ4
z8`mB^dUOGO(3fPwnusQ`63P20g%FY`EG%3*I5_zI^z`(wTBM;bp24#u5~5Gv@{yp<
z`NkrUM0a<0^|NQs`W5Z|{rl?d*|Vylp+OZF7pq_}sG`xRDl02fjg5`-_lAaslr}sI
zACy;wzF8mcn#V{!3SIa1_8t~#Jl2UHJ$h96d_IWymGFAK=sW)m3_h-1yY@M2C2ElH
zxGfu<eC~}KH=3YrByi=*6(yQ}DbbRW5>-=Eqbe#Ylt|^J`xu#v7cVLpeD(G9eF@(N
z3ChVm%|{TRtE+3@+}zv*0-rl~4sUcJDafX+txY|6@IcvyYq*C#y1&QcQ5_u}3MM`$
z;hQ8PZq<aIZ9>p#QBhH1a&q!E0$#dw2?;DDbNcjYH8C-vQW^T7uSo*FVDOC?oOVNc
zc5*{HS%Sj;{{CjIc}PGf(c0Ro(ltC|%1PJ6ty{N#KrF^|E+szX=UknenVGp>W{vqM
zO-)S;!B3nxp`6;ulP4Ga9654C!4Lzn5R<X}P6>F;w}1Ka<*yLn-o1O!z1DmR*`$_}
zt_k>rZx~`(qu_NqZH73#C1m00g7cP^mK4%)E+zPeAr@jXc1TaFPUI66<O?=FdGh2h
zILCsd0}c!fESUg&Xn*hxlURQuCSymDixUC?4&ge%W?BBn;5;6W&j(8+63Q@KOADsK
z7p}oK46zWCv9p+q$BF*41#v;SUbwJ5K(M;HI@bum7p?^YfrW)l{@%*i*-q*JoijNf
zmk74WLNj9$sH&=RjR1U^1P}``89N8LI3vIU7Hoh1{P|-;Lf9U-MgYD{2_Y6@>Oyvf
zz}VOrR$%Njm%WJPyWzGg1WXCtxpSvyC8klX#yv}xkX^)`ot@vp`S9?tD+?L-KITF;
z?;Cdh{Q2(?Q&7wtNMH%mXhudx-P5N}M-TwZKHnO)1MY1lXtI^qYs^Ax^elu@Bhp{U
z1eI5>UTsgdnZq_YU2AV|UwA$o4#TH8A?y-t5fnKlU~eU$NlCh13hXX|^z`)D+i6H*
zQL-_&(*XVGHDHb;wwe;syHXNJe={f8B-nB4)Tys$W@e_+{h)dH@S*)dvltTguGC8s
z>2Ie6rJNadOF{pH#pYF?l%=Jms<yUPRaRCi`AD(vL+42PRV1cKVx1lZ^FYke2aVuu
zL4}}R-u}-V3FsF^$k9moQIEcOCh2`14A>+Jkb_CW$tPuwAkIxzmEis3$B%y_2U$bO
zj#aR#`u%<YZCt}WY?YN^>5#~`NjUnb=i*XE67{k-`a}x)*YWZ3e^hGI+vQP9>y%G&
z5+c{BrIX;Xia}yC<+NMSARDnmXU?4YQO=8g8yOk-TV|Va)CqvL6!G2b*RTKH+}!+&
zjLI>2=9ngtVkGPlTPuheBs}S!%4rgD)C3EAhhVSZL&3*_gM!ZlhXJ+^2|g7Zz`y+a
z3%=o5dn9a_=Je>rK3dFSVV81>-9}l}3id!=g8cy7dpTOW`0qXvKA^YIOwI=CC>e?D
z^hSXs?89BYjY2MV8!4@F650;1UCza63)}Ass!8l4lLTk0#g2mC$v(+vAFp%8&gZ-x
zXPqPfwu^bai0$<px%W6KjaGu@Su4&^mA1URyiLaUasUKY>IaTB0NZ&a`xZus(rd6u
z*vV&QWmU8G3Ruh}u*^R(5kcc#m_!OV8t({dP!}q>VFS6JBep@XHq{6?CzBd_<T5#8
z`6N+J5+5kbB9RCRekW_FSf8J|eH4#MO9^Y#Y!X{Jo9(gQ{7#P22KJ5Vvs1STI3__^
zBv{<rxlmS8Hd~l{A*C0xep_1=vq{7_Jr;3&*~o(3K-uIo`LLDz>Y7C&!X$H<Z~;dq
z2L#=J^X`)f7(`-(@!Rt1C!czeG^b>O*L*9Syz}YU>Ho9%4<#_{YD*7bo&W#<07*qo
IM6N<$f<KcvfdBvi

diff --git a/widget/cocoa/moz.build b/widget/cocoa/moz.build
deleted file mode 100644
index c4f887297d..0000000000
--- a/widget/cocoa/moz.build
+++ /dev/null
@@ -1,140 +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/.
-
-XPIDL_SOURCES += [
-    'nsPIWidgetCocoa.idl',
-]
-
-XPIDL_MODULE = 'widget_cocoa'
-
-EXPORTS += [
-    'mozView.h',
-    'nsBidiKeyboard.h',
-    'nsChangeObserver.h',
-    'nsCocoaDebugUtils.h',
-    'nsCocoaFeatures.h',
-    'nsCocoaUtils.h',
-]
-
-UNIFIED_SOURCES += [
-    'ComplexTextInputPanel.mm',
-    'GfxInfo.mm',
-    'NativeKeyBindings.mm',
-    'nsAppShell.mm',
-    'nsBidiKeyboard.mm',
-    'nsCocoaFeatures.mm',
-    'nsCocoaUtils.mm',
-    'nsCocoaWindow.mm',
-    'nsColorPicker.mm',
-    'nsCursorManager.mm',
-    'nsDeviceContextSpecX.mm',
-    'nsFilePicker.mm',
-    'nsIdleServiceX.mm',
-    'nsLookAndFeel.mm',
-    'nsMacCursor.mm',
-    'nsMacDockSupport.mm',
-    'nsMacWebAppUtils.mm',
-    'nsMenuBarX.mm',
-    'nsMenuGroupOwnerX.mm',
-    'nsMenuItemIconX.mm',
-    'nsMenuItemX.mm',
-    'nsMenuUtilsX.mm',
-    'nsMenuX.mm',
-    'nsPrintDialogX.mm',
-    'nsPrintOptionsX.mm',
-    'nsPrintSettingsX.mm',
-    'nsScreenCocoa.mm',
-    'nsScreenManagerCocoa.mm',
-    'nsSound.mm',
-    'nsStandaloneNativeMenu.mm',
-    'nsSystemStatusBarCocoa.mm',
-    'nsToolkit.mm',
-    'nsWidgetFactory.mm',
-    'nsWindowMap.mm',
-    'OSXNotificationCenter.mm',
-    'RectTextureImage.mm',
-    'SwipeTracker.mm',
-    'TextInputHandler.mm',
-    'VibrancyManager.mm',
-    'ViewRegion.mm',
-    'WidgetTraceEvent.mm',
-]
-
-# These files cannot be built in unified mode because they cause symbol conflicts
-SOURCES += [
-    'nsChildView.mm',
-    'nsClipboard.mm',
-    'nsCocoaDebugUtils.mm',
-    'nsDragService.mm',
-    'nsNativeThemeCocoa.mm',
-]
-
-if not CONFIG['RELEASE_OR_BETA'] or CONFIG['MOZ_DEBUG']:
-    SOURCES += [
-        'nsSandboxViolationSink.mm',
-    ]
-
-include('/ipc/chromium/chromium-config.mozbuild')
-
-# XXX: We should fix these warnings.
-ALLOW_COMPILER_WARNINGS = True
-
-FINAL_LIBRARY = 'xul'
-LOCAL_INCLUDES += [
-    '/layout/forms',
-    '/layout/generic',
-    '/layout/style',
-    '/layout/xul',
-    '/widget',
-]
-
-RESOURCE_FILES.cursors += [
-    'cursors/arrowN.png',
-    'cursors/arrowN@2x.png',
-    'cursors/arrowS.png',
-    'cursors/arrowS@2x.png',
-    'cursors/cell.png',
-    'cursors/cell@2x.png',
-    'cursors/colResize.png',
-    'cursors/colResize@2x.png',
-    'cursors/help.png',
-    'cursors/help@2x.png',
-    'cursors/move.png',
-    'cursors/move@2x.png',
-    'cursors/rowResize.png',
-    'cursors/rowResize@2x.png',
-    'cursors/sizeNE.png',
-    'cursors/sizeNE@2x.png',
-    'cursors/sizeNESW.png',
-    'cursors/sizeNESW@2x.png',
-    'cursors/sizeNS.png',
-    'cursors/sizeNS@2x.png',
-    'cursors/sizeNW.png',
-    'cursors/sizeNW@2x.png',
-    'cursors/sizeNWSE.png',
-    'cursors/sizeNWSE@2x.png',
-    'cursors/sizeSE.png',
-    'cursors/sizeSE@2x.png',
-    'cursors/sizeSW.png',
-    'cursors/sizeSW@2x.png',
-    'cursors/vtIBeam.png',
-    'cursors/vtIBeam@2x.png',
-    'cursors/zoomIn.png',
-    'cursors/zoomIn@2x.png',
-    'cursors/zoomOut.png',
-    'cursors/zoomOut@2x.png',
-]
-
-# These resources go in $(DIST)/bin/res/MainMenu.nib, but we can't use a magic
-# RESOURCE_FILES.MainMenu.nib attribute, since that would put the files in
-# $(DIST)/bin/res/MainMenu/nib. Instead, we call __setattr__ directly to create
-# an attribute with the correct name.
-RESOURCE_FILES.__setattr__('MainMenu.nib', [
-    'resources/MainMenu.nib/classes.nib',
-    'resources/MainMenu.nib/info.nib',
-    'resources/MainMenu.nib/keyedobjects.nib',
-])
-
-CXXFLAGS += CONFIG['TK_CFLAGS']
diff --git a/widget/cocoa/mozView.h b/widget/cocoa/mozView.h
deleted file mode 100644
index bd054893ba..0000000000
--- a/widget/cocoa/mozView.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef mozView_h_
-#define mozView_h_
-
-#undef DARWIN
-#import <Cocoa/Cocoa.h>
-class nsIWidget;
-
-namespace mozilla {
-namespace widget{
-class TextInputHandler;
-} // namespace widget
-} // namespace mozilla
-
-// A protocol listing all the methods that an object which wants
-// to live in gecko's widget hierarchy must implement. |nsChildView|
-// makes assumptions that any NSView with which it comes in contact will
-// implement this protocol.
-@protocol mozView
-
-  // aHandler is Gecko's default text input handler:  It implements the
-  // NSTextInput protocol to handle key events.  Don't make aHandler a
-  // strong reference -- that causes a memory leak.
-- (void)installTextInputHandler:(mozilla::widget::TextInputHandler*)aHandler;
-- (void)uninstallTextInputHandler;
-
-  // access the nsIWidget associated with this view. DOES NOT ADDREF.
-- (nsIWidget*)widget;
-
-  // return a context menu for this view
-- (NSMenu*)contextMenu;
-
-  // called when our corresponding Gecko view goes away
-- (void)widgetDestroyed;
-
-- (BOOL)isDragInProgress;
-
-  // Checks whether the view is first responder or not
-- (BOOL)isFirstResponder;
-
-  // Call when you dispatch an event which may cause to open context menu.
-- (void)maybeInitContextMenuTracking;
-
-@end
-
-// An informal protocol implemented by the NSWindow of the host application.
-// 
-// It's used to prevent re-entrant calls to -makeKeyAndOrderFront: when gecko
-// focus/activate events propagate out to the embedder's
-// nsIEmbeddingSiteWindow::SetFocus implementation.
-@interface NSObject(mozWindow)
-
-- (BOOL)suppressMakeKeyFront;
-- (void)setSuppressMakeKeyFront:(BOOL)inSuppress;
-
-@end
-
-#endif // mozView_h_
diff --git a/widget/cocoa/nsAppShell.h b/widget/cocoa/nsAppShell.h
deleted file mode 100644
index b7836b6391..0000000000
--- a/widget/cocoa/nsAppShell.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
-/* 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/. */
-
-/*
- * Runs the main native Cocoa run loop, interrupting it as needed to process
- * Gecko events.
- */
-
-#ifndef nsAppShell_h_
-#define nsAppShell_h_
-
-#include "nsBaseAppShell.h"
-#include "nsTArray.h"
-
-// GeckoNSApplication
-//
-// Subclass of NSApplication for filtering out certain events.
-@interface GeckoNSApplication : NSApplication
-{
-}
-@end
-
-@class AppShellDelegate;
-
-class nsAppShell : public nsBaseAppShell
-{
-public:
-  NS_IMETHOD ResumeNative(void);
-
-  nsAppShell();
-
-  nsresult Init();
-
-  NS_IMETHOD Run(void);
-  NS_IMETHOD Exit(void);
-  NS_IMETHOD OnProcessNextEvent(nsIThreadInternal *aThread, bool aMayWait);
-  NS_IMETHOD AfterProcessNextEvent(nsIThreadInternal *aThread,
-                                   bool aEventWasProcessed);
-
-  // public only to be visible to Objective-C code that must call it
-  void WillTerminate();
-
-protected:
-  virtual ~nsAppShell();
-
-  virtual void ScheduleNativeEventCallback();
-  virtual bool ProcessNextNativeEvent(bool aMayWait);
-
-  static void ProcessGeckoEvents(void* aInfo);
-
-protected:
-  CFMutableArrayRef  mAutoreleasePools;
-
-  AppShellDelegate*  mDelegate;
-  CFRunLoopRef       mCFRunLoop;
-  CFRunLoopSourceRef mCFRunLoopSource;
-
-  bool               mRunningEventLoop;
-  bool               mStarted;
-  bool               mTerminated;
-  bool               mSkippedNativeCallback;
-  bool               mRunningCocoaEmbedded;
-
-  int32_t            mNativeEventCallbackDepth;
-  // Can be set from different threads, so must be modified atomically
-  int32_t            mNativeEventScheduledDepth;
-};
-
-#endif // nsAppShell_h_
diff --git a/widget/cocoa/nsAppShell.mm b/widget/cocoa/nsAppShell.mm
deleted file mode 100644
index 33ce8e742a..0000000000
--- a/widget/cocoa/nsAppShell.mm
+++ /dev/null
@@ -1,907 +0,0 @@
-/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
-/* 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/. */
-
-/*
- * Runs the main native Cocoa run loop, interrupting it as needed to process
- * Gecko events.
- */
-
-#import <Cocoa/Cocoa.h>
-
-#include "CustomCocoaEvents.h"
-#include "mozilla/WidgetTraceEvent.h"
-#include "nsAppShell.h"
-#include "nsCOMPtr.h"
-#include "nsIFile.h"
-#include "nsDirectoryServiceDefs.h"
-#include "nsString.h"
-#include "nsIRollupListener.h"
-#include "nsIWidget.h"
-#include "nsThreadUtils.h"
-#include "nsIWindowMediator.h"
-#include "nsServiceManagerUtils.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIWebBrowserChrome.h"
-#include "nsObjCExceptions.h"
-#include "nsCocoaFeatures.h"
-#include "nsCocoaUtils.h"
-#include "nsChildView.h"
-#include "nsToolkit.h"
-#include "TextInputHandler.h"
-#include "mozilla/HangMonitor.h"
-#include "GeckoProfiler.h"
-#include "pratom.h"
-#if !defined(RELEASE_OR_BETA) || defined(DEBUG)
-#include "nsSandboxViolationSink.h"
-#endif
-
-#include <IOKit/pwr_mgt/IOPMLib.h>
-#include "nsIDOMWakeLockListener.h"
-#include "nsIPowerManagerService.h"
-
-using namespace mozilla::widget;
-
-// A wake lock listener that disables screen saver when requested by
-// Gecko. For example when we're playing video in a foreground tab we
-// don't want the screen saver to turn on.
-
-class MacWakeLockListener final : public nsIDOMMozWakeLockListener {
-public:
-  NS_DECL_ISUPPORTS;
-
-private:
-  ~MacWakeLockListener() {}
-
-  IOPMAssertionID mAssertionID = kIOPMNullAssertionID;
-
-  NS_IMETHOD Callback(const nsAString& aTopic, const nsAString& aState) override {
-    if (!aTopic.EqualsASCII("screen")) {
-      return NS_OK;
-    }
-    // Note the wake lock code ensures that we're not sent duplicate
-    // "locked-foreground" notifications when multiple wake locks are held.
-    if (aState.EqualsASCII("locked-foreground")) {
-      // Prevent screen saver.
-      CFStringRef cf_topic =
-        ::CFStringCreateWithCharacters(kCFAllocatorDefault,
-                                       reinterpret_cast<const UniChar*>
-                                         (aTopic.Data()),
-                                       aTopic.Length());
-      IOReturn success =
-        ::IOPMAssertionCreateWithName(kIOPMAssertionTypeNoDisplaySleep,
-                                      kIOPMAssertionLevelOn,
-                                      cf_topic,
-                                      &mAssertionID);
-      CFRelease(cf_topic);
-      if (success != kIOReturnSuccess) {
-        NS_WARNING("failed to disable screensaver");
-      }
-    } else {
-      // Re-enable screen saver.
-      NS_WARNING("Releasing screensaver");
-      if (mAssertionID != kIOPMNullAssertionID) {
-        IOReturn result = ::IOPMAssertionRelease(mAssertionID);
-        if (result != kIOReturnSuccess) {
-          NS_WARNING("failed to release screensaver");
-        }
-      }
-    }
-    return NS_OK;
-  }
-}; // MacWakeLockListener
-
-// defined in nsCocoaWindow.mm
-extern int32_t             gXULModalLevel;
-
-static bool gAppShellMethodsSwizzled = false;
-
-@implementation GeckoNSApplication
-
-- (void)sendEvent:(NSEvent *)anEvent
-{
-  mozilla::HangMonitor::NotifyActivity();
-  if ([anEvent type] == NSApplicationDefined &&
-      [anEvent subtype] == kEventSubtypeTrace) {
-    mozilla::SignalTracerThread();
-    return;
-  }
-  [super sendEvent:anEvent];
-}
-
-#if defined(MAC_OS_X_VERSION_10_12) && \
-    MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_12 && \
-    __LP64__
-// 10.12 changed `mask` to NSEventMask (unsigned long long) for x86_64 builds.
-- (NSEvent*)nextEventMatchingMask:(NSEventMask)mask
-#else
-- (NSEvent*)nextEventMatchingMask:(NSUInteger)mask
-#endif
-                        untilDate:(NSDate*)expiration
-                           inMode:(NSString*)mode
-                          dequeue:(BOOL)flag
-{
-  if (expiration) {
-    mozilla::HangMonitor::Suspend();
-  }
-  NSEvent* nextEvent = [super nextEventMatchingMask:mask
-                        untilDate:expiration inMode:mode dequeue:flag];
-  if (expiration) {
-    mozilla::HangMonitor::NotifyActivity();
-  }
-  return nextEvent;
-}
-
-@end
-
-// AppShellDelegate
-//
-// Cocoa bridge class.  An object of this class is registered to receive
-// notifications.
-//
-@interface AppShellDelegate : NSObject
-{
-  @private
-    nsAppShell* mAppShell;
-}
-
-- (id)initWithAppShell:(nsAppShell*)aAppShell;
-- (void)applicationWillTerminate:(NSNotification*)aNotification;
-- (void)beginMenuTracking:(NSNotification*)aNotification;
-@end
-
-// nsAppShell implementation
-
-NS_IMETHODIMP
-nsAppShell::ResumeNative(void)
-{
-  nsresult retval = nsBaseAppShell::ResumeNative();
-  if (NS_SUCCEEDED(retval) && (mSuspendNativeCount == 0) &&
-      mSkippedNativeCallback)
-  {
-    mSkippedNativeCallback = false;
-    ScheduleNativeEventCallback();
-  }
-  return retval;
-}
-
-nsAppShell::nsAppShell()
-: mAutoreleasePools(nullptr)
-, mDelegate(nullptr)
-, mCFRunLoop(NULL)
-, mCFRunLoopSource(NULL)
-, mRunningEventLoop(false)
-, mStarted(false)
-, mTerminated(false)
-, mSkippedNativeCallback(false)
-, mNativeEventCallbackDepth(0)
-, mNativeEventScheduledDepth(0)
-{
-  // A Cocoa event loop is running here if (and only if) we've been embedded
-  // by a Cocoa app.
-  mRunningCocoaEmbedded = [NSApp isRunning] ? true : false;
-}
-
-nsAppShell::~nsAppShell()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (mCFRunLoop) {
-    if (mCFRunLoopSource) {
-      ::CFRunLoopRemoveSource(mCFRunLoop, mCFRunLoopSource,
-                              kCFRunLoopCommonModes);
-      ::CFRelease(mCFRunLoopSource);
-    }
-    ::CFRelease(mCFRunLoop);
-  }
-
-  if (mAutoreleasePools) {
-    NS_ASSERTION(::CFArrayGetCount(mAutoreleasePools) == 0,
-                 "nsAppShell destroyed without popping all autorelease pools");
-    ::CFRelease(mAutoreleasePools);
-  }
-
-  [mDelegate release];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK
-}
-
-NS_IMPL_ISUPPORTS(MacWakeLockListener, nsIDOMMozWakeLockListener)
-mozilla::StaticRefPtr<MacWakeLockListener> sWakeLockListener;
-
-static void
-AddScreenWakeLockListener()
-{
-  nsCOMPtr<nsIPowerManagerService> sPowerManagerService = do_GetService(
-                                                          POWERMANAGERSERVICE_CONTRACTID);
-  if (sPowerManagerService) {
-    sWakeLockListener = new MacWakeLockListener();
-    sPowerManagerService->AddWakeLockListener(sWakeLockListener);
-  } else {
-    NS_WARNING("Failed to retrieve PowerManagerService, wakelocks will be broken!");
-  }
-}
-
-static void
-RemoveScreenWakeLockListener()
-{
-  nsCOMPtr<nsIPowerManagerService> sPowerManagerService = do_GetService(
-                                                          POWERMANAGERSERVICE_CONTRACTID);
-  if (sPowerManagerService) {
-    sPowerManagerService->RemoveWakeLockListener(sWakeLockListener);
-    sPowerManagerService = nullptr;
-    sWakeLockListener = nullptr;
-  }
-}
-
-// An undocumented CoreGraphics framework method, present in the same form
-// since at least OS X 10.5.
-extern "C" CGError CGSSetDebugOptions(int options);
-
-// Init
-//
-// Loads the nib (see bug 316076c21) and sets up the CFRunLoopSource used to
-// interrupt the main native run loop.
-//
-// public
-nsresult
-nsAppShell::Init()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  // No event loop is running yet (unless an embedding app that uses
-  // NSApplicationMain() is running).
-  NSAutoreleasePool* localPool = [[NSAutoreleasePool alloc] init];
-
-  // mAutoreleasePools is used as a stack of NSAutoreleasePool objects created
-  // by |this|.  CFArray is used instead of NSArray because NSArray wants to
-  // retain each object you add to it, and you can't retain an
-  // NSAutoreleasePool.
-  mAutoreleasePools = ::CFArrayCreateMutable(nullptr, 0, nullptr);
-  NS_ENSURE_STATE(mAutoreleasePools);
-
-  // Get the path of the nib file, which lives in the GRE location
-  nsCOMPtr<nsIFile> nibFile;
-  nsresult rv = NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(nibFile));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nibFile->AppendNative(NS_LITERAL_CSTRING("res"));
-  nibFile->AppendNative(NS_LITERAL_CSTRING("MainMenu.nib"));
-
-  nsAutoCString nibPath;
-  rv = nibFile->GetNativePath(nibPath);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // This call initializes NSApplication unless:
-  // 1) we're using xre -- NSApp's already been initialized by
-  //    MacApplicationDelegate.mm's EnsureUseCocoaDockAPI().
-  // 2) an embedding app that uses NSApplicationMain() is running -- NSApp's
-  //    already been initialized and its main run loop is already running.
-  [NSBundle loadNibFile:
-                     [NSString stringWithUTF8String:(const char*)nibPath.get()]
-      externalNameTable:
-           [NSDictionary dictionaryWithObject:[GeckoNSApplication sharedApplication]
-                                       forKey:@"NSOwner"]
-               withZone:NSDefaultMallocZone()];
-
-  mDelegate = [[AppShellDelegate alloc] initWithAppShell:this];
-  NS_ENSURE_STATE(mDelegate);
-
-  // Add a CFRunLoopSource to the main native run loop.  The source is
-  // responsible for interrupting the run loop when Gecko events are ready.
-
-  mCFRunLoop = [[NSRunLoop currentRunLoop] getCFRunLoop];
-  NS_ENSURE_STATE(mCFRunLoop);
-  ::CFRetain(mCFRunLoop);
-
-  CFRunLoopSourceContext context;
-  bzero(&context, sizeof(context));
-  // context.version = 0;
-  context.info = this;
-  context.perform = ProcessGeckoEvents;
-  
-  mCFRunLoopSource = ::CFRunLoopSourceCreate(kCFAllocatorDefault, 0, &context);
-  NS_ENSURE_STATE(mCFRunLoopSource);
-
-  ::CFRunLoopAddSource(mCFRunLoop, mCFRunLoopSource, kCFRunLoopCommonModes);
-
-  rv = nsBaseAppShell::Init();
-
-  if (!gAppShellMethodsSwizzled) {
-    // We should only replace the original terminate: method if we're not
-    // running in a Cocoa embedder. See bug 604901.
-    if (!mRunningCocoaEmbedded) {
-      nsToolkit::SwizzleMethods([NSApplication class], @selector(terminate:),
-                                @selector(nsAppShell_NSApplication_terminate:));
-    }
-    gAppShellMethodsSwizzled = true;
-  }
-
-  if (nsCocoaFeatures::OnYosemiteOrLater()) {
-    // Explicitly turn off CGEvent logging.  This works around bug 1092855.
-    // If there are already CGEvents in the log, turning off logging also
-    // causes those events to be written to disk.  But at this point no
-    // CGEvents have yet been processed.  CGEvents are events (usually
-    // input events) pulled from the WindowServer.  An option of 0x80000008
-    // turns on CGEvent logging.
-    CGSSetDebugOptions(0x80000007);
-  }
-
-#if !defined(RELEASE_OR_BETA) || defined(DEBUG)
-  if (Preferences::GetBool("security.sandbox.mac.track.violations", false)) {
-    nsSandboxViolationSink::Start();
-  }
-#endif
-
-  [localPool release];
-
-  return rv;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-// ProcessGeckoEvents
-//
-// The "perform" target of mCFRunLoop, called when mCFRunLoopSource is
-// signalled from ScheduleNativeEventCallback.
-//
-// Arrange for Gecko events to be processed on demand (in response to a call
-// to ScheduleNativeEventCallback(), if processing of Gecko events via "native
-// methods" hasn't been suspended).  This happens in NativeEventCallback().
-//
-// protected static
-void
-nsAppShell::ProcessGeckoEvents(void* aInfo)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-  PROFILER_LABEL("Events", "ProcessGeckoEvents",
-    js::ProfileEntry::Category::EVENTS);
-
-  nsAppShell* self = static_cast<nsAppShell*> (aInfo);
-
-  if (self->mRunningEventLoop) {
-    self->mRunningEventLoop = false;
-
-    // The run loop may be sleeping -- [NSRunLoop runMode:...]
-    // won't return until it's given a reason to wake up.  Awaken it by
-    // posting a bogus event.  There's no need to make the event
-    // presentable.
-    //
-    // But _don't_ set windowNumber to '-1' -- that can lead to nasty
-    // weirdness like bmo bug 397039 (a crash in [NSApp sendEvent:] on one of
-    // these fake events, because the -1 has gotten changed into the number
-    // of an actual NSWindow object, and that NSWindow object has just been
-    // destroyed).  Setting windowNumber to '0' seems to work fine -- this
-    // seems to prevent the OS from ever trying to associate our bogus event
-    // with a particular NSWindow object.
-    [NSApp postEvent:[NSEvent otherEventWithType:NSApplicationDefined
-                                        location:NSMakePoint(0,0)
-                                   modifierFlags:0
-                                       timestamp:0
-                                    windowNumber:0
-                                         context:NULL
-                                         subtype:kEventSubtypeNone
-                                           data1:0
-                                           data2:0]
-             atStart:NO];
-  }
-
-  if (self->mSuspendNativeCount <= 0) {
-    ++self->mNativeEventCallbackDepth;
-    self->NativeEventCallback();
-    --self->mNativeEventCallbackDepth;
-  } else {
-    self->mSkippedNativeCallback = true;
-  }
-
-  // Still needed to avoid crashes on quit in most Mochitests.
-  [NSApp postEvent:[NSEvent otherEventWithType:NSApplicationDefined
-                                      location:NSMakePoint(0,0)
-                                 modifierFlags:0
-                                     timestamp:0
-                                  windowNumber:0
-                                       context:NULL
-                                       subtype:kEventSubtypeNone
-                                         data1:0
-                                         data2:0]
-           atStart:NO];
-
-  // Normally every call to ScheduleNativeEventCallback() results in
-  // exactly one call to ProcessGeckoEvents().  So each Release() here
-  // normally balances exactly one AddRef() in ScheduleNativeEventCallback().
-  // But if Exit() is called just after ScheduleNativeEventCallback(), the
-  // corresponding call to ProcessGeckoEvents() will never happen.  We check
-  // for this possibility in two different places -- here and in Exit()
-  // itself.  If we find here that Exit() has been called (that mTerminated
-  // is true), it's because we've been called recursively, that Exit() was
-  // called from self->NativeEventCallback() above, and that we're unwinding
-  // the recursion.  In this case we'll never be called again, and we balance
-  // here any extra calls to ScheduleNativeEventCallback().
-  //
-  // When ProcessGeckoEvents() is called recursively, it's because of a
-  // call to ScheduleNativeEventCallback() from NativeEventCallback().  We
-  // balance the "extra" AddRefs here (rather than always in Exit()) in order
-  // to ensure that 'self' stays alive until the end of this method.  We also
-  // make sure not to finish the balancing until all the recursion has been
-  // unwound.
-  if (self->mTerminated) {
-    int32_t releaseCount = 0;
-    if (self->mNativeEventScheduledDepth > self->mNativeEventCallbackDepth) {
-      releaseCount = PR_ATOMIC_SET(&self->mNativeEventScheduledDepth,
-                                   self->mNativeEventCallbackDepth);
-    }
-    while (releaseCount-- > self->mNativeEventCallbackDepth)
-      self->Release();
-  } else {
-    // As best we can tell, every call to ProcessGeckoEvents() is triggered
-    // by a call to ScheduleNativeEventCallback().  But we've seen a few
-    // (non-reproducible) cases of double-frees that *might* have been caused
-    // by spontaneous calls (from the OS) to ProcessGeckoEvents().  So we
-    // deal with that possibility here.
-    if (PR_ATOMIC_DECREMENT(&self->mNativeEventScheduledDepth) < 0) {
-      PR_ATOMIC_SET(&self->mNativeEventScheduledDepth, 0);
-      NS_WARNING("Spontaneous call to ProcessGeckoEvents()!");
-    } else {
-      self->Release();
-    }
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-// WillTerminate
-//
-// Called by the AppShellDelegate when an NSApplicationWillTerminate
-// notification is posted.  After this method is called, native events should
-// no longer be processed.  The NSApplicationWillTerminate notification is
-// only posted when [NSApp terminate:] is called, which doesn't happen on a
-// "normal" application quit.
-//
-// public
-void
-nsAppShell::WillTerminate()
-{
-  if (mTerminated)
-    return;
-
-  // Make sure that the nsAppExitEvent posted by nsAppStartup::Quit() (called
-  // from [MacApplicationDelegate applicationShouldTerminate:]) gets run.
-  NS_ProcessPendingEvents(NS_GetCurrentThread());
-
-  mTerminated = true;
-}
-
-// ScheduleNativeEventCallback
-//
-// Called (possibly on a non-main thread) when Gecko has an event that
-// needs to be processed.  The Gecko event needs to be processed on the
-// main thread, so the native run loop must be interrupted.
-//
-// In nsBaseAppShell.cpp, the mNativeEventPending variable is used to
-// ensure that ScheduleNativeEventCallback() is called no more than once
-// per call to NativeEventCallback().  ProcessGeckoEvents() can skip its
-// call to NativeEventCallback() if processing of Gecko events by native
-// means is suspended (using nsIAppShell::SuspendNative()), which will
-// suspend calls from nsBaseAppShell::OnDispatchedEvent() to
-// ScheduleNativeEventCallback().  But when Gecko event processing by
-// native means is resumed (in ResumeNative()), an extra call is made to
-// ScheduleNativeEventCallback() (from ResumeNative()).  This triggers
-// another call to ProcessGeckoEvents(), which calls NativeEventCallback(),
-// and nsBaseAppShell::OnDispatchedEvent() resumes calling
-// ScheduleNativeEventCallback().
-//
-// protected virtual
-void
-nsAppShell::ScheduleNativeEventCallback()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (mTerminated)
-    return;
-
-  // Each AddRef() here is normally balanced by exactly one Release() in
-  // ProcessGeckoEvents().  But there are exceptions, for which see
-  // ProcessGeckoEvents() and Exit().
-  NS_ADDREF_THIS();
-  PR_ATOMIC_INCREMENT(&mNativeEventScheduledDepth);
-
-  // This will invoke ProcessGeckoEvents on the main thread.
-  ::CFRunLoopSourceSignal(mCFRunLoopSource);
-  ::CFRunLoopWakeUp(mCFRunLoop);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-// Undocumented Cocoa Event Manager function, present in the same form since
-// at least OS X 10.6.
-extern "C" EventAttributes GetEventAttributes(EventRef inEvent);
-
-// ProcessNextNativeEvent
-//
-// If aMayWait is false, process a single native event.  If it is true, run
-// the native run loop until stopped by ProcessGeckoEvents.
-//
-// Returns true if more events are waiting in the native event queue.
-//
-// protected virtual
-bool
-nsAppShell::ProcessNextNativeEvent(bool aMayWait)
-{
-  bool moreEvents = false;
-
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  bool eventProcessed = false;
-  NSString* currentMode = nil;
-
-  if (mTerminated)
-    return false;
-
-  bool wasRunningEventLoop = mRunningEventLoop;
-  mRunningEventLoop = aMayWait;
-  NSDate* waitUntil = nil;
-  if (aMayWait)
-    waitUntil = [NSDate distantFuture];
-
-  NSRunLoop* currentRunLoop = [NSRunLoop currentRunLoop];
-
-  EventQueueRef currentEventQueue = GetCurrentEventQueue();
-  EventTargetRef eventDispatcherTarget = GetEventDispatcherTarget();
-
-  if (aMayWait) {
-    mozilla::HangMonitor::Suspend();
-  }
-
-  // Only call -[NSApp sendEvent:] (and indirectly send user-input events to
-  // Gecko) if aMayWait is true.  Tbis ensures most calls to -[NSApp
-  // sendEvent:] happen under nsAppShell::Run(), at the lowest level of
-  // recursion -- thereby making it less likely Gecko will process user-input
-  // events in the wrong order or skip some of them.  It also avoids eating
-  // too much CPU in nsBaseAppShell::OnProcessNextEvent() (which calls
-  // us) -- thereby avoiding the starvation of nsIRunnable events in
-  // nsThread::ProcessNextEvent().  For more information see bug 996848.
-  do {
-    // No autorelease pool is provided here, because OnProcessNextEvent
-    // and AfterProcessNextEvent are responsible for maintaining it.
-    NS_ASSERTION(mAutoreleasePools && ::CFArrayGetCount(mAutoreleasePools),
-                 "No autorelease pool for native event");
-
-    if (aMayWait) {
-      currentMode = [currentRunLoop currentMode];
-      if (!currentMode)
-        currentMode = NSDefaultRunLoopMode;
-      NSEvent *nextEvent = [NSApp nextEventMatchingMask:NSAnyEventMask
-                                              untilDate:waitUntil
-                                                 inMode:currentMode
-                                                dequeue:YES];
-      if (nextEvent) {
-        mozilla::HangMonitor::NotifyActivity();
-        [NSApp sendEvent:nextEvent];
-        eventProcessed = true;
-      }
-    } else {
-      // AcquireFirstMatchingEventInQueue() doesn't spin the (native) event
-      // loop, though it does queue up any newly available events from the
-      // window server.
-      EventRef currentEvent = AcquireFirstMatchingEventInQueue(currentEventQueue, 0, NULL,
-                                                               kEventQueueOptionsNone);
-      if (!currentEvent) {
-        continue;
-      }
-      EventAttributes attrs = GetEventAttributes(currentEvent);
-      UInt32 eventKind = GetEventKind(currentEvent);
-      UInt32 eventClass = GetEventClass(currentEvent);
-      bool osCocoaEvent =
-        ((eventClass == 'appl') || (eventClass == kEventClassAppleEvent) ||
-         ((eventClass == 'cgs ') && (eventKind != NSApplicationDefined)));
-      // If attrs is kEventAttributeUserEvent or kEventAttributeMonitored
-      // (i.e. a user input event), we shouldn't process it here while
-      // aMayWait is false.  Likewise if currentEvent will eventually be
-      // turned into an OS-defined Cocoa event, or otherwise needs AppKit
-      // processing.  Doing otherwise risks doing too much work here, and
-      // preventing the event from being properly processed by the AppKit
-      // framework.
-      if ((attrs != kEventAttributeNone) || osCocoaEvent) {
-        // Since we can't process the next event here (while aMayWait is false),
-        // we want moreEvents to be false on return.
-        eventProcessed = false;
-        // This call to ReleaseEvent() matches a call to RetainEvent() in
-        // AcquireFirstMatchingEventInQueue() above.
-        ReleaseEvent(currentEvent);
-        break;
-      }
-      // This call to RetainEvent() matches a call to ReleaseEvent() in
-      // RemoveEventFromQueue() below.
-      RetainEvent(currentEvent);
-      RemoveEventFromQueue(currentEventQueue, currentEvent);
-      SendEventToEventTarget(currentEvent, eventDispatcherTarget);
-      // This call to ReleaseEvent() matches a call to RetainEvent() in
-      // AcquireFirstMatchingEventInQueue() above.
-      ReleaseEvent(currentEvent);
-      eventProcessed = true;
-    }
-  } while (mRunningEventLoop);
-
-  if (eventProcessed) {
-    moreEvents =
-      (AcquireFirstMatchingEventInQueue(currentEventQueue, 0, NULL,
-                                        kEventQueueOptionsNone) != NULL);
-  }
-
-  mRunningEventLoop = wasRunningEventLoop;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-
-  if (!moreEvents) {
-    nsChildView::UpdateCurrentInputEventCount();
-  }
-
-  return moreEvents;
-}
-
-// Run
-//
-// Overrides the base class's Run() method to call [NSApp run] (which spins
-// the native run loop until the application quits).  Since (unlike the base
-// class's Run() method) we don't process any Gecko events here, they need
-// to be processed elsewhere (in NativeEventCallback(), called from
-// ProcessGeckoEvents()).
-//
-// Camino called [NSApp run] on its own (via NSApplicationMain()), and so
-// didn't call nsAppShell::Run().
-//
-// public
-NS_IMETHODIMP
-nsAppShell::Run(void)
-{
-  NS_ASSERTION(!mStarted, "nsAppShell::Run() called multiple times");
-  if (mStarted || mTerminated)
-    return NS_OK;
-
-  mStarted = true;
-
-  AddScreenWakeLockListener();
-
-  NS_OBJC_TRY_ABORT([NSApp run]);
-
-  RemoveScreenWakeLockListener();
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsAppShell::Exit(void)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  // This method is currently called more than once -- from (according to
-  // mento) an nsAppExitEvent dispatched by nsAppStartup::Quit() and from an
-  // XPCOM shutdown notification that nsBaseAppShell has registered to
-  // receive.  So we need to ensure that multiple calls won't break anything.
-  // But we should also complain about it (since it isn't quite kosher).
-  if (mTerminated) {
-    NS_WARNING("nsAppShell::Exit() called redundantly");
-    return NS_OK;
-  }
-
-  mTerminated = true;
-
-#if !defined(RELEASE_OR_BETA) || defined(DEBUG)
-  nsSandboxViolationSink::Stop();
-#endif
-
-  // Quoting from Apple's doc on the [NSApplication stop:] method (from their
-  // doc on the NSApplication class):  "If this method is invoked during a
-  // modal event loop, it will break that loop but not the main event loop."
-  // nsAppShell::Exit() shouldn't be called from a modal event loop.  So if
-  // it is we complain about it (to users of debug builds) and call [NSApp
-  // stop:] one extra time.  (I'm not sure if modal event loops can be nested
-  // -- Apple's docs don't say one way or the other.  But the return value
-  // of [NSApp _isRunningModal] doesn't change immediately after a call to
-  // [NSApp stop:], so we have to assume that one extra call to [NSApp stop:]
-  // will do the job.)
-  BOOL cocoaModal = [NSApp _isRunningModal];
-  NS_ASSERTION(!cocoaModal,
-               "Don't call nsAppShell::Exit() from a modal event loop!");
-  if (cocoaModal)
-    [NSApp stop:nullptr];
-  [NSApp stop:nullptr];
-
-  // A call to Exit() just after a call to ScheduleNativeEventCallback()
-  // prevents the (normally) matching call to ProcessGeckoEvents() from
-  // happening.  If we've been called from ProcessGeckoEvents() (as usually
-  // happens), we take care of it there.  But if we have an unbalanced call
-  // to ScheduleNativeEventCallback() and ProcessGeckoEvents() isn't on the
-  // stack, we need to take care of the problem here.
-  if (!mNativeEventCallbackDepth && mNativeEventScheduledDepth) {
-    int32_t releaseCount = PR_ATOMIC_SET(&mNativeEventScheduledDepth, 0);
-    while (releaseCount-- > 0)
-      NS_RELEASE_THIS();
-  }
-
-  return nsBaseAppShell::Exit();
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-// OnProcessNextEvent
-//
-// This nsIThreadObserver method is called prior to processing an event.
-// Set up an autorelease pool that will service any autoreleased Cocoa
-// objects during this event.  This includes native events processed by
-// ProcessNextNativeEvent.  The autorelease pool will be popped by
-// AfterProcessNextEvent, it is important for these two methods to be
-// tightly coupled.
-//
-// public
-NS_IMETHODIMP
-nsAppShell::OnProcessNextEvent(nsIThreadInternal *aThread, bool aMayWait)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  NS_ASSERTION(mAutoreleasePools,
-               "No stack on which to store autorelease pool");
-
-  NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
-  ::CFArrayAppendValue(mAutoreleasePools, pool);
-
-  return nsBaseAppShell::OnProcessNextEvent(aThread, aMayWait);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-// AfterProcessNextEvent
-//
-// This nsIThreadObserver method is called after event processing is complete.
-// The Cocoa implementation cleans up the autorelease pool create by the
-// previous OnProcessNextEvent call.
-//
-// public
-NS_IMETHODIMP
-nsAppShell::AfterProcessNextEvent(nsIThreadInternal *aThread,
-                                  bool aEventWasProcessed)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  CFIndex count = ::CFArrayGetCount(mAutoreleasePools);
-
-  NS_ASSERTION(mAutoreleasePools && count,
-               "Processed an event, but there's no autorelease pool?");
-
-  const NSAutoreleasePool* pool = static_cast<const NSAutoreleasePool*>
-    (::CFArrayGetValueAtIndex(mAutoreleasePools, count - 1));
-  ::CFArrayRemoveValueAtIndex(mAutoreleasePools, count - 1);
-  [pool release];
-
-  return nsBaseAppShell::AfterProcessNextEvent(aThread, aEventWasProcessed);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-
-// AppShellDelegate implementation
-
-
-@implementation AppShellDelegate
-// initWithAppShell:
-//
-// Constructs the AppShellDelegate object
-- (id)initWithAppShell:(nsAppShell*)aAppShell
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  if ((self = [self init])) {
-    mAppShell = aAppShell;
-
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(applicationWillTerminate:)
-                                                 name:NSApplicationWillTerminateNotification
-                                               object:NSApp];
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(applicationDidBecomeActive:)
-                                                 name:NSApplicationDidBecomeActiveNotification
-                                               object:NSApp];
-    [[NSDistributedNotificationCenter defaultCenter] addObserver:self
-                                                        selector:@selector(beginMenuTracking:)
-                                                            name:@"com.apple.HIToolbox.beginMenuTrackingNotification"
-                                                          object:nil];
-  }
-
-  return self;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-- (void)dealloc
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
-  [[NSDistributedNotificationCenter defaultCenter] removeObserver:self];
-  [super dealloc];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-// applicationWillTerminate:
-//
-// Notify the nsAppShell that native event processing should be discontinued.
-- (void)applicationWillTerminate:(NSNotification*)aNotification
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  mAppShell->WillTerminate();
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-// applicationDidBecomeActive
-//
-// Make sure TextInputHandler::sLastModifierState is updated when we become
-// active (since we won't have received [ChildView flagsChanged:] messages
-// while inactive).
-- (void)applicationDidBecomeActive:(NSNotification*)aNotification
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  // [NSEvent modifierFlags] is valid on every kind of event, so we don't need
-  // to worry about getting an NSInternalInconsistencyException here.
-  NSEvent* currentEvent = [NSApp currentEvent];
-  if (currentEvent) {
-    TextInputHandler::sLastModifierState =
-      [currentEvent modifierFlags] & NSDeviceIndependentModifierFlagsMask;
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-// beginMenuTracking
-//
-// Roll up our context menu (if any) when some other app (or the OS) opens
-// any sort of menu.  But make sure we don't do this for notifications we
-// send ourselves (whose 'sender' will be @"org.mozilla.gecko.PopupWindow").
-- (void)beginMenuTracking:(NSNotification*)aNotification
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  NSString *sender = [aNotification object];
-  if (!sender || ![sender isEqualToString:@"org.mozilla.gecko.PopupWindow"]) {
-    nsIRollupListener* rollupListener = nsBaseWidget::GetActiveRollupListener();
-    nsCOMPtr<nsIWidget> rollupWidget = rollupListener->GetRollupWidget();
-    if (rollupWidget)
-      rollupListener->Rollup(0, true, nullptr, nullptr);
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-@end
-
-// We hook terminate: in order to make OS-initiated termination work nicely
-// with Gecko's shutdown sequence.  (Two ways to trigger OS-initiated
-// termination:  1) Quit from the Dock menu; 2) Log out from (or shut down)
-// your computer while the browser is active.)
-@interface NSApplication (MethodSwizzling)
-- (void)nsAppShell_NSApplication_terminate:(id)sender;
-@end
-
-@implementation NSApplication (MethodSwizzling)
-
-// Called by the OS after [MacApplicationDelegate applicationShouldTerminate:]
-// has returned NSTerminateNow.  This method "subclasses" and replaces the
-// OS's original implementation.  The only thing the orginal method does which
-// we need is that it posts NSApplicationWillTerminateNotification.  Everything
-// else is unneeded (because it's handled elsewhere), or actively interferes
-// with Gecko's shutdown sequence.  For example the original terminate: method
-// causes the app to exit() inside [NSApp run] (called from nsAppShell::Run()
-// above), which means that nothing runs after the call to nsAppStartup::Run()
-// in XRE_Main(), which in particular means that ScopedXPCOMStartup's destructor
-// and NS_ShutdownXPCOM() never get called.
-- (void)nsAppShell_NSApplication_terminate:(id)sender
-{
-  [[NSNotificationCenter defaultCenter] postNotificationName:NSApplicationWillTerminateNotification
-                                                      object:NSApp];
-}
-
-@end
diff --git a/widget/cocoa/nsBidiKeyboard.h b/widget/cocoa/nsBidiKeyboard.h
deleted file mode 100644
index e7e7ac8722..0000000000
--- a/widget/cocoa/nsBidiKeyboard.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsBidiKeyboard_h_
-#define nsBidiKeyboard_h_
-
-#include "nsIBidiKeyboard.h"
-
-class nsBidiKeyboard : public nsIBidiKeyboard
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIBIDIKEYBOARD
-
-  nsBidiKeyboard();
-
-protected:
-  virtual ~nsBidiKeyboard();
-};
-
-#endif // nsBidiKeyboard_h_
diff --git a/widget/cocoa/nsBidiKeyboard.mm b/widget/cocoa/nsBidiKeyboard.mm
deleted file mode 100644
index e0fc86aeb7..0000000000
--- a/widget/cocoa/nsBidiKeyboard.mm
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "nsBidiKeyboard.h"
-#include "nsCocoaUtils.h"
-#include "TextInputHandler.h"
-
-// This must be the last include:
-#include "nsObjCExceptions.h"
-
-using namespace mozilla::widget;
-
-NS_IMPL_ISUPPORTS(nsBidiKeyboard, nsIBidiKeyboard)
-
-nsBidiKeyboard::nsBidiKeyboard() : nsIBidiKeyboard()
-{
-  Reset();
-}
-
-nsBidiKeyboard::~nsBidiKeyboard()
-{
-}
-
-NS_IMETHODIMP nsBidiKeyboard::Reset()
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsBidiKeyboard::IsLangRTL(bool *aIsRTL)
-{
-  *aIsRTL = TISInputSourceWrapper::CurrentInputSource().IsForRTLLanguage();
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsBidiKeyboard::GetHaveBidiKeyboards(bool* aResult)
-{
-  // not implemented yet
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
diff --git a/widget/cocoa/nsChangeObserver.h b/widget/cocoa/nsChangeObserver.h
deleted file mode 100644
index 1b9a001735..0000000000
--- a/widget/cocoa/nsChangeObserver.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsChangeObserver_h_
-#define nsChangeObserver_h_
-
-class nsIContent;
-class nsIDocument;
-class nsIAtom;
-
-#define NS_DECL_CHANGEOBSERVER \
-void ObserveAttributeChanged(nsIDocument *aDocument, nsIContent *aContent, nsIAtom *aAttribute) override; \
-void ObserveContentRemoved(nsIDocument *aDocument, nsIContent *aChild, int32_t aIndexInContainer) override; \
-void ObserveContentInserted(nsIDocument *aDocument, nsIContent* aContainer, nsIContent *aChild) override;
-
-// Something that wants to be alerted to changes in attributes or changes in
-// its corresponding content object.
-//
-// This interface is used by our menu code so we only have to have one
-// nsIDocumentObserver.
-//
-// Any class that implements this interface must take care to unregister itself
-// on deletion.
-class nsChangeObserver
-{
-public:
-  // XXX use dom::Element
-  virtual void ObserveAttributeChanged(nsIDocument* aDocument,
-                                       nsIContent* aContent,
-                                       nsIAtom* aAttribute)=0;
-
-  virtual void ObserveContentRemoved(nsIDocument* aDocument,
-                                     nsIContent* aChild, 
-                                     int32_t aIndexInContainer)=0;
-
-  virtual void ObserveContentInserted(nsIDocument* aDocument,
-                                      nsIContent* aContainer,
-                                      nsIContent* aChild)=0;
-};
-
-#endif // nsChangeObserver_h_
diff --git a/widget/cocoa/nsChildView.h b/widget/cocoa/nsChildView.h
deleted file mode 100644
index 2817c8d415..0000000000
--- a/widget/cocoa/nsChildView.h
+++ /dev/null
@@ -1,666 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsChildView_h_
-#define nsChildView_h_
-
-// formal protocols
-#include "mozView.h"
-#ifdef ACCESSIBILITY
-#include "mozilla/a11y/Accessible.h"
-#include "mozAccessibleProtocol.h"
-#endif
-
-#include "nsISupports.h"
-#include "nsBaseWidget.h"
-#include "nsWeakPtr.h"
-#include "TextInputHandler.h"
-#include "nsCocoaUtils.h"
-#include "gfxQuartzSurface.h"
-#include "GLContextTypes.h"
-#include "mozilla/Mutex.h"
-#include "nsRegion.h"
-#include "mozilla/MouseEvents.h"
-#include "mozilla/UniquePtr.h"
-
-#include "nsString.h"
-#include "nsIDragService.h"
-#include "ViewRegion.h"
-
-#import <Carbon/Carbon.h>
-#import <Cocoa/Cocoa.h>
-#import <AppKit/NSOpenGL.h>
-
-class nsChildView;
-class nsCocoaWindow;
-
-namespace {
-class GLPresenter;
-} // namespace
-
-namespace mozilla {
-class InputData;
-class PanGestureInput;
-class SwipeTracker;
-struct SwipeEventQueue;
-class VibrancyManager;
-namespace layers {
-class GLManager;
-class IAPZCTreeManager;
-} // namespace layers
-namespace widget {
-class RectTextureImage;
-class WidgetRenderingContext;
-} // namespace widget
-} // namespace mozilla
-
-@class PixelHostingView;
-
-@interface NSEvent (Undocumented)
-
-// Return Cocoa event's corresponding Carbon event.  Not initialized (on
-// synthetic events) until the OS actually "sends" the event.  This method
-// has been present in the same form since at least OS X 10.2.8.
-- (EventRef)_eventRef;
-
-@end
-
-@interface NSView (Undocumented)
-
-// Draws the title string of a window.
-// Present on NSThemeFrame since at least 10.6.
-// _drawTitleBar is somewhat complex, and has changed over the years
-// since OS X 10.6.  But in that time it's never done anything that
-// would break when called outside of -[NSView drawRect:] (which we
-// sometimes do), or whose output can't be redirected to a
-// CGContextRef object (which we also sometimes do).  This is likely
-// to remain true for the indefinite future.  However we should
-// check _drawTitleBar in each new major version of OS X.  For more
-// information see bug 877767.
-- (void)_drawTitleBar:(NSRect)aRect;
-
-// Returns an NSRect that is the bounding box for all an NSView's dirty
-// rectangles (ones that need to be redrawn).  The full list of dirty
-// rectangles can be obtained by calling -[NSView _dirtyRegion] and then
-// calling -[NSRegion getRects:count:] on what it returns.  Both these
-// methods have been present in the same form since at least OS X 10.5.
-// Unlike -[NSView getRectsBeingDrawn:count:], these methods can be called
-// outside a call to -[NSView drawRect:].
-- (NSRect)_dirtyRect;
-
-// Undocumented method of one or more of NSFrameView's subclasses.  Called
-// when one or more of the titlebar buttons needs to be repositioned, to
-// disappear, or to reappear (say if the window's style changes).  If
-// 'redisplay' is true, the entire titlebar (the window's top 22 pixels) is
-// marked as needing redisplay.  This method has been present in the same
-// format since at least OS X 10.5.
-- (void)_tileTitlebarAndRedisplay:(BOOL)redisplay;
-
-// The following undocumented methods are used to work around bug 1069658,
-// which is an Apple bug or design flaw that effects Yosemite.  None of them
-// were present prior to Yosemite (OS X 10.10).
-- (NSView *)titlebarView; // Method of NSThemeFrame
-- (NSView *)titlebarContainerView; // Method of NSThemeFrame
-- (BOOL)transparent; // Method of NSTitlebarView and NSTitlebarContainerView
-- (void)setTransparent:(BOOL)transparent; // Method of NSTitlebarView and
-                                          // NSTitlebarContainerView
-
-@end
-
-@interface ChildView : NSView<
-#ifdef ACCESSIBILITY
-                              mozAccessible,
-#endif
-                              mozView, NSTextInputClient>
-{
-@private
-  // the nsChildView that created the view. It retains this NSView, so
-  // the link back to it must be weak.
-  nsChildView* mGeckoChild;
-
-  // Text input handler for mGeckoChild and us.  Note that this is a weak
-  // reference.  Ideally, this should be a strong reference but a ChildView
-  // object can live longer than the mGeckoChild that owns it.  And if
-  // mTextInputHandler were a strong reference, this would make it difficult
-  // for Gecko's leak detector to detect leaked TextInputHandler objects.
-  // This is initialized by [mozView installTextInputHandler:aHandler] and
-  // cleared by [mozView uninstallTextInputHandler].
-  mozilla::widget::TextInputHandler* mTextInputHandler;  // [WEAK]
-
-  // when mouseDown: is called, we store its event here (strong)
-  NSEvent* mLastMouseDownEvent;
-
-  // Needed for IME support in e10s mode.  Strong.
-  NSEvent* mLastKeyDownEvent;
-
-  // Whether the last mouse down event was blocked from Gecko.
-  BOOL mBlockedLastMouseDown;
-
-  // when acceptsFirstMouse: is called, we store the event here (strong)
-  NSEvent* mClickThroughMouseDownEvent;
-
-  // WheelStart/Stop events should always come in pairs. This BOOL records the
-  // last received event so that, when we receive one of the events, we make sure
-  // to send its pair event first, in case we didn't yet for any reason.
-  BOOL mExpectingWheelStop;
-
-  // Set to YES when our GL surface has been updated and we need to call
-  // updateGLContext before we composite.
-  BOOL mNeedsGLUpdate;
-
-  // Holds our drag service across multiple drag calls. The reference to the
-  // service is obtained when the mouse enters the view and is released when
-  // the mouse exits or there is a drop. This prevents us from having to
-  // re-establish the connection to the service manager many times per second
-  // when handling |draggingUpdated:| messages.
-  nsIDragService* mDragService;
-
-  NSOpenGLContext *mGLContext;
-
-  // Simple gestures support
-  //
-  // mGestureState is used to detect when Cocoa has called both
-  // magnifyWithEvent and rotateWithEvent within the same
-  // beginGestureWithEvent and endGestureWithEvent sequence. We
-  // discard the spurious gesture event so as not to confuse Gecko.
-  //
-  // mCumulativeMagnification keeps track of the total amount of
-  // magnification peformed during a magnify gesture so that we can
-  // send that value with the final MozMagnifyGesture event.
-  //
-  // mCumulativeRotation keeps track of the total amount of rotation
-  // performed during a rotate gesture so we can send that value with
-  // the final MozRotateGesture event.
-  enum {
-    eGestureState_None,
-    eGestureState_StartGesture,
-    eGestureState_MagnifyGesture,
-    eGestureState_RotateGesture
-  } mGestureState;
-  float mCumulativeMagnification;
-  float mCumulativeRotation;
-
-#ifdef __LP64__
-  // Support for fluid swipe tracking.
-  BOOL* mCancelSwipeAnimation;
-#endif
-
-  // Whether this uses off-main-thread compositing.
-  BOOL mUsingOMTCompositor;
-
-  // The mask image that's used when painting into the titlebar using basic
-  // CGContext painting (i.e. non-accelerated).
-  CGImageRef mTopLeftCornerMask;
-
-  // Subviews of self, which act as container views for vibrancy views and
-  // non-draggable views.
-  NSView* mVibrancyViewsContainer;      // [STRONG]
-  NSView* mNonDraggableViewsContainer;  // [STRONG]
-
-  // The view that does our drawing. This is a subview of self so that it can
-  // be ordered on top of mVibrancyViewsContainer.
-  PixelHostingView* mPixelHostingView;
-}
-
-// class initialization
-+ (void)initialize;
-
-+ (void)registerViewForDraggedTypes:(NSView*)aView;
-
-// these are sent to the first responder when the window key status changes
-- (void)viewsWindowDidBecomeKey;
-- (void)viewsWindowDidResignKey;
-
-// Stop NSView hierarchy being changed during [ChildView drawRect:]
-- (void)delayedTearDown;
-
-- (void)sendFocusEvent:(mozilla::EventMessage)eventMessage;
-
-- (void)handleMouseMoved:(NSEvent*)aEvent;
-
-- (void)sendMouseEnterOrExitEvent:(NSEvent*)aEvent
-                            enter:(BOOL)aEnter
-                         exitFrom:(mozilla::WidgetMouseEvent::ExitFrom)aExitFrom;
-
-- (void)updateGLContext;
-- (void)_surfaceNeedsUpdate:(NSNotification*)notification;
-
-- (bool)preRender:(NSOpenGLContext *)aGLContext;
-- (void)postRender:(NSOpenGLContext *)aGLContext;
-
-- (NSView*)vibrancyViewsContainer;
-- (NSView*)nonDraggableViewsContainer;
-- (NSView*)pixelHostingView;
-
-- (BOOL)isCoveringTitlebar;
-
-- (void)viewWillStartLiveResize;
-- (void)viewDidEndLiveResize;
-
-- (NSColor*)vibrancyFillColorForThemeGeometryType:(nsITheme::ThemeGeometryType)aThemeGeometryType;
-- (NSColor*)vibrancyFontSmoothingBackgroundColorForThemeGeometryType:(nsITheme::ThemeGeometryType)aThemeGeometryType;
-
-// Simple gestures support
-//
-// XXX - The swipeWithEvent, beginGestureWithEvent, magnifyWithEvent,
-// rotateWithEvent, and endGestureWithEvent methods are part of a
-// PRIVATE interface exported by nsResponder and reverse-engineering
-// was necessary to obtain the methods' prototypes. Thus, Apple may
-// change the interface in the future without notice.
-//
-// The prototypes were obtained from the following link:
-// http://cocoadex.com/2008/02/nsevent-modifications-swipe-ro.html
-- (void)swipeWithEvent:(NSEvent *)anEvent;
-- (void)beginGestureWithEvent:(NSEvent *)anEvent;
-- (void)magnifyWithEvent:(NSEvent *)anEvent;
-- (void)smartMagnifyWithEvent:(NSEvent *)anEvent;
-- (void)rotateWithEvent:(NSEvent *)anEvent;
-- (void)endGestureWithEvent:(NSEvent *)anEvent;
-
-- (void)scrollWheel:(NSEvent *)anEvent;
-
-- (void)setUsingOMTCompositor:(BOOL)aUseOMTC;
-
-- (NSEvent*)lastKeyDownEvent;
-@end
-
-class ChildViewMouseTracker {
-
-public:
-
-  static void MouseMoved(NSEvent* aEvent);
-  static void MouseScrolled(NSEvent* aEvent);
-  static void OnDestroyView(ChildView* aView);
-  static void OnDestroyWindow(NSWindow* aWindow);
-  static BOOL WindowAcceptsEvent(NSWindow* aWindow, NSEvent* aEvent,
-                                 ChildView* aView, BOOL isClickThrough = NO);
-  static void MouseExitedWindow(NSEvent* aEvent);
-  static void MouseEnteredWindow(NSEvent* aEvent);
-  static void ReEvaluateMouseEnterState(NSEvent* aEvent = nil, ChildView* aOldView = nil);
-  static void ResendLastMouseMoveEvent();
-  static ChildView* ViewForEvent(NSEvent* aEvent);
-
-  static ChildView* sLastMouseEventView;
-  static NSEvent* sLastMouseMoveEvent;
-  static NSWindow* sWindowUnderMouse;
-  static NSPoint sLastScrollEventScreenLocation;
-};
-
-//-------------------------------------------------------------------------
-//
-// nsChildView
-//
-//-------------------------------------------------------------------------
-
-class nsChildView : public nsBaseWidget
-{
-private:
-  typedef nsBaseWidget Inherited;
-  typedef mozilla::layers::IAPZCTreeManager IAPZCTreeManager;
-
-public:
-  nsChildView();
-
-  // nsIWidget interface
-  virtual MOZ_MUST_USE nsresult Create(nsIWidget* aParent,
-                                       nsNativeWidget aNativeParent,
-                                       const LayoutDeviceIntRect& aRect,
-                                       nsWidgetInitData* aInitData = nullptr)
-                                       override;
-
-  virtual void            Destroy() override;
-
-  NS_IMETHOD              Show(bool aState) override;
-  virtual bool            IsVisible() const override;
-
-  NS_IMETHOD              SetParent(nsIWidget* aNewParent) override;
-  virtual nsIWidget*      GetParent(void) override;
-  virtual float           GetDPI() override;
-
-  NS_IMETHOD              Move(double aX, double aY) override;
-  NS_IMETHOD              Resize(double aWidth, double aHeight, bool aRepaint) override;
-  NS_IMETHOD              Resize(double aX, double aY,
-                                 double aWidth, double aHeight, bool aRepaint) override;
-
-  NS_IMETHOD              Enable(bool aState) override;
-  virtual bool            IsEnabled() const override;
-  NS_IMETHOD              SetFocus(bool aRaise) override;
-  virtual LayoutDeviceIntRect GetBounds() override;
-  virtual LayoutDeviceIntRect GetClientBounds() override;
-  virtual LayoutDeviceIntRect GetScreenBounds() override;
-
-  // Returns the "backing scale factor" of the view's window, which is the
-  // ratio of pixels in the window's backing store to Cocoa points. Prior to
-  // HiDPI support in OS X 10.7, this was always 1.0, but in HiDPI mode it
-  // will be 2.0 (and might potentially other values as screen resolutions
-  // evolve). This gives the relationship between what Gecko calls "device
-  // pixels" and the Cocoa "points" coordinate system.
-  CGFloat                 BackingScaleFactor() const;
-
-  mozilla::DesktopToLayoutDeviceScale GetDesktopToDeviceScale() final {
-    return mozilla::DesktopToLayoutDeviceScale(BackingScaleFactor());
-  }
-
-  // Call if the window's backing scale factor changes - i.e., it is moved
-  // between HiDPI and non-HiDPI screens
-  void                    BackingScaleFactorChanged();
-
-  virtual double          GetDefaultScaleInternal() override;
-
-  virtual int32_t         RoundsWidgetCoordinatesTo() override;
-
-  NS_IMETHOD              Invalidate(const LayoutDeviceIntRect &aRect) override;
-
-  virtual void*           GetNativeData(uint32_t aDataType) override;
-  virtual nsresult        ConfigureChildren(const nsTArray<Configuration>& aConfigurations) override;
-  virtual LayoutDeviceIntPoint WidgetToScreenOffset() override;
-  virtual bool            ShowsResizeIndicator(LayoutDeviceIntRect* aResizerRect) override;
-
-  static  bool            ConvertStatus(nsEventStatus aStatus)
-                          { return aStatus == nsEventStatus_eConsumeNoDefault; }
-  NS_IMETHOD              DispatchEvent(mozilla::WidgetGUIEvent* aEvent,
-                                        nsEventStatus& aStatus) override;
-
-  virtual bool            WidgetTypeSupportsAcceleration() override;
-  virtual bool            ShouldUseOffMainThreadCompositing() override;
-
-  NS_IMETHOD        SetCursor(nsCursor aCursor) override;
-  NS_IMETHOD        SetCursor(imgIContainer* aCursor, uint32_t aHotspotX, uint32_t aHotspotY) override;
-
-  NS_IMETHOD        SetTitle(const nsAString& title) override;
-
-  NS_IMETHOD        GetAttention(int32_t aCycleCount) override;
-
-  virtual bool HasPendingInputEvent() override;
-
-  NS_IMETHOD        ActivateNativeMenuItemAt(const nsAString& indexString) override;
-  NS_IMETHOD        ForceUpdateNativeMenuAt(const nsAString& indexString) override;
-  NS_IMETHOD        GetSelectionAsPlaintext(nsAString& aResult) override;
-
-  NS_IMETHOD_(void) SetInputContext(const InputContext& aContext,
-                                    const InputContextAction& aAction) override;
-  NS_IMETHOD_(InputContext) GetInputContext() override;
-  NS_IMETHOD_(TextEventDispatcherListener*)
-    GetNativeTextEventDispatcherListener() override;
-  NS_IMETHOD        AttachNativeKeyEvent(mozilla::WidgetKeyboardEvent& aEvent) override;
-  NS_IMETHOD_(bool) ExecuteNativeKeyBinding(
-                      NativeKeyBindingsType aType,
-                      const mozilla::WidgetKeyboardEvent& aEvent,
-                      DoCommandCallback aCallback,
-                      void* aCallbackData) override;
-  bool ExecuteNativeKeyBindingRemapped(
-                      NativeKeyBindingsType aType,
-                      const mozilla::WidgetKeyboardEvent& aEvent,
-                      DoCommandCallback aCallback,
-                      void* aCallbackData,
-                      uint32_t aGeckoKeyCode,
-                      uint32_t aCocoaKeyCode);
-  virtual nsIMEUpdatePreference GetIMEUpdatePreference() override;
-
-  virtual nsTransparencyMode GetTransparencyMode() override;
-  virtual void                SetTransparencyMode(nsTransparencyMode aMode) override;
-
-  virtual nsresult SynthesizeNativeKeyEvent(int32_t aNativeKeyboardLayout,
-                                            int32_t aNativeKeyCode,
-                                            uint32_t aModifierFlags,
-                                            const nsAString& aCharacters,
-                                            const nsAString& aUnmodifiedCharacters,
-                                            nsIObserver* aObserver) override;
-
-  virtual nsresult SynthesizeNativeMouseEvent(LayoutDeviceIntPoint aPoint,
-                                              uint32_t aNativeMessage,
-                                              uint32_t aModifierFlags,
-                                              nsIObserver* aObserver) override;
-
-  virtual nsresult SynthesizeNativeMouseMove(LayoutDeviceIntPoint aPoint,
-                                             nsIObserver* aObserver) override
-  { return SynthesizeNativeMouseEvent(aPoint, NSMouseMoved, 0, aObserver); }
-  virtual nsresult SynthesizeNativeMouseScrollEvent(LayoutDeviceIntPoint aPoint,
-                                                    uint32_t aNativeMessage,
-                                                    double aDeltaX,
-                                                    double aDeltaY,
-                                                    double aDeltaZ,
-                                                    uint32_t aModifierFlags,
-                                                    uint32_t aAdditionalFlags,
-                                                    nsIObserver* aObserver) override;
-  virtual nsresult SynthesizeNativeTouchPoint(uint32_t aPointerId,
-                                              TouchPointerState aPointerState,
-                                              LayoutDeviceIntPoint aPoint,
-                                              double aPointerPressure,
-                                              uint32_t aPointerOrientation,
-                                              nsIObserver* aObserver) override;
-
-  // Mac specific methods
-
-  virtual bool      DispatchWindowEvent(mozilla::WidgetGUIEvent& event);
-
-  void WillPaintWindow();
-  bool PaintWindow(LayoutDeviceIntRegion aRegion);
-  bool PaintWindowInContext(CGContextRef aContext, const LayoutDeviceIntRegion& aRegion,
-                            mozilla::gfx::IntSize aSurfaceSize);
-
-#ifdef ACCESSIBILITY
-  already_AddRefed<mozilla::a11y::Accessible> GetDocumentAccessible();
-#endif
-
-  virtual void CreateCompositor() override;
-  virtual void PrepareWindowEffects() override;
-  virtual void CleanupWindowEffects() override;
-  virtual bool PreRender(mozilla::widget::WidgetRenderingContext* aContext) override;
-  virtual void PostRender(mozilla::widget::WidgetRenderingContext* aContext) override;
-  virtual void DrawWindowOverlay(mozilla::widget::WidgetRenderingContext* aManager,
-                                 LayoutDeviceIntRect aRect) override;
-
-  virtual void UpdateThemeGeometries(const nsTArray<ThemeGeometry>& aThemeGeometries) override;
-
-  virtual void UpdateWindowDraggingRegion(const LayoutDeviceIntRegion& aRegion) override;
-  LayoutDeviceIntRegion GetNonDraggableRegion() { return mNonDraggableRegion.Region(); }
-
-  virtual void ReportSwipeStarted(uint64_t aInputBlockId, bool aStartSwipe) override;
-
-  virtual void LookUpDictionary(
-                 const nsAString& aText,
-                 const nsTArray<mozilla::FontRange>& aFontRangeArray,
-                 const bool aIsVertical,
-                 const LayoutDeviceIntPoint& aPoint) override;
-
-  void              ResetParent();
-
-  static bool DoHasPendingInputEvent();
-  static uint32_t GetCurrentInputEventCount();
-  static void UpdateCurrentInputEventCount();
-
-  NSView<mozView>* GetEditorView();
-
-  nsCocoaWindow*    GetXULWindowWidget();
-
-  virtual void      ReparentNativeWidget(nsIWidget* aNewParent) override;
-
-  mozilla::widget::TextInputHandler* GetTextInputHandler()
-  {
-    return mTextInputHandler;
-  }
-
-  void              ClearVibrantAreas();
-  NSColor*          VibrancyFillColorForThemeGeometryType(nsITheme::ThemeGeometryType aThemeGeometryType);
-  NSColor*          VibrancyFontSmoothingBackgroundColorForThemeGeometryType(nsITheme::ThemeGeometryType aThemeGeometryType);
-
-  // unit conversion convenience functions
-  int32_t           CocoaPointsToDevPixels(CGFloat aPts) const {
-    return nsCocoaUtils::CocoaPointsToDevPixels(aPts, BackingScaleFactor());
-  }
-  LayoutDeviceIntPoint CocoaPointsToDevPixels(const NSPoint& aPt) const {
-    return nsCocoaUtils::CocoaPointsToDevPixels(aPt, BackingScaleFactor());
-  }
-  LayoutDeviceIntPoint CocoaPointsToDevPixelsRoundDown(const NSPoint& aPt) const {
-    return nsCocoaUtils::CocoaPointsToDevPixelsRoundDown(aPt, BackingScaleFactor());
-  }
-  LayoutDeviceIntRect CocoaPointsToDevPixels(const NSRect& aRect) const {
-    return nsCocoaUtils::CocoaPointsToDevPixels(aRect, BackingScaleFactor());
-  }
-  CGFloat           DevPixelsToCocoaPoints(int32_t aPixels) const {
-    return nsCocoaUtils::DevPixelsToCocoaPoints(aPixels, BackingScaleFactor());
-  }
-  NSRect            DevPixelsToCocoaPoints(const LayoutDeviceIntRect& aRect) const {
-    return nsCocoaUtils::DevPixelsToCocoaPoints(aRect, BackingScaleFactor());
-  }
-
-  already_AddRefed<mozilla::gfx::DrawTarget>
-    StartRemoteDrawingInRegion(LayoutDeviceIntRegion& aInvalidRegion,
-                               mozilla::layers::BufferMode* aBufferMode) override;
-  void EndRemoteDrawing() override;
-  void CleanupRemoteDrawing() override;
-  bool InitCompositor(mozilla::layers::Compositor* aCompositor) override;
-
-  NS_IMETHOD StartPluginIME(const mozilla::WidgetKeyboardEvent& aKeyboardEvent,
-                            int32_t aPanelX, int32_t aPanelY,
-                            nsString& aCommitted) override;
-
-  virtual void SetPluginFocused(bool& aFocused) override;
-
-  bool IsPluginFocused() { return mPluginFocused; }
-
-  virtual LayoutDeviceIntPoint GetClientOffset() override;
-
-  void DispatchAPZWheelInputEvent(mozilla::InputData& aEvent, bool aCanTriggerSwipe);
-
-  void SwipeFinished();
-
-protected:
-  virtual ~nsChildView();
-
-  void              ReportMoveEvent();
-  void              ReportSizeEvent();
-
-  void              TearDownView();
-
-  virtual already_AddRefed<nsIWidget>
-  AllocateChildPopupWidget() override
-  {
-    static NS_DEFINE_IID(kCPopUpCID, NS_POPUP_CID);
-    nsCOMPtr<nsIWidget> widget = do_CreateInstance(kCPopUpCID);
-    return widget.forget();
-  }
-
-  void ConfigureAPZCTreeManager() override;
-  void ConfigureAPZControllerThread() override;
-
-  void DoRemoteComposition(const LayoutDeviceIntRect& aRenderRect);
-
-  // Overlay drawing functions for OpenGL drawing
-  void DrawWindowOverlay(mozilla::layers::GLManager* aManager, LayoutDeviceIntRect aRect);
-  void MaybeDrawResizeIndicator(mozilla::layers::GLManager* aManager);
-  void MaybeDrawRoundedCorners(mozilla::layers::GLManager* aManager, const LayoutDeviceIntRect& aRect);
-  void MaybeDrawTitlebar(mozilla::layers::GLManager* aManager);
-
-  // Redraw the contents of mTitlebarCGContext on the main thread, as
-  // determined by mDirtyTitlebarRegion.
-  void UpdateTitlebarCGContext();
-
-  LayoutDeviceIntRect RectContainingTitlebarControls();
-  void UpdateVibrancy(const nsTArray<ThemeGeometry>& aThemeGeometries);
-  mozilla::VibrancyManager& EnsureVibrancyManager();
-
-  nsIWidget* GetWidgetForListenerEvents();
-
-  struct SwipeInfo {
-    bool wantsSwipe;
-    uint32_t allowedDirections;
-  };
-
-  SwipeInfo SendMayStartSwipe(const mozilla::PanGestureInput& aSwipeStartEvent);
-  void TrackScrollEventAsSwipe(const mozilla::PanGestureInput& aSwipeStartEvent,
-                               uint32_t aAllowedDirections);
-
-protected:
-
-  ChildView<mozView>* mView;  // my parallel cocoa view, [STRONG]
-  RefPtr<mozilla::widget::TextInputHandler> mTextInputHandler;
-  InputContext          mInputContext;
-
-  NSView<mozView>*      mParentView;
-  nsIWidget*            mParentWidget;
-
-#ifdef ACCESSIBILITY
-  // weak ref to this childview's associated mozAccessible for speed reasons
-  // (we get queried for it *a lot* but don't want to own it)
-  nsWeakPtr             mAccessible;
-#endif
-
-  // Protects the view from being teared down while a composition is in
-  // progress on the compositor thread.
-  mozilla::Mutex mViewTearDownLock;
-
-  mozilla::Mutex mEffectsLock;
-
-  // May be accessed from any thread, protected
-  // by mEffectsLock.
-  bool mShowsResizeIndicator;
-  LayoutDeviceIntRect mResizeIndicatorRect;
-  bool mHasRoundedBottomCorners;
-  int mDevPixelCornerRadius;
-  bool mIsCoveringTitlebar;
-  bool mIsFullscreen;
-  bool mIsOpaque;
-  LayoutDeviceIntRect mTitlebarRect;
-
-  // The area of mTitlebarCGContext that needs to be redrawn during the next
-  // transaction. Accessed from any thread, protected by mEffectsLock.
-  LayoutDeviceIntRegion mUpdatedTitlebarRegion;
-  CGContextRef mTitlebarCGContext;
-
-  // Compositor thread only
-  mozilla::UniquePtr<mozilla::widget::RectTextureImage> mResizerImage;
-  mozilla::UniquePtr<mozilla::widget::RectTextureImage> mCornerMaskImage;
-  mozilla::UniquePtr<mozilla::widget::RectTextureImage> mTitlebarImage;
-  mozilla::UniquePtr<mozilla::widget::RectTextureImage> mBasicCompositorImage;
-
-  // The area of mTitlebarCGContext that has changed and needs to be
-  // uploaded to to mTitlebarImage. Main thread only.
-  nsIntRegion           mDirtyTitlebarRegion;
-
-  mozilla::ViewRegion   mNonDraggableRegion;
-
-  // Cached value of [mView backingScaleFactor], to avoid sending two obj-c
-  // messages (respondsToSelector, backingScaleFactor) every time we need to
-  // use it.
-  // ** We'll need to reinitialize this if the backing resolution changes. **
-  mutable CGFloat       mBackingScaleFactor;
-
-  bool                  mVisible;
-  bool                  mDrawing;
-  bool                  mIsDispatchPaint; // Is a paint event being dispatched
-
-  bool mPluginFocused;
-
-  // Used in OMTC BasicLayers mode. Presents the BasicCompositor result
-  // surface to the screen using an OpenGL context.
-  mozilla::UniquePtr<GLPresenter> mGLPresenter;
-
-  mozilla::UniquePtr<mozilla::VibrancyManager> mVibrancyManager;
-  RefPtr<mozilla::SwipeTracker> mSwipeTracker;
-  mozilla::UniquePtr<mozilla::SwipeEventQueue> mSwipeEventQueue;
-
-  // Only used for drawRect-based painting in popups.
-  RefPtr<mozilla::gfx::DrawTarget> mBackingSurface;
-
-  // This flag is only used when APZ is off. It indicates that the current pan
-  // gesture was processed as a swipe. Sometimes the swipe animation can finish
-  // before momentum events of the pan gesture have stopped firing, so this
-  // flag tells us that we shouldn't allow the remaining events to cause
-  // scrolling. It is reset to false once a new gesture starts (as indicated by
-  // a PANGESTURE_(MAY)START event).
-  bool mCurrentPanGestureBelongsToSwipe;
-
-  static uint32_t sLastInputEventCount;
-
-  void ReleaseTitlebarCGContext();
-
-  // This is used by SynthesizeNativeTouchPoint to maintain state between
-  // multiple synthesized points
-  mozilla::UniquePtr<mozilla::MultiTouchInput> mSynthesizedTouchInput;
-};
-
-#endif // nsChildView_h_
diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm
deleted file mode 100644
index 868687fe16..0000000000
--- a/widget/cocoa/nsChildView.mm
+++ /dev/null
@@ -1,6151 +0,0 @@
-/* -*- Mode: objc; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "mozilla/ArrayUtils.h"
-
-#include "mozilla/Logging.h"
-
-#include <unistd.h>
-#include <math.h>
-
-#include "nsChildView.h"
-#include "nsCocoaWindow.h"
-
-#include "mozilla/MiscEvents.h"
-#include "mozilla/MouseEvents.h"
-#include "mozilla/TextEvents.h"
-#include "mozilla/TouchEvents.h"
-
-#include "nsArrayUtils.h"
-#include "nsObjCExceptions.h"
-#include "nsCOMPtr.h"
-#include "nsToolkit.h"
-#include "nsCRT.h"
-
-#include "nsFontMetrics.h"
-#include "nsIRollupListener.h"
-#include "nsViewManager.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIFile.h"
-#include "nsILocalFileMac.h"
-#include "nsGfxCIID.h"
-#include "nsIDOMSimpleGestureEvent.h"
-#include "nsThemeConstants.h"
-#include "nsIWidgetListener.h"
-#include "nsIPresShell.h"
-
-#include "nsDragService.h"
-#include "nsClipboard.h"
-#include "nsCursorManager.h"
-#include "nsWindowMap.h"
-#include "nsCocoaFeatures.h"
-#include "nsCocoaUtils.h"
-#include "nsMenuUtilsX.h"
-#include "nsMenuBarX.h"
-#include "NativeKeyBindings.h"
-#include "ComplexTextInputPanel.h"
-
-#include "gfxContext.h"
-#include "gfxQuartzSurface.h"
-#include "gfxUtils.h"
-#include "nsRegion.h"
-#include "Layers.h"
-#include "ClientLayerManager.h"
-#include "mozilla/layers/LayerManagerComposite.h"
-#include "GfxTexturesReporter.h"
-#include "GLTextureImage.h"
-#include "GLContextProvider.h"
-#include "GLContextCGL.h"
-#include "ScopedGLHelpers.h"
-#include "HeapCopyOfStackArray.h"
-#include "mozilla/layers/IAPZCTreeManager.h"
-#include "mozilla/layers/APZThreadUtils.h"
-#include "mozilla/layers/GLManager.h"
-#include "mozilla/layers/CompositorOGL.h"
-#include "mozilla/layers/CompositorBridgeParent.h"
-#include "mozilla/layers/BasicCompositor.h"
-#include "mozilla/layers/InputAPZContext.h"
-#include "mozilla/widget/CompositorWidget.h"
-#include "gfxUtils.h"
-#include "gfxPrefs.h"
-#include "mozilla/gfx/2D.h"
-#include "mozilla/gfx/BorrowedContext.h"
-#include "mozilla/gfx/MacIOSurface.h"
-#ifdef ACCESSIBILITY
-#include "nsAccessibilityService.h"
-#include "mozilla/a11y/Platform.h"
-#endif
-
-#include "mozilla/Preferences.h"
-
-#include <dlfcn.h>
-
-#include <ApplicationServices/ApplicationServices.h>
-
-#include "GeckoProfiler.h"
-
-#include "nsIDOMWheelEvent.h"
-#include "mozilla/layers/ChromeProcessController.h"
-#include "nsLayoutUtils.h"
-#include "InputData.h"
-#include "RectTextureImage.h"
-#include "SwipeTracker.h"
-#include "VibrancyManager.h"
-#include "nsNativeThemeCocoa.h"
-#include "nsIDOMWindowUtils.h"
-#include "Units.h"
-#include "UnitTransforms.h"
-#include "mozilla/UniquePtrExtensions.h"
-
-using namespace mozilla;
-using namespace mozilla::layers;
-using namespace mozilla::gl;
-using namespace mozilla::widget;
-
-using mozilla::gfx::Matrix4x4;
-
-#undef DEBUG_UPDATE
-#undef INVALIDATE_DEBUGGING  // flash areas as they are invalidated
-
-// Don't put more than this many rects in the dirty region, just fluff
-// out to the bounding-box if there are more
-#define MAX_RECTS_IN_REGION 100
-
-PRLogModuleInfo* sCocoaLog = nullptr;
-
-extern "C" {
-  CG_EXTERN void CGContextResetCTM(CGContextRef);
-  CG_EXTERN void CGContextSetCTM(CGContextRef, CGAffineTransform);
-  CG_EXTERN void CGContextResetClip(CGContextRef);
-
-  typedef CFTypeRef CGSRegionObj;
-  CGError CGSNewRegionWithRect(const CGRect *rect, CGSRegionObj *outRegion);
-  CGError CGSNewRegionWithRectList(const CGRect *rects, int rectCount, CGSRegionObj *outRegion);
-}
-
-// defined in nsMenuBarX.mm
-extern NSMenu* sApplicationMenu; // Application menu shared by all menubars
-
-static bool gChildViewMethodsSwizzled = false;
-
-extern nsIArray *gDraggedTransferables;
-
-ChildView* ChildViewMouseTracker::sLastMouseEventView = nil;
-NSEvent* ChildViewMouseTracker::sLastMouseMoveEvent = nil;
-NSWindow* ChildViewMouseTracker::sWindowUnderMouse = nil;
-NSPoint ChildViewMouseTracker::sLastScrollEventScreenLocation = NSZeroPoint;
-
-#ifdef INVALIDATE_DEBUGGING
-static void blinkRect(Rect* r);
-static void blinkRgn(RgnHandle rgn);
-#endif
-
-bool gUserCancelledDrag = false;
-
-uint32_t nsChildView::sLastInputEventCount = 0;
-
-// The view that will do our drawing or host our NSOpenGLContext or Core Animation layer.
-@interface PixelHostingView : NSView {
-}
-@end
-
-@interface ChildView(Private)
-
-// sets up our view, attaching it to its owning gecko view
-- (id)initWithFrame:(NSRect)inFrame geckoChild:(nsChildView*)inChild;
-
-// set up a gecko mouse event based on a cocoa mouse event
-- (void) convertCocoaMouseWheelEvent:(NSEvent*)aMouseEvent
-                        toGeckoEvent:(WidgetWheelEvent*)outWheelEvent;
-- (void) convertCocoaMouseEvent:(NSEvent*)aMouseEvent
-                   toGeckoEvent:(WidgetInputEvent*)outGeckoEvent;
-
-- (NSMenu*)contextMenu;
-
-- (BOOL)isRectObscuredBySubview:(NSRect)inRect;
-
-- (LayoutDeviceIntRegion)nativeDirtyRegionWithBoundingRect:(NSRect)aRect;
-- (BOOL)isUsingOpenGL;
-- (void)drawUsingOpenGL;
-
-- (BOOL)hasRoundedBottomCorners;
-- (CGFloat)cornerRadius;
-- (void)clearCorners;
-
--(void)setGLOpaque:(BOOL)aOpaque;
-
-// Overlay drawing functions for traditional CGContext drawing
-- (void)drawTitleString;
-- (void)drawTitlebarHighlight;
-- (void)maskTopCornersInContext:(CGContextRef)aContext;
-
-#if USE_CLICK_HOLD_CONTEXTMENU
- // called on a timer two seconds after a mouse down to see if we should display
- // a context menu (click-hold)
-- (void)clickHoldCallback:(id)inEvent;
-#endif
-
-#ifdef ACCESSIBILITY
-- (id<mozAccessible>)accessible;
-#endif
-
-- (LayoutDeviceIntPoint)convertWindowCoordinates:(NSPoint)aPoint;
-- (LayoutDeviceIntPoint)convertWindowCoordinatesRoundDown:(NSPoint)aPoint;
-
-- (BOOL)inactiveWindowAcceptsMouseEvent:(NSEvent*)aEvent;
-- (void)updateWindowDraggableState;
-
-- (bool)shouldConsiderStartingSwipeFromEvent:(NSEvent*)aEvent;
-
-@end
-
-@interface NSView(NSThemeFrameCornerRadius)
-- (float)roundedCornerRadius;
-@end
-
-@interface NSWindow(NSWindowShouldZoomOnDoubleClick)
-+ (BOOL)_shouldZoomOnDoubleClick; // present on 10.7 and above
-@end
-
-// Starting with 10.7 the bottom corners of all windows are rounded.
-// Unfortunately, the standard rounding that OS X applies to OpenGL views
-// does not use anti-aliasing and looks very crude. Since we want a smooth,
-// anti-aliased curve, we'll draw it ourselves.
-// Additionally, we need to turn off the OS-supplied rounding because it
-// eats into our corner's curve. We do that by overriding an NSSurface method.
-@interface NSSurface @end
-
-@implementation NSSurface(DontCutOffCorners)
-- (CGSRegionObj)_createRoundedBottomRegionForRect:(CGRect)rect
-{
-  // Create a normal rect region without rounded bottom corners.
-  CGSRegionObj region;
-  CGSNewRegionWithRect(&rect, &region);
-  return region;
-}
-@end
-
-#pragma mark -
-
-// Flips a screen coordinate from a point in the cocoa coordinate system (bottom-left rect) to a point
-// that is a "flipped" cocoa coordinate system (starts in the top-left).
-static inline void
-FlipCocoaScreenCoordinate(NSPoint &inPoint)
-{
-  inPoint.y = nsCocoaUtils::FlippedScreenY(inPoint.y);
-}
-
-void EnsureLogInitialized()
-{
-  if (!sCocoaLog) {
-    sCocoaLog = PR_NewLogModule("nsCocoaWidgets");
-  }
-}
-
-namespace {
-
-// Used for OpenGL drawing from the compositor thread for OMTC BasicLayers.
-// We need to use OpenGL for this because there seems to be no other robust
-// way of drawing from a secondary thread without locking, which would cause
-// deadlocks in our setup. See bug 882523.
-class GLPresenter : public GLManager
-{
-public:
-  static mozilla::UniquePtr<GLPresenter> CreateForWindow(nsIWidget* aWindow)
-  {
-    // Contrary to CompositorOGL, we allow unaccelerated OpenGL contexts to be
-    // used. BasicCompositor only requires very basic GL functionality.
-    RefPtr<GLContext> context = gl::GLContextProvider::CreateForWindow(aWindow, false);
-    return context ? MakeUnique<GLPresenter>(context) : nullptr;
-  }
-
-  explicit GLPresenter(GLContext* aContext);
-  virtual ~GLPresenter();
-
-  virtual GLContext* gl() const override { return mGLContext; }
-  virtual ShaderProgramOGL* GetProgram(GLenum aTarget, gfx::SurfaceFormat aFormat) override
-  {
-    MOZ_ASSERT(aTarget == LOCAL_GL_TEXTURE_RECTANGLE_ARB);
-    MOZ_ASSERT(aFormat == gfx::SurfaceFormat::R8G8B8A8);
-    return mRGBARectProgram.get();
-  }
-  virtual const gfx::Matrix4x4& GetProjMatrix() const override
-  {
-    return mProjMatrix;
-  }
-  virtual void ActivateProgram(ShaderProgramOGL *aProg) override
-  {
-    mGLContext->fUseProgram(aProg->GetProgram());
-  }
-  virtual void BindAndDrawQuad(ShaderProgramOGL *aProg,
-                               const gfx::Rect& aLayerRect,
-                               const gfx::Rect& aTextureRect) override;
-
-  void BeginFrame(LayoutDeviceIntSize aRenderSize);
-  void EndFrame();
-
-  NSOpenGLContext* GetNSOpenGLContext()
-  {
-    return GLContextCGL::Cast(mGLContext)->GetNSOpenGLContext();
-  }
-
-protected:
-  RefPtr<mozilla::gl::GLContext> mGLContext;
-  mozilla::UniquePtr<mozilla::layers::ShaderProgramOGL> mRGBARectProgram;
-  gfx::Matrix4x4 mProjMatrix;
-  GLuint mQuadVBO;
-};
-
-} // unnamed namespace
-
-namespace mozilla {
-
-struct SwipeEventQueue {
-  SwipeEventQueue(uint32_t aAllowedDirections, uint64_t aInputBlockId)
-    : allowedDirections(aAllowedDirections)
-    , inputBlockId(aInputBlockId)
-  {}
-
-  nsTArray<PanGestureInput> queuedEvents;
-  uint32_t allowedDirections;
-  uint64_t inputBlockId;
-};
-
-} // namespace mozilla
-
-#pragma mark -
-
-nsChildView::nsChildView() : nsBaseWidget()
-, mView(nullptr)
-, mParentView(nullptr)
-, mParentWidget(nullptr)
-, mViewTearDownLock("ChildViewTearDown")
-, mEffectsLock("WidgetEffects")
-, mShowsResizeIndicator(false)
-, mHasRoundedBottomCorners(false)
-, mIsCoveringTitlebar(false)
-, mIsFullscreen(false)
-, mIsOpaque(false)
-, mTitlebarCGContext(nullptr)
-, mBackingScaleFactor(0.0)
-, mVisible(false)
-, mDrawing(false)
-, mIsDispatchPaint(false)
-{
-  EnsureLogInitialized();
-}
-
-nsChildView::~nsChildView()
-{
-  ReleaseTitlebarCGContext();
-
-  if (mSwipeTracker) {
-    mSwipeTracker->Destroy();
-    mSwipeTracker = nullptr;
-  }
-
-  // Notify the children that we're gone.  childView->ResetParent() can change
-  // our list of children while it's being iterated, so the way we iterate the
-  // list must allow for this.
-  for (nsIWidget* kid = mLastChild; kid;) {
-    nsChildView* childView = static_cast<nsChildView*>(kid);
-    kid = kid->GetPrevSibling();
-    childView->ResetParent();
-  }
-
-  NS_WARNING_ASSERTION(
-    mOnDestroyCalled,
-    "nsChildView object destroyed without calling Destroy()");
-
-  DestroyCompositor();
-
-  // An nsChildView object that was in use can be destroyed without Destroy()
-  // ever being called on it.  So we also need to do a quick, safe cleanup
-  // here (it's too late to just call Destroy(), which can cause crashes).
-  // It's particularly important to make sure widgetDestroyed is called on our
-  // mView -- this method NULLs mView's mGeckoChild, and NULL checks on
-  // mGeckoChild are used throughout the ChildView class to tell if it's safe
-  // to use a ChildView object.
-  [mView widgetDestroyed]; // Safe if mView is nil.
-  mParentWidget = nil;
-  TearDownView(); // Safe if called twice.
-}
-
-void
-nsChildView::ReleaseTitlebarCGContext()
-{
-  if (mTitlebarCGContext) {
-    CGContextRelease(mTitlebarCGContext);
-    mTitlebarCGContext = nullptr;
-  }
-}
-
-nsresult
-nsChildView::Create(nsIWidget* aParent,
-                    nsNativeWidget aNativeParent,
-                    const LayoutDeviceIntRect& aRect,
-                    nsWidgetInitData* aInitData)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  // Because the hidden window is created outside of an event loop,
-  // we need to provide an autorelease pool to avoid leaking cocoa objects
-  // (see bug 559075).
-  nsAutoreleasePool localPool;
-
-  // See NSView (MethodSwizzling) below.
-  if (!gChildViewMethodsSwizzled) {
-    nsToolkit::SwizzleMethods([NSView class], @selector(mouseDownCanMoveWindow),
-                              @selector(nsChildView_NSView_mouseDownCanMoveWindow));
-    gChildViewMethodsSwizzled = true;
-  }
-
-  mBounds = aRect;
-
-  // Ensure that the toolkit is created.
-  nsToolkit::GetToolkit();
-
-  BaseCreate(aParent, aInitData);
-
-  // inherit things from the parent view and create our parallel
-  // NSView in the Cocoa display system
-  mParentView = nil;
-  if (aParent) {
-    // inherit the top-level window. NS_NATIVE_WIDGET is always a NSView
-    // regardless of if we're asking a window or a view (for compatibility
-    // with windows).
-    mParentView = (NSView<mozView>*)aParent->GetNativeData(NS_NATIVE_WIDGET);
-    mParentWidget = aParent;
-  } else {
-    // This is the normal case. When we're the root widget of the view hiararchy,
-    // aNativeParent will be the contentView of our window, since that's what
-    // nsCocoaWindow returns when asked for an NS_NATIVE_VIEW.
-    mParentView = reinterpret_cast<NSView<mozView>*>(aNativeParent);
-  }
-
-  // create our parallel NSView and hook it up to our parent. Recall
-  // that NS_NATIVE_WIDGET is the NSView.
-  CGFloat scaleFactor = nsCocoaUtils::GetBackingScaleFactor(mParentView);
-  NSRect r = nsCocoaUtils::DevPixelsToCocoaPoints(mBounds, scaleFactor);
-  mView = [[[[ChildView alloc] initWithFrame:r geckoChild:this] autorelease] retain];
-  
-  if (!mView) {
-    return NS_ERROR_FAILURE;
-  }
-
-  // If this view was created in a Gecko view hierarchy, the initial state
-  // is hidden.  If the view is attached only to a native NSView but has
-  // no Gecko parent (as in embedding), the initial state is visible.
-  if (mParentWidget)
-    [mView setHidden:YES];
-  else
-    mVisible = true;
-
-  // Hook it up in the NSView hierarchy.
-  if (mParentView) {
-    [mParentView addSubview:mView];
-  }
-
-  // if this is a ChildView, make sure that our per-window data
-  // is set up
-  if ([mView isKindOfClass:[ChildView class]])
-    [[WindowDataMap sharedWindowDataMap] ensureDataForWindow:[mView window]];
-
-  NS_ASSERTION(!mTextInputHandler, "mTextInputHandler has already existed");
-  mTextInputHandler = new TextInputHandler(this, mView);
-
-  mPluginFocused = false;
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-
-void nsChildView::TearDownView()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!mView)
-    return;
-
-  NSWindow* win = [mView window];
-  NSResponder* responder = [win firstResponder];
-
-  // We're being unhooked from the view hierarchy, don't leave our view
-  // or a child view as the window first responder.
-  if (responder && [responder isKindOfClass:[NSView class]] &&
-      [(NSView*)responder isDescendantOf:mView]) {
-    [win makeFirstResponder:[mView superview]];
-  }
-
-  // If mView is win's contentView, win (mView's NSWindow) "owns" mView --
-  // win has retained mView, and will detach it from the view hierarchy and
-  // release it when necessary (when win is itself destroyed (in a call to
-  // [win dealloc])).  So all we need to do here is call [mView release] (to
-  // match the call to [mView retain] in nsChildView::StandardCreate()).
-  // Also calling [mView removeFromSuperviewWithoutNeedingDisplay] causes
-  // mView to be released again and dealloced, while remaining win's
-  // contentView.  So if we do that here, win will (for a short while) have
-  // an invalid contentView (for the consequences see bmo bugs 381087 and
-  // 374260).
-  if ([mView isEqual:[win contentView]]) {
-    [mView release];
-  } else {
-    // Stop NSView hierarchy being changed during [ChildView drawRect:]
-    [mView performSelectorOnMainThread:@selector(delayedTearDown) withObject:nil waitUntilDone:false];
-  }
-  mView = nil;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-nsCocoaWindow*
-nsChildView::GetXULWindowWidget()
-{
-  id windowDelegate = [[mView window] delegate];
-  if (windowDelegate && [windowDelegate isKindOfClass:[WindowDelegate class]]) {
-    return [(WindowDelegate *)windowDelegate geckoWidget];
-  }
-  return nullptr;
-}
-
-void nsChildView::Destroy()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  // Make sure that no composition is in progress while disconnecting
-  // ourselves from the view.
-  MutexAutoLock lock(mViewTearDownLock);
-
-  if (mOnDestroyCalled)
-    return;
-  mOnDestroyCalled = true;
-
-  // Stuff below may delete the last ref to this
-  nsCOMPtr<nsIWidget> kungFuDeathGrip(this);
-
-  [mView widgetDestroyed];
-
-  nsBaseWidget::Destroy();
-
-  NotifyWindowDestroyed();
-  mParentWidget = nil;
-
-  TearDownView();
-
-  nsBaseWidget::OnDestroy();
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-#pragma mark -
-
-#if 0
-static void PrintViewHierarchy(NSView *view)
-{
-  while (view) {
-    NSLog(@"  view is %x, frame %@", view, NSStringFromRect([view frame]));
-    view = [view superview];
-  }
-}
-#endif
-
-// Return native data according to aDataType
-void* nsChildView::GetNativeData(uint32_t aDataType)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSNULL;
-
-  void* retVal = nullptr;
-
-  switch (aDataType)
-  {
-    case NS_NATIVE_WIDGET:
-    case NS_NATIVE_DISPLAY:
-      retVal = (void*)mView;
-      break;
-
-    case NS_NATIVE_WINDOW:
-      retVal = [mView window];
-      break;
-
-    case NS_NATIVE_GRAPHIC:
-      NS_ERROR("Requesting NS_NATIVE_GRAPHIC on a Mac OS X child view!");
-      retVal = nullptr;
-      break;
-
-    case NS_NATIVE_OFFSETX:
-      retVal = 0;
-      break;
-
-    case NS_NATIVE_OFFSETY:
-      retVal = 0;
-      break;
-
-    case NS_RAW_NATIVE_IME_CONTEXT:
-      retVal = GetPseudoIMEContext();
-      if (retVal) {
-        break;
-      }
-      retVal = [mView inputContext];
-      // If input context isn't available on this widget, we should set |this|
-      // instead of nullptr since if this returns nullptr, IMEStateManager
-      // cannot manage composition with TextComposition instance.  Although,
-      // this case shouldn't occur.
-      if (NS_WARN_IF(!retVal)) {
-        retVal = this;
-      }
-      break;
-  }
-
-  return retVal;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSNULL;
-}
-
-#pragma mark -
-
-nsTransparencyMode nsChildView::GetTransparencyMode()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  nsCocoaWindow* windowWidget = GetXULWindowWidget();
-  return windowWidget ? windowWidget->GetTransparencyMode() : eTransparencyOpaque;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(eTransparencyOpaque);
-}
-
-// This is called by nsContainerFrame on the root widget for all window types
-// except popup windows (when nsCocoaWindow::SetTransparencyMode is used instead).
-void nsChildView::SetTransparencyMode(nsTransparencyMode aMode)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  nsCocoaWindow* windowWidget = GetXULWindowWidget();
-  if (windowWidget) {
-    windowWidget->SetTransparencyMode(aMode);
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-bool nsChildView::IsVisible() const
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  if (!mVisible) {
-    return mVisible;
-  }
-
-  // mVisible does not accurately reflect the state of a hidden tabbed view
-  // so verify that the view has a window as well
-  // then check native widget hierarchy visibility
-  return ([mView window] != nil) && !NSIsEmptyRect([mView visibleRect]);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(false);
-}
-
-// Some NSView methods (e.g. setFrame and setHidden) invalidate the view's
-// bounds in our window. However, we don't want these invalidations because
-// they are unnecessary and because they actually slow us down since we
-// block on the compositor inside drawRect.
-// When we actually need something invalidated, there will be an explicit call
-// to Invalidate from Gecko, so turning these automatic invalidations off
-// won't hurt us in the non-OMTC case.
-// The invalidations inside these NSView methods happen via a call to the
-// private method -[NSWindow _setNeedsDisplayInRect:]. Our BaseWindow
-// implementation of that method is augmented to let us ignore those calls
-// using -[BaseWindow disable/enableSetNeedsDisplay].
-static void
-ManipulateViewWithoutNeedingDisplay(NSView* aView, void (^aCallback)())
-{
-  BaseWindow* win = nil;
-  if ([[aView window] isKindOfClass:[BaseWindow class]]) {
-    win = (BaseWindow*)[aView window];
-  }
-  [win disableSetNeedsDisplay];
-  aCallback();
-  [win enableSetNeedsDisplay];
-}
-
-// Hide or show this component
-NS_IMETHODIMP nsChildView::Show(bool aState)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  if (aState != mVisible) {
-    // Provide an autorelease pool because this gets called during startup
-    // on the "hidden window", resulting in cocoa object leakage if there's
-    // no pool in place.
-    nsAutoreleasePool localPool;
-
-    ManipulateViewWithoutNeedingDisplay(mView, ^{
-      [mView setHidden:!aState];
-    });
-
-    mVisible = aState;
-  }
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-// Change the parent of this widget
-NS_IMETHODIMP
-nsChildView::SetParent(nsIWidget* aNewParent)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  if (mOnDestroyCalled)
-    return NS_OK;
-
-  nsCOMPtr<nsIWidget> kungFuDeathGrip(this);
-
-  if (mParentWidget) {
-    mParentWidget->RemoveChild(this);
-  }
-
-  if (aNewParent) {
-    ReparentNativeWidget(aNewParent);
-  } else {
-    [mView removeFromSuperview];
-    mParentView = nil;
-  }
-
-  mParentWidget = aNewParent;
-
-  if (mParentWidget) {
-    mParentWidget->AddChild(this);
-  }
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-void
-nsChildView::ReparentNativeWidget(nsIWidget* aNewParent)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  NS_PRECONDITION(aNewParent, "");
-
-  if (mOnDestroyCalled)
-    return;
-
-  NSView<mozView>* newParentView =
-   (NSView<mozView>*)aNewParent->GetNativeData(NS_NATIVE_WIDGET);
-  NS_ENSURE_TRUE_VOID(newParentView);
-
-  // we hold a ref to mView, so this is safe
-  [mView removeFromSuperview];
-  mParentView = newParentView;
-  [mParentView addSubview:mView];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void nsChildView::ResetParent()
-{
-  if (!mOnDestroyCalled) {
-    if (mParentWidget)
-      mParentWidget->RemoveChild(this);
-    if (mView)
-      [mView removeFromSuperview];
-  }
-  mParentWidget = nullptr;
-}
-
-nsIWidget*
-nsChildView::GetParent()
-{
-  return mParentWidget;
-}
-
-float
-nsChildView::GetDPI()
-{
-  NSWindow* window = [mView window];
-  if (window && [window isKindOfClass:[BaseWindow class]]) {
-    return [(BaseWindow*)window getDPI];
-  }
-
-  return 96.0;
-}
-
-NS_IMETHODIMP nsChildView::Enable(bool aState)
-{
-  return NS_OK;
-}
-
-bool nsChildView::IsEnabled() const
-{
-  return true;
-}
-
-NS_IMETHODIMP nsChildView::SetFocus(bool aRaise)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  NSWindow* window = [mView window];
-  if (window)
-    [window makeFirstResponder:mView];
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-// Override to set the cursor on the mac
-NS_IMETHODIMP nsChildView::SetCursor(nsCursor aCursor)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  if ([mView isDragInProgress])
-    return NS_OK; // Don't change the cursor during dragging.
-
-  nsBaseWidget::SetCursor(aCursor);
-  return [[nsCursorManager sharedInstance] setCursor:aCursor];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-// implement to fix "hidden virtual function" warning
-NS_IMETHODIMP nsChildView::SetCursor(imgIContainer* aCursor,
-                                      uint32_t aHotspotX, uint32_t aHotspotY)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  nsBaseWidget::SetCursor(aCursor, aHotspotX, aHotspotY);
-  return [[nsCursorManager sharedInstance] setCursorWithImage:aCursor hotSpotX:aHotspotX hotSpotY:aHotspotY scaleFactor:BackingScaleFactor()];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-#pragma mark -
-
-// Get this component dimension
-LayoutDeviceIntRect
-nsChildView::GetBounds()
-{
-  return !mView ? mBounds : CocoaPointsToDevPixels([mView frame]);
-}
-
-LayoutDeviceIntRect
-nsChildView::GetClientBounds()
-{
-  LayoutDeviceIntRect rect = GetBounds();
-  if (!mParentWidget) {
-    // For top level widgets we want the position on screen, not the position
-    // of this view inside the window.
-    rect.MoveTo(WidgetToScreenOffset());
-  }
-  return rect;
-}
-
-LayoutDeviceIntRect
-nsChildView::GetScreenBounds()
-{
-  LayoutDeviceIntRect rect = GetBounds();
-  rect.MoveTo(WidgetToScreenOffset());
-  return rect;
-}
-
-double
-nsChildView::GetDefaultScaleInternal()
-{
-  return BackingScaleFactor();
-}
-
-CGFloat
-nsChildView::BackingScaleFactor() const
-{
-  if (mBackingScaleFactor > 0.0) {
-    return mBackingScaleFactor;
-  }
-  if (!mView) {
-    return 1.0;
-  }
-  mBackingScaleFactor = nsCocoaUtils::GetBackingScaleFactor(mView);
-  return mBackingScaleFactor;
-}
-
-void
-nsChildView::BackingScaleFactorChanged()
-{
-  CGFloat newScale = nsCocoaUtils::GetBackingScaleFactor(mView);
-
-  // ignore notification if it hasn't really changed (or maybe we have
-  // disabled HiDPI mode via prefs)
-  if (mBackingScaleFactor == newScale) {
-    return;
-  }
-
-  mBackingScaleFactor = newScale;
-  NSRect frame = [mView frame];
-  mBounds = nsCocoaUtils::CocoaRectToGeckoRectDevPix(frame, newScale);
-
-  if (mWidgetListener && !mWidgetListener->GetXULWindow()) {
-    nsIPresShell* presShell = mWidgetListener->GetPresShell();
-    if (presShell) {
-      presShell->BackingScaleFactorChanged();
-    }
-  }
-}
-
-int32_t
-nsChildView::RoundsWidgetCoordinatesTo()
-{
-  if (BackingScaleFactor() == 2.0) {
-    return 2;
-  }
-  return 1;
-}
-
-// Move this component, aX and aY are in the parent widget coordinate system
-NS_IMETHODIMP nsChildView::Move(double aX, double aY)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  int32_t x = NSToIntRound(aX);
-  int32_t y = NSToIntRound(aY);
-
-  if (!mView || (mBounds.x == x && mBounds.y == y))
-    return NS_OK;
-
-  mBounds.x = x;
-  mBounds.y = y;
-
-  ManipulateViewWithoutNeedingDisplay(mView, ^{
-    [mView setFrame:DevPixelsToCocoaPoints(mBounds)];
-  });
-
-  NotifyRollupGeometryChange();
-  ReportMoveEvent();
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP nsChildView::Resize(double aWidth, double aHeight, bool aRepaint)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  int32_t width = NSToIntRound(aWidth);
-  int32_t height = NSToIntRound(aHeight);
-
-  if (!mView || (mBounds.width == width && mBounds.height == height))
-    return NS_OK;
-
-  mBounds.width  = width;
-  mBounds.height = height;
-
-  ManipulateViewWithoutNeedingDisplay(mView, ^{
-    [mView setFrame:DevPixelsToCocoaPoints(mBounds)];
-  });
-
-  if (mVisible && aRepaint) {
-    [[mView pixelHostingView] setNeedsDisplay:YES];
-  }
-
-  NotifyRollupGeometryChange();
-  ReportSizeEvent();
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP nsChildView::Resize(double aX, double aY,
-                                  double aWidth, double aHeight, bool aRepaint)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  int32_t x = NSToIntRound(aX);
-  int32_t y = NSToIntRound(aY);
-  int32_t width = NSToIntRound(aWidth);
-  int32_t height = NSToIntRound(aHeight);
-
-  BOOL isMoving = (mBounds.x != x || mBounds.y != y);
-  BOOL isResizing = (mBounds.width != width || mBounds.height != height);
-  if (!mView || (!isMoving && !isResizing))
-    return NS_OK;
-
-  if (isMoving) {
-    mBounds.x = x;
-    mBounds.y = y;
-  }
-  if (isResizing) {
-    mBounds.width  = width;
-    mBounds.height = height;
-  }
-
-  ManipulateViewWithoutNeedingDisplay(mView, ^{
-    [mView setFrame:DevPixelsToCocoaPoints(mBounds)];
-  });
-
-  if (mVisible && aRepaint) {
-    [[mView pixelHostingView] setNeedsDisplay:YES];
-  }
-
-  NotifyRollupGeometryChange();
-  if (isMoving) {
-    ReportMoveEvent();
-    if (mOnDestroyCalled)
-      return NS_OK;
-  }
-  if (isResizing)
-    ReportSizeEvent();
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-static const int32_t resizeIndicatorWidth = 15;
-static const int32_t resizeIndicatorHeight = 15;
-bool nsChildView::ShowsResizeIndicator(LayoutDeviceIntRect* aResizerRect)
-{
-  NSView *topLevelView = mView, *superView = nil;
-  while ((superView = [topLevelView superview]))
-    topLevelView = superView;
-
-  if (![[topLevelView window] showsResizeIndicator] ||
-      !([[topLevelView window] styleMask] & NSResizableWindowMask))
-    return false;
-
-  if (aResizerRect) {
-    NSSize bounds = [topLevelView bounds].size;
-    NSPoint corner = NSMakePoint(bounds.width, [topLevelView isFlipped] ? bounds.height : 0);
-    corner = [topLevelView convertPoint:corner toView:mView];
-    aResizerRect->SetRect(NSToIntRound(corner.x) - resizeIndicatorWidth,
-                          NSToIntRound(corner.y) - resizeIndicatorHeight,
-                          resizeIndicatorWidth, resizeIndicatorHeight);
-  }
-  return true;
-}
-
-nsresult nsChildView::SynthesizeNativeKeyEvent(int32_t aNativeKeyboardLayout,
-                                               int32_t aNativeKeyCode,
-                                               uint32_t aModifierFlags,
-                                               const nsAString& aCharacters,
-                                               const nsAString& aUnmodifiedCharacters,
-                                               nsIObserver* aObserver)
-{
-  AutoObserverNotifier notifier(aObserver, "keyevent");
-  return mTextInputHandler->SynthesizeNativeKeyEvent(aNativeKeyboardLayout,
-                                                     aNativeKeyCode,
-                                                     aModifierFlags,
-                                                     aCharacters,
-                                                     aUnmodifiedCharacters);
-}
-
-nsresult nsChildView::SynthesizeNativeMouseEvent(LayoutDeviceIntPoint aPoint,
-                                                 uint32_t aNativeMessage,
-                                                 uint32_t aModifierFlags,
-                                                 nsIObserver* aObserver)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  AutoObserverNotifier notifier(aObserver, "mouseevent");
-
-  NSPoint pt =
-    nsCocoaUtils::DevPixelsToCocoaPoints(aPoint, BackingScaleFactor());
-
-  // Move the mouse cursor to the requested position and reconnect it to the mouse.
-  CGWarpMouseCursorPosition(NSPointToCGPoint(pt));
-  CGAssociateMouseAndMouseCursorPosition(true);
-
-  // aPoint is given with the origin on the top left, but convertScreenToBase
-  // expects a point in a coordinate system that has its origin on the bottom left.
-  NSPoint screenPoint = NSMakePoint(pt.x, nsCocoaUtils::FlippedScreenY(pt.y));
-  NSPoint windowPoint =
-    nsCocoaUtils::ConvertPointFromScreen([mView window], screenPoint);
-
-  NSEvent* event = [NSEvent mouseEventWithType:(NSEventType)aNativeMessage
-                                      location:windowPoint
-                                 modifierFlags:aModifierFlags
-                                     timestamp:[[NSProcessInfo processInfo] systemUptime]
-                                  windowNumber:[[mView window] windowNumber]
-                                       context:nil
-                                   eventNumber:0
-                                    clickCount:1
-                                      pressure:0.0];
-
-  if (!event)
-    return NS_ERROR_FAILURE;
-
-  if ([[mView window] isKindOfClass:[BaseWindow class]]) {
-    // Tracking area events don't end up in their tracking areas when sent
-    // through [NSApp sendEvent:], so pass them directly to the right methods.
-    BaseWindow* window = (BaseWindow*)[mView window];
-    if (aNativeMessage == NSMouseEntered) {
-      [window mouseEntered:event];
-      return NS_OK;
-    }
-    if (aNativeMessage == NSMouseExited) {
-      [window mouseExited:event];
-      return NS_OK;
-    }
-    if (aNativeMessage == NSMouseMoved) {
-      [window mouseMoved:event];
-      return NS_OK;
-    }
-  }
-
-  [NSApp sendEvent:event];
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-nsresult nsChildView::SynthesizeNativeMouseScrollEvent(mozilla::LayoutDeviceIntPoint aPoint,
-                                                       uint32_t aNativeMessage,
-                                                       double aDeltaX,
-                                                       double aDeltaY,
-                                                       double aDeltaZ,
-                                                       uint32_t aModifierFlags,
-                                                       uint32_t aAdditionalFlags,
-                                                       nsIObserver* aObserver)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  AutoObserverNotifier notifier(aObserver, "mousescrollevent");
-
-  NSPoint pt =
-    nsCocoaUtils::DevPixelsToCocoaPoints(aPoint, BackingScaleFactor());
-
-  // Move the mouse cursor to the requested position and reconnect it to the mouse.
-  CGWarpMouseCursorPosition(NSPointToCGPoint(pt));
-  CGAssociateMouseAndMouseCursorPosition(true);
-
-  // Mostly copied from http://stackoverflow.com/a/6130349
-  CGScrollEventUnit units =
-    (aAdditionalFlags & nsIDOMWindowUtils::MOUSESCROLL_SCROLL_LINES)
-    ? kCGScrollEventUnitLine : kCGScrollEventUnitPixel;
-  CGEventRef cgEvent = CGEventCreateScrollWheelEvent(NULL, units, 3, aDeltaY, aDeltaX, aDeltaZ);
-  if (!cgEvent) {
-    return NS_ERROR_FAILURE;
-  }
-
-  CGEventPost(kCGHIDEventTap, cgEvent);
-  CFRelease(cgEvent);
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-nsresult nsChildView::SynthesizeNativeTouchPoint(uint32_t aPointerId,
-                                                 TouchPointerState aPointerState,
-                                                 mozilla::LayoutDeviceIntPoint aPoint,
-                                                 double aPointerPressure,
-                                                 uint32_t aPointerOrientation,
-                                                 nsIObserver* aObserver)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  AutoObserverNotifier notifier(aObserver, "touchpoint");
-
-  MOZ_ASSERT(NS_IsMainThread());
-  if (aPointerState == TOUCH_HOVER) {
-    return NS_ERROR_UNEXPECTED;
-  }
-
-  if (!mSynthesizedTouchInput) {
-    mSynthesizedTouchInput = MakeUnique<MultiTouchInput>();
-  }
-
-  LayoutDeviceIntPoint pointInWindow = aPoint - WidgetToScreenOffset();
-  MultiTouchInput inputToDispatch = UpdateSynthesizedTouchState(
-      mSynthesizedTouchInput.get(), PR_IntervalNow(), TimeStamp::Now(),
-      aPointerId, aPointerState, pointInWindow, aPointerPressure,
-      aPointerOrientation);
-  DispatchTouchInput(inputToDispatch);
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-// First argument has to be an NSMenu representing the application's top-level
-// menu bar. The returned item is *not* retained.
-static NSMenuItem* NativeMenuItemWithLocation(NSMenu* menubar, NSString* locationString)
-{
-  NSArray* indexes = [locationString componentsSeparatedByString:@"|"];
-  unsigned int indexCount = [indexes count];
-  if (indexCount == 0)
-    return nil;
-
-  NSMenu* currentSubmenu = [NSApp mainMenu];
-  for (unsigned int i = 0; i < indexCount; i++) {
-    int targetIndex;
-    // We remove the application menu from consideration for the top-level menu
-    if (i == 0)
-      targetIndex = [[indexes objectAtIndex:i] intValue] + 1;
-    else
-      targetIndex = [[indexes objectAtIndex:i] intValue];
-    int itemCount = [currentSubmenu numberOfItems];
-    if (targetIndex < itemCount) {
-      NSMenuItem* menuItem = [currentSubmenu itemAtIndex:targetIndex];
-      // if this is the last index just return the menu item
-      if (i == (indexCount - 1))
-        return menuItem;
-      // if this is not the last index find the submenu and keep going
-      if ([menuItem hasSubmenu])
-        currentSubmenu = [menuItem submenu];
-      else
-        return nil;
-    }
-  }
-
-  return nil;
-}
-
-// Used for testing native menu system structure and event handling.
-NS_IMETHODIMP nsChildView::ActivateNativeMenuItemAt(const nsAString& indexString)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  NSString* locationString = [NSString stringWithCharacters:reinterpret_cast<const unichar*>(indexString.BeginReading())
-                                                     length:indexString.Length()];
-  NSMenuItem* item = NativeMenuItemWithLocation([NSApp mainMenu], locationString);
-  // We can't perform an action on an item with a submenu, that will raise
-  // an obj-c exception.
-  if (item && ![item hasSubmenu]) {
-    NSMenu* parent = [item menu];
-    if (parent) {
-      // NSLog(@"Performing action for native menu item titled: %@\n",
-      //       [[currentSubmenu itemAtIndex:targetIndex] title]);
-      [parent performActionForItemAtIndex:[parent indexOfItem:item]];
-      return NS_OK;
-    }
-  }
-  return NS_ERROR_FAILURE;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-// Used for testing native menu system structure and event handling.
-NS_IMETHODIMP nsChildView::ForceUpdateNativeMenuAt(const nsAString& indexString)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  nsCocoaWindow *widget = GetXULWindowWidget();
-  if (widget) {
-    nsMenuBarX* mb = widget->GetMenuBar();
-    if (mb) {
-      if (indexString.IsEmpty())
-        mb->ForceNativeMenuReload();
-      else
-        mb->ForceUpdateNativeMenuAt(indexString);
-    }
-  }
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-#pragma mark -
-
-#ifdef INVALIDATE_DEBUGGING
-
-static Boolean KeyDown(const UInt8 theKey)
-{
-  KeyMap map;
-  GetKeys(map);
-  return ((*((UInt8 *)map + (theKey >> 3)) >> (theKey & 7)) & 1) != 0;
-}
-
-static Boolean caps_lock()
-{
-  return KeyDown(0x39);
-}
-
-static void blinkRect(Rect* r)
-{
-  StRegionFromPool oldClip;
-  if (oldClip != NULL)
-    ::GetClip(oldClip);
-
-  ::ClipRect(r);
-  ::InvertRect(r);
-  UInt32 end = ::TickCount() + 5;
-  while (::TickCount() < end) ;
-  ::InvertRect(r);
-
-  if (oldClip != NULL)
-    ::SetClip(oldClip);
-}
-
-static void blinkRgn(RgnHandle rgn)
-{
-  StRegionFromPool oldClip;
-  if (oldClip != NULL)
-    ::GetClip(oldClip);
-
-  ::SetClip(rgn);
-  ::InvertRgn(rgn);
-  UInt32 end = ::TickCount() + 5;
-  while (::TickCount() < end) ;
-  ::InvertRgn(rgn);
-
-  if (oldClip != NULL)
-    ::SetClip(oldClip);
-}
-
-#endif
-
-// Invalidate this component's visible area
-NS_IMETHODIMP nsChildView::Invalidate(const LayoutDeviceIntRect& aRect)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  if (!mView || !mVisible)
-    return NS_OK;
-
-  NS_ASSERTION(GetLayerManager()->GetBackendType() != LayersBackend::LAYERS_CLIENT,
-               "Shouldn't need to invalidate with accelerated OMTC layers!");
-
-  [[mView pixelHostingView] setNeedsDisplayInRect:DevPixelsToCocoaPoints(aRect)];
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-bool
-nsChildView::WidgetTypeSupportsAcceleration()
-{
-  // Don't use OpenGL for transparent windows or for popup windows.
-  return mView && [[mView window] isOpaque] &&
-         ![[mView window] isKindOfClass:[PopupWindow class]];
-}
-
-bool
-nsChildView::ShouldUseOffMainThreadCompositing()
-{
-  // Don't use OMTC for transparent windows or for popup windows.
-  if (!mView || ![[mView window] isOpaque] ||
-      [[mView window] isKindOfClass:[PopupWindow class]])
-    return false;
-
-  return nsBaseWidget::ShouldUseOffMainThreadCompositing();
-}
-
-inline uint16_t COLOR8TOCOLOR16(uint8_t color8)
-{
-  // return (color8 == 0xFF ? 0xFFFF : (color8 << 8));
-  return (color8 << 8) | color8;  /* (color8 * 257) == (color8 * 0x0101) */
-}
-
-#pragma mark -
-
-nsresult nsChildView::ConfigureChildren(const nsTArray<Configuration>& aConfigurations)
-{
-  return NS_OK;
-}
-
-// Invokes callback and ProcessEvent methods on Event Listener object
-NS_IMETHODIMP nsChildView::DispatchEvent(WidgetGUIEvent* event,
-                                         nsEventStatus& aStatus)
-{
-  RefPtr<nsChildView> kungFuDeathGrip(this);
-
-#ifdef DEBUG
-  debug_DumpEvent(stdout, event->mWidget, event, "something", 0);
-#endif
-
-  NS_ASSERTION(!(mTextInputHandler && mTextInputHandler->IsIMEComposing() &&
-                 event->HasKeyEventMessage()),
-    "Any key events should not be fired during IME composing");
-
-  if (event->mFlags.mIsSynthesizedForTests) {
-    WidgetKeyboardEvent* keyEvent = event->AsKeyboardEvent();
-    if (keyEvent) {
-      nsresult rv = mTextInputHandler->AttachNativeKeyEvent(*keyEvent);
-      NS_ENSURE_SUCCESS(rv, rv);
-    }
-  }
-
-  aStatus = nsEventStatus_eIgnore;
-
-  nsIWidgetListener* listener = mWidgetListener;
-
-  // If the listener is NULL, check if the parent is a popup. If it is, then
-  // this child is the popup content view attached to a popup. Get the
-  // listener from the parent popup instead.
-  nsCOMPtr<nsIWidget> parentWidget = mParentWidget;
-  if (!listener && parentWidget) {
-    if (parentWidget->WindowType() == eWindowType_popup) {
-      // Check just in case event->mWidget isn't this widget
-      if (event->mWidget) {
-        listener = event->mWidget->GetWidgetListener();
-      }
-      if (!listener) {
-        event->mWidget = parentWidget;
-        listener = parentWidget->GetWidgetListener();
-      }
-    }
-  }
-
-  if (listener)
-    aStatus = listener->HandleEvent(event, mUseAttachedEvents);
-
-  return NS_OK;
-}
-
-bool nsChildView::DispatchWindowEvent(WidgetGUIEvent& event)
-{
-  nsEventStatus status;
-  DispatchEvent(&event, status);
-  return ConvertStatus(status);
-}
-
-nsIWidget*
-nsChildView::GetWidgetForListenerEvents()
-{
-  // If there is no listener, use the parent popup's listener if that exists.
-  if (!mWidgetListener && mParentWidget &&
-      mParentWidget->WindowType() == eWindowType_popup) {
-    return mParentWidget;
-  }
-
-  return this;
-}
-
-void nsChildView::WillPaintWindow()
-{
-  nsCOMPtr<nsIWidget> widget = GetWidgetForListenerEvents();
-
-  nsIWidgetListener* listener = widget->GetWidgetListener();
-  if (listener) {
-    listener->WillPaintWindow(widget);
-  }
-}
-
-bool nsChildView::PaintWindow(LayoutDeviceIntRegion aRegion)
-{
-  nsCOMPtr<nsIWidget> widget = GetWidgetForListenerEvents();
-
-  nsIWidgetListener* listener = widget->GetWidgetListener();
-  if (!listener)
-    return false;
-
-  bool returnValue = false;
-  bool oldDispatchPaint = mIsDispatchPaint;
-  mIsDispatchPaint = true;
-  returnValue = listener->PaintWindow(widget, aRegion);
-
-  listener = widget->GetWidgetListener();
-  if (listener) {
-    listener->DidPaintWindow();
-  }
-
-  mIsDispatchPaint = oldDispatchPaint;
-  return returnValue;
-}
-
-bool
-nsChildView::PaintWindowInContext(CGContextRef aContext, const LayoutDeviceIntRegion& aRegion, gfx::IntSize aSurfaceSize)
-{
-  if (!mBackingSurface || mBackingSurface->GetSize() != aSurfaceSize) {
-    mBackingSurface =
-      gfxPlatform::GetPlatform()->CreateOffscreenContentDrawTarget(aSurfaceSize,
-                                                                   gfx::SurfaceFormat::B8G8R8A8);
-    if (!mBackingSurface) {
-      return false;
-    }
-  }
-
-  RefPtr<gfxContext> targetContext = gfxContext::CreateOrNull(mBackingSurface);
-  MOZ_ASSERT(targetContext); // already checked the draw target above
-
-  // Set up the clip region and clear existing contents in the backing surface.
-  targetContext->NewPath();
-  for (auto iter = aRegion.RectIter(); !iter.Done(); iter.Next()) {
-    const LayoutDeviceIntRect& r = iter.Get();
-    targetContext->Rectangle(gfxRect(r.x, r.y, r.width, r.height));
-    mBackingSurface->ClearRect(gfx::Rect(r.ToUnknownRect()));
-  }
-  targetContext->Clip();
-
-  nsAutoRetainCocoaObject kungFuDeathGrip(mView);
-  bool painted = false;
-  if (GetLayerManager()->GetBackendType() == LayersBackend::LAYERS_BASIC) {
-    nsBaseWidget::AutoLayerManagerSetup
-      setupLayerManager(this, targetContext, BufferMode::BUFFER_NONE);
-    painted = PaintWindow(aRegion);
-  } else if (GetLayerManager()->GetBackendType() == LayersBackend::LAYERS_CLIENT) {
-    // We only need this so that we actually get DidPaintWindow fired
-    painted = PaintWindow(aRegion);
-  }
-
-  uint8_t* data;
-  gfx::IntSize size;
-  int32_t stride;
-  gfx::SurfaceFormat format;
-
-  if (!mBackingSurface->LockBits(&data, &size, &stride, &format)) {
-    return false;
-  }
-
-  // Draw the backing surface onto the window.
-  CGDataProviderRef provider = CGDataProviderCreateWithData(NULL, data, stride * size.height, NULL);
-  NSColorSpace* colorSpace = [[mView window] colorSpace];
-  CGImageRef image = CGImageCreate(size.width, size.height, 8, 32, stride,
-                                   [colorSpace CGColorSpace],
-                                   kCGBitmapByteOrder32Host | kCGImageAlphaPremultipliedFirst,
-                                   provider, NULL, false, kCGRenderingIntentDefault);
-  CGContextSaveGState(aContext);
-  CGContextTranslateCTM(aContext, 0, size.height);
-  CGContextScaleCTM(aContext, 1, -1);
-  CGContextSetBlendMode(aContext, kCGBlendModeCopy);
-  CGContextDrawImage(aContext, CGRectMake(0, 0, size.width, size.height), image);
-  CGImageRelease(image);
-  CGDataProviderRelease(provider);
-  CGContextRestoreGState(aContext);
-
-  mBackingSurface->ReleaseBits(data);
-
-  return painted;
-}
-
-#pragma mark -
-
-void nsChildView::ReportMoveEvent()
-{
-   NotifyWindowMoved(mBounds.x, mBounds.y);
-}
-
-void nsChildView::ReportSizeEvent()
-{
-  if (mWidgetListener)
-    mWidgetListener->WindowResized(this, mBounds.width, mBounds.height);
-}
-
-#pragma mark -
-
-LayoutDeviceIntPoint nsChildView::GetClientOffset()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  NSPoint origin = [mView convertPoint:NSMakePoint(0, 0) toView:nil];
-  origin.y = [[mView window] frame].size.height - origin.y;
-  return CocoaPointsToDevPixels(origin);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(LayoutDeviceIntPoint(0, 0));
-}
-
-//    Return the offset between this child view and the screen.
-//    @return       -- widget origin in device-pixel coords
-LayoutDeviceIntPoint nsChildView::WidgetToScreenOffset()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  NSPoint origin = NSMakePoint(0, 0);
-
-  // 1. First translate view origin point into window coords.
-  // The returned point is in bottom-left coordinates.
-  origin = [mView convertPoint:origin toView:nil];
-
-  // 2. We turn the window-coord rect's origin into screen (still bottom-left) coords.
-  origin = nsCocoaUtils::ConvertPointToScreen([mView window], origin);
-
-  // 3. Since we're dealing in bottom-left coords, we need to make it top-left coords
-  //    before we pass it back to Gecko.
-  FlipCocoaScreenCoordinate(origin);
-
-  // convert to device pixels
-  return CocoaPointsToDevPixels(origin);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(LayoutDeviceIntPoint(0,0));
-}
-
-NS_IMETHODIMP nsChildView::SetTitle(const nsAString& title)
-{
-  // child views don't have titles
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsChildView::GetAttention(int32_t aCycleCount)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  [NSApp requestUserAttention:NSInformationalRequest];
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-/* static */
-bool nsChildView::DoHasPendingInputEvent()
-{
-  return sLastInputEventCount != GetCurrentInputEventCount();
-}
-
-/* static */
-uint32_t nsChildView::GetCurrentInputEventCount()
-{
-  // Can't use kCGAnyInputEventType because that updates too rarely for us (and
-  // always in increments of 30+!) and because apparently it's sort of broken
-  // on Tiger.  So just go ahead and query the counters we care about.
-  static const CGEventType eventTypes[] = {
-    kCGEventLeftMouseDown,
-    kCGEventLeftMouseUp,
-    kCGEventRightMouseDown,
-    kCGEventRightMouseUp,
-    kCGEventMouseMoved,
-    kCGEventLeftMouseDragged,
-    kCGEventRightMouseDragged,
-    kCGEventKeyDown,
-    kCGEventKeyUp,
-    kCGEventScrollWheel,
-    kCGEventTabletPointer,
-    kCGEventOtherMouseDown,
-    kCGEventOtherMouseUp,
-    kCGEventOtherMouseDragged
-  };
-
-  uint32_t eventCount = 0;
-  for (uint32_t i = 0; i < ArrayLength(eventTypes); ++i) {
-    eventCount +=
-      CGEventSourceCounterForEventType(kCGEventSourceStateCombinedSessionState,
-                                       eventTypes[i]);
-  }
-  return eventCount;
-}
-
-/* static */
-void nsChildView::UpdateCurrentInputEventCount()
-{
-  sLastInputEventCount = GetCurrentInputEventCount();
-}
-
-bool nsChildView::HasPendingInputEvent()
-{
-  return DoHasPendingInputEvent();
-}
-
-#pragma mark -
-
-NS_IMETHODIMP
-nsChildView::StartPluginIME(const mozilla::WidgetKeyboardEvent& aKeyboardEvent,
-                            int32_t aPanelX, int32_t aPanelY,
-                            nsString& aCommitted)
-{
-  NS_ENSURE_TRUE(mView, NS_ERROR_NOT_AVAILABLE);
-
-  ComplexTextInputPanel* ctiPanel =
-    ComplexTextInputPanel::GetSharedComplexTextInputPanel();
-
-  ctiPanel->PlacePanel(aPanelX, aPanelY);
-  // We deliberately don't use TextInputHandler::GetCurrentKeyEvent() to
-  // obtain the NSEvent* we pass to InterpretKeyEvent().  This works fine in
-  // non-e10s mode.  But in e10s mode TextInputHandler::HandleKeyDownEvent()
-  // has already returned, so the relevant KeyEventState* (and its NSEvent*)
-  // is already out of scope.  Furthermore we don't *need* to use it.
-  // StartPluginIME() is only ever called to start a new IME session when none
-  // currently exists.  So nested IME should never reach here, and so it should
-  // be fine to use the last key-down event received by -[ChildView keyDown:]
-  // (as we currently do).
-  ctiPanel->InterpretKeyEvent([(ChildView*)mView lastKeyDownEvent], aCommitted);
-
-  return NS_OK;
-}
-
-void
-nsChildView::SetPluginFocused(bool& aFocused)
-{
-  if (aFocused == mPluginFocused) {
-    return;
-  }
-  if (!aFocused) {
-    ComplexTextInputPanel* ctiPanel =
-      ComplexTextInputPanel::GetSharedComplexTextInputPanel();
-    if (ctiPanel) {
-      ctiPanel->CancelComposition();
-    }
-  }
-  mPluginFocused = aFocused;
-}
-
-NS_IMETHODIMP_(void)
-nsChildView::SetInputContext(const InputContext& aContext,
-                             const InputContextAction& aAction)
-{
-  NS_ENSURE_TRUE_VOID(mTextInputHandler);
-
-  if (mTextInputHandler->IsFocused()) {
-    if (aContext.IsPasswordEditor()) {
-      TextInputHandler::EnableSecureEventInput();
-    } else {
-      TextInputHandler::EnsureSecureEventInputDisabled();
-    }
-  }
-
-  mInputContext = aContext;
-  switch (aContext.mIMEState.mEnabled) {
-    case IMEState::ENABLED:
-    case IMEState::PLUGIN:
-      mTextInputHandler->SetASCIICapableOnly(false);
-      mTextInputHandler->EnableIME(true);
-      if (mInputContext.mIMEState.mOpen != IMEState::DONT_CHANGE_OPEN_STATE) {
-        mTextInputHandler->SetIMEOpenState(
-          mInputContext.mIMEState.mOpen == IMEState::OPEN);
-      }
-      break;
-    case IMEState::DISABLED:
-      mTextInputHandler->SetASCIICapableOnly(false);
-      mTextInputHandler->EnableIME(false);
-      break;
-    case IMEState::PASSWORD:
-      mTextInputHandler->SetASCIICapableOnly(true);
-      mTextInputHandler->EnableIME(false);
-      break;
-    default:
-      NS_ERROR("not implemented!");
-  }
-}
-
-NS_IMETHODIMP_(InputContext)
-nsChildView::GetInputContext()
-{
-  switch (mInputContext.mIMEState.mEnabled) {
-    case IMEState::ENABLED:
-    case IMEState::PLUGIN:
-      if (mTextInputHandler) {
-        mInputContext.mIMEState.mOpen =
-          mTextInputHandler->IsIMEOpened() ? IMEState::OPEN : IMEState::CLOSED;
-        break;
-      }
-      // If mTextInputHandler is null, set CLOSED instead...
-      MOZ_FALLTHROUGH;
-    default:
-      mInputContext.mIMEState.mOpen = IMEState::CLOSED;
-      break;
-  }
-  return mInputContext;
-}
-
-NS_IMETHODIMP_(TextEventDispatcherListener*)
-nsChildView::GetNativeTextEventDispatcherListener()
-{
-  if (NS_WARN_IF(!mTextInputHandler)) {
-    return nullptr;
-  }
-  return mTextInputHandler;
-}
-
-NS_IMETHODIMP
-nsChildView::AttachNativeKeyEvent(mozilla::WidgetKeyboardEvent& aEvent)
-{
-  NS_ENSURE_TRUE(mTextInputHandler, NS_ERROR_NOT_AVAILABLE);
-  return mTextInputHandler->AttachNativeKeyEvent(aEvent);
-}
-
-bool
-nsChildView::ExecuteNativeKeyBindingRemapped(NativeKeyBindingsType aType,
-                                             const WidgetKeyboardEvent& aEvent,
-                                             DoCommandCallback aCallback,
-                                             void* aCallbackData,
-                                             uint32_t aGeckoKeyCode,
-                                             uint32_t aCocoaKeyCode)
-{
-  NSEvent *originalEvent = reinterpret_cast<NSEvent*>(aEvent.mNativeKeyEvent);
-
-  WidgetKeyboardEvent modifiedEvent(aEvent);
-  modifiedEvent.mKeyCode = aGeckoKeyCode;
-
-  unichar ch = nsCocoaUtils::ConvertGeckoKeyCodeToMacCharCode(aGeckoKeyCode);
-  NSString *chars =
-    [[[NSString alloc] initWithCharacters:&ch length:1] autorelease];
-
-  modifiedEvent.mNativeKeyEvent =
-    [NSEvent keyEventWithType:[originalEvent type]
-                     location:[originalEvent locationInWindow]
-                modifierFlags:[originalEvent modifierFlags]
-                    timestamp:[originalEvent timestamp]
-                 windowNumber:[originalEvent windowNumber]
-                      context:[originalEvent context]
-                   characters:chars
-  charactersIgnoringModifiers:chars
-                    isARepeat:[originalEvent isARepeat]
-                      keyCode:aCocoaKeyCode];
-
-  NativeKeyBindings* keyBindings = NativeKeyBindings::GetInstance(aType);
-  return keyBindings->Execute(modifiedEvent, aCallback, aCallbackData);
-}
-
-NS_IMETHODIMP_(bool)
-nsChildView::ExecuteNativeKeyBinding(NativeKeyBindingsType aType,
-                                     const WidgetKeyboardEvent& aEvent,
-                                     DoCommandCallback aCallback,
-                                     void* aCallbackData)
-{
-  // If the key is a cursor-movement arrow, and the current selection has
-  // vertical writing-mode, we'll remap so that the movement command
-  // generated (in terms of characters/lines) will be appropriate for
-  // the physical direction of the arrow.
-  if (aEvent.mKeyCode >= NS_VK_LEFT && aEvent.mKeyCode <= NS_VK_DOWN) {
-    WidgetQueryContentEvent query(true, eQuerySelectedText, this);
-    DispatchWindowEvent(query);
-
-    if (query.mSucceeded && query.mReply.mWritingMode.IsVertical()) {
-      uint32_t geckoKey = 0;
-      uint32_t cocoaKey = 0;
-
-      switch (aEvent.mKeyCode) {
-      case NS_VK_LEFT:
-        if (query.mReply.mWritingMode.IsVerticalLR()) {
-          geckoKey = NS_VK_UP;
-          cocoaKey = kVK_UpArrow;
-        } else {
-          geckoKey = NS_VK_DOWN;
-          cocoaKey = kVK_DownArrow;
-        }
-        break;
-
-      case NS_VK_RIGHT:
-        if (query.mReply.mWritingMode.IsVerticalLR()) {
-          geckoKey = NS_VK_DOWN;
-          cocoaKey = kVK_DownArrow;
-        } else {
-          geckoKey = NS_VK_UP;
-          cocoaKey = kVK_UpArrow;
-        }
-        break;
-
-      case NS_VK_UP:
-        geckoKey = NS_VK_LEFT;
-        cocoaKey = kVK_LeftArrow;
-        break;
-
-      case NS_VK_DOWN:
-        geckoKey = NS_VK_RIGHT;
-        cocoaKey = kVK_RightArrow;
-        break;
-      }
-
-      return ExecuteNativeKeyBindingRemapped(aType, aEvent, aCallback,
-                                             aCallbackData,
-                                             geckoKey, cocoaKey);
-    }
-  }
-
-  NativeKeyBindings* keyBindings = NativeKeyBindings::GetInstance(aType);
-  return keyBindings->Execute(aEvent, aCallback, aCallbackData);
-}
-
-nsIMEUpdatePreference
-nsChildView::GetIMEUpdatePreference()
-{
-  // XXX Shouldn't we move floating window which shows composition string
-  //     when plugin has focus and its parent is scrolled or the window is
-  //     moved?
-  return nsIMEUpdatePreference();
-}
-
-NSView<mozView>* nsChildView::GetEditorView()
-{
-  NSView<mozView>* editorView = mView;
-  // We need to get editor's view. E.g., when the focus is in the bookmark
-  // dialog, the view is <panel> element of the dialog.  At this time, the key
-  // events are processed the parent window's view that has native focus.
-  WidgetQueryContentEvent textContent(true, eQueryTextContent, this);
-  textContent.InitForQueryTextContent(0, 0);
-  DispatchWindowEvent(textContent);
-  if (textContent.mSucceeded && textContent.mReply.mFocusedWidget) {
-    NSView<mozView>* view = static_cast<NSView<mozView>*>(
-      textContent.mReply.mFocusedWidget->GetNativeData(NS_NATIVE_WIDGET));
-    if (view)
-      editorView = view;
-  }
-  return editorView;
-}
-
-#pragma mark -
-
-void
-nsChildView::CreateCompositor()
-{
-  nsBaseWidget::CreateCompositor();
-  if (mCompositorBridgeChild) {
-    [(ChildView *)mView setUsingOMTCompositor:true];
-  }
-}
-
-void
-nsChildView::ConfigureAPZCTreeManager()
-{
-  nsBaseWidget::ConfigureAPZCTreeManager();
-}
-
-void
-nsChildView::ConfigureAPZControllerThread()
-{
-  if (gfxPrefs::AsyncPanZoomSeparateEventThread()) {
-    // The EventThreadRunner is the controller thread, but it doesn't
-    // have a MessageLoop.
-    APZThreadUtils::SetControllerThread(nullptr);
-  } else {
-    nsBaseWidget::ConfigureAPZControllerThread();
-  }
-}
-
-LayoutDeviceIntRect
-nsChildView::RectContainingTitlebarControls()
-{
-  // Start with a thin strip at the top of the window for the highlight line.
-  NSRect rect = NSMakeRect(0, 0, [mView bounds].size.width,
-                           [(ChildView*)mView cornerRadius]);
-
-  // If we draw the titlebar title string, increase the height to the default
-  // titlebar height. This height does not necessarily include all the titlebar
-  // controls because we may have moved them further down, but at least it will
-  // include the whole title text.
-  BaseWindow* window = (BaseWindow*)[mView window];
-  if ([window wantsTitleDrawn] && [window isKindOfClass:[ToolbarWindow class]]) {
-    CGFloat defaultTitlebarHeight = [(ToolbarWindow*)window titlebarHeight];
-    rect.size.height = std::max(rect.size.height, defaultTitlebarHeight);
-  }
-
-  // Add the rects of the titlebar controls.
-  for (id view in [window titlebarControls]) {
-    rect = NSUnionRect(rect, [mView convertRect:[view bounds] fromView:view]);
-  }
-  return CocoaPointsToDevPixels(rect);
-}
-
-void
-nsChildView::PrepareWindowEffects()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  bool canBeOpaque;
-  {
-    MutexAutoLock lock(mEffectsLock);
-    mShowsResizeIndicator = ShowsResizeIndicator(&mResizeIndicatorRect);
-    mHasRoundedBottomCorners = [(ChildView*)mView hasRoundedBottomCorners];
-    CGFloat cornerRadius = [(ChildView*)mView cornerRadius];
-    mDevPixelCornerRadius = cornerRadius * BackingScaleFactor();
-    mIsCoveringTitlebar = [(ChildView*)mView isCoveringTitlebar];
-    NSInteger styleMask = [[mView window] styleMask];
-    bool wasFullscreen = mIsFullscreen;
-    mIsFullscreen = (styleMask & NSFullScreenWindowMask) || !(styleMask & NSTitledWindowMask);
-
-    canBeOpaque = mIsFullscreen && wasFullscreen;
-    if (canBeOpaque && VibrancyManager::SystemSupportsVibrancy()) {
-      canBeOpaque = !EnsureVibrancyManager().HasVibrantRegions();
-    }
-    if (mIsCoveringTitlebar) {
-      mTitlebarRect = RectContainingTitlebarControls();
-      UpdateTitlebarCGContext();
-    }
-  }
-
-  // If we've just transitioned into or out of full screen then update the opacity on our GLContext.
-  if (canBeOpaque != mIsOpaque) {
-    mIsOpaque = canBeOpaque;
-    [(ChildView*)mView setGLOpaque:canBeOpaque];
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void
-nsChildView::CleanupWindowEffects()
-{
-  mResizerImage = nullptr;
-  mCornerMaskImage = nullptr;
-  mTitlebarImage = nullptr;
-}
-
-bool
-nsChildView::PreRender(WidgetRenderingContext* aContext)
-{
-  UniquePtr<GLManager> manager(GLManager::CreateGLManager(aContext->mLayerManager));
-  if (!manager) {
-    return true;
-  }
-
-  // The lock makes sure that we don't attempt to tear down the view while
-  // compositing. That would make us unable to call postRender on it when the
-  // composition is done, thus keeping the GL context locked forever.
-  mViewTearDownLock.Lock();
-
-  NSOpenGLContext *glContext = GLContextCGL::Cast(manager->gl())->GetNSOpenGLContext();
-
-  if (![(ChildView*)mView preRender:glContext]) {
-    mViewTearDownLock.Unlock();
-    return false;
-  }
-  return true;
-}
-
-void
-nsChildView::PostRender(WidgetRenderingContext* aContext)
-{
-  UniquePtr<GLManager> manager(GLManager::CreateGLManager(aContext->mLayerManager));
-  if (!manager) {
-    return;
-  }
-  NSOpenGLContext *glContext = GLContextCGL::Cast(manager->gl())->GetNSOpenGLContext();
-  [(ChildView*)mView postRender:glContext];
-  mViewTearDownLock.Unlock();
-}
-
-void
-nsChildView::DrawWindowOverlay(WidgetRenderingContext* aContext,
-                               LayoutDeviceIntRect aRect)
-{
-  mozilla::UniquePtr<GLManager> manager(GLManager::CreateGLManager(aContext->mLayerManager));
-  if (manager) {
-    DrawWindowOverlay(manager.get(), aRect);
-  }
-}
-
-void
-nsChildView::DrawWindowOverlay(GLManager* aManager, LayoutDeviceIntRect aRect)
-{
-  GLContext* gl = aManager->gl();
-  ScopedGLState scopedScissorTestState(gl, LOCAL_GL_SCISSOR_TEST, false);
-
-  MaybeDrawTitlebar(aManager);
-  MaybeDrawResizeIndicator(aManager);
-  MaybeDrawRoundedCorners(aManager, aRect);
-}
-
-static void
-ClearRegion(gfx::DrawTarget *aDT, LayoutDeviceIntRegion aRegion)
-{
-  gfxUtils::ClipToRegion(aDT, aRegion.ToUnknownRegion());
-  aDT->ClearRect(gfx::Rect(0, 0, aDT->GetSize().width, aDT->GetSize().height));
-  aDT->PopClip();
-}
-
-static void
-DrawResizer(CGContextRef aCtx)
-{
-  CGContextSetShouldAntialias(aCtx, false);
-  CGPoint points[6];
-  points[0] = CGPointMake(13.0f, 4.0f);
-  points[1] = CGPointMake(3.0f, 14.0f);
-  points[2] = CGPointMake(13.0f, 8.0f);
-  points[3] = CGPointMake(7.0f, 14.0f);
-  points[4] = CGPointMake(13.0f, 12.0f);
-  points[5] = CGPointMake(11.0f, 14.0f);
-  CGContextSetRGBStrokeColor(aCtx, 0.00f, 0.00f, 0.00f, 0.15f);
-  CGContextStrokeLineSegments(aCtx, points, 6);
-
-  points[0] = CGPointMake(13.0f, 5.0f);
-  points[1] = CGPointMake(4.0f, 14.0f);
-  points[2] = CGPointMake(13.0f, 9.0f);
-  points[3] = CGPointMake(8.0f, 14.0f);
-  points[4] = CGPointMake(13.0f, 13.0f);
-  points[5] = CGPointMake(12.0f, 14.0f);
-  CGContextSetRGBStrokeColor(aCtx, 0.13f, 0.13f, 0.13f, 0.54f);
-  CGContextStrokeLineSegments(aCtx, points, 6);
-
-  points[0] = CGPointMake(13.0f, 6.0f);
-  points[1] = CGPointMake(5.0f, 14.0f);
-  points[2] = CGPointMake(13.0f, 10.0f);
-  points[3] = CGPointMake(9.0f, 14.0f);
-  points[5] = CGPointMake(13.0f, 13.9f);
-  points[4] = CGPointMake(13.0f, 14.0f);
-  CGContextSetRGBStrokeColor(aCtx, 0.84f, 0.84f, 0.84f, 0.55f);
-  CGContextStrokeLineSegments(aCtx, points, 6);
-}
-
-void
-nsChildView::MaybeDrawResizeIndicator(GLManager* aManager)
-{
-  MutexAutoLock lock(mEffectsLock);
-  if (!mShowsResizeIndicator) {
-    return;
-  }
-
-  if (!mResizerImage) {
-    mResizerImage = MakeUnique<RectTextureImage>();
-  }
-
-  LayoutDeviceIntSize size = mResizeIndicatorRect.Size();
-  mResizerImage->UpdateIfNeeded(size, LayoutDeviceIntRegion(), ^(gfx::DrawTarget* drawTarget, const LayoutDeviceIntRegion& updateRegion) {
-    ClearRegion(drawTarget, updateRegion);
-    gfx::BorrowedCGContext borrow(drawTarget);
-    DrawResizer(borrow.cg);
-    borrow.Finish();
-  });
-
-  mResizerImage->Draw(aManager, mResizeIndicatorRect.TopLeft());
-}
-
-// Draw the highlight line at the top of the titlebar.
-// This function draws into the current NSGraphicsContext and assumes flippedness.
-static void
-DrawTitlebarHighlight(NSSize aWindowSize, CGFloat aRadius, CGFloat aDevicePixelWidth)
-{
-  [NSGraphicsContext saveGraphicsState];
-
-  // Set up the clip path. We start with the outer rectangle and cut out a
-  // slightly smaller inner rectangle with rounded corners.
-  // The outer corners of the resulting path will be square, but they will be
-  // masked away in a later step.
-  NSBezierPath* path = [NSBezierPath bezierPath];
-  [path setWindingRule:NSEvenOddWindingRule];
-  NSRect pathRect = NSMakeRect(0, 0, aWindowSize.width, aRadius + 2);
-  [path appendBezierPathWithRect:pathRect];
-  pathRect = NSInsetRect(pathRect, aDevicePixelWidth, aDevicePixelWidth);
-  CGFloat innerRadius = aRadius - aDevicePixelWidth;
-  [path appendBezierPathWithRoundedRect:pathRect xRadius:innerRadius yRadius:innerRadius];
-  [path addClip];
-
-  // Now we fill the path with a subtle highlight gradient.
-  // We don't use NSGradient because it's 5x to 15x slower than the manual fill,
-  // as indicated by the performance test in bug 880620.
-  for (CGFloat y = 0; y < aRadius; y += aDevicePixelWidth) {
-    CGFloat t = y / aRadius;
-    [[NSColor colorWithDeviceWhite:1.0 alpha:0.4 * (1.0 - t)] set];
-    NSRectFillUsingOperation(NSMakeRect(0, y, aWindowSize.width, aDevicePixelWidth), NSCompositeSourceOver);
-  }
-
-  [NSGraphicsContext restoreGraphicsState];
-}
-
-static CGContextRef
-CreateCGContext(const LayoutDeviceIntSize& aSize)
-{
-  CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
-  CGContextRef ctx =
-    CGBitmapContextCreate(NULL,
-                          aSize.width,
-                          aSize.height,
-                          8 /* bitsPerComponent */,
-                          aSize.width * 4,
-                          cs,
-                          kCGBitmapByteOrder32Host | kCGImageAlphaPremultipliedFirst);
-  CGColorSpaceRelease(cs);
-
-  CGContextTranslateCTM(ctx, 0, aSize.height);
-  CGContextScaleCTM(ctx, 1, -1);
-  CGContextSetInterpolationQuality(ctx, kCGInterpolationLow);
-
-  return ctx;
-}
-
-LayoutDeviceIntSize
-TextureSizeForSize(const LayoutDeviceIntSize& aSize)
-{
-  return LayoutDeviceIntSize(RoundUpPow2(aSize.width),
-                             RoundUpPow2(aSize.height));
-}
-
-// When this method is entered, mEffectsLock is already being held.
-void
-nsChildView::UpdateTitlebarCGContext()
-{
-  if (mTitlebarRect.IsEmpty()) {
-    ReleaseTitlebarCGContext();
-    return;
-  }
-
-  NSRect titlebarRect = DevPixelsToCocoaPoints(mTitlebarRect);
-  NSRect dirtyRect = [mView convertRect:[(BaseWindow*)[mView window] getAndResetNativeDirtyRect] fromView:nil];
-  NSRect dirtyTitlebarRect = NSIntersectionRect(titlebarRect, dirtyRect);
-
-  LayoutDeviceIntSize texSize = TextureSizeForSize(mTitlebarRect.Size());
-  if (!mTitlebarCGContext ||
-      CGBitmapContextGetWidth(mTitlebarCGContext) != size_t(texSize.width) ||
-      CGBitmapContextGetHeight(mTitlebarCGContext) != size_t(texSize.height)) {
-    dirtyTitlebarRect = titlebarRect;
-
-    ReleaseTitlebarCGContext();
-
-    mTitlebarCGContext = CreateCGContext(texSize);
-  }
-
-  if (NSIsEmptyRect(dirtyTitlebarRect)) {
-    return;
-  }
-
-  CGContextRef ctx = mTitlebarCGContext;
-
-  CGContextSaveGState(ctx);
-
-  double scale = BackingScaleFactor();
-  CGContextScaleCTM(ctx, scale, scale);
-
-  CGContextClipToRect(ctx, NSRectToCGRect(dirtyTitlebarRect));
-  CGContextClearRect(ctx, NSRectToCGRect(dirtyTitlebarRect));
-
-  NSGraphicsContext* oldContext = [NSGraphicsContext currentContext];
-
-  CGContextSaveGState(ctx);
-
-  BaseWindow* window = (BaseWindow*)[mView window];
-  NSView* frameView = [[window contentView] superview];
-  if (![frameView isFlipped]) {
-    CGContextTranslateCTM(ctx, 0, [frameView bounds].size.height);
-    CGContextScaleCTM(ctx, 1, -1);
-  }
-  NSGraphicsContext* context = [NSGraphicsContext graphicsContextWithGraphicsPort:ctx flipped:[frameView isFlipped]];
-  [NSGraphicsContext setCurrentContext:context];
-
-  // Draw the title string.
-  if ([window wantsTitleDrawn] && [frameView respondsToSelector:@selector(_drawTitleBar:)]) {
-    [frameView _drawTitleBar:[frameView bounds]];
-  }
-
-  // Draw the titlebar controls into the titlebar image.
-  for (id view in [window titlebarControls]) {
-    NSRect viewFrame = [view frame];
-    NSRect viewRect = [mView convertRect:viewFrame fromView:frameView];
-    if (!NSIntersectsRect(dirtyTitlebarRect, viewRect)) {
-      continue;
-    }
-    // All of the titlebar controls we're interested in are subclasses of
-    // NSButton.
-    if (![view isKindOfClass:[NSButton class]]) {
-      continue;
-    }
-    NSButton *button = (NSButton *) view;
-    id cellObject = [button cell];
-    if (![cellObject isKindOfClass:[NSCell class]]) {
-      continue;
-    }
-    NSCell *cell = (NSCell *) cellObject;
-
-    CGContextSaveGState(ctx);
-    CGContextTranslateCTM(ctx, viewFrame.origin.x, viewFrame.origin.y);
-
-    if ([context isFlipped] != [view isFlipped]) {
-      CGContextTranslateCTM(ctx, 0, viewFrame.size.height);
-      CGContextScaleCTM(ctx, 1, -1);
-    }
-
-    [NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithGraphicsPort:ctx flipped:[view isFlipped]]];
-
-    if ([window useBrightTitlebarForeground] && !nsCocoaFeatures::OnYosemiteOrLater() &&
-        view == [window standardWindowButton:NSWindowFullScreenButton]) {
-      // Make the fullscreen button visible on dark titlebar backgrounds by
-      // drawing it into a new transparency layer and turning it white.
-      CGRect r = NSRectToCGRect([view bounds]);
-      CGContextBeginTransparencyLayerWithRect(ctx, r, nullptr);
-
-      // Draw twice for double opacity.
-      [cell drawWithFrame:[button bounds] inView:button];
-      [cell drawWithFrame:[button bounds] inView:button];
-
-      // Make it white.
-      CGContextSetBlendMode(ctx, kCGBlendModeSourceIn);
-      CGContextSetRGBFillColor(ctx, 1, 1, 1, 1);
-      CGContextFillRect(ctx, r);
-      CGContextSetBlendMode(ctx, kCGBlendModeNormal);
-
-      CGContextEndTransparencyLayer(ctx);
-    } else {
-      [cell drawWithFrame:[button bounds] inView:button];
-    }
-
-    [NSGraphicsContext setCurrentContext:context];
-    CGContextRestoreGState(ctx);
-  }
-
-  CGContextRestoreGState(ctx);
-
-  DrawTitlebarHighlight([frameView bounds].size, [(ChildView*)mView cornerRadius],
-                        DevPixelsToCocoaPoints(1));
-
-  [NSGraphicsContext setCurrentContext:oldContext];
-
-  CGContextRestoreGState(ctx);
-
-  mUpdatedTitlebarRegion.OrWith(CocoaPointsToDevPixels(dirtyTitlebarRect));
-}
-
-// This method draws an overlay in the top of the window which contains the
-// titlebar controls (e.g. close, min, zoom, fullscreen) and the titlebar
-// highlight effect.
-// This is necessary because the real titlebar controls are covered by our
-// OpenGL context. Note that in terms of the NSView hierarchy, our ChildView
-// is actually below the titlebar controls - that's why hovering and clicking
-// them works as expected - but their visual representation is only drawn into
-// the normal window buffer, and the window buffer surface lies below the
-// GLContext surface. In order to make the titlebar controls visible, we have
-// to redraw them inside the OpenGL context surface.
-void
-nsChildView::MaybeDrawTitlebar(GLManager* aManager)
-{
-  MutexAutoLock lock(mEffectsLock);
-  if (!mIsCoveringTitlebar || mIsFullscreen) {
-    return;
-  }
-
-  LayoutDeviceIntRegion updatedTitlebarRegion;
-  updatedTitlebarRegion.And(mUpdatedTitlebarRegion, mTitlebarRect);
-  mUpdatedTitlebarRegion.SetEmpty();
-
-  if (!mTitlebarImage) {
-    mTitlebarImage = MakeUnique<RectTextureImage>();
-  }
-
-  mTitlebarImage->UpdateFromCGContext(mTitlebarRect.Size(),
-                                      updatedTitlebarRegion,
-                                      mTitlebarCGContext);
-
-  mTitlebarImage->Draw(aManager, mTitlebarRect.TopLeft());
-}
-
-static void
-DrawTopLeftCornerMask(CGContextRef aCtx, int aRadius)
-{
-  CGContextSetRGBFillColor(aCtx, 1.0, 1.0, 1.0, 1.0);
-  CGContextFillEllipseInRect(aCtx, CGRectMake(0, 0, aRadius * 2, aRadius * 2));
-}
-
-void
-nsChildView::MaybeDrawRoundedCorners(GLManager* aManager,
-                                     const LayoutDeviceIntRect& aRect)
-{
-  MutexAutoLock lock(mEffectsLock);
-
-  if (!mCornerMaskImage) {
-    mCornerMaskImage = MakeUnique<RectTextureImage>();
-  }
-
-  LayoutDeviceIntSize size(mDevPixelCornerRadius, mDevPixelCornerRadius);
-  mCornerMaskImage->UpdateIfNeeded(size, LayoutDeviceIntRegion(), ^(gfx::DrawTarget* drawTarget, const LayoutDeviceIntRegion& updateRegion) {
-    ClearRegion(drawTarget, updateRegion);
-    RefPtr<gfx::PathBuilder> builder = drawTarget->CreatePathBuilder();
-    builder->Arc(gfx::Point(mDevPixelCornerRadius, mDevPixelCornerRadius), mDevPixelCornerRadius, 0, 2.0f * M_PI);
-    RefPtr<gfx::Path> path = builder->Finish();
-    drawTarget->Fill(path,
-                     gfx::ColorPattern(gfx::Color(1.0, 1.0, 1.0, 1.0)),
-                     gfx::DrawOptions(1.0f, gfx::CompositionOp::OP_SOURCE));
-  });
-
-  // Use operator destination in: multiply all 4 channels with source alpha.
-  aManager->gl()->fBlendFuncSeparate(LOCAL_GL_ZERO, LOCAL_GL_SRC_ALPHA,
-                                     LOCAL_GL_ZERO, LOCAL_GL_SRC_ALPHA);
-
-  Matrix4x4 flipX = Matrix4x4::Scaling(-1, 1, 1);
-  Matrix4x4 flipY = Matrix4x4::Scaling(1, -1, 1);
-
-  if (mIsCoveringTitlebar && !mIsFullscreen) {
-    // Mask the top corners.
-    mCornerMaskImage->Draw(aManager, aRect.TopLeft());
-    mCornerMaskImage->Draw(aManager, aRect.TopRight(), flipX);
-  }
-
-  if (mHasRoundedBottomCorners && !mIsFullscreen) {
-    // Mask the bottom corners.
-    mCornerMaskImage->Draw(aManager, aRect.BottomLeft(), flipY);
-    mCornerMaskImage->Draw(aManager, aRect.BottomRight(), flipY * flipX);
-  }
-
-  // Reset blend mode.
-  aManager->gl()->fBlendFuncSeparate(LOCAL_GL_ONE, LOCAL_GL_ONE_MINUS_SRC_ALPHA,
-                                     LOCAL_GL_ONE, LOCAL_GL_ONE);
-}
-
-static int32_t
-FindTitlebarBottom(const nsTArray<nsIWidget::ThemeGeometry>& aThemeGeometries,
-                   int32_t aWindowWidth)
-{
-  int32_t titlebarBottom = 0;
-  for (uint32_t i = 0; i < aThemeGeometries.Length(); ++i) {
-    const nsIWidget::ThemeGeometry& g = aThemeGeometries[i];
-    if ((g.mType == nsNativeThemeCocoa::eThemeGeometryTypeTitlebar) &&
-        g.mRect.X() <= 0 &&
-        g.mRect.XMost() >= aWindowWidth &&
-        g.mRect.Y() <= 0) {
-      titlebarBottom = std::max(titlebarBottom, g.mRect.YMost());
-    }
-  }
-  return titlebarBottom;
-}
-
-static int32_t
-FindUnifiedToolbarBottom(const nsTArray<nsIWidget::ThemeGeometry>& aThemeGeometries,
-                         int32_t aWindowWidth, int32_t aTitlebarBottom)
-{
-  int32_t unifiedToolbarBottom = aTitlebarBottom;
-  for (uint32_t i = 0; i < aThemeGeometries.Length(); ++i) {
-    const nsIWidget::ThemeGeometry& g = aThemeGeometries[i];
-    if ((g.mType == nsNativeThemeCocoa::eThemeGeometryTypeToolbar) &&
-        g.mRect.X() <= 0 &&
-        g.mRect.XMost() >= aWindowWidth &&
-        g.mRect.Y() <= aTitlebarBottom) {
-      unifiedToolbarBottom = std::max(unifiedToolbarBottom, g.mRect.YMost());
-    }
-  }
-  return unifiedToolbarBottom;
-}
-
-static LayoutDeviceIntRect
-FindFirstRectOfType(const nsTArray<nsIWidget::ThemeGeometry>& aThemeGeometries,
-                    nsITheme::ThemeGeometryType aThemeGeometryType)
-{
-  for (uint32_t i = 0; i < aThemeGeometries.Length(); ++i) {
-    const nsIWidget::ThemeGeometry& g = aThemeGeometries[i];
-    if (g.mType == aThemeGeometryType) {
-      return g.mRect;
-    }
-  }
-  return LayoutDeviceIntRect();
-}
-
-void
-nsChildView::UpdateThemeGeometries(const nsTArray<ThemeGeometry>& aThemeGeometries)
-{
-  if (![mView window])
-    return;
-
-  UpdateVibrancy(aThemeGeometries);
-
-  if (![[mView window] isKindOfClass:[ToolbarWindow class]])
-    return;
-
-  // Update unified toolbar height and sheet attachment position.
-  int32_t windowWidth = mBounds.width;
-  int32_t titlebarBottom = FindTitlebarBottom(aThemeGeometries, windowWidth);
-  int32_t unifiedToolbarBottom =
-    FindUnifiedToolbarBottom(aThemeGeometries, windowWidth, titlebarBottom);
-  int32_t toolboxBottom =
-    FindFirstRectOfType(aThemeGeometries, nsNativeThemeCocoa::eThemeGeometryTypeToolbox).YMost();
-
-  ToolbarWindow* win = (ToolbarWindow*)[mView window];
-  bool drawsContentsIntoWindowFrame = [win drawsContentsIntoWindowFrame];
-  int32_t titlebarHeight = CocoaPointsToDevPixels([win titlebarHeight]);
-  int32_t contentOffset = drawsContentsIntoWindowFrame ? titlebarHeight : 0;
-  int32_t devUnifiedHeight = titlebarHeight + unifiedToolbarBottom - contentOffset;
-  [win setUnifiedToolbarHeight:DevPixelsToCocoaPoints(devUnifiedHeight)];
-  int32_t devSheetPosition = titlebarHeight + std::max(toolboxBottom, unifiedToolbarBottom) - contentOffset;
-  [win setSheetAttachmentPosition:DevPixelsToCocoaPoints(devSheetPosition)];
-
-  // Update titlebar control offsets.
-  LayoutDeviceIntRect windowButtonRect = FindFirstRectOfType(aThemeGeometries, nsNativeThemeCocoa::eThemeGeometryTypeWindowButtons);
-  [win placeWindowButtons:[mView convertRect:DevPixelsToCocoaPoints(windowButtonRect) toView:nil]];
-  LayoutDeviceIntRect fullScreenButtonRect = FindFirstRectOfType(aThemeGeometries, nsNativeThemeCocoa::eThemeGeometryTypeFullscreenButton);
-  [win placeFullScreenButton:[mView convertRect:DevPixelsToCocoaPoints(fullScreenButtonRect) toView:nil]];
-}
-
-static LayoutDeviceIntRegion
-GatherThemeGeometryRegion(const nsTArray<nsIWidget::ThemeGeometry>& aThemeGeometries,
-                          nsITheme::ThemeGeometryType aThemeGeometryType)
-{
-  LayoutDeviceIntRegion region;
-  for (size_t i = 0; i < aThemeGeometries.Length(); ++i) {
-    const nsIWidget::ThemeGeometry& g = aThemeGeometries[i];
-    if (g.mType == aThemeGeometryType) {
-      region.OrWith(g.mRect);
-    }
-  }
-  return region;
-}
-
-template<typename Region>
-static void MakeRegionsNonOverlappingImpl(Region& aOutUnion) { }
-
-template<typename Region, typename ... Regions>
-static void MakeRegionsNonOverlappingImpl(Region& aOutUnion, Region& aFirst, Regions& ... aRest)
-{
-  MakeRegionsNonOverlappingImpl(aOutUnion, aRest...);
-  aFirst.SubOut(aOutUnion);
-  aOutUnion.OrWith(aFirst);
-}
-
-// Subtracts parts from regions in such a way that they don't have any overlap.
-// Each region in the argument list will have the union of all the regions
-// *following* it subtracted from itself. In other words, the arguments are
-// sorted low priority to high priority.
-template<typename Region, typename ... Regions>
-static void MakeRegionsNonOverlapping(Region& aFirst, Regions& ... aRest)
-{
-  Region unionOfAll;
-  MakeRegionsNonOverlappingImpl(unionOfAll, aFirst, aRest...);
-}
-
-void
-nsChildView::UpdateVibrancy(const nsTArray<ThemeGeometry>& aThemeGeometries)
-{
-  if (!VibrancyManager::SystemSupportsVibrancy()) {
-    return;
-  }
-
-  LayoutDeviceIntRegion sheetRegion =
-    GatherThemeGeometryRegion(aThemeGeometries, nsNativeThemeCocoa::eThemeGeometryTypeSheet);
-  LayoutDeviceIntRegion vibrantLightRegion =
-    GatherThemeGeometryRegion(aThemeGeometries, nsNativeThemeCocoa::eThemeGeometryTypeVibrancyLight);
-  LayoutDeviceIntRegion vibrantDarkRegion =
-    GatherThemeGeometryRegion(aThemeGeometries, nsNativeThemeCocoa::eThemeGeometryTypeVibrancyDark);
-  LayoutDeviceIntRegion menuRegion =
-    GatherThemeGeometryRegion(aThemeGeometries, nsNativeThemeCocoa::eThemeGeometryTypeMenu);
-  LayoutDeviceIntRegion tooltipRegion =
-    GatherThemeGeometryRegion(aThemeGeometries, nsNativeThemeCocoa::eThemeGeometryTypeTooltip);
-  LayoutDeviceIntRegion highlightedMenuItemRegion =
-    GatherThemeGeometryRegion(aThemeGeometries, nsNativeThemeCocoa::eThemeGeometryTypeHighlightedMenuItem);
-  LayoutDeviceIntRegion sourceListRegion =
-    GatherThemeGeometryRegion(aThemeGeometries, nsNativeThemeCocoa::eThemeGeometryTypeSourceList);
-  LayoutDeviceIntRegion sourceListSelectionRegion =
-    GatherThemeGeometryRegion(aThemeGeometries, nsNativeThemeCocoa::eThemeGeometryTypeSourceListSelection);
-  LayoutDeviceIntRegion activeSourceListSelectionRegion =
-    GatherThemeGeometryRegion(aThemeGeometries, nsNativeThemeCocoa::eThemeGeometryTypeActiveSourceListSelection);
-
-  MakeRegionsNonOverlapping(sheetRegion, vibrantLightRegion, vibrantDarkRegion,
-                            menuRegion, tooltipRegion, highlightedMenuItemRegion,
-                            sourceListRegion, sourceListSelectionRegion,
-                            activeSourceListSelectionRegion);
-
-  auto& vm = EnsureVibrancyManager();
-  vm.UpdateVibrantRegion(VibrancyType::LIGHT, vibrantLightRegion);
-  vm.UpdateVibrantRegion(VibrancyType::TOOLTIP, tooltipRegion);
-  vm.UpdateVibrantRegion(VibrancyType::MENU, menuRegion);
-  vm.UpdateVibrantRegion(VibrancyType::HIGHLIGHTED_MENUITEM, highlightedMenuItemRegion);
-  vm.UpdateVibrantRegion(VibrancyType::SHEET, sheetRegion);
-  vm.UpdateVibrantRegion(VibrancyType::SOURCE_LIST, sourceListRegion);
-  vm.UpdateVibrantRegion(VibrancyType::SOURCE_LIST_SELECTION, sourceListSelectionRegion);
-  vm.UpdateVibrantRegion(VibrancyType::ACTIVE_SOURCE_LIST_SELECTION, activeSourceListSelectionRegion);
-  vm.UpdateVibrantRegion(VibrancyType::DARK, vibrantDarkRegion);
-}
-
-static VibrancyType
-ThemeGeometryTypeToVibrancyType(nsITheme::ThemeGeometryType aThemeGeometryType)
-{
-  switch (aThemeGeometryType) {
-    case nsNativeThemeCocoa::eThemeGeometryTypeVibrancyLight:
-      return VibrancyType::LIGHT;
-    case nsNativeThemeCocoa::eThemeGeometryTypeVibrancyDark:
-      return VibrancyType::DARK;
-    case nsNativeThemeCocoa::eThemeGeometryTypeTooltip:
-      return VibrancyType::TOOLTIP;
-    case nsNativeThemeCocoa::eThemeGeometryTypeMenu:
-      return VibrancyType::MENU;
-    case nsNativeThemeCocoa::eThemeGeometryTypeHighlightedMenuItem:
-      return VibrancyType::HIGHLIGHTED_MENUITEM;
-    case nsNativeThemeCocoa::eThemeGeometryTypeSheet:
-      return VibrancyType::SHEET;
-    case nsNativeThemeCocoa::eThemeGeometryTypeSourceList:
-      return VibrancyType::SOURCE_LIST;
-    case nsNativeThemeCocoa::eThemeGeometryTypeSourceListSelection:
-      return VibrancyType::SOURCE_LIST_SELECTION;
-    case nsNativeThemeCocoa::eThemeGeometryTypeActiveSourceListSelection:
-      return VibrancyType::ACTIVE_SOURCE_LIST_SELECTION;
-    default:
-      MOZ_CRASH();
-  }
-}
-
-NSColor*
-nsChildView::VibrancyFillColorForThemeGeometryType(nsITheme::ThemeGeometryType aThemeGeometryType)
-{
-  if (VibrancyManager::SystemSupportsVibrancy()) {
-    return EnsureVibrancyManager().VibrancyFillColorForType(
-      ThemeGeometryTypeToVibrancyType(aThemeGeometryType));
-  }
-  return [NSColor whiteColor];
-}
-
-NSColor*
-nsChildView::VibrancyFontSmoothingBackgroundColorForThemeGeometryType(nsITheme::ThemeGeometryType aThemeGeometryType)
-{
-  if (VibrancyManager::SystemSupportsVibrancy()) {
-    return EnsureVibrancyManager().VibrancyFontSmoothingBackgroundColorForType(
-      ThemeGeometryTypeToVibrancyType(aThemeGeometryType));
-  }
-  return [NSColor clearColor];
-}
-
-mozilla::VibrancyManager&
-nsChildView::EnsureVibrancyManager()
-{
-  MOZ_ASSERT(mView, "Only call this once we have a view!");
-  if (!mVibrancyManager) {
-    mVibrancyManager = MakeUnique<VibrancyManager>(*this, [mView vibrancyViewsContainer]);
-  }
-  return *mVibrancyManager;
-}
-
-nsChildView::SwipeInfo
-nsChildView::SendMayStartSwipe(const mozilla::PanGestureInput& aSwipeStartEvent)
-{
-  nsCOMPtr<nsIWidget> kungFuDeathGrip(this);
-
-  uint32_t direction = (aSwipeStartEvent.mPanDisplacement.x > 0.0)
-    ? (uint32_t)nsIDOMSimpleGestureEvent::DIRECTION_RIGHT
-    : (uint32_t)nsIDOMSimpleGestureEvent::DIRECTION_LEFT;
-
-  // We're ready to start the animation. Tell Gecko about it, and at the same
-  // time ask it if it really wants to start an animation for this event.
-  // This event also reports back the directions that we can swipe in.
-  LayoutDeviceIntPoint position =
-    RoundedToInt(aSwipeStartEvent.mPanStartPoint * ScreenToLayoutDeviceScale(1));
-  WidgetSimpleGestureEvent geckoEvent =
-    SwipeTracker::CreateSwipeGestureEvent(eSwipeGestureMayStart, this,
-                                          position);
-  geckoEvent.mDirection = direction;
-  geckoEvent.mDelta = 0.0;
-  geckoEvent.mAllowedDirections = 0;
-  bool shouldStartSwipe = DispatchWindowEvent(geckoEvent); // event cancelled == swipe should start
-
-  SwipeInfo result = { shouldStartSwipe, geckoEvent.mAllowedDirections };
-  return result;
-}
-
-void
-nsChildView::TrackScrollEventAsSwipe(const mozilla::PanGestureInput& aSwipeStartEvent,
-                                     uint32_t aAllowedDirections)
-{
-  // If a swipe is currently being tracked kill it -- it's been interrupted
-  // by another gesture event.
-  if (mSwipeTracker) {
-    mSwipeTracker->CancelSwipe();
-    mSwipeTracker->Destroy();
-    mSwipeTracker = nullptr;
-  }
-
-  uint32_t direction = (aSwipeStartEvent.mPanDisplacement.x > 0.0)
-    ? (uint32_t)nsIDOMSimpleGestureEvent::DIRECTION_RIGHT
-    : (uint32_t)nsIDOMSimpleGestureEvent::DIRECTION_LEFT;
-
-  mSwipeTracker = new SwipeTracker(*this, aSwipeStartEvent,
-                                   aAllowedDirections, direction);
-
-  if (!mAPZC) {
-    mCurrentPanGestureBelongsToSwipe = true;
-  }
-}
-
-void
-nsChildView::SwipeFinished()
-{
-  mSwipeTracker = nullptr;
-}
-
-already_AddRefed<gfx::DrawTarget>
-nsChildView::StartRemoteDrawingInRegion(LayoutDeviceIntRegion& aInvalidRegion,
-                                        BufferMode* aBufferMode)
-{
-  // should have created the GLPresenter in InitCompositor.
-  MOZ_ASSERT(mGLPresenter);
-  if (!mGLPresenter) {
-    mGLPresenter = GLPresenter::CreateForWindow(this);
-
-    if (!mGLPresenter) {
-      return nullptr;
-    }
-  }
-
-  LayoutDeviceIntRegion dirtyRegion(aInvalidRegion);
-  LayoutDeviceIntSize renderSize = mBounds.Size();
-
-  if (!mBasicCompositorImage) {
-    mBasicCompositorImage = MakeUnique<RectTextureImage>();
-  }
-
-  RefPtr<gfx::DrawTarget> drawTarget =
-    mBasicCompositorImage->BeginUpdate(renderSize, dirtyRegion);
-
-  if (!drawTarget) {
-    // Composite unchanged textures.
-    DoRemoteComposition(mBounds);
-    return nullptr;
-  }
-
-  aInvalidRegion = mBasicCompositorImage->GetUpdateRegion();
-  *aBufferMode = BufferMode::BUFFER_NONE;
-
-  return drawTarget.forget();
-}
-
-void
-nsChildView::EndRemoteDrawing()
-{
-  mBasicCompositorImage->EndUpdate();
-  DoRemoteComposition(mBounds);
-}
-
-void
-nsChildView::CleanupRemoteDrawing()
-{
-  mBasicCompositorImage = nullptr;
-  mCornerMaskImage = nullptr;
-  mResizerImage = nullptr;
-  mTitlebarImage = nullptr;
-  mGLPresenter = nullptr;
-}
-
-bool
-nsChildView::InitCompositor(Compositor* aCompositor)
-{
-  if (aCompositor->GetBackendType() == LayersBackend::LAYERS_BASIC) {
-    if (!mGLPresenter) {
-      mGLPresenter = GLPresenter::CreateForWindow(this);
-    }
-
-    return !!mGLPresenter;
-  }
-  return true;
-}
-
-void
-nsChildView::DoRemoteComposition(const LayoutDeviceIntRect& aRenderRect)
-{
-  if (![(ChildView*)mView preRender:mGLPresenter->GetNSOpenGLContext()]) {
-    return;
-  }
-  mGLPresenter->BeginFrame(aRenderRect.Size());
-
-  // Draw the result from the basic compositor.
-  mBasicCompositorImage->Draw(mGLPresenter.get(), LayoutDeviceIntPoint(0, 0));
-
-  // DrawWindowOverlay doesn't do anything for non-GL, so it didn't paint
-  // anything during the basic compositor transaction. Draw the overlay now.
-  DrawWindowOverlay(mGLPresenter.get(), aRenderRect);
-
-  mGLPresenter->EndFrame();
-
-  [(ChildView*)mView postRender:mGLPresenter->GetNSOpenGLContext()];
-}
-
-@interface NonDraggableView : NSView
-@end
-
-@implementation NonDraggableView
-- (BOOL)mouseDownCanMoveWindow { return NO; }
-- (NSView*)hitTest:(NSPoint)aPoint { return nil; }
-@end
-
-void
-nsChildView::UpdateWindowDraggingRegion(const LayoutDeviceIntRegion& aRegion)
-{
-  // mView returns YES from mouseDownCanMoveWindow, so we need to put NSViews
-  // that return NO from mouseDownCanMoveWindow in the places that shouldn't
-  // be draggable. We can't do it the other way round because returning
-  // YES from mouseDownCanMoveWindow doesn't have any effect if there's a
-  // superview that returns NO.
-  LayoutDeviceIntRegion nonDraggable;
-  nonDraggable.Sub(LayoutDeviceIntRect(0, 0, mBounds.width, mBounds.height), aRegion);
-
-  __block bool changed = false;
-
-  // Suppress calls to setNeedsDisplay during NSView geometry changes.
-  ManipulateViewWithoutNeedingDisplay(mView, ^() {
-    changed = mNonDraggableRegion.UpdateRegion(
-        nonDraggable, *this, [mView nonDraggableViewsContainer], ^() {
-          return [[NonDraggableView alloc] initWithFrame:NSZeroRect];
-        });
-  });
-
-  if (changed) {
-    // Trigger an update to the window server. This will call
-    // mouseDownCanMoveWindow.
-    // Doing this manually is only necessary because we're suppressing
-    // setNeedsDisplay calls above.
-    [[mView window] setMovableByWindowBackground:NO];
-    [[mView window] setMovableByWindowBackground:YES];
-  }
-}
-
-void
-nsChildView::ReportSwipeStarted(uint64_t aInputBlockId,
-                                bool aStartSwipe)
-{
-  if (mSwipeEventQueue && mSwipeEventQueue->inputBlockId == aInputBlockId) {
-    if (aStartSwipe) {
-      PanGestureInput& startEvent = mSwipeEventQueue->queuedEvents[0];
-      TrackScrollEventAsSwipe(startEvent, mSwipeEventQueue->allowedDirections);
-      for (size_t i = 1; i < mSwipeEventQueue->queuedEvents.Length(); i++) {
-        mSwipeTracker->ProcessEvent(mSwipeEventQueue->queuedEvents[i]);
-      }
-    }
-    mSwipeEventQueue = nullptr;
-  }
-}
-
-void
-nsChildView::DispatchAPZWheelInputEvent(InputData& aEvent, bool aCanTriggerSwipe)
-{
-  if (mSwipeTracker && aEvent.mInputType == PANGESTURE_INPUT) {
-    // Give the swipe tracker a first pass at the event. If a new pan gesture
-    // has been started since the beginning of the swipe, the swipe tracker
-    // will know to ignore the event.
-    nsEventStatus status = mSwipeTracker->ProcessEvent(aEvent.AsPanGestureInput());
-    if (status == nsEventStatus_eConsumeNoDefault) {
-      return;
-    }
-  }
-
-  WidgetWheelEvent event(true, eWheel, this);
-
-  if (mAPZC) {
-    uint64_t inputBlockId = 0;
-    ScrollableLayerGuid guid;
-
-    nsEventStatus result = mAPZC->ReceiveInputEvent(aEvent, &guid, &inputBlockId);
-    if (result == nsEventStatus_eConsumeNoDefault) {
-      return;
-    }
-
-    switch(aEvent.mInputType) {
-      case PANGESTURE_INPUT: {
-        PanGestureInput& panInput = aEvent.AsPanGestureInput();
-
-        event = panInput.ToWidgetWheelEvent(this);
-        if (aCanTriggerSwipe) {
-          SwipeInfo swipeInfo = SendMayStartSwipe(panInput);
-          event.mCanTriggerSwipe = swipeInfo.wantsSwipe;
-          if (swipeInfo.wantsSwipe) {
-            if (result == nsEventStatus_eIgnore) {
-              // APZ has determined and that scrolling horizontally in the
-              // requested direction is impossible, so it didn't do any
-              // scrolling for the event.
-              // We know now that MayStartSwipe wants a swipe, so we can start
-              // the swipe now.
-              TrackScrollEventAsSwipe(panInput, swipeInfo.allowedDirections);
-            } else {
-              // We don't know whether this event can start a swipe, so we need
-              // to queue up events and wait for a call to ReportSwipeStarted.
-              // APZ might already have started scrolling in response to the
-              // event if it knew that it's the right thing to do. In that case
-              // we'll still get a call to ReportSwipeStarted, and we will
-              // discard the queued events at that point.
-              mSwipeEventQueue = MakeUnique<SwipeEventQueue>(swipeInfo.allowedDirections,
-                                                             inputBlockId);
-            }
-          }
-        }
-
-        if (mSwipeEventQueue && mSwipeEventQueue->inputBlockId == inputBlockId) {
-          mSwipeEventQueue->queuedEvents.AppendElement(panInput);
-        }
-        break;
-      }
-      case SCROLLWHEEL_INPUT: {
-        event = aEvent.AsScrollWheelInput().ToWidgetWheelEvent(this);
-        break;
-      };
-      default:
-        MOZ_CRASH("unsupported event type");
-        return;
-    }
-    if (event.mMessage == eWheel &&
-        (event.mDeltaX != 0 || event.mDeltaY != 0)) {
-      ProcessUntransformedAPZEvent(&event, guid, inputBlockId, result);
-    }
-    return;
-  }
-
-  nsEventStatus status;
-  switch(aEvent.mInputType) {
-    case PANGESTURE_INPUT: {
-      PanGestureInput panInput = aEvent.AsPanGestureInput();
-      if (panInput.mType == PanGestureInput::PANGESTURE_MAYSTART ||
-          panInput.mType == PanGestureInput::PANGESTURE_START) {
-        mCurrentPanGestureBelongsToSwipe = false;
-      }
-      if (mCurrentPanGestureBelongsToSwipe) {
-        // Ignore this event. It's a momentum event from a scroll gesture
-        // that was processed as a swipe, and the swipe animation has
-        // already finished (so mSwipeTracker is already null).
-        MOZ_ASSERT(panInput.IsMomentum(),
-          "If the fingers are still on the touchpad, we should still have a SwipeTracker, and it should have consumed this event.");
-        return;
-      }
-
-      event = panInput.ToWidgetWheelEvent(this);
-      if (aCanTriggerSwipe) {
-        SwipeInfo swipeInfo = SendMayStartSwipe(panInput);
-
-        // We're in the non-APZ case here, but we still want to know whether
-        // the event was routed to a child process, so we use InputAPZContext
-        // to get that piece of information.
-        ScrollableLayerGuid guid;
-        InputAPZContext context(guid, 0, nsEventStatus_eIgnore);
-
-        event.mCanTriggerSwipe = swipeInfo.wantsSwipe;
-        DispatchEvent(&event, status);
-        if (swipeInfo.wantsSwipe) {
-          if (context.WasRoutedToChildProcess()) {
-            // We don't know whether this event can start a swipe, so we need
-            // to queue up events and wait for a call to ReportSwipeStarted.
-            mSwipeEventQueue = MakeUnique<SwipeEventQueue>(swipeInfo.allowedDirections, 0);
-          } else if (event.TriggersSwipe()) {
-            TrackScrollEventAsSwipe(panInput, swipeInfo.allowedDirections);
-          }
-        }
-
-        if (mSwipeEventQueue && mSwipeEventQueue->inputBlockId == 0) {
-          mSwipeEventQueue->queuedEvents.AppendElement(panInput);
-        }
-        return;
-      }
-      break;
-    }
-    case SCROLLWHEEL_INPUT: {
-      event = aEvent.AsScrollWheelInput().ToWidgetWheelEvent(this);
-      break;
-    }
-    default:
-      MOZ_CRASH("unexpected event type");
-      return;
-  }
-  if (event.mMessage == eWheel &&
-      (event.mDeltaX != 0 || event.mDeltaY != 0)) {
-    DispatchEvent(&event, status);
-  }
-}
-
-// When using 10.11, calling showDefinitionForAttributedString causes the
-// following exception on LookupViewService. (rdar://26476091)
-//
-// Exception: decodeObjectForKey: class "TitlebarAndBackgroundColor" not
-// loaded or does not exist
-//
-// So we set temporary color that is NSColor before calling it.
-
-class MOZ_RAII AutoBackgroundSetter final {
-public:
-  explicit AutoBackgroundSetter(NSView* aView) {
-    if (nsCocoaFeatures::OnElCapitanOrLater() &&
-        [[aView window] isKindOfClass:[ToolbarWindow class]]) {
-      mWindow = [(ToolbarWindow*)[aView window] retain];
-      [mWindow setTemporaryBackgroundColor];
-    } else {
-      mWindow = nullptr;
-    }
-  }
-
-  ~AutoBackgroundSetter() {
-    if (mWindow) {
-      [mWindow restoreBackgroundColor];
-      [mWindow release];
-    }
-  }
-
-private:
-  ToolbarWindow* mWindow; // strong
-};
-
-void
-nsChildView::LookUpDictionary(
-               const nsAString& aText,
-               const nsTArray<mozilla::FontRange>& aFontRangeArray,
-               const bool aIsVertical,
-               const LayoutDeviceIntPoint& aPoint)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  NSMutableAttributedString* attrStr =
-    nsCocoaUtils::GetNSMutableAttributedString(aText, aFontRangeArray,
-                                               aIsVertical,
-                                               BackingScaleFactor());
-  NSPoint pt =
-    nsCocoaUtils::DevPixelsToCocoaPoints(aPoint, BackingScaleFactor());
-  NSDictionary* attributes = [attrStr attributesAtIndex:0 effectiveRange:nil];
-  NSFont* font = [attributes objectForKey:NSFontAttributeName];
-  if (font) {
-    if (aIsVertical) {
-      pt.x -= [font descender];
-    } else {
-      pt.y += [font ascender];
-    }
-  }
-
-  AutoBackgroundSetter setter(mView);
-  [mView showDefinitionForAttributedString:attrStr atPoint:pt];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-#ifdef ACCESSIBILITY
-already_AddRefed<a11y::Accessible>
-nsChildView::GetDocumentAccessible()
-{
-  if (!mozilla::a11y::ShouldA11yBeEnabled())
-    return nullptr;
-
-  if (mAccessible) {
-    RefPtr<a11y::Accessible> ret;
-    CallQueryReferent(mAccessible.get(),
-                      static_cast<a11y::Accessible**>(getter_AddRefs(ret)));
-    return ret.forget();
-  }
-
-  // need to fetch the accessible anew, because it has gone away.
-  // cache the accessible in our weak ptr
-  RefPtr<a11y::Accessible> acc = GetRootAccessible();
-  mAccessible = do_GetWeakReference(acc.get());
-
-  return acc.forget();
-}
-#endif
-
-// GLPresenter implementation
-
-GLPresenter::GLPresenter(GLContext* aContext)
- : mGLContext(aContext)
-{
-  mGLContext->MakeCurrent();
-  ShaderConfigOGL config;
-  config.SetTextureTarget(LOCAL_GL_TEXTURE_RECTANGLE_ARB);
-  mRGBARectProgram = MakeUnique<ShaderProgramOGL>(mGLContext,
-    ProgramProfileOGL::GetProfileFor(config));
-
-  // Create mQuadVBO.
-  mGLContext->fGenBuffers(1, &mQuadVBO);
-  mGLContext->fBindBuffer(LOCAL_GL_ARRAY_BUFFER, mQuadVBO);
-
-  // 1 quad, with the number of the quad (vertexID) encoded in w.
-  GLfloat vertices[] = {
-    0.0f, 0.0f, 0.0f, 0.0f,
-    1.0f, 0.0f, 0.0f, 0.0f,
-    0.0f, 1.0f, 0.0f, 0.0f,
-    1.0f, 0.0f, 0.0f, 0.0f,
-    0.0f, 1.0f, 0.0f, 0.0f,
-    1.0f, 1.0f, 0.0f, 0.0f,
-  };
-  HeapCopyOfStackArray<GLfloat> verticesOnHeap(vertices);
-  mGLContext->fBufferData(LOCAL_GL_ARRAY_BUFFER,
-                          verticesOnHeap.ByteLength(),
-                          verticesOnHeap.Data(),
-                          LOCAL_GL_STATIC_DRAW);
-   mGLContext->fBindBuffer(LOCAL_GL_ARRAY_BUFFER, 0);
-}
-
-GLPresenter::~GLPresenter()
-{
-  if (mQuadVBO) {
-    mGLContext->MakeCurrent();
-    mGLContext->fDeleteBuffers(1, &mQuadVBO);
-    mQuadVBO = 0;
-  }
-}
-
-void
-GLPresenter::BindAndDrawQuad(ShaderProgramOGL *aProgram,
-                             const gfx::Rect& aLayerRect,
-                             const gfx::Rect& aTextureRect)
-{
-  mGLContext->MakeCurrent();
-
-  gfx::Rect layerRects[4];
-  gfx::Rect textureRects[4];
-
-  layerRects[0] = aLayerRect;
-  textureRects[0] = aTextureRect;
-
-  aProgram->SetLayerRects(layerRects);
-  aProgram->SetTextureRects(textureRects);
-
-  const GLuint coordAttribIndex = 0;
-
-  mGLContext->fBindBuffer(LOCAL_GL_ARRAY_BUFFER, mQuadVBO);
-  mGLContext->fVertexAttribPointer(coordAttribIndex, 4,
-                                   LOCAL_GL_FLOAT, LOCAL_GL_FALSE, 0,
-                                   (GLvoid*)0);
-  mGLContext->fEnableVertexAttribArray(coordAttribIndex);
-  mGLContext->fDrawArrays(LOCAL_GL_TRIANGLES, 0, 6);
-  mGLContext->fDisableVertexAttribArray(coordAttribIndex);
-}
-
-void
-GLPresenter::BeginFrame(LayoutDeviceIntSize aRenderSize)
-{
-  mGLContext->MakeCurrent();
-
-  mGLContext->fViewport(0, 0, aRenderSize.width, aRenderSize.height);
-
-  // Matrix to transform (0, 0, width, height) to viewport space (-1.0, 1.0,
-  // 2, 2) and flip the contents.
-  gfx::Matrix viewMatrix = gfx::Matrix::Translation(-1.0, 1.0);
-  viewMatrix.PreScale(2.0f / float(aRenderSize.width),
-                      2.0f / float(aRenderSize.height));
-  viewMatrix.PreScale(1.0f, -1.0f);
-
-  gfx::Matrix4x4 matrix3d = gfx::Matrix4x4::From2D(viewMatrix);
-  matrix3d._33 = 0.0f;
-
-  // set the projection matrix for the next time the program is activated
-  mProjMatrix = matrix3d;
-
-  // Default blend function implements "OVER"
-  mGLContext->fBlendFuncSeparate(LOCAL_GL_ONE, LOCAL_GL_ONE_MINUS_SRC_ALPHA,
-                                 LOCAL_GL_ONE, LOCAL_GL_ONE);
-  mGLContext->fEnable(LOCAL_GL_BLEND);
-
-  mGLContext->fClearColor(0.0, 0.0, 0.0, 0.0);
-  mGLContext->fClear(LOCAL_GL_COLOR_BUFFER_BIT | LOCAL_GL_DEPTH_BUFFER_BIT);
-
-  mGLContext->fEnable(LOCAL_GL_TEXTURE_RECTANGLE_ARB);
-}
-
-void
-GLPresenter::EndFrame()
-{
-  mGLContext->SwapBuffers();
-  mGLContext->fBindBuffer(LOCAL_GL_ARRAY_BUFFER, 0);
-}
-
-class WidgetsReleaserRunnable final : public mozilla::Runnable
-{
-public:
-  explicit WidgetsReleaserRunnable(nsTArray<nsCOMPtr<nsIWidget>>&& aWidgetArray)
-    : mWidgetArray(aWidgetArray)
-  {
-  }
-
-  // Do nothing; all this runnable does is hold a reference the widgets in
-  // mWidgetArray, and those references will be dropped when this runnable
-  // is destroyed.
-
-private:
-  nsTArray<nsCOMPtr<nsIWidget>> mWidgetArray;
-};
-
-#pragma mark -
-
-// ViewRegionContainerView is a view class for certain subviews of ChildView
-// which contain the NSViews created for ViewRegions (see ViewRegion.h).
-// It doesn't do anything interesting, it only acts as a container so that it's
-// easier for ChildView to control the z order of its children.
-@interface ViewRegionContainerView : NSView {
-}
-@end
-
-@implementation ViewRegionContainerView
-
-- (NSView*)hitTest:(NSPoint)aPoint {
-  return nil;  // Be transparent to mouse events.
-}
-
-- (BOOL)isFlipped {
-  return [[self superview] isFlipped];
-}
-
-- (BOOL)mouseDownCanMoveWindow {
-  return [[self superview] mouseDownCanMoveWindow];
-}
-
-@end
-;
-
-@implementation ChildView
-
-// globalDragPboard is non-null during native drag sessions that did not originate
-// in our native NSView (it is set in |draggingEntered:|). It is unset when the
-// drag session ends for this view, either with the mouse exiting or when a drop
-// occurs in this view.
-NSPasteboard* globalDragPboard = nil;
-
-// gLastDragView and gLastDragMouseDownEvent are used to communicate information
-// to the drag service during drag invocation (starting a drag in from the view).
-// gLastDragView is only non-null while mouseDragged is on the call stack.
-NSView* gLastDragView = nil;
-NSEvent* gLastDragMouseDownEvent = nil;
-
-+ (void)initialize
-{
-  static BOOL initialized = NO;
-
-  if (!initialized) {
-    // Inform the OS about the types of services (from the "Services" menu)
-    // that we can handle.
-
-    NSArray *sendTypes = [[NSArray alloc] initWithObjects:NSStringPboardType,NSHTMLPboardType,nil];
-    NSArray *returnTypes = [[NSArray alloc] initWithObjects:NSStringPboardType,NSHTMLPboardType,nil];
-
-    [NSApp registerServicesMenuSendTypes:sendTypes returnTypes:returnTypes];
-
-    [sendTypes release];
-    [returnTypes release];
-
-    initialized = YES;
-  }
-}
-
-+ (void)registerViewForDraggedTypes:(NSView*)aView
-{
-  [aView registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType,
-                                                           NSStringPboardType,
-                                                           NSHTMLPboardType,
-                                                           NSURLPboardType,
-                                                           NSFilesPromisePboardType,
-                                                           kWildcardPboardType,
-                                                           kCorePboardType_url,
-                                                           kCorePboardType_urld,
-                                                           kCorePboardType_urln,
-                                                           nil]];
-}
-
-// initWithFrame:geckoChild:
-- (id)initWithFrame:(NSRect)inFrame geckoChild:(nsChildView*)inChild
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  if ((self = [super initWithFrame:inFrame])) {
-    mGeckoChild = inChild;
-    mBlockedLastMouseDown = NO;
-    mExpectingWheelStop = NO;
-
-    mLastMouseDownEvent = nil;
-    mLastKeyDownEvent = nil;
-    mClickThroughMouseDownEvent = nil;
-    mDragService = nullptr;
-
-    mGestureState = eGestureState_None;
-    mCumulativeMagnification = 0.0;
-    mCumulativeRotation = 0.0;
-
-    mNeedsGLUpdate = NO;
-
-    [self setFocusRingType:NSFocusRingTypeNone];
-
-#ifdef __LP64__
-    mCancelSwipeAnimation = nil;
-#endif
-
-    mNonDraggableViewsContainer = [[ViewRegionContainerView alloc] initWithFrame:[self bounds]];
-    mVibrancyViewsContainer = [[ViewRegionContainerView alloc] initWithFrame:[self bounds]];
-
-    [mNonDraggableViewsContainer setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-    [mVibrancyViewsContainer setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-
-    [self addSubview:mNonDraggableViewsContainer];
-    [self addSubview:mVibrancyViewsContainer];
-
-    mPixelHostingView = [[PixelHostingView alloc] initWithFrame:[self bounds]];
-    [mPixelHostingView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-
-    [self addSubview:mPixelHostingView];
-
-    mTopLeftCornerMask = NULL;
-  }
-
-  // register for things we'll take from other applications
-  [ChildView registerViewForDraggedTypes:self];
-
-  [[NSNotificationCenter defaultCenter] addObserver:self
-                                           selector:@selector(systemMetricsChanged)
-                                               name:NSControlTintDidChangeNotification
-                                             object:nil];
-  [[NSNotificationCenter defaultCenter] addObserver:self
-                                           selector:@selector(systemMetricsChanged)
-                                               name:NSSystemColorsDidChangeNotification
-                                             object:nil];
-  [[NSNotificationCenter defaultCenter] addObserver:self
-                                           selector:@selector(scrollbarSystemMetricChanged)
-                                               name:NSPreferredScrollerStyleDidChangeNotification
-                                             object:nil];
-  [[NSDistributedNotificationCenter defaultCenter] addObserver:self
-                                                      selector:@selector(systemMetricsChanged)
-                                                          name:@"AppleAquaScrollBarVariantChanged"
-                                                        object:nil
-                                            suspensionBehavior:NSNotificationSuspensionBehaviorDeliverImmediately];
-  [[NSNotificationCenter defaultCenter] addObserver:self
-                                           selector:@selector(_surfaceNeedsUpdate:)
-                                               name:NSViewGlobalFrameDidChangeNotification
-                                             object:mPixelHostingView];
-
-  return self;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-// ComplexTextInputPanel's interpretKeyEvent hack won't work without this.
-// It makes calls to +[NSTextInputContext currentContext], deep in system
-// code, return the appropriate context.
-- (NSTextInputContext *)inputContext
-{
-  NSTextInputContext* pluginContext = NULL;
-  if (mGeckoChild && mGeckoChild->IsPluginFocused()) {
-    ComplexTextInputPanel* ctiPanel =
-      ComplexTextInputPanel::GetSharedComplexTextInputPanel();
-    if (ctiPanel) {
-      pluginContext = (NSTextInputContext*) ctiPanel->GetInputContext();
-    }
-  }
-  if (pluginContext) {
-    return pluginContext;
-  } else {
-    if (!mGeckoChild) {
-      // -[ChildView widgetDestroyed] has been called, but
-      // -[ChildView delayedTearDown] has not yet completed.  Accessing
-      // [super inputContext] now would uselessly recreate a text input context
-      // for us, under which -[ChildView validAttributesForMarkedText] would
-      // be called and the assertion checking for mTextInputHandler would fail.
-      // We return nil to avoid that.
-      return nil;
-    }
-    return [super inputContext];
-  }
-}
-
-- (void)installTextInputHandler:(TextInputHandler*)aHandler
-{
-  mTextInputHandler = aHandler;
-}
-
-- (void)uninstallTextInputHandler
-{
-  mTextInputHandler = nullptr;
-}
-
-- (bool)preRender:(NSOpenGLContext *)aGLContext
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  if (![self window] ||
-      ([[self window] isKindOfClass:[BaseWindow class]] &&
-       ![(BaseWindow*)[self window] isVisibleOrBeingShown])) {
-    // Before the window is shown, our GL context's front FBO is not
-    // framebuffer complete, so we refuse to render.
-    return false;
-  }
-
-  if (!mGLContext) {
-    mGLContext = aGLContext;
-    [mGLContext retain];
-    mNeedsGLUpdate = true;
-  }
-
-  CGLLockContext((CGLContextObj)[aGLContext CGLContextObj]);
-
-  if (mNeedsGLUpdate) {
-    [self updateGLContext];
-    mNeedsGLUpdate = NO;
-  }
-
-  return true;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(false);
-}
-
-- (void)postRender:(NSOpenGLContext *)aGLContext
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  CGLUnlockContext((CGLContextObj)[aGLContext CGLContextObj]);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (NSView*)vibrancyViewsContainer {
-  return mVibrancyViewsContainer;
-}
-
-- (NSView*)nonDraggableViewsContainer {
-  return mNonDraggableViewsContainer;
-}
-
-- (NSView*)pixelHostingView {
-  return mPixelHostingView;
-}
-
-- (void)dealloc
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  [mGLContext release];
-  [mLastMouseDownEvent release];
-  [mLastKeyDownEvent release];
-  [mClickThroughMouseDownEvent release];
-  CGImageRelease(mTopLeftCornerMask);
-  ChildViewMouseTracker::OnDestroyView(self);
-
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
-  [[NSDistributedNotificationCenter defaultCenter] removeObserver:self];
-  [mVibrancyViewsContainer removeFromSuperview];
-  [mVibrancyViewsContainer release];
-  [mNonDraggableViewsContainer removeFromSuperview];
-  [mNonDraggableViewsContainer release];
-  [mPixelHostingView removeFromSuperview];
-  [mPixelHostingView release];
-
-  [super dealloc];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (void)widgetDestroyed
-{
-  if (mTextInputHandler) {
-    mTextInputHandler->OnDestroyWidget(mGeckoChild);
-    mTextInputHandler = nullptr;
-  }
-  mGeckoChild = nullptr;
-
-  // Just in case we're destroyed abruptly and missed the draggingExited
-  // or performDragOperation message.
-  NS_IF_RELEASE(mDragService);
-}
-
-// mozView method, return our gecko child view widget. Note this does not AddRef.
-- (nsIWidget*) widget
-{
-  return static_cast<nsIWidget*>(mGeckoChild);
-}
-
-- (void)systemMetricsChanged
-{
-  if (mGeckoChild)
-    mGeckoChild->NotifyThemeChanged();
-}
-
-- (void)scrollbarSystemMetricChanged
-{
-  [self systemMetricsChanged];
-
-  if (mGeckoChild) {
-    nsIWidgetListener* listener = mGeckoChild->GetWidgetListener();
-    if (listener) {
-      nsIPresShell* presShell = listener->GetPresShell();
-      if (presShell) {
-        presShell->ReconstructFrames();
-      }
-    }
-  }
-}
-
-- (NSString*)description
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  return [NSString stringWithFormat:@"ChildView %p, gecko child %p, frame %@", self, mGeckoChild, NSStringFromRect([self frame])];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-// Make the origin of this view the topLeft corner (gecko origin) rather
-// than the bottomLeft corner (standard cocoa origin).
-- (BOOL)isFlipped
-{
-  return YES;
-}
-
-- (BOOL)isOpaque
-{
-  return [[self window] isOpaque];
-}
-
-- (void)sendFocusEvent:(EventMessage)eventMessage
-{
-  if (!mGeckoChild)
-    return;
-
-  nsEventStatus status = nsEventStatus_eIgnore;
-  WidgetGUIEvent focusGuiEvent(true, eventMessage, mGeckoChild);
-  focusGuiEvent.mTime = PR_IntervalNow();
-  mGeckoChild->DispatchEvent(&focusGuiEvent, status);
-}
-
-// We accept key and mouse events, so don't keep passing them up the chain. Allow
-// this to be a 'focused' widget for event dispatch.
-- (BOOL)acceptsFirstResponder
-{
-  return YES;
-}
-
-// Accept mouse down events on background windows
-- (BOOL)acceptsFirstMouse:(NSEvent*)aEvent
-{
-  if (![[self window] isKindOfClass:[PopupWindow class]]) {
-    // We rely on this function to tell us that the mousedown was on a
-    // background window. Inside mouseDown we can't tell whether we were
-    // inactive because at that point we've already been made active.
-    // Unfortunately, acceptsFirstMouse is called for PopupWindows even when
-    // their parent window is active, so ignore this on them for now.
-    mClickThroughMouseDownEvent = [aEvent retain];
-  }
-  return YES;
-}
-
-- (BOOL)mouseDownCanMoveWindow
-{
-  // Return YES so that parts of this view can be draggable. The non-draggable
-  // parts will be covered by NSViews that return NO from
-  // mouseDownCanMoveWindow and thus override draggability from the inside.
-  // These views are assembled in nsChildView::UpdateWindowDraggingRegion.
-  return YES;
-}
-
--(void)updateGLContext
-{
-  [mGLContext setView:mPixelHostingView];
-  [mGLContext update];
-}
-
-- (void)_surfaceNeedsUpdate:(NSNotification*)notification
-{
-  if (mGLContext) {
-    CGLLockContext((CGLContextObj)[mGLContext CGLContextObj]);
-    mNeedsGLUpdate = YES;
-    CGLUnlockContext((CGLContextObj)[mGLContext CGLContextObj]);
-  }
-}
-
-- (void)viewDidChangeBackingProperties
-{
-  [super viewDidChangeBackingProperties];
-  if (mGeckoChild) {
-    // actually, it could be the color space that's changed,
-    // but we can't tell the difference here except by retrieving
-    // the backing scale factor and comparing to the old value
-    mGeckoChild->BackingScaleFactorChanged();
-  }
-}
-
-- (BOOL)isCoveringTitlebar
-{
-  return [[self window] isKindOfClass:[BaseWindow class]] &&
-         [(BaseWindow*)[self window] mainChildView] == self &&
-         [(BaseWindow*)[self window] drawsContentsIntoWindowFrame];
-}
-
-- (void)viewWillStartLiveResize
-{
-  nsCOMPtr<nsIObserverService> observerService = mozilla::services::GetObserverService();
-
-  if (!observerService) {
-    return;
-  }
-
-  observerService->NotifyObservers(nullptr, "live-resize-start", nullptr);
-}
-
-- (void)viewDidEndLiveResize
-{
-  nsCOMPtr<nsIObserverService> observerService = mozilla::services::GetObserverService();
-
-  if (!observerService) {
-    return;
-  }
-
-  observerService->NotifyObservers(nullptr, "live-resize-end", nullptr);
-}
-
-- (NSColor*)vibrancyFillColorForThemeGeometryType:(nsITheme::ThemeGeometryType)aThemeGeometryType
-{
-  if (!mGeckoChild) {
-    return [NSColor whiteColor];
-  }
-  return mGeckoChild->VibrancyFillColorForThemeGeometryType(aThemeGeometryType);
-}
-
-- (NSColor*)vibrancyFontSmoothingBackgroundColorForThemeGeometryType:(nsITheme::ThemeGeometryType)aThemeGeometryType
-{
-  if (!mGeckoChild) {
-    return [NSColor clearColor];
-  }
-  return mGeckoChild->VibrancyFontSmoothingBackgroundColorForThemeGeometryType(aThemeGeometryType);
-}
-
-- (LayoutDeviceIntRegion)nativeDirtyRegionWithBoundingRect:(NSRect)aRect
-{
-  LayoutDeviceIntRect boundingRect = mGeckoChild->CocoaPointsToDevPixels(aRect);
-  const NSRect *rects;
-  NSInteger count;
-  [mPixelHostingView getRectsBeingDrawn:&rects count:&count];
-
-  if (count > MAX_RECTS_IN_REGION) {
-    return boundingRect;
-  }
-
-  LayoutDeviceIntRegion region;
-  for (NSInteger i = 0; i < count; ++i) {
-    region.Or(region, mGeckoChild->CocoaPointsToDevPixels(rects[i]));
-  }
-  region.And(region, boundingRect);
-  return region;
-}
-
-// The display system has told us that a portion of our view is dirty. Tell
-// gecko to paint it
-// This method is called from mPixelHostingView's drawRect handler.
-- (void)doDrawRect:(NSRect)aRect
-{
-  if (!NS_IsMainThread()) {
-    // In the presence of CoreAnimation, this method can sometimes be called on
-    // a non-main thread. Ignore those calls because Gecko can only react to
-    // them on the main thread.
-    return;
-  }
-
-  if (!mGeckoChild || !mGeckoChild->IsVisible())
-    return;
-  CGContextRef cgContext = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
-
-  if ([self isUsingOpenGL]) {
-    // Since this view is usually declared as opaque, the window's pixel
-    // buffer may now contain garbage which we need to prevent from reaching
-    // the screen. The only place where garbage can show is in the window
-    // corners and the vibrant regions of the window - the rest of the window
-    // is covered by opaque content in our OpenGL surface.
-    // So we need to clear the pixel buffer contents in these areas.
-    [self clearCorners];
-
-    // Force a sync OMTC composite into the OpenGL context and return.
-    LayoutDeviceIntRect geckoBounds = mGeckoChild->GetBounds();
-    LayoutDeviceIntRegion region(geckoBounds);
-
-    mGeckoChild->PaintWindow(region);
-    return;
-  }
-
-  PROFILER_LABEL("ChildView", "drawRect",
-    js::ProfileEntry::Category::GRAPHICS);
-
-  // The CGContext that drawRect supplies us with comes with a transform that
-  // scales one user space unit to one Cocoa point, which can consist of
-  // multiple dev pixels. But Gecko expects its supplied context to be scaled
-  // to device pixels, so we need to reverse the scaling.
-  double scale = mGeckoChild->BackingScaleFactor();
-  CGContextSaveGState(cgContext);
-  CGContextScaleCTM(cgContext, 1.0 / scale, 1.0 / scale);
-
-  NSSize viewSize = [self bounds].size;
-  gfx::IntSize backingSize = gfx::IntSize::Truncate(viewSize.width * scale, viewSize.height * scale);
-  LayoutDeviceIntRegion region = [self nativeDirtyRegionWithBoundingRect:aRect];
-
-  bool painted = mGeckoChild->PaintWindowInContext(cgContext, region, backingSize);
-
-  // Undo the scale transform so that from now on the context is in
-  // CocoaPoints again.
-  CGContextRestoreGState(cgContext);
-
-  if (!painted && [mPixelHostingView isOpaque]) {
-    // Gecko refused to draw, but we've claimed to be opaque, so we have to
-    // draw something--fill with white.
-    CGContextSetRGBFillColor(cgContext, 1, 1, 1, 1);
-    CGContextFillRect(cgContext, NSRectToCGRect(aRect));
-  }
-
-  if ([self isCoveringTitlebar]) {
-    [self drawTitleString];
-    [self drawTitlebarHighlight];
-    [self maskTopCornersInContext:cgContext];
-  }
-}
-
-- (BOOL)isUsingOpenGL
-{
-  if (!mGeckoChild || ![self window])
-    return NO;
-
-  return mGLContext || mUsingOMTCompositor;
-}
-
-
-- (BOOL)hasRoundedBottomCorners
-{
-  return [[self window] respondsToSelector:@selector(bottomCornerRounded)] &&
-  [[self window] bottomCornerRounded];
-}
-
-- (CGFloat)cornerRadius
-{
-  NSView* frameView = [[[self window] contentView] superview];
-  if (!frameView || ![frameView respondsToSelector:@selector(roundedCornerRadius)])
-    return 4.0f;
-  return [frameView roundedCornerRadius];
-}
-
--(void)setGLOpaque:(BOOL)aOpaque
-{
-  CGLLockContext((CGLContextObj)[mGLContext CGLContextObj]);
-  // Make the context opaque for fullscreen (since it performs better), and transparent
-  // for windowed (since we need it for rounded corners).
-  GLint opaque = aOpaque ? 1 : 0;
-  [mGLContext setValues:&opaque forParameter:NSOpenGLCPSurfaceOpacity];
-  CGLUnlockContext((CGLContextObj)[mGLContext CGLContextObj]);
-}
-
-// Accelerated windows have two NSSurfaces:
-//  (1) The window's pixel buffer in the back and
-//  (2) the OpenGL view in the front.
-// These two surfaces are composited by the window manager. Drawing into the
-// CGContext which is provided by drawRect ends up in (1).
-// When our window has rounded corners, the OpenGL view has transparent pixels
-// in the corners. In these places the contents of the window's pixel buffer
-// can show through. So we need to make sure that the pixel buffer is
-// transparent in the corners so that no garbage reaches the screen.
-// The contents of the pixel buffer in the rest of the window don't matter
-// because they're covered by opaque pixels of the OpenGL context.
-// Making the corners transparent works even though our window is
-// declared "opaque" (in the NSWindow's isOpaque method).
-- (void)clearCorners
-{
-  CGFloat radius = [self cornerRadius];
-  CGFloat w = [self bounds].size.width, h = [self bounds].size.height;
-  [[NSColor clearColor] set];
-
-  if ([self isCoveringTitlebar]) {
-    NSRectFill(NSMakeRect(0, 0, radius, radius));
-    NSRectFill(NSMakeRect(w - radius, 0, radius, radius));
-  }
-
-  if ([self hasRoundedBottomCorners]) {
-    NSRectFill(NSMakeRect(0, h - radius, radius, radius));
-    NSRectFill(NSMakeRect(w - radius, h - radius, radius, radius));
-  }
-}
-
-// This is the analog of nsChildView::MaybeDrawRoundedCorners for CGContexts.
-// We only need to mask the top corners here because Cocoa does the masking
-// for the window's bottom corners automatically (starting with 10.7).
-- (void)maskTopCornersInContext:(CGContextRef)aContext
-{
-  CGFloat radius = [self cornerRadius];
-  int32_t devPixelCornerRadius = mGeckoChild->CocoaPointsToDevPixels(radius);
-
-  // First make sure that mTopLeftCornerMask is set up.
-  if (!mTopLeftCornerMask ||
-      int32_t(CGImageGetWidth(mTopLeftCornerMask)) != devPixelCornerRadius) {
-    CGImageRelease(mTopLeftCornerMask);
-    CGColorSpaceRef rgb = CGColorSpaceCreateDeviceRGB();
-    CGContextRef imgCtx = CGBitmapContextCreate(NULL,
-                                                devPixelCornerRadius,
-                                                devPixelCornerRadius,
-                                                8, devPixelCornerRadius * 4,
-                                                rgb, kCGImageAlphaPremultipliedFirst);
-    CGColorSpaceRelease(rgb);
-    DrawTopLeftCornerMask(imgCtx, devPixelCornerRadius);
-    mTopLeftCornerMask = CGBitmapContextCreateImage(imgCtx);
-    CGContextRelease(imgCtx);
-  }
-
-  // kCGBlendModeDestinationIn is the secret sauce which allows us to erase
-  // already painted pixels. It's defined as R = D * Sa: multiply all channels
-  // of the destination pixel with the alpha of the source pixel. In our case,
-  // the source is mTopLeftCornerMask.
-  CGContextSaveGState(aContext);
-  CGContextSetBlendMode(aContext, kCGBlendModeDestinationIn);
-
-  CGRect destRect = CGRectMake(0, 0, radius, radius);
-
-  // Erase the top left corner...
-  CGContextDrawImage(aContext, destRect, mTopLeftCornerMask);
-
-  // ... and the top right corner.
-  CGContextTranslateCTM(aContext, [self bounds].size.width, 0);
-  CGContextScaleCTM(aContext, -1, 1);
-  CGContextDrawImage(aContext, destRect, mTopLeftCornerMask);
-
-  CGContextRestoreGState(aContext);
-}
-
-- (void)drawTitleString
-{
-  BaseWindow* window = (BaseWindow*)[self window];
-  if (![window wantsTitleDrawn]) {
-    return;
-  }
-
-  NSView* frameView = [[window contentView] superview];
-  if (![frameView respondsToSelector:@selector(_drawTitleBar:)]) {
-    return;
-  }
-
-  NSGraphicsContext* oldContext = [NSGraphicsContext currentContext];
-  CGContextRef ctx = (CGContextRef)[oldContext graphicsPort];
-  CGContextSaveGState(ctx);
-  if ([oldContext isFlipped] != [frameView isFlipped]) {
-    CGContextTranslateCTM(ctx, 0, [self bounds].size.height);
-    CGContextScaleCTM(ctx, 1, -1);
-  }
-  [NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithGraphicsPort:ctx flipped:[frameView isFlipped]]];
-  [frameView _drawTitleBar:[frameView bounds]];
-  CGContextRestoreGState(ctx);
-  [NSGraphicsContext setCurrentContext:oldContext];
-}
-
-- (void)drawTitlebarHighlight
-{
-  DrawTitlebarHighlight([self bounds].size, [self cornerRadius],
-                        mGeckoChild->DevPixelsToCocoaPoints(1));
-}
-
-- (void)viewWillDraw
-{
-  nsAutoRetainCocoaObject kungFuDeathGrip(self);
-
-  if (mGeckoChild) {
-    // The OS normally *will* draw our NSWindow, no matter what we do here.
-    // But Gecko can delete our parent widget(s) (along with mGeckoChild)
-    // while processing a paint request, which closes our NSWindow and
-    // makes the OS throw an NSInternalInconsistencyException assertion when
-    // it tries to draw it.  Sometimes the OS also aborts the browser process.
-    // So we need to retain our parent(s) here and not release it/them until
-    // the next time through the main thread's run loop.  When we do this we
-    // also need to retain and release mGeckoChild, which holds a strong
-    // reference to us.  See bug 550392.
-    nsIWidget* parent = mGeckoChild->GetParent();
-    if (parent) {
-      nsTArray<nsCOMPtr<nsIWidget>> widgetArray;
-      while (parent) {
-        widgetArray.AppendElement(parent);
-        parent = parent->GetParent();
-      }
-      widgetArray.AppendElement(mGeckoChild);
-      nsCOMPtr<nsIRunnable> releaserRunnable =
-        new WidgetsReleaserRunnable(Move(widgetArray));
-      NS_DispatchToMainThread(releaserRunnable);
-    }
-
-    if ([self isUsingOpenGL]) {
-      if (ShadowLayerForwarder* slf = mGeckoChild->GetLayerManager()->AsShadowForwarder()) {
-        slf->WindowOverlayChanged();
-      }
-    }
-
-    mGeckoChild->WillPaintWindow();
-  }
-  [super viewWillDraw];
-}
-
-#if USE_CLICK_HOLD_CONTEXTMENU
-//
-// -clickHoldCallback:
-//
-// called from a timer two seconds after a mouse down to see if we should display
-// a context menu (click-hold). |anEvent| is the original mouseDown event. If we're
-// still in that mouseDown by this time, put up the context menu, otherwise just
-// fuhgeddaboutit. |anEvent| has been retained by the OS until after this callback
-// fires so we're ok there.
-//
-// This code currently messes in a bunch of edge cases (bugs 234751, 232964, 232314)
-// so removing it until we get it straightened out.
-//
-- (void)clickHoldCallback:(id)theEvent;
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if( theEvent == [NSApp currentEvent] ) {
-    // we're still in the middle of the same mousedown event here, activate
-    // click-hold context menu by triggering the right mouseDown action.
-    NSEvent* clickHoldEvent = [NSEvent mouseEventWithType:NSRightMouseDown
-                                                  location:[theEvent locationInWindow]
-                                             modifierFlags:[theEvent modifierFlags]
-                                                 timestamp:[theEvent timestamp]
-                                              windowNumber:[theEvent windowNumber]
-                                                   context:[theEvent context]
-                                               eventNumber:[theEvent eventNumber]
-                                                clickCount:[theEvent clickCount]
-                                                  pressure:[theEvent pressure]];
-    [self rightMouseDown:clickHoldEvent];
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-#endif
-
-// If we've just created a non-native context menu, we need to mark it as
-// such and let the OS (and other programs) know when it opens and closes
-// (this is how the OS knows to close other programs' context menus when
-// ours open).  We send the initial notification here, but others are sent
-// in nsCocoaWindow::Show().
-- (void)maybeInitContextMenuTracking
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-#ifdef MOZ_USE_NATIVE_POPUP_WINDOWS
-  return;
-#endif /* MOZ_USE_NATIVE_POPUP_WINDOWS */
-
-  nsIRollupListener* rollupListener = nsBaseWidget::GetActiveRollupListener();
-  NS_ENSURE_TRUE_VOID(rollupListener);
-  nsCOMPtr<nsIWidget> widget = rollupListener->GetRollupWidget();
-  NS_ENSURE_TRUE_VOID(widget);
-
-  NSWindow *popupWindow = (NSWindow*)widget->GetNativeData(NS_NATIVE_WINDOW);
-  if (!popupWindow || ![popupWindow isKindOfClass:[PopupWindow class]])
-    return;
-
-  [[NSDistributedNotificationCenter defaultCenter]
-    postNotificationName:@"com.apple.HIToolbox.beginMenuTrackingNotification"
-                  object:@"org.mozilla.gecko.PopupWindow"];
-  [(PopupWindow*)popupWindow setIsContextMenu:YES];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-// Returns true if the event should no longer be processed, false otherwise.
-// This does not return whether or not anything was rolled up.
-- (BOOL)maybeRollup:(NSEvent*)theEvent
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  BOOL consumeEvent = NO;
-
-  nsIRollupListener* rollupListener = nsBaseWidget::GetActiveRollupListener();
-  NS_ENSURE_TRUE(rollupListener, false);
-  nsCOMPtr<nsIWidget> rollupWidget = rollupListener->GetRollupWidget();
-  if (rollupWidget) {
-    NSWindow* currentPopup = static_cast<NSWindow*>(rollupWidget->GetNativeData(NS_NATIVE_WINDOW));
-    if (!nsCocoaUtils::IsEventOverWindow(theEvent, currentPopup)) {
-      // event is not over the rollup window, default is to roll up
-      bool shouldRollup = true;
-
-      // check to see if scroll events should roll up the popup
-      if ([theEvent type] == NSScrollWheel) {
-        shouldRollup = rollupListener->ShouldRollupOnMouseWheelEvent();
-        // consume scroll events that aren't over the popup
-        // unless the popup is an arrow panel
-        consumeEvent = rollupListener->ShouldConsumeOnMouseWheelEvent();
-      }
-
-      // if we're dealing with menus, we probably have submenus and
-      // we don't want to rollup if the click is in a parent menu of
-      // the current submenu
-      uint32_t popupsToRollup = UINT32_MAX;
-      AutoTArray<nsIWidget*, 5> widgetChain;
-      uint32_t sameTypeCount = rollupListener->GetSubmenuWidgetChain(&widgetChain);
-      for (uint32_t i = 0; i < widgetChain.Length(); i++) {
-        nsIWidget* widget = widgetChain[i];
-        NSWindow* currWindow = (NSWindow*)widget->GetNativeData(NS_NATIVE_WINDOW);
-        if (nsCocoaUtils::IsEventOverWindow(theEvent, currWindow)) {
-          // don't roll up if the mouse event occurred within a menu of the
-          // same type. If the mouse event occurred in a menu higher than
-          // that, roll up, but pass the number of popups to Rollup so
-          // that only those of the same type close up.
-          if (i < sameTypeCount) {
-            shouldRollup = false;
-          }
-          else {
-            popupsToRollup = sameTypeCount;
-          }
-          break;
-        }
-      }
-
-      if (shouldRollup) {
-        if ([theEvent type] == NSLeftMouseDown) {
-          NSPoint point = [NSEvent mouseLocation];
-          FlipCocoaScreenCoordinate(point);
-          gfx::IntPoint pos = gfx::IntPoint::Truncate(point.x, point.y);
-          consumeEvent = (BOOL)rollupListener->Rollup(popupsToRollup, true, &pos, nullptr);
-        }
-        else {
-          consumeEvent = (BOOL)rollupListener->Rollup(popupsToRollup, true, nullptr, nullptr);
-        }
-      }
-    }
-  }
-
-  return consumeEvent;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NO);
-}
-
-/*
- * In OS X Mountain Lion and above, smart zoom gestures are implemented in
- * smartMagnifyWithEvent. In OS X Lion, they are implemented in
- * magnifyWithEvent. See inline comments for more info.
- *
- * The prototypes swipeWithEvent, beginGestureWithEvent, magnifyWithEvent,
- * smartMagnifyWithEvent, rotateWithEvent, and endGestureWithEvent were
- * obtained from the following links:
- * https://developer.apple.com/library/mac/#documentation/Cocoa/Reference/ApplicationKit/Classes/NSResponder_Class/Reference/Reference.html
- * https://developer.apple.com/library/mac/#releasenotes/Cocoa/AppKit.html
- */
-
-- (void)swipeWithEvent:(NSEvent *)anEvent
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!anEvent || !mGeckoChild)
-    return;
-
-  nsAutoRetainCocoaObject kungFuDeathGrip(self);
-
-  float deltaX = [anEvent deltaX];  // left=1.0, right=-1.0
-  float deltaY = [anEvent deltaY];  // up=1.0, down=-1.0
-
-  // Setup the "swipe" event.
-  WidgetSimpleGestureEvent geckoEvent(true, eSwipeGesture, mGeckoChild);
-  [self convertCocoaMouseEvent:anEvent toGeckoEvent:&geckoEvent];
-
-  // Record the left/right direction.
-  if (deltaX > 0.0)
-    geckoEvent.mDirection |= nsIDOMSimpleGestureEvent::DIRECTION_LEFT;
-  else if (deltaX < 0.0)
-    geckoEvent.mDirection |= nsIDOMSimpleGestureEvent::DIRECTION_RIGHT;
-
-  // Record the up/down direction.
-  if (deltaY > 0.0)
-    geckoEvent.mDirection |= nsIDOMSimpleGestureEvent::DIRECTION_UP;
-  else if (deltaY < 0.0)
-    geckoEvent.mDirection |= nsIDOMSimpleGestureEvent::DIRECTION_DOWN;
-
-  // Send the event.
-  mGeckoChild->DispatchWindowEvent(geckoEvent);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (void)beginGestureWithEvent:(NSEvent *)anEvent
-{
-  if (!anEvent)
-    return;
-
-  mGestureState = eGestureState_StartGesture;
-  mCumulativeMagnification = 0;
-  mCumulativeRotation = 0.0;
-}
-
-- (void)magnifyWithEvent:(NSEvent *)anEvent
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!anEvent || !mGeckoChild)
-    return;
-
-  nsAutoRetainCocoaObject kungFuDeathGrip(self);
-
-  float deltaZ = [anEvent deltaZ];
-
-  EventMessage msg;
-  switch (mGestureState) {
-  case eGestureState_StartGesture:
-    msg = eMagnifyGestureStart;
-    mGestureState = eGestureState_MagnifyGesture;
-    break;
-
-  case eGestureState_MagnifyGesture:
-    msg = eMagnifyGestureUpdate;
-    break;
-
-  case eGestureState_None:
-  case eGestureState_RotateGesture:
-  default:
-    return;
-  }
-
-  // Setup the event.
-  WidgetSimpleGestureEvent geckoEvent(true, msg, mGeckoChild);
-  geckoEvent.mDelta = deltaZ;
-  [self convertCocoaMouseEvent:anEvent toGeckoEvent:&geckoEvent];
-
-  // Send the event.
-  mGeckoChild->DispatchWindowEvent(geckoEvent);
-
-  // Keep track of the cumulative magnification for the final "magnify" event.
-  mCumulativeMagnification += deltaZ;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (void)smartMagnifyWithEvent:(NSEvent *)anEvent
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!anEvent || !mGeckoChild) {
-    return;
-  }
-
-  nsAutoRetainCocoaObject kungFuDeathGrip(self);
-
-  // Setup the "double tap" event.
-  WidgetSimpleGestureEvent geckoEvent(true, eTapGesture, mGeckoChild);
-  [self convertCocoaMouseEvent:anEvent toGeckoEvent:&geckoEvent];
-  geckoEvent.mClickCount = 1;
-
-  // Send the event.
-  mGeckoChild->DispatchWindowEvent(geckoEvent);
-
-  // Clear the gesture state
-  mGestureState = eGestureState_None;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (void)rotateWithEvent:(NSEvent *)anEvent
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!anEvent || !mGeckoChild)
-    return;
-
-  nsAutoRetainCocoaObject kungFuDeathGrip(self);
-
-  float rotation = [anEvent rotation];
-
-  EventMessage msg;
-  switch (mGestureState) {
-  case eGestureState_StartGesture:
-    msg = eRotateGestureStart;
-    mGestureState = eGestureState_RotateGesture;
-    break;
-
-  case eGestureState_RotateGesture:
-    msg = eRotateGestureUpdate;
-    break;
-
-  case eGestureState_None:
-  case eGestureState_MagnifyGesture:
-  default:
-    return;
-  }
-
-  // Setup the event.
-  WidgetSimpleGestureEvent geckoEvent(true, msg, mGeckoChild);
-  [self convertCocoaMouseEvent:anEvent toGeckoEvent:&geckoEvent];
-  geckoEvent.mDelta = -rotation;
-  if (rotation > 0.0) {
-    geckoEvent.mDirection = nsIDOMSimpleGestureEvent::ROTATION_COUNTERCLOCKWISE;
-  } else {
-    geckoEvent.mDirection = nsIDOMSimpleGestureEvent::ROTATION_CLOCKWISE;
-  }
-
-  // Send the event.
-  mGeckoChild->DispatchWindowEvent(geckoEvent);
-
-  // Keep track of the cumulative rotation for the final "rotate" event.
-  mCumulativeRotation += rotation;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (void)endGestureWithEvent:(NSEvent *)anEvent
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!anEvent || !mGeckoChild) {
-    // Clear the gestures state if we cannot send an event.
-    mGestureState = eGestureState_None;
-    mCumulativeMagnification = 0.0;
-    mCumulativeRotation = 0.0;
-    return;
-  }
-
-  nsAutoRetainCocoaObject kungFuDeathGrip(self);
-
-  switch (mGestureState) {
-  case eGestureState_MagnifyGesture:
-    {
-      // Setup the "magnify" event.
-      WidgetSimpleGestureEvent geckoEvent(true, eMagnifyGesture, mGeckoChild);
-      geckoEvent.mDelta = mCumulativeMagnification;
-      [self convertCocoaMouseEvent:anEvent toGeckoEvent:&geckoEvent];
-
-      // Send the event.
-      mGeckoChild->DispatchWindowEvent(geckoEvent);
-    }
-    break;
-
-  case eGestureState_RotateGesture:
-    {
-      // Setup the "rotate" event.
-      WidgetSimpleGestureEvent geckoEvent(true, eRotateGesture, mGeckoChild);
-      [self convertCocoaMouseEvent:anEvent toGeckoEvent:&geckoEvent];
-      geckoEvent.mDelta = -mCumulativeRotation;
-      if (mCumulativeRotation > 0.0) {
-        geckoEvent.mDirection = nsIDOMSimpleGestureEvent::ROTATION_COUNTERCLOCKWISE;
-      } else {
-        geckoEvent.mDirection = nsIDOMSimpleGestureEvent::ROTATION_CLOCKWISE;
-      }
-
-      // Send the event.
-      mGeckoChild->DispatchWindowEvent(geckoEvent);
-    }
-    break;
-
-  case eGestureState_None:
-  case eGestureState_StartGesture:
-  default:
-    break;
-  }
-
-  // Clear the gestures state.
-  mGestureState = eGestureState_None;
-  mCumulativeMagnification = 0.0;
-  mCumulativeRotation = 0.0;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (bool)shouldConsiderStartingSwipeFromEvent:(NSEvent*)anEvent
-{
-  // This method checks whether the AppleEnableSwipeNavigateWithScrolls global
-  // preference is set.  If it isn't, fluid swipe tracking is disabled, and a
-  // horizontal two-finger gesture is always a scroll (even in Safari).  This
-  // preference can't (currently) be set from the Preferences UI -- only using
-  // 'defaults write'.
-  if (![NSEvent isSwipeTrackingFromScrollEventsEnabled]) {
-    return false;
-  }
-
-  // Only initiate horizontal tracking for gestures that have just begun --
-  // otherwise a scroll to one side of the page can have a swipe tacked on
-  // to it.
-  NSEventPhase eventPhase = nsCocoaUtils::EventPhase(anEvent);
-  if ([anEvent type] != NSScrollWheel ||
-      eventPhase != NSEventPhaseBegan ||
-      ![anEvent hasPreciseScrollingDeltas]) {
-    return false;
-  }
-
-  // Only initiate horizontal tracking for events whose horizontal element is
-  // at least eight times larger than its vertical element. This minimizes
-  // performance problems with vertical scrolls (by minimizing the possibility
-  // that they'll be misinterpreted as horizontal swipes), while still
-  // tolerating a small vertical element to a true horizontal swipe.  The number
-  // '8' was arrived at by trial and error.
-  CGFloat deltaX = [anEvent scrollingDeltaX];
-  CGFloat deltaY = [anEvent scrollingDeltaY];
-  return std::abs(deltaX) > std::abs(deltaY) * 8;
-}
-
-- (void)setUsingOMTCompositor:(BOOL)aUseOMTC
-{
-  mUsingOMTCompositor = aUseOMTC;
-}
-
-// Returning NO from this method only disallows ordering on mousedown - in order
-// to prevent it for mouseup too, we need to call [NSApp preventWindowOrdering]
-// when handling the mousedown event.
-- (BOOL)shouldDelayWindowOrderingForEvent:(NSEvent*)aEvent
-{
-  // Always using system-provided window ordering for normal windows.
-  if (![[self window] isKindOfClass:[PopupWindow class]])
-    return NO;
-
-  // Don't reorder when we don't have a parent window, like when we're a
-  // context menu or a tooltip.
-  return ![[self window] parentWindow];
-}
-
-- (void)mouseDown:(NSEvent*)theEvent
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if ([self shouldDelayWindowOrderingForEvent:theEvent]) {
-    [NSApp preventWindowOrdering];
-  }
-
-  // If we've already seen this event due to direct dispatch from menuForEvent:
-  // just bail; if not, remember it.
-  if (mLastMouseDownEvent == theEvent) {
-    [mLastMouseDownEvent release];
-    mLastMouseDownEvent = nil;
-    return;
-  }
-  else {
-    [mLastMouseDownEvent release];
-    mLastMouseDownEvent = [theEvent retain];
-  }
-
-  [gLastDragMouseDownEvent release];
-  gLastDragMouseDownEvent = [theEvent retain];
-
-  // We need isClickThrough because at this point the window we're in might
-  // already have become main, so the check for isMainWindow in
-  // WindowAcceptsEvent isn't enough. It also has to check isClickThrough.
-  BOOL isClickThrough = (theEvent == mClickThroughMouseDownEvent);
-  [mClickThroughMouseDownEvent release];
-  mClickThroughMouseDownEvent = nil;
-
-  nsAutoRetainCocoaObject kungFuDeathGrip(self);
-
-  if ([self maybeRollup:theEvent] ||
-      !ChildViewMouseTracker::WindowAcceptsEvent([self window], theEvent, self, isClickThrough)) {
-    // Remember blocking because that means we want to block mouseup as well.
-    mBlockedLastMouseDown = YES;
-    return;
-  }
-
-#if USE_CLICK_HOLD_CONTEXTMENU
-  // fire off timer to check for click-hold after two seconds. retains |theEvent|
-  [self performSelector:@selector(clickHoldCallback:) withObject:theEvent afterDelay:2.0];
-#endif
-
-  // in order to send gecko events we'll need a gecko widget
-  if (!mGeckoChild)
-    return;
-  if (mTextInputHandler->OnHandleEvent(theEvent)) {
-    return;
-  }
-
-  NSUInteger modifierFlags = [theEvent modifierFlags];
-
-  WidgetMouseEvent geckoEvent(true, eMouseDown, mGeckoChild,
-                              WidgetMouseEvent::eReal);
-  [self convertCocoaMouseEvent:theEvent toGeckoEvent:&geckoEvent];
-
-  NSInteger clickCount = [theEvent clickCount];
-  if (mBlockedLastMouseDown && clickCount > 1) {
-    // Don't send a double click if the first click of the double click was
-    // blocked.
-    clickCount--;
-  }
-  geckoEvent.mClickCount = clickCount;
-
-  if (modifierFlags & NSControlKeyMask)
-    geckoEvent.button = WidgetMouseEvent::eRightButton;
-  else
-    geckoEvent.button = WidgetMouseEvent::eLeftButton;
-
-  mGeckoChild->DispatchInputEvent(&geckoEvent);
-  mBlockedLastMouseDown = NO;
-
-  // XXX maybe call markedTextSelectionChanged:client: here?
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (void)mouseUp:(NSEvent *)theEvent
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!mGeckoChild || mBlockedLastMouseDown)
-    return;
-  if (mTextInputHandler->OnHandleEvent(theEvent)) {
-    return;
-  }
-
-  nsAutoRetainCocoaObject kungFuDeathGrip(self);
-
-  WidgetMouseEvent geckoEvent(true, eMouseUp, mGeckoChild,
-                              WidgetMouseEvent::eReal);
-  [self convertCocoaMouseEvent:theEvent toGeckoEvent:&geckoEvent];
-  if ([theEvent modifierFlags] & NSControlKeyMask)
-    geckoEvent.button = WidgetMouseEvent::eRightButton;
-  else
-    geckoEvent.button = WidgetMouseEvent::eLeftButton;
-
-  // This might destroy our widget (and null out mGeckoChild).
-  bool defaultPrevented =
-    (mGeckoChild->DispatchInputEvent(&geckoEvent) == nsEventStatus_eConsumeNoDefault);
-
-  // Check to see if we are double-clicking in the titlebar.
-  CGFloat locationInTitlebar = [[self window] frame].size.height - [theEvent locationInWindow].y;
-  LayoutDeviceIntPoint pos = geckoEvent.mRefPoint;
-  if (!defaultPrevented && [theEvent clickCount] == 2 &&
-      !mGeckoChild->GetNonDraggableRegion().Contains(pos.x, pos.y) &&
-      [[self window] isKindOfClass:[ToolbarWindow class]] &&
-      (locationInTitlebar < [(ToolbarWindow*)[self window] titlebarHeight] ||
-       locationInTitlebar < [(ToolbarWindow*)[self window] unifiedToolbarHeight])) {
-    if ([self shouldZoomOnDoubleClick]) {
-      [[self window] performZoom:nil];
-    } else if ([self shouldMinimizeOnTitlebarDoubleClick]) {
-      NSButton *minimizeButton = [[self window] standardWindowButton:NSWindowMiniaturizeButton];
-      [minimizeButton performClick:self];
-    }
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (void)sendMouseEnterOrExitEvent:(NSEvent*)aEvent
-                            enter:(BOOL)aEnter
-                         exitFrom:(WidgetMouseEvent::ExitFrom)aExitFrom
-{
-  if (!mGeckoChild)
-    return;
-
-  NSPoint windowEventLocation = nsCocoaUtils::EventLocationForWindow(aEvent, [self window]);
-  NSPoint localEventLocation = [self convertPoint:windowEventLocation fromView:nil];
-
-  EventMessage msg = aEnter ? eMouseEnterIntoWidget : eMouseExitFromWidget;
-  WidgetMouseEvent event(true, msg, mGeckoChild, WidgetMouseEvent::eReal);
-  event.mRefPoint = mGeckoChild->CocoaPointsToDevPixels(localEventLocation);
-
-  event.mExitFrom = aExitFrom;
-
-  nsEventStatus status; // ignored
-  mGeckoChild->DispatchEvent(&event, status);
-}
-
-- (void)handleMouseMoved:(NSEvent*)theEvent
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!mGeckoChild)
-    return;
-  if (mTextInputHandler->OnHandleEvent(theEvent)) {
-    return;
-  }
-
-  WidgetMouseEvent geckoEvent(true, eMouseMove, mGeckoChild,
-                              WidgetMouseEvent::eReal);
-  [self convertCocoaMouseEvent:theEvent toGeckoEvent:&geckoEvent];
-
-  mGeckoChild->DispatchInputEvent(&geckoEvent);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (void)mouseDragged:(NSEvent*)theEvent
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!mGeckoChild)
-    return;
-  if (mTextInputHandler->OnHandleEvent(theEvent)) {
-    return;
-  }
-
-  gLastDragView = self;
-
-  WidgetMouseEvent geckoEvent(true, eMouseMove, mGeckoChild,
-                              WidgetMouseEvent::eReal);
-  [self convertCocoaMouseEvent:theEvent toGeckoEvent:&geckoEvent];
-
-  mGeckoChild->DispatchInputEvent(&geckoEvent);
-
-  // Note, sending the above event might have destroyed our widget since we didn't retain.
-  // Fine so long as we don't access any local variables from here on.
-  gLastDragView = nil;
-
-  // XXX maybe call markedTextSelectionChanged:client: here?
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (void)rightMouseDown:(NSEvent *)theEvent
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  nsAutoRetainCocoaObject kungFuDeathGrip(self);
-
-  [self maybeRollup:theEvent];
-  if (!mGeckoChild)
-    return;
-  if (mTextInputHandler->OnHandleEvent(theEvent)) {
-    return;
-  }
-
-  // The right mouse went down, fire off a right mouse down event to gecko
-  WidgetMouseEvent geckoEvent(true, eMouseDown, mGeckoChild,
-                              WidgetMouseEvent::eReal);
-  [self convertCocoaMouseEvent:theEvent toGeckoEvent:&geckoEvent];
-  geckoEvent.button = WidgetMouseEvent::eRightButton;
-  geckoEvent.mClickCount = [theEvent clickCount];
-
-  mGeckoChild->DispatchInputEvent(&geckoEvent);
-  if (!mGeckoChild)
-    return;
-
-  // Let the superclass do the context menu stuff.
-  [super rightMouseDown:theEvent];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (void)rightMouseUp:(NSEvent *)theEvent
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!mGeckoChild)
-    return;
-  if (mTextInputHandler->OnHandleEvent(theEvent)) {
-    return;
-  }
-
-  WidgetMouseEvent geckoEvent(true, eMouseUp, mGeckoChild,
-                              WidgetMouseEvent::eReal);
-  [self convertCocoaMouseEvent:theEvent toGeckoEvent:&geckoEvent];
-  geckoEvent.button = WidgetMouseEvent::eRightButton;
-  geckoEvent.mClickCount = [theEvent clickCount];
-
-  nsAutoRetainCocoaObject kungFuDeathGrip(self);
-  mGeckoChild->DispatchInputEvent(&geckoEvent);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (void)rightMouseDragged:(NSEvent*)theEvent
-{
-  if (!mGeckoChild)
-    return;
-  if (mTextInputHandler->OnHandleEvent(theEvent)) {
-    return;
-  }
-
-  WidgetMouseEvent geckoEvent(true, eMouseMove, mGeckoChild,
-                              WidgetMouseEvent::eReal);
-  [self convertCocoaMouseEvent:theEvent toGeckoEvent:&geckoEvent];
-  geckoEvent.button = WidgetMouseEvent::eRightButton;
-
-  // send event into Gecko by going directly to the
-  // the widget.
-  mGeckoChild->DispatchInputEvent(&geckoEvent);
-}
-
-- (void)otherMouseDown:(NSEvent *)theEvent
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  nsAutoRetainCocoaObject kungFuDeathGrip(self);
-
-  if ([self maybeRollup:theEvent] ||
-      !ChildViewMouseTracker::WindowAcceptsEvent([self window], theEvent, self))
-    return;
-
-  if (!mGeckoChild)
-    return;
-  if (mTextInputHandler->OnHandleEvent(theEvent)) {
-    return;
-  }
-
-  WidgetMouseEvent geckoEvent(true, eMouseDown, mGeckoChild,
-                              WidgetMouseEvent::eReal);
-  [self convertCocoaMouseEvent:theEvent toGeckoEvent:&geckoEvent];
-  geckoEvent.button = WidgetMouseEvent::eMiddleButton;
-  geckoEvent.mClickCount = [theEvent clickCount];
-
-  mGeckoChild->DispatchInputEvent(&geckoEvent);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (void)otherMouseUp:(NSEvent *)theEvent
-{
-  if (!mGeckoChild)
-    return;
-  if (mTextInputHandler->OnHandleEvent(theEvent)) {
-    return;
-  }
-
-  WidgetMouseEvent geckoEvent(true, eMouseUp, mGeckoChild,
-                              WidgetMouseEvent::eReal);
-  [self convertCocoaMouseEvent:theEvent toGeckoEvent:&geckoEvent];
-  geckoEvent.button = WidgetMouseEvent::eMiddleButton;
-
-  nsAutoRetainCocoaObject kungFuDeathGrip(self);
-  mGeckoChild->DispatchInputEvent(&geckoEvent);
-}
-
-- (void)otherMouseDragged:(NSEvent*)theEvent
-{
-  if (!mGeckoChild)
-    return;
-  if (mTextInputHandler->OnHandleEvent(theEvent)) {
-    return;
-  }
-
-  WidgetMouseEvent geckoEvent(true, eMouseMove, mGeckoChild,
-                              WidgetMouseEvent::eReal);
-  [self convertCocoaMouseEvent:theEvent toGeckoEvent:&geckoEvent];
-  geckoEvent.button = WidgetMouseEvent::eMiddleButton;
-
-  // send event into Gecko by going directly to the
-  // the widget.
-  mGeckoChild->DispatchInputEvent(&geckoEvent);
-}
-
-- (void)sendWheelStartOrStop:(EventMessage)msg forEvent:(NSEvent *)theEvent
-{
-  WidgetWheelEvent wheelEvent(true, msg, mGeckoChild);
-  [self convertCocoaMouseWheelEvent:theEvent toGeckoEvent:&wheelEvent];
-  mExpectingWheelStop = (msg == eWheelOperationStart);
-  mGeckoChild->DispatchInputEvent(wheelEvent.AsInputEvent());
-}
-
-- (void)sendWheelCondition:(BOOL)condition
-                     first:(EventMessage)first
-                    second:(EventMessage)second
-                  forEvent:(NSEvent *)theEvent
-{
-  if (mExpectingWheelStop == condition) {
-    [self sendWheelStartOrStop:first forEvent:theEvent];
-  }
-  [self sendWheelStartOrStop:second forEvent:theEvent];
-}
-
-static PanGestureInput::PanGestureType
-PanGestureTypeForEvent(NSEvent* aEvent)
-{
-  switch (nsCocoaUtils::EventPhase(aEvent)) {
-    case NSEventPhaseMayBegin:
-      return PanGestureInput::PANGESTURE_MAYSTART;
-    case NSEventPhaseCancelled:
-      return PanGestureInput::PANGESTURE_CANCELLED;
-    case NSEventPhaseBegan:
-      return PanGestureInput::PANGESTURE_START;
-    case NSEventPhaseChanged:
-      return PanGestureInput::PANGESTURE_PAN;
-    case NSEventPhaseEnded:
-      return PanGestureInput::PANGESTURE_END;
-    case NSEventPhaseNone:
-      switch (nsCocoaUtils::EventMomentumPhase(aEvent)) {
-        case NSEventPhaseBegan:
-          return PanGestureInput::PANGESTURE_MOMENTUMSTART;
-        case NSEventPhaseChanged:
-          return PanGestureInput::PANGESTURE_MOMENTUMPAN;
-        case NSEventPhaseEnded:
-          return PanGestureInput::PANGESTURE_MOMENTUMEND;
-        default:
-          NS_ERROR("unexpected event phase");
-          return PanGestureInput::PANGESTURE_PAN;
-      }
-    default:
-      NS_ERROR("unexpected event phase");
-      return PanGestureInput::PANGESTURE_PAN;
-  }
-}
-
-static int32_t RoundUp(double aDouble)
-{
-  return aDouble < 0 ? static_cast<int32_t>(floor(aDouble)) :
-                       static_cast<int32_t>(ceil(aDouble));
-}
-
-static int32_t
-TakeLargestInt(gfx::Float* aFloat)
-{
-  int32_t result(*aFloat); // truncate towards zero
-  *aFloat -= result;
-  return result;
-}
-
-static gfx::IntPoint
-AccumulateIntegerDelta(NSEvent* aEvent)
-{
-  static gfx::Point sAccumulator(0.0f, 0.0f);
-  if (nsCocoaUtils::EventPhase(aEvent) == NSEventPhaseBegan) {
-    sAccumulator = gfx::Point(0.0f, 0.0f);
-  }
-  sAccumulator.x += [aEvent deltaX];
-  sAccumulator.y += [aEvent deltaY];
-  return gfx::IntPoint(TakeLargestInt(&sAccumulator.x),
-                       TakeLargestInt(&sAccumulator.y));
-}
-
-static gfx::IntPoint
-GetIntegerDeltaForEvent(NSEvent* aEvent)
-{
-  if (nsCocoaFeatures::OnSierraOrLater() && [aEvent hasPreciseScrollingDeltas]) {
-    // Pixel scroll events (events with hasPreciseScrollingDeltas == YES)
-    // carry pixel deltas in the scrollingDeltaX/Y fields and line scroll
-    // information in the deltaX/Y fields.
-    // Prior to 10.12, these line scroll fields would be zero for most pixel
-    // scroll events and non-zero for some, whenever at least a full line
-    // worth of pixel scrolling had accumulated. That's the behavior we want.
-    // Starting with 10.12 however, pixel scroll events no longer accumulate
-    // deltaX and deltaY; they just report floating point values for every
-    // single event. So we need to do our own accumulation.
-    return AccumulateIntegerDelta(aEvent);
-  }
-
-  // For line scrolls, or pre-10.12, just use the rounded up value of deltaX / deltaY.
-  return gfx::IntPoint(RoundUp([aEvent deltaX]), RoundUp([aEvent deltaY]));
-}
-
-- (void)scrollWheel:(NSEvent*)theEvent
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  nsAutoRetainCocoaObject kungFuDeathGrip(self);
-
-  ChildViewMouseTracker::MouseScrolled(theEvent);
-
-  if ([self maybeRollup:theEvent]) {
-    return;
-  }
-
-  if (!mGeckoChild) {
-    return;
-  }
-
-  NSEventPhase phase = nsCocoaUtils::EventPhase(theEvent);
-  // Fire eWheelOperationStart/End events when 2 fingers touch/release the
-  // touchpad.
-  if (phase & NSEventPhaseMayBegin) {
-    [self sendWheelCondition:YES
-                       first:eWheelOperationEnd
-                      second:eWheelOperationStart
-                    forEvent:theEvent];
-  } else if (phase & (NSEventPhaseEnded | NSEventPhaseCancelled)) {
-    [self sendWheelCondition:NO
-                       first:eWheelOperationStart
-                      second:eWheelOperationEnd
-                    forEvent:theEvent];
-  }
-
-  if (!mGeckoChild) {
-    return;
-  }
-  RefPtr<nsChildView> geckoChildDeathGrip(mGeckoChild);
-
-  NSPoint locationInWindow = nsCocoaUtils::EventLocationForWindow(theEvent, [self window]);
-
-  // Use convertWindowCoordinatesRoundDown when converting the position to
-  // integer screen pixels in order to ensure that coordinates which are just
-  // inside the right / bottom edges of the window don't end up outside of the
-  // window after rounding.
-  ScreenPoint position = ViewAs<ScreenPixel>(
-    [self convertWindowCoordinatesRoundDown:locationInWindow],
-    PixelCastJustification::LayoutDeviceIsScreenForUntransformedEvent);
-
-  bool usePreciseDeltas = nsCocoaUtils::HasPreciseScrollingDeltas(theEvent) &&
-    Preferences::GetBool("mousewheel.enable_pixel_scrolling", true);
-  bool hasPhaseInformation = nsCocoaUtils::EventHasPhaseInformation(theEvent);
-
-  gfx::IntPoint lineOrPageDelta = -GetIntegerDeltaForEvent(theEvent);
-
-  Modifiers modifiers = nsCocoaUtils::ModifiersForEvent(theEvent);
-
-  NSTimeInterval beforeNow = [[NSProcessInfo processInfo] systemUptime] - [theEvent timestamp];
-  PRIntervalTime eventIntervalTime = PR_IntervalNow() - PR_MillisecondsToInterval(beforeNow * 1000);
-  TimeStamp eventTimeStamp = TimeStamp::Now() - TimeDuration::FromSeconds(beforeNow);
-
-  ScreenPoint preciseDelta;
-  if (usePreciseDeltas) {
-    CGFloat pixelDeltaX = 0, pixelDeltaY = 0;
-    nsCocoaUtils::GetScrollingDeltas(theEvent, &pixelDeltaX, &pixelDeltaY);
-    double scale = geckoChildDeathGrip->BackingScaleFactor();
-    preciseDelta = ScreenPoint(-pixelDeltaX * scale, -pixelDeltaY * scale);
-  }
-
-  if (usePreciseDeltas && hasPhaseInformation) {
-    PanGestureInput panEvent(PanGestureTypeForEvent(theEvent),
-                             eventIntervalTime, eventTimeStamp,
-                             position, preciseDelta, modifiers);
-    panEvent.mLineOrPageDeltaX = lineOrPageDelta.x;
-    panEvent.mLineOrPageDeltaY = lineOrPageDelta.y;
-
-    if (panEvent.mType == PanGestureInput::PANGESTURE_END) {
-      // Check if there's a momentum start event in the event queue, so that we
-      // can annotate this event.
-      NSEvent* nextWheelEvent =
-        [NSApp nextEventMatchingMask:NSScrollWheelMask
-                           untilDate:[NSDate distantPast]
-                              inMode:NSDefaultRunLoopMode
-                             dequeue:NO];
-      if (nextWheelEvent &&
-          PanGestureTypeForEvent(nextWheelEvent) == PanGestureInput::PANGESTURE_MOMENTUMSTART) {
-        panEvent.mFollowedByMomentum = true;
-      }
-    }
-
-    bool canTriggerSwipe = [self shouldConsiderStartingSwipeFromEvent:theEvent];
-    panEvent.mRequiresContentResponseIfCannotScrollHorizontallyInStartDirection = canTriggerSwipe;
-    geckoChildDeathGrip->DispatchAPZWheelInputEvent(panEvent, canTriggerSwipe);
-  } else if (usePreciseDeltas) {
-    // This is on 10.6 or old touchpads that don't have any phase information.
-    ScrollWheelInput wheelEvent(eventIntervalTime, eventTimeStamp, modifiers,
-                                ScrollWheelInput::SCROLLMODE_INSTANT,
-                                ScrollWheelInput::SCROLLDELTA_PIXEL,
-                                position,
-                                preciseDelta.x,
-                                preciseDelta.y,
-                                false);
-    wheelEvent.mLineOrPageDeltaX = lineOrPageDelta.x;
-    wheelEvent.mLineOrPageDeltaY = lineOrPageDelta.y;
-    wheelEvent.mIsMomentum = nsCocoaUtils::IsMomentumScrollEvent(theEvent);
-    geckoChildDeathGrip->DispatchAPZWheelInputEvent(wheelEvent, false);
-  } else {
-    ScrollWheelInput::ScrollMode scrollMode = ScrollWheelInput::SCROLLMODE_INSTANT;
-    if (gfxPrefs::SmoothScrollEnabled() && gfxPrefs::WheelSmoothScrollEnabled()) {
-      scrollMode = ScrollWheelInput::SCROLLMODE_SMOOTH;
-    }
-    ScrollWheelInput wheelEvent(eventIntervalTime, eventTimeStamp, modifiers,
-                                scrollMode,
-                                ScrollWheelInput::SCROLLDELTA_LINE,
-                                position,
-                                lineOrPageDelta.x,
-                                lineOrPageDelta.y,
-                                false);
-    wheelEvent.mLineOrPageDeltaX = lineOrPageDelta.x;
-    wheelEvent.mLineOrPageDeltaY = lineOrPageDelta.y;
-    geckoChildDeathGrip->DispatchAPZWheelInputEvent(wheelEvent, false);
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
--(NSMenu*)menuForEvent:(NSEvent*)theEvent
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  if (!mGeckoChild)
-    return nil;
-
-  nsAutoRetainCocoaObject kungFuDeathGrip(self);
-
-  [self maybeRollup:theEvent];
-  if (!mGeckoChild)
-    return nil;
-
-  // Cocoa doesn't always dispatch a mouseDown: for a control-click event,
-  // depends on what we return from menuForEvent:. Gecko always expects one
-  // and expects the mouse down event before the context menu event, so
-  // get that event sent first if this is a left mouse click.
-  if ([theEvent type] == NSLeftMouseDown) {
-    [self mouseDown:theEvent];
-    if (!mGeckoChild)
-      return nil;
-  }
-
-  WidgetMouseEvent geckoEvent(true, eContextMenu, mGeckoChild,
-                              WidgetMouseEvent::eReal);
-  [self convertCocoaMouseEvent:theEvent toGeckoEvent:&geckoEvent];
-  geckoEvent.button = WidgetMouseEvent::eRightButton;
-  mGeckoChild->DispatchInputEvent(&geckoEvent);
-  if (!mGeckoChild)
-    return nil;
-
-  [self maybeInitContextMenuTracking];
-
-  // Go up our view chain to fetch the correct menu to return.
-  return [self contextMenu];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-- (NSMenu*)contextMenu
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  NSView* superView = [self superview];
-  if ([superView respondsToSelector:@selector(contextMenu)])
-    return [(NSView<mozView>*)superView contextMenu];
-
-  return nil;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-- (void) convertCocoaMouseWheelEvent:(NSEvent*)aMouseEvent
-                        toGeckoEvent:(WidgetWheelEvent*)outWheelEvent
-{
-  [self convertCocoaMouseEvent:aMouseEvent toGeckoEvent:outWheelEvent];
-
-  bool usePreciseDeltas = nsCocoaUtils::HasPreciseScrollingDeltas(aMouseEvent) &&
-    Preferences::GetBool("mousewheel.enable_pixel_scrolling", true);
-
-  outWheelEvent->mDeltaMode =
-    usePreciseDeltas ? nsIDOMWheelEvent::DOM_DELTA_PIXEL
-                     : nsIDOMWheelEvent::DOM_DELTA_LINE;
-  outWheelEvent->mIsMomentum = nsCocoaUtils::IsMomentumScrollEvent(aMouseEvent);
-}
-
-- (void) convertCocoaMouseEvent:(NSEvent*)aMouseEvent
-                   toGeckoEvent:(WidgetInputEvent*)outGeckoEvent
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  NS_ASSERTION(outGeckoEvent, "convertCocoaMouseEvent:toGeckoEvent: requires non-null aoutGeckoEvent");
-  if (!outGeckoEvent)
-    return;
-
-  nsCocoaUtils::InitInputEvent(*outGeckoEvent, aMouseEvent);
-
-  // convert point to view coordinate system
-  NSPoint locationInWindow = nsCocoaUtils::EventLocationForWindow(aMouseEvent, [self window]);
-
-  outGeckoEvent->mRefPoint = [self convertWindowCoordinates:locationInWindow];
-
-  WidgetMouseEventBase* mouseEvent = outGeckoEvent->AsMouseEventBase();
-  mouseEvent->buttons = 0;
-  NSUInteger mouseButtons = [NSEvent pressedMouseButtons];
-
-  if (mouseButtons & 0x01) {
-    mouseEvent->buttons |= WidgetMouseEvent::eLeftButtonFlag;
-  }
-  if (mouseButtons & 0x02) {
-    mouseEvent->buttons |= WidgetMouseEvent::eRightButtonFlag;
-  }
-  if (mouseButtons & 0x04) {
-    mouseEvent->buttons |= WidgetMouseEvent::eMiddleButtonFlag;
-  }
-  if (mouseButtons & 0x08) {
-    mouseEvent->buttons |= WidgetMouseEvent::e4thButtonFlag;
-  }
-  if (mouseButtons & 0x10) {
-    mouseEvent->buttons |= WidgetMouseEvent::e5thButtonFlag;
-  }
-
-  switch ([aMouseEvent type]) {
-    case NSLeftMouseDown:
-    case NSLeftMouseUp:
-    case NSLeftMouseDragged:
-    case NSRightMouseDown:
-    case NSRightMouseUp:
-    case NSRightMouseDragged:
-    case NSOtherMouseDown:
-    case NSOtherMouseUp:
-    case NSOtherMouseDragged:
-      if ([aMouseEvent subtype] == NSTabletPointEventSubtype) {
-        mouseEvent->pressure = [aMouseEvent pressure];
-        MOZ_ASSERT(mouseEvent->pressure >= 0.0 && mouseEvent->pressure <= 1.0);
-      }
-      break;
-
-    default:
-      // Don't check other NSEvents for pressure.
-      break;
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (BOOL)shouldZoomOnDoubleClick
-{
-  if ([NSWindow respondsToSelector:@selector(_shouldZoomOnDoubleClick)]) {
-    return [NSWindow _shouldZoomOnDoubleClick];
-  }
-  return nsCocoaFeatures::OnYosemiteOrLater();
-}
-
-- (BOOL)shouldMinimizeOnTitlebarDoubleClick
-{
-  NSString *MDAppleMiniaturizeOnDoubleClickKey =
-                                      @"AppleMiniaturizeOnDoubleClick";
-  NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
-  bool shouldMinimize = [[userDefaults
-          objectForKey:MDAppleMiniaturizeOnDoubleClickKey] boolValue];
-
-  return shouldMinimize;
-}
-
-#pragma mark -
-// NSTextInputClient implementation
-
-- (NSRange)markedRange
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  NS_ENSURE_TRUE(mTextInputHandler, NSMakeRange(NSNotFound, 0));
-  return mTextInputHandler->MarkedRange();
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NSMakeRange(0, 0));
-}
-
-- (NSRange)selectedRange
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  NS_ENSURE_TRUE(mTextInputHandler, NSMakeRange(NSNotFound, 0));
-  return mTextInputHandler->SelectedRange();
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NSMakeRange(0, 0));
-}
-
-- (BOOL)drawsVerticallyForCharacterAtIndex:(NSUInteger)charIndex
-{
-  NS_ENSURE_TRUE(mTextInputHandler, NO);
-  if (charIndex == NSNotFound) {
-    return NO;
-  }
-  return mTextInputHandler->DrawsVerticallyForCharacterAtIndex(charIndex);
-}
-
-- (NSUInteger)characterIndexForPoint:(NSPoint)thePoint
-{
-  NS_ENSURE_TRUE(mTextInputHandler, 0);
-  return mTextInputHandler->CharacterIndexForPoint(thePoint);
-}
-
-- (NSArray*)validAttributesForMarkedText
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  NS_ENSURE_TRUE(mTextInputHandler, [NSArray array]);
-  return mTextInputHandler->GetValidAttributesForMarkedText();
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-- (void)insertText:(id)aString replacementRange:(NSRange)replacementRange
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  NS_ENSURE_TRUE_VOID(mGeckoChild);
-
-  nsAutoRetainCocoaObject kungFuDeathGrip(self);
-
-  NSAttributedString* attrStr;
-  if ([aString isKindOfClass:[NSAttributedString class]]) {
-    attrStr = static_cast<NSAttributedString*>(aString);
-  } else {
-    attrStr = [[[NSAttributedString alloc] initWithString:aString] autorelease];
-  }
-
-  mTextInputHandler->InsertText(attrStr, &replacementRange);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (void)doCommandBySelector:(SEL)aSelector
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!mGeckoChild || !mTextInputHandler) {
-    return;
-  }
-
-  const char* sel = reinterpret_cast<const char*>(aSelector);
-  if (!mTextInputHandler->DoCommandBySelector(sel)) {
-    [super doCommandBySelector:aSelector];
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (void)unmarkText
-{
-  NS_ENSURE_TRUE_VOID(mTextInputHandler);
-  mTextInputHandler->CommitIMEComposition();
-}
-
-- (BOOL) hasMarkedText
-{
-  NS_ENSURE_TRUE(mTextInputHandler, NO);
-  return mTextInputHandler->HasMarkedText();
-}
-
-- (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange
-                               replacementRange:(NSRange)replacementRange
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  NS_ENSURE_TRUE_VOID(mTextInputHandler);
-
-  nsAutoRetainCocoaObject kungFuDeathGrip(self);
-
-  NSAttributedString* attrStr;
-  if ([aString isKindOfClass:[NSAttributedString class]]) {
-    attrStr = static_cast<NSAttributedString*>(aString);
-  } else {
-    attrStr = [[[NSAttributedString alloc] initWithString:aString] autorelease];
-  }
-
-  mTextInputHandler->SetMarkedText(attrStr, selectedRange, &replacementRange);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (NSAttributedString*)attributedSubstringForProposedRange:(NSRange)aRange
-                                        actualRange:(NSRangePointer)actualRange
-{
-  NS_ENSURE_TRUE(mTextInputHandler, nil);
-  return mTextInputHandler->GetAttributedSubstringFromRange(aRange,
-                                                            actualRange);
-}
-
-- (NSRect)firstRectForCharacterRange:(NSRange)aRange
-                         actualRange:(NSRangePointer)actualRange
-{
-  NS_ENSURE_TRUE(mTextInputHandler, NSMakeRect(0.0, 0.0, 0.0, 0.0));
-  return mTextInputHandler->FirstRectForCharacterRange(aRange, actualRange);
-}
-
-- (void)quickLookWithEvent:(NSEvent*)event
-{
-  // Show dictionary by current point
-  WidgetContentCommandEvent
-    contentCommandEvent(true, eContentCommandLookUpDictionary, mGeckoChild);
-  NSPoint point = [self convertPoint:[event locationInWindow] fromView:nil];
-  contentCommandEvent.mRefPoint = mGeckoChild->CocoaPointsToDevPixels(point);
-  mGeckoChild->DispatchWindowEvent(contentCommandEvent);
-  // The widget might have been destroyed.
-}
-
-- (NSInteger)windowLevel
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  NS_ENSURE_TRUE(mTextInputHandler, [[self window] level]);
-  return mTextInputHandler->GetWindowLevel();
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NSNormalWindowLevel);
-}
-
-#pragma mark -
-
-// This is a private API that Cocoa uses.
-// Cocoa will call this after the menu system returns "NO" for "performKeyEquivalent:".
-// We want all they key events we can get so just return YES. In particular, this fixes
-// ctrl-tab - we don't get a "keyDown:" call for that without this.
-- (BOOL)_wantsKeyDownForEvent:(NSEvent*)event
-{
-  return YES;
-}
-
-- (NSEvent*)lastKeyDownEvent
-{
-  return mLastKeyDownEvent;
-}
-
-- (void)keyDown:(NSEvent*)theEvent
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  [mLastKeyDownEvent release];
-  mLastKeyDownEvent = [theEvent retain];
-
-  // Weird things can happen on keyboard input if the key window isn't in the
-  // current space.  For example see bug 1056251.  To get around this, always
-  // make sure that, if our window is key, it's also made frontmost.  Doing
-  // this automatically switches to whatever space our window is in.  Safari
-  // does something similar.  Our window should normally always be key --
-  // otherwise why is the OS sending us a key down event?  But it's just
-  // possible we're in Gecko's hidden window, so we check first.
-  NSWindow *viewWindow = [self window];
-  if (viewWindow && [viewWindow isKeyWindow]) {
-    [viewWindow orderWindow:NSWindowAbove relativeTo:0];
-  }
-
-#if !defined(RELEASE_OR_BETA) || defined(DEBUG)
-  if (!Preferences::GetBool("intl.allow-insecure-text-input", false) &&
-      mGeckoChild && mTextInputHandler && mTextInputHandler->IsFocused()) {
-    if (mGeckoChild->GetInputContext().IsPasswordEditor() &&
-               !TextInputHandler::IsSecureEventInputEnabled()) {
-      #define CRASH_MESSAGE "A password editor has focus, but not in secure input mode"
-      MOZ_CRASH(CRASH_MESSAGE);
-      #undef CRASH_MESSAGE
-    } else if (!mGeckoChild->GetInputContext().IsPasswordEditor() &&
-               TextInputHandler::IsSecureEventInputEnabled()) {
-      #define CRASH_MESSAGE "A non-password editor has focus, but in secure input mode"
-      MOZ_CRASH(CRASH_MESSAGE);
-      #undef CRASH_MESSAGE
-    }
-  }
-#endif // #if !defined(RELEASE_OR_BETA) || defined(DEBUG)
-
-  nsAutoRetainCocoaObject kungFuDeathGrip(self);
-  bool handled = false;
-  if (mGeckoChild && mTextInputHandler) {
-    handled = mTextInputHandler->HandleKeyDownEvent(theEvent);
-  }
-
-  // We always allow keyboard events to propagate to keyDown: but if they are not
-  // handled we give special Application menu items a chance to act.
-  if (!handled && sApplicationMenu) {
-    [sApplicationMenu performKeyEquivalent:theEvent];
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (void)keyUp:(NSEvent*)theEvent
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  NS_ENSURE_TRUE(mGeckoChild, );
-
-  nsAutoRetainCocoaObject kungFuDeathGrip(self);
-
-  mTextInputHandler->HandleKeyUpEvent(theEvent);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (void)insertNewline:(id)sender
-{
-  if (mTextInputHandler) {
-    NSAttributedString *attrStr = [[NSAttributedString alloc] initWithString:@"\n"];
-    mTextInputHandler->InsertText(attrStr);
-    [attrStr release];
-  }
-}
-
-- (void)flagsChanged:(NSEvent*)theEvent
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  NS_ENSURE_TRUE(mGeckoChild, );
-
-  nsAutoRetainCocoaObject kungFuDeathGrip(self);
-  mTextInputHandler->HandleFlagsChanged(theEvent);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (BOOL) isFirstResponder
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  NSResponder* resp = [[self window] firstResponder];
-  return (resp == (NSResponder*)self);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NO);
-}
-
-- (BOOL)isDragInProgress
-{
-  if (!mDragService)
-    return NO;
-
-  nsCOMPtr<nsIDragSession> dragSession;
-  mDragService->GetCurrentSession(getter_AddRefs(dragSession));
-  return dragSession != nullptr;
-}
-
-- (BOOL)inactiveWindowAcceptsMouseEvent:(NSEvent*)aEvent
-{
-  // If we're being destroyed assume the default -- return YES.
-  if (!mGeckoChild)
-    return YES;
-
-  WidgetMouseEvent geckoEvent(true, eMouseActivate, mGeckoChild,
-                              WidgetMouseEvent::eReal);
-  [self convertCocoaMouseEvent:aEvent toGeckoEvent:&geckoEvent];
-  return (mGeckoChild->DispatchInputEvent(&geckoEvent) != nsEventStatus_eConsumeNoDefault);
-}
-
-// We must always call through to our superclass, even when mGeckoChild is
-// nil -- otherwise the keyboard focus can end up in the wrong NSView.
-- (BOOL)becomeFirstResponder
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  return [super becomeFirstResponder];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(YES);
-}
-
-- (void)viewsWindowDidBecomeKey
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!mGeckoChild)
-    return;
-
-  nsAutoRetainCocoaObject kungFuDeathGrip(self);
-
-  // check to see if the window implements the mozWindow protocol. This
-  // allows embedders to avoid re-entrant calls to -makeKeyAndOrderFront,
-  // which can happen because these activate calls propagate out
-  // to the embedder via nsIEmbeddingSiteWindow::SetFocus().
-  BOOL isMozWindow = [[self window] respondsToSelector:@selector(setSuppressMakeKeyFront:)];
-  if (isMozWindow)
-    [[self window] setSuppressMakeKeyFront:YES];
-
-  nsIWidgetListener* listener = mGeckoChild->GetWidgetListener();
-  if (listener)
-    listener->WindowActivated();
-
-  if (isMozWindow)
-    [[self window] setSuppressMakeKeyFront:NO];
-
-  if (mGeckoChild->GetInputContext().IsPasswordEditor()) {
-    TextInputHandler::EnableSecureEventInput();
-  } else {
-    TextInputHandler::EnsureSecureEventInputDisabled();
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (void)viewsWindowDidResignKey
-{
-  if (!mGeckoChild)
-    return;
-
-  nsAutoRetainCocoaObject kungFuDeathGrip(self);
-
-  nsIWidgetListener* listener = mGeckoChild->GetWidgetListener();
-  if (listener)
-    listener->WindowDeactivated();
-
-  TextInputHandler::EnsureSecureEventInputDisabled();
-}
-
-// If the call to removeFromSuperview isn't delayed from nsChildView::
-// TearDownView(), the NSView hierarchy might get changed during calls to
-// [ChildView drawRect:], which leads to "beyond bounds" exceptions in
-// NSCFArray.  For more info see bmo bug 373122.  Apple's docs claim that
-// removeFromSuperviewWithoutNeedingDisplay "can be safely invoked during
-// display" (whatever "display" means).  But it's _not_ true that it can be
-// safely invoked during calls to [NSView drawRect:].  We use
-// removeFromSuperview here because there's no longer any danger of being
-// "invoked during display", and because doing do clears up bmo bug 384343.
-- (void)delayedTearDown
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  [self removeFromSuperview];
-  [self release];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-#pragma mark -
-
-// drag'n'drop stuff
-#define kDragServiceContractID "@mozilla.org/widget/dragservice;1"
-
-- (NSDragOperation)dragOperationFromDragAction:(int32_t)aDragAction
-{
-  if (nsIDragService::DRAGDROP_ACTION_LINK & aDragAction)
-    return NSDragOperationLink;
-  if (nsIDragService::DRAGDROP_ACTION_COPY & aDragAction)
-    return NSDragOperationCopy;
-  if (nsIDragService::DRAGDROP_ACTION_MOVE & aDragAction)
-    return NSDragOperationGeneric;
-  return NSDragOperationNone;
-}
-
-- (LayoutDeviceIntPoint)convertWindowCoordinates:(NSPoint)aPoint
-{
-  if (!mGeckoChild) {
-    return LayoutDeviceIntPoint(0, 0);
-  }
-
-  NSPoint localPoint = [self convertPoint:aPoint fromView:nil];
-  return mGeckoChild->CocoaPointsToDevPixels(localPoint);
-}
-
-- (LayoutDeviceIntPoint)convertWindowCoordinatesRoundDown:(NSPoint)aPoint
-{
-  if (!mGeckoChild) {
-    return LayoutDeviceIntPoint(0, 0);
-  }
-
-  NSPoint localPoint = [self convertPoint:aPoint fromView:nil];
-  return mGeckoChild->CocoaPointsToDevPixelsRoundDown(localPoint);
-}
-
-// This is a utility function used by NSView drag event methods
-// to send events. It contains all of the logic needed for Gecko
-// dragging to work. Returns the appropriate cocoa drag operation code.
-- (NSDragOperation)doDragAction:(EventMessage)aMessage sender:(id)aSender
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  if (!mGeckoChild)
-    return NSDragOperationNone;
-
-  MOZ_LOG(sCocoaLog, LogLevel::Info, ("ChildView doDragAction: entered\n"));
-
-  if (!mDragService) {
-    CallGetService(kDragServiceContractID, &mDragService);
-    NS_ASSERTION(mDragService, "Couldn't get a drag service - big problem!");
-    if (!mDragService)
-      return NSDragOperationNone;
-  }
-
-  if (aMessage == eDragEnter) {
-    mDragService->StartDragSession();
-  }
-
-  nsCOMPtr<nsIDragSession> dragSession;
-  mDragService->GetCurrentSession(getter_AddRefs(dragSession));
-  if (dragSession) {
-    if (aMessage == eDragOver) {
-      // fire the drag event at the source. Just ignore whether it was
-      // cancelled or not as there isn't actually a means to stop the drag
-      mDragService->FireDragEventAtSource(eDrag);
-      dragSession->SetCanDrop(false);
-    } else if (aMessage == eDrop) {
-      // We make the assumption that the dragOver handlers have correctly set
-      // the |canDrop| property of the Drag Session.
-      bool canDrop = false;
-      if (!NS_SUCCEEDED(dragSession->GetCanDrop(&canDrop)) || !canDrop) {
-        [self doDragAction:eDragExit sender:aSender];
-
-        nsCOMPtr<nsIDOMNode> sourceNode;
-        dragSession->GetSourceNode(getter_AddRefs(sourceNode));
-        if (!sourceNode) {
-          mDragService->EndDragSession(false);
-        }
-        return NSDragOperationNone;
-      }
-    }
-
-    unsigned int modifierFlags = [[NSApp currentEvent] modifierFlags];
-    uint32_t action = nsIDragService::DRAGDROP_ACTION_MOVE;
-    // force copy = option, alias = cmd-option, default is move
-    if (modifierFlags & NSAlternateKeyMask) {
-      if (modifierFlags & NSCommandKeyMask)
-        action = nsIDragService::DRAGDROP_ACTION_LINK;
-      else
-        action = nsIDragService::DRAGDROP_ACTION_COPY;
-    }
-    dragSession->SetDragAction(action);
-  }
-
-  // set up gecko event
-  WidgetDragEvent geckoEvent(true, aMessage, mGeckoChild);
-  nsCocoaUtils::InitInputEvent(geckoEvent, [NSApp currentEvent]);
-
-  // Use our own coordinates in the gecko event.
-  // Convert event from gecko global coords to gecko view coords.
-  NSPoint draggingLoc = [aSender draggingLocation];
-
-  geckoEvent.mRefPoint = [self convertWindowCoordinates:draggingLoc];
-
-  nsAutoRetainCocoaObject kungFuDeathGrip(self);
-  mGeckoChild->DispatchInputEvent(&geckoEvent);
-  if (!mGeckoChild)
-    return NSDragOperationNone;
-
-  if (dragSession) {
-    switch (aMessage) {
-      case eDragEnter:
-      case eDragOver: {
-        uint32_t dragAction;
-        dragSession->GetDragAction(&dragAction);
-
-        // If TakeChildProcessDragAction returns something other than
-        // DRAGDROP_ACTION_UNINITIALIZED, it means that the last event was sent
-        // to the child process and this event is also being sent to the child
-        // process. In this case, use the last event's action instead.
-        nsDragService* dragService = static_cast<nsDragService *>(mDragService);
-        int32_t childDragAction = dragService->TakeChildProcessDragAction();
-        if (childDragAction != nsIDragService::DRAGDROP_ACTION_UNINITIALIZED) {
-          dragAction = childDragAction;
-        }
-
-        return [self dragOperationFromDragAction:dragAction];
-      }
-      case eDragExit:
-      case eDrop: {
-        nsCOMPtr<nsIDOMNode> sourceNode;
-        dragSession->GetSourceNode(getter_AddRefs(sourceNode));
-        if (!sourceNode) {
-          // We're leaving a window while doing a drag that was
-          // initiated in a different app. End the drag session,
-          // since we're done with it for now (until the user
-          // drags back into mozilla).
-          mDragService->EndDragSession(false);
-        }
-      }
-      default:
-        break;
-    }
-  }
-
-  return NSDragOperationGeneric;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NSDragOperationNone);
-}
-
-- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  MOZ_LOG(sCocoaLog, LogLevel::Info, ("ChildView draggingEntered: entered\n"));
-
-  // there should never be a globalDragPboard when "draggingEntered:" is
-  // called, but just in case we'll take care of it here.
-  [globalDragPboard release];
-
-  // Set the global drag pasteboard that will be used for this drag session.
-  // This will be set back to nil when the drag session ends (mouse exits
-  // the view or a drop happens within the view).
-  globalDragPboard = [[sender draggingPasteboard] retain];
-
-  return [self doDragAction:eDragEnter sender:sender];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NSDragOperationNone);
-}
-
-- (NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)sender
-{
-  MOZ_LOG(sCocoaLog, LogLevel::Info, ("ChildView draggingUpdated: entered\n"));
-
-  return [self doDragAction:eDragOver sender:sender];
-}
-
-- (void)draggingExited:(id <NSDraggingInfo>)sender
-{
-  MOZ_LOG(sCocoaLog, LogLevel::Info, ("ChildView draggingExited: entered\n"));
-
-  nsAutoRetainCocoaObject kungFuDeathGrip(self);
-  [self doDragAction:eDragExit sender:sender];
-  NS_IF_RELEASE(mDragService);
-}
-
-- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
-{
-  nsAutoRetainCocoaObject kungFuDeathGrip(self);
-  BOOL handled = [self doDragAction:eDrop sender:sender] != NSDragOperationNone;
-  NS_IF_RELEASE(mDragService);
-  return handled;
-}
-
-// NSDraggingSource
-- (void)draggedImage:(NSImage *)anImage movedTo:(NSPoint)aPoint
-{
-  // Get the drag service if it isn't already cached. The drag service
-  // isn't cached when dragging over a different application.
-  nsCOMPtr<nsIDragService> dragService = mDragService;
-  if (!dragService) {
-    dragService = do_GetService(kDragServiceContractID);
-  }
-
-  if (dragService) {
-    NSPoint pnt = [NSEvent mouseLocation];
-    FlipCocoaScreenCoordinate(pnt);
-
-    LayoutDeviceIntPoint devPoint = mGeckoChild->CocoaPointsToDevPixels(pnt);
-    dragService->DragMoved(devPoint.x, devPoint.y);
-  }
-}
-
-// NSDraggingSource
-- (void)draggedImage:(NSImage *)anImage endedAt:(NSPoint)aPoint operation:(NSDragOperation)operation
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  gDraggedTransferables = nullptr;
-
-  NSEvent *currentEvent = [NSApp currentEvent];
-  gUserCancelledDrag = ([currentEvent type] == NSKeyDown &&
-                        [currentEvent keyCode] == kVK_Escape);
-
-  if (!mDragService) {
-    CallGetService(kDragServiceContractID, &mDragService);
-    NS_ASSERTION(mDragService, "Couldn't get a drag service - big problem!");
-  }
-
-  if (mDragService) {
-    // set the dragend point from the current mouse location
-    nsDragService* dragService = static_cast<nsDragService *>(mDragService);
-    NSPoint pnt = [NSEvent mouseLocation];
-    FlipCocoaScreenCoordinate(pnt);
-    dragService->SetDragEndPoint(gfx::IntPoint::Round(pnt.x, pnt.y));
-
-    // XXX: dropEffect should be updated per |operation|.
-    // As things stand though, |operation| isn't well handled within "our"
-    // events, that is, when the drop happens within the window: it is set
-    // either to NSDragOperationGeneric or to NSDragOperationNone.
-    // For that reason, it's not yet possible to override dropEffect per the
-    // given OS value, and it's also unclear what's the correct dropEffect
-    // value for NSDragOperationGeneric that is passed by other applications.
-    // All that said, NSDragOperationNone is still reliable.
-    if (operation == NSDragOperationNone) {
-      nsCOMPtr<nsIDOMDataTransfer> dataTransfer;
-      dragService->GetDataTransfer(getter_AddRefs(dataTransfer));
-      if (dataTransfer)
-        dataTransfer->SetDropEffectInt(nsIDragService::DRAGDROP_ACTION_NONE);
-    }
-
-    mDragService->EndDragSession(true);
-    NS_RELEASE(mDragService);
-  }
-
-  [globalDragPboard release];
-  globalDragPboard = nil;
-  [gLastDragMouseDownEvent release];
-  gLastDragMouseDownEvent = nil;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-// NSDraggingSource
-// this is just implemented so we comply with the NSDraggingSource informal protocol
-- (NSDragOperation)draggingSourceOperationMaskForLocal:(BOOL)isLocal
-{
-  return UINT_MAX;
-}
-
-// This method is a callback typically invoked in response to a drag ending on the desktop
-// or a Findow folder window; the argument passed is a path to the drop location, to be used
-// in constructing a complete pathname for the file(s) we want to create as a result of
-// the drag.
-- (NSArray *)namesOfPromisedFilesDroppedAtDestination:(NSURL*)dropDestination
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  nsresult rv;
-
-  MOZ_LOG(sCocoaLog, LogLevel::Info, ("ChildView namesOfPromisedFilesDroppedAtDestination: entering callback for promised files\n"));
-
-  nsCOMPtr<nsIFile> targFile;
-  NS_NewLocalFile(EmptyString(), true, getter_AddRefs(targFile));
-  nsCOMPtr<nsILocalFileMac> macLocalFile = do_QueryInterface(targFile);
-  if (!macLocalFile) {
-    NS_ERROR("No Mac local file");
-    return nil;
-  }
-
-  if (!NS_SUCCEEDED(macLocalFile->InitWithCFURL((CFURLRef)dropDestination))) {
-    NS_ERROR("failed InitWithCFURL");
-    return nil;
-  }
-
-  if (!gDraggedTransferables)
-    return nil;
-
-  uint32_t transferableCount;
-  rv = gDraggedTransferables->GetLength(&transferableCount);
-  if (NS_FAILED(rv))
-    return nil;
-
-  for (uint32_t i = 0; i < transferableCount; i++) {
-    nsCOMPtr<nsITransferable> item = do_QueryElementAt(gDraggedTransferables, i);
-    if (!item) {
-      NS_ERROR("no transferable");
-      return nil;
-    }
-
-    item->SetTransferData(kFilePromiseDirectoryMime, macLocalFile, sizeof(nsIFile*));
-
-    // now request the kFilePromiseMime data, which will invoke the data provider
-    // If successful, the returned data is a reference to the resulting file.
-    nsCOMPtr<nsISupports> fileDataPrimitive;
-    uint32_t dataSize = 0;
-    item->GetTransferData(kFilePromiseMime, getter_AddRefs(fileDataPrimitive), &dataSize);
-  }
-
-  NSPasteboard* generalPboard = [NSPasteboard pasteboardWithName:NSDragPboard];
-  NSData* data = [generalPboard dataForType:@"application/x-moz-file-promise-dest-filename"];
-  NSString* name = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
-  NSArray* rslt = [NSArray arrayWithObject:name];
-
-  [name release];
-
-  return rslt;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-#pragma mark -
-
-// Support for the "Services" menu. We currently only support sending strings
-// and HTML to system services.
-
-- (id)validRequestorForSendType:(NSString *)sendType
-                     returnType:(NSString *)returnType
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  // sendType contains the type of data that the service would like this
-  // application to send to it.  sendType is nil if the service is not
-  // requesting any data.
-  //
-  // returnType contains the type of data the the service would like to
-  // return to this application (e.g., to overwrite the selection).
-  // returnType is nil if the service will not return any data.
-  //
-  // The following condition thus triggers when the service expects a string
-  // or HTML from us or no data at all AND when the service will either not
-  // send back any data to us or will send a string or HTML back to us.
-
-#define IsSupportedType(typeStr) ([typeStr isEqual:NSStringPboardType] || [typeStr isEqual:NSHTMLPboardType])
-
-  id result = nil;
-
-  if ((!sendType || IsSupportedType(sendType)) &&
-      (!returnType || IsSupportedType(returnType))) {
-    if (mGeckoChild) {
-      // Assume that this object will be able to handle this request.
-      result = self;
-
-      // Keep the ChildView alive during this operation.
-      nsAutoRetainCocoaObject kungFuDeathGrip(self);
-
-      if (sendType) {
-        // Determine if there is a current selection (chrome/content).
-        if (!nsClipboard::sSelectionCache) {
-          result = nil;
-        }
-      }
-
-      // Determine if we can paste (if receiving data from the service).
-      if (mGeckoChild && returnType) {
-        WidgetContentCommandEvent command(true,
-                                          eContentCommandPasteTransferable,
-                                          mGeckoChild, true);
-        // This might possibly destroy our widget (and null out mGeckoChild).
-        mGeckoChild->DispatchWindowEvent(command);
-        if (!mGeckoChild || !command.mSucceeded || !command.mIsEnabled)
-          result = nil;
-      }
-    }
-  }
-
-#undef IsSupportedType
-
-  // Give the superclass a chance if this object will not handle this request.
-  if (!result)
-    result = [super validRequestorForSendType:sendType returnType:returnType];
-
-  return result;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-- (BOOL)writeSelectionToPasteboard:(NSPasteboard *)pboard
-                             types:(NSArray *)types
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  nsAutoRetainCocoaObject kungFuDeathGrip(self);
-
-  // Make sure that the service will accept strings or HTML.
-  if ([types containsObject:NSStringPboardType] == NO &&
-      [types containsObject:NSHTMLPboardType] == NO)
-    return NO;
-
-  // Bail out if there is no Gecko object.
-  if (!mGeckoChild)
-    return NO;
-
-  // Transform the transferable to an NSDictionary.
-  NSDictionary* pasteboardOutputDict = nullptr;
-
-  pasteboardOutputDict = nsClipboard::
-      PasteboardDictFromTransferable(nsClipboard::sSelectionCache);
-
-  if (!pasteboardOutputDict)
-    return NO;
-
-  // Declare the pasteboard types.
-  unsigned int typeCount = [pasteboardOutputDict count];
-  NSMutableArray* declaredTypes = [NSMutableArray arrayWithCapacity:typeCount];
-  [declaredTypes addObjectsFromArray:[pasteboardOutputDict allKeys]];
-  [pboard declareTypes:declaredTypes owner:nil];
-
-  // Write the data to the pasteboard.
-  for (unsigned int i = 0; i < typeCount; i++) {
-    NSString* currentKey = [declaredTypes objectAtIndex:i];
-    id currentValue = [pasteboardOutputDict valueForKey:currentKey];
-
-    if (currentKey == NSStringPboardType ||
-        currentKey == kCorePboardType_url ||
-        currentKey == kCorePboardType_urld ||
-        currentKey == kCorePboardType_urln) {
-      [pboard setString:currentValue forType:currentKey];
-    } else if (currentKey == NSHTMLPboardType) {
-      [pboard setString:(nsClipboard::WrapHtmlForSystemPasteboard(currentValue)) forType:currentKey];
-    } else if (currentKey == NSTIFFPboardType) {
-      [pboard setData:currentValue forType:currentKey];
-    } else if (currentKey == NSFilesPromisePboardType) {
-      [pboard setPropertyList:currentValue forType:currentKey];
-    }
-  }
-
-  return YES;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NO);
-}
-
-// Called if the service wants us to replace the current selection.
-- (BOOL)readSelectionFromPasteboard:(NSPasteboard *)pboard
-{
-  nsresult rv;
-  nsCOMPtr<nsITransferable> trans = do_CreateInstance("@mozilla.org/widget/transferable;1", &rv);
-  if (NS_FAILED(rv))
-    return NO;
-  trans->Init(nullptr);
-
-  trans->AddDataFlavor(kUnicodeMime);
-  trans->AddDataFlavor(kHTMLMime);
-
-  rv = nsClipboard::TransferableFromPasteboard(trans, pboard);
-  if (NS_FAILED(rv))
-    return NO;
-
-  NS_ENSURE_TRUE(mGeckoChild, false);
-
-  WidgetContentCommandEvent command(true,
-                                    eContentCommandPasteTransferable,
-                                    mGeckoChild);
-  command.mTransferable = trans;
-  mGeckoChild->DispatchWindowEvent(command);
-
-  return command.mSucceeded && command.mIsEnabled;
-}
-
-NS_IMETHODIMP
-nsChildView::GetSelectionAsPlaintext(nsAString& aResult)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  if (!nsClipboard::sSelectionCache) {
-    MOZ_ASSERT(aResult.IsEmpty());
-    return NS_OK;
-  }
-
-  // Get the current chrome or content selection.
-  NSDictionary* pasteboardOutputDict = nullptr;
-  pasteboardOutputDict = nsClipboard::
-    PasteboardDictFromTransferable(nsClipboard::sSelectionCache);
-
-  if (NS_WARN_IF(!pasteboardOutputDict)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  // Declare the pasteboard types.
-  unsigned int typeCount = [pasteboardOutputDict count];
-  NSMutableArray* declaredTypes = [NSMutableArray arrayWithCapacity:typeCount];
-  [declaredTypes addObjectsFromArray:[pasteboardOutputDict allKeys]];
-  NSString* currentKey = [declaredTypes objectAtIndex:0];
-  NSString* currentValue = [pasteboardOutputDict valueForKey:currentKey];
-  const char* textSelection = [currentValue UTF8String];
-  aResult = NS_ConvertUTF8toUTF16(textSelection);
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-#pragma mark -
-
-#ifdef ACCESSIBILITY
-
-/* Every ChildView has a corresponding mozDocAccessible object that is doing all
-   the heavy lifting. The topmost ChildView corresponds to a mozRootAccessible
-   object.
-
-   All ChildView needs to do is to route all accessibility calls (from the NSAccessibility APIs)
-   down to its object, pretending that they are the same.
-*/
-- (id<mozAccessible>)accessible
-{
-  if (!mGeckoChild)
-    return nil;
-
-  id<mozAccessible> nativeAccessible = nil;
-
-  nsAutoRetainCocoaObject kungFuDeathGrip(self);
-  RefPtr<nsChildView> geckoChild(mGeckoChild);
-  RefPtr<a11y::Accessible> accessible = geckoChild->GetDocumentAccessible();
-  if (!accessible)
-    return nil;
-
-  accessible->GetNativeInterface((void**)&nativeAccessible);
-
-#ifdef DEBUG_hakan
-  NSAssert(![nativeAccessible isExpired], @"native acc is expired!!!");
-#endif
-
-  return nativeAccessible;
-}
-
-/* Implementation of formal mozAccessible formal protocol (enabling mozViews
-   to talk to mozAccessible objects in the accessibility module). */
-
-- (BOOL)hasRepresentedView
-{
-  return YES;
-}
-
-- (id)representedView
-{
-  return self;
-}
-
-- (BOOL)isRoot
-{
-  return [[self accessible] isRoot];
-}
-
-#ifdef DEBUG
-- (void)printHierarchy
-{
-  [[self accessible] printHierarchy];
-}
-#endif
-
-#pragma mark -
-
-// general
-
-- (BOOL)accessibilityIsIgnored
-{
-  if (!mozilla::a11y::ShouldA11yBeEnabled())
-    return [super accessibilityIsIgnored];
-
-  return [[self accessible] accessibilityIsIgnored];
-}
-
-- (id)accessibilityHitTest:(NSPoint)point
-{
-  if (!mozilla::a11y::ShouldA11yBeEnabled())
-    return [super accessibilityHitTest:point];
-
-  return [[self accessible] accessibilityHitTest:point];
-}
-
-- (id)accessibilityFocusedUIElement
-{
-  if (!mozilla::a11y::ShouldA11yBeEnabled())
-    return [super accessibilityFocusedUIElement];
-
-  return [[self accessible] accessibilityFocusedUIElement];
-}
-
-// actions
-
-- (NSArray*)accessibilityActionNames
-{
-  if (!mozilla::a11y::ShouldA11yBeEnabled())
-    return [super accessibilityActionNames];
-
-  return [[self accessible] accessibilityActionNames];
-}
-
-- (NSString*)accessibilityActionDescription:(NSString*)action
-{
-  if (!mozilla::a11y::ShouldA11yBeEnabled())
-    return [super accessibilityActionDescription:action];
-
-  return [[self accessible] accessibilityActionDescription:action];
-}
-
-- (void)accessibilityPerformAction:(NSString*)action
-{
-  if (!mozilla::a11y::ShouldA11yBeEnabled())
-    return [super accessibilityPerformAction:action];
-
-  return [[self accessible] accessibilityPerformAction:action];
-}
-
-// attributes
-
-- (NSArray*)accessibilityAttributeNames
-{
-  if (!mozilla::a11y::ShouldA11yBeEnabled())
-    return [super accessibilityAttributeNames];
-
-  return [[self accessible] accessibilityAttributeNames];
-}
-
-- (BOOL)accessibilityIsAttributeSettable:(NSString*)attribute
-{
-  if (!mozilla::a11y::ShouldA11yBeEnabled())
-    return [super accessibilityIsAttributeSettable:attribute];
-
-  return [[self accessible] accessibilityIsAttributeSettable:attribute];
-}
-
-- (id)accessibilityAttributeValue:(NSString*)attribute
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  if (!mozilla::a11y::ShouldA11yBeEnabled())
-    return [super accessibilityAttributeValue:attribute];
-
-  id<mozAccessible> accessible = [self accessible];
-
-  // if we're the root (topmost) accessible, we need to return our native AXParent as we
-  // traverse outside to the hierarchy of whoever embeds us. thus, fall back on NSView's
-  // default implementation for this attribute.
-  if ([attribute isEqualToString:NSAccessibilityParentAttribute] && [accessible isRoot]) {
-    id parentAccessible = [super accessibilityAttributeValue:attribute];
-    return parentAccessible;
-  }
-
-  return [accessible accessibilityAttributeValue:attribute];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-#endif /* ACCESSIBILITY */
-
-@end
-
-@implementation PixelHostingView
-
-- (BOOL)isFlipped {
-  return YES;
-}
-
-- (NSView*)hitTest:(NSPoint)aPoint {
-  return nil;
-}
-
-- (void)drawRect:(NSRect)aRect {
-  [(ChildView*)[self superview] doDrawRect:aRect];
-}
-
-- (BOOL)wantsBestResolutionOpenGLSurface {
-  return nsCocoaUtils::HiDPIEnabled() ? YES : NO;
-}
-
-@end
-
-#pragma mark -
-
-void
-ChildViewMouseTracker::OnDestroyView(ChildView* aView)
-{
-  if (sLastMouseEventView == aView) {
-    sLastMouseEventView = nil;
-    [sLastMouseMoveEvent release];
-    sLastMouseMoveEvent = nil;
-  }
-}
-
-void
-ChildViewMouseTracker::OnDestroyWindow(NSWindow* aWindow)
-{
-  if (sWindowUnderMouse == aWindow) {
-    sWindowUnderMouse = nil;
-  }
-}
-
-void
-ChildViewMouseTracker::MouseEnteredWindow(NSEvent* aEvent)
-{
-  sWindowUnderMouse = [aEvent window];
-  ReEvaluateMouseEnterState(aEvent);
-}
-
-void
-ChildViewMouseTracker::MouseExitedWindow(NSEvent* aEvent)
-{
-  if (sWindowUnderMouse == [aEvent window]) {
-    sWindowUnderMouse = nil;
-    ReEvaluateMouseEnterState(aEvent);
-  }
-}
-
-void
-ChildViewMouseTracker::ReEvaluateMouseEnterState(NSEvent* aEvent, ChildView* aOldView)
-{
-  ChildView* oldView = aOldView ? aOldView : sLastMouseEventView;
-  sLastMouseEventView = ViewForEvent(aEvent);
-  if (sLastMouseEventView != oldView) {
-    // Send enter and / or exit events.
-    WidgetMouseEvent::ExitFrom exitFrom =
-      [sLastMouseEventView window] == [oldView window] ?
-        WidgetMouseEvent::eChild : WidgetMouseEvent::eTopLevel;
-    [oldView sendMouseEnterOrExitEvent:aEvent
-                                 enter:NO
-                              exitFrom:exitFrom];
-    // After the cursor exits the window set it to a visible regular arrow cursor.
-    if (exitFrom == WidgetMouseEvent::eTopLevel) {
-      [[nsCursorManager sharedInstance] setCursor:eCursor_standard];
-    }
-    [sLastMouseEventView sendMouseEnterOrExitEvent:aEvent
-                                             enter:YES
-                                          exitFrom:exitFrom];
-  }
-}
-
-void
-ChildViewMouseTracker::ResendLastMouseMoveEvent()
-{
-  if (sLastMouseMoveEvent) {
-    MouseMoved(sLastMouseMoveEvent);
-  }
-}
-
-void
-ChildViewMouseTracker::MouseMoved(NSEvent* aEvent)
-{
-  MouseEnteredWindow(aEvent);
-  [sLastMouseEventView handleMouseMoved:aEvent];
-  if (sLastMouseMoveEvent != aEvent) {
-    [sLastMouseMoveEvent release];
-    sLastMouseMoveEvent = [aEvent retain];
-  }
-}
-
-void
-ChildViewMouseTracker::MouseScrolled(NSEvent* aEvent)
-{
-  if (!nsCocoaUtils::IsMomentumScrollEvent(aEvent)) {
-    // Store the position so we can pin future momentum scroll events.
-    sLastScrollEventScreenLocation = nsCocoaUtils::ScreenLocationForEvent(aEvent);
-  }
-}
-
-ChildView*
-ChildViewMouseTracker::ViewForEvent(NSEvent* aEvent)
-{
-  NSWindow* window = sWindowUnderMouse;
-  if (!window)
-    return nil;
-
-  NSPoint windowEventLocation = nsCocoaUtils::EventLocationForWindow(aEvent, window);
-  NSView* view = [[[window contentView] superview] hitTest:windowEventLocation];
-
-  if (![view isKindOfClass:[ChildView class]])
-    return nil;
-
-  ChildView* childView = (ChildView*)view;
-  // If childView is being destroyed return nil.
-  if (![childView widget])
-    return nil;
-  return WindowAcceptsEvent(window, aEvent, childView) ? childView : nil;
-}
-
-BOOL
-ChildViewMouseTracker::WindowAcceptsEvent(NSWindow* aWindow, NSEvent* aEvent,
-                                          ChildView* aView, BOOL aIsClickThrough)
-{
-  // Right mouse down events may get through to all windows, even to a top level
-  // window with an open sheet.
-  if (!aWindow || [aEvent type] == NSRightMouseDown)
-    return YES;
-
-  id delegate = [aWindow delegate];
-  if (!delegate || ![delegate isKindOfClass:[WindowDelegate class]])
-    return YES;
-
-  nsIWidget *windowWidget = [(WindowDelegate *)delegate geckoWidget];
-  if (!windowWidget)
-    return YES;
-
-  NSWindow* topLevelWindow = nil;
-
-  switch (windowWidget->WindowType()) {
-    case eWindowType_popup:
-      // If this is a context menu, it won't have a parent. So we'll always
-      // accept mouse move events on context menus even when none of our windows
-      // is active, which is the right thing to do.
-      // For panels, the parent window is the XUL window that owns the panel.
-      return WindowAcceptsEvent([aWindow parentWindow], aEvent, aView, aIsClickThrough);
-
-    case eWindowType_toplevel:
-    case eWindowType_dialog:
-      if ([aWindow attachedSheet])
-        return NO;
-
-      topLevelWindow = aWindow;
-      break;
-    case eWindowType_sheet: {
-      nsIWidget* parentWidget = windowWidget->GetSheetWindowParent();
-      if (!parentWidget)
-        return YES;
-
-      topLevelWindow = (NSWindow*)parentWidget->GetNativeData(NS_NATIVE_WINDOW);
-      break;
-    }
-
-    default:
-      return YES;
-  }
-
-  if (!topLevelWindow ||
-      ([topLevelWindow isMainWindow] && !aIsClickThrough) ||
-      [aEvent type] == NSOtherMouseDown ||
-      (([aEvent modifierFlags] & NSCommandKeyMask) != 0 &&
-       [aEvent type] != NSMouseMoved))
-    return YES;
-
-  // If we're here then we're dealing with a left click or mouse move on an
-  // inactive window or something similar. Ask Gecko what to do.
-  return [aView inactiveWindowAcceptsMouseEvent:aEvent];
-}
-
-#pragma mark -
-
-@interface NSView (MethodSwizzling)
-- (BOOL)nsChildView_NSView_mouseDownCanMoveWindow;
-@end
-
-@implementation NSView (MethodSwizzling)
-
-// All top-level browser windows belong to the ToolbarWindow class and have
-// NSTexturedBackgroundWindowMask turned on in their "style" (see particularly
-// [ToolbarWindow initWithContentRect:...] in nsCocoaWindow.mm).  This style
-// normally means the window "may be moved by clicking and dragging anywhere
-// in the window background", but we've suppressed this by giving the
-// ChildView class a mouseDownCanMoveWindow method that always returns NO.
-// Normally a ToolbarWindow's contentView (not a ChildView) returns YES when
-// NSTexturedBackgroundWindowMask is turned on.  But normally this makes no
-// difference.  However, under some (probably very unusual) circumstances
-// (and only on Leopard) it *does* make a difference -- for example it
-// triggers bmo bugs 431902 and 476393.  So here we make sure that a
-// ToolbarWindow's contentView always returns NO from the
-// mouseDownCanMoveWindow method.
-- (BOOL)nsChildView_NSView_mouseDownCanMoveWindow
-{
-  NSWindow *ourWindow = [self window];
-  NSView *contentView = [ourWindow contentView];
-  if ([ourWindow isKindOfClass:[ToolbarWindow class]] && (self == contentView))
-    return [ourWindow isMovableByWindowBackground];
-  return [self nsChildView_NSView_mouseDownCanMoveWindow];
-}
-
-@end
diff --git a/widget/cocoa/nsClipboard.h b/widget/cocoa/nsClipboard.h
deleted file mode 100644
index 45871efe10..0000000000
--- a/widget/cocoa/nsClipboard.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsClipboard_h_
-#define nsClipboard_h_
-
-#include "nsIClipboard.h"
-#include "nsXPIDLString.h"
-#include "mozilla/StaticPtr.h"
-
-#import <Cocoa/Cocoa.h>
-
-class nsITransferable;
-
-class nsClipboard : public nsIClipboard
-{
-
-public:
-  nsClipboard();
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSICLIPBOARD
-
-  // On macOS, cache the transferable of the current selection (chrome/content)
-  // in the parent process. This is needed for the services menu which
-  // requires synchronous access to the current selection.
-  static mozilla::StaticRefPtr<nsITransferable> sSelectionCache;
-
-  // Helper methods, used also by nsDragService
-  static NSDictionary* PasteboardDictFromTransferable(nsITransferable *aTransferable);
-  static bool IsStringType(const nsCString& aMIMEType, NSString** aPasteboardType);
-  static NSString* WrapHtmlForSystemPasteboard(NSString* aString);
-  static nsresult TransferableFromPasteboard(nsITransferable *aTransferable, NSPasteboard *pboard);
-
-protected:
-
-  // impelement the native clipboard behavior
-  NS_IMETHOD SetNativeClipboardData(int32_t aWhichClipboard);
-  NS_IMETHOD GetNativeClipboardData(nsITransferable * aTransferable, int32_t aWhichClipboard);
-  void ClearSelectionCache();
-  void SetSelectionCache(nsITransferable* aTransferable);
-  
-private:
-  virtual ~nsClipboard();
-  int32_t mCachedClipboard;
-  int32_t mChangeCount; // Set to the native change count after any modification of the clipboard.
-
-  bool                        mIgnoreEmptyNotification;
-  nsCOMPtr<nsIClipboardOwner> mClipboardOwner;
-  nsCOMPtr<nsITransferable>   mTransferable;
-};
-
-#endif // nsClipboard_h_
diff --git a/widget/cocoa/nsClipboard.mm b/widget/cocoa/nsClipboard.mm
deleted file mode 100644
index 4146f17851..0000000000
--- a/widget/cocoa/nsClipboard.mm
+++ /dev/null
@@ -1,775 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "mozilla/Logging.h"
-
-#include "mozilla/Unused.h"
-
-#include "gfxPlatform.h"
-#include "nsArrayUtils.h"
-#include "nsCOMPtr.h"
-#include "nsClipboard.h"
-#include "nsString.h"
-#include "nsISupportsPrimitives.h"
-#include "nsXPIDLString.h"
-#include "nsPrimitiveHelpers.h"
-#include "nsMemory.h"
-#include "nsIFile.h"
-#include "nsStringStream.h"
-#include "nsDragService.h"
-#include "nsEscape.h"
-#include "nsPrintfCString.h"
-#include "nsObjCExceptions.h"
-#include "imgIContainer.h"
-#include "nsCocoaUtils.h"
-
-using mozilla::gfx::DataSourceSurface;
-using mozilla::gfx::SourceSurface;
-using mozilla::LogLevel;
-
-// Screenshots use the (undocumented) png pasteboard type.
-#define IMAGE_PASTEBOARD_TYPES NSTIFFPboardType, @"Apple PNG pasteboard type", nil
-
-extern PRLogModuleInfo* sCocoaLog;
-
-extern void EnsureLogInitialized();
-
-mozilla::StaticRefPtr<nsITransferable> nsClipboard::sSelectionCache;
-
-nsClipboard::nsClipboard()
-  : mCachedClipboard(-1)
-  , mChangeCount(0)
-  , mIgnoreEmptyNotification(false)
-{
-  EnsureLogInitialized();
-}
-
-nsClipboard::~nsClipboard()
-{
-  EmptyClipboard(kGlobalClipboard);
-  EmptyClipboard(kFindClipboard);
-  ClearSelectionCache();
-}
-
-NS_IMPL_ISUPPORTS(nsClipboard, nsIClipboard)
-
-// We separate this into its own function because after an @try, all local
-// variables within that function get marked as volatile, and our C++ type
-// system doesn't like volatile things.
-static NSData*
-GetDataFromPasteboard(NSPasteboard* aPasteboard, NSString* aType)
-{
-  NSData *data = nil;
-  @try {
-    data = [aPasteboard dataForType:aType];
-  } @catch (NSException* e) {
-    NS_WARNING(nsPrintfCString("Exception raised while getting data from the pasteboard: \"%s - %s\"",
-                               [[e name] UTF8String], [[e reason] UTF8String]).get());
-    mozilla::Unused << e;
-  }
-  return data;
-}
-
-void
-nsClipboard::SetSelectionCache(nsITransferable *aTransferable)
-{
-  sSelectionCache = aTransferable;
-}
-
-void
-nsClipboard::ClearSelectionCache()
-{
-  sSelectionCache = nullptr;
-}
-
-NS_IMETHODIMP
-nsClipboard::SetNativeClipboardData(int32_t aWhichClipboard)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  if ((aWhichClipboard != kGlobalClipboard && aWhichClipboard != kFindClipboard) || !mTransferable)
-    return NS_ERROR_FAILURE;
-
-  mIgnoreEmptyNotification = true;
-
-  NSDictionary* pasteboardOutputDict = PasteboardDictFromTransferable(mTransferable);
-  if (!pasteboardOutputDict)
-    return NS_ERROR_FAILURE;
-
-  unsigned int outputCount = [pasteboardOutputDict count];
-  NSArray* outputKeys = [pasteboardOutputDict allKeys];
-  NSPasteboard* cocoaPasteboard;
-  if (aWhichClipboard == kFindClipboard) {
-    cocoaPasteboard = [NSPasteboard pasteboardWithName:NSFindPboard];
-    [cocoaPasteboard declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:nil];
-  } else {
-    // Write everything else out to the general pasteboard.
-    cocoaPasteboard = [NSPasteboard generalPasteboard];
-    [cocoaPasteboard declareTypes:outputKeys owner:nil];
-  }
-
-  for (unsigned int i = 0; i < outputCount; i++) {
-    NSString* currentKey = [outputKeys objectAtIndex:i];
-    id currentValue = [pasteboardOutputDict valueForKey:currentKey];
-    if (aWhichClipboard == kFindClipboard) {
-      if (currentKey == NSStringPboardType)
-        [cocoaPasteboard setString:currentValue forType:currentKey];
-    } else {
-      if (currentKey == NSStringPboardType ||
-          currentKey == kCorePboardType_url ||
-          currentKey == kCorePboardType_urld ||
-          currentKey == kCorePboardType_urln) {
-        [cocoaPasteboard setString:currentValue forType:currentKey];
-      } else if (currentKey == NSHTMLPboardType) {
-        [cocoaPasteboard setString:(nsClipboard::WrapHtmlForSystemPasteboard(currentValue))
-                         forType:currentKey];
-      } else {
-        [cocoaPasteboard setData:currentValue forType:currentKey];
-      }
-    }
-  }
-
-  mCachedClipboard = aWhichClipboard;
-  mChangeCount = [cocoaPasteboard changeCount];
-
-  mIgnoreEmptyNotification = false;
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-nsresult
-nsClipboard::TransferableFromPasteboard(nsITransferable *aTransferable, NSPasteboard *cocoaPasteboard)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  // get flavor list that includes all acceptable flavors (including ones obtained through conversion)
-  nsCOMPtr<nsIArray> flavorList;
-  nsresult rv = aTransferable->FlavorsTransferableCanImport(getter_AddRefs(flavorList));
-  if (NS_FAILED(rv))
-    return NS_ERROR_FAILURE;
-
-  uint32_t flavorCount;
-  flavorList->GetLength(&flavorCount);
-
-  for (uint32_t i = 0; i < flavorCount; i++) {
-    nsCOMPtr<nsISupportsCString> currentFlavor = do_QueryElementAt(flavorList, i);
-    if (!currentFlavor)
-      continue;
-
-    nsXPIDLCString flavorStr;
-    currentFlavor->ToString(getter_Copies(flavorStr)); // i has a flavr
-
-    // printf("looking for clipboard data of type %s\n", flavorStr.get());
-
-    NSString *pboardType = nil;
-    if (nsClipboard::IsStringType(flavorStr, &pboardType)) {
-      NSString* pString = [cocoaPasteboard stringForType:pboardType];
-      if (!pString)
-        continue;
-
-      NSData* stringData;
-      if ([pboardType isEqualToString:NSRTFPboardType]) {
-        stringData = [pString dataUsingEncoding:NSASCIIStringEncoding];
-      } else {
-        stringData = [pString dataUsingEncoding:NSUnicodeStringEncoding];
-      }
-      unsigned int dataLength = [stringData length];
-      void* clipboardDataPtr = malloc(dataLength);
-      if (!clipboardDataPtr)
-        return NS_ERROR_OUT_OF_MEMORY;
-      [stringData getBytes:clipboardDataPtr];
-
-      // The DOM only wants LF, so convert from MacOS line endings to DOM line endings.
-      int32_t signedDataLength = dataLength;
-      nsLinebreakHelpers::ConvertPlatformToDOMLinebreaks(flavorStr, &clipboardDataPtr, &signedDataLength);
-      dataLength = signedDataLength;
-
-      // skip BOM (Byte Order Mark to distinguish little or big endian)      
-      char16_t* clipboardDataPtrNoBOM = (char16_t*)clipboardDataPtr;
-      if ((dataLength > 2) &&
-          ((clipboardDataPtrNoBOM[0] == 0xFEFF) ||
-           (clipboardDataPtrNoBOM[0] == 0xFFFE))) {
-        dataLength -= sizeof(char16_t);
-        clipboardDataPtrNoBOM += 1;
-      }
-
-      nsCOMPtr<nsISupports> genericDataWrapper;
-      nsPrimitiveHelpers::CreatePrimitiveForData(flavorStr, clipboardDataPtrNoBOM, dataLength,
-                                                 getter_AddRefs(genericDataWrapper));
-      aTransferable->SetTransferData(flavorStr, genericDataWrapper, dataLength);
-      free(clipboardDataPtr);
-      break;
-    }
-    else if (flavorStr.EqualsLiteral(kCustomTypesMime)) {
-      NSString* type = [cocoaPasteboard availableTypeFromArray:[NSArray arrayWithObject:kCustomTypesPboardType]];
-      if (!type) {
-        continue;
-      }
-
-      NSData* pasteboardData = GetDataFromPasteboard(cocoaPasteboard, type);
-      if (!pasteboardData) {
-        continue;
-      }
-
-      unsigned int dataLength = [pasteboardData length];
-      void* clipboardDataPtr = malloc(dataLength);
-      if (!clipboardDataPtr) {
-        return NS_ERROR_OUT_OF_MEMORY;
-      }
-      [pasteboardData getBytes:clipboardDataPtr];
-
-      nsCOMPtr<nsISupports> genericDataWrapper;
-      nsPrimitiveHelpers::CreatePrimitiveForData(flavorStr, clipboardDataPtr, dataLength,
-                                                 getter_AddRefs(genericDataWrapper));
-
-      aTransferable->SetTransferData(flavorStr, genericDataWrapper, dataLength);
-      free(clipboardDataPtr);
-    }
-    else if (flavorStr.EqualsLiteral(kJPEGImageMime) ||
-             flavorStr.EqualsLiteral(kJPGImageMime) ||
-             flavorStr.EqualsLiteral(kPNGImageMime) ||
-             flavorStr.EqualsLiteral(kGIFImageMime)) {
-      // Figure out if there's data on the pasteboard we can grab (sanity check)
-      NSString *type = [cocoaPasteboard availableTypeFromArray:[NSArray arrayWithObjects:IMAGE_PASTEBOARD_TYPES]];
-      if (!type)
-        continue;
-
-      // Read data off the clipboard
-      NSData *pasteboardData = GetDataFromPasteboard(cocoaPasteboard, type);
-      if (!pasteboardData)
-        continue;
-
-      // Figure out what type we're converting to
-      CFStringRef outputType = NULL; 
-      if (flavorStr.EqualsLiteral(kJPEGImageMime) ||
-          flavorStr.EqualsLiteral(kJPGImageMime))
-        outputType = CFSTR("public.jpeg");
-      else if (flavorStr.EqualsLiteral(kPNGImageMime))
-        outputType = CFSTR("public.png");
-      else if (flavorStr.EqualsLiteral(kGIFImageMime))
-        outputType = CFSTR("com.compuserve.gif");
-      else
-        continue;
-
-      // Use ImageIO to interpret the data on the clipboard and transcode.
-      // Note that ImageIO, like all CF APIs, allows NULLs to propagate freely
-      // and safely in most cases (like ObjC). A notable exception is CFRelease.
-      NSDictionary *options = [NSDictionary dictionaryWithObjectsAndKeys:
-                                (NSNumber*)kCFBooleanTrue, kCGImageSourceShouldAllowFloat,
-                                (type == NSTIFFPboardType ? @"public.tiff" : @"public.png"),
-                                kCGImageSourceTypeIdentifierHint, nil];
-
-      CGImageSourceRef source = CGImageSourceCreateWithData((CFDataRef)pasteboardData, 
-                                                            (CFDictionaryRef)options);
-      NSMutableData *encodedData = [NSMutableData data];
-      CGImageDestinationRef dest = CGImageDestinationCreateWithData((CFMutableDataRef)encodedData,
-                                                                    outputType,
-                                                                    1, NULL);
-      CGImageDestinationAddImageFromSource(dest, source, 0, NULL);
-      bool successfullyConverted = CGImageDestinationFinalize(dest);
-
-      if (successfullyConverted) {
-        // Put the converted data in a form Gecko can understand
-        nsCOMPtr<nsIInputStream> byteStream;
-        NS_NewByteInputStream(getter_AddRefs(byteStream), (const char*)[encodedData bytes],
-                                   [encodedData length], NS_ASSIGNMENT_COPY);
-  
-        aTransferable->SetTransferData(flavorStr, byteStream, sizeof(nsIInputStream*));
-      }
-
-      if (dest)
-        CFRelease(dest);
-      if (source)
-        CFRelease(source);
-      
-      if (successfullyConverted)
-        break;
-      else
-        continue;
-    }
-  }
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-nsClipboard::GetNativeClipboardData(nsITransferable* aTransferable, int32_t aWhichClipboard)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  if ((aWhichClipboard != kGlobalClipboard && aWhichClipboard != kFindClipboard) || !aTransferable)
-    return NS_ERROR_FAILURE;
-
-  NSPasteboard* cocoaPasteboard;
-  if (aWhichClipboard == kFindClipboard) {
-    cocoaPasteboard = [NSPasteboard pasteboardWithName:NSFindPboard];
-  } else {
-    cocoaPasteboard = [NSPasteboard generalPasteboard];
-  }
-  if (!cocoaPasteboard)
-    return NS_ERROR_FAILURE;
-
-  // get flavor list that includes all acceptable flavors (including ones obtained through conversion)
-  nsCOMPtr<nsIArray> flavorList;
-  nsresult rv = aTransferable->FlavorsTransferableCanImport(getter_AddRefs(flavorList));
-  if (NS_FAILED(rv))
-    return NS_ERROR_FAILURE;
-
-  uint32_t flavorCount;
-  flavorList->GetLength(&flavorCount);
-
-  // If we were the last ones to put something on the pasteboard, then just use the cached
-  // transferable. Otherwise clear it because it isn't relevant any more.
-  if (mCachedClipboard == aWhichClipboard &&
-      mChangeCount == [cocoaPasteboard changeCount]) {
-    if (mTransferable) {
-      for (uint32_t i = 0; i < flavorCount; i++) {
-        nsCOMPtr<nsISupportsCString> currentFlavor = do_QueryElementAt(flavorList, i);
-        if (!currentFlavor)
-          continue;
-
-        nsXPIDLCString flavorStr;
-        currentFlavor->ToString(getter_Copies(flavorStr));
-
-        nsCOMPtr<nsISupports> dataSupports;
-        uint32_t dataSize = 0;
-        rv = mTransferable->GetTransferData(flavorStr, getter_AddRefs(dataSupports), &dataSize);
-        if (NS_SUCCEEDED(rv)) {
-          aTransferable->SetTransferData(flavorStr, dataSupports, dataSize);
-          return NS_OK; // maybe try to fill in more types? Is there a point?
-        }
-      }
-    }
-  } else {
-    EmptyClipboard(aWhichClipboard);
-  }
-
-  // at this point we can't satisfy the request from cache data so let's look
-  // for things other people put on the system clipboard
-
-  return nsClipboard::TransferableFromPasteboard(aTransferable, cocoaPasteboard);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-// returns true if we have *any* of the passed in flavors available for pasting
-NS_IMETHODIMP
-nsClipboard::HasDataMatchingFlavors(const char** aFlavorList, uint32_t aLength,
-                                    int32_t aWhichClipboard, bool* outResult)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  *outResult = false;
-
-  if ((aWhichClipboard != kGlobalClipboard) || !aFlavorList)
-    return NS_OK;
-
-  // first see if we have data for this in our cached transferable
-  if (mTransferable) {
-    nsCOMPtr<nsIArray> transferableFlavorList;
-    nsresult rv = mTransferable->FlavorsTransferableCanImport(getter_AddRefs(transferableFlavorList));
-    if (NS_SUCCEEDED(rv)) {
-      uint32_t transferableFlavorCount;
-      transferableFlavorList->GetLength(&transferableFlavorCount);
-      for (uint32_t j = 0; j < transferableFlavorCount; j++) {
-        nsCOMPtr<nsISupportsCString> currentTransferableFlavor =
-            do_QueryElementAt(transferableFlavorList, j);
-        if (!currentTransferableFlavor)
-          continue;
-        nsXPIDLCString transferableFlavorStr;
-        currentTransferableFlavor->ToString(getter_Copies(transferableFlavorStr));
-
-        for (uint32_t k = 0; k < aLength; k++) {
-          if (transferableFlavorStr.Equals(aFlavorList[k])) {
-            *outResult = true;
-            return NS_OK;
-          }
-        }
-      }      
-    }    
-  }
-
-  NSPasteboard* generalPBoard = [NSPasteboard generalPasteboard];
-
-  for (uint32_t i = 0; i < aLength; i++) {
-    nsDependentCString mimeType(aFlavorList[i]);
-    NSString *pboardType = nil;
-
-    if (nsClipboard::IsStringType(mimeType, &pboardType)) {
-      NSString* availableType = [generalPBoard availableTypeFromArray:[NSArray arrayWithObject:pboardType]];
-      if (availableType && [availableType isEqualToString:pboardType]) {
-        *outResult = true;
-        break;
-      }
-    } else if (!strcmp(aFlavorList[i], kCustomTypesMime)) {
-      NSString* availableType = [generalPBoard availableTypeFromArray:[NSArray arrayWithObject:kCustomTypesPboardType]];
-      if (availableType) {
-        *outResult = true;
-        break;
-      }
-    } else if (!strcmp(aFlavorList[i], kJPEGImageMime) ||
-               !strcmp(aFlavorList[i], kJPGImageMime) ||
-               !strcmp(aFlavorList[i], kPNGImageMime) ||
-               !strcmp(aFlavorList[i], kGIFImageMime)) {
-      NSString* availableType = [generalPBoard availableTypeFromArray:
-                                  [NSArray arrayWithObjects:IMAGE_PASTEBOARD_TYPES]];
-      if (availableType) {
-        *outResult = true;
-        break;
-      }
-    }
-  }
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-nsClipboard::SupportsFindClipboard(bool *_retval)
-{
-  NS_ENSURE_ARG_POINTER(_retval);
-  *_retval = true;
-  return NS_OK;
-}
-
-// This function converts anything that other applications might understand into the system format
-// and puts it into a dictionary which it returns.
-// static
-NSDictionary* 
-nsClipboard::PasteboardDictFromTransferable(nsITransferable* aTransferable)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  if (!aTransferable)
-    return nil;
-
-  NSMutableDictionary* pasteboardOutputDict = [NSMutableDictionary dictionary];
-
-  nsCOMPtr<nsIArray> flavorList;
-  nsresult rv = aTransferable->FlavorsTransferableCanExport(getter_AddRefs(flavorList));
-  if (NS_FAILED(rv))
-    return nil;
-
-  uint32_t flavorCount;
-  flavorList->GetLength(&flavorCount);
-  for (uint32_t i = 0; i < flavorCount; i++) {
-    nsCOMPtr<nsISupportsCString> currentFlavor = do_QueryElementAt(flavorList, i);
-    if (!currentFlavor)
-      continue;
-
-    nsXPIDLCString flavorStr;
-    currentFlavor->ToString(getter_Copies(flavorStr));
-
-    MOZ_LOG(sCocoaLog, LogLevel::Info, ("writing out clipboard data of type %s (%d)\n", flavorStr.get(), i));
-
-    NSString *pboardType = nil;
-
-    if (nsClipboard::IsStringType(flavorStr, &pboardType)) {
-      void* data = nullptr;
-      uint32_t dataSize = 0;
-      nsCOMPtr<nsISupports> genericDataWrapper;
-      rv = aTransferable->GetTransferData(flavorStr, getter_AddRefs(genericDataWrapper), &dataSize);
-      nsPrimitiveHelpers::CreateDataFromPrimitive(flavorStr, genericDataWrapper, &data, dataSize);
-
-      NSString* nativeString;
-      if (data)
-        nativeString = [NSString stringWithCharacters:(const unichar*)data length:(dataSize / sizeof(char16_t))];
-      else
-        nativeString = [NSString string];
-      
-      // be nice to Carbon apps, normalize the receiver's contents using Form C.
-      nativeString = [nativeString precomposedStringWithCanonicalMapping];
-
-      [pasteboardOutputDict setObject:nativeString forKey:pboardType];
-      
-      free(data);
-    }
-    else if (flavorStr.EqualsLiteral(kCustomTypesMime)) {
-      void* data = nullptr;
-      uint32_t dataSize = 0;
-      nsCOMPtr<nsISupports> genericDataWrapper;
-      rv = aTransferable->GetTransferData(flavorStr, getter_AddRefs(genericDataWrapper), &dataSize);
-      nsPrimitiveHelpers::CreateDataFromPrimitive(flavorStr, genericDataWrapper, &data, dataSize);
-
-      if (data) {
-        NSData* nativeData = [NSData dataWithBytes:data length:dataSize];
-
-        [pasteboardOutputDict setObject:nativeData forKey:kCustomTypesPboardType];
-        free(data);
-      }
-    }
-    else if (flavorStr.EqualsLiteral(kPNGImageMime) || flavorStr.EqualsLiteral(kJPEGImageMime) ||
-             flavorStr.EqualsLiteral(kJPGImageMime) || flavorStr.EqualsLiteral(kGIFImageMime) ||
-             flavorStr.EqualsLiteral(kNativeImageMime)) {
-      uint32_t dataSize = 0;
-      nsCOMPtr<nsISupports> transferSupports;
-      aTransferable->GetTransferData(flavorStr, getter_AddRefs(transferSupports), &dataSize);
-      nsCOMPtr<nsISupportsInterfacePointer> ptrPrimitive(do_QueryInterface(transferSupports));
-      if (!ptrPrimitive)
-        continue;
-
-      nsCOMPtr<nsISupports> primitiveData;
-      ptrPrimitive->GetData(getter_AddRefs(primitiveData));
-
-      nsCOMPtr<imgIContainer> image(do_QueryInterface(primitiveData));
-      if (!image) {
-        NS_WARNING("Image isn't an imgIContainer in transferable");
-        continue;
-      }
-
-      RefPtr<SourceSurface> surface =
-        image->GetFrame(imgIContainer::FRAME_CURRENT,
-                        imgIContainer::FLAG_SYNC_DECODE);
-      if (!surface) {
-        continue;
-      }
-      CGImageRef imageRef = NULL;
-      rv = nsCocoaUtils::CreateCGImageFromSurface(surface, &imageRef);
-      if (NS_FAILED(rv) || !imageRef) {
-        continue;
-      }
-
-      // Convert the CGImageRef to TIFF data.
-      CFMutableDataRef tiffData = CFDataCreateMutable(kCFAllocatorDefault, 0);
-      CGImageDestinationRef destRef = CGImageDestinationCreateWithData(tiffData,
-                                                                       CFSTR("public.tiff"),
-                                                                       1,
-                                                                       NULL);
-      CGImageDestinationAddImage(destRef, imageRef, NULL);
-      bool successfullyConverted = CGImageDestinationFinalize(destRef);
-
-      CGImageRelease(imageRef);
-      if (destRef)
-        CFRelease(destRef);
-
-      if (!successfullyConverted) {
-        if (tiffData)
-          CFRelease(tiffData);
-        continue;
-      }
-
-      [pasteboardOutputDict setObject:(NSMutableData*)tiffData forKey:NSTIFFPboardType];
-      if (tiffData)
-        CFRelease(tiffData);
-    }
-    else if (flavorStr.EqualsLiteral(kFileMime)) {
-      uint32_t len = 0;
-      nsCOMPtr<nsISupports> genericFile;
-      rv = aTransferable->GetTransferData(flavorStr, getter_AddRefs(genericFile), &len);
-      if (NS_FAILED(rv)) {
-        continue;
-      }
-
-      nsCOMPtr<nsIFile> file(do_QueryInterface(genericFile));
-      if (!file) {
-        nsCOMPtr<nsISupportsInterfacePointer> ptr(do_QueryInterface(genericFile));
-
-        if (ptr) {
-          ptr->GetData(getter_AddRefs(genericFile));
-          file = do_QueryInterface(genericFile);
-        }
-      }
-
-      if (!file) {
-        continue;
-      }
-
-      nsAutoString fileURI;
-      rv = file->GetPath(fileURI);
-      if (NS_FAILED(rv)) {
-        continue;
-      }
-
-      NSString* str = nsCocoaUtils::ToNSString(fileURI);
-      NSArray* fileList = [NSArray arrayWithObjects:str, nil];
-      [pasteboardOutputDict setObject:fileList forKey:NSFilenamesPboardType];
-    }
-    else if (flavorStr.EqualsLiteral(kFilePromiseMime)) {
-      [pasteboardOutputDict setObject:[NSArray arrayWithObject:@""] forKey:NSFilesPromisePboardType];      
-    }
-    else if (flavorStr.EqualsLiteral(kURLMime)) {
-      uint32_t len = 0;
-      nsCOMPtr<nsISupports> genericURL;
-      rv = aTransferable->GetTransferData(flavorStr, getter_AddRefs(genericURL), &len);
-      nsCOMPtr<nsISupportsString> urlObject(do_QueryInterface(genericURL));
-
-      nsAutoString url;
-      urlObject->GetData(url);
-
-      // A newline embedded in the URL means that the form is actually URL + title.
-      int32_t newlinePos = url.FindChar(char16_t('\n'));
-      if (newlinePos >= 0) {
-        url.Truncate(newlinePos);
-
-        nsAutoString urlTitle;
-        urlObject->GetData(urlTitle);
-        urlTitle.Mid(urlTitle, newlinePos + 1, len - (newlinePos + 1));
-
-        NSString *nativeTitle = [[NSString alloc] initWithCharacters:reinterpret_cast<const unichar*>(urlTitle.get())
-                                                              length:urlTitle.Length()];
-        // be nice to Carbon apps, normalize the receiver's contents using Form C.
-        [pasteboardOutputDict setObject:[nativeTitle precomposedStringWithCanonicalMapping] forKey:kCorePboardType_urln];
-        // Also put the title out as 'urld', since some recipients will look for that.
-        [pasteboardOutputDict setObject:[nativeTitle precomposedStringWithCanonicalMapping] forKey:kCorePboardType_urld];
-        [nativeTitle release];
-      }
-
-      // The Finder doesn't like getting random binary data aka
-      // Unicode, so change it into an escaped URL containing only
-      // ASCII.
-      nsAutoCString utf8Data = NS_ConvertUTF16toUTF8(url.get(), url.Length());
-      nsAutoCString escData;
-      NS_EscapeURL(utf8Data.get(), utf8Data.Length(), esc_OnlyNonASCII|esc_AlwaysCopy, escData);
-
-      // printf("Escaped url is %s, length %d\n", escData.get(), escData.Length());
-
-      NSString *nativeURL = [NSString stringWithUTF8String:escData.get()];
-      [pasteboardOutputDict setObject:nativeURL forKey:kCorePboardType_url];
-    }
-    // If it wasn't a type that we recognize as exportable we don't put it on the system
-    // clipboard. We'll just access it from our cached transferable when we need it.
-  }
-
-  return pasteboardOutputDict;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-bool nsClipboard::IsStringType(const nsCString& aMIMEType, NSString** aPasteboardType)
-{
-  if (aMIMEType.EqualsLiteral(kUnicodeMime)) {
-    *aPasteboardType = NSStringPboardType;
-    return true;
-  } else if (aMIMEType.EqualsLiteral(kRTFMime)) {
-    *aPasteboardType = NSRTFPboardType;
-    return true;
-  } else if (aMIMEType.EqualsLiteral(kHTMLMime)) {
-    *aPasteboardType = NSHTMLPboardType;
-    return true;
-  } else {
-    return false;
-  }
-}
-
-NSString* nsClipboard::WrapHtmlForSystemPasteboard(NSString* aString)
-{
-  NSString* wrapped =
-    [NSString stringWithFormat:
-      @"<html>"
-         "<head>"
-           "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">"
-         "</head>"
-         "<body>"
-           "%@"
-         "</body>"
-       "</html>", aString];
-  return wrapped;
-}
-
-/**
-  * Sets the transferable object
-  *
-  */
-NS_IMETHODIMP
-nsClipboard::SetData(nsITransferable* aTransferable, nsIClipboardOwner* anOwner,
-                     int32_t aWhichClipboard)
-{
-  NS_ASSERTION (aTransferable, "clipboard given a null transferable");
-
-  if (aWhichClipboard == kSelectionCache) {
-    if (aTransferable) {
-      SetSelectionCache(aTransferable);
-      return NS_OK;
-    }
-    return NS_ERROR_FAILURE;
-  }
-
-  if (aTransferable == mTransferable && anOwner == mClipboardOwner) {
-    return NS_OK;
-  }
-  bool selectClipPresent;
-  SupportsSelectionClipboard(&selectClipPresent);
-  bool findClipPresent;
-  SupportsFindClipboard(&findClipPresent);
-  if (!selectClipPresent && !findClipPresent && aWhichClipboard != kGlobalClipboard) {
-    return NS_ERROR_FAILURE;
-  }
-
-  EmptyClipboard(aWhichClipboard);
-
-  mClipboardOwner = anOwner;
-  mTransferable = aTransferable;
-
-  nsresult rv = NS_ERROR_FAILURE;
-  if (mTransferable) {
-    rv = SetNativeClipboardData(aWhichClipboard);
-  }
-
-  return rv;
-}
-
-/**
-  * Gets the transferable object
-  *
-  */
-NS_IMETHODIMP
-nsClipboard::GetData(nsITransferable* aTransferable, int32_t aWhichClipboard)
-{
-  NS_ASSERTION (aTransferable, "clipboard given a null transferable");
-
-  bool selectClipPresent;
-  SupportsSelectionClipboard(&selectClipPresent);
-  bool findClipPresent;
-  SupportsFindClipboard(&findClipPresent);
-  if (!selectClipPresent && !findClipPresent && aWhichClipboard != kGlobalClipboard)
-    return NS_ERROR_FAILURE;
-
-  if (aTransferable) {
-    return GetNativeClipboardData(aTransferable, aWhichClipboard);
-  }
-
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsClipboard::EmptyClipboard(int32_t aWhichClipboard)
-{
-  if (aWhichClipboard == kSelectionCache) {
-    ClearSelectionCache();
-    return NS_OK;
-  }
-
-  bool selectClipPresent;
-  SupportsSelectionClipboard(&selectClipPresent);
-  bool findClipPresent;
-  SupportsFindClipboard(&findClipPresent);
-  if (!selectClipPresent && !findClipPresent && aWhichClipboard != kGlobalClipboard) {
-    return NS_ERROR_FAILURE;
-  }
-
-  if (mIgnoreEmptyNotification) {
-    return NS_OK;
-  }
-
-  if (mClipboardOwner) {
-    mClipboardOwner->LosingOwnership(mTransferable);
-    mClipboardOwner = nullptr;
-  }
-
-  mTransferable = nullptr;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsClipboard::SupportsSelectionClipboard(bool* _retval)
-{
-  *_retval = false;   // we don't support the selection clipboard by default.
-  return NS_OK;
-}
diff --git a/widget/cocoa/nsCocoaDebugUtils.h b/widget/cocoa/nsCocoaDebugUtils.h
deleted file mode 100644
index 814f060878..0000000000
--- a/widget/cocoa/nsCocoaDebugUtils.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsCocoaDebugUtils_h_
-#define nsCocoaDebugUtils_h_
-
-#include <CoreServices/CoreServices.h>
-
-// Definitions and declarations of stuff used by us from the CoreSymbolication
-// framework.  This is an undocumented, private framework available on OS X
-// 10.6 and up.  It's used by Apple utilities like dtrace, atos, ReportCrash
-// and crashreporterd.
-
-typedef struct _CSTypeRef {
-  unsigned long type;
-  void* contents;
-} CSTypeRef;
-
-typedef CSTypeRef CSSymbolicatorRef;
-typedef CSTypeRef CSSymbolOwnerRef;
-typedef CSTypeRef CSSymbolRef;
-typedef CSTypeRef CSSourceInfoRef;
-
-typedef struct _CSRange {
-  unsigned long long location;
-  unsigned long long length;
-} CSRange;
-
-typedef unsigned long long CSArchitecture;
-
-#define kCSNow LONG_MAX
-
-extern "C" {
-
-CSSymbolicatorRef
-CSSymbolicatorCreateWithPid(pid_t pid);
-
-CSSymbolicatorRef
-CSSymbolicatorCreateWithPidFlagsAndNotification(pid_t pid,
-                                                uint32_t flags,
-                                                uint32_t notification);
-
-CSArchitecture
-CSSymbolicatorGetArchitecture(CSSymbolicatorRef symbolicator);
-
-CSSymbolOwnerRef
-CSSymbolicatorGetSymbolOwnerWithAddressAtTime(CSSymbolicatorRef symbolicator,
-                                              unsigned long long address,
-                                              long time);
-
-const char*
-CSSymbolOwnerGetName(CSSymbolOwnerRef owner);
-
-unsigned long long
-CSSymbolOwnerGetBaseAddress(CSSymbolOwnerRef owner);
-
-CSSymbolRef
-CSSymbolOwnerGetSymbolWithAddress(CSSymbolOwnerRef owner,
-                                  unsigned long long address);
-
-CSSourceInfoRef
-CSSymbolOwnerGetSourceInfoWithAddress(CSSymbolOwnerRef owner,
-                                      unsigned long long address);
-
-const char*
-CSSymbolGetName(CSSymbolRef symbol);
-
-CSRange
-CSSymbolGetRange(CSSymbolRef symbol);
-
-const char*
-CSSourceInfoGetFilename(CSSourceInfoRef info);
-
-uint32_t
-CSSourceInfoGetLineNumber(CSSourceInfoRef info);
-
-CSTypeRef
-CSRetain(CSTypeRef);
-
-void
-CSRelease(CSTypeRef);
-
-bool
-CSIsNull(CSTypeRef);
-
-void
-CSShow(CSTypeRef);
-
-const char*
-CSArchitectureGetFamilyName(CSArchitecture);
-
-} // extern "C"
-
-class nsCocoaDebugUtils
-{
-public:
-  // Like NSLog() but records more information (for example the full path to
-  // the executable and the "thread name").  Like NSLog(), writes to both
-  // stdout and the system log.
-  static void DebugLog(const char* aFormat, ...);
-
-  // Logs a stack trace of the current point of execution, to both stdout and
-  // the system log.
-  static void PrintStackTrace();
-
-  // Returns the name of the module that "owns" aAddress.  This must be
-  // free()ed by the caller.
-  static char* GetOwnerName(void* aAddress);
-
-  // Returns a symbolicated representation of aAddress.  This must be
-  // free()ed by the caller.
-  static char* GetAddressString(void* aAddress);
-
-private:
-  static void DebugLogInt(bool aDecorate, const char* aFormat, ...);
-  static void DebugLogV(bool aDecorate, CFStringRef aFormat, va_list aArgs);
-
-  static void PrintAddress(void* aAddress);
-
-  // The values returned by GetOwnerNameInt() and GetAddressStringInt() must
-  // be free()ed by the caller.
-  static char* GetOwnerNameInt(void* aAddress,
-                               CSTypeRef aOwner = sInitializer);
-  static char* GetAddressStringInt(void* aAddress,
-                                   CSTypeRef aOwner = sInitializer);
-
-  static CSSymbolicatorRef GetSymbolicatorRef();
-  static void ReleaseSymbolicator();
-
-  static CSTypeRef sInitializer;
-  static CSSymbolicatorRef sSymbolicator;
-};
-
-#endif // nsCocoaDebugUtils_h_
diff --git a/widget/cocoa/nsCocoaDebugUtils.mm b/widget/cocoa/nsCocoaDebugUtils.mm
deleted file mode 100644
index 35896dc401..0000000000
--- a/widget/cocoa/nsCocoaDebugUtils.mm
+++ /dev/null
@@ -1,284 +0,0 @@
-/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "nsCocoaDebugUtils.h"
-
-#include <pthread.h>
-#include <libproc.h>
-#include <stdarg.h>
-#include <time.h>
-#include <execinfo.h>
-#include <asl.h>
-
-static char gProcPath[PROC_PIDPATHINFO_MAXSIZE] = {0};
-static char gBundleID[MAXPATHLEN] = {0};
-
-static void MaybeGetPathAndID()
-{
-  if (!gProcPath[0]) {
-    proc_pidpath(getpid(), gProcPath, sizeof(gProcPath));
-  }
-  if (!gBundleID[0]) {
-    // Apple's CFLog() uses "com.apple.console" (in its call to asl_open()) if
-    // it can't find the bundle id.
-    CFStringRef bundleID = NULL;
-    CFBundleRef mainBundle = CFBundleGetMainBundle();
-    if (mainBundle) {
-      bundleID = CFBundleGetIdentifier(mainBundle);
-    }
-    if (!bundleID) {
-      strcpy(gBundleID, "com.apple.console");
-    } else {
-      CFStringGetCString(bundleID, gBundleID, sizeof(gBundleID),
-                         kCFStringEncodingUTF8);
-    }
-  }
-}
-
-static void GetThreadName(char* aName, size_t aSize)
-{
-  pthread_getname_np(pthread_self(), aName, aSize);
-}
-
-void
-nsCocoaDebugUtils::DebugLog(const char* aFormat, ...)
-{
-  va_list args;
-  va_start(args, aFormat);
-  CFStringRef formatCFSTR =
-    CFStringCreateWithCString(kCFAllocatorDefault, aFormat,
-                              kCFStringEncodingUTF8);
-  DebugLogV(true, formatCFSTR, args);
-  CFRelease(formatCFSTR);
-  va_end(args);
-}
-
-void
-nsCocoaDebugUtils::DebugLogInt(bool aDecorate, const char* aFormat, ...)
-{
-  va_list args;
-  va_start(args, aFormat);
-  CFStringRef formatCFSTR =
-    CFStringCreateWithCString(kCFAllocatorDefault, aFormat,
-                              kCFStringEncodingUTF8);
-  DebugLogV(aDecorate, formatCFSTR, args);
-  CFRelease(formatCFSTR);
-  va_end(args);
-}
-
-void
-nsCocoaDebugUtils::DebugLogV(bool aDecorate, CFStringRef aFormat,
-                             va_list aArgs)
-{
-  MaybeGetPathAndID();
-
-  CFStringRef message =
-    CFStringCreateWithFormatAndArguments(kCFAllocatorDefault, NULL,
-                                         aFormat, aArgs);
-
-  int msgLength =
-    CFStringGetMaximumSizeForEncoding(CFStringGetLength(message),
-                                      kCFStringEncodingUTF8);
-  char* msgUTF8 = (char*) calloc(msgLength, 1);
-  CFStringGetCString(message, msgUTF8, msgLength, kCFStringEncodingUTF8);
-  CFRelease(message);
-
-  int finishedLength = msgLength + PROC_PIDPATHINFO_MAXSIZE;
-  char* finished = (char*) calloc(finishedLength, 1);
-  const time_t currentTime = time(NULL);
-  char timestamp[30] = {0};
-  ctime_r(&currentTime, timestamp);
-  if (aDecorate) {
-    char threadName[MAXPATHLEN] = {0};
-    GetThreadName(threadName, sizeof(threadName));
-    snprintf(finished, finishedLength, "(%s) %s[%u] %s[%p] %s\n",
-            timestamp, gProcPath, getpid(), threadName, pthread_self(), msgUTF8);
-  } else {
-    snprintf(finished, finishedLength, "%s\n", msgUTF8);
-  }
-  free(msgUTF8);
-
-  fputs(finished, stdout);
-
-  // Use the Apple System Log facility, as NSLog and CFLog do.
-  aslclient asl = asl_open(NULL, gBundleID, ASL_OPT_NO_DELAY);
-  aslmsg msg = asl_new(ASL_TYPE_MSG);
-  asl_set(msg, ASL_KEY_LEVEL, "4"); // kCFLogLevelWarning, used by NSLog()
-  asl_set(msg, ASL_KEY_MSG, finished);
-  asl_send(asl, msg);
-  asl_free(msg);
-  asl_close(asl);
-
-  free(finished);
-}
-
-CSTypeRef
-nsCocoaDebugUtils::sInitializer = {0};
-
-CSSymbolicatorRef
-nsCocoaDebugUtils::sSymbolicator = {0};
-
-#define STACK_MAX 256
-
-void
-nsCocoaDebugUtils::PrintStackTrace()
-{
-  void** addresses = (void**) calloc(STACK_MAX, sizeof(void*));
-  if (!addresses) {
-    return;
-  }
-
-  CSSymbolicatorRef symbolicator = GetSymbolicatorRef();
-  if (CSIsNull(symbolicator)) {
-    free(addresses);
-    return;
-  }
-
-  uint32_t count = backtrace(addresses, STACK_MAX);
-  for (uint32_t i = 0; i < count; ++i) {
-    PrintAddress(addresses[i]);
-  }
-
-  ReleaseSymbolicator();
-  free(addresses);
-}
-
-void
-nsCocoaDebugUtils::PrintAddress(void* aAddress)
-{
-  const char* ownerName = "unknown";
-  const char* addressString = "unknown + 0";
-
-  char* allocatedOwnerName = nullptr;
-  char* allocatedAddressString = nullptr;
-
-  CSSymbolOwnerRef owner = {0};
-  CSSymbolicatorRef symbolicator = GetSymbolicatorRef();
-
-  if (!CSIsNull(symbolicator)) {
-    owner =
-      CSSymbolicatorGetSymbolOwnerWithAddressAtTime(symbolicator,
-                                                    (unsigned long long) aAddress,
-                                                    kCSNow);
-  }
-  if (!CSIsNull(owner)) {
-    ownerName = allocatedOwnerName = GetOwnerNameInt(aAddress, owner);
-    addressString = allocatedAddressString = GetAddressStringInt(aAddress, owner);
-  }
-  DebugLogInt(false, "    (%s) %s", ownerName, addressString);
-
-  free(allocatedOwnerName);
-  free(allocatedAddressString);
-
-  ReleaseSymbolicator();
-}
-
-char*
-nsCocoaDebugUtils::GetOwnerName(void* aAddress)
-{
-  return GetOwnerNameInt(aAddress);
-}
-
-char*
-nsCocoaDebugUtils::GetOwnerNameInt(void* aAddress, CSTypeRef aOwner)
-{
-  char* retval = (char*) calloc(MAXPATHLEN, 1);
-
-  const char* ownerName = "unknown";
-
-  CSSymbolicatorRef symbolicator = GetSymbolicatorRef();
-  CSTypeRef owner = aOwner;
-
-  if (CSIsNull(owner) && !CSIsNull(symbolicator)) {
-    owner =
-      CSSymbolicatorGetSymbolOwnerWithAddressAtTime(symbolicator,
-                                                    (unsigned long long) aAddress,
-                                                    kCSNow);
-  }
-
-  if (!CSIsNull(owner)) {
-    ownerName = CSSymbolOwnerGetName(owner);
-  }
-
-  snprintf(retval, MAXPATHLEN, "%s", ownerName);
-  ReleaseSymbolicator();
-
-  return retval;
-}
-
-char*
-nsCocoaDebugUtils::GetAddressString(void* aAddress)
-{
-  return GetAddressStringInt(aAddress);
-}
-
-char*
-nsCocoaDebugUtils::GetAddressStringInt(void* aAddress, CSTypeRef aOwner)
-{
-  char* retval = (char*) calloc(MAXPATHLEN, 1);
-
-  const char* addressName = "unknown";
-  unsigned long long addressOffset = 0;
-
-  CSSymbolicatorRef symbolicator = GetSymbolicatorRef();
-  CSTypeRef owner = aOwner;
-
-  if (CSIsNull(owner) && !CSIsNull(symbolicator)) {
-    owner =
-      CSSymbolicatorGetSymbolOwnerWithAddressAtTime(symbolicator,
-                                                    (unsigned long long) aAddress,
-                                                    kCSNow);
-  }
-
-  if (!CSIsNull(owner)) {
-    CSSymbolRef symbol =
-      CSSymbolOwnerGetSymbolWithAddress(owner,
-                                        (unsigned long long) aAddress);
-    if (!CSIsNull(symbol)) {
-      addressName = CSSymbolGetName(symbol);
-      CSRange range = CSSymbolGetRange(symbol);
-      addressOffset = (unsigned long long) aAddress - range.location;
-    } else {
-      addressOffset = (unsigned long long)
-        aAddress - CSSymbolOwnerGetBaseAddress(owner);
-    }
-  }
-
-  snprintf(retval, MAXPATHLEN, "%s + 0x%llx",
-           addressName, addressOffset);
-  ReleaseSymbolicator();
-
-  return retval;
-}
-
-CSSymbolicatorRef
-nsCocoaDebugUtils::GetSymbolicatorRef()
-{
-  if (CSIsNull(sSymbolicator)) {
-    // 0x40e0000 is the value returned by
-    // uint32_t CSSymbolicatorGetFlagsForNListOnlyData(void).  We don't use
-    // this method directly because it doesn't exist on OS X 10.6.  Unless
-    // we limit ourselves to NList data, it will take too long to get a
-    // stack trace where Dwarf debugging info is available (about 15 seconds
-    // with Firefox).  This means we won't be able to get a CSSourceInfoRef,
-    // or line number information.  Oh well.
-    sSymbolicator =
-      CSSymbolicatorCreateWithPidFlagsAndNotification(getpid(),
-                                                      0x40e0000, 0);
-  }
-  // Retaining just after creation prevents crashes when calling symbolicator
-  // code (for example from PrintStackTrace()) as Firefox is quitting.  Not
-  // sure why.  Doing this may mean that we leak sSymbolicator on quitting
-  // (if we ever created it).  No particular harm in that, though.
-  return CSRetain(sSymbolicator);
-}
-
-void
-nsCocoaDebugUtils::ReleaseSymbolicator()
-{
-  if (!CSIsNull(sSymbolicator)) {
-    CSRelease(sSymbolicator);
-  }
-}
diff --git a/widget/cocoa/nsCocoaFeatures.h b/widget/cocoa/nsCocoaFeatures.h
deleted file mode 100644
index a9cab95d56..0000000000
--- a/widget/cocoa/nsCocoaFeatures.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsCocoaFeatures_h_
-#define nsCocoaFeatures_h_
-
-#include <stdint.h>
-
-/// Note that this class assumes we support the platform we are running on.
-/// For better or worse, if the version is unknown or less than what we
-/// support, we set it to the minimum supported version.  GetSystemVersion
-/// is the only call that returns the unadjusted values.
-class nsCocoaFeatures {
-public:
-  static int32_t macOSVersion();
-  static int32_t macOSVersionMajor();
-  static int32_t macOSVersionMinor();
-  static int32_t macOSVersionBugFix();
-  static bool OnYosemiteOrLater();
-  static bool OnElCapitanOrLater();
-  static bool OnSierraOrLater();
-  static bool OnHighSierraOrLater();
-  static bool OnMojaveOrLater();
-  static bool OnCatalinaOrLater();
-  static bool OnBigSurOrLater();
-
-  static bool IsAtLeastVersion(int32_t aMajor, int32_t aMinor, int32_t aBugFix=0);
-
-  // These are utilities that do not change or depend on the value of mOSXVersion
-  // and instead just encapsulate the encoding algorithm.  Note that GetVersion
-  // actually adjusts to the lowest supported OS, so it will always return
-  // a "supported" version.  GetSystemVersion does not make any modifications.
-  static void GetSystemVersion(int &aMajor, int &aMinor, int &aBugFix);
-  static int32_t GetVersion(int32_t aMajor, int32_t aMinor, int32_t aBugFix);
-  static int32_t ExtractMajorVersion(int32_t aVersion);
-  static int32_t ExtractMinorVersion(int32_t aVersion);
-  static int32_t ExtractBugFixVersion(int32_t aVersion);
-
-private:
-  static void InitializeVersionNumbers();
-
-  static int32_t mOSVersion;
-};
-#endif // nsCocoaFeatures_h_
diff --git a/widget/cocoa/nsCocoaFeatures.mm b/widget/cocoa/nsCocoaFeatures.mm
deleted file mode 100644
index e0fafb7d96..0000000000
--- a/widget/cocoa/nsCocoaFeatures.mm
+++ /dev/null
@@ -1,209 +0,0 @@
-/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-// This file makes some assumptions about the versions of macOS.
-// We are assuming that the major, minor and bugfix versions are each less than
-// 256.
-// There are MOZ_ASSERTs for that.
-
-// The formula for the version integer is (major << 16) + (minor << 8) + bugfix.
-
-#define MACOS_VERSION_MASK 0x00FFFFFF
-#define MACOS_MAJOR_VERSION_MASK 0x00FFFFFF
-#define MACOS_MINOR_VERSION_MASK 0x00FFFFFF
-#define MACOS_BUGFIX_VERSION_MASK 0x00FFFFFF
-#define MACOS_VERSION_10_0_HEX 0x000A0000
-#define MACOS_VERSION_10_7_HEX 0x000A0700
-#define MACOS_VERSION_10_8_HEX 0x000A0800
-#define MACOS_VERSION_10_9_HEX 0x000A0900
-#define MACOS_VERSION_10_10_HEX 0x000A0A00
-#define MACOS_VERSION_10_11_HEX 0x000A0B00
-#define MACOS_VERSION_10_12_HEX 0x000A0C00
-#define MACOS_VERSION_10_13_HEX 0x000A0D00
-#define MACOS_VERSION_10_14_HEX 0x000A0E00
-#define MACOS_VERSION_10_15_HEX 0x000A0F00
-#define MACOS_VERSION_10_16_HEX 0x000A1000
-#define MACOS_VERSION_11_0_HEX 0x000B0000
-
-#include "nsCocoaFeatures.h"
-#include "nsCocoaUtils.h"
-#include "nsDebug.h"
-#include "nsObjCExceptions.h"
-
-#import <Cocoa/Cocoa.h>
-
-int32_t nsCocoaFeatures::mOSVersion = 0;
-
-// This should not be called with unchecked aMajor, which should be >= 10.
-inline int32_t AssembleVersion(int32_t aMajor, int32_t aMinor, int32_t aBugFix)
-{
-  MOZ_ASSERT(aMajor >= 10);
-  return (aMajor << 16) + (aMinor << 8) + aBugFix;
-}
-
-int32_t nsCocoaFeatures::ExtractMajorVersion(int32_t aVersion)
-{
-  MOZ_ASSERT((aVersion & MACOS_VERSION_MASK) == aVersion);
-  return (aVersion & 0xFF0000) >> 16;
-}
-
-int32_t nsCocoaFeatures::ExtractMinorVersion(int32_t aVersion)
-{
-  MOZ_ASSERT((aVersion & MACOS_VERSION_MASK) == aVersion);
-  return (aVersion & 0xFF00) >> 8;
-}
-
-int32_t nsCocoaFeatures::ExtractBugFixVersion(int32_t aVersion)
-{
-  MOZ_ASSERT((aVersion & MACOS_VERSION_MASK) == aVersion);
-  return aVersion & 0xFF;
-}
-
-static int intAtStringIndex(NSArray *array, int index)
-{
-  return [(NSString*)[array objectAtIndex:index] integerValue];
-}
-
-void nsCocoaFeatures::GetSystemVersion(int &major, int &minor, int &bugfix)
-{
-    major = minor = bugfix = 0;
-
-    NSString* versionString = [[NSDictionary dictionaryWithContentsOfFile:
-                                @"/System/Library/CoreServices/SystemVersion.plist"] objectForKey:@"ProductVersion"];
-    NSArray* versions = [versionString componentsSeparatedByString:@"."];
-    NSUInteger count = [versions count];
-    if (count > 0) {
-        major = intAtStringIndex(versions, 0);
-        if (count > 1) {
-            minor = intAtStringIndex(versions, 1);
-            if (count > 2) {
-                bugfix = intAtStringIndex(versions, 2);
-            }
-        }
-    }
-}
-
-int32_t nsCocoaFeatures::GetVersion(int32_t aMajor, int32_t aMinor, int32_t aBugFix)
-{
-  int32_t macOSVersion;
-  if (aMajor < 10) {
-    aMajor = 10;
-    NS_ERROR("Couldn't determine macOS version, assuming 10.7");
-    macOSVersion = MACOS_VERSION_10_7_HEX;
-  } else if (aMajor == 10 && aMinor < 7) {
-    aMinor = 7;
-    NS_ERROR("macOS version too old, assuming 10.7");
-    macOSVersion = MACOS_VERSION_10_7_HEX;
-  } else {
-    MOZ_ASSERT(aMajor >= 10);
-    MOZ_ASSERT(aMajor < 256);
-    MOZ_ASSERT(aMinor >= 0);
-    MOZ_ASSERT(aMinor < 256);
-    MOZ_ASSERT(aBugFix >= 0);
-    MOZ_ASSERT(aBugFix < 256);
-    macOSVersion = AssembleVersion(aMajor, aMinor, aBugFix);
-  }
-  MOZ_ASSERT(aMajor == ExtractMajorVersion(macOSVersion));
-  MOZ_ASSERT(aMinor == ExtractMinorVersion(macOSVersion));
-  MOZ_ASSERT(aBugFix == ExtractBugFixVersion(macOSVersion));
-  return macOSVersion;
-}
-
-/*static*/ void
-nsCocoaFeatures::InitializeVersionNumbers()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  // Provide an autorelease pool to avoid leaking Cocoa objects,
-  // as this gets called before the main autorelease pool is in place.
-  nsAutoreleasePool localPool;
-
-  int major, minor, bugfix;
-  GetSystemVersion(major, minor, bugfix);
-  mOSVersion = GetVersion(major, minor, bugfix);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-/* static */ int32_t
-nsCocoaFeatures::macOSVersion()
-{
-  // Don't let this be called while we're first setting the value...
-  MOZ_ASSERT((mOSVersion & MACOS_VERSION_MASK) >= 0);
-  if (!mOSVersion) {
-    mOSVersion = -1;
-    InitializeVersionNumbers();
-  }
-  return mOSVersion;
-}
-
-/* static */ int32_t
-nsCocoaFeatures::macOSVersionMajor()
-{
-  return ExtractMajorVersion(macOSVersion());
-}
-
-/* static */ int32_t
-nsCocoaFeatures::macOSVersionMinor()
-{
-  return ExtractMinorVersion(macOSVersion());
-}
-
-/* static */ int32_t
-nsCocoaFeatures::macOSVersionBugFix()
-{
-  return ExtractBugFixVersion(macOSVersion());
-}
-
-/* static */ bool
-nsCocoaFeatures::OnYosemiteOrLater()
-{
-  return (macOSVersion() >= MACOS_VERSION_10_10_HEX);
-}
-
-/* static */ bool
-nsCocoaFeatures::OnElCapitanOrLater()
-{
-  return (macOSVersion() >= MACOS_VERSION_10_11_HEX);
-}
-
-/* static */ bool
-nsCocoaFeatures::OnSierraOrLater()
-{
-  return (macOSVersion() >= MACOS_VERSION_10_12_HEX);
-}
-
-/* static */ bool 
-nsCocoaFeatures::OnHighSierraOrLater() 
-{
-  return (macOSVersion() >= MACOS_VERSION_10_13_HEX);
-}
-
-/* static */ bool 
-nsCocoaFeatures::OnMojaveOrLater() 
-{
-  return (macOSVersion() >= MACOS_VERSION_10_14_HEX);
-}
-
-/* static */ bool 
-nsCocoaFeatures::OnCatalinaOrLater() 
-{
-  return (macOSVersion() >= MACOS_VERSION_10_15_HEX);
-}
-
-/* static */ bool
-nsCocoaFeatures::OnBigSurOrLater()
-{
-  // Account for the version being 10.16 (which occurs when the
-  // application is linked with an older SDK) or 11.0 on Big Sur.
-  return ((macOSVersion() >= MACOS_VERSION_10_16_HEX) ||
-          (macOSVersion() >= MACOS_VERSION_11_0_HEX));
-}
-
-/* static */ bool
-nsCocoaFeatures::IsAtLeastVersion(int32_t aMajor, int32_t aMinor, int32_t aBugFix)
-{
-    return macOSVersion() >= GetVersion(aMajor, aMinor, aBugFix);
-}
diff --git a/widget/cocoa/nsCocoaUtils.h b/widget/cocoa/nsCocoaUtils.h
deleted file mode 100644
index 139e76b4ad..0000000000
--- a/widget/cocoa/nsCocoaUtils.h
+++ /dev/null
@@ -1,389 +0,0 @@
-/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsCocoaUtils_h_
-#define nsCocoaUtils_h_
-
-#import <Cocoa/Cocoa.h>
-
-#include "nsRect.h"
-#include "imgIContainer.h"
-#include "npapi.h"
-#include "nsTArray.h"
-#include "Units.h"
-
-// This must be the last include:
-#include "nsObjCExceptions.h"
-
-#include "mozilla/EventForwards.h"
-
-// Declare the backingScaleFactor method that we want to call
-// on NSView/Window/Screen objects, if they recognize it.
-@interface NSObject (BackingScaleFactorCategory)
-- (CGFloat)backingScaleFactor;
-@end
-
-#if !defined(MAC_OS_X_VERSION_10_8) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_8
-enum {
-  NSEventPhaseMayBegin    = 0x1 << 5
-};
-#endif
-
-class nsIWidget;
-
-namespace mozilla {
-namespace gfx {
-class SourceSurface;
-} // namespace gfx
-} // namespace mozilla
-
-// Used to retain a Cocoa object for the remainder of a method's execution.
-class nsAutoRetainCocoaObject {
-public:
-explicit nsAutoRetainCocoaObject(id anObject)
-{
-  mObject = NS_OBJC_TRY_EXPR_ABORT([anObject retain]);
-}
-~nsAutoRetainCocoaObject()
-{
-  NS_OBJC_TRY_ABORT([mObject release]);
-}
-private:
-  id mObject;  // [STRONG]
-};
-
-// Provide a local autorelease pool for the remainder of a method's execution.
-class nsAutoreleasePool {
-public:
-  nsAutoreleasePool()
-  {
-    mLocalPool = [[NSAutoreleasePool alloc] init];
-  }
-  ~nsAutoreleasePool()
-  {
-    [mLocalPool release];
-  }
-private:
-  NSAutoreleasePool *mLocalPool;
-};
-
-@interface NSApplication (Undocumented)
-
-// Present in all versions of OS X from (at least) 10.2.8 through 10.5.
-- (BOOL)_isRunningModal;
-- (BOOL)_isRunningAppModal;
-
-// It's sometimes necessary to explicitly remove a window from the "window
-// cache" in order to deactivate it.  The "window cache" is an undocumented
-// subsystem, all of whose methods are included in the NSWindowCache category
-// of the NSApplication class (in header files generated using class-dump).
-// Present in all versions of OS X from (at least) 10.2.8 through 10.5.
-- (void)_removeWindowFromCache:(NSWindow *)aWindow;
-
-// Send an event to the current Cocoa app-modal session.  Present in all
-// versions of OS X from (at least) 10.2.8 through 10.5.
-- (void)_modalSession:(NSModalSession)aSession sendEvent:(NSEvent *)theEvent;
-
-@end
-
-struct KeyBindingsCommand
-{
-  SEL selector;
-  id data;
-};
-
-@interface NativeKeyBindingsRecorder : NSResponder
-{
-@private
-  nsTArray<KeyBindingsCommand>* mCommands;
-}
-
-- (void)startRecording:(nsTArray<KeyBindingsCommand>&)aCommands;
-
-- (void)doCommandBySelector:(SEL)aSelector;
-
-- (void)insertText:(id)aString;
-
-@end // NativeKeyBindingsRecorder
-
-class nsCocoaUtils
-{
-  typedef mozilla::gfx::SourceSurface SourceSurface;
-  typedef mozilla::LayoutDeviceIntPoint LayoutDeviceIntPoint;
-  typedef mozilla::LayoutDeviceIntRect LayoutDeviceIntRect;
-
-public:
-
-  // Get the backing scale factor from an object that supports this selector
-  // (NSView/Window/Screen, on 10.7 or later), returning 1.0 if not supported
-  static CGFloat
-  GetBackingScaleFactor(id aObject)
-  {
-    if (HiDPIEnabled() &&
-        [aObject respondsToSelector:@selector(backingScaleFactor)]) {
-      return [aObject backingScaleFactor];
-    }
-    return 1.0;
-  }
-
-  // Conversions between Cocoa points and device pixels, given the backing
-  // scale factor from a view/window/screen.
-  static int32_t
-  CocoaPointsToDevPixels(CGFloat aPts, CGFloat aBackingScale)
-  {
-    return NSToIntRound(aPts * aBackingScale);
-  }
-
-  static LayoutDeviceIntPoint
-  CocoaPointsToDevPixels(const NSPoint& aPt, CGFloat aBackingScale)
-  {
-    return LayoutDeviceIntPoint(NSToIntRound(aPt.x * aBackingScale),
-                                NSToIntRound(aPt.y * aBackingScale));
-  }
-
-  static LayoutDeviceIntPoint
-  CocoaPointsToDevPixelsRoundDown(const NSPoint& aPt, CGFloat aBackingScale)
-  {
-    return LayoutDeviceIntPoint(NSToIntFloor(aPt.x * aBackingScale),
-                                NSToIntFloor(aPt.y * aBackingScale));
-  }
-
-  static LayoutDeviceIntRect
-  CocoaPointsToDevPixels(const NSRect& aRect, CGFloat aBackingScale)
-  {
-    return LayoutDeviceIntRect(NSToIntRound(aRect.origin.x * aBackingScale),
-                               NSToIntRound(aRect.origin.y * aBackingScale),
-                               NSToIntRound(aRect.size.width * aBackingScale),
-                               NSToIntRound(aRect.size.height * aBackingScale));
-  }
-
-  static CGFloat
-  DevPixelsToCocoaPoints(int32_t aPixels, CGFloat aBackingScale)
-  {
-    return (CGFloat)aPixels / aBackingScale;
-  }
-
-  static NSPoint
-  DevPixelsToCocoaPoints(const mozilla::LayoutDeviceIntPoint& aPt,
-                         CGFloat aBackingScale)
-  {
-    return NSMakePoint((CGFloat)aPt.x / aBackingScale,
-                       (CGFloat)aPt.y / aBackingScale);
-  }
-
-  // Implements an NSPoint equivalent of -[NSWindow convertRectFromScreen:].
-  static NSPoint
-  ConvertPointFromScreen(NSWindow* aWindow, const NSPoint& aPt)
-  {
-    return [aWindow convertRectFromScreen:NSMakeRect(aPt.x, aPt.y, 0, 0)].origin;
-  }
-
-  // Implements an NSPoint equivalent of -[NSWindow convertRectToScreen:].
-  static NSPoint
-  ConvertPointToScreen(NSWindow* aWindow, const NSPoint& aPt)
-  {
-    return [aWindow convertRectToScreen:NSMakeRect(aPt.x, aPt.y, 0, 0)].origin;
-  }
-
-  static NSRect
-  DevPixelsToCocoaPoints(const LayoutDeviceIntRect& aRect,
-                         CGFloat aBackingScale)
-  {
-    return NSMakeRect((CGFloat)aRect.x / aBackingScale,
-                      (CGFloat)aRect.y / aBackingScale,
-                      (CGFloat)aRect.width / aBackingScale,
-                      (CGFloat)aRect.height / aBackingScale);
-  }
-
-  // Returns the given y coordinate, which must be in screen coordinates,
-  // flipped from Gecko to Cocoa or Cocoa to Gecko.
-  static float FlippedScreenY(float y);
-
-  // The following functions come in "DevPix" variants that work with
-  // backing-store (device pixel) coordinates, as well as the original
-  // versions that expect coordinates in Cocoa points/CSS pixels.
-  // The difference becomes important in HiDPI display modes, where Cocoa
-  // points and backing-store pixels are no longer 1:1.
-
-  // Gecko rects (nsRect) contain an origin (x,y) in a coordinate
-  // system with (0,0) in the top-left of the primary screen. Cocoa rects
-  // (NSRect) contain an origin (x,y) in a coordinate system with (0,0)
-  // in the bottom-left of the primary screen. Both nsRect and NSRect
-  // contain width/height info, with no difference in their use.
-  // This function does no scaling, so the Gecko coordinates are
-  // expected to be desktop pixels, which are equal to Cocoa points
-  // (by definition).
-  static NSRect GeckoRectToCocoaRect(const mozilla::DesktopIntRect &geckoRect);
-
-  // Converts aGeckoRect in dev pixels to points in Cocoa coordinates
-  static NSRect
-  GeckoRectToCocoaRectDevPix(const mozilla::LayoutDeviceIntRect &aGeckoRect,
-                             CGFloat aBackingScale);
-
-  // See explanation for geckoRectToCocoaRect, guess what this does...
-  static mozilla::DesktopIntRect CocoaRectToGeckoRect(const NSRect &cocoaRect);
-
-  static mozilla::LayoutDeviceIntRect CocoaRectToGeckoRectDevPix(
-    const NSRect& aCocoaRect, CGFloat aBackingScale);
-
-  // Gives the location for the event in screen coordinates. Do not call this
-  // unless the window the event was originally targeted at is still alive!
-  // anEvent may be nil -- in that case the current mouse location is returned.
-  static NSPoint ScreenLocationForEvent(NSEvent* anEvent);
-  
-  // Determines if an event happened over a window, whether or not the event
-  // is for the window. Does not take window z-order into account.
-  static BOOL IsEventOverWindow(NSEvent* anEvent, NSWindow* aWindow);
-
-  // Events are set up so that their coordinates refer to the window to which they
-  // were originally sent. If we reroute the event somewhere else, we'll have
-  // to get the window coordinates this way. Do not call this unless the window
-  // the event was originally targeted at is still alive!
-  static NSPoint EventLocationForWindow(NSEvent* anEvent, NSWindow* aWindow);
-
-  // Compatibility wrappers for the -[NSEvent phase], -[NSEvent momentumPhase],
-  // -[NSEvent hasPreciseScrollingDeltas] and -[NSEvent scrollingDeltaX/Y] APIs
-  // that became availaible starting with the 10.7 SDK.
-  // All of these can be removed once we drop support for 10.6.
-  static NSEventPhase EventPhase(NSEvent* aEvent);
-  static NSEventPhase EventMomentumPhase(NSEvent* aEvent);
-  static BOOL IsMomentumScrollEvent(NSEvent* aEvent);
-  static BOOL HasPreciseScrollingDeltas(NSEvent* aEvent);
-  static void GetScrollingDeltas(NSEvent* aEvent, CGFloat* aOutDeltaX, CGFloat* aOutDeltaY);
-  static BOOL EventHasPhaseInformation(NSEvent* aEvent);
-
-  // Hides the Menu bar and the Dock. Multiple hide/show requests can be nested.
-  static void HideOSChromeOnScreen(bool aShouldHide);
-
-  static nsIWidget* GetHiddenWindowWidget();
-
-  static void PrepareForNativeAppModalDialog();
-  static void CleanUpAfterNativeAppModalDialog();
-
-  // 3 utility functions to go from a frame of imgIContainer to CGImage and then to NSImage
-  // Convert imgIContainer -> CGImageRef, caller owns result
-  
-  /** Creates a <code>CGImageRef</code> from a frame contained in an <code>imgIContainer</code>.
-      Copies the pixel data from the indicated frame of the <code>imgIContainer</code> into a new <code>CGImageRef</code>.
-      The caller owns the <code>CGImageRef</code>. 
-      @param aFrame the frame to convert
-      @param aResult the resulting CGImageRef
-      @return NS_OK if the conversion worked, NS_ERROR_FAILURE otherwise
-   */
-  static nsresult CreateCGImageFromSurface(SourceSurface* aSurface,
-                                           CGImageRef* aResult);
-  
-  /** Creates a Cocoa <code>NSImage</code> from a <code>CGImageRef</code>.
-      Copies the pixel data from the <code>CGImageRef</code> into a new <code>NSImage</code>.
-      The caller owns the <code>NSImage</code>. 
-      @param aInputImage the image to convert
-      @param aResult the resulting NSImage
-      @return NS_OK if the conversion worked, NS_ERROR_FAILURE otherwise
-   */
-  static nsresult CreateNSImageFromCGImage(CGImageRef aInputImage, NSImage **aResult);
-
-  /** Creates a Cocoa <code>NSImage</code> from a frame of an <code>imgIContainer</code>.
-      Combines the two methods above. The caller owns the <code>NSImage</code>.
-      @param aImage the image to extract a frame from
-      @param aWhichFrame the frame to extract (see imgIContainer FRAME_*)
-      @param aResult the resulting NSImage
-      @param scaleFactor the desired scale factor of the NSImage (2 for a retina display)
-      @return NS_OK if the conversion worked, NS_ERROR_FAILURE otherwise
-   */  
-  static nsresult CreateNSImageFromImageContainer(imgIContainer *aImage, uint32_t aWhichFrame, NSImage **aResult, CGFloat scaleFactor);
-
-  /**
-   * Returns nsAString for aSrc.
-   */
-  static void GetStringForNSString(const NSString *aSrc, nsAString& aDist);
-
-  /**
-   * Makes NSString instance for aString.
-   */
-  static NSString* ToNSString(const nsAString& aString);
-
-  /**
-   * Returns NSRect for aGeckoRect.
-   * Just copies values between the two types; it does no coordinate-system
-   * conversion, so both rects must have the same coordinate origin/direction.
-   */
-  static void GeckoRectToNSRect(const nsIntRect& aGeckoRect,
-                                NSRect& aOutCocoaRect);
-
-  /**
-   * Returns Gecko rect for aCocoaRect.
-   * Just copies values between the two types; it does no coordinate-system
-   * conversion, so both rects must have the same coordinate origin/direction.
-   */
-  static void NSRectToGeckoRect(const NSRect& aCocoaRect,
-                                nsIntRect& aOutGeckoRect);
-
-  /**
-   * Makes NSEvent instance for aEventTytpe and aEvent.
-   */
-  static NSEvent* MakeNewCocoaEventWithType(NSEventType aEventType,
-                                            NSEvent *aEvent);
-
-  /**
-   * Initializes aNPCocoaEvent.
-   */
-  static void InitNPCocoaEvent(NPCocoaEvent* aNPCocoaEvent);
-
-  /**
-   * Initializes WidgetInputEvent for aNativeEvent or aModifiers.
-   */
-  static void InitInputEvent(mozilla::WidgetInputEvent &aInputEvent,
-                             NSEvent* aNativeEvent);
-
-  /**
-   * Converts the native modifiers from aNativeEvent into WidgetMouseEvent
-   * Modifiers. aNativeEvent can be null.
-   */
-  static mozilla::Modifiers ModifiersForEvent(NSEvent* aNativeEvent);
-
-  /**
-   * ConvertToCarbonModifier() returns carbon modifier flags for the cocoa
-   * modifier flags.
-   * NOTE: The result never includes right*Key.
-   */
-  static UInt32 ConvertToCarbonModifier(NSUInteger aCocoaModifier);
-
-  /**
-   * Whether to support HiDPI rendering. For testing purposes, to be removed
-   * once we're comfortable with the HiDPI behavior.
-   */
-  static bool HiDPIEnabled();
-
-  /**
-   * Keys can optionally be bound by system or user key bindings to one or more
-   * commands based on selectors. This collects any such commands in the
-   * provided array.
-   */
-  static void GetCommandsFromKeyEvent(NSEvent* aEvent,
-                                      nsTArray<KeyBindingsCommand>& aCommands);
-
-  /**
-   * Converts the string name of a Gecko key (like "VK_HOME") to the
-   * corresponding Cocoa Unicode character.
-   */
-  static uint32_t ConvertGeckoNameToMacCharCode(const nsAString& aKeyCodeName);
-
-  /**
-   * Converts a Gecko key code (like NS_VK_HOME) to the corresponding Cocoa
-   * Unicode character.
-   */
-  static uint32_t ConvertGeckoKeyCodeToMacCharCode(uint32_t aKeyCode);
-
-  /**
-   * Convert string with font attribute to NSMutableAttributedString
-   */
-  static NSMutableAttributedString* GetNSMutableAttributedString(
-           const nsAString& aText,
-           const nsTArray<mozilla::FontRange>& aFontRanges,
-           const bool aIsVertical,
-           const CGFloat aBackingScaleFactor);
-};
-
-#endif // nsCocoaUtils_h_
diff --git a/widget/cocoa/nsCocoaUtils.mm b/widget/cocoa/nsCocoaUtils.mm
deleted file mode 100644
index 3138245aa7..0000000000
--- a/widget/cocoa/nsCocoaUtils.mm
+++ /dev/null
@@ -1,1022 +0,0 @@
-/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include <cmath>
-
-#include "gfx2DGlue.h"
-#include "gfxPlatform.h"
-#include "gfxUtils.h"
-#include "ImageRegion.h"
-#include "nsCocoaUtils.h"
-#include "nsChildView.h"
-#include "nsMenuBarX.h"
-#include "nsCocoaWindow.h"
-#include "nsCOMPtr.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsIAppShellService.h"
-#include "nsIXULWindow.h"
-#include "nsIBaseWindow.h"
-#include "nsIServiceManager.h"
-#include "nsMenuUtilsX.h"
-#include "nsToolkit.h"
-#include "nsCRT.h"
-#include "SVGImageContext.h"
-#include "mozilla/gfx/2D.h"
-#include "mozilla/MiscEvents.h"
-#include "mozilla/Preferences.h"
-#include "mozilla/TextEvents.h"
-
-using namespace mozilla;
-using namespace mozilla::widget;
-
-using mozilla::gfx::BackendType;
-using mozilla::gfx::DataSourceSurface;
-using mozilla::gfx::DrawTarget;
-using mozilla::gfx::Factory;
-using mozilla::gfx::SamplingFilter;
-using mozilla::gfx::IntPoint;
-using mozilla::gfx::IntRect;
-using mozilla::gfx::IntSize;
-using mozilla::gfx::SurfaceFormat;
-using mozilla::gfx::SourceSurface;
-using mozilla::image::ImageRegion;
-using std::ceil;
-
-static float
-MenuBarScreenHeight()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  NSArray* allScreens = [NSScreen screens];
-  if ([allScreens count]) {
-    return [[allScreens objectAtIndex:0] frame].size.height;
-  }
-
-  return 0.0;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(0.0);
-}
-
-float
-nsCocoaUtils::FlippedScreenY(float y)
-{
-  return MenuBarScreenHeight() - y;
-}
-
-NSRect nsCocoaUtils::GeckoRectToCocoaRect(const DesktopIntRect &geckoRect)
-{
-  // We only need to change the Y coordinate by starting with the primary screen
-  // height and subtracting the gecko Y coordinate of the bottom of the rect.
-  return NSMakeRect(geckoRect.x,
-                    MenuBarScreenHeight() - geckoRect.YMost(),
-                    geckoRect.width,
-                    geckoRect.height);
-}
-
-NSRect
-nsCocoaUtils::GeckoRectToCocoaRectDevPix(const LayoutDeviceIntRect &aGeckoRect,
-                                         CGFloat aBackingScale)
-{
-  return NSMakeRect(aGeckoRect.x / aBackingScale,
-                    MenuBarScreenHeight() - aGeckoRect.YMost() / aBackingScale,
-                    aGeckoRect.width / aBackingScale,
-                    aGeckoRect.height / aBackingScale);
-}
-
-DesktopIntRect nsCocoaUtils::CocoaRectToGeckoRect(const NSRect &cocoaRect)
-{
-  // We only need to change the Y coordinate by starting with the primary screen
-  // height and subtracting both the cocoa y origin and the height of the
-  // cocoa rect.
-  DesktopIntRect rect;
-  rect.x = NSToIntRound(cocoaRect.origin.x);
-  rect.y = NSToIntRound(FlippedScreenY(cocoaRect.origin.y + cocoaRect.size.height));
-  rect.width = NSToIntRound(cocoaRect.origin.x + cocoaRect.size.width) - rect.x;
-  rect.height = NSToIntRound(FlippedScreenY(cocoaRect.origin.y)) - rect.y;
-  return rect;
-}
-
-LayoutDeviceIntRect nsCocoaUtils::CocoaRectToGeckoRectDevPix(
-  const NSRect& aCocoaRect, CGFloat aBackingScale)
-{
-  LayoutDeviceIntRect rect;
-  rect.x = NSToIntRound(aCocoaRect.origin.x * aBackingScale);
-  rect.y = NSToIntRound(FlippedScreenY(aCocoaRect.origin.y + aCocoaRect.size.height) * aBackingScale);
-  rect.width = NSToIntRound((aCocoaRect.origin.x + aCocoaRect.size.width) * aBackingScale) - rect.x;
-  rect.height = NSToIntRound(FlippedScreenY(aCocoaRect.origin.y) * aBackingScale) - rect.y;
-  return rect;
-}
-
-NSPoint nsCocoaUtils::ScreenLocationForEvent(NSEvent* anEvent)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  // Don't trust mouse locations of mouse move events, see bug 443178.
-  if (!anEvent || [anEvent type] == NSMouseMoved)
-    return [NSEvent mouseLocation];
-
-  // Pin momentum scroll events to the location of the last user-controlled
-  // scroll event.
-  if (IsMomentumScrollEvent(anEvent))
-    return ChildViewMouseTracker::sLastScrollEventScreenLocation;
-
-  return nsCocoaUtils::ConvertPointToScreen([anEvent window], [anEvent locationInWindow]);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NSMakePoint(0.0, 0.0));
-}
-
-BOOL nsCocoaUtils::IsEventOverWindow(NSEvent* anEvent, NSWindow* aWindow)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  return NSPointInRect(ScreenLocationForEvent(anEvent), [aWindow frame]);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NO);
-}
-
-NSPoint nsCocoaUtils::EventLocationForWindow(NSEvent* anEvent, NSWindow* aWindow)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  return nsCocoaUtils::ConvertPointFromScreen(aWindow, ScreenLocationForEvent(anEvent));
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NSMakePoint(0.0, 0.0));
-}
-
-@interface NSEvent (ScrollPhase)
-// 10.5 and 10.6
-- (long long)_scrollPhase;
-// 10.7 and above
-- (NSEventPhase)phase;
-- (NSEventPhase)momentumPhase;
-@end
-
-NSEventPhase nsCocoaUtils::EventPhase(NSEvent* aEvent)
-{
-  if ([aEvent respondsToSelector:@selector(phase)]) {
-    return [aEvent phase];
-  }
-  return NSEventPhaseNone;
-}
-
-NSEventPhase nsCocoaUtils::EventMomentumPhase(NSEvent* aEvent)
-{
-  if ([aEvent respondsToSelector:@selector(momentumPhase)]) {
-    return [aEvent momentumPhase];
-  }
-  if ([aEvent respondsToSelector:@selector(_scrollPhase)]) {
-    switch ([aEvent _scrollPhase]) {
-      case 1: return NSEventPhaseBegan;
-      case 2: return NSEventPhaseChanged;
-      case 3: return NSEventPhaseEnded;
-      default: return NSEventPhaseNone;
-    }
-  }
-  return NSEventPhaseNone;
-}
-
-BOOL nsCocoaUtils::IsMomentumScrollEvent(NSEvent* aEvent)
-{
-  return [aEvent type] == NSScrollWheel &&
-    EventMomentumPhase(aEvent) != NSEventPhaseNone;
-}
-
-@interface NSEvent (HasPreciseScrollingDeltas)
-// 10.7 and above
-- (BOOL)hasPreciseScrollingDeltas;
-// For 10.6 and below, see the comment in nsChildView.h about _eventRef
-- (EventRef)_eventRef;
-@end
-
-BOOL nsCocoaUtils::HasPreciseScrollingDeltas(NSEvent* aEvent)
-{
-  if ([aEvent respondsToSelector:@selector(hasPreciseScrollingDeltas)]) {
-    return [aEvent hasPreciseScrollingDeltas];
-  }
-
-  // For events that don't contain pixel scrolling information, the event
-  // kind of their underlaying carbon event is kEventMouseWheelMoved instead
-  // of kEventMouseScroll.
-  EventRef carbonEvent = [aEvent _eventRef];
-  return carbonEvent && ::GetEventKind(carbonEvent) == kEventMouseScroll;
-}
-
-@interface NSEvent (ScrollingDeltas)
-// 10.6 and below
-- (CGFloat)deviceDeltaX;
-- (CGFloat)deviceDeltaY;
-// 10.7 and above
-- (CGFloat)scrollingDeltaX;
-- (CGFloat)scrollingDeltaY;
-@end
-
-void nsCocoaUtils::GetScrollingDeltas(NSEvent* aEvent, CGFloat* aOutDeltaX, CGFloat* aOutDeltaY)
-{
-  if ([aEvent respondsToSelector:@selector(scrollingDeltaX)]) {
-    *aOutDeltaX = [aEvent scrollingDeltaX];
-    *aOutDeltaY = [aEvent scrollingDeltaY];
-    return;
-  }
-  if ([aEvent respondsToSelector:@selector(deviceDeltaX)] &&
-      HasPreciseScrollingDeltas(aEvent)) {
-    // Calling deviceDeltaX/Y on those events that do not contain pixel
-    // scrolling information triggers a Cocoa assertion and an
-    // Objective-C NSInternalInconsistencyException.
-    *aOutDeltaX = [aEvent deviceDeltaX];
-    *aOutDeltaY = [aEvent deviceDeltaY];
-    return;
-  }
-
-  // This is only hit pre-10.7 when we are called on a scroll event that does
-  // not contain pixel scrolling information.
-  CGFloat lineDeltaPixels = 12;
-  *aOutDeltaX = [aEvent deltaX] * lineDeltaPixels;
-  *aOutDeltaY = [aEvent deltaY] * lineDeltaPixels;
-}
-
-BOOL nsCocoaUtils::EventHasPhaseInformation(NSEvent* aEvent)
-{
-  if (![aEvent respondsToSelector:@selector(phase)]) {
-    return NO;
-  }
-  return EventPhase(aEvent) != NSEventPhaseNone ||
-         EventMomentumPhase(aEvent) != NSEventPhaseNone;
-}
-
-void nsCocoaUtils::HideOSChromeOnScreen(bool aShouldHide)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  // Keep track of how many hiding requests have been made, so that they can
-  // be nested.
-  static int sHiddenCount = 0;
-
-  sHiddenCount += aShouldHide ? 1 : -1;
-  NS_ASSERTION(sHiddenCount >= 0, "Unbalanced HideMenuAndDockForWindow calls");
-
-  NSApplicationPresentationOptions options =
-    sHiddenCount <= 0 ? NSApplicationPresentationDefault :
-    NSApplicationPresentationHideDock | NSApplicationPresentationHideMenuBar;
-  [NSApp setPresentationOptions:options];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-#define NS_APPSHELLSERVICE_CONTRACTID "@mozilla.org/appshell/appShellService;1"
-nsIWidget* nsCocoaUtils::GetHiddenWindowWidget()
-{
-  nsCOMPtr<nsIAppShellService> appShell(do_GetService(NS_APPSHELLSERVICE_CONTRACTID));
-  if (!appShell) {
-    NS_WARNING("Couldn't get AppShellService in order to get hidden window ref");
-    return nullptr;
-  }
-  
-  nsCOMPtr<nsIXULWindow> hiddenWindow;
-  appShell->GetHiddenWindow(getter_AddRefs(hiddenWindow));
-  if (!hiddenWindow) {
-    // Don't warn, this happens during shutdown, bug 358607.
-    return nullptr;
-  }
-  
-  nsCOMPtr<nsIBaseWindow> baseHiddenWindow;
-  baseHiddenWindow = do_GetInterface(hiddenWindow);
-  if (!baseHiddenWindow) {
-    NS_WARNING("Couldn't get nsIBaseWindow from hidden window (nsIXULWindow)");
-    return nullptr;
-  }
-  
-  nsCOMPtr<nsIWidget> hiddenWindowWidget;
-  if (NS_FAILED(baseHiddenWindow->GetMainWidget(getter_AddRefs(hiddenWindowWidget)))) {
-    NS_WARNING("Couldn't get nsIWidget from hidden window (nsIBaseWindow)");
-    return nullptr;
-  }
-  
-  return hiddenWindowWidget;
-}
-
-void nsCocoaUtils::PrepareForNativeAppModalDialog()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  // Don't do anything if this is embedding. We'll assume that if there is no hidden
-  // window we shouldn't do anything, and that should cover the embedding case.
-  nsMenuBarX* hiddenWindowMenuBar = nsMenuUtilsX::GetHiddenWindowMenuBar();
-  if (!hiddenWindowMenuBar)
-    return;
-
-  // First put up the hidden window menu bar so that app menu event handling is correct.
-  hiddenWindowMenuBar->Paint();
-
-  NSMenu* mainMenu = [NSApp mainMenu];
-  NS_ASSERTION([mainMenu numberOfItems] > 0, "Main menu does not have any items, something is terribly wrong!");
-  
-  // Create new menu bar for use with modal dialog
-  NSMenu* newMenuBar = [[NSMenu alloc] initWithTitle:@""];
-  
-  // Swap in our app menu. Note that the event target is whatever window is up when
-  // the app modal dialog goes up.
-  NSMenuItem* firstMenuItem = [[mainMenu itemAtIndex:0] retain];
-  [mainMenu removeItemAtIndex:0];
-  [newMenuBar insertItem:firstMenuItem atIndex:0];
-  [firstMenuItem release];
-  
-  // Add standard edit menu
-  [newMenuBar addItem:nsMenuUtilsX::GetStandardEditMenuItem()];
-  
-  // Show the new menu bar
-  [NSApp setMainMenu:newMenuBar];
-  [newMenuBar release];
-  
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void nsCocoaUtils::CleanUpAfterNativeAppModalDialog()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  // Don't do anything if this is embedding. We'll assume that if there is no hidden
-  // window we shouldn't do anything, and that should cover the embedding case.
-  nsMenuBarX* hiddenWindowMenuBar = nsMenuUtilsX::GetHiddenWindowMenuBar();
-  if (!hiddenWindowMenuBar)
-    return;
-
-  NSWindow* mainWindow = [NSApp mainWindow];
-  if (!mainWindow)
-    hiddenWindowMenuBar->Paint();
-  else
-    [WindowDelegate paintMenubarForWindow:mainWindow];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void data_ss_release_callback(void *aDataSourceSurface,
-                              const void *data,
-                              size_t size)
-{
-  if (aDataSourceSurface) {
-    static_cast<DataSourceSurface*>(aDataSourceSurface)->Unmap();
-    static_cast<DataSourceSurface*>(aDataSourceSurface)->Release();
-  }
-}
-
-nsresult nsCocoaUtils::CreateCGImageFromSurface(SourceSurface* aSurface,
-                                                CGImageRef* aResult)
-{
-  RefPtr<DataSourceSurface> dataSurface;
-
-  if (aSurface->GetFormat() ==  SurfaceFormat::B8G8R8A8) {
-    dataSurface = aSurface->GetDataSurface();
-  } else {
-    // CGImageCreate only supports 16- and 32-bit bit-depth
-    // Convert format to SurfaceFormat::B8G8R8A8
-    dataSurface = gfxUtils::
-      CopySurfaceToDataSourceSurfaceWithFormat(aSurface,
-                                               SurfaceFormat::B8G8R8A8);
-  }
-
-  NS_ENSURE_TRUE(dataSurface, NS_ERROR_FAILURE);
-
-  int32_t width = dataSurface->GetSize().width;
-  int32_t height = dataSurface->GetSize().height;
-  if (height < 1 || width < 1) {
-    return NS_ERROR_FAILURE;
-  }
-
-  DataSourceSurface::MappedSurface map;
-  if (!dataSurface->Map(DataSourceSurface::MapType::READ, &map)) {
-    return NS_ERROR_FAILURE;
-  }
-  // The Unmap() call happens in data_ss_release_callback
-
-  // Create a CGImageRef with the bits from the image, taking into account
-  // the alpha ordering and endianness of the machine so we don't have to
-  // touch the bits ourselves.
-  CGDataProviderRef dataProvider = ::CGDataProviderCreateWithData(dataSurface.forget().take(),
-                                                                  map.mData,
-                                                                  map.mStride * height,
-                                                                  data_ss_release_callback);
-  CGColorSpaceRef colorSpace = ::CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
-  *aResult = ::CGImageCreate(width,
-                             height,
-                             8,
-                             32,
-                             map.mStride,
-                             colorSpace,
-                             kCGBitmapByteOrder32Host | kCGImageAlphaPremultipliedFirst,
-                             dataProvider,
-                             NULL,
-                             0,
-                             kCGRenderingIntentDefault);
-  ::CGColorSpaceRelease(colorSpace);
-  ::CGDataProviderRelease(dataProvider);
-  return *aResult ? NS_OK : NS_ERROR_FAILURE;
-}
-
-nsresult nsCocoaUtils::CreateNSImageFromCGImage(CGImageRef aInputImage, NSImage **aResult)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  // Be very careful when creating the NSImage that the backing NSImageRep is
-  // exactly 1:1 with the input image. On a retina display, both [NSImage
-  // lockFocus] and [NSImage initWithCGImage:size:] will create an image with a
-  // 2x backing NSImageRep. This prevents NSCursor from recognizing a retina
-  // cursor, which only occurs if pixelsWide and pixelsHigh are exactly 2x the
-  // size of the NSImage.
-  //
-  // For example, if a 32x32 SVG cursor is rendered on a retina display, then
-  // aInputImage will be 64x64. The resulting NSImage will be scaled back down
-  // to 32x32 so it stays the correct size on the screen by changing its size
-  // (resizing a NSImage only scales the image and doesn't resample the data).
-  // If aInputImage is converted using [NSImage initWithCGImage:size:] then the
-  // bitmap will be 128x128 and NSCursor won't recognize a retina cursor, since
-  // it will expect a 64x64 bitmap.
-
-  int32_t width = ::CGImageGetWidth(aInputImage);
-  int32_t height = ::CGImageGetHeight(aInputImage);
-  NSRect imageRect = ::NSMakeRect(0.0, 0.0, width, height);
-
-  NSBitmapImageRep *offscreenRep = [[NSBitmapImageRep alloc]
-    initWithBitmapDataPlanes:NULL
-    pixelsWide:width
-    pixelsHigh:height
-    bitsPerSample:8
-    samplesPerPixel:4
-    hasAlpha:YES
-    isPlanar:NO
-    colorSpaceName:NSDeviceRGBColorSpace
-    bitmapFormat:NSAlphaFirstBitmapFormat
-    bytesPerRow:0
-    bitsPerPixel:0];
-
-  NSGraphicsContext *context = [NSGraphicsContext graphicsContextWithBitmapImageRep:offscreenRep];
-  [NSGraphicsContext saveGraphicsState];
-  [NSGraphicsContext setCurrentContext:context];
-
-  // Get the Quartz context and draw.
-  CGContextRef imageContext = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
-  ::CGContextDrawImage(imageContext, *(CGRect*)&imageRect, aInputImage);
-
-  [NSGraphicsContext restoreGraphicsState];
-
-  *aResult = [[NSImage alloc] initWithSize:NSMakeSize(width, height)];
-  [*aResult addRepresentation:offscreenRep];
-  [offscreenRep release];
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-nsresult nsCocoaUtils::CreateNSImageFromImageContainer(imgIContainer *aImage, uint32_t aWhichFrame, NSImage **aResult, CGFloat scaleFactor)
-{
-  RefPtr<SourceSurface> surface;
-  int32_t width = 0, height = 0;
-  aImage->GetWidth(&width);
-  aImage->GetHeight(&height);
-
-  // Render a vector image at the correct resolution on a retina display
-  if (aImage->GetType() == imgIContainer::TYPE_VECTOR && scaleFactor != 1.0f) {
-    IntSize scaledSize = IntSize::Ceil(width * scaleFactor, height * scaleFactor);
-
-    RefPtr<DrawTarget> drawTarget = gfxPlatform::GetPlatform()->
-      CreateOffscreenContentDrawTarget(scaledSize, SurfaceFormat::B8G8R8A8);
-    if (!drawTarget || !drawTarget->IsValid()) {
-      NS_ERROR("Failed to create valid DrawTarget");
-      return NS_ERROR_FAILURE;
-    }
-
-    RefPtr<gfxContext> context = gfxContext::CreateOrNull(drawTarget);
-    MOZ_ASSERT(context);
-
-    mozilla::image::DrawResult res =
-      aImage->Draw(context, scaledSize, ImageRegion::Create(scaledSize),
-                   aWhichFrame, SamplingFilter::POINT,
-                   /* no SVGImageContext */ Nothing(),
-                   imgIContainer::FLAG_SYNC_DECODE);
-
-    if (res != mozilla::image::DrawResult::SUCCESS) {
-      return NS_ERROR_FAILURE;
-    }
-
-    surface = drawTarget->Snapshot();
-  } else {
-    surface = aImage->GetFrame(aWhichFrame, imgIContainer::FLAG_SYNC_DECODE);
-  }
-
-  NS_ENSURE_TRUE(surface, NS_ERROR_FAILURE);
-
-  CGImageRef imageRef = NULL;
-  nsresult rv = nsCocoaUtils::CreateCGImageFromSurface(surface, &imageRef);
-  if (NS_FAILED(rv) || !imageRef) {
-    return NS_ERROR_FAILURE;
-  }
-
-  rv = nsCocoaUtils::CreateNSImageFromCGImage(imageRef, aResult);
-  if (NS_FAILED(rv) || !aResult) {
-    return NS_ERROR_FAILURE;
-  }
-  ::CGImageRelease(imageRef);
-
-  // Ensure the image will be rendered the correct size on a retina display
-  NSSize size = NSMakeSize(width, height);
-  [*aResult setSize:size];
-  [[[*aResult representations] objectAtIndex:0] setSize:size];
-  return NS_OK;
-}
-
-// static
-void
-nsCocoaUtils::GetStringForNSString(const NSString *aSrc, nsAString& aDist)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!aSrc) {
-    aDist.Truncate();
-    return;
-  }
-
-  aDist.SetLength([aSrc length]);
-  [aSrc getCharacters: reinterpret_cast<unichar*>(aDist.BeginWriting())];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-// static
-NSString*
-nsCocoaUtils::ToNSString(const nsAString& aString)
-{
-  if (aString.IsEmpty()) {
-    return [NSString string];
-  }
-  return [NSString stringWithCharacters:reinterpret_cast<const unichar*>(aString.BeginReading())
-                                 length:aString.Length()];
-}
-
-// static
-void
-nsCocoaUtils::GeckoRectToNSRect(const nsIntRect& aGeckoRect,
-                                NSRect& aOutCocoaRect)
-{
-  aOutCocoaRect.origin.x = aGeckoRect.x;
-  aOutCocoaRect.origin.y = aGeckoRect.y;
-  aOutCocoaRect.size.width = aGeckoRect.width;
-  aOutCocoaRect.size.height = aGeckoRect.height;
-}
-
-// static
-void
-nsCocoaUtils::NSRectToGeckoRect(const NSRect& aCocoaRect,
-                                nsIntRect& aOutGeckoRect)
-{
-  aOutGeckoRect.x = NSToIntRound(aCocoaRect.origin.x);
-  aOutGeckoRect.y = NSToIntRound(aCocoaRect.origin.y);
-  aOutGeckoRect.width = NSToIntRound(aCocoaRect.origin.x + aCocoaRect.size.width) - aOutGeckoRect.x;
-  aOutGeckoRect.height = NSToIntRound(aCocoaRect.origin.y + aCocoaRect.size.height) - aOutGeckoRect.y;
-}
-
-// static
-NSEvent*
-nsCocoaUtils::MakeNewCocoaEventWithType(NSEventType aEventType, NSEvent *aEvent)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  NSEvent* newEvent =
-    [NSEvent     keyEventWithType:aEventType
-                         location:[aEvent locationInWindow] 
-                    modifierFlags:[aEvent modifierFlags]
-                        timestamp:[aEvent timestamp]
-                     windowNumber:[aEvent windowNumber]
-                          context:[aEvent context]
-                       characters:[aEvent characters]
-      charactersIgnoringModifiers:[aEvent charactersIgnoringModifiers]
-                        isARepeat:[aEvent isARepeat]
-                          keyCode:[aEvent keyCode]];
-  return newEvent;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-// static
-void
-nsCocoaUtils::InitNPCocoaEvent(NPCocoaEvent* aNPCocoaEvent)
-{
-  memset(aNPCocoaEvent, 0, sizeof(NPCocoaEvent));
-}
-
-// static
-void
-nsCocoaUtils::InitInputEvent(WidgetInputEvent& aInputEvent,
-                             NSEvent* aNativeEvent)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  aInputEvent.mModifiers = ModifiersForEvent(aNativeEvent);
-  aInputEvent.mTime = PR_IntervalNow();
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-// static
-Modifiers
-nsCocoaUtils::ModifiersForEvent(NSEvent* aNativeEvent)
-{
-  NSUInteger modifiers =
-    aNativeEvent ? [aNativeEvent modifierFlags] : [NSEvent modifierFlags];
-  Modifiers result = 0;
-  if (modifiers & NSShiftKeyMask) {
-    result |= MODIFIER_SHIFT;
-  }
-  if (modifiers & NSControlKeyMask) {
-    result |= MODIFIER_CONTROL;
-  }
-  if (modifiers & NSAlternateKeyMask) {
-    result |= MODIFIER_ALT;
-    // Mac's option key is similar to other platforms' AltGr key.
-    // Let's set AltGr flag when option key is pressed for consistency with
-    // other platforms.
-    result |= MODIFIER_ALTGRAPH;
-  }
-  if (modifiers & NSCommandKeyMask) {
-    result |= MODIFIER_META;
-  }
-
-  if (modifiers & NSAlphaShiftKeyMask) {
-    result |= MODIFIER_CAPSLOCK;
-  }
-  // Mac doesn't have NumLock key.  We can assume that NumLock is always locked
-  // if user is using a keyboard which has numpad.  Otherwise, if user is using
-  // a keyboard which doesn't have numpad, e.g., MacBook's keyboard, we can
-  // assume that NumLock is always unlocked.
-  // Unfortunately, we cannot know whether current keyboard has numpad or not.
-  // We should notify locked state only when keys in numpad are pressed.
-  // By this, web applications may not be confused by unexpected numpad key's
-  // key event with unlocked state.
-  if (modifiers & NSNumericPadKeyMask) {
-    result |= MODIFIER_NUMLOCK;
-  }
-
-  // Be aware, NSFunctionKeyMask is included when arrow keys, home key or some
-  // other keys are pressed. We cannot check whether 'fn' key is pressed or
-  // not by the flag.
-
-  return result;
-}
-
-// static
-UInt32
-nsCocoaUtils::ConvertToCarbonModifier(NSUInteger aCocoaModifier)
-{
-  UInt32 carbonModifier = 0;
-  if (aCocoaModifier & NSAlphaShiftKeyMask) {
-    carbonModifier |= alphaLock;
-  }
-  if (aCocoaModifier & NSControlKeyMask) {
-    carbonModifier |= controlKey;
-  }
-  if (aCocoaModifier & NSAlternateKeyMask) {
-    carbonModifier |= optionKey;
-  }
-  if (aCocoaModifier & NSShiftKeyMask) {
-    carbonModifier |= shiftKey;
-  }
-  if (aCocoaModifier & NSCommandKeyMask) {
-    carbonModifier |= cmdKey;
-  }
-  if (aCocoaModifier & NSNumericPadKeyMask) {
-    carbonModifier |= kEventKeyModifierNumLockMask;
-  }
-  if (aCocoaModifier & NSFunctionKeyMask) {
-    carbonModifier |= kEventKeyModifierFnMask;
-  }
-  return carbonModifier;
-}
-
-// While HiDPI support is not 100% complete and tested, we'll have a pref
-// to allow it to be turned off in case of problems (or for testing purposes).
-
-// gfx.hidpi.enabled is an integer with the meaning:
-//    <= 0 : HiDPI support is disabled
-//       1 : HiDPI enabled provided all screens have the same backing resolution
-//     > 1 : HiDPI enabled even if there are a mixture of screen modes
-
-// All the following code is to be removed once HiDPI work is more complete.
-
-static bool sHiDPIEnabled = false;
-static bool sHiDPIPrefInitialized = false;
-
-// static
-bool
-nsCocoaUtils::HiDPIEnabled()
-{
-  if (!sHiDPIPrefInitialized) {
-    sHiDPIPrefInitialized = true;
-
-    int prefSetting = Preferences::GetInt("gfx.hidpi.enabled", 1);
-    if (prefSetting <= 0) {
-      return false;
-    }
-
-    // prefSetting is at least 1, need to check attached screens...
-
-    int scaleFactors = 0; // used as a bitset to track the screen types found
-    NSEnumerator *screenEnum = [[NSScreen screens] objectEnumerator];
-    while (NSScreen *screen = [screenEnum nextObject]) {
-      NSDictionary *desc = [screen deviceDescription];
-      if ([desc objectForKey:NSDeviceIsScreen] == nil) {
-        continue;
-      }
-      CGFloat scale =
-        [screen respondsToSelector:@selector(backingScaleFactor)] ?
-          [screen backingScaleFactor] : 1.0;
-      // Currently, we only care about differentiating "1.0" and "2.0",
-      // so we set one of the two low bits to record which.
-      if (scale > 1.0) {
-        scaleFactors |= 2;
-      } else {
-        scaleFactors |= 1;
-      }
-    }
-
-    // Now scaleFactors will be:
-    //   0 if no screens (supporting backingScaleFactor) found
-    //   1 if only lo-DPI screens
-    //   2 if only hi-DPI screens
-    //   3 if both lo- and hi-DPI screens
-    // We'll enable HiDPI support if there's only a single screen type,
-    // OR if the pref setting is explicitly greater than 1.
-    sHiDPIEnabled = (scaleFactors <= 2) || (prefSetting > 1);
-  }
-
-  return sHiDPIEnabled;
-}
-
-void
-nsCocoaUtils::GetCommandsFromKeyEvent(NSEvent* aEvent,
-                                      nsTArray<KeyBindingsCommand>& aCommands)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  MOZ_ASSERT(aEvent);
-
-  static NativeKeyBindingsRecorder* sNativeKeyBindingsRecorder;
-  if (!sNativeKeyBindingsRecorder) {
-    sNativeKeyBindingsRecorder = [NativeKeyBindingsRecorder new];
-  }
-
-  [sNativeKeyBindingsRecorder startRecording:aCommands];
-
-  // This will trigger 0 - N calls to doCommandBySelector: and insertText:
-  [sNativeKeyBindingsRecorder
-    interpretKeyEvents:[NSArray arrayWithObject:aEvent]];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-@implementation NativeKeyBindingsRecorder
-
-- (void)startRecording:(nsTArray<KeyBindingsCommand>&)aCommands
-{
-  mCommands = &aCommands;
-  mCommands->Clear();
-}
-
-- (void)doCommandBySelector:(SEL)aSelector
-{
-  KeyBindingsCommand command = {
-    aSelector,
-    nil
-  };
-
-  mCommands->AppendElement(command);
-}
-
-- (void)insertText:(id)aString
-{
-  KeyBindingsCommand command = {
-    @selector(insertText:),
-    aString
-  };
-
-  mCommands->AppendElement(command);
-}
-
-@end // NativeKeyBindingsRecorder
-
-struct KeyConversionData
-{
-  const char* str;
-  size_t strLength;
-  uint32_t geckoKeyCode;
-  uint32_t charCode;
-};
-
-static const KeyConversionData gKeyConversions[] = {
-
-#define KEYCODE_ENTRY(aStr, aCode) \
-  {#aStr, sizeof(#aStr) - 1, NS_##aStr, aCode}
-
-// Some keycodes may have different name in nsIDOMKeyEvent from its key name.
-#define KEYCODE_ENTRY2(aStr, aNSName, aCode) \
-  {#aStr, sizeof(#aStr) - 1, NS_##aNSName, aCode}
-
-  KEYCODE_ENTRY(VK_CANCEL, 0x001B),
-  KEYCODE_ENTRY(VK_DELETE, NSDeleteFunctionKey),
-  KEYCODE_ENTRY(VK_BACK, NSBackspaceCharacter),
-  KEYCODE_ENTRY2(VK_BACK_SPACE, VK_BACK, NSBackspaceCharacter),
-  KEYCODE_ENTRY(VK_TAB, NSTabCharacter),
-  KEYCODE_ENTRY(VK_CLEAR, NSClearLineFunctionKey),
-  KEYCODE_ENTRY(VK_RETURN, NSEnterCharacter),
-  KEYCODE_ENTRY(VK_SHIFT, 0),
-  KEYCODE_ENTRY(VK_CONTROL, 0),
-  KEYCODE_ENTRY(VK_ALT, 0),
-  KEYCODE_ENTRY(VK_PAUSE, NSPauseFunctionKey),
-  KEYCODE_ENTRY(VK_CAPS_LOCK, 0),
-  KEYCODE_ENTRY(VK_ESCAPE, 0),
-  KEYCODE_ENTRY(VK_SPACE, ' '),
-  KEYCODE_ENTRY(VK_PAGE_UP, NSPageUpFunctionKey),
-  KEYCODE_ENTRY(VK_PAGE_DOWN, NSPageDownFunctionKey),
-  KEYCODE_ENTRY(VK_END, NSEndFunctionKey),
-  KEYCODE_ENTRY(VK_HOME, NSHomeFunctionKey),
-  KEYCODE_ENTRY(VK_LEFT, NSLeftArrowFunctionKey),
-  KEYCODE_ENTRY(VK_UP, NSUpArrowFunctionKey),
-  KEYCODE_ENTRY(VK_RIGHT, NSRightArrowFunctionKey),
-  KEYCODE_ENTRY(VK_DOWN, NSDownArrowFunctionKey),
-  KEYCODE_ENTRY(VK_PRINTSCREEN, NSPrintScreenFunctionKey),
-  KEYCODE_ENTRY(VK_INSERT, NSInsertFunctionKey),
-  KEYCODE_ENTRY(VK_HELP, NSHelpFunctionKey),
-  KEYCODE_ENTRY(VK_0, '0'),
-  KEYCODE_ENTRY(VK_1, '1'),
-  KEYCODE_ENTRY(VK_2, '2'),
-  KEYCODE_ENTRY(VK_3, '3'),
-  KEYCODE_ENTRY(VK_4, '4'),
-  KEYCODE_ENTRY(VK_5, '5'),
-  KEYCODE_ENTRY(VK_6, '6'),
-  KEYCODE_ENTRY(VK_7, '7'),
-  KEYCODE_ENTRY(VK_8, '8'),
-  KEYCODE_ENTRY(VK_9, '9'),
-  KEYCODE_ENTRY(VK_SEMICOLON, ':'),
-  KEYCODE_ENTRY(VK_EQUALS, '='),
-  KEYCODE_ENTRY(VK_A, 'A'),
-  KEYCODE_ENTRY(VK_B, 'B'),
-  KEYCODE_ENTRY(VK_C, 'C'),
-  KEYCODE_ENTRY(VK_D, 'D'),
-  KEYCODE_ENTRY(VK_E, 'E'),
-  KEYCODE_ENTRY(VK_F, 'F'),
-  KEYCODE_ENTRY(VK_G, 'G'),
-  KEYCODE_ENTRY(VK_H, 'H'),
-  KEYCODE_ENTRY(VK_I, 'I'),
-  KEYCODE_ENTRY(VK_J, 'J'),
-  KEYCODE_ENTRY(VK_K, 'K'),
-  KEYCODE_ENTRY(VK_L, 'L'),
-  KEYCODE_ENTRY(VK_M, 'M'),
-  KEYCODE_ENTRY(VK_N, 'N'),
-  KEYCODE_ENTRY(VK_O, 'O'),
-  KEYCODE_ENTRY(VK_P, 'P'),
-  KEYCODE_ENTRY(VK_Q, 'Q'),
-  KEYCODE_ENTRY(VK_R, 'R'),
-  KEYCODE_ENTRY(VK_S, 'S'),
-  KEYCODE_ENTRY(VK_T, 'T'),
-  KEYCODE_ENTRY(VK_U, 'U'),
-  KEYCODE_ENTRY(VK_V, 'V'),
-  KEYCODE_ENTRY(VK_W, 'W'),
-  KEYCODE_ENTRY(VK_X, 'X'),
-  KEYCODE_ENTRY(VK_Y, 'Y'),
-  KEYCODE_ENTRY(VK_Z, 'Z'),
-  KEYCODE_ENTRY(VK_CONTEXT_MENU, NSMenuFunctionKey),
-  KEYCODE_ENTRY(VK_NUMPAD0, '0'),
-  KEYCODE_ENTRY(VK_NUMPAD1, '1'),
-  KEYCODE_ENTRY(VK_NUMPAD2, '2'),
-  KEYCODE_ENTRY(VK_NUMPAD3, '3'),
-  KEYCODE_ENTRY(VK_NUMPAD4, '4'),
-  KEYCODE_ENTRY(VK_NUMPAD5, '5'),
-  KEYCODE_ENTRY(VK_NUMPAD6, '6'),
-  KEYCODE_ENTRY(VK_NUMPAD7, '7'),
-  KEYCODE_ENTRY(VK_NUMPAD8, '8'),
-  KEYCODE_ENTRY(VK_NUMPAD9, '9'),
-  KEYCODE_ENTRY(VK_MULTIPLY, '*'),
-  KEYCODE_ENTRY(VK_ADD, '+'),
-  KEYCODE_ENTRY(VK_SEPARATOR, 0),
-  KEYCODE_ENTRY(VK_SUBTRACT, '-'),
-  KEYCODE_ENTRY(VK_DECIMAL, '.'),
-  KEYCODE_ENTRY(VK_DIVIDE, '/'),
-  KEYCODE_ENTRY(VK_F1, NSF1FunctionKey),
-  KEYCODE_ENTRY(VK_F2, NSF2FunctionKey),
-  KEYCODE_ENTRY(VK_F3, NSF3FunctionKey),
-  KEYCODE_ENTRY(VK_F4, NSF4FunctionKey),
-  KEYCODE_ENTRY(VK_F5, NSF5FunctionKey),
-  KEYCODE_ENTRY(VK_F6, NSF6FunctionKey),
-  KEYCODE_ENTRY(VK_F7, NSF7FunctionKey),
-  KEYCODE_ENTRY(VK_F8, NSF8FunctionKey),
-  KEYCODE_ENTRY(VK_F9, NSF9FunctionKey),
-  KEYCODE_ENTRY(VK_F10, NSF10FunctionKey),
-  KEYCODE_ENTRY(VK_F11, NSF11FunctionKey),
-  KEYCODE_ENTRY(VK_F12, NSF12FunctionKey),
-  KEYCODE_ENTRY(VK_F13, NSF13FunctionKey),
-  KEYCODE_ENTRY(VK_F14, NSF14FunctionKey),
-  KEYCODE_ENTRY(VK_F15, NSF15FunctionKey),
-  KEYCODE_ENTRY(VK_F16, NSF16FunctionKey),
-  KEYCODE_ENTRY(VK_F17, NSF17FunctionKey),
-  KEYCODE_ENTRY(VK_F18, NSF18FunctionKey),
-  KEYCODE_ENTRY(VK_F19, NSF19FunctionKey),
-  KEYCODE_ENTRY(VK_F20, NSF20FunctionKey),
-  KEYCODE_ENTRY(VK_F21, NSF21FunctionKey),
-  KEYCODE_ENTRY(VK_F22, NSF22FunctionKey),
-  KEYCODE_ENTRY(VK_F23, NSF23FunctionKey),
-  KEYCODE_ENTRY(VK_F24, NSF24FunctionKey),
-  KEYCODE_ENTRY(VK_NUM_LOCK, NSClearLineFunctionKey),
-  KEYCODE_ENTRY(VK_SCROLL_LOCK, NSScrollLockFunctionKey),
-  KEYCODE_ENTRY(VK_COMMA, ','),
-  KEYCODE_ENTRY(VK_PERIOD, '.'),
-  KEYCODE_ENTRY(VK_SLASH, '/'),
-  KEYCODE_ENTRY(VK_BACK_QUOTE, '`'),
-  KEYCODE_ENTRY(VK_OPEN_BRACKET, '['),
-  KEYCODE_ENTRY(VK_BACK_SLASH, '\\'),
-  KEYCODE_ENTRY(VK_CLOSE_BRACKET, ']'),
-  KEYCODE_ENTRY(VK_QUOTE, '\'')
-
-#undef KEYCODE_ENTRY
-
-};
-
-uint32_t
-nsCocoaUtils::ConvertGeckoNameToMacCharCode(const nsAString& aKeyCodeName)
-{
-  if (aKeyCodeName.IsEmpty()) {
-    return 0;
-  }
-
-  nsAutoCString keyCodeName;
-  keyCodeName.AssignWithConversion(aKeyCodeName);
-  // We want case-insensitive comparison with data stored as uppercase.
-  ToUpperCase(keyCodeName);
-
-  uint32_t keyCodeNameLength = keyCodeName.Length();
-  const char* keyCodeNameStr = keyCodeName.get();
-  for (uint16_t i = 0; i < ArrayLength(gKeyConversions); ++i) {
-    if (keyCodeNameLength == gKeyConversions[i].strLength &&
-        nsCRT::strcmp(gKeyConversions[i].str, keyCodeNameStr) == 0) {
-      return gKeyConversions[i].charCode;
-    }
-  }
-
-  return 0;
-}
-
-uint32_t
-nsCocoaUtils::ConvertGeckoKeyCodeToMacCharCode(uint32_t aKeyCode)
-{
-  if (!aKeyCode) {
-    return 0;
-  }
-
-  for (uint16_t i = 0; i < ArrayLength(gKeyConversions); ++i) {
-    if (gKeyConversions[i].geckoKeyCode == aKeyCode) {
-      return gKeyConversions[i].charCode;
-    }
-  }
-
-  return 0;
-}
-
-NSMutableAttributedString*
-nsCocoaUtils::GetNSMutableAttributedString(
-                const nsAString& aText,
-                const nsTArray<mozilla::FontRange>& aFontRanges,
-                const bool aIsVertical,
-                const CGFloat aBackingScaleFactor)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL
-
-  NSString* nsstr = nsCocoaUtils::ToNSString(aText);
-  NSMutableAttributedString* attrStr =
-    [[[NSMutableAttributedString alloc] initWithString:nsstr
-                                            attributes:nil] autorelease];
-
-  int32_t lastOffset = aText.Length();
-  for (auto i = aFontRanges.Length(); i > 0; --i) {
-    const FontRange& fontRange = aFontRanges[i - 1];
-    NSString* fontName = nsCocoaUtils::ToNSString(fontRange.mFontName);
-    CGFloat fontSize = fontRange.mFontSize / aBackingScaleFactor;
-    NSFont* font = [NSFont fontWithName:fontName size:fontSize];
-    if (!font) {
-      font = [NSFont systemFontOfSize:fontSize];
-    }
-
-    NSDictionary* attrs = @{ NSFontAttributeName: font };
-    NSRange range = NSMakeRange(fontRange.mStartOffset,
-                                lastOffset - fontRange.mStartOffset);
-    [attrStr setAttributes:attrs range:range];
-    lastOffset = fontRange.mStartOffset;
-  }
-
-  if (aIsVertical) {
-    [attrStr addAttribute:NSVerticalGlyphFormAttributeName
-                    value:[NSNumber numberWithInt: 1]
-                    range:NSMakeRange(0, [attrStr length])];
-  }
-
-  return attrStr;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL
-}
diff --git a/widget/cocoa/nsCocoaWindow.h b/widget/cocoa/nsCocoaWindow.h
deleted file mode 100644
index 1913696b8c..0000000000
--- a/widget/cocoa/nsCocoaWindow.h
+++ /dev/null
@@ -1,426 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsCocoaWindow_h_
-#define nsCocoaWindow_h_
-
-#undef DARWIN
-
-#import <Cocoa/Cocoa.h>
-
-#include "mozilla/RefPtr.h"
-#include "nsBaseWidget.h"
-#include "nsPIWidgetCocoa.h"
-#include "nsCocoaUtils.h"
-
-class nsCocoaWindow;
-class nsChildView;
-class nsMenuBarX;
-@class ChildView;
-
-typedef struct _nsCocoaWindowList {
-  _nsCocoaWindowList() : prev(nullptr), window(nullptr) {}
-  struct _nsCocoaWindowList *prev;
-  nsCocoaWindow *window; // Weak
-} nsCocoaWindowList;
-
-// NSWindow subclass that is the base class for all of our own window classes.
-// Among other things, this class handles the storage of those settings that
-// need to be persisted across window destruction and reconstruction, i.e. when
-// switching to and from fullscreen mode.
-// We don't save shadow, transparency mode or background color because it's not
-// worth the hassle - Gecko will reset them anyway as soon as the window is
-// resized.
-@interface BaseWindow : NSWindow
-{
-  // Data Storage
-  NSMutableDictionary* mState;
-  BOOL mDrawsIntoWindowFrame;
-  NSColor* mActiveTitlebarColor;
-  NSColor* mInactiveTitlebarColor;
-
-  // Shadow
-  BOOL mScheduledShadowInvalidation;
-
-  // Invalidation disabling
-  BOOL mDisabledNeedsDisplay;
-
-  // DPI cache. Getting the physical screen size (CGDisplayScreenSize)
-  // is ridiculously slow, so we cache it in the toplevel window for all
-  // descendants to use.
-  float mDPI;
-
-  NSTrackingArea* mTrackingArea;
-
-  NSRect mDirtyRect;
-
-  BOOL mBeingShown;
-  BOOL mDrawTitle;
-  BOOL mBrightTitlebarForeground;
-  BOOL mUseMenuStyle;
-}
-
-- (void)importState:(NSDictionary*)aState;
-- (NSMutableDictionary*)exportState;
-- (void)setDrawsContentsIntoWindowFrame:(BOOL)aState;
-- (BOOL)drawsContentsIntoWindowFrame;
-- (void)setTitlebarColor:(NSColor*)aColor forActiveWindow:(BOOL)aActive;
-- (NSColor*)titlebarColorForActiveWindow:(BOOL)aActive;
-
-- (void)deferredInvalidateShadow;
-- (void)invalidateShadow;
-- (float)getDPI;
-
-- (void)mouseEntered:(NSEvent*)aEvent;
-- (void)mouseExited:(NSEvent*)aEvent;
-- (void)mouseMoved:(NSEvent*)aEvent;
-- (void)updateTrackingArea;
-- (NSView*)trackingAreaView;
-
-- (void)setBeingShown:(BOOL)aValue;
-- (BOOL)isBeingShown;
-- (BOOL)isVisibleOrBeingShown;
-
-- (ChildView*)mainChildView;
-
-- (NSArray*)titlebarControls;
-
-- (void)setWantsTitleDrawn:(BOOL)aDrawTitle;
-- (BOOL)wantsTitleDrawn;
-
-- (void)setUseBrightTitlebarForeground:(BOOL)aBrightForeground;
-- (BOOL)useBrightTitlebarForeground;
-
-- (void)disableSetNeedsDisplay;
-- (void)enableSetNeedsDisplay;
-
-- (NSRect)getAndResetNativeDirtyRect;
-
-- (void)setUseMenuStyle:(BOOL)aValue;
-
-@end
-
-@interface NSWindow (Undocumented)
-
-// If a window has been explicitly removed from the "window cache" (to
-// deactivate it), it's sometimes necessary to "reset" it to reactivate it
-// (and put it back in the "window cache").  One way to do this, which Apple
-// often uses, is to set the "window number" to '-1' and then back to its
-// original value.
-- (void)_setWindowNumber:(NSInteger)aNumber;
-
-// If we set the window's stylemask to be textured, the corners on the bottom of
-// the window are rounded by default. We use this private method to make
-// the corners square again, a la Safari. Starting with 10.7, all windows have
-// rounded bottom corners, so this call doesn't have any effect there.
-- (void)setBottomCornerRounded:(BOOL)rounded;
-- (BOOL)bottomCornerRounded;
-
-// Present in the same form on OS X since at least OS X 10.5.
-- (NSRect)contentRectForFrameRect:(NSRect)windowFrame styleMask:(NSUInteger)windowStyle;
-- (NSRect)frameRectForContentRect:(NSRect)windowContentRect styleMask:(NSUInteger)windowStyle;
-
-// Present since at least OS X 10.5.  The OS calls this method on NSWindow
-// (and its subclasses) to find out which NSFrameView subclass to instantiate
-// to create its "frame view".
-+ (Class)frameViewClassForStyleMask:(NSUInteger)styleMask;
-
-@end
-
-@interface PopupWindow : BaseWindow
-{
-@private
-  BOOL mIsContextMenu;
-}
-
-- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)styleMask
-      backing:(NSBackingStoreType)bufferingType defer:(BOOL)deferCreation;
-- (BOOL)isContextMenu;
-- (void)setIsContextMenu:(BOOL)flag;
-- (BOOL)canBecomeMainWindow;
-
-@end
-
-@interface BorderlessWindow : BaseWindow
-{
-}
-
-- (BOOL)canBecomeKeyWindow;
-- (BOOL)canBecomeMainWindow;
-
-@end
-
-@interface WindowDelegate : NSObject <NSWindowDelegate>
-{
-  nsCocoaWindow* mGeckoWindow; // [WEAK] (we are owned by the window)
-  // Used to avoid duplication when we send NS_ACTIVATE and
-  // NS_DEACTIVATE to Gecko for toplevel widgets.  Starts out
-  // false.
-  bool mToplevelActiveState;
-  BOOL mHasEverBeenZoomed;
-}
-+ (void)paintMenubarForWindow:(NSWindow*)aWindow;
-- (id)initWithGeckoWindow:(nsCocoaWindow*)geckoWind;
-- (void)windowDidResize:(NSNotification*)aNotification;
-- (nsCocoaWindow*)geckoWidget;
-- (bool)toplevelActiveState;
-- (void)sendToplevelActivateEvents;
-- (void)sendToplevelDeactivateEvents;
-@end
-
-@class ToolbarWindow;
-
-// NSColor subclass that allows us to draw separate colors both in the titlebar
-// and for background of the window.
-@interface TitlebarAndBackgroundColor : NSColor
-{
-  ToolbarWindow *mWindow; // [WEAK] (we are owned by the window)
-}
-
-- (id)initWithWindow:(ToolbarWindow*)aWindow;
-
-@end
-
-// NSWindow subclass for handling windows with toolbars.
-@interface ToolbarWindow : BaseWindow
-{
-  TitlebarAndBackgroundColor *mColor; // strong
-  CGFloat mUnifiedToolbarHeight;
-  NSColor *mBackgroundColor; // strong
-  NSView *mTitlebarView; // strong
-  NSRect mWindowButtonsRect;
-  NSRect mFullScreenButtonRect;
-}
-// Pass nil here to get the default appearance.
-- (void)setTitlebarColor:(NSColor*)aColor forActiveWindow:(BOOL)aActive;
-- (void)setUnifiedToolbarHeight:(CGFloat)aHeight;
-- (CGFloat)unifiedToolbarHeight;
-- (CGFloat)titlebarHeight;
-- (NSRect)titlebarRect;
-- (void)setTitlebarNeedsDisplayInRect:(NSRect)aRect sync:(BOOL)aSync;
-- (void)setTitlebarNeedsDisplayInRect:(NSRect)aRect;
-- (void)setDrawsContentsIntoWindowFrame:(BOOL)aState;
-- (void)setSheetAttachmentPosition:(CGFloat)aY;
-- (void)placeWindowButtons:(NSRect)aRect;
-- (void)placeFullScreenButton:(NSRect)aRect;
-- (NSPoint)windowButtonsPositionWithDefaultPosition:(NSPoint)aDefaultPosition;
-- (NSPoint)fullScreenButtonPositionWithDefaultPosition:(NSPoint)aDefaultPosition;
-- (void)setTemporaryBackgroundColor;
-- (void)restoreBackgroundColor;
-@end
-
-class nsCocoaWindow : public nsBaseWidget, public nsPIWidgetCocoa
-{
-private:
-  typedef nsBaseWidget Inherited;
-
-public:
-
-    nsCocoaWindow();
-
-    NS_DECL_ISUPPORTS_INHERITED
-    NS_DECL_NSPIWIDGETCOCOA
-
-    virtual MOZ_MUST_USE nsresult Create(nsIWidget* aParent,
-                                         nsNativeWidget aNativeParent,
-                                         const DesktopIntRect& aRect,
-                                         nsWidgetInitData* aInitData = nullptr)
-                                         override;
-
-    virtual MOZ_MUST_USE nsresult Create(nsIWidget* aParent,
-                                         nsNativeWidget aNativeParent,
-                                         const LayoutDeviceIntRect& aRect,
-                                         nsWidgetInitData* aInitData = nullptr)
-                                         override;
-
-    virtual void            Destroy() override;
-
-    NS_IMETHOD              Show(bool aState) override;
-    virtual nsIWidget*      GetSheetWindowParent(void) override;
-    NS_IMETHOD              Enable(bool aState) override;
-    virtual bool            IsEnabled() const override;
-    virtual void            SetModal(bool aState) override;
-    virtual void            SetFakeModal(bool aState) override;
-    virtual bool            IsRunningAppModal() override;
-    virtual bool            IsVisible() const override;
-    NS_IMETHOD              SetFocus(bool aState=false) override;
-    virtual LayoutDeviceIntPoint WidgetToScreenOffset() override;
-    virtual LayoutDeviceIntPoint GetClientOffset() override;
-    virtual LayoutDeviceIntSize
-    ClientToWindowSize(const LayoutDeviceIntSize& aClientSize) override;
-
-    virtual void* GetNativeData(uint32_t aDataType) override;
-
-    virtual void            ConstrainPosition(bool aAllowSlop,
-                                              int32_t *aX, int32_t *aY) override;
-    virtual void            SetSizeConstraints(const SizeConstraints& aConstraints) override;
-    NS_IMETHOD              Move(double aX, double aY) override;
-    virtual void            SetSizeMode(nsSizeMode aMode) override;
-    NS_IMETHOD              HideWindowChrome(bool aShouldHide) override;
-
-    void EnteredFullScreen(bool aFullScreen, bool aNativeMode = true);
-    virtual bool PrepareForFullscreenTransition(nsISupports** aData) override;
-    virtual void PerformFullscreenTransition(FullscreenTransitionStage aStage,
-                                             uint16_t aDuration,
-                                             nsISupports* aData,
-                                             nsIRunnable* aCallback) override;
-    virtual nsresult MakeFullScreen(
-      bool aFullScreen, nsIScreen* aTargetScreen = nullptr) override final;
-    NS_IMETHOD MakeFullScreenWithNativeTransition(
-      bool aFullScreen, nsIScreen* aTargetScreen = nullptr) override final;
-    NSAnimation* FullscreenTransitionAnimation() const { return mFullscreenTransitionAnimation; }
-    void ReleaseFullscreenTransitionAnimation()
-    {
-      MOZ_ASSERT(mFullscreenTransitionAnimation,
-                 "Should only be called when there is animation");
-      [mFullscreenTransitionAnimation release];
-      mFullscreenTransitionAnimation = nil;
-    }
-
-    NS_IMETHOD              Resize(double aWidth, double aHeight, bool aRepaint) override;
-    NS_IMETHOD              Resize(double aX, double aY, double aWidth, double aHeight, bool aRepaint) override;
-    virtual LayoutDeviceIntRect GetClientBounds() override;
-    virtual LayoutDeviceIntRect GetScreenBounds() override;
-    void                    ReportMoveEvent();
-    void                    ReportSizeEvent();
-    NS_IMETHOD              SetCursor(nsCursor aCursor) override;
-    NS_IMETHOD              SetCursor(imgIContainer* aCursor, uint32_t aHotspotX, uint32_t aHotspotY) override;
-
-    CGFloat                 BackingScaleFactor();
-    void                    BackingScaleFactorChanged();
-    virtual double          GetDefaultScaleInternal() override;
-    virtual int32_t         RoundsWidgetCoordinatesTo() override;
-
-    mozilla::DesktopToLayoutDeviceScale GetDesktopToDeviceScale() final {
-      return mozilla::DesktopToLayoutDeviceScale(BackingScaleFactor());
-    }
-
-    NS_IMETHOD              SetTitle(const nsAString& aTitle) override;
-
-    NS_IMETHOD Invalidate(const LayoutDeviceIntRect& aRect) override;
-    virtual nsresult ConfigureChildren(const nsTArray<Configuration>& aConfigurations) override;
-    virtual LayerManager* GetLayerManager(PLayerTransactionChild* aShadowManager = nullptr,
-                                          LayersBackend aBackendHint = mozilla::layers::LayersBackend::LAYERS_NONE,
-                                          LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT) override;
-    NS_IMETHOD DispatchEvent(mozilla::WidgetGUIEvent* aEvent,
-                             nsEventStatus& aStatus) override;
-    virtual void CaptureRollupEvents(nsIRollupListener * aListener,
-                                     bool aDoCapture) override;
-    NS_IMETHOD GetAttention(int32_t aCycleCount) override;
-    virtual bool HasPendingInputEvent() override;
-    virtual nsTransparencyMode GetTransparencyMode() override;
-    virtual void SetTransparencyMode(nsTransparencyMode aMode) override;
-    virtual void SetWindowShadowStyle(int32_t aStyle) override;
-    virtual void SetShowsToolbarButton(bool aShow) override;
-    virtual void SetShowsFullScreenButton(bool aShow) override;
-    virtual void SetWindowAnimationType(WindowAnimationType aType) override;
-    virtual void SetDrawsTitle(bool aDrawTitle) override;
-    virtual void SetUseBrightTitlebarForeground(bool aBrightForeground) override;
-    NS_IMETHOD SetNonClientMargins(LayoutDeviceIntMargin& aMargins) override;
-    virtual void SetWindowTitlebarColor(nscolor aColor, bool aActive) override;
-    virtual void SetDrawsInTitlebar(bool aState) override;
-    virtual void UpdateThemeGeometries(const nsTArray<ThemeGeometry>& aThemeGeometries) override;
-    virtual nsresult SynthesizeNativeMouseEvent(LayoutDeviceIntPoint aPoint,
-                                                uint32_t aNativeMessage,
-                                                uint32_t aModifierFlags,
-                                                nsIObserver* aObserver) override;
-
-    void DispatchSizeModeEvent();
-
-    // be notified that a some form of drag event needs to go into Gecko
-    virtual bool DragEvent(unsigned int aMessage, mozilla::gfx::Point aMouseGlobal, UInt16 aKeyModifiers);
-
-    bool HasModalDescendents() { return mNumModalDescendents > 0; }
-    NSWindow *GetCocoaWindow() { return mWindow; }
-
-    void SetMenuBar(nsMenuBarX* aMenuBar);
-    nsMenuBarX *GetMenuBar();
-
-    NS_IMETHOD_(void) SetInputContext(
-                        const InputContext& aContext,
-                        const InputContextAction& aAction) override;
-    NS_IMETHOD_(InputContext) GetInputContext() override
-    {
-      return mInputContext;
-    }
-    NS_IMETHOD_(bool) ExecuteNativeKeyBinding(
-                        NativeKeyBindingsType aType,
-                        const mozilla::WidgetKeyboardEvent& aEvent,
-                        DoCommandCallback aCallback,
-                        void* aCallbackData) override;
-
-    void SetPopupWindowLevel();
-
-protected:
-  virtual ~nsCocoaWindow();
-
-  nsresult             CreateNativeWindow(const NSRect &aRect,
-                                          nsBorderStyle aBorderStyle,
-                                          bool aRectIsFrameRect);
-  nsresult             CreatePopupContentView(const LayoutDeviceIntRect &aRect,
-                                              nsWidgetInitData* aInitData);
-  void                 DestroyNativeWindow();
-  void                 AdjustWindowShadow();
-  void                 SetWindowBackgroundBlur();
-  void                 UpdateBounds();
-
-  nsresult             DoResize(double aX, double aY, double aWidth, double aHeight,
-                                bool aRepaint, bool aConstrainToCurrentScreen);
-
-  inline bool ShouldToggleNativeFullscreen(bool aFullScreen,
-                                           bool aUseSystemTransition);
-  nsresult DoMakeFullScreen(bool aFullScreen, bool aUseSystemTransition);
-
-  virtual already_AddRefed<nsIWidget>
-  AllocateChildPopupWidget() override
-  {
-    static NS_DEFINE_IID(kCPopUpCID, NS_POPUP_CID);
-    nsCOMPtr<nsIWidget> widget = do_CreateInstance(kCPopUpCID);
-    return widget.forget();
-  }
-
-  nsIWidget*           mParent;         // if we're a popup, this is our parent [WEAK]
-  nsIWidget*           mAncestorLink;   // link to traverse ancestors [WEAK]
-  BaseWindow*          mWindow;         // our cocoa window [STRONG]
-  WindowDelegate*      mDelegate;       // our delegate for processing window msgs [STRONG]
-  RefPtr<nsMenuBarX> mMenuBar;
-  NSWindow*            mSheetWindowParent; // if this is a sheet, this is the NSWindow it's attached to
-  nsChildView*         mPopupContentView; // if this is a popup, this is its content widget
-  // if this is a toplevel window, and there is any ongoing fullscreen
-  // transition, it is the animation object.
-  NSAnimation*         mFullscreenTransitionAnimation;
-  int32_t              mShadowStyle;
-
-  CGFloat              mBackingScaleFactor;
-
-  WindowAnimationType  mAnimationType;
-
-  bool                 mWindowMadeHere; // true if we created the window, false for embedding
-  bool                 mSheetNeedsShow; // if this is a sheet, are we waiting to be shown?
-                                        // this is used for sibling sheet contention only
-  bool                 mInFullScreenMode;
-  bool                 mInFullScreenTransition; // true from the request to enter/exit fullscreen
-                                                // (MakeFullScreen() call) to EnteredFullScreen()
-  bool                 mModal;
-  bool                 mFakeModal;
-
-  // Only true on 10.7+ if SetShowsFullScreenButton(true) is called.
-  bool                 mSupportsNativeFullScreen;
-  // Whether we are currently using native fullscreen. It could be false because
-  // we are in the DOM fullscreen where we do not use the native fullscreen.
-  bool                 mInNativeFullScreenMode;
-
-  bool                 mIsAnimationSuppressed;
-
-  bool                 mInReportMoveEvent; // true if in a call to ReportMoveEvent().
-  bool                 mInResize; // true if in a call to DoResize().
-
-  bool                 mAlwaysOnTop;
-
-  int32_t              mNumModalDescendents;
-  InputContext         mInputContext;
-};
-
-#endif // nsCocoaWindow_h_
diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm
deleted file mode 100644
index a437504fd1..0000000000
--- a/widget/cocoa/nsCocoaWindow.mm
+++ /dev/null
@@ -1,3881 +0,0 @@
-/* -*- Mode: Objective-C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "nsCocoaWindow.h"
-
-#include "NativeKeyBindings.h"
-#include "TextInputHandler.h"
-#include "nsObjCExceptions.h"
-#include "nsCOMPtr.h"
-#include "nsWidgetsCID.h"
-#include "nsIRollupListener.h"
-#include "nsChildView.h"
-#include "nsWindowMap.h"
-#include "nsAppShell.h"
-#include "nsIAppShellService.h"
-#include "nsIBaseWindow.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsIXULWindow.h"
-#include "nsToolkit.h"
-#include "nsIDOMWindow.h"
-#include "nsPIDOMWindow.h"
-#include "nsIDOMElement.h"
-#include "nsThreadUtils.h"
-#include "nsMenuBarX.h"
-#include "nsMenuUtilsX.h"
-#include "nsStyleConsts.h"
-#include "nsNativeThemeColors.h"
-#include "nsNativeThemeCocoa.h"
-#include "nsChildView.h"
-#include "nsCocoaFeatures.h"
-#include "nsIScreenManager.h"
-#include "nsIWidgetListener.h"
-#include "nsIPresShell.h"
-#include "nsScreenCocoa.h"
-#include "VibrancyManager.h"
-
-#include "gfxPlatform.h"
-#include "qcms.h"
-
-#include "mozilla/AutoRestore.h"
-#include "mozilla/BasicEvents.h"
-#include "mozilla/Preferences.h"
-#include <algorithm>
-
-namespace mozilla {
-namespace layers {
-class LayerManager;
-} // namespace layers
-} // namespace mozilla
-using namespace mozilla::layers;
-using namespace mozilla::widget;
-using namespace mozilla;
-
-int32_t gXULModalLevel = 0;
-
-// In principle there should be only one app-modal window at any given time.
-// But sometimes, despite our best efforts, another window appears above the
-// current app-modal window.  So we need to keep a linked list of app-modal
-// windows.  (A non-sheet window that appears above an app-modal window is
-// also made app-modal.)  See nsCocoaWindow::SetModal().
-nsCocoaWindowList *gGeckoAppModalWindowList = NULL;
-
-// defined in nsMenuBarX.mm
-extern NSMenu* sApplicationMenu; // Application menu shared by all menubars
-
-// defined in nsChildView.mm
-extern BOOL                gSomeMenuBarPainted;
-
-#if !defined(MAC_OS_X_VERSION_10_12) || \
-    MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12
-
-@interface NSWindow(AutomaticWindowTabbing)
-+ (void)setAllowsAutomaticWindowTabbing:(BOOL)allow;
-@end
-
-#endif
-
-extern "C" {
-  // CGSPrivate.h
-  typedef NSInteger CGSConnection;
-  typedef NSInteger CGSWindow;
-  typedef NSUInteger CGSWindowFilterRef;
-  extern CGSConnection _CGSDefaultConnection(void);
-  extern CGError CGSSetWindowShadowAndRimParameters(const CGSConnection cid, CGSWindow wid, float standardDeviation, float density, int offsetX, int offsetY, unsigned int flags);
-  extern CGError CGSSetWindowBackgroundBlurRadius(CGSConnection cid, CGSWindow wid, NSUInteger blur);
-}
-
-#define NS_APPSHELLSERVICE_CONTRACTID "@mozilla.org/appshell/appShellService;1"
-
-NS_IMPL_ISUPPORTS_INHERITED(nsCocoaWindow, Inherited, nsPIWidgetCocoa)
-
-// A note on testing to see if your object is a sheet...
-// |mWindowType == eWindowType_sheet| is true if your gecko nsIWidget is a sheet
-// widget - whether or not the sheet is showing. |[mWindow isSheet]| will return
-// true *only when the sheet is actually showing*. Choose your test wisely.
-
-static void RollUpPopups()
-{
-  nsIRollupListener* rollupListener = nsBaseWidget::GetActiveRollupListener();
-  NS_ENSURE_TRUE_VOID(rollupListener);
-  nsCOMPtr<nsIWidget> rollupWidget = rollupListener->GetRollupWidget();
-  if (!rollupWidget)
-    return;
-  rollupListener->Rollup(0, true, nullptr, nullptr);
-}
-
-nsCocoaWindow::nsCocoaWindow()
-: mParent(nullptr)
-, mAncestorLink(nullptr)
-, mWindow(nil)
-, mDelegate(nil)
-, mSheetWindowParent(nil)
-, mPopupContentView(nil)
-, mFullscreenTransitionAnimation(nil)
-, mShadowStyle(NS_STYLE_WINDOW_SHADOW_DEFAULT)
-, mBackingScaleFactor(0.0)
-, mAnimationType(nsIWidget::eGenericWindowAnimation)
-, mWindowMadeHere(false)
-, mSheetNeedsShow(false)
-, mInFullScreenMode(false)
-, mInFullScreenTransition(false)
-, mModal(false)
-, mFakeModal(false)
-, mSupportsNativeFullScreen(false)
-, mInNativeFullScreenMode(false)
-, mIsAnimationSuppressed(false)
-, mInReportMoveEvent(false)
-, mInResize(false)
-, mAlwaysOnTop(false)
-, mNumModalDescendents(0)
-{
-  if ([NSWindow respondsToSelector:@selector(setAllowsAutomaticWindowTabbing:)]) {
-    // Disable automatic tabbing on 10.12. We need to do this before we
-    // orderFront any of our windows.
-    [NSWindow setAllowsAutomaticWindowTabbing:NO];
-  }
-}
-
-void nsCocoaWindow::DestroyNativeWindow()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!mWindow)
-    return;
-
-  // We want to unhook the delegate here because we don't want events
-  // sent to it after this object has been destroyed.
-  [mWindow setDelegate:nil];
-  [mWindow close];
-  mWindow = nil;
-  [mDelegate autorelease];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-nsCocoaWindow::~nsCocoaWindow()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  // Notify the children that we're gone.  Popup windows (e.g. tooltips) can
-  // have nsChildView children.  'kid' is an nsChildView object if and only if
-  // its 'type' is 'eWindowType_child'.
-  // childView->ResetParent() can change our list of children while it's
-  // being iterated, so the way we iterate the list must allow for this.
-  for (nsIWidget* kid = mLastChild; kid;) {
-    nsWindowType kidType = kid->WindowType();
-    if (kidType == eWindowType_child) {
-      nsChildView* childView = static_cast<nsChildView*>(kid);
-      kid = kid->GetPrevSibling();
-      childView->ResetParent();
-    } else {
-      nsCocoaWindow* childWindow = static_cast<nsCocoaWindow*>(kid);
-      childWindow->mParent = nullptr;
-      childWindow->mAncestorLink = mAncestorLink;
-      kid = kid->GetPrevSibling();
-    }
-  }
-
-  if (mWindow && mWindowMadeHere) {
-    DestroyNativeWindow();
-  }
-
-  NS_IF_RELEASE(mPopupContentView);
-
-  // Deal with the possiblity that we're being destroyed while running modal.
-  if (mModal) {
-    NS_WARNING("Widget destroyed while running modal!");
-    --gXULModalLevel;
-    NS_ASSERTION(gXULModalLevel >= 0, "Weirdness setting modality!");
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-// Find the screen that overlaps aRect the most,
-// if none are found default to the mainScreen.
-static NSScreen*
-FindTargetScreenForRect(const DesktopIntRect& aRect)
-{
-  NSScreen *targetScreen = [NSScreen mainScreen];
-  NSEnumerator *screenEnum = [[NSScreen screens] objectEnumerator];
-  int largestIntersectArea = 0;
-  while (NSScreen *screen = [screenEnum nextObject]) {
-    DesktopIntRect screenRect =
-      nsCocoaUtils::CocoaRectToGeckoRect([screen visibleFrame]);
-    screenRect = screenRect.Intersect(aRect);
-    int area = screenRect.width * screenRect.height;
-    if (area > largestIntersectArea) {
-      largestIntersectArea = area;
-      targetScreen = screen;
-    }
-  }
-  return targetScreen;
-}
-
-// fits the rect to the screen that contains the largest area of it,
-// or to aScreen if a screen is passed in
-// NB: this operates with aRect in desktop pixels
-static void
-FitRectToVisibleAreaForScreen(DesktopIntRect& aRect, NSScreen* aScreen)
-{
-  if (!aScreen) {
-    aScreen = FindTargetScreenForRect(aRect);
-  }
-
-  DesktopIntRect screenBounds =
-    nsCocoaUtils::CocoaRectToGeckoRect([aScreen visibleFrame]);
-
-  if (aRect.width > screenBounds.width) {
-    aRect.width = screenBounds.width;
-  }
-  if (aRect.height > screenBounds.height) {
-    aRect.height = screenBounds.height;
-  }
-  
-  if (aRect.x - screenBounds.x + aRect.width > screenBounds.width) {
-    aRect.x += screenBounds.width - (aRect.x - screenBounds.x + aRect.width);
-  }
-  if (aRect.y - screenBounds.y + aRect.height > screenBounds.height) {
-    aRect.y += screenBounds.height - (aRect.y - screenBounds.y + aRect.height);
-  }
-
-  // If the left/top edge of the window is off the screen in either direction,
-  // then set the window to start at the left/top edge of the screen.
-  if (aRect.x < screenBounds.x || aRect.x > (screenBounds.x + screenBounds.width)) {
-    aRect.x = screenBounds.x;
-  }
-  if (aRect.y < screenBounds.y || aRect.y > (screenBounds.y + screenBounds.height)) {
-    aRect.y = screenBounds.y;
-  }
-}
-
-// Some applications use native popup windows
-// (native context menus, native tooltips)
-static bool UseNativePopupWindows()
-{
-#ifdef MOZ_USE_NATIVE_POPUP_WINDOWS
-  return true;
-#else
-  return false;
-#endif /* MOZ_USE_NATIVE_POPUP_WINDOWS */
-}
-
-// aRect here is specified in desktop pixels
-nsresult
-nsCocoaWindow::Create(nsIWidget* aParent,
-                      nsNativeWidget aNativeParent,
-                      const DesktopIntRect& aRect,
-                      nsWidgetInitData* aInitData)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  // Because the hidden window is created outside of an event loop,
-  // we have to provide an autorelease pool (see bug 559075).
-  nsAutoreleasePool localPool;
-
-  DesktopIntRect newBounds = aRect;
-  FitRectToVisibleAreaForScreen(newBounds, nullptr);
-
-  // Set defaults which can be overriden from aInitData in BaseCreate
-  mWindowType = eWindowType_toplevel;
-  mBorderStyle = eBorderStyle_default;
-
-  // Ensure that the toolkit is created.
-  nsToolkit::GetToolkit();
-
-  Inherited::BaseCreate(aParent, aInitData);
-
-  mParent = aParent;
-  mAncestorLink = aParent;
-
-  // Applications that use native popups don't want us to create popup windows.
-  if ((mWindowType == eWindowType_popup) && UseNativePopupWindows())
-    return NS_OK;
-
-  nsresult rv =
-    CreateNativeWindow(nsCocoaUtils::GeckoRectToCocoaRect(newBounds),
-                       mBorderStyle, false);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (mWindowType == eWindowType_popup) {
-    if (aInitData->mMouseTransparent) {
-      [mWindow setIgnoresMouseEvents:YES];
-    } else {
-      [mWindow setIgnoresMouseEvents:NO];
-    }
-    // now we can convert newBounds to device pixels for the window we created,
-    // as the child view expects a rect expressed in the dev pix of its parent
-    LayoutDeviceIntRect devRect =
-      RoundedToInt(newBounds * GetDesktopToDeviceScale());
-    return CreatePopupContentView(devRect, aInitData);
-  }
-
-  mIsAnimationSuppressed = aInitData->mIsAnimationSuppressed;
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-nsresult
-nsCocoaWindow::Create(nsIWidget* aParent,
-                      nsNativeWidget aNativeParent,
-                      const LayoutDeviceIntRect& aRect,
-                      nsWidgetInitData* aInitData)
-{
-  DesktopIntRect desktopRect =
-    RoundedToInt(aRect / GetDesktopToDeviceScale());
-  return Create(aParent, aNativeParent, desktopRect, aInitData);
-}
-
-static unsigned int WindowMaskForBorderStyle(nsBorderStyle aBorderStyle)
-{
-  bool allOrDefault = (aBorderStyle == eBorderStyle_all ||
-                         aBorderStyle == eBorderStyle_default);
-
-  /* Apple's docs on NSWindow styles say that "a window's style mask should
-   * include NSTitledWindowMask if it includes any of the others [besides
-   * NSBorderlessWindowMask]".  This implies that a borderless window
-   * shouldn't have any other styles than NSBorderlessWindowMask.
-   */
-  if (!allOrDefault && !(aBorderStyle & eBorderStyle_title))
-    return NSBorderlessWindowMask;
-
-  unsigned int mask = NSTitledWindowMask;
-  if (allOrDefault || aBorderStyle & eBorderStyle_close)
-    mask |= NSClosableWindowMask;
-  if (allOrDefault || aBorderStyle & eBorderStyle_minimize)
-    mask |= NSMiniaturizableWindowMask;
-  if (allOrDefault || aBorderStyle & eBorderStyle_resizeh)
-    mask |= NSResizableWindowMask;
-
-  return mask;
-}
-
-// If aRectIsFrameRect, aRect specifies the frame rect of the new window.
-// Otherwise, aRect.x/y specify the position of the window's frame relative to
-// the bottom of the menubar and aRect.width/height specify the size of the
-// content rect.
-nsresult nsCocoaWindow::CreateNativeWindow(const NSRect &aRect,
-                                           nsBorderStyle aBorderStyle,
-                                           bool aRectIsFrameRect)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  // We default to NSBorderlessWindowMask, add features if needed.
-  unsigned int features = NSBorderlessWindowMask;
-
-  // Configure the window we will create based on the window type.
-  switch (mWindowType)
-  {
-    case eWindowType_invisible:
-    case eWindowType_child:
-    case eWindowType_plugin:
-      break;
-    case eWindowType_popup:
-      if (aBorderStyle != eBorderStyle_default && mBorderStyle & eBorderStyle_title) {
-        features |= NSTitledWindowMask;
-        if (aBorderStyle & eBorderStyle_close) {
-          features |= NSClosableWindowMask;
-        }
-      }
-      break;
-    case eWindowType_toplevel:
-    case eWindowType_dialog:
-      features = WindowMaskForBorderStyle(aBorderStyle);
-      break;
-    case eWindowType_sheet:
-      if (mParent->WindowType() != eWindowType_invisible &&
-          aBorderStyle & eBorderStyle_resizeh) {
-        features = NSResizableWindowMask;
-      }
-      else {
-        features = NSMiniaturizableWindowMask;
-      }
-      features |= NSTitledWindowMask;
-      break;
-    default:
-      NS_ERROR("Unhandled window type!");
-      return NS_ERROR_FAILURE;
-  }
-
-  NSRect contentRect;
-
-  if (aRectIsFrameRect) {
-    contentRect = [NSWindow contentRectForFrameRect:aRect styleMask:features];
-  } else {
-    /* 
-     * We pass a content area rect to initialize the native Cocoa window. The
-     * content rect we give is the same size as the size we're given by gecko.
-     * The origin we're given for non-popup windows is moved down by the height
-     * of the menu bar so that an origin of (0,100) from gecko puts the window
-     * 100 pixels below the top of the available desktop area. We also move the
-     * origin down by the height of a title bar if it exists. This is so the
-     * origin that gecko gives us for the top-left of  the window turns out to
-     * be the top-left of the window we create. This is how it was done in
-     * Carbon. If it ought to be different we'll probably need to look at all
-     * the callers.
-     *
-     * Note: This means that if you put a secondary screen on top of your main
-     * screen and open a window in the top screen, it'll be incorrectly shifted
-     * down by the height of the menu bar. Same thing would happen in Carbon.
-     *
-     * Note: If you pass a rect with 0,0 for an origin, the window ends up in a
-     * weird place for some reason. This stops that without breaking popups.
-     */
-    // Compensate for difference between frame and content area height (e.g. title bar).
-    NSRect newWindowFrame = [NSWindow frameRectForContentRect:aRect styleMask:features];
-
-    contentRect = aRect;
-    contentRect.origin.y -= (newWindowFrame.size.height - aRect.size.height);
-
-    if (mWindowType != eWindowType_popup)
-      contentRect.origin.y -= [[NSApp mainMenu] menuBarHeight];
-  }
-
-  // NSLog(@"Top-level window being created at Cocoa rect: %f, %f, %f, %f\n",
-  //       rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
-
-  Class windowClass = [BaseWindow class];
-  // If we have a titlebar on a top-level window, we want to be able to control the 
-  // titlebar color (for unified windows), so use the special ToolbarWindow class. 
-  // Note that we need to check the window type because we mark sheets as 
-  // having titlebars.
-  if ((mWindowType == eWindowType_toplevel || mWindowType == eWindowType_dialog) &&
-      (features & NSTitledWindowMask))
-    windowClass = [ToolbarWindow class];
-  // If we're a popup window we need to use the PopupWindow class.
-  else if (mWindowType == eWindowType_popup)
-    windowClass = [PopupWindow class];
-  // If we're a non-popup borderless window we need to use the
-  // BorderlessWindow class.
-  else if (features == NSBorderlessWindowMask)
-    windowClass = [BorderlessWindow class];
-
-  // Create the window
-  mWindow = [[windowClass alloc] initWithContentRect:contentRect styleMask:features 
-                                 backing:NSBackingStoreBuffered defer:YES];
-
-  // Make sure that window titles don't leak to disk in private browsing mode
-  // due to macOS' resume feature.
-  [mWindow setRestorable:NO];
-  [mWindow disableSnapshotRestoration];
-
-  // setup our notification delegate. Note that setDelegate: does NOT retain.
-  mDelegate = [[WindowDelegate alloc] initWithGeckoWindow:this];
-  [mWindow setDelegate:mDelegate];
-
-  // Make sure that the content rect we gave has been honored.
-  NSRect wantedFrame = [mWindow frameRectForContentRect:contentRect];
-  if (!NSEqualRects([mWindow frame], wantedFrame)) {
-    // This can happen when the window is not on the primary screen.
-    [mWindow setFrame:wantedFrame display:NO];
-  }
-  UpdateBounds();
-
-  if (mWindowType == eWindowType_invisible) {
-    [mWindow setLevel:kCGDesktopWindowLevelKey];
-  }
-
-  if (mWindowType == eWindowType_popup) {
-    SetPopupWindowLevel();
-    [mWindow setBackgroundColor:[NSColor clearColor]];
-    [mWindow setOpaque:NO];
-  } else {
-    // Make sure that regular windows are opaque from the start, so that
-    // nsChildView::WidgetTypeSupportsAcceleration returns true for them.
-    [mWindow setOpaque:YES];
-  }
-
-  NSWindowCollectionBehavior newBehavior = [mWindow collectionBehavior];
-  if (mAlwaysOnTop) {
-    [mWindow setLevel:NSFloatingWindowLevel];
-    newBehavior |= NSWindowCollectionBehaviorCanJoinAllSpaces;
-  }
-  [mWindow setCollectionBehavior:newBehavior];
-
-  [mWindow setContentMinSize:NSMakeSize(60, 60)];
-  [mWindow disableCursorRects];
-
-  // Make sure the window starts out not draggable by the background.
-  // We will turn it on as necessary.
-  [mWindow setMovableByWindowBackground:NO];
-
-  [[WindowDataMap sharedWindowDataMap] ensureDataForWindow:mWindow];
-  mWindowMadeHere = true;
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-nsCocoaWindow::CreatePopupContentView(const LayoutDeviceIntRect &aRect,
-	                                  nsWidgetInitData* aInitData)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  // We need to make our content view a ChildView.
-  mPopupContentView = new nsChildView();
-  if (!mPopupContentView)
-    return NS_ERROR_FAILURE;
-
-  NS_ADDREF(mPopupContentView);
-
-  nsIWidget* thisAsWidget = static_cast<nsIWidget*>(this);
-  nsresult rv = mPopupContentView->Create(thisAsWidget, nullptr, aRect,
-                                          aInitData);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  NSView* contentView = [mWindow contentView];
-  ChildView* childView = (ChildView*)mPopupContentView->GetNativeData(NS_NATIVE_WIDGET);
-  [childView setFrame:NSZeroRect];
-  [childView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-  [contentView addSubview:childView];
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-void nsCocoaWindow::Destroy()
-{
-  if (mOnDestroyCalled)
-    return;
-  mOnDestroyCalled = true;
-
-  // SetFakeModal(true) is called for non-modal window opened by modal window.
-  // On Cocoa, it needs corresponding SetFakeModal(false) on destroy to restore
-  // ancestor windows' state.
-  if (mFakeModal) {
-    SetFakeModal(false);
-  }
-
-  // If we don't hide here we run into problems with panels, this is not ideal.
-  // (Bug 891424)
-  Show(false);
-
-  if (mPopupContentView)
-    mPopupContentView->Destroy();
-
-  if (mFullscreenTransitionAnimation) {
-    [mFullscreenTransitionAnimation stopAnimation];
-    ReleaseFullscreenTransitionAnimation();
-  }
-
-  nsBaseWidget::Destroy();
-  // nsBaseWidget::Destroy() calls GetParent()->RemoveChild(this). But we
-  // don't implement GetParent(), so we need to do the equivalent here.
-  if (mParent) {
-    mParent->RemoveChild(this);
-  }
-  nsBaseWidget::OnDestroy();
-
-  if (mInFullScreenMode) {
-    // On Lion we don't have to mess with the OS chrome when in Full Screen
-    // mode.  But we do have to destroy the native window here (and not wait
-    // for that to happen in our destructor).  We don't switch away from the
-    // native window's space until the window is destroyed, and otherwise this
-    // might not happen for several seconds (because at least one object
-    // holding a reference to ourselves is usually waiting to be garbage-
-    // collected).  See bug 757618.
-    if (mInNativeFullScreenMode) {
-      DestroyNativeWindow();
-    } else if (mWindow) {
-      nsCocoaUtils::HideOSChromeOnScreen(false);
-    }
-  }
-}
-
-nsIWidget* nsCocoaWindow::GetSheetWindowParent(void)
-{
-  if (mWindowType != eWindowType_sheet)
-    return nullptr;
-  nsCocoaWindow *parent = static_cast<nsCocoaWindow*>(mParent);
-  while (parent && (parent->mWindowType == eWindowType_sheet))
-    parent = static_cast<nsCocoaWindow*>(parent->mParent);
-  return parent;
-}
-
-void* nsCocoaWindow::GetNativeData(uint32_t aDataType)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSNULL;
-
-  void* retVal = nullptr;
-  
-  switch (aDataType) {
-    // to emulate how windows works, we always have to return a NSView
-    // for NS_NATIVE_WIDGET
-    case NS_NATIVE_WIDGET:
-    case NS_NATIVE_DISPLAY:
-      retVal = [mWindow contentView];
-      break;
-      
-    case NS_NATIVE_WINDOW:
-      retVal = mWindow;
-      break;
-      
-    case NS_NATIVE_GRAPHIC:
-      // There isn't anything that makes sense to return here,
-      // and it doesn't matter so just return nullptr.
-      NS_ERROR("Requesting NS_NATIVE_GRAPHIC on a top-level window!");
-      break;
-    case NS_RAW_NATIVE_IME_CONTEXT: {
-      retVal = GetPseudoIMEContext();
-      if (retVal) {
-        break;
-      }
-      NSView* view = mWindow ? [mWindow contentView] : nil;
-      if (view) {
-        retVal = [view inputContext];
-      }
-      // If inputContext isn't available on this window, return this window's
-      // pointer instead of nullptr since if this returns nullptr,
-      // IMEStateManager cannot manage composition with TextComposition
-      // instance.  Although, this case shouldn't occur.
-      if (NS_WARN_IF(!retVal)) {
-        retVal = this;
-      }
-      break;
-    }
-  }
-
-  return retVal;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSNULL;
-}
-
-bool nsCocoaWindow::IsVisible() const
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  return (mWindow && ([mWindow isVisibleOrBeingShown] || mSheetNeedsShow));
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(false);
-}
-
-void
-nsCocoaWindow::SetModal(bool aState)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!mWindow)
-    return;
-
-  // This is used during startup (outside the event loop) when creating
-  // the add-ons compatibility checking dialog and the profile manager UI;
-  // therefore, it needs to provide an autorelease pool to avoid cocoa
-  // objects leaking.
-  nsAutoreleasePool localPool;
-
-  mModal = aState;
-  nsCocoaWindow *ancestor = static_cast<nsCocoaWindow*>(mAncestorLink);
-  if (aState) {
-    ++gXULModalLevel;
-    // When a non-sheet window gets "set modal", make the window(s) that it
-    // appears over behave as they should.  We can't rely on native methods to
-    // do this, for the following reason:  The OS runs modal non-sheet windows
-    // in an event loop (using [NSApplication runModalForWindow:] or similar
-    // methods) that's incompatible with the modal event loop in nsXULWindow::
-    // ShowModal() (each of these event loops is "exclusive", and can't run at
-    // the same time as other (similar) event loops).
-    if (mWindowType != eWindowType_sheet) {
-      while (ancestor) {
-        if (ancestor->mNumModalDescendents++ == 0) {
-          NSWindow *aWindow = ancestor->GetCocoaWindow();
-          if (ancestor->mWindowType != eWindowType_invisible) {
-            [[aWindow standardWindowButton:NSWindowCloseButton] setEnabled:NO];
-            [[aWindow standardWindowButton:NSWindowMiniaturizeButton] setEnabled:NO];
-            [[aWindow standardWindowButton:NSWindowZoomButton] setEnabled:NO];
-          }
-        }
-        ancestor = static_cast<nsCocoaWindow*>(ancestor->mParent);
-      }
-      [mWindow setLevel:NSModalPanelWindowLevel];
-      nsCocoaWindowList *windowList = new nsCocoaWindowList;
-      if (windowList) {
-        windowList->window = this; // Don't ADDREF
-        windowList->prev = gGeckoAppModalWindowList;
-        gGeckoAppModalWindowList = windowList;
-      }
-    }
-  }
-  else {
-    --gXULModalLevel;
-    NS_ASSERTION(gXULModalLevel >= 0, "Mismatched call to nsCocoaWindow::SetModal(false)!");
-    if (mWindowType != eWindowType_sheet) {
-      while (ancestor) {
-        if (--ancestor->mNumModalDescendents == 0) {
-          NSWindow *aWindow = ancestor->GetCocoaWindow();
-          if (ancestor->mWindowType != eWindowType_invisible) {
-            [[aWindow standardWindowButton:NSWindowCloseButton] setEnabled:YES];
-            [[aWindow standardWindowButton:NSWindowMiniaturizeButton] setEnabled:YES];
-            [[aWindow standardWindowButton:NSWindowZoomButton] setEnabled:YES];
-          }
-        }
-        NS_ASSERTION(ancestor->mNumModalDescendents >= 0, "Widget hierarchy changed while modal!");
-        ancestor = static_cast<nsCocoaWindow*>(ancestor->mParent);
-      }
-      if (gGeckoAppModalWindowList) {
-        NS_ASSERTION(gGeckoAppModalWindowList->window == this, "Widget hierarchy changed while modal!");
-        nsCocoaWindowList *saved = gGeckoAppModalWindowList;
-        gGeckoAppModalWindowList = gGeckoAppModalWindowList->prev;
-        delete saved; // "window" not ADDREFed
-      }
-      if (mWindowType == eWindowType_popup)
-        SetPopupWindowLevel();
-      else
-        [mWindow setLevel:NSNormalWindowLevel];
-    }
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void
-nsCocoaWindow::SetFakeModal(bool aState)
-{
-    mFakeModal = aState;
-    SetModal(aState);
-}
-
-bool
-nsCocoaWindow::IsRunningAppModal()
-{
-  return [NSApp _isRunningAppModal];
-}
-
-// Hide or show this window
-NS_IMETHODIMP nsCocoaWindow::Show(bool bState)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  if (!mWindow)
-    return NS_OK;
-
-  // We need to re-execute sometimes in order to bring already-visible
-  // windows forward.
-  if (!mSheetNeedsShow && !bState && ![mWindow isVisible])
-    return NS_OK;
-
-  // Protect against re-entering.
-  if (bState && [mWindow isBeingShown])
-    return NS_OK;
-
-  [mWindow setBeingShown:bState];
-
-  nsIWidget* parentWidget = mParent;
-  nsCOMPtr<nsPIWidgetCocoa> piParentWidget(do_QueryInterface(parentWidget));
-  NSWindow* nativeParentWindow = (parentWidget) ?
-    (NSWindow*)parentWidget->GetNativeData(NS_NATIVE_WINDOW) : nil;
-
-  if (bState && !mBounds.IsEmpty()) {
-    // Don't try to show a popup when the parent isn't visible or is minimized.
-    if (mWindowType == eWindowType_popup && nativeParentWindow) {
-      if (![nativeParentWindow isVisible] || [nativeParentWindow isMiniaturized]) {
-        return NS_ERROR_FAILURE;
-      }
-    }
-
-    if (mPopupContentView) {
-      // Ensure our content view is visible. We never need to hide it.
-      mPopupContentView->Show(true);
-    }
-
-    if (mWindowType == eWindowType_sheet) {
-      // bail if no parent window (its basically what we do in Carbon)
-      if (!nativeParentWindow || !piParentWidget)
-        return NS_ERROR_FAILURE;
-
-      NSWindow* topNonSheetWindow = nativeParentWindow;
-      
-      // If this sheet is the child of another sheet, hide the parent so that
-      // this sheet can be displayed. Leave the parent mSheetNeedsShow alone,
-      // that is only used to handle sibling sheet contention. The parent will
-      // return once there are no more child sheets.
-      bool parentIsSheet = false;
-      if (NS_SUCCEEDED(piParentWidget->GetIsSheet(&parentIsSheet)) &&
-          parentIsSheet) {
-        piParentWidget->GetSheetWindowParent(&topNonSheetWindow);
-        [NSApp endSheet:nativeParentWindow];
-      }
-
-      nsCOMPtr<nsIWidget> sheetShown;
-      if (NS_SUCCEEDED(piParentWidget->GetChildSheet(
-                           true, getter_AddRefs(sheetShown))) &&
-          (!sheetShown || sheetShown == this)) {
-        // If this sheet is already the sheet actually being shown, don't
-        // tell it to show again. Otherwise the number of calls to
-        // [NSApp beginSheet...] won't match up with [NSApp endSheet...].
-        if (![mWindow isVisible]) {
-          mSheetNeedsShow = false;
-          mSheetWindowParent = topNonSheetWindow;
-          // Only set contextInfo if our parent isn't a sheet.
-          NSWindow* contextInfo = parentIsSheet ? nil : mSheetWindowParent;
-          [TopLevelWindowData deactivateInWindow:mSheetWindowParent];
-          [NSApp beginSheet:mWindow
-             modalForWindow:mSheetWindowParent
-              modalDelegate:mDelegate
-             didEndSelector:@selector(didEndSheet:returnCode:contextInfo:)
-                contextInfo:contextInfo];
-          [TopLevelWindowData activateInWindow:mWindow];
-          SendSetZLevelEvent();
-        }
-      }
-      else {
-        // A sibling of this sheet is active, don't show this sheet yet.
-        // When the active sheet hides, its brothers and sisters that have
-        // mSheetNeedsShow set will have their opportunities to display.
-        mSheetNeedsShow = true;
-      }
-    }
-    else if (mWindowType == eWindowType_popup) {
-      if (!nsCocoaFeatures::OnMojaveOrLater()) {
-        // If a popup window is shown after being hidden, it needs to be "reset"
-        // for it to receive any mouse events aside from mouse-moved events
-        // (because it was removed from the "window cache" when it was hidden
-        // -- see below).  Setting the window number to -1 and then back to its
-        // original value seems to accomplish this.  The idea was "borrowed"
-        // from the Java Embedding Plugin. This is fixed on macOS 10.14+.
-        NSInteger windowNumber = [mWindow windowNumber];
-        [mWindow _setWindowNumber:-1];
-        [mWindow _setWindowNumber:windowNumber];
-      }
-      // For reasons that aren't yet clear, calls to [NSWindow orderFront:] or
-      // [NSWindow makeKeyAndOrderFront:] can sometimes trigger "Error (1000)
-      // creating CGSWindow", which in turn triggers an internal inconsistency
-      // NSException.  These errors shouldn't be fatal.  So we need to wrap
-      // calls to ...orderFront: in TRY blocks.  See bmo bug 470864.
-      NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-      [[mWindow contentView] setNeedsDisplay:YES];
-      [mWindow orderFront:nil];
-      NS_OBJC_END_TRY_ABORT_BLOCK;
-      SendSetZLevelEvent();
-      AdjustWindowShadow();
-      SetWindowBackgroundBlur();
-      // If our popup window is a non-native context menu, tell the OS (and
-      // other programs) that a menu has opened.  This is how the OS knows to
-      // close other programs' context menus when ours open.
-      if ([mWindow isKindOfClass:[PopupWindow class]] &&
-          [(PopupWindow*) mWindow isContextMenu]) {
-        [[NSDistributedNotificationCenter defaultCenter]
-          postNotificationName:@"com.apple.HIToolbox.beginMenuTrackingNotification"
-                        object:@"org.mozilla.gecko.PopupWindow"];
-      }
-
-      // If a parent window was supplied and this is a popup at the parent
-      // level, set its child window. This will cause the child window to
-      // appear above the parent and move when the parent does. Setting this
-      // needs to happen after the _setWindowNumber calls above, otherwise the
-      // window doesn't focus properly.
-      if (nativeParentWindow && mPopupLevel == ePopupLevelParent)
-        [nativeParentWindow addChildWindow:mWindow
-                            ordered:NSWindowAbove];
-    }
-    else {
-      NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-      if (mWindowType == eWindowType_toplevel &&
-          [mWindow respondsToSelector:@selector(setAnimationBehavior:)]) {
-        NSWindowAnimationBehavior behavior;
-        if (mIsAnimationSuppressed) {
-          behavior = NSWindowAnimationBehaviorNone;
-        } else {
-          switch (mAnimationType) {
-            case nsIWidget::eDocumentWindowAnimation:
-              behavior = NSWindowAnimationBehaviorDocumentWindow;
-              break;
-            default:
-              NS_NOTREACHED("unexpected mAnimationType value");
-              // fall through
-            case nsIWidget::eGenericWindowAnimation:
-              behavior = NSWindowAnimationBehaviorDefault;
-              break;
-          }
-        }
-        [mWindow setAnimationBehavior:behavior];
-      }
-      [mWindow makeKeyAndOrderFront:nil];
-      NS_OBJC_END_TRY_ABORT_BLOCK;
-      SendSetZLevelEvent();
-    }
-  }
-  else {
-    // roll up any popups if a top-level window is going away
-    if (mWindowType == eWindowType_toplevel || mWindowType == eWindowType_dialog)
-      RollUpPopups();
-
-    // now get rid of the window/sheet
-    if (mWindowType == eWindowType_sheet) {
-      if (mSheetNeedsShow) {
-        // This is an attempt to hide a sheet that never had a chance to
-        // be shown. There's nothing to do other than make sure that it
-        // won't show.
-        mSheetNeedsShow = false;
-      }
-      else {
-        // get sheet's parent *before* hiding the sheet (which breaks the linkage)
-        NSWindow* sheetParent = mSheetWindowParent;
-        
-        // hide the sheet
-        [NSApp endSheet:mWindow];
-        
-        [TopLevelWindowData deactivateInWindow:mWindow];
-
-        nsCOMPtr<nsIWidget> siblingSheetToShow;
-        bool parentIsSheet = false;
-
-        if (nativeParentWindow && piParentWidget &&
-            NS_SUCCEEDED(piParentWidget->GetChildSheet(
-                             false, getter_AddRefs(siblingSheetToShow))) &&
-            siblingSheetToShow) {
-          // First, give sibling sheets an opportunity to show.
-          siblingSheetToShow->Show(true);
-        }
-        else if (nativeParentWindow && piParentWidget &&
-                 NS_SUCCEEDED(piParentWidget->GetIsSheet(&parentIsSheet)) &&
-                 parentIsSheet) {
-          // Only set contextInfo if the parent of the parent sheet we're about
-          // to restore isn't itself a sheet.
-          NSWindow* contextInfo = sheetParent;
-          nsIWidget* grandparentWidget = nil;
-          if (NS_SUCCEEDED(piParentWidget->GetRealParent(&grandparentWidget)) && grandparentWidget) {
-            nsCOMPtr<nsPIWidgetCocoa> piGrandparentWidget(do_QueryInterface(grandparentWidget));
-            bool grandparentIsSheet = false;
-            if (piGrandparentWidget && NS_SUCCEEDED(piGrandparentWidget->GetIsSheet(&grandparentIsSheet)) &&
-                grandparentIsSheet) {
-                contextInfo = nil;
-            }
-          }
-          // If there are no sibling sheets, but the parent is a sheet, restore
-          // it.  It wasn't sent any deactivate events when it was hidden, so
-          // don't call through Show, just let the OS put it back up.
-          [NSApp beginSheet:nativeParentWindow
-             modalForWindow:sheetParent
-              modalDelegate:[nativeParentWindow delegate]
-             didEndSelector:@selector(didEndSheet:returnCode:contextInfo:)
-                contextInfo:contextInfo];
-        }
-        else {
-          // Sheet, that was hard.  No more siblings or parents, going back
-          // to a real window.
-          NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-          [sheetParent makeKeyAndOrderFront:nil];
-          NS_OBJC_END_TRY_ABORT_BLOCK;
-        }
-        SendSetZLevelEvent();
-      }
-    }
-    else {
-      // If the window is a popup window with a parent window we need to
-      // unhook it here before ordering it out. When you order out the child
-      // of a window it hides the parent window.
-      if (mWindowType == eWindowType_popup && nativeParentWindow)
-        [nativeParentWindow removeChildWindow:mWindow];
-
-      [mWindow orderOut:nil];
-
-      if (!nsCocoaFeatures::OnMojaveOrLater()) {
-        // Unless it's explicitly removed from NSApp's "window cache", a popup
-        // window will keep receiving mouse-moved events even after it's been
-        // "ordered out" (instead of the browser window that was underneath it,
-        // until you click on that window).  This is bmo bug 378645, but it's
-        // surely an Apple bug.  The "window cache" is an undocumented
-        // subsystem, all of whose methods are included in the NSWindowCache
-        // category of the NSApplication class (in header files generated using
-        // class-dump). This workaround was "borrowed" from the Java Embedding
-        // Plugin (which uses it for a different purpose). This is fixed on
-        // macOS 10.14+.
-        if (mWindowType == eWindowType_popup) {
-          [NSApp _removeWindowFromCache:mWindow];
-        }
-      }
-
-      // If our popup window is a non-native context menu, tell the OS (and
-      // other programs) that a menu has closed.
-      if ([mWindow isKindOfClass:[PopupWindow class]] &&
-          [(PopupWindow*) mWindow isContextMenu]) {
-        [[NSDistributedNotificationCenter defaultCenter]
-          postNotificationName:@"com.apple.HIToolbox.endMenuTrackingNotification"
-                        object:@"org.mozilla.gecko.PopupWindow"];
-      }
-    }
-  }
-
-  [mWindow setBeingShown:NO];
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-struct ShadowParams {
-  float standardDeviation;
-  float density;
-  int offsetX;
-  int offsetY;
-  unsigned int flags;
-};
-
-// These numbers have been determined by looking at the results of
-// CGSGetWindowShadowAndRimParameters for native window types.
-static const ShadowParams kWindowShadowParametersPreYosemite[] = {
-  { 0.0f, 0.0f, 0, 0, 0 },        // none
-  { 8.0f, 0.5f, 0, 6, 1 },        // default
-  { 10.0f, 0.44f, 0, 10, 512 },   // menu
-  { 8.0f, 0.5f, 0, 6, 1 },        // tooltip
-  { 4.0f, 0.6f, 0, 4, 512 }       // sheet
-};
-
-static const ShadowParams kWindowShadowParametersPostYosemite[] = {
-  { 0.0f, 0.0f, 0, 0, 0 },        // none
-  { 8.0f, 0.5f, 0, 6, 1 },        // default
-  { 9.882353f, 0.3f, 0, 4, 0 },   // menu
-  { 3.294118f, 0.2f, 0, 1, 0 },   // tooltip
-  { 9.882353f, 0.3f, 0, 4, 0 }    // sheet
-};
-
-// This method will adjust the window shadow style for popup windows after
-// they have been made visible. Before they're visible, their window number
-// might be -1, which is not useful.
-// We won't attempt to change the shadow for windows that can acquire key state
-// since OS X will reset the shadow whenever that happens.
-void
-nsCocoaWindow::AdjustWindowShadow()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!mWindow || ![mWindow isVisible] || ![mWindow hasShadow] ||
-      [mWindow canBecomeKeyWindow] || [mWindow windowNumber] == -1)
-    return;
-
-  const ShadowParams& params = nsCocoaFeatures::OnYosemiteOrLater()
-    ? kWindowShadowParametersPostYosemite[mShadowStyle]
-    : kWindowShadowParametersPreYosemite[mShadowStyle];
-  CGSConnection cid = _CGSDefaultConnection();
-  CGSSetWindowShadowAndRimParameters(cid, [mWindow windowNumber],
-                                     params.standardDeviation, params.density,
-                                     params.offsetX, params.offsetY,
-                                     params.flags);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-static const NSUInteger kWindowBackgroundBlurRadius = 4;
-
-void
-nsCocoaWindow::SetWindowBackgroundBlur()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!mWindow || ![mWindow isVisible] || [mWindow windowNumber] == -1)
-    return;
-
-  // Only blur the background of menus and fake sheets.
-  if (mShadowStyle != NS_STYLE_WINDOW_SHADOW_MENU &&
-      mShadowStyle != NS_STYLE_WINDOW_SHADOW_SHEET)
-    return;
-
-  CGSConnection cid = _CGSDefaultConnection();
-  CGSSetWindowBackgroundBlurRadius(cid, [mWindow windowNumber], kWindowBackgroundBlurRadius);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-nsresult
-nsCocoaWindow::ConfigureChildren(const nsTArray<Configuration>& aConfigurations)
-{
-  if (mPopupContentView) {
-    mPopupContentView->ConfigureChildren(aConfigurations);
-  }
-  return NS_OK;
-}
-
-LayerManager*
-nsCocoaWindow::GetLayerManager(PLayerTransactionChild* aShadowManager,
-                               LayersBackend aBackendHint,
-                               LayerManagerPersistence aPersistence)
-{
-  if (mPopupContentView) {
-    return mPopupContentView->GetLayerManager(aShadowManager,
-                                              aBackendHint,
-                                              aPersistence);
-  }
-  return nullptr;
-}
-
-nsTransparencyMode nsCocoaWindow::GetTransparencyMode()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  return (!mWindow || [mWindow isOpaque]) ? eTransparencyOpaque : eTransparencyTransparent;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(eTransparencyOpaque);
-}
-
-// This is called from nsMenuPopupFrame when making a popup transparent, or
-// from nsChildView::SetTransparencyMode for other window types.
-void nsCocoaWindow::SetTransparencyMode(nsTransparencyMode aMode)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!mWindow)
-    return;
-
-  // Transparent windows are only supported on popups.
-  BOOL isTransparent = aMode == eTransparencyTransparent &&
-                       mWindowType == eWindowType_popup;
-  BOOL currentTransparency = ![mWindow isOpaque];
-  if (isTransparent != currentTransparency) {
-    [mWindow setOpaque:!isTransparent];
-    [mWindow setBackgroundColor:(isTransparent ? [NSColor clearColor] : [NSColor whiteColor])];
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-NS_IMETHODIMP nsCocoaWindow::Enable(bool aState)
-{
-  return NS_OK;
-}
-
-bool nsCocoaWindow::IsEnabled() const
-{
-  return true;
-}
-
-#define kWindowPositionSlop 20
-
-void
-nsCocoaWindow::ConstrainPosition(bool aAllowSlop, int32_t *aX, int32_t *aY)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!mWindow || ![mWindow screen]) {
-    return;
-  }
-
-  nsIntRect screenBounds;
-
-  int32_t width, height;
-
-  NSRect frame = [mWindow frame];
-
-  // zero size rects confuse the screen manager
-  width = std::max<int32_t>(frame.size.width, 1);
-  height = std::max<int32_t>(frame.size.height, 1);
-
-  nsCOMPtr<nsIScreenManager> screenMgr = do_GetService("@mozilla.org/gfx/screenmanager;1");
-  if (screenMgr) {
-    nsCOMPtr<nsIScreen> screen;
-    screenMgr->ScreenForRect(*aX, *aY, width, height, getter_AddRefs(screen));
-
-    if (screen) {
-      screen->GetRectDisplayPix(&(screenBounds.x), &(screenBounds.y),
-                                &(screenBounds.width), &(screenBounds.height));
-    }
-  }
-
-  if (aAllowSlop) {
-    if (*aX < screenBounds.x - width + kWindowPositionSlop) {
-      *aX = screenBounds.x - width + kWindowPositionSlop;
-    } else if (*aX >= screenBounds.x + screenBounds.width - kWindowPositionSlop) {
-      *aX = screenBounds.x + screenBounds.width - kWindowPositionSlop;
-    }
-
-    if (*aY < screenBounds.y - height + kWindowPositionSlop) {
-      *aY = screenBounds.y - height + kWindowPositionSlop;
-    } else if (*aY >= screenBounds.y + screenBounds.height - kWindowPositionSlop) {
-      *aY = screenBounds.y + screenBounds.height - kWindowPositionSlop;
-    }
-  } else {
-    if (*aX < screenBounds.x) {
-      *aX = screenBounds.x;
-    } else if (*aX >= screenBounds.x + screenBounds.width - width) {
-      *aX = screenBounds.x + screenBounds.width - width;
-    }
-
-    if (*aY < screenBounds.y) {
-      *aY = screenBounds.y;
-    } else if (*aY >= screenBounds.y + screenBounds.height - height) {
-      *aY = screenBounds.y + screenBounds.height - height;
-    }
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void nsCocoaWindow::SetSizeConstraints(const SizeConstraints& aConstraints)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  // Popups can be smaller than (60, 60)
-  NSRect rect =
-    (mWindowType == eWindowType_popup) ? NSZeroRect : NSMakeRect(0.0, 0.0, 60, 60);
-  rect = [mWindow frameRectForContentRect:rect];
-
-  CGFloat scaleFactor = BackingScaleFactor();
-
-  SizeConstraints c = aConstraints;
-  c.mMinSize.width =
-    std::max(nsCocoaUtils::CocoaPointsToDevPixels(rect.size.width, scaleFactor),
-           c.mMinSize.width);
-  c.mMinSize.height =
-    std::max(nsCocoaUtils::CocoaPointsToDevPixels(rect.size.height, scaleFactor),
-           c.mMinSize.height);
-
-  NSSize minSize = {
-    nsCocoaUtils::DevPixelsToCocoaPoints(c.mMinSize.width, scaleFactor),
-    nsCocoaUtils::DevPixelsToCocoaPoints(c.mMinSize.height, scaleFactor)
-  };
-  [mWindow setMinSize:minSize];
-
-  NSSize maxSize = {
-    c.mMaxSize.width == NS_MAXSIZE ?
-      FLT_MAX : nsCocoaUtils::DevPixelsToCocoaPoints(c.mMaxSize.width, scaleFactor),
-    c.mMaxSize.height == NS_MAXSIZE ?
-      FLT_MAX : nsCocoaUtils::DevPixelsToCocoaPoints(c.mMaxSize.height, scaleFactor)
-  };
-  [mWindow setMaxSize:maxSize];
-
-  nsBaseWidget::SetSizeConstraints(c);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-// Coordinates are desktop pixels
-NS_IMETHODIMP nsCocoaWindow::Move(double aX, double aY)
-{
-  if (!mWindow) {
-    return NS_OK;
-  }
-
-  // The point we have is in Gecko coordinates (origin top-left). Convert
-  // it to Cocoa ones (origin bottom-left).
-  NSPoint coord = {
-    static_cast<float>(aX),
-    static_cast<float>(nsCocoaUtils::FlippedScreenY(NSToIntRound(aY)))
-  };
-
-  NSRect frame = [mWindow frame];
-  if (frame.origin.x != coord.x ||
-      frame.origin.y + frame.size.height != coord.y) {
-    [mWindow setFrameTopLeftPoint:coord];
-  }
-
-  return NS_OK;
-}
-
-void
-nsCocoaWindow::SetSizeMode(nsSizeMode aMode)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!mWindow)
-    return;
-
-  // mSizeMode will be updated in DispatchSizeModeEvent, which will be called
-  // from a delegate method that handles the state change during one of the
-  // calls below.
-  nsSizeMode previousMode = mSizeMode;
-
-  if (aMode == nsSizeMode_Normal) {
-    if ([mWindow isMiniaturized])
-      [mWindow deminiaturize:nil];
-    else if (previousMode == nsSizeMode_Maximized && [mWindow isZoomed])
-      [mWindow zoom:nil];
-  }
-  else if (aMode == nsSizeMode_Minimized) {
-    if (![mWindow isMiniaturized])
-      [mWindow miniaturize:nil];
-  }
-  else if (aMode == nsSizeMode_Maximized) {
-    if ([mWindow isMiniaturized])
-      [mWindow deminiaturize:nil];
-    if (![mWindow isZoomed])
-      [mWindow zoom:nil];
-  }
-  else if (aMode == nsSizeMode_Fullscreen) {
-    if (!mInFullScreenMode)
-      MakeFullScreen(true);
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-// This has to preserve the window's frame bounds.
-// This method requires (as does the Windows impl.) that you call Resize shortly
-// after calling HideWindowChrome. See bug 498835 for fixing this.
-NS_IMETHODIMP nsCocoaWindow::HideWindowChrome(bool aShouldHide)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  if (!mWindow || !mWindowMadeHere ||
-      (mWindowType != eWindowType_toplevel && mWindowType != eWindowType_dialog))
-    return NS_ERROR_FAILURE;
-
-  BOOL isVisible = [mWindow isVisible];
-
-  // Remove child windows.
-  NSArray* childWindows = [mWindow childWindows];
-  NSEnumerator* enumerator = [childWindows objectEnumerator];
-  NSWindow* child = nil;
-  while ((child = [enumerator nextObject])) {
-    [mWindow removeChildWindow:child];
-  }
-
-  // Remove the content view.
-  NSView* contentView = [mWindow contentView];
-  [contentView retain];
-  [contentView removeFromSuperviewWithoutNeedingDisplay];
-
-  // Save state (like window title).
-  NSMutableDictionary* state = [mWindow exportState];
-
-  // Recreate the window with the right border style.
-  NSRect frameRect = [mWindow frame];
-  DestroyNativeWindow();
-  nsresult rv = CreateNativeWindow(frameRect, aShouldHide ? eBorderStyle_none : mBorderStyle, true);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // Re-import state.
-  [mWindow importState:state];
-
-  // Reparent the content view.
-  [mWindow setContentView:contentView];
-  [contentView release];
-
-  // Reparent child windows.
-  enumerator = [childWindows objectEnumerator];
-  while ((child = [enumerator nextObject])) {
-    [mWindow addChildWindow:child ordered:NSWindowAbove];
-  }
-
-  // Show the new window.
-  if (isVisible) {
-    bool wasAnimationSuppressed = mIsAnimationSuppressed;
-    mIsAnimationSuppressed = true;
-    rv = Show(true);
-    mIsAnimationSuppressed = wasAnimationSuppressed;
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-class FullscreenTransitionData : public nsISupports
-{
-public:
-  NS_DECL_ISUPPORTS
-
-  explicit FullscreenTransitionData(NSWindow* aWindow)
-    : mTransitionWindow(aWindow) { }
-
-  NSWindow* mTransitionWindow;
-
-private:
-  virtual ~FullscreenTransitionData()
-  {
-    [mTransitionWindow close];
-  }
-};
-
-NS_IMPL_ISUPPORTS0(FullscreenTransitionData)
-
-@interface FullscreenTransitionDelegate : NSObject <NSAnimationDelegate>
-{
-@public
-  nsCocoaWindow* mWindow;
-  nsIRunnable* mCallback;
-}
-@end
-
-@implementation FullscreenTransitionDelegate
-- (void)cleanupAndDispatch:(NSAnimation* )animation
-{
-  [animation setDelegate:nil];
-  [self autorelease];
-  // The caller should have added ref for us.
-  NS_DispatchToMainThread(already_AddRefed<nsIRunnable>(mCallback));
-}
-
-- (void)animationDidEnd:(NSAnimation *)animation
-{
-  MOZ_ASSERT(animation == mWindow->FullscreenTransitionAnimation(),
-             "Should be handling the only animation on the window");
-  mWindow->ReleaseFullscreenTransitionAnimation();
-  [self cleanupAndDispatch:animation];
-}
-
-- (void)animationDidStop:(NSAnimation *)animation
-{
-  [self cleanupAndDispatch:animation];
-}
-@end
-
-/* virtual */ bool
-nsCocoaWindow::PrepareForFullscreenTransition(nsISupports** aData)
-{
-  nsCOMPtr<nsIScreen> widgetScreen = GetWidgetScreen();
-  nsScreenCocoa* screen = static_cast<nsScreenCocoa*>(widgetScreen.get());
-  NSScreen* cocoaScreen = screen->CocoaScreen();
-
-  NSWindow* win =
-    [[NSWindow alloc] initWithContentRect:[cocoaScreen frame]
-                                styleMask:NSBorderlessWindowMask
-                                  backing:NSBackingStoreBuffered
-                                    defer:YES];
-  [win setBackgroundColor:[NSColor blackColor]];
-  [win setAlphaValue:0];
-  [win setIgnoresMouseEvents:YES];
-  [win setLevel:NSScreenSaverWindowLevel];
-  [win makeKeyAndOrderFront:nil];
-
-  auto data = new FullscreenTransitionData(win);
-  *aData = data;
-  NS_ADDREF(data);
-  return true;
-}
-
-/* virtual */ void
-nsCocoaWindow::PerformFullscreenTransition(FullscreenTransitionStage aStage,
-                                           uint16_t aDuration,
-                                           nsISupports* aData,
-                                           nsIRunnable* aCallback)
-{
-  auto data = static_cast<FullscreenTransitionData*>(aData);
-  FullscreenTransitionDelegate* delegate =
-    [[FullscreenTransitionDelegate alloc] init];
-  delegate->mWindow = this;
-  // Storing already_AddRefed directly could cause static checking fail.
-  delegate->mCallback = nsCOMPtr<nsIRunnable>(aCallback).forget().take();
-
-  if (mFullscreenTransitionAnimation) {
-    [mFullscreenTransitionAnimation stopAnimation];
-    ReleaseFullscreenTransitionAnimation();
-  }
-
-  NSDictionary* dict = @{
-    NSViewAnimationTargetKey: data->mTransitionWindow,
-    NSViewAnimationEffectKey: aStage == eBeforeFullscreenToggle ?
-      NSViewAnimationFadeInEffect : NSViewAnimationFadeOutEffect
-  };
-  mFullscreenTransitionAnimation =
-    [[NSViewAnimation alloc] initWithViewAnimations:@[dict]];
-  [mFullscreenTransitionAnimation setDelegate:delegate];
-  [mFullscreenTransitionAnimation setDuration:aDuration / 1000.0];
-  [mFullscreenTransitionAnimation startAnimation];
-}
-
-void nsCocoaWindow::EnteredFullScreen(bool aFullScreen, bool aNativeMode)
-{
-  mInFullScreenTransition = false;
-  bool wasInFullscreen = mInFullScreenMode;
-  mInFullScreenMode = aFullScreen;
-  if (aNativeMode || mInNativeFullScreenMode) {
-    mInNativeFullScreenMode = aFullScreen;
-  }
-  DispatchSizeModeEvent();
-  if (mWidgetListener && wasInFullscreen != aFullScreen) {
-    mWidgetListener->FullscreenChanged(aFullScreen);
-  }
-}
-
-inline bool
-nsCocoaWindow::ShouldToggleNativeFullscreen(bool aFullScreen,
-                                            bool aUseSystemTransition)
-{
-  if (!mSupportsNativeFullScreen) {
-    // If we cannot use native fullscreen, don't touch it.
-    return false;
-  }
-  if (mInNativeFullScreenMode) {
-    // If we are using native fullscreen, go ahead to exit it.
-    return true;
-  }
-  if (!aUseSystemTransition) {
-    // If we do not want the system fullscreen transition,
-    // don't use the native fullscreen.
-    return false;
-  }
-  // If we are using native fullscreen, we should have returned earlier.
-  return aFullScreen;
-}
-
-nsresult
-nsCocoaWindow::MakeFullScreen(bool aFullScreen, nsIScreen* aTargetScreen)
-{
-  return DoMakeFullScreen(aFullScreen, false);
-}
-
-NS_IMETHODIMP
-nsCocoaWindow::MakeFullScreenWithNativeTransition(bool aFullScreen,
-                                                  nsIScreen* aTargetScreen)
-{
-  return DoMakeFullScreen(aFullScreen, true);
-}
-
-nsresult
-nsCocoaWindow::DoMakeFullScreen(bool aFullScreen, bool aUseSystemTransition)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  if (!mWindow) {
-    return NS_OK;
-  }
-
-  // We will call into MakeFullScreen redundantly when entering/exiting
-  // fullscreen mode via OS X controls. When that happens we should just handle
-  // it gracefully - no need to ASSERT.
-  if (mInFullScreenMode == aFullScreen) {
-    return NS_OK;
-  }
-
-  mInFullScreenTransition = true;
-
-  if (ShouldToggleNativeFullscreen(aFullScreen, aUseSystemTransition)) {
-    // If we're using native fullscreen mode and our native window is invisible,
-    // our attempt to go into fullscreen mode will fail with an assertion in
-    // system code, without [WindowDelegate windowDidFailToEnterFullScreen:]
-    // ever getting called.  To pre-empt this we bail here.  See bug 752294.
-    if (aFullScreen && ![mWindow isVisible]) {
-      EnteredFullScreen(false);
-      return NS_OK;
-    }
-    MOZ_ASSERT(mInNativeFullScreenMode != aFullScreen,
-               "We shouldn't have been in native fullscreen.");
-    // Calling toggleFullScreen will result in windowDid(FailTo)?(Enter|Exit)FullScreen
-    // to be called from the OS. We will call EnteredFullScreen from those methods,
-    // where mInFullScreenMode will be set and a sizemode event will be dispatched.
-    [mWindow toggleFullScreen:nil];
-  } else {
-    NSDisableScreenUpdates();
-    // The order here matters. When we exit full screen mode, we need to show the
-    // Dock first, otherwise the newly-created window won't have its minimize
-    // button enabled. See bug 526282.
-    nsCocoaUtils::HideOSChromeOnScreen(aFullScreen);
-    nsBaseWidget::InfallibleMakeFullScreen(aFullScreen);
-    NSEnableScreenUpdates();
-    EnteredFullScreen(aFullScreen, /* aNativeMode */ false);
-  }
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-// Coordinates are desktop pixels
-nsresult nsCocoaWindow::DoResize(double aX, double aY,
-                                 double aWidth, double aHeight,
-                                 bool aRepaint,
-                                 bool aConstrainToCurrentScreen)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  if (!mWindow || mInResize) {
-    return NS_OK;
-  }
-
-  AutoRestore<bool> reentrantResizeGuard(mInResize);
-  mInResize = true;
-
-  // ConstrainSize operates in device pixels, so we need to convert using
-  // the backing scale factor here
-  CGFloat scale = BackingScaleFactor();
-  int32_t width = NSToIntRound(aWidth * scale);
-  int32_t height = NSToIntRound(aHeight * scale);
-  ConstrainSize(&width, &height);
-
-  DesktopIntRect newBounds(NSToIntRound(aX), NSToIntRound(aY),
-                           NSToIntRound(width / scale),
-                           NSToIntRound(height / scale));
-
-  // constrain to the screen that contains the largest area of the new rect
-  FitRectToVisibleAreaForScreen(newBounds, aConstrainToCurrentScreen ?
-                                           [mWindow screen] : nullptr);
-
-  // convert requested bounds into Cocoa coordinate system
-  NSRect newFrame = nsCocoaUtils::GeckoRectToCocoaRect(newBounds);
-
-  NSRect frame = [mWindow frame];
-  BOOL isMoving = newFrame.origin.x != frame.origin.x ||
-                  newFrame.origin.y != frame.origin.y;
-  BOOL isResizing = newFrame.size.width != frame.size.width ||
-                    newFrame.size.height != frame.size.height;
-
-  if (!isMoving && !isResizing) {
-    return NS_OK;
-  }
-
-  // We ignore aRepaint -- we have to call display:YES, otherwise the
-  // title bar doesn't immediately get repainted and is displayed in
-  // the wrong place, leading to a visual jump.
-  [mWindow setFrame:newFrame display:YES];
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-// Coordinates are desktop pixels
-NS_IMETHODIMP nsCocoaWindow::Resize(double aX, double aY,
-                                    double aWidth, double aHeight,
-                                    bool aRepaint)
-{
-  return DoResize(aX, aY, aWidth, aHeight, aRepaint, false);
-}
-
-// Coordinates are desktop pixels
-NS_IMETHODIMP nsCocoaWindow::Resize(double aWidth, double aHeight, bool aRepaint)
-{
-  double invScale = 1.0 / BackingScaleFactor();
-  return DoResize(mBounds.x * invScale, mBounds.y * invScale,
-                  aWidth, aHeight, aRepaint, true);
-}
-
-LayoutDeviceIntRect
-nsCocoaWindow::GetClientBounds()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  CGFloat scaleFactor = BackingScaleFactor();
-  if (!mWindow) {
-    return nsCocoaUtils::CocoaRectToGeckoRectDevPix(NSZeroRect, scaleFactor);
-  }
-
-  NSRect r;
-  if ([mWindow isKindOfClass:[ToolbarWindow class]] &&
-      [(ToolbarWindow*)mWindow drawsContentsIntoWindowFrame]) {
-    r = [mWindow frame];
-  } else {
-    r = [mWindow contentRectForFrameRect:[mWindow frame]];
-  }
-
-  return nsCocoaUtils::CocoaRectToGeckoRectDevPix(r, scaleFactor);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(LayoutDeviceIntRect(0, 0, 0, 0));
-}
-
-void
-nsCocoaWindow::UpdateBounds()
-{
-  NSRect frame = NSZeroRect;
-  if (mWindow) {
-    frame = [mWindow frame];
-  }
-  mBounds =
-    nsCocoaUtils::CocoaRectToGeckoRectDevPix(frame, BackingScaleFactor());
-}
-
-LayoutDeviceIntRect
-nsCocoaWindow::GetScreenBounds()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-#ifdef DEBUG
-  LayoutDeviceIntRect r = nsCocoaUtils::CocoaRectToGeckoRectDevPix([mWindow frame], BackingScaleFactor());
-  NS_ASSERTION(mWindow && mBounds == r, "mBounds out of sync!");
-#endif
-
-  return mBounds;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(LayoutDeviceIntRect(0, 0, 0, 0));
-}
-
-double
-nsCocoaWindow::GetDefaultScaleInternal()
-{
-  return BackingScaleFactor();
-}
-
-static CGFloat
-GetBackingScaleFactor(NSWindow* aWindow)
-{
-  NSRect frame = [aWindow frame];
-  if (frame.size.width > 0 && frame.size.height > 0) {
-    return nsCocoaUtils::GetBackingScaleFactor(aWindow);
-  }
-
-  // For windows with zero width or height, the backingScaleFactor method
-  // is broken - it will always return 2 on a retina macbook, even when
-  // the window position implies it's on a non-hidpi external display
-  // (to the extent that a zero-area window can be said to be "on" a
-  // display at all!)
-  // And to make matters worse, Cocoa even fires a
-  // windowDidChangeBackingProperties notification with the
-  // NSBackingPropertyOldScaleFactorKey key when a window on an
-  // external display is resized to/from zero height, even though it hasn't
-  // really changed screens.
-
-  // This causes us to handle popup window sizing incorrectly when the
-  // popup is resized to zero height (bug 820327) - nsXULPopupManager
-  // becomes (incorrectly) convinced the popup has been explicitly forced
-  // to a non-default size and needs to have size attributes attached.
-
-  // Workaround: instead of asking the window, we'll find the screen it is on
-  // and ask that for *its* backing scale factor.
-
-  // (See bug 853252 and additional comments in windowDidChangeScreen: below
-  // for further complications this causes.)
-
-  // First, expand the rect so that it actually has a measurable area,
-  // for FindTargetScreenForRect to use.
-  if (frame.size.width == 0) {
-    frame.size.width = 1;
-  }
-  if (frame.size.height == 0) {
-    frame.size.height = 1;
-  }
-
-  // Then identify the screen it belongs to, and return its scale factor.
-  NSScreen *screen =
-    FindTargetScreenForRect(nsCocoaUtils::CocoaRectToGeckoRect(frame));
-  return nsCocoaUtils::GetBackingScaleFactor(screen);
-}
-
-CGFloat
-nsCocoaWindow::BackingScaleFactor()
-{
-  if (mBackingScaleFactor > 0.0) {
-    return mBackingScaleFactor;
-  }
-  if (!mWindow) {
-    return 1.0;
-  }
-  mBackingScaleFactor = GetBackingScaleFactor(mWindow);
-  return mBackingScaleFactor;
-}
-
-void
-nsCocoaWindow::BackingScaleFactorChanged()
-{
-  CGFloat newScale = GetBackingScaleFactor(mWindow);
-
-  // ignore notification if it hasn't really changed (or maybe we have
-  // disabled HiDPI mode via prefs)
-  if (mBackingScaleFactor == newScale) {
-    return;
-  }
-
-  if (mBackingScaleFactor > 0.0) {
-    // convert size constraints to the new device pixel coordinate space
-    double scaleFactor = newScale / mBackingScaleFactor;
-    mSizeConstraints.mMinSize.width =
-      NSToIntRound(mSizeConstraints.mMinSize.width * scaleFactor);
-    mSizeConstraints.mMinSize.height =
-      NSToIntRound(mSizeConstraints.mMinSize.height * scaleFactor);
-    if (mSizeConstraints.mMaxSize.width < NS_MAXSIZE) {
-      mSizeConstraints.mMaxSize.width =
-        std::min(NS_MAXSIZE,
-               NSToIntRound(mSizeConstraints.mMaxSize.width * scaleFactor));
-    }
-    if (mSizeConstraints.mMaxSize.height < NS_MAXSIZE) {
-      mSizeConstraints.mMaxSize.height =
-        std::min(NS_MAXSIZE,
-               NSToIntRound(mSizeConstraints.mMaxSize.height * scaleFactor));
-    }
-  }
-
-  mBackingScaleFactor = newScale;
-
-  if (!mWidgetListener || mWidgetListener->GetXULWindow()) {
-    return;
-  }
-
-  nsIPresShell* presShell = mWidgetListener->GetPresShell();
-  if (presShell) {
-    presShell->BackingScaleFactorChanged();
-  }
-}
-
-int32_t
-nsCocoaWindow::RoundsWidgetCoordinatesTo()
-{
-  if (BackingScaleFactor() == 2.0) {
-    return 2;
-  }
-  return 1;
-}
-
-NS_IMETHODIMP nsCocoaWindow::SetCursor(nsCursor aCursor)
-{
-  if (mPopupContentView)
-    return mPopupContentView->SetCursor(aCursor);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsCocoaWindow::SetCursor(imgIContainer* aCursor,
-                                       uint32_t aHotspotX, uint32_t aHotspotY)
-{
-  if (mPopupContentView)
-    return mPopupContentView->SetCursor(aCursor, aHotspotX, aHotspotY);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsCocoaWindow::SetTitle(const nsAString& aTitle)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  if (!mWindow)
-    return NS_OK;
-
-  const nsString& strTitle = PromiseFlatString(aTitle);
-  NSString* title = [NSString stringWithCharacters:reinterpret_cast<const unichar*>(strTitle.get())
-                                            length:strTitle.Length()];
-
-  if ([mWindow drawsContentsIntoWindowFrame] && ![mWindow wantsTitleDrawn]) {
-    // Don't cause invalidations.
-    [mWindow disableSetNeedsDisplay];
-    [mWindow setTitle:title];
-    [mWindow enableSetNeedsDisplay];
-  } else {
-    [mWindow setTitle:title];
-  }
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP nsCocoaWindow::Invalidate(const LayoutDeviceIntRect& aRect)
-{
-  if (mPopupContentView) {
-    return mPopupContentView->Invalidate(aRect);
-  }
-
-  return NS_OK;
-}
-
-// Pass notification of some drag event to Gecko
-//
-// The drag manager has let us know that something related to a drag has
-// occurred in this window. It could be any number of things, ranging from 
-// a drop, to a drag enter/leave, or a drag over event. The actual event
-// is passed in |aMessage| and is passed along to our event hanlder so Gecko
-// knows about it.
-bool nsCocoaWindow::DragEvent(unsigned int aMessage, mozilla::gfx::Point aMouseGlobal, UInt16 aKeyModifiers)
-{
-  return false;
-}
-
-NS_IMETHODIMP nsCocoaWindow::SendSetZLevelEvent()
-{
-  nsWindowZ placement = nsWindowZTop;
-  nsCOMPtr<nsIWidget> actualBelow;
-  if (mWidgetListener)
-    mWidgetListener->ZLevelChanged(true, &placement, nullptr, getter_AddRefs(actualBelow));
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsCocoaWindow::GetChildSheet(bool aShown, nsIWidget** _retval)
-{
-  nsIWidget* child = GetFirstChild();
-
-  while (child) {
-    if (child->WindowType() == eWindowType_sheet) {
-      // if it's a sheet, it must be an nsCocoaWindow
-      nsCocoaWindow* cocoaWindow = static_cast<nsCocoaWindow*>(child);
-      if (cocoaWindow->mWindow &&
-          ((aShown && [cocoaWindow->mWindow isVisible]) ||
-          (!aShown && cocoaWindow->mSheetNeedsShow))) {
-        nsCOMPtr<nsIWidget> widget = cocoaWindow;
-        widget.forget(_retval);
-        return NS_OK;
-      }
-    }
-    child = child->GetNextSibling();
-  }
-
-  *_retval = nullptr;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsCocoaWindow::GetRealParent(nsIWidget** parent)
-{
-  *parent = mParent;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsCocoaWindow::GetIsSheet(bool* isSheet)
-{
-  mWindowType == eWindowType_sheet ? *isSheet = true : *isSheet = false;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsCocoaWindow::GetSheetWindowParent(NSWindow** sheetWindowParent)
-{
-  *sheetWindowParent = mSheetWindowParent;
-  return NS_OK;
-}
-
-// Invokes callback and ProcessEvent methods on Event Listener object
-NS_IMETHODIMP 
-nsCocoaWindow::DispatchEvent(WidgetGUIEvent* event, nsEventStatus& aStatus)
-{
-  aStatus = nsEventStatus_eIgnore;
-
-  nsCOMPtr<nsIWidget> kungFuDeathGrip(event->mWidget);
-  mozilla::Unused << kungFuDeathGrip; // Not used within this function
-
-  if (mWidgetListener)
-    aStatus = mWidgetListener->HandleEvent(event, mUseAttachedEvents);
-
-  return NS_OK;
-}
-
-// aFullScreen should be the window's mInFullScreenMode. We don't have access to that
-// from here, so we need to pass it in. mInFullScreenMode should be the canonical
-// indicator that a window is currently full screen and it makes sense to keep
-// all sizemode logic here.
-static nsSizeMode
-GetWindowSizeMode(NSWindow* aWindow, bool aFullScreen) {
-  if (aFullScreen)
-    return nsSizeMode_Fullscreen;
-  if ([aWindow isMiniaturized])
-    return nsSizeMode_Minimized;
-  if (([aWindow styleMask] & NSResizableWindowMask) && [aWindow isZoomed])
-    return nsSizeMode_Maximized;
-  return nsSizeMode_Normal;
-}
-
-void
-nsCocoaWindow::ReportMoveEvent()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  // Prevent recursion, which can become infinite (see bug 708278).  This
-  // can happen when the call to [NSWindow setFrameTopLeftPoint:] in
-  // nsCocoaWindow::Move() triggers an immediate NSWindowDidMove notification
-  // (and a call to [WindowDelegate windowDidMove:]).
-  if (mInReportMoveEvent) {
-    return;
-  }
-  mInReportMoveEvent = true;
-
-  UpdateBounds();
-
-  // Dispatch the move event to Gecko
-  NotifyWindowMoved(mBounds.x, mBounds.y);
-
-  mInReportMoveEvent = false;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void
-nsCocoaWindow::DispatchSizeModeEvent()
-{
-  if (!mWindow) {
-    return;
-  }
-
-  nsSizeMode newMode = GetWindowSizeMode(mWindow, mInFullScreenMode);
-
-  // Don't dispatch a sizemode event if:
-  // 1. the window is transitioning to fullscreen
-  // 2. the new sizemode is the same as the current sizemode
-  if (mInFullScreenTransition || mSizeMode == newMode) {
-    return;
-  }
-
-  mSizeMode = newMode;
-  if (mWidgetListener) {
-    mWidgetListener->SizeModeChanged(newMode);
-  }
-}
-
-void
-nsCocoaWindow::ReportSizeEvent()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  UpdateBounds();
-
-  if (mWidgetListener) {
-    LayoutDeviceIntRect innerBounds = GetClientBounds();
-    mWidgetListener->WindowResized(this, innerBounds.width, innerBounds.height);
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void nsCocoaWindow::SetMenuBar(nsMenuBarX *aMenuBar)
-{
-  if (mMenuBar)
-    mMenuBar->SetParent(nullptr);
-  if (!mWindow) {
-    mMenuBar = nullptr;
-    return;
-  }
-  mMenuBar = aMenuBar;
-
-  // Only paint for active windows, or paint the hidden window menu bar if no
-  // other menu bar has been painted yet so that some reasonable menu bar is
-  // displayed when the app starts up.
-  id windowDelegate = [mWindow delegate];
-  if (mMenuBar &&
-      ((!gSomeMenuBarPainted && nsMenuUtilsX::GetHiddenWindowMenuBar() == mMenuBar) ||
-       (windowDelegate && [windowDelegate toplevelActiveState])))
-    mMenuBar->Paint();
-}
-
-NS_IMETHODIMP nsCocoaWindow::SetFocus(bool aState)
-{
-  if (!mWindow)
-    return NS_OK;
-
-  if (mPopupContentView) {
-    mPopupContentView->SetFocus(aState);
-  }
-  else if (aState && ([mWindow isVisible] || [mWindow isMiniaturized])) {
-    if ([mWindow isMiniaturized]) {
-      [mWindow deminiaturize:nil];
-    }
-
-    [mWindow makeKeyAndOrderFront:nil];
-    SendSetZLevelEvent();
-  }
-
-  return NS_OK;
-}
-
-LayoutDeviceIntPoint nsCocoaWindow::WidgetToScreenOffset()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  NSRect rect = NSZeroRect;
-  LayoutDeviceIntRect r;
-  if (mWindow) {
-    rect = [mWindow contentRectForFrameRect:[mWindow frame]];
-  }
-  r = nsCocoaUtils::CocoaRectToGeckoRectDevPix(rect, BackingScaleFactor());
-
-  return r.TopLeft();
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(LayoutDeviceIntPoint(0,0));
-}
-
-LayoutDeviceIntPoint nsCocoaWindow::GetClientOffset()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  LayoutDeviceIntRect clientRect = GetClientBounds();
-
-  return clientRect.TopLeft() - mBounds.TopLeft();
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(LayoutDeviceIntPoint(0, 0));
-}
-
-LayoutDeviceIntSize
-nsCocoaWindow::ClientToWindowSize(const LayoutDeviceIntSize& aClientSize)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  if (!mWindow)
-    return LayoutDeviceIntSize(0, 0);
-
-  CGFloat backingScale = BackingScaleFactor();
-  LayoutDeviceIntRect r(0, 0, aClientSize.width, aClientSize.height);
-  NSRect rect = nsCocoaUtils::DevPixelsToCocoaPoints(r, backingScale);
-
-  NSRect inflatedRect = [mWindow frameRectForContentRect:rect];
-  r = nsCocoaUtils::CocoaRectToGeckoRectDevPix(inflatedRect, backingScale);
-  return r.Size();
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(LayoutDeviceIntSize(0,0));
-}
-
-nsMenuBarX* nsCocoaWindow::GetMenuBar()
-{
-  return mMenuBar;
-}
-
-void
-nsCocoaWindow::CaptureRollupEvents(nsIRollupListener* aListener,
-                                   bool aDoCapture)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  gRollupListener = nullptr;
-  
-  if (aDoCapture) {
-    if (![NSApp isActive]) {
-      // We need to capture mouse event if we aren't
-      // the active application. We only set this up when needed
-      // because they cause spurious mouse event after crash
-      // and gdb sessions. See bug 699538.
-      nsToolkit::GetToolkit()->RegisterForAllProcessMouseEvents();
-    }
-    gRollupListener = aListener;
-
-    // Sometimes more than one popup window can be visible at the same time
-    // (e.g. nested non-native context menus, or the test case (attachment
-    // 276885) for bmo bug 392389, which displays a non-native combo-box in a
-    // non-native popup window).  In these cases the "active" popup window should
-    // be the topmost -- the (nested) context menu the mouse is currently over,
-    // or the combo-box's drop-down list (when it's displayed).  But (among
-    // windows that have the same "level") OS X makes topmost the window that
-    // last received a mouse-down event, which may be incorrect (in the combo-
-    // box case, it makes topmost the window containing the combo-box).  So
-    // here we fiddle with a non-native popup window's level to make sure the
-    // "active" one is always above any other non-native popup windows that
-    // may be visible.
-    if (mWindow && (mWindowType == eWindowType_popup))
-      SetPopupWindowLevel();
-  } else {
-    nsToolkit::GetToolkit()->UnregisterAllProcessMouseEventHandlers();
-
-    // XXXndeakin this doesn't make sense.
-    // Why is the new window assumed to be a modal panel?
-    if (mWindow && (mWindowType == eWindowType_popup))
-      [mWindow setLevel:NSModalPanelWindowLevel];
-  }
-  
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-NS_IMETHODIMP nsCocoaWindow::GetAttention(int32_t aCycleCount)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  [NSApp requestUserAttention:NSInformationalRequest];
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-bool
-nsCocoaWindow::HasPendingInputEvent()
-{
-  return nsChildView::DoHasPendingInputEvent();
-}
-
-void
-nsCocoaWindow::SetWindowShadowStyle(int32_t aStyle)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!mWindow)
-    return;
-
-  mShadowStyle = aStyle;
-
-  // Shadowless windows are only supported on popups.
-  if (mWindowType == eWindowType_popup)
-    [mWindow setHasShadow:(aStyle != NS_STYLE_WINDOW_SHADOW_NONE)];
-
-  [mWindow setUseMenuStyle:(aStyle == NS_STYLE_WINDOW_SHADOW_MENU)];
-  AdjustWindowShadow();
-  SetWindowBackgroundBlur();
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void nsCocoaWindow::SetShowsToolbarButton(bool aShow)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (mWindow)
-    [mWindow setShowsToolbarButton:aShow];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void nsCocoaWindow::SetShowsFullScreenButton(bool aShow)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!mWindow || ![mWindow respondsToSelector:@selector(toggleFullScreen:)] ||
-      mSupportsNativeFullScreen == aShow) {
-    return;
-  }
-
-  // If the window is currently in fullscreen mode, then we're going to
-  // transition out first, then set the collection behavior & toggle
-  // mSupportsNativeFullScreen, then transtion back into fullscreen mode. This
-  // prevents us from getting into a conflicting state with MakeFullScreen
-  // where mSupportsNativeFullScreen would lead us down the wrong path.
-  bool wasFullScreen = mInFullScreenMode;
-
-  if (wasFullScreen) {
-    MakeFullScreen(false);
-  }
-
-  NSWindowCollectionBehavior newBehavior = [mWindow collectionBehavior];
-  if (aShow) {
-    newBehavior |= NSWindowCollectionBehaviorFullScreenPrimary;
-  } else {
-    newBehavior &= ~NSWindowCollectionBehaviorFullScreenPrimary;
-  }
-  [mWindow setCollectionBehavior:newBehavior];
-  mSupportsNativeFullScreen = aShow;
-
-  if (wasFullScreen) {
-    MakeFullScreen(true);
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void nsCocoaWindow::SetWindowAnimationType(nsIWidget::WindowAnimationType aType)
-{
-  mAnimationType = aType;
-}
-
-void
-nsCocoaWindow::SetDrawsTitle(bool aDrawTitle)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  [mWindow setWantsTitleDrawn:aDrawTitle];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void
-nsCocoaWindow::SetUseBrightTitlebarForeground(bool aBrightForeground)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  [mWindow setUseBrightTitlebarForeground:aBrightForeground];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-NS_IMETHODIMP nsCocoaWindow::SetNonClientMargins(LayoutDeviceIntMargin &margins)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  SetDrawsInTitlebar(margins.top == 0);
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-void
-nsCocoaWindow::SetWindowTitlebarColor(nscolor aColor, bool aActive)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!mWindow)
-    return;
-
-  // If they pass a color with a complete transparent alpha component, use the
-  // native titlebar appearance.
-  if (NS_GET_A(aColor) == 0) {
-    [mWindow setTitlebarColor:nil forActiveWindow:(BOOL)aActive]; 
-  } else {
-    // Transform from sRGBA to monitor RGBA. This seems like it would make trying
-    // to match the system appearance lame, so probably we just shouldn't color 
-    // correct chrome.
-    if (gfxPlatform::GetCMSMode() == eCMSMode_All) {
-      qcms_transform *transform = gfxPlatform::GetCMSRGBATransform();
-      if (transform) {
-        uint8_t color[3];
-        color[0] = NS_GET_R(aColor);
-        color[1] = NS_GET_G(aColor);
-        color[2] = NS_GET_B(aColor);
-        qcms_transform_data(transform, color, color, 1);
-        aColor = NS_RGB(color[0], color[1], color[2]);
-      }
-    }
-
-    [mWindow setTitlebarColor:[NSColor colorWithDeviceRed:NS_GET_R(aColor)/255.0
-                                                    green:NS_GET_G(aColor)/255.0
-                                                     blue:NS_GET_B(aColor)/255.0
-                                                    alpha:NS_GET_A(aColor)/255.0]
-              forActiveWindow:(BOOL)aActive];
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void nsCocoaWindow::SetDrawsInTitlebar(bool aState)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (mWindow)
-    [mWindow setDrawsContentsIntoWindowFrame:aState];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-NS_IMETHODIMP nsCocoaWindow::SynthesizeNativeMouseEvent(LayoutDeviceIntPoint aPoint,
-                                                        uint32_t aNativeMessage,
-                                                        uint32_t aModifierFlags,
-                                                        nsIObserver* aObserver)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  AutoObserverNotifier notifier(aObserver, "mouseevent");
-  if (mPopupContentView)
-    return mPopupContentView->SynthesizeNativeMouseEvent(aPoint, aNativeMessage,
-                                                         aModifierFlags, nullptr);
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-void nsCocoaWindow::UpdateThemeGeometries(const nsTArray<ThemeGeometry>& aThemeGeometries) {
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (mPopupContentView) {
-    return mPopupContentView->UpdateThemeGeometries(aThemeGeometries);
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void nsCocoaWindow::SetPopupWindowLevel()
-{
-  if (!mWindow)
-    return;
-
-  // Floating popups are at the floating level and hide when the window is
-  // deactivated.
-  if (mPopupLevel == ePopupLevelFloating) {
-    [mWindow setLevel:NSFloatingWindowLevel];
-    [mWindow setHidesOnDeactivate:YES];
-  }
-  else {
-    // Otherwise, this is a top-level or parent popup. Parent popups always
-    // appear just above their parent and essentially ignore the level.
-    [mWindow setLevel:NSPopUpMenuWindowLevel];
-    [mWindow setHidesOnDeactivate:NO];
-  }
-}
-
-NS_IMETHODIMP_(void)
-nsCocoaWindow::SetInputContext(const InputContext& aContext,
-                               const InputContextAction& aAction)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  mInputContext = aContext;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-NS_IMETHODIMP_(bool)
-nsCocoaWindow::ExecuteNativeKeyBinding(NativeKeyBindingsType aType,
-                                       const WidgetKeyboardEvent& aEvent,
-                                       DoCommandCallback aCallback,
-                                       void* aCallbackData)
-{
-  NativeKeyBindings* keyBindings = NativeKeyBindings::GetInstance(aType);
-  return keyBindings->Execute(aEvent, aCallback, aCallbackData);
-}
-
-@implementation WindowDelegate
-
-// We try to find a gecko menu bar to paint. If one does not exist, just paint
-// the application menu by itself so that a window doesn't have some other
-// window's menu bar.
-+ (void)paintMenubarForWindow:(NSWindow*)aWindow
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  // make sure we only act on windows that have this kind of
-  // object as a delegate
-  id windowDelegate = [aWindow delegate];
-  if ([windowDelegate class] != [self class])
-    return;
-
-  nsCocoaWindow* geckoWidget = [windowDelegate geckoWidget];
-  NS_ASSERTION(geckoWidget, "Window delegate not returning a gecko widget!");
-  
-  nsMenuBarX* geckoMenuBar = geckoWidget->GetMenuBar();
-  if (geckoMenuBar) {
-    geckoMenuBar->Paint();
-  }
-  else {
-    // sometimes we don't have a native application menu early in launching
-    if (!sApplicationMenu)
-      return;
-
-    NSMenu* mainMenu = [NSApp mainMenu];
-    NS_ASSERTION([mainMenu numberOfItems] > 0, "Main menu does not have any items, something is terribly wrong!");
-
-    // Create a new menu bar.
-    // We create a GeckoNSMenu because all menu bar NSMenu objects should use that subclass for
-    // key handling reasons.
-    GeckoNSMenu* newMenuBar = [[GeckoNSMenu alloc] initWithTitle:@"MainMenuBar"];
-
-    // move the application menu from the existing menu bar to the new one
-    NSMenuItem* firstMenuItem = [[mainMenu itemAtIndex:0] retain];
-    [mainMenu removeItemAtIndex:0];
-    [newMenuBar insertItem:firstMenuItem atIndex:0];
-    [firstMenuItem release];
-
-    // set our new menu bar as the main menu
-    [NSApp setMainMenu:newMenuBar];
-    [newMenuBar release];
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (id)initWithGeckoWindow:(nsCocoaWindow*)geckoWind
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  [super init];
-  mGeckoWindow = geckoWind;
-  mToplevelActiveState = false;
-  mHasEverBeenZoomed = false;
-  return self;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-- (NSSize)windowWillResize:(NSWindow *)sender toSize:(NSSize)proposedFrameSize
-{
-  RollUpPopups();
-  
-  return proposedFrameSize;
-}
-
-- (void)windowDidResize:(NSNotification *)aNotification
-{
-  BaseWindow* window = [aNotification object];
-  [window updateTrackingArea];
-
-  if (!mGeckoWindow)
-    return;
-
-  // Resizing might have changed our zoom state.
-  mGeckoWindow->DispatchSizeModeEvent();
-  mGeckoWindow->ReportSizeEvent();
-}
-
-- (void)windowDidChangeScreen:(NSNotification *)aNotification
-{
-  if (!mGeckoWindow)
-    return;
-
-  // Because of Cocoa's peculiar treatment of zero-size windows (see comments
-  // at GetBackingScaleFactor() above), we sometimes have a situation where
-  // our concept of backing scale (based on the screen where the zero-sized
-  // window is positioned) differs from Cocoa's idea (always based on the
-  // Retina screen, AFAICT, even when an external non-Retina screen is the
-  // primary display).
-  //
-  // As a result, if the window was created with zero size on an external
-  // display, but then made visible on the (secondary) Retina screen, we
-  // will *not* get a windowDidChangeBackingProperties notification for it.
-  // This leads to an incorrect GetDefaultScale(), and widget coordinate
-  // confusion, as per bug 853252.
-  //
-  // To work around this, we check for a backing scale mismatch when we
-  // receive a windowDidChangeScreen notification, as we will receive this
-  // even if Cocoa was already treating the zero-size window as having
-  // Retina backing scale.
-  NSWindow *window = (NSWindow *)[aNotification object];
-  if ([window respondsToSelector:@selector(backingScaleFactor)]) {
-    if (GetBackingScaleFactor(window) != mGeckoWindow->BackingScaleFactor()) {
-      mGeckoWindow->BackingScaleFactorChanged();
-    }
-  }
-
-  mGeckoWindow->ReportMoveEvent();
-}
-
-// Lion's full screen mode will bypass our internal fullscreen tracking, so
-// we need to catch it when we transition and call our own methods, which in
-// turn will fire "fullscreen" events.
-- (void)windowDidEnterFullScreen:(NSNotification *)notification
-{
-  if (!mGeckoWindow) {
-    return;
-  }
-
-  mGeckoWindow->EnteredFullScreen(true);
-
-  // On Yosemite, the NSThemeFrame class has two new properties --
-  // titlebarView (an NSTitlebarView object) and titlebarContainerView (an
-  // NSTitlebarContainerView object).  These are used to display the titlebar
-  // in fullscreen mode.  In Safari they're not transparent.  But in Firefox
-  // for some reason they are, which causes bug 1069658.  The following code
-  // works around this Apple bug or design flaw.
-  NSWindow *window = (NSWindow *) [notification object];
-  NSView *frameView = [[window contentView] superview];
-  NSView *titlebarView = nil;
-  NSView *titlebarContainerView = nil;
-  if ([frameView respondsToSelector:@selector(titlebarView)]) {
-    titlebarView = [frameView titlebarView];
-  }
-  if ([frameView respondsToSelector:@selector(titlebarContainerView)]) {
-    titlebarContainerView = [frameView titlebarContainerView];
-  }
-  if ([titlebarView respondsToSelector:@selector(setTransparent:)]) {
-    [titlebarView setTransparent:NO];
-  }
-  if ([titlebarContainerView respondsToSelector:@selector(setTransparent:)]) {
-    [titlebarContainerView setTransparent:NO];
-  }
-}
-
-- (void)windowDidExitFullScreen:(NSNotification *)notification
-{
-  if (!mGeckoWindow) {
-    return;
-  }
-
-  mGeckoWindow->EnteredFullScreen(false);
-}
-
-- (void)windowDidFailToEnterFullScreen:(NSWindow *)window
-{
-  if (!mGeckoWindow) {
-    return;
-  }
-
-  mGeckoWindow->EnteredFullScreen(false);
-}
-
-- (void)windowDidFailToExitFullScreen:(NSWindow *)window
-{
-  if (!mGeckoWindow) {
-    return;
-  }
-
-  mGeckoWindow->EnteredFullScreen(true);
-}
-
-- (void)windowDidBecomeMain:(NSNotification *)aNotification
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  RollUpPopups();
-  ChildViewMouseTracker::ReEvaluateMouseEnterState();
-
-  // [NSApp _isRunningAppModal] will return true if we're running an OS dialog
-  // app modally. If one of those is up then we want it to retain its menu bar.
-  if ([NSApp _isRunningAppModal])
-    return;
-  NSWindow* window = [aNotification object];
-  if (window)
-    [WindowDelegate paintMenubarForWindow:window];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (void)windowDidResignMain:(NSNotification *)aNotification
-{
-  RollUpPopups();
-  ChildViewMouseTracker::ReEvaluateMouseEnterState();
-
-  // [NSApp _isRunningAppModal] will return true if we're running an OS dialog
-  // app modally. If one of those is up then we want it to retain its menu bar.
-  if ([NSApp _isRunningAppModal])
-    return;
-  RefPtr<nsMenuBarX> hiddenWindowMenuBar = nsMenuUtilsX::GetHiddenWindowMenuBar();
-  if (hiddenWindowMenuBar) {
-    // printf("painting hidden window menu bar due to window losing main status\n");
-    hiddenWindowMenuBar->Paint();
-  }
-}
-
-- (void)windowDidBecomeKey:(NSNotification *)aNotification
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  RollUpPopups();
-  ChildViewMouseTracker::ReEvaluateMouseEnterState();
-
-  NSWindow* window = [aNotification object];
-  if ([window isSheet])
-    [WindowDelegate paintMenubarForWindow:window];
-
-  nsChildView* mainChildView =
-    static_cast<nsChildView*>([[(BaseWindow*)window mainChildView] widget]);
-  if (mainChildView) {
-    if (mainChildView->GetInputContext().IsPasswordEditor()) {
-      TextInputHandler::EnableSecureEventInput();
-    } else {
-      TextInputHandler::EnsureSecureEventInputDisabled();
-    }
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (void)windowDidResignKey:(NSNotification *)aNotification
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  RollUpPopups();
-  ChildViewMouseTracker::ReEvaluateMouseEnterState();
-
-  // If a sheet just resigned key then we should paint the menu bar
-  // for whatever window is now main.
-  NSWindow* window = [aNotification object];
-  if ([window isSheet])
-    [WindowDelegate paintMenubarForWindow:[NSApp mainWindow]];
-
-  TextInputHandler::EnsureSecureEventInputDisabled();
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (void)windowWillMove:(NSNotification *)aNotification
-{
-  RollUpPopups();
-}
-
-- (void)windowDidMove:(NSNotification *)aNotification
-{
-  if (mGeckoWindow)
-    mGeckoWindow->ReportMoveEvent();
-}
-
-- (BOOL)windowShouldClose:(id)sender
-{
-  nsIWidgetListener* listener = mGeckoWindow ? mGeckoWindow->GetWidgetListener() : nullptr;
-  if (listener)
-    listener->RequestWindowClose(mGeckoWindow);
-  return NO; // gecko will do it
-}
-
-- (void)windowWillClose:(NSNotification *)aNotification
-{
-  RollUpPopups();
-}
-
-- (void)windowWillMiniaturize:(NSNotification *)aNotification
-{
-  RollUpPopups();
-}
-
-- (void)windowDidMiniaturize:(NSNotification *)aNotification
-{
-  if (mGeckoWindow)
-    mGeckoWindow->DispatchSizeModeEvent();
-}
-
-- (void)windowDidDeminiaturize:(NSNotification *)aNotification
-{
-  if (mGeckoWindow)
-    mGeckoWindow->DispatchSizeModeEvent();
-}
-
-- (BOOL)windowShouldZoom:(NSWindow *)window toFrame:(NSRect)proposedFrame
-{
-  if (!mHasEverBeenZoomed && [window isZoomed])
-    return NO; // See bug 429954.
-
-  mHasEverBeenZoomed = YES;
-  return YES;
-}
-
-- (void)didEndSheet:(NSWindow*)sheet returnCode:(int)returnCode contextInfo:(void*)contextInfo
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  // Note: 'contextInfo' (if it is set) is the window that is the parent of
-  // the sheet.  The value of contextInfo is determined in
-  // nsCocoaWindow::Show().  If it's set, 'contextInfo' is always the top-
-  // level window, not another sheet itself.  But 'contextInfo' is nil if
-  // our parent window is also a sheet -- in that case we shouldn't send
-  // the top-level window any activate events (because it's our parent
-  // window that needs to get these events, not the top-level window).
-  [TopLevelWindowData deactivateInWindow:sheet];
-  [sheet orderOut:self];
-  if (contextInfo)
-    [TopLevelWindowData activateInWindow:(NSWindow*)contextInfo];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (void)windowDidChangeBackingProperties:(NSNotification *)aNotification
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  NSWindow *window = (NSWindow *)[aNotification object];
-
-  if ([window respondsToSelector:@selector(backingScaleFactor)]) {
-    CGFloat oldFactor =
-      [[[aNotification userInfo]
-         objectForKey:@"NSBackingPropertyOldScaleFactorKey"] doubleValue];
-    if ([window backingScaleFactor] != oldFactor) {
-      mGeckoWindow->BackingScaleFactorChanged();
-    }
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (nsCocoaWindow*)geckoWidget
-{
-  return mGeckoWindow;
-}
-
-- (bool)toplevelActiveState
-{
-  return mToplevelActiveState;
-}
-
-- (void)sendToplevelActivateEvents
-{
-  if (!mToplevelActiveState && mGeckoWindow) {
-    nsIWidgetListener* listener = mGeckoWindow->GetWidgetListener();
-    if (listener) {
-      listener->WindowActivated();
-    }
-    mToplevelActiveState = true;
-  }
-}
-
-- (void)sendToplevelDeactivateEvents
-{
-  if (mToplevelActiveState && mGeckoWindow) {
-    nsIWidgetListener* listener = mGeckoWindow->GetWidgetListener();
-    if (listener) {
-      listener->WindowDeactivated();
-    }
-    mToplevelActiveState = false;
-  }
-}
-
-@end
-
-static float
-GetDPI(NSWindow* aWindow)
-{
-  NSScreen* screen = [aWindow screen];
-  if (!screen)
-    return 96.0f;
-
-  CGDirectDisplayID displayID =
-    [[[screen deviceDescription] objectForKey:@"NSScreenNumber"] intValue];
-  CGFloat heightMM = ::CGDisplayScreenSize(displayID).height;
-  size_t heightPx = ::CGDisplayPixelsHigh(displayID);
-  if (heightMM < 1 || heightPx < 1) {
-    // Something extremely bogus is going on
-    return 96.0f;
-  }
-
-  float dpi = heightPx / (heightMM / MM_PER_INCH_FLOAT);
-
-  // Account for HiDPI mode where Cocoa's "points" do not correspond to real
-  // device pixels
-  CGFloat backingScale = GetBackingScaleFactor(aWindow);
-
-  return dpi * backingScale;
-}
-
-@interface NSView(FrameViewMethodSwizzling)
-- (NSPoint)FrameView__closeButtonOrigin;
-- (NSPoint)FrameView__fullScreenButtonOrigin;
-@end
-
-@implementation NSView(FrameViewMethodSwizzling)
-
-- (NSPoint)FrameView__closeButtonOrigin
-{
-  NSPoint defaultPosition = [self FrameView__closeButtonOrigin];
-  if ([[self window] isKindOfClass:[ToolbarWindow class]]) {
-    return [(ToolbarWindow*)[self window] windowButtonsPositionWithDefaultPosition:defaultPosition];
-  }
-  return defaultPosition;
-}
-
-- (NSPoint)FrameView__fullScreenButtonOrigin
-{
-  NSPoint defaultPosition = [self FrameView__fullScreenButtonOrigin];
-  if ([[self window] isKindOfClass:[ToolbarWindow class]]) {
-    return [(ToolbarWindow*)[self window] fullScreenButtonPositionWithDefaultPosition:defaultPosition];
-  }
-  return defaultPosition;
-}
-
-@end
-
-static NSMutableSet *gSwizzledFrameViewClasses = nil;
-
-@interface NSWindow(PrivateSetNeedsDisplayInRectMethod)
- - (void)_setNeedsDisplayInRect:(NSRect)aRect;
-@end
-
-// This method is on NSThemeFrame starting with 10.10, but since NSThemeFrame
-// is not a public class, we declare the method on NSView instead. We only have
-// this declaration in order to avoid compiler warnings.
-@interface NSView(PrivateAddKnownSubviewMethod)
- - (void)_addKnownSubview:(NSView*)aView positioned:(NSWindowOrderingMode)place relativeTo:(NSView*)otherView;
-@end
-
-#if !defined(MAC_OS_X_VERSION_10_10) || \
-    MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_10
-
-@interface NSImage(CapInsets)
-- (void)setCapInsets:(NSEdgeInsets)capInsets;
-@end
-
-#endif
-
-#if !defined(MAC_OS_X_VERSION_10_8) || \
-    MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_8
-
-@interface NSImage(ImageCreationWithDrawingHandler)
-+ (NSImage *)imageWithSize:(NSSize)size
-                   flipped:(BOOL)drawingHandlerShouldBeCalledWithFlippedContext
-            drawingHandler:(BOOL (^)(NSRect dstRect))drawingHandler;
-@end
-
-#endif
-
-@interface NSView(NSVisualEffectViewSetMaskImage)
-- (void)setMaskImage:(NSImage*)image;
-@end
-
-@interface BaseWindow(Private)
-- (void)removeTrackingArea;
-- (void)cursorUpdated:(NSEvent*)aEvent;
-- (void)updateContentViewSize;
-- (void)reflowTitlebarElements;
-@end
-
-@implementation BaseWindow
-
-// The frame of a window is implemented using undocumented NSView subclasses.
-// We offset the window buttons by overriding the methods _closeButtonOrigin
-// and _fullScreenButtonOrigin on these frame view classes. The class which is
-// used for a window is determined in the window's frameViewClassForStyleMask:
-// method, so this is where we make sure that we have swizzled the method on
-// all encountered classes.
-+ (Class)frameViewClassForStyleMask:(NSUInteger)styleMask
-{
-  Class frameViewClass = [super frameViewClassForStyleMask:styleMask];
-
-  if (!gSwizzledFrameViewClasses) {
-    gSwizzledFrameViewClasses = [[NSMutableSet setWithCapacity:3] retain];
-    if (!gSwizzledFrameViewClasses) {
-      return frameViewClass;
-    }
-  }
-
-  static IMP our_closeButtonOrigin =
-    class_getMethodImplementation([NSView class],
-                                  @selector(FrameView__closeButtonOrigin));
-  static IMP our_fullScreenButtonOrigin =
-    class_getMethodImplementation([NSView class],
-                                  @selector(FrameView__fullScreenButtonOrigin));
-
-  if (![gSwizzledFrameViewClasses containsObject:frameViewClass]) {
-    // Either of these methods might be implemented in both a subclass of
-    // NSFrameView and one of its own subclasses.  Which means that if we
-    // aren't careful we might end up swizzling the same method twice.
-    // Since method swizzling involves swapping pointers, this would break
-    // things.
-    IMP _closeButtonOrigin =
-      class_getMethodImplementation(frameViewClass,
-                                    @selector(_closeButtonOrigin));
-    if (_closeButtonOrigin && _closeButtonOrigin != our_closeButtonOrigin) {
-      nsToolkit::SwizzleMethods(frameViewClass, @selector(_closeButtonOrigin),
-                                @selector(FrameView__closeButtonOrigin));
-    }
-    IMP _fullScreenButtonOrigin =
-      class_getMethodImplementation(frameViewClass,
-                                    @selector(_fullScreenButtonOrigin));
-    if (_fullScreenButtonOrigin &&
-        _fullScreenButtonOrigin != our_fullScreenButtonOrigin) {
-      nsToolkit::SwizzleMethods(frameViewClass, @selector(_fullScreenButtonOrigin),
-                                @selector(FrameView__fullScreenButtonOrigin));
-    }
-    [gSwizzledFrameViewClasses addObject:frameViewClass];
-  }
-
-  return frameViewClass;
-}
-
-- (id)initWithContentRect:(NSRect)aContentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)aBufferingType defer:(BOOL)aFlag
-{
-  mDrawsIntoWindowFrame = NO;
-  [super initWithContentRect:aContentRect styleMask:aStyle backing:aBufferingType defer:aFlag];
-  mState = nil;
-  mActiveTitlebarColor = nil;
-  mInactiveTitlebarColor = nil;
-  mScheduledShadowInvalidation = NO;
-  mDisabledNeedsDisplay = NO;
-  mDPI = GetDPI(self);
-  mTrackingArea = nil;
-  mDirtyRect = NSZeroRect;
-  mBeingShown = NO;
-  mDrawTitle = NO;
-  mBrightTitlebarForeground = NO;
-  mUseMenuStyle = NO;
-  [self updateTrackingArea];
-
-  return self;
-}
-
-// Returns an autoreleased NSImage.
-static NSImage*
-GetMenuMaskImage()
-{
-  CGFloat radius = 4.0f;
-  NSEdgeInsets insets = { 5, 5, 5, 5 };
-  NSSize maskSize = { 12, 12 };
-  NSImage* maskImage = [NSImage imageWithSize:maskSize flipped:YES drawingHandler:^BOOL(NSRect dstRect) {
-    NSBezierPath *path = [NSBezierPath bezierPathWithRoundedRect:dstRect xRadius:radius yRadius:radius];
-    [[NSColor colorWithDeviceWhite:1.0 alpha:1.0] set];
-    [path fill];
-    return YES;
-  }];
-  [maskImage setCapInsets:insets];
-  return maskImage;
-}
-
-- (void)swapOutChildViewWrapper:(NSView*)aNewWrapper
-{
-  [aNewWrapper setFrame:[[self contentView] frame]];
-  NSView* childView = [[self mainChildView] retain];
-  [childView removeFromSuperview];
-  [aNewWrapper addSubview:childView];
-  [childView release];
-  [super setContentView:aNewWrapper];
-}
-
-- (void)setUseMenuStyle:(BOOL)aValue
-{
-  if (!VibrancyManager::SystemSupportsVibrancy()) {
-    return;
-  }
-
-  if (aValue && !mUseMenuStyle) {
-    // Turn on rounded corner masking.
-    NSView* effectView = VibrancyManager::CreateEffectView(VibrancyType::MENU, YES);
-    if ([effectView respondsToSelector:@selector(setMaskImage:)]) {
-      [effectView setMaskImage:GetMenuMaskImage()];
-    }
-    [self swapOutChildViewWrapper:effectView];
-    [effectView release];
-  } else if (mUseMenuStyle && !aValue) {
-    // Turn off rounded corner masking.
-    NSView* wrapper = [[NSView alloc] initWithFrame:NSZeroRect];
-    [self swapOutChildViewWrapper:wrapper];
-    [wrapper release];
-  }
-  mUseMenuStyle = aValue;
-}
-
-- (void)setBeingShown:(BOOL)aValue
-{
-  mBeingShown = aValue;
-}
-
-- (BOOL)isBeingShown
-{
-  return mBeingShown;
-}
-
-- (BOOL)isVisibleOrBeingShown
-{
-  return [super isVisible] || mBeingShown;
-}
-
-- (void)disableSetNeedsDisplay
-{
-  mDisabledNeedsDisplay = YES;
-}
-
-- (void)enableSetNeedsDisplay
-{
-  mDisabledNeedsDisplay = NO;
-}
-
-- (void)dealloc
-{
-  [mActiveTitlebarColor release];
-  [mInactiveTitlebarColor release];
-  [self removeTrackingArea];
-  ChildViewMouseTracker::OnDestroyWindow(self);
-  [super dealloc];
-}
-
-static const NSString* kStateTitleKey = @"title";
-static const NSString* kStateDrawsContentsIntoWindowFrameKey = @"drawsContentsIntoWindowFrame";
-static const NSString* kStateActiveTitlebarColorKey = @"activeTitlebarColor";
-static const NSString* kStateInactiveTitlebarColorKey = @"inactiveTitlebarColor";
-static const NSString* kStateShowsToolbarButton = @"showsToolbarButton";
-static const NSString* kStateCollectionBehavior = @"collectionBehavior";
-
-- (void)importState:(NSDictionary*)aState
-{
-  [self setTitle:[aState objectForKey:kStateTitleKey]];
-  [self setDrawsContentsIntoWindowFrame:[[aState objectForKey:kStateDrawsContentsIntoWindowFrameKey] boolValue]];
-  [self setTitlebarColor:[aState objectForKey:kStateActiveTitlebarColorKey] forActiveWindow:YES];
-  [self setTitlebarColor:[aState objectForKey:kStateInactiveTitlebarColorKey] forActiveWindow:NO];
-  [self setShowsToolbarButton:[[aState objectForKey:kStateShowsToolbarButton] boolValue]];
-  [self setCollectionBehavior:[[aState objectForKey:kStateCollectionBehavior] unsignedIntValue]];
-}
-
-- (NSMutableDictionary*)exportState
-{
-  NSMutableDictionary* state = [NSMutableDictionary dictionaryWithCapacity:10];
-  [state setObject:[self title] forKey:kStateTitleKey];
-  [state setObject:[NSNumber numberWithBool:[self drawsContentsIntoWindowFrame]]
-            forKey:kStateDrawsContentsIntoWindowFrameKey];
-  NSColor* activeTitlebarColor = [self titlebarColorForActiveWindow:YES];
-  if (activeTitlebarColor) {
-    [state setObject:activeTitlebarColor forKey:kStateActiveTitlebarColorKey];
-  }
-  NSColor* inactiveTitlebarColor = [self titlebarColorForActiveWindow:NO];
-  if (inactiveTitlebarColor) {
-    [state setObject:inactiveTitlebarColor forKey:kStateInactiveTitlebarColorKey];
-  }
-  [state setObject:[NSNumber numberWithBool:[self showsToolbarButton]]
-            forKey:kStateShowsToolbarButton];
-  [state setObject:[NSNumber numberWithUnsignedInt: [self collectionBehavior]]
-            forKey:kStateCollectionBehavior];
-  return state;
-}
-
-- (void)setDrawsContentsIntoWindowFrame:(BOOL)aState
-{
-  bool changed = (aState != mDrawsIntoWindowFrame);
-  mDrawsIntoWindowFrame = aState;
-  if (changed) {
-    [self updateContentViewSize];
-    [self reflowTitlebarElements];
-  }
-}
-
-- (BOOL)drawsContentsIntoWindowFrame
-{
-  return mDrawsIntoWindowFrame;
-}
-
-- (void)setWantsTitleDrawn:(BOOL)aDrawTitle
-{
-  mDrawTitle = aDrawTitle;
-}
-
-- (BOOL)wantsTitleDrawn
-{
-  return mDrawTitle;
-}
-
-- (void)setUseBrightTitlebarForeground:(BOOL)aBrightForeground
-{
-  mBrightTitlebarForeground = aBrightForeground;
-  [[self standardWindowButton:NSWindowFullScreenButton] setNeedsDisplay:YES];
-}
-
-- (BOOL)useBrightTitlebarForeground
-{
-  return mBrightTitlebarForeground;
-}
-
-// Pass nil here to get the default appearance.
-- (void)setTitlebarColor:(NSColor*)aColor forActiveWindow:(BOOL)aActive
-{
-  [aColor retain];
-  if (aActive) {
-    [mActiveTitlebarColor release];
-    mActiveTitlebarColor = aColor;
-  } else {
-    [mInactiveTitlebarColor release];
-    mInactiveTitlebarColor = aColor;
-  }
-}
-
-- (NSColor*)titlebarColorForActiveWindow:(BOOL)aActive
-{
-  return aActive ? mActiveTitlebarColor : mInactiveTitlebarColor;
-}
-
-- (void)deferredInvalidateShadow
-{
-  if (mScheduledShadowInvalidation || [self isOpaque] || ![self hasShadow])
-    return;
-
-  [self performSelector:@selector(invalidateShadow) withObject:nil afterDelay:0];
-  mScheduledShadowInvalidation = YES;
-}
-
-- (void)invalidateShadow
-{
-  [super invalidateShadow];
-  mScheduledShadowInvalidation = NO;
-}
-
-- (float)getDPI
-{
-  return mDPI;
-}
-
-- (NSView*)trackingAreaView
-{
-  NSView* contentView = [self contentView];
-  return [contentView superview] ? [contentView superview] : contentView;
-}
-
-- (ChildView*)mainChildView
-{
-  NSView *contentView = [self contentView];
-  NSView* lastView = [[contentView subviews] lastObject];
-  if ([lastView isKindOfClass:[ChildView class]]) {
-    return (ChildView*)lastView;
-  }
-  return nil;
-}
-
-- (void)removeTrackingArea
-{
-  if (mTrackingArea) {
-    [[self trackingAreaView] removeTrackingArea:mTrackingArea];
-    [mTrackingArea release];
-    mTrackingArea = nil;
-  }
-}
-
-- (void)updateTrackingArea
-{
-  [self removeTrackingArea];
-
-  NSView* view = [self trackingAreaView];
-  const NSTrackingAreaOptions options =
-    NSTrackingMouseEnteredAndExited | NSTrackingMouseMoved | NSTrackingActiveAlways;
-  mTrackingArea = [[NSTrackingArea alloc] initWithRect:[view bounds]
-                                               options:options
-                                                 owner:self
-                                              userInfo:nil];
-  [view addTrackingArea:mTrackingArea];
-}
-
-- (void)mouseEntered:(NSEvent*)aEvent
-{
-  ChildViewMouseTracker::MouseEnteredWindow(aEvent);
-}
-
-- (void)mouseExited:(NSEvent*)aEvent
-{
-  ChildViewMouseTracker::MouseExitedWindow(aEvent);
-}
-
-- (void)mouseMoved:(NSEvent*)aEvent
-{
-  ChildViewMouseTracker::MouseMoved(aEvent);
-}
-
-- (void)cursorUpdated:(NSEvent*)aEvent
-{
-  // Nothing to do here, but NSTrackingArea wants us to implement this method.
-}
-
-- (void)_setNeedsDisplayInRect:(NSRect)aRect
-{
-  // Prevent unnecessary invalidations due to moving NSViews (e.g. for plugins)
-  if (!mDisabledNeedsDisplay) {
-    // This method is only called by Cocoa, so when we're here, we know that
-    // it's available and don't need to check whether our superclass responds
-    // to the selector.
-    [super _setNeedsDisplayInRect:aRect];
-    mDirtyRect = NSUnionRect(mDirtyRect, aRect);
-  }
-}
-
-- (NSRect)getAndResetNativeDirtyRect
-{
-  NSRect dirtyRect = mDirtyRect;
-  mDirtyRect = NSZeroRect;
-  return dirtyRect;
-}
-
-- (void)updateContentViewSize
-{
-  NSRect rect = [self contentRectForFrameRect:[self frame]];
-  [[self contentView] setFrameSize:rect.size];
-}
-
-// Possibly move the titlebar buttons.
-- (void)reflowTitlebarElements
-{
-  NSView *frameView = [[self contentView] superview];
-  if ([frameView respondsToSelector:@selector(_tileTitlebarAndRedisplay:)]) {
-    [frameView _tileTitlebarAndRedisplay:NO];
-  }
-}
-
-// Override methods that translate between content rect and frame rect.
-- (NSRect)contentRectForFrameRect:(NSRect)aRect
-{
-  if ([self drawsContentsIntoWindowFrame]) {
-    return aRect;
-  }
-  return [super contentRectForFrameRect:aRect];
-}
-
-- (NSRect)contentRectForFrameRect:(NSRect)aRect styleMask:(NSUInteger)aMask
-{
-  if ([self drawsContentsIntoWindowFrame]) {
-    return aRect;
-  }
-  if ([super respondsToSelector:@selector(contentRectForFrameRect:styleMask:)]) {
-    return [super contentRectForFrameRect:aRect styleMask:aMask];
-  } else {
-    return [NSWindow contentRectForFrameRect:aRect styleMask:aMask];
-  }
-}
-
-- (NSRect)frameRectForContentRect:(NSRect)aRect
-{
-  if ([self drawsContentsIntoWindowFrame]) {
-    return aRect;
-  }
-  return [super frameRectForContentRect:aRect];
-}
-
-- (NSRect)frameRectForContentRect:(NSRect)aRect styleMask:(NSUInteger)aMask
-{
-  if ([self drawsContentsIntoWindowFrame]) {
-    return aRect;
-  }
-  if ([super respondsToSelector:@selector(frameRectForContentRect:styleMask:)]) {
-    return [super frameRectForContentRect:aRect styleMask:aMask];
-  } else {
-    return [NSWindow frameRectForContentRect:aRect styleMask:aMask];
-  }
-}
-
-- (void)setContentView:(NSView*)aView
-{
-  [super setContentView:aView];
-
-  // Now move the contentView to the bottommost layer so that it's guaranteed
-  // to be under the window buttons.
-  NSView* frameView = [aView superview];
-  [aView removeFromSuperview];
-  if ([frameView respondsToSelector:@selector(_addKnownSubview:positioned:relativeTo:)]) {
-    // 10.10 prints a warning when we call addSubview on the frame view, so we
-    // silence the warning by calling a private method instead.
-    [frameView _addKnownSubview:aView positioned:NSWindowBelow relativeTo:nil];
-  } else {
-    [frameView addSubview:aView positioned:NSWindowBelow relativeTo:nil];
-  }
-}
-
-- (NSArray*)titlebarControls
-{
-  // Return all subviews of the frameView which are not the content view.
-  NSView* frameView = [[self contentView] superview];
-  NSMutableArray* array = [[[frameView subviews] mutableCopy] autorelease];
-  [array removeObject:[self contentView]];
-  return array;
-}
-
-- (BOOL)respondsToSelector:(SEL)aSelector
-{
-  // Claim the window doesn't respond to this so that the system
-  // doesn't steal keyboard equivalents for it. Bug 613710.
-  if (aSelector == @selector(cancelOperation:)) {
-    return NO;
-  }
-
-  return [super respondsToSelector:aSelector];
-}
-
-- (void) doCommandBySelector:(SEL)aSelector
-{
-  // We override this so that it won't beep if it can't act.
-  // We want to control the beeping for missing or disabled
-  // commands ourselves.
-  [self tryToPerform:aSelector with:nil];
-}
-
-- (id)accessibilityAttributeValue:(NSString *)attribute
-{
-  id retval = [super accessibilityAttributeValue:attribute];
-
-  // The following works around a problem with Text-to-Speech on OS X 10.7.
-  // See bug 674612 for more info.
-  //
-  // When accessibility is off, AXUIElementCopyAttributeValue(), when called
-  // on an AXApplication object to get its AXFocusedUIElement attribute,
-  // always returns an AXWindow object (the actual browser window -- never a
-  // mozAccessible object).  This also happens with accessibility turned on,
-  // if no other object in the browser window has yet been focused.  But if
-  // the browser window has a title bar (as it currently always does), the
-  // AXWindow object will always have four "accessible" children, one of which
-  // is an AXStaticText object (the title bar's "title"; the other three are
-  // the close, minimize and zoom buttons).  This means that (for complicated
-  // reasons, for which see bug 674612) Text-to-Speech on OS X 10.7 will often
-  // "speak" the window title, no matter what text is selected, or even if no
-  // text at all is selected.  (This always happens when accessibility is off.
-  // It doesn't happen in Firefox releases because Apple has (on OS X 10.7)
-  // special-cased the handling of apps whose CFBundleIdentifier is
-  // org.mozilla.firefox.)
-  //
-  // We work around this problem by only returning AXChildren that are
-  // mozAccessible object or are one of the titlebar's buttons (which
-  // instantiate subclasses of NSButtonCell).
-  if ([retval isKindOfClass:[NSArray class]] &&
-      [attribute isEqualToString:@"AXChildren"]) {
-    NSMutableArray *holder = [NSMutableArray arrayWithCapacity:10];
-    [holder addObjectsFromArray:(NSArray *)retval];
-    NSUInteger count = [holder count];
-    for (NSInteger i = count - 1; i >= 0; --i) {
-      id item = [holder objectAtIndex:i];
-      // Remove anything from holder that isn't one of the titlebar's buttons
-      // (which instantiate subclasses of NSButtonCell) or a mozAccessible
-      // object (or one of its subclasses).
-      if (![item isKindOfClass:[NSButtonCell class]] &&
-          ![item respondsToSelector:@selector(hasRepresentedView)]) {
-        [holder removeObjectAtIndex:i];
-      }
-    }
-    retval = [NSArray arrayWithArray:holder];
-  }
-
-  return retval;
-}
-
-@end
-
-// This class allows us to exercise control over the window's title bar. This
-// allows for a "unified toolbar" look without having to extend the content
-// area into the title bar. It works like this:
-// 1) We set the window's style to textured.
-// 2) Because of this, the background color applies to the entire window, including
-//     the titlebar area. For normal textured windows, the default pattern is a 
-//    "brushed metal" image on Tiger and a unified gradient on Leopard.
-// 3) We set the background color to a custom NSColor subclass that knows how tall the window is.
-//    When -set is called on it, it sets a pattern (with a draw callback) as the fill. In that callback,
-//    it paints the the titlebar and background colors in the correct areas of the context it's given,
-//    which will fill the entire window (CG will tile it horizontally for us).
-// 4) Whenever the window's main state changes and when [window display] is called,
-//    Cocoa redraws the titlebar using the patternDraw callback function.
-//
-// This class also provides us with a pill button to show/hide the toolbar up to 10.6.
-//
-// Drawing the unified gradient in the titlebar and the toolbar works like this:
-// 1) In the style sheet we set the toolbar's -moz-appearance to toolbar.
-// 2) When the toolbar is visible and we paint the application chrome
-//    window, the array that Gecko passes nsChildView::UpdateThemeGeometries
-//    will contain an entry for the widget type NS_THEME_TOOLBAR.
-// 3) nsChildView::UpdateThemeGeometries finds the toolbar frame's ToolbarWindow
-//    and passes the toolbar frame's height to setUnifiedToolbarHeight.
-// 4) If the toolbar height has changed, a titlebar redraw is triggered and the
-//    upper part of the unified gradient is drawn in the titlebar.
-// 5) The lower part of the unified gradient in the toolbar is drawn during
-//    normal window content painting in nsNativeThemeCocoa::DrawUnifiedToolbar.
-//
-// Whenever the unified gradient is drawn in the titlebar or the toolbar, both
-// titlebar height and toolbar height must be known in order to construct the
-// correct gradient. But you can only get from the toolbar frame
-// to the containing window - the other direction doesn't work. That's why the
-// toolbar height is cached in the ToolbarWindow but nsNativeThemeCocoa can simply
-// query the window for its titlebar height when drawing the toolbar.
-//
-// Note that in drawsContentsIntoWindowFrame mode, titlebar drawing works in a
-// completely different way: In that mode, the window's mainChildView will
-// cover the titlebar completely and nothing that happens in the window
-// background will reach the screen.
-@implementation ToolbarWindow
-
-- (id)initWithContentRect:(NSRect)aContentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)aBufferingType defer:(BOOL)aFlag
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  aStyle = aStyle | NSTexturedBackgroundWindowMask;
-  if ((self = [super initWithContentRect:aContentRect styleMask:aStyle backing:aBufferingType defer:aFlag])) {
-    mColor = [[TitlebarAndBackgroundColor alloc] initWithWindow:self];
-    // Bypass our guard method below.
-    [super setBackgroundColor:mColor];
-    mBackgroundColor = [[NSColor whiteColor] retain];
-
-    mUnifiedToolbarHeight = 22.0f;
-    mWindowButtonsRect = NSZeroRect;
-    mFullScreenButtonRect = NSZeroRect;
-
-    // setBottomCornerRounded: is a private API call, so we check to make sure
-    // we respond to it just in case.
-    if ([self respondsToSelector:@selector(setBottomCornerRounded:)])
-      [self setBottomCornerRounded:YES];
-
-    [self setAutorecalculatesContentBorderThickness:NO forEdge:NSMaxYEdge];
-    [self setContentBorderThickness:0.0f forEdge:NSMaxYEdge];
-  }
-  return self;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-- (void)dealloc
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  [super setBackgroundColor:[NSColor whiteColor]];
-  [mColor release];
-  [mBackgroundColor release];
-  [mTitlebarView release];
-  [super dealloc];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (void)setTitlebarColor:(NSColor*)aColor forActiveWindow:(BOOL)aActive
-{
-  [super setTitlebarColor:aColor forActiveWindow:aActive];
-  [self setTitlebarNeedsDisplayInRect:[self titlebarRect]];
-}
-
-- (void)setBackgroundColor:(NSColor*)aColor
-{
-  [aColor retain];
-  [mBackgroundColor release];
-  mBackgroundColor = aColor;
-}
-
-- (NSColor*)windowBackgroundColor
-{
-  return mBackgroundColor;
-}
-
-- (void)setTemporaryBackgroundColor
-{
-  [super setBackgroundColor:[NSColor whiteColor]];
-}
-
-- (void)restoreBackgroundColor
-{
-  [super setBackgroundColor:mBackgroundColor];
-}
-
-- (void)setTitlebarNeedsDisplayInRect:(NSRect)aRect
-{
-  [self setTitlebarNeedsDisplayInRect:aRect sync:NO];
-}
-
-- (void)setTitlebarNeedsDisplayInRect:(NSRect)aRect sync:(BOOL)aSync
-{
-  NSRect titlebarRect = [self titlebarRect];
-  NSRect rect = NSIntersectionRect(titlebarRect, aRect);
-  if (NSIsEmptyRect(rect))
-    return;
-
-  NSView* borderView = [[self contentView] superview];
-  if (!borderView)
-    return;
-
-  if (aSync) {
-    [borderView displayRect:rect];
-  } else {
-    [borderView setNeedsDisplayInRect:rect];
-  }
-}
-
-- (NSRect)titlebarRect
-{
-  CGFloat titlebarHeight = [self titlebarHeight];
-  return NSMakeRect(0, [self frame].size.height - titlebarHeight,
-                    [self frame].size.width, titlebarHeight);
-}
-
-// Returns the unified height of titlebar + toolbar.
-- (CGFloat)unifiedToolbarHeight
-{
-  return mUnifiedToolbarHeight;
-}
-
-- (CGFloat)titlebarHeight
-{
-  // We use the original content rect here, not what we return from
-  // [self contentRectForFrameRect:], because that would give us a
-  // titlebarHeight of zero in drawsContentsIntoWindowFrame mode.
-  NSRect frameRect = [self frame];
-  NSRect originalContentRect = [NSWindow contentRectForFrameRect:frameRect styleMask:[self styleMask]];
-  return NSMaxY(frameRect) - NSMaxY(originalContentRect);
-}
-
-// Stores the complete height of titlebar + toolbar.
-- (void)setUnifiedToolbarHeight:(CGFloat)aHeight
-{
-  if (aHeight == mUnifiedToolbarHeight)
-    return;
-
-  mUnifiedToolbarHeight = aHeight;
-
-  if (![self drawsContentsIntoWindowFrame]) {
-    // Redraw the title bar. If we're inside painting, we'll do it right now,
-    // otherwise we'll just invalidate it.
-    BOOL needSyncRedraw = ([NSView focusView] != nil);
-    [self setTitlebarNeedsDisplayInRect:[self titlebarRect] sync:needSyncRedraw];
-  }
-}
-
-// Extending the content area into the title bar works by resizing the
-// mainChildView so that it covers the titlebar.
-- (void)setDrawsContentsIntoWindowFrame:(BOOL)aState
-{
-  BOOL stateChanged = ([self drawsContentsIntoWindowFrame] != aState);
-  [super setDrawsContentsIntoWindowFrame:aState];
-  if (stateChanged && [[self delegate] isKindOfClass:[WindowDelegate class]]) {
-    // Here we extend / shrink our mainChildView. We do that by firing a resize
-    // event which will cause the ChildView to be resized to the rect returned
-    // by nsCocoaWindow::GetClientBounds. GetClientBounds bases its return
-    // value on what we return from drawsContentsIntoWindowFrame.
-    WindowDelegate *windowDelegate = (WindowDelegate *)[self delegate];
-    nsCocoaWindow *geckoWindow = [windowDelegate geckoWidget];
-    if (geckoWindow) {
-      // Re-layout our contents.
-      geckoWindow->ReportSizeEvent();
-    }
-
-    // Resizing the content area causes a reflow which would send a synthesized
-    // mousemove event to the old mouse position relative to the top left
-    // corner of the content area. But the mouse has shifted relative to the
-    // content area, so that event would have wrong position information. So
-    // we'll send a mouse move event with the correct new position.
-    ChildViewMouseTracker::ResendLastMouseMoveEvent();
-  }
-}
-
-- (void)setWantsTitleDrawn:(BOOL)aDrawTitle
-{
-  [super setWantsTitleDrawn:aDrawTitle];
-  [self setTitlebarNeedsDisplayInRect:[self titlebarRect]];
-}
-
-- (void)setSheetAttachmentPosition:(CGFloat)aY
-{
-  CGFloat topMargin = aY - [self titlebarHeight];
-  [self setContentBorderThickness:topMargin forEdge:NSMaxYEdge];
-}
-
-- (void)placeWindowButtons:(NSRect)aRect
-{
-  if (!NSEqualRects(mWindowButtonsRect, aRect)) {
-    mWindowButtonsRect = aRect;
-    [self reflowTitlebarElements];
-  }
-}
-
-- (NSPoint)windowButtonsPositionWithDefaultPosition:(NSPoint)aDefaultPosition
-{
-  NSInteger styleMask = [self styleMask];
-  if ([self drawsContentsIntoWindowFrame] &&
-      !(styleMask & NSFullScreenWindowMask) && (styleMask & NSTitledWindowMask)) {
-    if (NSIsEmptyRect(mWindowButtonsRect)) {
-      // Empty rect. Let's hide the buttons.
-      // Position is in non-flipped window coordinates. Using frame's height
-      // for the vertical coordinate will move the buttons above the window,
-      // making them invisible.
-      return NSMakePoint(0, [self frame].size.height);
-    }
-    return NSMakePoint(mWindowButtonsRect.origin.x, mWindowButtonsRect.origin.y);
-  }
-  return aDefaultPosition;
-}
-
-- (void)placeFullScreenButton:(NSRect)aRect
-{
-  if (!NSEqualRects(mFullScreenButtonRect, aRect)) {
-    mFullScreenButtonRect = aRect;
-    [self reflowTitlebarElements];
-  }
-}
-
-- (NSPoint)fullScreenButtonPositionWithDefaultPosition:(NSPoint)aDefaultPosition
-{
-  if ([self drawsContentsIntoWindowFrame] && !NSIsEmptyRect(mFullScreenButtonRect)) {
-    return NSMakePoint(std::min(mFullScreenButtonRect.origin.x, aDefaultPosition.x),
-                       std::min(mFullScreenButtonRect.origin.y, aDefaultPosition.y));
-  }
-  return aDefaultPosition;
-}
-
-// Returning YES here makes the setShowsToolbarButton method work even though
-// the window doesn't contain an NSToolbar.
-- (BOOL)_hasToolbar
-{
-  return YES;
-}
-
-// Dispatch a toolbar pill button clicked message to Gecko.
-- (void)_toolbarPillButtonClicked:(id)sender
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  RollUpPopups();
-
-  if ([[self delegate] isKindOfClass:[WindowDelegate class]]) {
-    WindowDelegate *windowDelegate = (WindowDelegate *)[self delegate];
-    nsCocoaWindow *geckoWindow = [windowDelegate geckoWidget];
-    if (!geckoWindow)
-      return;
-
-    nsIWidgetListener* listener = geckoWindow->GetWidgetListener();
-    if (listener)
-      listener->OSToolbarButtonPressed();
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-// Retain and release "self" to avoid crashes when our widget (and its native
-// window) is closed as a result of processing a key equivalent (e.g.
-// Command+w or Command+q).  This workaround is only needed for a window
-// that can become key.
-- (BOOL)performKeyEquivalent:(NSEvent*)theEvent
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  NSWindow *nativeWindow = [self retain];
-  BOOL retval = [super performKeyEquivalent:theEvent];
-  [nativeWindow release];
-  return retval;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NO);
-}
-
-- (void)sendEvent:(NSEvent *)anEvent
-{
-  NSEventType type = [anEvent type];
-  
-  switch (type) {
-    case NSScrollWheel:
-    case NSLeftMouseDown:
-    case NSLeftMouseUp:
-    case NSRightMouseDown:
-    case NSRightMouseUp:
-    case NSOtherMouseDown:
-    case NSOtherMouseUp:
-    case NSMouseMoved:
-    case NSLeftMouseDragged:
-    case NSRightMouseDragged:
-    case NSOtherMouseDragged:
-    {
-      // Drop all mouse events if a modal window has appeared above us.
-      // This helps make us behave as if the OS were running a "real" modal
-      // event loop.
-      id delegate = [self delegate];
-      if (delegate && [delegate isKindOfClass:[WindowDelegate class]]) {
-        nsCocoaWindow *widget = [(WindowDelegate *)delegate geckoWidget];
-        if (widget) {
-          if (gGeckoAppModalWindowList && (widget != gGeckoAppModalWindowList->window))
-            return;
-          if (widget->HasModalDescendents())
-            return;
-        }
-      }
-      break;
-    }
-    default:
-      break;
-  }
-
-  [super sendEvent:anEvent];
-}
-
-@end
-
-// Custom NSColor subclass where most of the work takes place for drawing in
-// the titlebar area. Not used in drawsContentsIntoWindowFrame mode.
-@implementation TitlebarAndBackgroundColor
-
-- (id)initWithWindow:(ToolbarWindow*)aWindow
-{
-  if ((self = [super init])) {
-    mWindow = aWindow; // weak ref to avoid a cycle
-  }
-  return self;
-}
-
-static void
-DrawNativeTitlebar(CGContextRef aContext, CGRect aTitlebarRect,
-                   CGFloat aUnifiedToolbarHeight, BOOL aIsMain)
-{
-  nsNativeThemeCocoa::DrawNativeTitlebar(aContext, aTitlebarRect, aUnifiedToolbarHeight, aIsMain, NO);
-
-  // The call to CUIDraw doesn't draw the top pixel strip at some window widths.
-  // We don't want to have a flickering transparent line, so we overdraw it.
-  CGContextSetRGBFillColor(aContext, 0.95, 0.95, 0.95, 1);
-  CGContextFillRect(aContext, CGRectMake(0, CGRectGetMaxY(aTitlebarRect) - 1,
-                                           aTitlebarRect.size.width, 1));
-}
-
-// Pattern draw callback for standard titlebar gradients and solid titlebar colors
-static void
-TitlebarDrawCallback(void* aInfo, CGContextRef aContext)
-{
-  ToolbarWindow *window = (ToolbarWindow*)aInfo;
-  if (![window drawsContentsIntoWindowFrame]) {
-    NSRect titlebarRect = [window titlebarRect];
-    BOOL isMain = [window isMainWindow];
-    NSColor *titlebarColor = [window titlebarColorForActiveWindow:isMain];
-    if (!titlebarColor) {
-      // If the titlebar color is nil, draw the default titlebar shading.
-      DrawNativeTitlebar(aContext, NSRectToCGRect(titlebarRect),
-                         [window unifiedToolbarHeight], isMain);
-    } else {
-      // If the titlebar color is not nil, just set and draw it normally.
-      [NSGraphicsContext saveGraphicsState];
-      [NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithGraphicsPort:aContext flipped:NO]];
-      [titlebarColor set];
-      NSRectFill(titlebarRect);
-      [NSGraphicsContext restoreGraphicsState];
-    }
-  }
-}
-
-- (void)setFill
-{
-  float patternWidth = [mWindow frame].size.width;
-
-  CGPatternCallbacks callbacks = {0, &TitlebarDrawCallback, NULL};
-  CGPatternRef pattern = CGPatternCreate(mWindow, CGRectMake(0.0f, 0.0f, patternWidth, [mWindow frame].size.height), 
-                                         CGAffineTransformIdentity, patternWidth, [mWindow frame].size.height,
-                                         kCGPatternTilingConstantSpacing, true, &callbacks);
-
-  // Set the pattern as the fill, which is what we were asked to do. All our
-  // drawing will take place in the patternDraw callback.
-  CGColorSpaceRef patternSpace = CGColorSpaceCreatePattern(NULL);
-  CGContextRef context = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
-  CGContextSetFillColorSpace(context, patternSpace);
-  CGColorSpaceRelease(patternSpace);
-  CGFloat component = 1.0f;
-  CGContextSetFillPattern(context, pattern, &component);
-  CGPatternRelease(pattern);
-}
-
-- (void)set
-{
-  [self setFill];
-}
-
-- (NSString*)colorSpaceName
-{
-  return NSDeviceRGBColorSpace;
-}
-
-@end
-
-@implementation PopupWindow
-
-- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)styleMask
-      backing:(NSBackingStoreType)bufferingType defer:(BOOL)deferCreation
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  mIsContextMenu = false;
-  return [super initWithContentRect:contentRect styleMask:styleMask
-          backing:bufferingType defer:deferCreation];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-- (BOOL)isContextMenu
-{
-  return mIsContextMenu;
-}
-
-- (void)setIsContextMenu:(BOOL)flag
-{
-  mIsContextMenu = flag;
-}
-
-- (BOOL)canBecomeMainWindow
-{
-  // This is overriden because the default is 'yes' when a titlebar is present.
-  return NO;
-}
-
-@end
-
-// According to Apple's docs on [NSWindow canBecomeKeyWindow] and [NSWindow
-// canBecomeMainWindow], windows without a title bar or resize bar can't (by
-// default) become key or main.  But if a window can't become key, it can't
-// accept keyboard input (bmo bug 393250).  And it should also be possible for
-// an otherwise "ordinary" window to become main.  We need to override these
-// two methods to make this happen.
-@implementation BorderlessWindow
-
-- (BOOL)canBecomeKeyWindow
-{
-  return YES;
-}
-
-- (void)sendEvent:(NSEvent *)anEvent
-{
-  NSEventType type = [anEvent type];
-  
-  switch (type) {
-    case NSScrollWheel:
-    case NSLeftMouseDown:
-    case NSLeftMouseUp:
-    case NSRightMouseDown:
-    case NSRightMouseUp:
-    case NSOtherMouseDown:
-    case NSOtherMouseUp:
-    case NSMouseMoved:
-    case NSLeftMouseDragged:
-    case NSRightMouseDragged:
-    case NSOtherMouseDragged:
-    {
-      // Drop all mouse events if a modal window has appeared above us.
-      // This helps make us behave as if the OS were running a "real" modal
-      // event loop.
-      id delegate = [self delegate];
-      if (delegate && [delegate isKindOfClass:[WindowDelegate class]]) {
-        nsCocoaWindow *widget = [(WindowDelegate *)delegate geckoWidget];
-        if (widget) {
-          if (gGeckoAppModalWindowList && (widget != gGeckoAppModalWindowList->window))
-            return;
-          if (widget->HasModalDescendents())
-            return;
-        }
-      }
-      break;
-    }
-    default:
-      break;
-  }
-
-  [super sendEvent:anEvent];
-}
-
-// Apple's doc on this method says that the NSWindow class's default is not to
-// become main if the window isn't "visible" -- so we should replicate that
-// behavior here.  As best I can tell, the [NSWindow isVisible] method is an
-// accurate test of what Apple means by "visibility".
-- (BOOL)canBecomeMainWindow
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  if (![self isVisible])
-    return NO;
-  return YES;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NO);
-}
-
-// Retain and release "self" to avoid crashes when our widget (and its native
-// window) is closed as a result of processing a key equivalent (e.g.
-// Command+w or Command+q).  This workaround is only needed for a window
-// that can become key.
-- (BOOL)performKeyEquivalent:(NSEvent*)theEvent
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  NSWindow *nativeWindow = [self retain];
-  BOOL retval = [super performKeyEquivalent:theEvent];
-  [nativeWindow release];
-  return retval;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NO);
-}
-
-@end
diff --git a/widget/cocoa/nsColorPicker.h b/widget/cocoa/nsColorPicker.h
deleted file mode 100644
index 4b3e262188..0000000000
--- a/widget/cocoa/nsColorPicker.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsColorPicker_h_
-#define nsColorPicker_h_
-
-#include "nsIColorPicker.h"
-#include "nsString.h"
-#include "nsCOMPtr.h"
-
-class nsIColorPickerShownCallback;
-class mozIDOMWindowProxy;
-@class NSColorPanelWrapper;
-@class NSColor;
-
-class nsColorPicker final : public nsIColorPicker
-{
-public:
-  NS_DECL_ISUPPORTS
-
-  NS_IMETHOD Init(mozIDOMWindowProxy* aParent, const nsAString& aTitle,
-                  const nsAString& aInitialColor) override;
-  NS_IMETHOD Open(nsIColorPickerShownCallback* aCallback) override;
-
-  // For NSColorPanelWrapper.
-  void Update(NSColor* aColor);
-  // Call this method if you are done with this input, but the color picker needs to
-  // stay open as it will be associated to another input
-  void DoneWithRetarget();
-  // Same as DoneWithRetarget + clean the static instance of sColorPanelWrapper,
-  // as it is not needed anymore for now
-  void Done();
-
-private:
-  ~nsColorPicker();
-
-  static NSColor* GetNSColorFromHexString(const nsAString& aColor);
-  static void GetHexStringFromNSColor(NSColor* aColor, nsAString& aResult);
-
-  static NSColorPanelWrapper* sColorPanelWrapper;
-
-  nsString             mTitle;
-  nsString             mColor;
-  nsCOMPtr<nsIColorPickerShownCallback> mCallback;
-};
-
-#endif // nsColorPicker_h_
diff --git a/widget/cocoa/nsColorPicker.mm b/widget/cocoa/nsColorPicker.mm
deleted file mode 100644
index 263ea349b0..0000000000
--- a/widget/cocoa/nsColorPicker.mm
+++ /dev/null
@@ -1,188 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#import <Cocoa/Cocoa.h>
-
-#include "nsColorPicker.h"
-#include "nsCocoaUtils.h"
-#include "nsThreadUtils.h"
-
-using namespace mozilla;
-
-static unsigned int
-HexStrToInt(NSString* str)
-{
-  unsigned int result = 0;
-
-  for (unsigned int i = 0; i < [str length]; ++i) {
-    char c = [str characterAtIndex:i];
-    result *= 16;
-    if (c >= '0' && c <= '9') {
-      result += c - '0';
-    } else if (c >= 'A' && c <= 'F') {
-      result += 10 + (c - 'A');
-    } else {
-      result += 10 + (c - 'a');
-    }
-  }
-
-  return result;
-}
-
-@interface NSColorPanelWrapper : NSObject <NSWindowDelegate>
-{
-  NSColorPanel*  mColorPanel;
-  nsColorPicker* mColorPicker;
-}
-- (id)initWithPicker:(nsColorPicker*)aPicker;
-- (void)open:(NSColor*)aInitialColor title:(NSString*)aTitle;
-- (void)retarget:(nsColorPicker*)aPicker;
-- (void)colorChanged:(NSColorPanel*)aPanel;
-@end
-
-@implementation NSColorPanelWrapper
-- (id)initWithPicker:(nsColorPicker*)aPicker
-{
-  mColorPicker = aPicker;
-  mColorPanel = [NSColorPanel sharedColorPanel];
-
-  self = [super init];
-  return self;
-}
-
-- (void)open:(NSColor*)aInitialColor title:(NSString*)aTitle
-{
-  [mColorPanel setTarget:self];
-  [mColorPanel setAction:@selector(colorChanged:)];
-  [mColorPanel setDelegate:self];
-  [mColorPanel setTitle:aTitle];
-  [mColorPanel setColor:aInitialColor];
-  [mColorPanel makeKeyAndOrderFront:nil];
-}
-
-- (void)colorChanged:(NSColorPanel*)aPanel
-{
-  mColorPicker->Update([mColorPanel color]);
-}
-
-- (void)windowWillClose:(NSNotification*)aNotification
-{
-  mColorPicker->Done();
-}
-
-- (void)retarget:(nsColorPicker*)aPicker
-{
-  mColorPicker->DoneWithRetarget();
-  mColorPicker = aPicker;
-}
-
-- (void)dealloc
-{
-  [mColorPanel setTarget:nil];
-  [mColorPanel setAction:nil];
-  [mColorPanel setDelegate:nil];
-
-  mColorPanel = nil;
-  mColorPicker = nullptr;
-
-  [super dealloc];
-}
-@end
-
-NS_IMPL_ISUPPORTS(nsColorPicker, nsIColorPicker)
-
-NSColorPanelWrapper* nsColorPicker::sColorPanelWrapper = nullptr;
-
-nsColorPicker::~nsColorPicker()
-{
-}
-
-NS_IMETHODIMP
-nsColorPicker::Init(mozIDOMWindowProxy* aParent, const nsAString& aTitle,
-                    const nsAString& aInitialColor)
-{
-  MOZ_ASSERT(NS_IsMainThread(),
-      "Color pickers can only be opened from main thread currently");
-  mTitle = aTitle;
-  mColor = aInitialColor;
-
-  if (sColorPanelWrapper) {
-    // Update current wrapper to target the new input instead
-    [sColorPanelWrapper retarget:this];
-  } else {
-    // Create a brand new color panel wrapper
-    sColorPanelWrapper = [[NSColorPanelWrapper alloc] initWithPicker:this];
-  }
-  return NS_OK;
-}
-
-/* static */ NSColor*
-nsColorPicker::GetNSColorFromHexString(const nsAString& aColor)
-{
-  NSString* str = nsCocoaUtils::ToNSString(aColor);
-
-  double red = HexStrToInt([str substringWithRange:NSMakeRange(1, 2)]) / 255.0;
-  double green = HexStrToInt([str substringWithRange:NSMakeRange(3, 2)]) / 255.0;
-  double blue = HexStrToInt([str substringWithRange:NSMakeRange(5, 2)]) / 255.0;
-
-  return [NSColor colorWithDeviceRed: red green: green blue: blue alpha: 1.0];
-}
-
-/* static */ void
-nsColorPicker::GetHexStringFromNSColor(NSColor* aColor, nsAString& aResult)
-{
-  CGFloat redFloat, greenFloat, blueFloat;
-
-  NSColor* color = aColor;
-  @try {
-    [color getRed:&redFloat green:&greenFloat blue:&blueFloat alpha: nil];
-  } @catch (NSException* e) {
-    color = [color colorUsingColorSpace:[NSColorSpace genericRGBColorSpace]];
-    [color getRed:&redFloat green:&greenFloat blue:&blueFloat alpha: nil];
-  }
-
-  nsCocoaUtils::GetStringForNSString([NSString stringWithFormat:@"#%02x%02x%02x",
-                                       (int)(redFloat * 255),
-                                       (int)(greenFloat * 255),
-                                       (int)(blueFloat * 255)],
-                                     aResult);
-}
-
-NS_IMETHODIMP
-nsColorPicker::Open(nsIColorPickerShownCallback* aCallback)
-{
-  MOZ_ASSERT(aCallback);
-  mCallback = aCallback;
-
-  [sColorPanelWrapper open:GetNSColorFromHexString(mColor)
-              title:nsCocoaUtils::ToNSString(mTitle)];
-
-  NS_ADDREF_THIS();
-
-  return NS_OK;
-}
-
-void
-nsColorPicker::Update(NSColor* aColor)
-{
-  GetHexStringFromNSColor(aColor, mColor);
-  mCallback->Update(mColor);
-}
-
-void
-nsColorPicker::DoneWithRetarget()
-{
-  mCallback->Done(EmptyString());
-  mCallback = nullptr;
-  NS_RELEASE_THIS();
-}
-
-void
-nsColorPicker::Done()
-{
-  [sColorPanelWrapper release];
-  sColorPanelWrapper = nullptr;
-  DoneWithRetarget();
-}
diff --git a/widget/cocoa/nsCursorManager.h b/widget/cocoa/nsCursorManager.h
deleted file mode 100644
index 6dba8f9034..0000000000
--- a/widget/cocoa/nsCursorManager.h
+++ /dev/null
@@ -1,65 +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/. */
-
-#ifndef nsCursorManager_h_
-#define nsCursorManager_h_
-
-#import <Foundation/Foundation.h>
-#include "nsIWidget.h"
-#include "nsMacCursor.h"
-
-/*! @class      nsCursorManager
-    @abstract   Singleton service provides access to all cursors available in the application.
-    @discussion Use <code>nsCusorManager</code> to set the current cursor using an XP <code>nsCusor</code> enum value.
-                <code>nsCursorManager</code> encapsulates the details of setting different types of cursors, animating
-                cursors and cleaning up cursors when they are no longer in use.
- */
-@interface nsCursorManager : NSObject
-{
-  @private
-  NSMutableDictionary *mCursors;
-  nsMacCursor *mCurrentMacCursor;
-}
-
-/*! @method     setCursor:
-    @abstract   Sets the current cursor.
-    @discussion Sets the current cursor to the cursor indicated by the XP cursor constant given as an argument.
-                Resources associated with the previous cursor are cleaned up.
-    @param aCursor the cursor to use
-*/
-- (nsresult) setCursor: (nsCursor) aCursor;
-
-/*! @method  setCursorWithImage:hotSpotX:hotSpotY:
- @abstract   Sets the current cursor to a custom image
- @discussion Sets the current cursor to the cursor given by the aCursorImage argument.
- Resources associated with the previous cursor are cleaned up.
- @param aCursorImage the cursor image to use
- @param aHotSpotX the x coordinate of the cursor's hotspot
- @param aHotSpotY the y coordinate of the cursor's hotspot
- @param scaleFactor the scale factor of the target display (2 for a retina display)
- */
-- (nsresult) setCursorWithImage: (imgIContainer*) aCursorImage hotSpotX: (uint32_t) aHotspotX hotSpotY: (uint32_t) aHotspotY scaleFactor: (CGFloat) scaleFactor;
-
-
-/*! @method     sharedInstance
-    @abstract   Get the Singleton instance of the cursor manager.
-    @discussion Use this method to obtain a reference to the cursor manager.
-    @result a reference to the cursor manager
-*/
-+ (nsCursorManager *) sharedInstance;
-
-/*! @method     dispose
-    @abstract   Releases the shared instance of the cursor manager.
-    @discussion Use dispose to clean up the cursor manager and associated cursors.
-*/
-+ (void) dispose;
-@end
-
-@interface NSCursor (Undocumented)
-// busyButClickableCursor is an undocumented NSCursor API, but has been in use since
-// at least OS X 10.4 and through 10.9.
-+ (NSCursor*)busyButClickableCursor;
-@end
-
-#endif // nsCursorManager_h_
diff --git a/widget/cocoa/nsCursorManager.mm b/widget/cocoa/nsCursorManager.mm
deleted file mode 100644
index c4281a438a..0000000000
--- a/widget/cocoa/nsCursorManager.mm
+++ /dev/null
@@ -1,308 +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 "imgIContainer.h"
-#include "nsCocoaUtils.h"
-#include "nsCursorManager.h"
-#include "nsObjCExceptions.h"
-#include <math.h>
-
-static nsCursorManager *gInstance;
-static CGFloat sCursorScaleFactor = 0.0f;
-static imgIContainer *sCursorImgContainer = nullptr;
-static const nsCursor sCustomCursor = eCursorCount;
-
-/*! @category nsCursorManager(PrivateMethods)
-    Private methods for the cursor manager class.
-*/
-@interface nsCursorManager(PrivateMethods)
-/*! @method     getCursor:
-    @abstract   Get a reference to the native Mac representation of a cursor.
-    @discussion Gets a reference to the Mac native implementation of a cursor.
-                If the cursor has been requested before, it is retreived from the cursor cache,
-                otherwise it is created and cached.
-    @param      aCursor the cursor to get
-    @result     the Mac native implementation of the cursor
-*/
-- (nsMacCursor *) getCursor: (nsCursor) aCursor;
-
-/*! @method     setMacCursor:
- @abstract   Set the current Mac native cursor
- @discussion Sets the current cursor - this routine is what actually causes the cursor to change.
- The argument is retained and the old cursor is released.
- @param      aMacCursor the cursor to set
- @result     NS_OK
- */
-- (nsresult) setMacCursor: (nsMacCursor*) aMacCursor;
-
-/*! @method     createCursor:
-    @abstract   Create a Mac native representation of a cursor.
-    @discussion Creates a version of the Mac native representation of this cursor
-    @param      aCursor the cursor to create
-    @result     the Mac native implementation of the cursor
-*/
-+ (nsMacCursor *) createCursor: (enum nsCursor) aCursor;
-
-@end
-
-@implementation nsCursorManager
-
-+ (nsCursorManager *) sharedInstance
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  if (!gInstance) {
-    gInstance = [[nsCursorManager alloc] init];
-  }
-  return gInstance;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-+ (void) dispose
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  [gInstance release];
-  gInstance = nil;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-+ (nsMacCursor *) createCursor: (enum nsCursor) aCursor
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  switch(aCursor)
-  {
-    SEL cursorSelector;
-    case eCursor_standard:
-      return [nsMacCursor cursorWithCursor:[NSCursor arrowCursor] type:aCursor];
-    case eCursor_wait:
-    case eCursor_spinning:
-    {
-      return [nsMacCursor cursorWithCursor:[NSCursor busyButClickableCursor] type:aCursor];
-    }
-    case eCursor_select:
-      return [nsMacCursor cursorWithCursor:[NSCursor IBeamCursor] type:aCursor];
-    case eCursor_hyperlink:
-      return [nsMacCursor cursorWithCursor:[NSCursor pointingHandCursor] type:aCursor];
-    case eCursor_crosshair:
-      return [nsMacCursor cursorWithCursor:[NSCursor crosshairCursor] type:aCursor];
-    case eCursor_move:
-      return [nsMacCursor cursorWithImageNamed:@"move" hotSpot:NSMakePoint(12,12) type:aCursor];
-    case eCursor_help:
-      return [nsMacCursor cursorWithImageNamed:@"help" hotSpot:NSMakePoint(12,12) type:aCursor];
-    case eCursor_copy:
-      cursorSelector = @selector(dragCopyCursor);
-      return [nsMacCursor cursorWithCursor:[NSCursor respondsToSelector:cursorSelector] ?
-              [NSCursor performSelector:cursorSelector] :
-              [NSCursor arrowCursor] type:aCursor];
-    case eCursor_alias:
-      cursorSelector = @selector(dragLinkCursor);
-      return [nsMacCursor cursorWithCursor:[NSCursor respondsToSelector:cursorSelector] ?
-              [NSCursor performSelector:cursorSelector] :
-              [NSCursor arrowCursor] type:aCursor];
-    case eCursor_context_menu:
-      cursorSelector = @selector(contextualMenuCursor);
-      return [nsMacCursor cursorWithCursor:[NSCursor respondsToSelector:cursorSelector] ?
-              [NSCursor performSelector:cursorSelector] :
-              [NSCursor arrowCursor] type:aCursor];
-    case eCursor_cell:
-      return [nsMacCursor cursorWithImageNamed:@"cell" hotSpot:NSMakePoint(12,12) type:aCursor];
-    case eCursor_grab:
-      return [nsMacCursor cursorWithCursor:[NSCursor openHandCursor] type:aCursor];
-    case eCursor_grabbing:
-      return [nsMacCursor cursorWithCursor:[NSCursor closedHandCursor] type:aCursor];
-    case eCursor_zoom_in:
-      return [nsMacCursor cursorWithImageNamed:@"zoomIn" hotSpot:NSMakePoint(10,10) type:aCursor];
-    case eCursor_zoom_out:
-      return [nsMacCursor cursorWithImageNamed:@"zoomOut" hotSpot:NSMakePoint(10,10) type:aCursor];
-    case eCursor_vertical_text:
-      return [nsMacCursor cursorWithImageNamed:@"vtIBeam" hotSpot:NSMakePoint(12,11) type:aCursor];
-    case eCursor_all_scroll:
-      return [nsMacCursor cursorWithCursor:[NSCursor openHandCursor] type:aCursor];
-    case eCursor_not_allowed:
-    case eCursor_no_drop:
-      cursorSelector = @selector(operationNotAllowedCursor);
-      return [nsMacCursor cursorWithCursor:[NSCursor respondsToSelector:cursorSelector] ?
-              [NSCursor performSelector:cursorSelector] :
-              [NSCursor arrowCursor] type:aCursor];
-    // Resize Cursors:
-    // North
-    case eCursor_n_resize:
-        return [nsMacCursor cursorWithCursor:[NSCursor resizeUpCursor] type:aCursor];
-    // North East
-    case eCursor_ne_resize:
-        return [nsMacCursor cursorWithImageNamed:@"sizeNE" hotSpot:NSMakePoint(12,11) type:aCursor];
-    // East
-    case eCursor_e_resize:
-        return [nsMacCursor cursorWithCursor:[NSCursor resizeRightCursor] type:aCursor];
-    // South East
-    case eCursor_se_resize:
-        return [nsMacCursor cursorWithImageNamed:@"sizeSE" hotSpot:NSMakePoint(12,12) type:aCursor];
-    // South
-    case eCursor_s_resize:
-        return [nsMacCursor cursorWithCursor:[NSCursor resizeDownCursor] type:aCursor];
-    // South West
-    case eCursor_sw_resize:
-        return [nsMacCursor cursorWithImageNamed:@"sizeSW" hotSpot:NSMakePoint(10,12) type:aCursor];
-    // West
-    case eCursor_w_resize:
-        return [nsMacCursor cursorWithCursor:[NSCursor resizeLeftCursor] type:aCursor];
-    // North West
-    case eCursor_nw_resize:
-        return [nsMacCursor cursorWithImageNamed:@"sizeNW" hotSpot:NSMakePoint(11,11) type:aCursor];
-    // North & South
-    case eCursor_ns_resize:
-        return [nsMacCursor cursorWithCursor:[NSCursor resizeUpDownCursor] type:aCursor];
-    // East & West
-    case eCursor_ew_resize:
-        return [nsMacCursor cursorWithCursor:[NSCursor resizeLeftRightCursor] type:aCursor];
-    // North East & South West
-    case eCursor_nesw_resize:
-        return [nsMacCursor cursorWithImageNamed:@"sizeNESW" hotSpot:NSMakePoint(12,12) type:aCursor];
-    // North West & South East
-    case eCursor_nwse_resize:
-        return [nsMacCursor cursorWithImageNamed:@"sizeNWSE" hotSpot:NSMakePoint(12,12) type:aCursor];
-    // Column Resize
-    case eCursor_col_resize:
-        return [nsMacCursor cursorWithImageNamed:@"colResize" hotSpot:NSMakePoint(12,12) type:aCursor];
-    // Row Resize
-    case eCursor_row_resize:
-        return [nsMacCursor cursorWithImageNamed:@"rowResize" hotSpot:NSMakePoint(12,12) type:aCursor];
-    default:
-        return [nsMacCursor cursorWithCursor:[NSCursor arrowCursor] type:aCursor];
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-- (id) init
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  if ((self = [super init])) {
-    mCursors = [[NSMutableDictionary alloc] initWithCapacity:25];
-  }
-  return self;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-- (nsresult) setCursor: (enum nsCursor) aCursor
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  // Some plugins mess with our cursors and set a cursor that even
-  // [NSCursor currentCursor] doesn't know about. In case that happens, just
-  // reset the state.
-  [[NSCursor currentCursor] set];
-
-  nsCursor oldType = [mCurrentMacCursor type];
-  if (oldType != aCursor) {
-    if (aCursor == eCursor_none) {
-      [NSCursor hide];
-    } else if (oldType == eCursor_none) {
-      [NSCursor unhide];
-    }
-  }
-  [self setMacCursor:[self getCursor:aCursor]];
-
-  // if a custom cursor was previously set, release sCursorImgContainer
-  if (oldType == sCustomCursor) {
-    NS_IF_RELEASE(sCursorImgContainer);
-  }
-  return NS_OK;
-  
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-- (nsresult) setMacCursor: (nsMacCursor*) aMacCursor
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  if (mCurrentMacCursor != aMacCursor || ![mCurrentMacCursor isSet]) {
-    [aMacCursor retain];
-    [mCurrentMacCursor unset];
-    [aMacCursor set];
-    [mCurrentMacCursor release];
-    mCurrentMacCursor = aMacCursor;
-  }
-
-  return NS_OK;
-  
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-- (nsresult) setCursorWithImage: (imgIContainer*) aCursorImage hotSpotX: (uint32_t) aHotspotX hotSpotY: (uint32_t) aHotspotY scaleFactor: (CGFloat) scaleFactor
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-  // As the user moves the mouse, this gets called repeatedly with the same aCursorImage
-  if (sCursorImgContainer == aCursorImage && sCursorScaleFactor == scaleFactor && mCurrentMacCursor) {
-    [self setMacCursor:mCurrentMacCursor];
-    return NS_OK;
-  }
-  
-  [[NSCursor currentCursor] set];
-  int32_t width = 0, height = 0;
-  aCursorImage->GetWidth(&width);
-  aCursorImage->GetHeight(&height);
-  // prevent DoS attacks
-  if (width > 128 || height > 128) {
-    return NS_OK;
-  }
-
-  NSImage *cursorImage;
-  nsresult rv = nsCocoaUtils::CreateNSImageFromImageContainer(aCursorImage, imgIContainer::FRAME_FIRST, &cursorImage, scaleFactor);
-  if (NS_FAILED(rv) || !cursorImage) {
-    return NS_ERROR_FAILURE;
-  }
-
-  // if the hotspot is nonsensical, make it 0,0
-  aHotspotX = (aHotspotX > (uint32_t)width - 1) ? 0 : aHotspotX;
-  aHotspotY = (aHotspotY > (uint32_t)height - 1) ? 0 : aHotspotY;
-
-  NSPoint hotSpot = ::NSMakePoint(aHotspotX, aHotspotY);
-  [self setMacCursor:[nsMacCursor cursorWithCursor:[[NSCursor alloc] initWithImage:cursorImage hotSpot:hotSpot] type:sCustomCursor]];
-  [cursorImage release];
-  
-  NS_IF_RELEASE(sCursorImgContainer);
-  sCursorImgContainer = aCursorImage;
-  sCursorScaleFactor = scaleFactor;
-  NS_ADDREF(sCursorImgContainer);
-  
-  return NS_OK;
-  
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-- (nsMacCursor *) getCursor: (enum nsCursor) aCursor
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  nsMacCursor * result = [mCursors objectForKey:[NSNumber numberWithInt:aCursor]];
-  if (!result) {
-    result = [nsCursorManager createCursor:aCursor];
-    [mCursors setObject:result forKey:[NSNumber numberWithInt:aCursor]];
-  }
-  return result;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-- (void) dealloc
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  [mCurrentMacCursor unset];
-  [mCurrentMacCursor release];
-  [mCursors release];
-  NS_IF_RELEASE(sCursorImgContainer);
-  [super dealloc];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-@end
diff --git a/widget/cocoa/nsDeviceContextSpecX.h b/widget/cocoa/nsDeviceContextSpecX.h
deleted file mode 100644
index 2df52418a7..0000000000
--- a/widget/cocoa/nsDeviceContextSpecX.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsDeviceContextSpecX_h_
-#define nsDeviceContextSpecX_h_
-
-#include "nsIDeviceContextSpec.h"
-
-#include <ApplicationServices/ApplicationServices.h>
-
-class nsDeviceContextSpecX : public nsIDeviceContextSpec
-{
-public:
-    NS_DECL_ISUPPORTS
-
-    nsDeviceContextSpecX();
-
-    NS_IMETHOD Init(nsIWidget *aWidget, nsIPrintSettings* aPS, bool aIsPrintPreview) override;
-    virtual already_AddRefed<PrintTarget> MakePrintTarget() final;
-    NS_IMETHOD BeginDocument(const nsAString& aTitle,
-                             const nsAString& aPrintToFileName,
-                             int32_t          aStartPage,
-                             int32_t          aEndPage) override;
-    NS_IMETHOD EndDocument() override;
-    NS_IMETHOD BeginPage() override;
-    NS_IMETHOD EndPage() override;
-
-    void GetPaperRect(double* aTop, double* aLeft, double* aBottom, double* aRight);
-
-protected:
-    virtual ~nsDeviceContextSpecX();
-
-protected:
-    PMPrintSession    mPrintSession;              // printing context.
-    PMPageFormat      mPageFormat;                // page format.
-    PMPrintSettings   mPrintSettings;             // print settings.
-};
-
-#endif //nsDeviceContextSpecX_h_
diff --git a/widget/cocoa/nsDeviceContextSpecX.mm b/widget/cocoa/nsDeviceContextSpecX.mm
deleted file mode 100644
index d252adef69..0000000000
--- a/widget/cocoa/nsDeviceContextSpecX.mm
+++ /dev/null
@@ -1,165 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "nsDeviceContextSpecX.h"
-
-#include "mozilla/gfx/PrintTargetCG.h"
-#include "mozilla/RefPtr.h"
-#include "nsCRT.h"
-#include <unistd.h>
-
-#include "nsQueryObject.h"
-#include "nsIServiceManager.h"
-#include "nsPrintSettingsX.h"
-
-// This must be the last include:
-#include "nsObjCExceptions.h"
-
-using namespace mozilla;
-using namespace mozilla::gfx;
-
-nsDeviceContextSpecX::nsDeviceContextSpecX()
-: mPrintSession(NULL)
-, mPageFormat(kPMNoPageFormat)
-, mPrintSettings(kPMNoPrintSettings)
-{
-}
-
-nsDeviceContextSpecX::~nsDeviceContextSpecX()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (mPrintSession)
-    ::PMRelease(mPrintSession);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-NS_IMPL_ISUPPORTS(nsDeviceContextSpecX, nsIDeviceContextSpec)
-
-NS_IMETHODIMP nsDeviceContextSpecX::Init(nsIWidget *aWidget,
-                                         nsIPrintSettings* aPS,
-                                         bool aIsPrintPreview)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  RefPtr<nsPrintSettingsX> settings(do_QueryObject(aPS));
-  if (!settings)
-    return NS_ERROR_NO_INTERFACE;
-
-  mPrintSession = settings->GetPMPrintSession();
-  ::PMRetain(mPrintSession);
-  mPageFormat = settings->GetPMPageFormat();
-  mPrintSettings = settings->GetPMPrintSettings();
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP nsDeviceContextSpecX::BeginDocument(const nsAString& aTitle, 
-                                                  const nsAString& aPrintToFileName,
-                                                  int32_t          aStartPage, 
-                                                  int32_t          aEndPage)
-{
-    NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-    if (!aTitle.IsEmpty()) {
-      CFStringRef cfString =
-        ::CFStringCreateWithCharacters(NULL, reinterpret_cast<const UniChar*>(aTitle.BeginReading()),
-                                             aTitle.Length());
-      if (cfString) {
-        ::PMPrintSettingsSetJobName(mPrintSettings, cfString);
-        ::CFRelease(cfString);
-      }
-    }
-
-    OSStatus status;
-    status = ::PMSetFirstPage(mPrintSettings, aStartPage, false);
-    NS_ASSERTION(status == noErr, "PMSetFirstPage failed");
-    status = ::PMSetLastPage(mPrintSettings, aEndPage, false);
-    NS_ASSERTION(status == noErr, "PMSetLastPage failed");
-
-    status = ::PMSessionBeginCGDocumentNoDialog(mPrintSession, mPrintSettings, mPageFormat);
-    if (status != noErr)
-      return NS_ERROR_ABORT;
-
-    return NS_OK;
-
-    NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP nsDeviceContextSpecX::EndDocument()
-{
-    NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-    ::PMSessionEndDocumentNoDialog(mPrintSession);
-    return NS_OK;
-
-    NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP nsDeviceContextSpecX::BeginPage()
-{
-    NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-    PMSessionError(mPrintSession);
-    OSStatus status = ::PMSessionBeginPageNoDialog(mPrintSession, mPageFormat, NULL);
-    if (status != noErr) return NS_ERROR_ABORT;
-    return NS_OK;
-
-    NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP nsDeviceContextSpecX::EndPage()
-{
-    NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-    OSStatus status = ::PMSessionEndPageNoDialog(mPrintSession);
-    if (status != noErr) return NS_ERROR_ABORT;
-    return NS_OK;
-
-    NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-void nsDeviceContextSpecX::GetPaperRect(double* aTop, double* aLeft, double* aBottom, double* aRight)
-{
-    NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-    PMRect paperRect;
-    ::PMGetAdjustedPaperRect(mPageFormat, &paperRect);
-
-    *aTop = paperRect.top, *aLeft = paperRect.left;
-    *aBottom = paperRect.bottom, *aRight = paperRect.right;
-
-    NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-already_AddRefed<PrintTarget> nsDeviceContextSpecX::MakePrintTarget()
-{
-    NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-    double top, left, bottom, right;
-    GetPaperRect(&top, &left, &bottom, &right);
-    const double width = right - left;
-    const double height = bottom - top;
-    IntSize size = IntSize::Floor(width, height);
-
-    CGContextRef context;
-    ::PMSessionGetCGGraphicsContext(mPrintSession, &context);
-
-    if (context) {
-        // Initially, origin is at bottom-left corner of the paper.
-        // Here, we translate it to top-left corner of the paper.
-        CGContextTranslateCTM(context, 0, height);
-        CGContextScaleCTM(context, 1.0, -1.0);
-        return PrintTargetCG::CreateOrNull(context, size);
-    }
-
-    // Apparently we do need this branch - bug 368933.
-    return PrintTargetCG::CreateOrNull(size, SurfaceFormat::A8R8G8B8_UINT32);
-
-    NS_OBJC_END_TRY_ABORT_BLOCK_NSNULL;
-}
diff --git a/widget/cocoa/nsDragService.h b/widget/cocoa/nsDragService.h
deleted file mode 100644
index ea6702812a..0000000000
--- a/widget/cocoa/nsDragService.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsDragService_h_
-#define nsDragService_h_
-
-#include "nsBaseDragService.h"
-
-#include <Cocoa/Cocoa.h>
-
-extern NSString* const kWildcardPboardType;
-extern NSString* const kCorePboardType_url;
-extern NSString* const kCorePboardType_urld;
-extern NSString* const kCorePboardType_urln;
-extern NSString* const kCustomTypesPboardType;
-
-class nsDragService : public nsBaseDragService
-{
-public:
-  nsDragService();
-
-  // nsBaseDragService
-  virtual nsresult InvokeDragSessionImpl(nsIArray* anArrayTransferables,
-                                         nsIScriptableRegion* aRegion,
-                                         uint32_t aActionType);
-  // nsIDragService
-  NS_IMETHOD EndDragSession(bool aDoneDrag);
-
-  // nsIDragSession
-  NS_IMETHOD GetData(nsITransferable * aTransferable, uint32_t aItemIndex);
-  NS_IMETHOD IsDataFlavorSupported(const char *aDataFlavor, bool *_retval);
-  NS_IMETHOD GetNumDropItems(uint32_t * aNumItems);
-
-protected:
-  virtual ~nsDragService();
-
-private:
-
-  NSImage* ConstructDragImage(nsIDOMNode* aDOMNode,
-                              mozilla::LayoutDeviceIntRect* aDragRect,
-                              nsIScriptableRegion* aRegion);
-  bool IsValidType(NSString* availableType, bool allowFileURL);
-  NSString* GetStringForType(NSPasteboardItem* item, const NSString* type,
-                             bool allowFileURL = false);
-  NSString* GetTitleForURL(NSPasteboardItem* item);
-  NSString* GetFilePath(NSPasteboardItem* item);
-
-  nsCOMPtr<nsIArray> mDataItems; // only valid for a drag started within gecko
-  NSView* mNativeDragView;
-  NSEvent* mNativeDragEvent;
-};
-
-#endif // nsDragService_h_
diff --git a/widget/cocoa/nsDragService.mm b/widget/cocoa/nsDragService.mm
deleted file mode 100644
index c4d8e6ff06..0000000000
--- a/widget/cocoa/nsDragService.mm
+++ /dev/null
@@ -1,669 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "mozilla/Logging.h"
-
-#include "nsArrayUtils.h"
-#include "nsDragService.h"
-#include "nsArrayUtils.h"
-#include "nsObjCExceptions.h"
-#include "nsITransferable.h"
-#include "nsString.h"
-#include "nsClipboard.h"
-#include "nsXPCOM.h"
-#include "nsISupportsPrimitives.h"
-#include "nsCOMPtr.h"
-#include "nsPrimitiveHelpers.h"
-#include "nsLinebreakConverter.h"
-#include "nsIMacUtils.h"
-#include "nsIDOMNode.h"
-#include "nsRect.h"
-#include "nsPoint.h"
-#include "nsIIOService.h"
-#include "nsIDocument.h"
-#include "nsIContent.h"
-#include "nsView.h"
-#include "gfxContext.h"
-#include "nsCocoaUtils.h"
-#include "mozilla/gfx/2D.h"
-#include "gfxPlatform.h"
-
-using namespace mozilla;
-using namespace mozilla::gfx;
-
-extern PRLogModuleInfo* sCocoaLog;
-
-extern void EnsureLogInitialized();
-
-extern NSPasteboard* globalDragPboard;
-extern NSView* gLastDragView;
-extern NSEvent* gLastDragMouseDownEvent;
-extern bool gUserCancelledDrag;
-
-// This global makes the transferable array available to Cocoa's promised
-// file destination callback.
-nsIArray *gDraggedTransferables = nullptr;
-
-NSString* const kWildcardPboardType = @"MozillaWildcard";
-NSString* const kCorePboardType_url  = @"CorePasteboardFlavorType 0x75726C20"; // 'url '  url
-NSString* const kCorePboardType_urld = @"CorePasteboardFlavorType 0x75726C64"; // 'urld'  desc
-NSString* const kCorePboardType_urln = @"CorePasteboardFlavorType 0x75726C6E"; // 'urln'  title
-NSString* const kUTTypeURLName = @"public.url-name";
-NSString* const kCustomTypesPboardType = @"org.mozilla.custom-clipdata";
-
-nsDragService::nsDragService()
-{
-  mNativeDragView = nil;
-  mNativeDragEvent = nil;
-
-  EnsureLogInitialized();
-}
-
-nsDragService::~nsDragService()
-{
-}
-
-static nsresult SetUpDragClipboard(nsIArray* aTransferableArray)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  if (!aTransferableArray)
-    return NS_ERROR_FAILURE;
-
-  uint32_t count = 0;
-  aTransferableArray->GetLength(&count);
-
-  NSPasteboard* dragPBoard = [NSPasteboard pasteboardWithName:NSDragPboard];
-
-  for (uint32_t j = 0; j < count; j++) {
-    nsCOMPtr<nsITransferable> currentTransferable = do_QueryElementAt(aTransferableArray, j);
-    if (!currentTransferable)
-      return NS_ERROR_FAILURE;
-
-    // Transform the transferable to an NSDictionary
-    NSDictionary* pasteboardOutputDict = nsClipboard::PasteboardDictFromTransferable(currentTransferable);
-    if (!pasteboardOutputDict)
-      return NS_ERROR_FAILURE;
-
-    // write everything out to the general pasteboard
-    unsigned int typeCount = [pasteboardOutputDict count];
-    NSMutableArray* types = [NSMutableArray arrayWithCapacity:typeCount + 1];
-    [types addObjectsFromArray:[pasteboardOutputDict allKeys]];
-    // Gecko is initiating this drag so we always want its own views to consider
-    // it. Add our wildcard type to the pasteboard to accomplish this.
-    [types addObject:kWildcardPboardType]; // we don't increase the count for the loop below on purpose
-    [dragPBoard declareTypes:types owner:nil];
-    for (unsigned int k = 0; k < typeCount; k++) {
-      NSString* currentKey = [types objectAtIndex:k];
-      id currentValue = [pasteboardOutputDict valueForKey:currentKey];
-      if (currentKey == NSStringPboardType ||
-          currentKey == kCorePboardType_url ||
-          currentKey == kCorePboardType_urld ||
-          currentKey == kCorePboardType_urln) {
-        [dragPBoard setString:currentValue forType:currentKey];
-      }
-      else if (currentKey == NSHTMLPboardType) {
-        [dragPBoard setString:(nsClipboard::WrapHtmlForSystemPasteboard(currentValue))
-                      forType:currentKey];
-      }
-      else if (currentKey == NSTIFFPboardType ||
-               currentKey == kCustomTypesPboardType) {
-        [dragPBoard setData:currentValue forType:currentKey];
-      }
-      else if (currentKey == NSFilesPromisePboardType ||
-               currentKey == NSFilenamesPboardType) {
-        [dragPBoard setPropertyList:currentValue forType:currentKey];        
-      }
-    }
-  }
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NSImage*
-nsDragService::ConstructDragImage(nsIDOMNode* aDOMNode,
-                                  LayoutDeviceIntRect* aDragRect,
-                                  nsIScriptableRegion* aRegion)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  CGFloat scaleFactor = nsCocoaUtils::GetBackingScaleFactor(gLastDragView);
-
-  RefPtr<SourceSurface> surface;
-  nsPresContext* pc;
-  nsresult rv = DrawDrag(aDOMNode, aRegion, mScreenPosition,
-                         aDragRect, &surface, &pc);
-  if (pc && (!aDragRect->width || !aDragRect->height)) {
-    // just use some suitable defaults
-    int32_t size = nsCocoaUtils::CocoaPointsToDevPixels(20, scaleFactor);
-    aDragRect->SetRect(pc->CSSPixelsToDevPixels(mScreenPosition.x),
-                       pc->CSSPixelsToDevPixels(mScreenPosition.y), size, size);
-  }
-
-  if (NS_FAILED(rv) || !surface)
-    return nil;
-
-  uint32_t width = aDragRect->width;
-  uint32_t height = aDragRect->height;
-
-  RefPtr<DataSourceSurface> dataSurface =
-    Factory::CreateDataSourceSurface(IntSize(width, height),
-                                     SurfaceFormat::B8G8R8A8);
-  DataSourceSurface::MappedSurface map;
-  if (!dataSurface->Map(DataSourceSurface::MapType::READ_WRITE, &map)) {
-    return nil;
-  }
-
-  RefPtr<DrawTarget> dt =
-    Factory::CreateDrawTargetForData(BackendType::CAIRO,
-                                     map.mData,
-                                     dataSurface->GetSize(),
-                                     map.mStride,
-                                     dataSurface->GetFormat());
-  if (!dt) {
-    dataSurface->Unmap();
-    return nil;
-  }
-
-  dt->FillRect(gfx::Rect(0, 0, width, height),
-               SurfacePattern(surface, ExtendMode::CLAMP),
-               DrawOptions(1.0f, CompositionOp::OP_SOURCE));
-
-  NSBitmapImageRep* imageRep =
-    [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL
-                                            pixelsWide:width
-                                            pixelsHigh:height
-                                         bitsPerSample:8
-                                       samplesPerPixel:4
-                                              hasAlpha:YES
-                                              isPlanar:NO
-                                        colorSpaceName:NSDeviceRGBColorSpace
-                                           bytesPerRow:width * 4
-                                          bitsPerPixel:32];
-
-  uint8_t* dest = [imageRep bitmapData];
-  for (uint32_t i = 0; i < height; ++i) {
-    uint8_t* src = map.mData + i * map.mStride;
-    for (uint32_t j = 0; j < width; ++j) {
-      // Reduce transparency overall by multipying by a factor. Remember, Alpha
-      // is premultipled here. Also, Quartz likes RGBA, so do that translation as well.
-#ifdef IS_BIG_ENDIAN
-      dest[0] = uint8_t(src[1] * DRAG_TRANSLUCENCY);
-      dest[1] = uint8_t(src[2] * DRAG_TRANSLUCENCY);
-      dest[2] = uint8_t(src[3] * DRAG_TRANSLUCENCY);
-      dest[3] = uint8_t(src[0] * DRAG_TRANSLUCENCY);
-#else
-      dest[0] = uint8_t(src[2] * DRAG_TRANSLUCENCY);
-      dest[1] = uint8_t(src[1] * DRAG_TRANSLUCENCY);
-      dest[2] = uint8_t(src[0] * DRAG_TRANSLUCENCY);
-      dest[3] = uint8_t(src[3] * DRAG_TRANSLUCENCY);
-#endif
-      src += 4;
-      dest += 4;
-    }
-  }
-  dataSurface->Unmap();
-
-  NSImage* image =
-    [[NSImage alloc] initWithSize:NSMakeSize(width / scaleFactor,
-                                             height / scaleFactor)];
-  [image addRepresentation:imageRep];
-  [imageRep release];
-
-  return [image autorelease];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-bool
-nsDragService::IsValidType(NSString* availableType, bool allowFileURL)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  // Prevent exposing fileURL for non-fileURL type.
-  // We need URL provided by dropped webloc file, but don't need file's URL.
-  // kUTTypeFileURL is returned by [NSPasteboard availableTypeFromArray:] for
-  // kUTTypeURL, since it conforms to kUTTypeURL.
-  if (!allowFileURL && [availableType isEqualToString:(id)kUTTypeFileURL]) {
-    return false;
-  }
-
-  return true;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(false);
-}
-
-NSString*
-nsDragService::GetStringForType(NSPasteboardItem* item, const NSString* type,
-                                bool allowFileURL)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  NSString* availableType = [item availableTypeFromArray:[NSArray arrayWithObjects:(id)type, nil]];
-  if (availableType && IsValidType(availableType, allowFileURL)) {
-    return [item stringForType:(id)availableType];
-  }
-
-  return nil;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-NSString*
-nsDragService::GetTitleForURL(NSPasteboardItem* item)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  NSString* name = GetStringForType(item, (const NSString*)kUTTypeURLName);
-  if (name) {
-    return name;
-  }
-
-  NSString* filePath = GetFilePath(item);
-  if (filePath) {
-    return [filePath lastPathComponent];
-  }
-
-  return nil;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-NSString*
-nsDragService::GetFilePath(NSPasteboardItem* item)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  NSString* urlString = GetStringForType(item, (const NSString*)kUTTypeFileURL, true);
-  if (urlString) {
-    NSURL* url = [NSURL URLWithString:urlString];
-    if (url) {
-      return [url path];
-    }
-  }
-
-  return nil;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-// We can only invoke NSView's 'dragImage:at:offset:event:pasteboard:source:slideBack:' from
-// within NSView's 'mouseDown:' or 'mouseDragged:'. Luckily 'mouseDragged' is always on the
-// stack when InvokeDragSession gets called.
-nsresult
-nsDragService::InvokeDragSessionImpl(nsIArray* aTransferableArray,
-                                     nsIScriptableRegion* aDragRgn,
-                                     uint32_t aActionType)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  mDataItems = aTransferableArray;
-
-  // put data on the clipboard
-  if (NS_FAILED(SetUpDragClipboard(aTransferableArray)))
-    return NS_ERROR_FAILURE;
-
-  CGFloat scaleFactor = nsCocoaUtils::GetBackingScaleFactor(gLastDragView);
-
-  LayoutDeviceIntRect dragRect(0, 0, 20, 20);
-  NSImage* image = ConstructDragImage(mSourceNode, &dragRect, aDragRgn);
-  if (!image) {
-    // if no image was returned, just draw a rectangle
-    NSSize size;
-    size.width = nsCocoaUtils::DevPixelsToCocoaPoints(dragRect.width, scaleFactor);
-    size.height = nsCocoaUtils::DevPixelsToCocoaPoints(dragRect.height, scaleFactor);
-    image = [[NSImage alloc] initWithSize:size];
-    [image lockFocus];
-    [[NSColor grayColor] set];
-    NSBezierPath* path = [NSBezierPath bezierPath];
-    [path setLineWidth:2.0];
-    [path moveToPoint:NSMakePoint(0, 0)];
-    [path lineToPoint:NSMakePoint(0, size.height)];
-    [path lineToPoint:NSMakePoint(size.width, size.height)];
-    [path lineToPoint:NSMakePoint(size.width, 0)];
-    [path lineToPoint:NSMakePoint(0, 0)];
-    [path stroke];
-    [image unlockFocus];
-  }
-
-  LayoutDeviceIntPoint pt(dragRect.x, dragRect.YMost());
-  NSPoint point = nsCocoaUtils::DevPixelsToCocoaPoints(pt, scaleFactor);
-  point.y = nsCocoaUtils::FlippedScreenY(point.y);
-
-  point = nsCocoaUtils::ConvertPointFromScreen([gLastDragView window], point);
-  NSPoint localPoint = [gLastDragView convertPoint:point fromView:nil];
- 
-  // Save the transferables away in case a promised file callback is invoked.
-  gDraggedTransferables = aTransferableArray;
-
-  nsBaseDragService::StartDragSession();
-  nsBaseDragService::OpenDragPopup();
-
-  // We need to retain the view and the event during the drag in case either gets destroyed.
-  mNativeDragView = [gLastDragView retain];
-  mNativeDragEvent = [gLastDragMouseDownEvent retain];
-
-  gUserCancelledDrag = false;
-  [mNativeDragView dragImage:image
-                          at:localPoint
-                      offset:NSZeroSize
-                       event:mNativeDragEvent
-                  pasteboard:[NSPasteboard pasteboardWithName:NSDragPboard]
-                      source:mNativeDragView
-                   slideBack:YES];
-  gUserCancelledDrag = false;
-
-  if (mDoingDrag)
-    nsBaseDragService::EndDragSession(false);
-  
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-nsDragService::GetData(nsITransferable* aTransferable, uint32_t aItemIndex)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  if (!aTransferable)
-    return NS_ERROR_FAILURE;
-
-  // get flavor list that includes all acceptable flavors (including ones obtained through conversion)
-  nsCOMPtr<nsIArray> flavorList;
-  nsresult rv = aTransferable->FlavorsTransferableCanImport(getter_AddRefs(flavorList));
-  if (NS_FAILED(rv))
-    return NS_ERROR_FAILURE;
-
-  uint32_t acceptableFlavorCount;
-  flavorList->GetLength(&acceptableFlavorCount);
-
-  // if this drag originated within Mozilla we should just use the cached data from
-  // when the drag started if possible
-  if (mDataItems) {
-    nsCOMPtr<nsITransferable> currentTransferable = do_QueryElementAt(mDataItems, aItemIndex);
-    if (currentTransferable) {
-      for (uint32_t i = 0; i < acceptableFlavorCount; i++) {
-        nsCOMPtr<nsISupportsCString> currentFlavor = do_QueryElementAt(flavorList, i);
-        if (!currentFlavor)
-          continue;
-        nsXPIDLCString flavorStr;
-        currentFlavor->ToString(getter_Copies(flavorStr));
-
-        nsCOMPtr<nsISupports> dataSupports;
-        uint32_t dataSize = 0;
-        rv = currentTransferable->GetTransferData(flavorStr, getter_AddRefs(dataSupports), &dataSize);
-        if (NS_SUCCEEDED(rv)) {
-          aTransferable->SetTransferData(flavorStr, dataSupports, dataSize);
-          return NS_OK; // maybe try to fill in more types? Is there a point?
-        }
-      }
-    }
-  }
-
-  // now check the actual clipboard for data
-  for (uint32_t i = 0; i < acceptableFlavorCount; i++) {
-    nsCOMPtr<nsISupportsCString> currentFlavor = do_QueryElementAt(flavorList, i);
-    if (!currentFlavor)
-      continue;
-
-    nsXPIDLCString flavorStr;
-    currentFlavor->ToString(getter_Copies(flavorStr));
-
-    MOZ_LOG(sCocoaLog, LogLevel::Info, ("nsDragService::GetData: looking for clipboard data of type %s\n", flavorStr.get()));
-
-    NSArray* droppedItems = [globalDragPboard pasteboardItems];
-    if (!droppedItems) {
-      continue;
-    }
-
-    uint32_t itemCount = [droppedItems count];
-    if (aItemIndex >= itemCount) {
-      continue;
-    }
-
-    NSPasteboardItem* item = [droppedItems objectAtIndex:aItemIndex];
-    if (!item) {
-      continue;
-    }
-
-    if (flavorStr.EqualsLiteral(kFileMime)) {
-      NSString* filePath = GetFilePath(item);
-      if (!filePath)
-        continue;
-
-      unsigned int stringLength = [filePath length];
-      unsigned int dataLength = (stringLength + 1) * sizeof(char16_t); // in bytes
-      char16_t* clipboardDataPtr = (char16_t*)malloc(dataLength);
-      if (!clipboardDataPtr)
-        return NS_ERROR_OUT_OF_MEMORY;
-      [filePath getCharacters:reinterpret_cast<unichar*>(clipboardDataPtr)];
-      clipboardDataPtr[stringLength] = 0; // null terminate
-
-      nsCOMPtr<nsIFile> file;
-      rv = NS_NewLocalFile(nsDependentString(clipboardDataPtr), true, getter_AddRefs(file));
-      free(clipboardDataPtr);
-      if (NS_FAILED(rv))
-        continue;
-
-      aTransferable->SetTransferData(flavorStr, file, dataLength);
-      
-      break;
-    }
-    else if (flavorStr.EqualsLiteral(kCustomTypesMime)) {
-      NSString* availableType = [item availableTypeFromArray:[NSArray arrayWithObject:kCustomTypesPboardType]];
-      if (!availableType || !IsValidType(availableType, false)) {
-          continue;
-      }
-      NSData *pasteboardData = [item dataForType:availableType];
-      if (!pasteboardData) {
-        continue;
-      }
-
-      unsigned int dataLength = [pasteboardData length];
-      void* clipboardDataPtr = malloc(dataLength);
-      if (!clipboardDataPtr) {
-        return NS_ERROR_OUT_OF_MEMORY;
-      }
-      [pasteboardData getBytes:clipboardDataPtr];
-
-      nsCOMPtr<nsISupports> genericDataWrapper;
-      nsPrimitiveHelpers::CreatePrimitiveForData(flavorStr, clipboardDataPtr, dataLength,
-                                                 getter_AddRefs(genericDataWrapper));
-
-      aTransferable->SetTransferData(flavorStr, genericDataWrapper, sizeof(nsIInputStream*));
-      free(clipboardDataPtr);
-      break;
-    }
-
-    NSString* pString = nil;
-    if (flavorStr.EqualsLiteral(kUnicodeMime)) {
-      pString = GetStringForType(item, (const NSString*)kUTTypeUTF8PlainText);
-    } else if (flavorStr.EqualsLiteral(kHTMLMime)) {
-      pString = GetStringForType(item, (const NSString*)kUTTypeHTML);
-    } else if (flavorStr.EqualsLiteral(kURLMime)) {
-      pString = GetStringForType(item, (const NSString*)kUTTypeURL);
-      if (pString) {
-        NSString* title = GetTitleForURL(item);
-        if (!title) {
-          title = pString;
-        }
-        pString = [NSString stringWithFormat:@"%@\n%@", pString, title];
-      }
-    } else if (flavorStr.EqualsLiteral(kURLDataMime)) {
-      pString = GetStringForType(item, (const NSString*)kUTTypeURL);
-    } else if (flavorStr.EqualsLiteral(kURLDescriptionMime)) {
-      pString = GetTitleForURL(item);
-    } else if (flavorStr.EqualsLiteral(kRTFMime)) {
-      pString = GetStringForType(item, (const NSString*)kUTTypeRTF);
-    }
-    if (pString) {
-      NSData* stringData;
-      if (flavorStr.EqualsLiteral(kRTFMime)) {
-        stringData = [pString dataUsingEncoding:NSASCIIStringEncoding];
-      } else {
-        stringData = [pString dataUsingEncoding:NSUnicodeStringEncoding];
-      }
-      unsigned int dataLength = [stringData length];
-      void* clipboardDataPtr = malloc(dataLength);
-      if (!clipboardDataPtr)
-        return NS_ERROR_OUT_OF_MEMORY;
-      [stringData getBytes:clipboardDataPtr];
-
-      // The DOM only wants LF, so convert from MacOS line endings to DOM line endings.
-      int32_t signedDataLength = dataLength;
-      nsLinebreakHelpers::ConvertPlatformToDOMLinebreaks(flavorStr, &clipboardDataPtr, &signedDataLength);
-      dataLength = signedDataLength;
-
-      // skip BOM (Byte Order Mark to distinguish little or big endian)      
-      char16_t* clipboardDataPtrNoBOM = (char16_t*)clipboardDataPtr;
-      if ((dataLength > 2) &&
-          ((clipboardDataPtrNoBOM[0] == 0xFEFF) ||
-           (clipboardDataPtrNoBOM[0] == 0xFFFE))) {
-        dataLength -= sizeof(char16_t);
-        clipboardDataPtrNoBOM += 1;
-      }
-
-      nsCOMPtr<nsISupports> genericDataWrapper;
-      nsPrimitiveHelpers::CreatePrimitiveForData(flavorStr, clipboardDataPtrNoBOM, dataLength,
-                                                 getter_AddRefs(genericDataWrapper));
-      aTransferable->SetTransferData(flavorStr, genericDataWrapper, dataLength);
-      free(clipboardDataPtr);
-      break;
-    }
-
-    // We have never supported this on Mac OS X, we should someday. Normally dragging images
-    // in is accomplished with a file path drag instead of the image data itself.
-    /*
-    if (flavorStr.EqualsLiteral(kPNGImageMime) || flavorStr.EqualsLiteral(kJPEGImageMime) ||
-        flavorStr.EqualsLiteral(kJPGImageMime) || flavorStr.EqualsLiteral(kGIFImageMime)) {
-
-    }
-    */
-  }
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-nsDragService::IsDataFlavorSupported(const char *aDataFlavor, bool *_retval)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  *_retval = false;
-
-  if (!globalDragPboard)
-    return NS_ERROR_FAILURE;
-
-  nsDependentCString dataFlavor(aDataFlavor);
-
-  // first see if we have data for this in our cached transferable
-  if (mDataItems) {
-    uint32_t dataItemsCount;
-    mDataItems->GetLength(&dataItemsCount);
-    for (unsigned int i = 0; i < dataItemsCount; i++) {
-      nsCOMPtr<nsITransferable> currentTransferable = do_QueryElementAt(mDataItems, i);
-      if (!currentTransferable)
-        continue;
-
-      nsCOMPtr<nsIArray> flavorList;
-      nsresult rv = currentTransferable->FlavorsTransferableCanImport(getter_AddRefs(flavorList));
-      if (NS_FAILED(rv))
-        continue;
-
-      uint32_t flavorCount;
-      flavorList->GetLength(&flavorCount);
-      for (uint32_t j = 0; j < flavorCount; j++) {
-        nsCOMPtr<nsISupportsCString> currentFlavor = do_QueryElementAt(flavorList, j);
-        if (!currentFlavor)
-          continue;
-        nsXPIDLCString flavorStr;
-        currentFlavor->ToString(getter_Copies(flavorStr));
-        if (dataFlavor.Equals(flavorStr)) {
-          *_retval = true;
-          return NS_OK;
-        }
-      }
-    }
-  }
-
-  const NSString* type = nil;
-  bool allowFileURL = false;
-  if (dataFlavor.EqualsLiteral(kFileMime)) {
-    type = (const NSString*)kUTTypeFileURL;
-    allowFileURL = true;
-  } else if (dataFlavor.EqualsLiteral(kUnicodeMime)) {
-    type = (const NSString*)kUTTypeUTF8PlainText;
-  } else if (dataFlavor.EqualsLiteral(kHTMLMime)) {
-    type = (const NSString*)kUTTypeHTML;
-  } else if (dataFlavor.EqualsLiteral(kURLMime) ||
-             dataFlavor.EqualsLiteral(kURLDataMime)) {
-    type = (const NSString*)kUTTypeURL;
-  } else if (dataFlavor.EqualsLiteral(kURLDescriptionMime)) {
-    type = (const NSString*)kUTTypeURLName;
-  } else if (dataFlavor.EqualsLiteral(kRTFMime)) {
-    type = (const NSString*)kUTTypeRTF;
-  } else if (dataFlavor.EqualsLiteral(kCustomTypesMime)) {
-    type = (const NSString*)kCustomTypesPboardType;
-  }
-
-  NSString* availableType = [globalDragPboard availableTypeFromArray:[NSArray arrayWithObjects:(id)type, nil]];
-  if (availableType && IsValidType(availableType, allowFileURL)) {
-    *_retval = true;
-  }
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-nsDragService::GetNumDropItems(uint32_t* aNumItems)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  *aNumItems = 0;
-
-  // first check to see if we have a number of items cached
-  if (mDataItems) {
-    mDataItems->GetLength(aNumItems);
-    return NS_OK;
-  }
-
-  NSArray* droppedItems = [globalDragPboard pasteboardItems];
-  if (droppedItems) {
-    *aNumItems = [droppedItems count];
-  }
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-nsDragService::EndDragSession(bool aDoneDrag)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  if (mNativeDragView) {
-    [mNativeDragView release];
-    mNativeDragView = nil;
-  }
-  if (mNativeDragEvent) {
-    [mNativeDragEvent release];
-    mNativeDragEvent = nil;
-  }
-
-  mUserCancelled = gUserCancelledDrag;
-
-  nsresult rv = nsBaseDragService::EndDragSession(aDoneDrag);
-  mDataItems = nullptr;
-  return rv;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
diff --git a/widget/cocoa/nsFilePicker.h b/widget/cocoa/nsFilePicker.h
deleted file mode 100644
index 1aeb22cc18..0000000000
--- a/widget/cocoa/nsFilePicker.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsFilePicker_h_
-#define nsFilePicker_h_
-
-#include "nsBaseFilePicker.h"
-#include "nsString.h"
-#include "nsIFileChannel.h"
-#include "nsIFile.h"
-#include "nsCOMArray.h"
-#include "nsTArray.h"
-
-class nsILocalFileMac;
-@class NSArray;
-
-class nsFilePicker : public nsBaseFilePicker
-{
-public:
-  nsFilePicker(); 
-
-  NS_DECL_ISUPPORTS
-
-  // nsIFilePicker (less what's in nsBaseFilePicker)
-  NS_IMETHOD GetDefaultString(nsAString& aDefaultString) override;
-  NS_IMETHOD SetDefaultString(const nsAString& aDefaultString) override;
-  NS_IMETHOD GetDefaultExtension(nsAString& aDefaultExtension) override;
-  NS_IMETHOD GetFilterIndex(int32_t *aFilterIndex) override;
-  NS_IMETHOD SetFilterIndex(int32_t aFilterIndex) override;
-  NS_IMETHOD SetDefaultExtension(const nsAString& aDefaultExtension) override;
-  NS_IMETHOD GetFile(nsIFile * *aFile) override;
-  NS_IMETHOD GetFileURL(nsIURI * *aFileURL) override;
-  NS_IMETHOD GetFiles(nsISimpleEnumerator **aFiles) override;
-  NS_IMETHOD Show(int16_t *_retval) override; 
-  NS_IMETHOD AppendFilter(const nsAString& aTitle, const nsAString& aFilter) override;
-
-  /**
-   * Returns the current filter list in the format used by Cocoa's NSSavePanel
-   * and NSOpenPanel.
-   * Returns nil if no filter currently apply.
-   */
-  NSArray* GetFilterList();
-
-protected:
-  virtual ~nsFilePicker();
-
-  virtual void InitNative(nsIWidget *aParent, const nsAString& aTitle) override;
-
-  // actual implementations of get/put dialogs using NSOpenPanel & NSSavePanel
-  // aFile is an existing but unspecified file. These functions must specify it.
-  //
-  // will return |returnCancel| or |returnOK| as result.
-  int16_t GetLocalFiles(const nsString& inTitle, bool inAllowMultiple, nsCOMArray<nsIFile>& outFiles);
-  int16_t GetLocalFolder(const nsString& inTitle, nsIFile** outFile);
-  int16_t PutLocalFile(const nsString& inTitle, const nsString& inDefaultName, nsIFile** outFile);
-
-  void     SetDialogTitle(const nsString& inTitle, id aDialog);
-  NSString *PanelDefaultDirectory();
-  NSView* GetAccessoryView();
-                                                
-  nsString               mTitle;
-  nsCOMArray<nsIFile>    mFiles;
-  nsString               mDefault;
-
-  nsTArray<nsString>     mFilters; 
-  nsTArray<nsString>     mTitles;
-
-  int32_t                mSelectedTypeIndex;
-};
-
-#endif // nsFilePicker_h_
diff --git a/widget/cocoa/nsFilePicker.mm b/widget/cocoa/nsFilePicker.mm
deleted file mode 100644
index 5213dee241..0000000000
--- a/widget/cocoa/nsFilePicker.mm
+++ /dev/null
@@ -1,676 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#import <Cocoa/Cocoa.h>
-
-#include "nsFilePicker.h"
-#include "nsCOMPtr.h"
-#include "nsReadableUtils.h"
-#include "nsNetUtil.h"
-#include "nsIComponentManager.h"
-#include "nsIFile.h"
-#include "nsILocalFileMac.h"
-#include "nsIURL.h"
-#include "nsArrayEnumerator.h"
-#include "nsIStringBundle.h"
-#include "nsCocoaUtils.h"
-#include "mozilla/Preferences.h"
-
-// This must be included last:
-#include "nsObjCExceptions.h"
-
-using namespace mozilla;
-
-const float kAccessoryViewPadding = 5;
-const int   kSaveTypeControlTag = 1;
-
-static bool gCallSecretHiddenFileAPI = false;
-const char kShowHiddenFilesPref[] = "filepicker.showHiddenFiles";
-
-/**
- * This class is an observer of NSPopUpButton selection change.
- */
-@interface NSPopUpButtonObserver : NSObject
-{
-  NSPopUpButton* mPopUpButton;
-  NSOpenPanel*   mOpenPanel;
-  nsFilePicker*  mFilePicker;
-}
-- (void) setPopUpButton:(NSPopUpButton*)aPopUpButton;
-- (void) setOpenPanel:(NSOpenPanel*)aOpenPanel;
-- (void) setFilePicker:(nsFilePicker*)aFilePicker;
-- (void) menuChangedItem:(NSNotification*)aSender;
-@end
-
-NS_IMPL_ISUPPORTS(nsFilePicker, nsIFilePicker)
-
-// We never want to call the secret show hidden files API unless the pref
-// has been set. Once the pref has been set we always need to call it even
-// if it disappears so that we stop showing hidden files if a user deletes
-// the pref. If the secret API was used once and things worked out it should
-// continue working for subsequent calls so the user is at no more risk.
-static void SetShowHiddenFileState(NSSavePanel* panel)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  bool show = false;
-  if (NS_SUCCEEDED(Preferences::GetBool(kShowHiddenFilesPref, &show))) {
-    gCallSecretHiddenFileAPI = true;
-  }
-
-  if (gCallSecretHiddenFileAPI) {
-    // invoke a method to get a Cocoa-internal nav view
-    SEL navViewSelector = @selector(_navView);
-    NSMethodSignature* navViewSignature = [panel methodSignatureForSelector:navViewSelector];
-    if (!navViewSignature)
-      return;
-    NSInvocation* navViewInvocation = [NSInvocation invocationWithMethodSignature:navViewSignature];
-    [navViewInvocation setSelector:navViewSelector];
-    [navViewInvocation setTarget:panel];
-    [navViewInvocation invoke];
-
-    // get the returned nav view
-    id navView = nil;
-    [navViewInvocation getReturnValue:&navView];
-
-    // invoke the secret show hidden file state method on the nav view
-    SEL showHiddenFilesSelector = @selector(setShowsHiddenFiles:);
-    NSMethodSignature* showHiddenFilesSignature = [navView methodSignatureForSelector:showHiddenFilesSelector];
-    if (!showHiddenFilesSignature)
-      return;
-    NSInvocation* showHiddenFilesInvocation = [NSInvocation invocationWithMethodSignature:showHiddenFilesSignature];
-    [showHiddenFilesInvocation setSelector:showHiddenFilesSelector];
-    [showHiddenFilesInvocation setTarget:navView];
-    [showHiddenFilesInvocation setArgument:&show atIndex:2];
-    [showHiddenFilesInvocation invoke];
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-nsFilePicker::nsFilePicker()
-: mSelectedTypeIndex(0)
-{
-}
-
-nsFilePicker::~nsFilePicker()
-{
-}
-
-void
-nsFilePicker::InitNative(nsIWidget *aParent, const nsAString& aTitle)
-{
-  mTitle = aTitle;
-}
-
-NSView* nsFilePicker::GetAccessoryView()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  NSView* accessoryView = [[[NSView alloc] initWithFrame:NSMakeRect(0, 0, 0, 0)] autorelease];
-
-  // Set a label's default value.
-  NSString* label = @"Format:";
-
-  // Try to get the localized string.
-  nsCOMPtr<nsIStringBundleService> sbs = do_GetService(NS_STRINGBUNDLE_CONTRACTID);
-  nsCOMPtr<nsIStringBundle> bundle;
-  nsresult rv = sbs->CreateBundle("chrome://global/locale/filepicker.properties", getter_AddRefs(bundle));
-  if (NS_SUCCEEDED(rv)) {
-    nsXPIDLString locaLabel;
-    bundle->GetStringFromName(u"formatLabel", getter_Copies(locaLabel));
-    if (locaLabel) {
-      label = [NSString stringWithCharacters:reinterpret_cast<const unichar*>(locaLabel.get())
-                                      length:locaLabel.Length()];
-    }
-  }
-
-  // set up label text field
-  NSTextField* textField = [[[NSTextField alloc] init] autorelease];
-  [textField setEditable:NO];
-  [textField setSelectable:NO];
-  [textField setDrawsBackground:NO];
-  [textField setBezeled:NO];
-  [textField setBordered:NO];
-  [textField setFont:[NSFont labelFontOfSize:13.0]];
-  [textField setStringValue:label];
-  [textField setTag:0];
-  [textField sizeToFit];
-
-  // set up popup button
-  NSPopUpButton* popupButton = [[[NSPopUpButton alloc] initWithFrame:NSMakeRect(0, 0, 0, 0) pullsDown:NO] autorelease];
-  uint32_t numMenuItems = mTitles.Length();
-  for (uint32_t i = 0; i < numMenuItems; i++) {
-    const nsString& currentTitle = mTitles[i];
-    NSString *titleString;
-    if (currentTitle.IsEmpty()) {
-      const nsString& currentFilter = mFilters[i];
-      titleString = [[NSString alloc] initWithCharacters:reinterpret_cast<const unichar*>(currentFilter.get())
-                                                  length:currentFilter.Length()];
-    }
-    else {
-      titleString = [[NSString alloc] initWithCharacters:reinterpret_cast<const unichar*>(currentTitle.get())
-                                                  length:currentTitle.Length()];
-    }
-    [popupButton addItemWithTitle:titleString];
-    [titleString release];
-  }
-  if (mSelectedTypeIndex >= 0 && (uint32_t)mSelectedTypeIndex < numMenuItems)
-    [popupButton selectItemAtIndex:mSelectedTypeIndex];
-  [popupButton setTag:kSaveTypeControlTag];
-  [popupButton sizeToFit]; // we have to do sizeToFit to get the height calculated for us
-  // This is just a default width that works well, doesn't truncate the vast majority of
-  // things that might end up in the menu.
-  [popupButton setFrameSize:NSMakeSize(180, [popupButton frame].size.height)];
-
-  // position everything based on control sizes with kAccessoryViewPadding pix padding
-  // on each side kAccessoryViewPadding pix horizontal padding between controls
-  float greatestHeight = [textField frame].size.height;
-  if ([popupButton frame].size.height > greatestHeight)
-    greatestHeight = [popupButton frame].size.height;
-  float totalViewHeight = greatestHeight + kAccessoryViewPadding * 2;
-  float totalViewWidth  = [textField frame].size.width + [popupButton frame].size.width + kAccessoryViewPadding * 3;
-  [accessoryView setFrameSize:NSMakeSize(totalViewWidth, totalViewHeight)];
-
-  float textFieldOriginY = ((greatestHeight - [textField frame].size.height) / 2 + 1) + kAccessoryViewPadding;
-  [textField setFrameOrigin:NSMakePoint(kAccessoryViewPadding, textFieldOriginY)];
-  
-  float popupOriginX = [textField frame].size.width + kAccessoryViewPadding * 2;
-  float popupOriginY = ((greatestHeight - [popupButton frame].size.height) / 2) + kAccessoryViewPadding;
-  [popupButton setFrameOrigin:NSMakePoint(popupOriginX, popupOriginY)];
-
-  [accessoryView addSubview:textField];
-  [accessoryView addSubview:popupButton];
-  return accessoryView;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-// Display the file dialog
-NS_IMETHODIMP nsFilePicker::Show(int16_t *retval)
-{
-  NS_ENSURE_ARG_POINTER(retval);
-
-  *retval = returnCancel;
-
-  int16_t userClicksOK = returnCancel;
-
-// Random questions from DHH:
-//
-// Why do we pass mTitle, mDefault to the functions?  Can GetLocalFile. PutLocalFile,
-// and GetLocalFolder get called someplace else?  It generates a bunch of warnings
-// as it is right now.
-//
-// I think we could easily combine GetLocalFile and GetLocalFolder together, just
-// setting panel pick options based on mMode.  I didn't do it here b/c I wanted to 
-// make this look as much like Carbon nsFilePicker as possible.  
-
-  mFiles.Clear();
-  nsCOMPtr<nsIFile> theFile;
-
-  switch (mMode)
-  {
-    case modeOpen:
-      userClicksOK = GetLocalFiles(mTitle, false, mFiles);
-      break;
-    
-    case modeOpenMultiple:
-      userClicksOK = GetLocalFiles(mTitle, true, mFiles);
-      break;
-      
-    case modeSave:
-      userClicksOK = PutLocalFile(mTitle, mDefault, getter_AddRefs(theFile));
-      break;
-      
-    case modeGetFolder:
-      userClicksOK = GetLocalFolder(mTitle, getter_AddRefs(theFile));
-      break;
-    
-    default:
-      NS_ERROR("Unknown file picker mode");
-      break;
-  }
-
-  if (theFile)
-    mFiles.AppendObject(theFile);
-  
-  *retval = userClicksOK;
-  return NS_OK;
-}
-
-static
-void UpdatePanelFileTypes(NSOpenPanel* aPanel, NSArray* aFilters)
-{
-  // If we show all file types, also "expose" bundles' contents.
-  [aPanel setTreatsFilePackagesAsDirectories:!aFilters];
-
-  [aPanel setAllowedFileTypes:aFilters];
-}
-
-@implementation NSPopUpButtonObserver
-- (void) setPopUpButton:(NSPopUpButton*)aPopUpButton
-{
-  mPopUpButton = aPopUpButton;
-}
-
-- (void) setOpenPanel:(NSOpenPanel*)aOpenPanel
-{
-  mOpenPanel = aOpenPanel;
-}
-
-- (void) setFilePicker:(nsFilePicker*)aFilePicker
-{
-  mFilePicker = aFilePicker;
-}
-
-- (void) menuChangedItem:(NSNotification *)aSender
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-  int32_t selectedItem = [mPopUpButton indexOfSelectedItem];
-  if (selectedItem < 0) {
-    return;
-  }
-
-  mFilePicker->SetFilterIndex(selectedItem);
-  UpdatePanelFileTypes(mOpenPanel, mFilePicker->GetFilterList());
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN();
-}
-@end
-
-// Use OpenPanel to do a GetFile. Returns |returnOK| if the user presses OK in the dialog. 
-int16_t
-nsFilePicker::GetLocalFiles(const nsString& inTitle, bool inAllowMultiple, nsCOMArray<nsIFile>& outFiles)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  int16_t retVal = (int16_t)returnCancel;
-  NSOpenPanel *thePanel = [NSOpenPanel openPanel];
-
-  SetShowHiddenFileState(thePanel);
-
-  // Set the options for how the get file dialog will appear
-  SetDialogTitle(inTitle, thePanel);
-  [thePanel setAllowsMultipleSelection:inAllowMultiple];
-  [thePanel setCanSelectHiddenExtension:YES];
-  [thePanel setCanChooseDirectories:NO];
-  [thePanel setCanChooseFiles:YES];
-  [thePanel setResolvesAliases:YES]; //this is default - probably doesn't need to be set
-  
-  // Get filters
-  // filters may be null, if we should allow all file types.
-  NSArray *filters = GetFilterList();
-
-  // set up default directory
-  NSString *theDir = PanelDefaultDirectory();
-  
-  // if this is the "Choose application..." dialog, and no other start
-  // dir has been set, then use the Applications folder.
-  if (!theDir) {
-    if (filters && [filters count] == 1 &&
-        [(NSString *)[filters objectAtIndex:0] isEqualToString:@"app"])
-      theDir = @"/Applications/";
-    else
-      theDir = @"";
-  }
-
-  if (theDir) {
-    [thePanel setDirectoryURL:[NSURL fileURLWithPath:theDir isDirectory:YES]];
-  }
-
-  int result;
-  nsCocoaUtils::PrepareForNativeAppModalDialog();
-  if (mFilters.Length() > 1) {
-    // [NSURL initWithString:] (below) throws an exception if URLString is nil.
-
-    NSPopUpButtonObserver* observer = [[NSPopUpButtonObserver alloc] init];
-
-    NSView* accessoryView = GetAccessoryView();
-    [thePanel setAccessoryView:accessoryView];
-
-    [observer setPopUpButton:[accessoryView viewWithTag:kSaveTypeControlTag]];
-    [observer setOpenPanel:thePanel];
-    [observer setFilePicker:this];
-
-    [[NSNotificationCenter defaultCenter]
-      addObserver:observer
-      selector:@selector(menuChangedItem:)
-      name:NSMenuWillSendActionNotification object:nil];
-
-    UpdatePanelFileTypes(thePanel, filters);
-    result = [thePanel runModal];
-
-    [[NSNotificationCenter defaultCenter] removeObserver:observer];
-    [observer release];
-  } else {
-    // If we show all file types, also "expose" bundles' contents.
-    if (!filters) {
-      [thePanel setTreatsFilePackagesAsDirectories:YES];
-    }
-    [thePanel setAllowedFileTypes:filters];
-    result = [thePanel runModal];
-  }
-  nsCocoaUtils::CleanUpAfterNativeAppModalDialog();
-  
-  if (result == NSFileHandlingPanelCancelButton)
-    return retVal;
-
-  // Converts data from a NSArray of NSURL to the returned format.
-  // We should be careful to not call [thePanel URLs] more than once given that
-  // it creates a new array each time.
-  // We are using Fast Enumeration, thus the NSURL array is created once then
-  // iterated.
-  for (NSURL* url in [thePanel URLs]) {
-    if (!url) {
-      continue;
-    }
-
-    nsCOMPtr<nsIFile> localFile;
-    NS_NewLocalFile(EmptyString(), true, getter_AddRefs(localFile));
-    nsCOMPtr<nsILocalFileMac> macLocalFile = do_QueryInterface(localFile);
-    if (macLocalFile && NS_SUCCEEDED(macLocalFile->InitWithCFURL((CFURLRef)url))) {
-      outFiles.AppendObject(localFile);
-    }
-  }
-
-  if (outFiles.Count() > 0)
-    retVal = returnOK;
-
-  return retVal;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(0);
-}
-
-// Use OpenPanel to do a GetFolder. Returns |returnOK| if the user presses OK in the dialog.
-int16_t
-nsFilePicker::GetLocalFolder(const nsString& inTitle, nsIFile** outFile)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-  NS_ASSERTION(outFile, "this protected member function expects a null initialized out pointer");
-  
-  int16_t retVal = (int16_t)returnCancel;
-  NSOpenPanel *thePanel = [NSOpenPanel openPanel];
-
-  SetShowHiddenFileState(thePanel);
-
-  // Set the options for how the get file dialog will appear
-  SetDialogTitle(inTitle, thePanel);
-  [thePanel setAllowsMultipleSelection:NO];   //this is default -probably doesn't need to be set
-  [thePanel setCanSelectHiddenExtension:YES];
-  [thePanel setCanChooseDirectories:YES];
-  [thePanel setCanChooseFiles:NO];
-  [thePanel setResolvesAliases:YES];          //this is default - probably doesn't need to be set
-  [thePanel setCanCreateDirectories:YES];
-  
-  // packages != folders
-  [thePanel setTreatsFilePackagesAsDirectories:NO];
-
-  // set up default directory
-  NSString *theDir = PanelDefaultDirectory();
-  if (theDir) {
-    [thePanel setDirectoryURL:[NSURL fileURLWithPath:theDir isDirectory:YES]];
-  }
-  nsCocoaUtils::PrepareForNativeAppModalDialog();
-  int result = [thePanel runModal];
-  nsCocoaUtils::CleanUpAfterNativeAppModalDialog();
-
-  if (result == NSFileHandlingPanelCancelButton)
-    return retVal;
-
-  // get the path for the folder (we allow just 1, so that's all we get)
-  NSURL *theURL = [[thePanel URLs] objectAtIndex:0];
-  if (theURL) {
-    nsCOMPtr<nsIFile> localFile;
-    NS_NewLocalFile(EmptyString(), true, getter_AddRefs(localFile));
-    nsCOMPtr<nsILocalFileMac> macLocalFile = do_QueryInterface(localFile);
-    if (macLocalFile && NS_SUCCEEDED(macLocalFile->InitWithCFURL((CFURLRef)theURL))) {
-      *outFile = localFile;
-      NS_ADDREF(*outFile);
-      retVal = returnOK;
-    }
-  }
-
-  return retVal;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(0);
-}
-
-// Returns |returnOK| if the user presses OK in the dialog.
-int16_t
-nsFilePicker::PutLocalFile(const nsString& inTitle, const nsString& inDefaultName, nsIFile** outFile)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-  NS_ASSERTION(outFile, "this protected member function expects a null initialized out pointer");
-
-  int16_t retVal = returnCancel;
-  NSSavePanel *thePanel = [NSSavePanel savePanel];
-
-  SetShowHiddenFileState(thePanel);
-
-  SetDialogTitle(inTitle, thePanel);
-
-  // set up accessory view for file format options
-  NSView* accessoryView = GetAccessoryView();
-  [thePanel setAccessoryView:accessoryView];
-
-  // set up default file name
-  NSString* defaultFilename = [NSString stringWithCharacters:(const unichar*)inDefaultName.get() length:inDefaultName.Length()];
-
-  // set up allowed types; this prevents the extension from being selected
-  // use the UTI for the file type to allow alternate extensions (e.g., jpg vs. jpeg)
-  NSString* extension = defaultFilename.pathExtension;
-  if (extension.length != 0) {
-    CFStringRef type = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, (CFStringRef)extension, NULL);
-
-    if (type) {
-      thePanel.allowedFileTypes = @[(NSString*)type];
-      CFRelease(type);
-    } else {
-      // if there's no UTI for the file extension, use the extension itself.
-      thePanel.allowedFileTypes = @[extension];
-    }
-  }
-  // Allow users to change the extension.
-  thePanel.allowsOtherFileTypes = YES;
-
-  // set up default directory
-  NSString *theDir = PanelDefaultDirectory();
-  if (theDir) {
-    [thePanel setDirectoryURL:[NSURL fileURLWithPath:theDir isDirectory:YES]];
-  }
-
-  // load the panel
-  nsCocoaUtils::PrepareForNativeAppModalDialog();
-  [thePanel setNameFieldStringValue:defaultFilename];
-  int result = [thePanel runModal];
-  nsCocoaUtils::CleanUpAfterNativeAppModalDialog();
-  if (result == NSFileHandlingPanelCancelButton)
-    return retVal;
-
-  // get the save type
-  NSPopUpButton* popupButton = [accessoryView viewWithTag:kSaveTypeControlTag];
-  if (popupButton) {
-    mSelectedTypeIndex = [popupButton indexOfSelectedItem];
-  }
-
-  NSURL* fileURL = [thePanel URL];
-  if (fileURL) { 
-    nsCOMPtr<nsIFile> localFile;
-    NS_NewLocalFile(EmptyString(), true, getter_AddRefs(localFile));
-    nsCOMPtr<nsILocalFileMac> macLocalFile = do_QueryInterface(localFile);
-    if (macLocalFile && NS_SUCCEEDED(macLocalFile->InitWithCFURL((CFURLRef)fileURL))) {
-      *outFile = localFile;
-      NS_ADDREF(*outFile);
-      // We tell if we are replacing or not by just looking to see if the file exists.
-      // The user could not have hit OK and not meant to replace the file.
-      if ([[NSFileManager defaultManager] fileExistsAtPath:[fileURL path]])
-        retVal = returnReplace;
-      else
-        retVal = returnOK;
-    }
-  }
-
-  return retVal;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(0);
-}
-
-NSArray *
-nsFilePicker::GetFilterList()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  if (!mFilters.Length()) {
-    return nil;
-  }
-
-  if (mFilters.Length() <= (uint32_t)mSelectedTypeIndex) {
-    NS_WARNING("An out of range index has been selected. Using the first index instead.");
-    mSelectedTypeIndex = 0;
-  }
-
-  const nsString& filterWide = mFilters[mSelectedTypeIndex];
-  if (!filterWide.Length()) {
-    return nil;
-  }
-
-  if (filterWide.Equals(NS_LITERAL_STRING("*"))) {
-    return nil;
-  }
-
-  // The extensions in filterWide are in the format "*.ext" but are expected
-  // in the format "ext" by NSOpenPanel. So we need to filter some characters.
-  NSMutableString* filterString = [[[NSMutableString alloc] initWithString:
-                                    [NSString stringWithCharacters:reinterpret_cast<const unichar*>(filterWide.get())
-                                                            length:filterWide.Length()]] autorelease];
-  NSCharacterSet *set = [NSCharacterSet characterSetWithCharactersInString:@". *"];
-  NSRange range = [filterString rangeOfCharacterFromSet:set];
-  while (range.length) {
-    [filterString replaceCharactersInRange:range withString:@""];
-    range = [filterString rangeOfCharacterFromSet:set];
-  }
-
-  return [[[NSArray alloc] initWithArray:
-           [filterString componentsSeparatedByString:@";"]] autorelease];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-// Sets the dialog title to whatever it should be.  If it fails, eh,
-// the OS will provide a sensible default.
-void
-nsFilePicker::SetDialogTitle(const nsString& inTitle, id aPanel)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  [aPanel setTitle:[NSString stringWithCharacters:(const unichar*)inTitle.get() length:inTitle.Length()]];
-
-  if (!mOkButtonLabel.IsEmpty()) {
-    [aPanel setPrompt:[NSString stringWithCharacters:(const unichar*)mOkButtonLabel.get() length:mOkButtonLabel.Length()]];
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-} 
-
-// Converts path from an nsIFile into a NSString path
-// If it fails, returns an empty string.
-NSString *
-nsFilePicker::PanelDefaultDirectory()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  NSString *directory = nil;
-  if (mDisplayDirectory) {
-    nsAutoString pathStr;
-    mDisplayDirectory->GetPath(pathStr);
-    directory = [[[NSString alloc] initWithCharacters:reinterpret_cast<const unichar*>(pathStr.get())
-                                               length:pathStr.Length()] autorelease];
-  }
-  return directory;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-NS_IMETHODIMP nsFilePicker::GetFile(nsIFile **aFile)
-{
-  NS_ENSURE_ARG_POINTER(aFile);
-  *aFile = nullptr;
-  
-  // just return the first file
-  if (mFiles.Count() > 0) {
-    *aFile = mFiles.ObjectAt(0);
-    NS_IF_ADDREF(*aFile);
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsFilePicker::GetFileURL(nsIURI **aFileURL)
-{
-  NS_ENSURE_ARG_POINTER(aFileURL);
-  *aFileURL = nullptr;
-
-  if (mFiles.Count() == 0)
-    return NS_OK;
-
-  return NS_NewFileURI(aFileURL, mFiles.ObjectAt(0));
-}
-
-NS_IMETHODIMP nsFilePicker::GetFiles(nsISimpleEnumerator **aFiles)
-{
-  return NS_NewArrayEnumerator(aFiles, mFiles);
-}
-
-NS_IMETHODIMP nsFilePicker::SetDefaultString(const nsAString& aString)
-{
-  mDefault = aString;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsFilePicker::GetDefaultString(nsAString& aString)
-{
-  return NS_ERROR_FAILURE;
-}
-
-// The default extension to use for files
-NS_IMETHODIMP nsFilePicker::GetDefaultExtension(nsAString& aExtension)
-{
-  aExtension.Truncate();
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsFilePicker::SetDefaultExtension(const nsAString& aExtension)
-{
-  return NS_OK;
-}
-
-// Append an entry to the filters array
-NS_IMETHODIMP
-nsFilePicker::AppendFilter(const nsAString& aTitle, const nsAString& aFilter)
-{
-  // "..apps" has to be translated with native executable extensions.
-  if (aFilter.EqualsLiteral("..apps")) {
-    mFilters.AppendElement(NS_LITERAL_STRING("*.app"));
-  } else {
-    mFilters.AppendElement(aFilter);
-  }
-  mTitles.AppendElement(aTitle);
-  
-  return NS_OK;
-}
-
-// Get the filter index - do we still need this?
-NS_IMETHODIMP nsFilePicker::GetFilterIndex(int32_t *aFilterIndex)
-{
-  *aFilterIndex = mSelectedTypeIndex;
-  return NS_OK;
-}
-
-// Set the filter index - do we still need this?
-NS_IMETHODIMP nsFilePicker::SetFilterIndex(int32_t aFilterIndex)
-{
-  mSelectedTypeIndex = aFilterIndex;
-  return NS_OK;
-}
diff --git a/widget/cocoa/nsIdleServiceX.h b/widget/cocoa/nsIdleServiceX.h
deleted file mode 100644
index f0b3d92ed5..0000000000
--- a/widget/cocoa/nsIdleServiceX.h
+++ /dev/null
@@ -1,33 +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/. */
-
-#ifndef nsIdleServiceX_h_
-#define nsIdleServiceX_h_
-
-#include "nsIdleService.h"
-
-class nsIdleServiceX : public nsIdleService
-{
-public:
-  NS_DECL_ISUPPORTS_INHERITED
-
-  bool PollIdleTime(uint32_t* aIdleTime) override;
-
-  static already_AddRefed<nsIdleServiceX> GetInstance() 
-  {
-    RefPtr<nsIdleService> idleService = nsIdleService::GetInstance();
-    if (!idleService) {
-      idleService = new nsIdleServiceX();
-    }
-    
-    return idleService.forget().downcast<nsIdleServiceX>();
-  }
-  
-protected:
-    nsIdleServiceX() { }
-    virtual ~nsIdleServiceX() { }
-    bool UsePollMode() override;
-};
-
-#endif // nsIdleServiceX_h_
diff --git a/widget/cocoa/nsIdleServiceX.mm b/widget/cocoa/nsIdleServiceX.mm
deleted file mode 100644
index 234a154146..0000000000
--- a/widget/cocoa/nsIdleServiceX.mm
+++ /dev/null
@@ -1,77 +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 "nsIdleServiceX.h"
-#include "nsObjCExceptions.h"
-#include "nsIServiceManager.h"
-#import <Foundation/Foundation.h>
-
-NS_IMPL_ISUPPORTS_INHERITED0(nsIdleServiceX, nsIdleService)
-
-bool
-nsIdleServiceX::PollIdleTime(uint32_t *aIdleTime)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  kern_return_t rval;
-  mach_port_t masterPort;
-
-  rval = IOMasterPort(kIOMasterPortDefault, &masterPort);
-  if (rval != KERN_SUCCESS)
-    return false;
-
-  io_iterator_t hidItr;
-  rval = IOServiceGetMatchingServices(masterPort,
-                                      IOServiceMatching("IOHIDSystem"),
-                                      &hidItr);
-
-  if (rval != KERN_SUCCESS)
-    return false;
-  NS_ASSERTION(hidItr, "Our iterator is null, but it ought not to be!");
-
-  io_registry_entry_t entry = IOIteratorNext(hidItr);
-  NS_ASSERTION(entry, "Our IO Registry Entry is null, but it shouldn't be!");
-
-  IOObjectRelease(hidItr);
-
-  NSMutableDictionary *hidProps;
-  rval = IORegistryEntryCreateCFProperties(entry,
-                                           (CFMutableDictionaryRef*)&hidProps,
-                                           kCFAllocatorDefault, 0);
-  if (rval != KERN_SUCCESS)
-    return false;
-  NS_ASSERTION(hidProps, "HIDProperties is null, but no error was returned.");
-  [hidProps autorelease];
-
-  id idleObj = [hidProps objectForKey:@"HIDIdleTime"];
-  NS_ASSERTION([idleObj isKindOfClass: [NSData class]] ||
-               [idleObj isKindOfClass: [NSNumber class]],
-               "What we got for the idle object is not what we expect!");
-
-  uint64_t time;
-  if ([idleObj isKindOfClass: [NSData class]])
-    [idleObj getBytes: &time];
-  else
-    time = [idleObj unsignedLongLongValue];
-
-  IOObjectRelease(entry);
-
-  // convert to ms from ns
-  time /= 1000000;
-  if (time > UINT32_MAX) // Overflow will occur
-    return false;
-
-  *aIdleTime = static_cast<uint32_t>(time);
-
-  return true;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(false);
-}
-
-bool
-nsIdleServiceX::UsePollMode()
-{
-  return true;
-}
-
diff --git a/widget/cocoa/nsLookAndFeel.h b/widget/cocoa/nsLookAndFeel.h
deleted file mode 100644
index 2ad31a2aa1..0000000000
--- a/widget/cocoa/nsLookAndFeel.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsLookAndFeel_h_
-#define nsLookAndFeel_h_
-#include "nsXPLookAndFeel.h"
-
-class nsLookAndFeel: public nsXPLookAndFeel {
-public:
-  nsLookAndFeel();
-  virtual ~nsLookAndFeel();
-
-  virtual nsresult NativeGetColor(ColorID aID, nscolor &aResult);
-  virtual nsresult GetIntImpl(IntID aID, int32_t &aResult);
-  virtual nsresult GetFloatImpl(FloatID aID, float &aResult);
-  virtual bool GetFontImpl(FontID aID, nsString& aFontName,
-                           gfxFontStyle& aFontStyle,
-                           float aDevPixPerCSSPixel);
-  virtual char16_t GetPasswordCharacterImpl()
-  {
-    // unicode value for the bullet character, used for password textfields.
-    return 0x2022;
-  }
-
-  static bool UseOverlayScrollbars();
-
-  virtual nsTArray<LookAndFeelInt> GetIntCacheImpl();
-  virtual void SetIntCacheImpl(const nsTArray<LookAndFeelInt>& aLookAndFeelIntCache);
-
-  virtual void RefreshImpl();
-
-protected:
-  static bool SystemWantsOverlayScrollbars();
-  static bool AllowOverlayScrollbarsOverlap();
-
-private:
-  int32_t mUseOverlayScrollbars;
-  bool mUseOverlayScrollbarsCached;
-
-  int32_t mAllowOverlayScrollbarsOverlap;
-  bool mAllowOverlayScrollbarsOverlapCached;
-};
-
-#endif // nsLookAndFeel_h_
diff --git a/widget/cocoa/nsLookAndFeel.mm b/widget/cocoa/nsLookAndFeel.mm
deleted file mode 100644
index 0b68cd0e4f..0000000000
--- a/widget/cocoa/nsLookAndFeel.mm
+++ /dev/null
@@ -1,584 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "nsLookAndFeel.h"
-#include "nsCocoaFeatures.h"
-#include "nsIServiceManager.h"
-#include "nsNativeThemeColors.h"
-#include "nsStyleConsts.h"
-#include "nsCocoaFeatures.h"
-#include "nsIContent.h"
-#include "gfxFont.h"
-#include "gfxFontConstants.h"
-#include "gfxPlatformMac.h"
-#include "mozilla/gfx/2D.h"
-#include "mozilla/widget/WidgetMessageUtils.h"
-
-#import <Cocoa/Cocoa.h>
-
-// This must be included last:
-#include "nsObjCExceptions.h"
-
-enum {
-  mozNSScrollerStyleLegacy       = 0,
-  mozNSScrollerStyleOverlay      = 1
-};
-typedef NSInteger mozNSScrollerStyle;
-
-@interface NSScroller(AvailableSinceLion)
-+ (mozNSScrollerStyle)preferredScrollerStyle;
-@end
-
-nsLookAndFeel::nsLookAndFeel()
- : nsXPLookAndFeel()
- , mUseOverlayScrollbars(-1)
- , mUseOverlayScrollbarsCached(false)
- , mAllowOverlayScrollbarsOverlap(-1)
- , mAllowOverlayScrollbarsOverlapCached(false)
-{
-}
-
-nsLookAndFeel::~nsLookAndFeel()
-{
-}
-
-static nscolor GetColorFromNSColor(NSColor* aColor)
-{
-  NSColor* deviceColor = [aColor colorUsingColorSpaceName:NSDeviceRGBColorSpace];
-  return NS_RGB((unsigned int)([deviceColor redComponent] * 255.0),
-                (unsigned int)([deviceColor greenComponent] * 255.0),
-                (unsigned int)([deviceColor blueComponent] * 255.0));
-}
-
-static nscolor GetColorFromNSColorWithAlpha(NSColor* aColor, float alpha)
-{
-  NSColor* deviceColor = [aColor colorUsingColorSpaceName:NSDeviceRGBColorSpace];
-  return NS_RGBA((unsigned int)([deviceColor redComponent] * 255.0),
-                 (unsigned int)([deviceColor greenComponent] * 255.0),
-                 (unsigned int)([deviceColor blueComponent] * 255.0),
-                 (unsigned int)(alpha * 255.0));
-}
-
-nsresult
-nsLookAndFeel::NativeGetColor(ColorID aID, nscolor &aColor)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  nsresult res = NS_OK;
-
-  switch (aID) {
-    case eColorID_WindowBackground:
-      aColor = NS_RGB(0xff,0xff,0xff);
-      break;
-    case eColorID_WindowForeground:
-      aColor = NS_RGB(0x00,0x00,0x00);
-      break;
-    case eColorID_WidgetBackground:
-      aColor = NS_RGB(0xdd,0xdd,0xdd);
-      break;
-    case eColorID_WidgetForeground:
-      aColor = NS_RGB(0x00,0x00,0x00);
-      break;
-    case eColorID_WidgetSelectBackground:
-      aColor = NS_RGB(0x80,0x80,0x80);
-      break;
-    case eColorID_WidgetSelectForeground:
-      aColor = NS_RGB(0x00,0x00,0x80);
-      break;
-    case eColorID_Widget3DHighlight:
-      aColor = NS_RGB(0xa0,0xa0,0xa0);
-      break;
-    case eColorID_Widget3DShadow:
-      aColor = NS_RGB(0x40,0x40,0x40);
-      break;
-    case eColorID_TextBackground:
-      aColor = NS_RGB(0xff,0xff,0xff);
-      break;
-    case eColorID_TextForeground:
-      aColor = NS_RGB(0x00,0x00,0x00);
-      break;
-    case eColorID_TextSelectBackground:
-      aColor = GetColorFromNSColor([NSColor selectedTextBackgroundColor]);
-      break;
-    case eColorID_highlight: // CSS2 color
-      aColor = GetColorFromNSColor([NSColor alternateSelectedControlColor]);
-      break;
-    case eColorID__moz_menuhover:
-      aColor = GetColorFromNSColor([NSColor alternateSelectedControlColor]);
-      break;
-    case eColorID_TextSelectForeground:
-      GetColor(eColorID_TextSelectBackground, aColor);
-      if (aColor == 0x000000)
-        aColor = NS_RGB(0xff,0xff,0xff);
-      else
-        aColor = NS_DONT_CHANGE_COLOR;
-      break;
-    case eColorID_highlighttext:  // CSS2 color
-    case eColorID__moz_menuhovertext:
-      aColor = GetColorFromNSColor([NSColor alternateSelectedControlTextColor]);
-      break;
-    case eColorID_IMESelectedRawTextBackground:
-    case eColorID_IMESelectedConvertedTextBackground:
-    case eColorID_IMERawInputBackground:
-    case eColorID_IMEConvertedTextBackground:
-      aColor = NS_TRANSPARENT;
-      break;
-    case eColorID_IMESelectedRawTextForeground:
-    case eColorID_IMESelectedConvertedTextForeground:
-    case eColorID_IMERawInputForeground:
-    case eColorID_IMEConvertedTextForeground:
-      aColor = NS_SAME_AS_FOREGROUND_COLOR;
-      break;
-    case eColorID_IMERawInputUnderline:
-    case eColorID_IMEConvertedTextUnderline:
-      aColor = NS_40PERCENT_FOREGROUND_COLOR;
-      break;
-    case eColorID_IMESelectedRawTextUnderline:
-    case eColorID_IMESelectedConvertedTextUnderline:
-      aColor = NS_SAME_AS_FOREGROUND_COLOR;
-      break;
-    case eColorID_SpellCheckerUnderline:
-      aColor = NS_RGB(0xff, 0, 0);
-      break;
-
-      //
-      // css2 system colors http://www.w3.org/TR/REC-CSS2/ui.html#system-colors
-      //
-      // It's really hard to effectively map these to the Appearance Manager properly,
-      // since they are modeled word for word after the win32 system colors and don't have any
-      // real counterparts in the Mac world. I'm sure we'll be tweaking these for
-      // years to come.
-      //
-      // Thanks to mpt26@student.canterbury.ac.nz for the hardcoded values that form the defaults
-      //  if querying the Appearance Manager fails ;)
-      //
-    case eColorID__moz_mac_buttonactivetext:
-    case eColorID__moz_mac_defaultbuttontext:
-      if (nsCocoaFeatures::OnYosemiteOrLater()) {
-        aColor = NS_RGB(0xFF,0xFF,0xFF);
-        break;
-      }
-      // Otherwise fall through and return the regular button text:
-
-    case eColorID_buttontext:
-    case eColorID__moz_buttonhovertext:
-      aColor = GetColorFromNSColor([NSColor controlTextColor]);
-      break;
-    case eColorID_captiontext:
-    case eColorID_menutext:
-    case eColorID_infotext:
-    case eColorID__moz_menubartext:
-      aColor = GetColorFromNSColor([NSColor textColor]);
-      break;
-    case eColorID_windowtext:
-      aColor = GetColorFromNSColor([NSColor windowFrameTextColor]);
-      break;
-    case eColorID_activecaption:
-      aColor = GetColorFromNSColor([NSColor gridColor]);
-      break;
-    case eColorID_activeborder:
-      aColor = GetColorFromNSColor([NSColor keyboardFocusIndicatorColor]);
-      break;
-     case eColorID_appworkspace:
-      aColor = NS_RGB(0xFF,0xFF,0xFF);
-      break;
-    case eColorID_background:
-      aColor = NS_RGB(0x63,0x63,0xCE);
-      break;
-    case eColorID_buttonface:
-    case eColorID__moz_buttonhoverface:
-      aColor = NS_RGB(0xF0,0xF0,0xF0);
-      break;
-    case eColorID_buttonhighlight:
-      aColor = NS_RGB(0xFF,0xFF,0xFF);
-      break;
-    case eColorID_buttonshadow:
-      aColor = NS_RGB(0xDC,0xDC,0xDC);
-      break;
-    case eColorID_graytext:
-      aColor = GetColorFromNSColor([NSColor disabledControlTextColor]);
-      break;
-    case eColorID_inactiveborder:
-      aColor = GetColorFromNSColor([NSColor controlBackgroundColor]);
-      break;
-    case eColorID_inactivecaption:
-      aColor = GetColorFromNSColor([NSColor controlBackgroundColor]);
-      break;
-    case eColorID_inactivecaptiontext:
-      aColor = NS_RGB(0x45,0x45,0x45);
-      break;
-    case eColorID_scrollbar:
-      aColor = GetColorFromNSColor([NSColor scrollBarColor]);
-      break;
-    case eColorID_threeddarkshadow:
-      aColor = NS_RGB(0xDC,0xDC,0xDC);
-      break;
-    case eColorID_threedshadow:
-      aColor = NS_RGB(0xE0,0xE0,0xE0);
-      break;
-    case eColorID_threedface:
-      aColor = NS_RGB(0xF0,0xF0,0xF0);
-      break;
-    case eColorID_threedhighlight:
-      aColor = GetColorFromNSColor([NSColor highlightColor]);
-      break;
-    case eColorID_threedlightshadow:
-      aColor = NS_RGB(0xDA,0xDA,0xDA);
-      break;
-    case eColorID_menu:
-      aColor = GetColorFromNSColor([NSColor alternateSelectedControlTextColor]);
-      break;
-    case eColorID_infobackground:
-      aColor = NS_RGB(0xFF,0xFF,0xC7);
-      break;
-    case eColorID_windowframe:
-      aColor = GetColorFromNSColor([NSColor gridColor]);
-      break;
-    case eColorID_window:
-    case eColorID__moz_field:
-    case eColorID__moz_combobox:
-      aColor = NS_RGB(0xff,0xff,0xff);
-      break;
-    case eColorID__moz_fieldtext:
-    case eColorID__moz_comboboxtext:
-      aColor = GetColorFromNSColor([NSColor controlTextColor]);
-      break;
-    case eColorID__moz_dialog:
-      aColor = GetColorFromNSColor([NSColor controlHighlightColor]);
-      break;
-    case eColorID__moz_dialogtext:
-    case eColorID__moz_cellhighlighttext:
-    case eColorID__moz_html_cellhighlighttext:
-      aColor = GetColorFromNSColor([NSColor controlTextColor]);
-      break;
-    case eColorID__moz_dragtargetzone:
-      aColor = GetColorFromNSColor([NSColor selectedControlColor]);
-      break;
-    case eColorID__moz_mac_chrome_active:
-    case eColorID__moz_mac_chrome_inactive: {
-      int grey = NativeGreyColorAsInt(toolbarFillGrey, (aID == eColorID__moz_mac_chrome_active));
-      aColor = NS_RGB(grey, grey, grey);
-    }
-      break;
-    case eColorID__moz_mac_focusring:
-      aColor = GetColorFromNSColorWithAlpha([NSColor keyboardFocusIndicatorColor], 0.48);
-      break;
-    case eColorID__moz_mac_menushadow:
-      aColor = NS_RGB(0xA3,0xA3,0xA3);
-      break;
-    case eColorID__moz_mac_menutextdisable:
-      aColor = NS_RGB(0x98,0x98,0x98);
-      break;
-    case eColorID__moz_mac_menutextselect:
-      aColor = GetColorFromNSColor([NSColor selectedMenuItemTextColor]);
-      break;
-    case eColorID__moz_mac_disabledtoolbartext:
-      aColor = GetColorFromNSColor([NSColor disabledControlTextColor]);
-      break;
-    case eColorID__moz_mac_menuselect:
-      aColor = GetColorFromNSColor([NSColor alternateSelectedControlColor]);
-      break;
-    case eColorID__moz_buttondefault:
-      aColor = NS_RGB(0xDC,0xDC,0xDC);
-      break;
-    case eColorID__moz_cellhighlight:
-    case eColorID__moz_html_cellhighlight:
-    case eColorID__moz_mac_secondaryhighlight:
-      // For inactive list selection
-      aColor = GetColorFromNSColor([NSColor secondarySelectedControlColor]);
-      break;
-    case eColorID__moz_eventreerow:
-      // Background color of even list rows.
-      aColor = GetColorFromNSColor([[NSColor controlAlternatingRowBackgroundColors] objectAtIndex:0]);
-      break;
-    case eColorID__moz_oddtreerow:
-      // Background color of odd list rows.
-      aColor = GetColorFromNSColor([[NSColor controlAlternatingRowBackgroundColors] objectAtIndex:1]);
-      break;
-    case eColorID__moz_nativehyperlinktext:
-      // There appears to be no available system defined color. HARDCODING to the appropriate color.
-      aColor = NS_RGB(0x14,0x4F,0xAE);
-      break;
-    default:
-      NS_WARNING("Someone asked nsILookAndFeel for a color I don't know about");
-      aColor = NS_RGB(0xff,0xff,0xff);
-      res = NS_ERROR_FAILURE;
-      break;
-    }
-
-  return res;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-nsresult
-nsLookAndFeel::GetIntImpl(IntID aID, int32_t &aResult)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  nsresult res = nsXPLookAndFeel::GetIntImpl(aID, aResult);
-  if (NS_SUCCEEDED(res))
-    return res;
-  res = NS_OK;
-
-  switch (aID) {
-    case eIntID_CaretBlinkTime:
-      aResult = 567;
-      break;
-    case eIntID_CaretWidth:
-      aResult = 1;
-      break;
-    case eIntID_ShowCaretDuringSelection:
-      aResult = 0;
-      break;
-    case eIntID_SelectTextfieldsOnKeyFocus:
-      // Select textfield content when focused by kbd
-      // used by EventStateManager::sTextfieldSelectModel
-      aResult = 1;
-      break;
-    case eIntID_SubmenuDelay:
-      aResult = 200;
-      break;
-    case eIntID_TooltipDelay:
-      aResult = 500;
-      break;
-    case eIntID_MenusCanOverlapOSBar:
-      // xul popups are not allowed to overlap the menubar.
-      aResult = 0;
-      break;
-    case eIntID_SkipNavigatingDisabledMenuItem:
-      aResult = 1;
-      break;
-    case eIntID_DragThresholdX:
-    case eIntID_DragThresholdY:
-      aResult = 4;
-      break;
-    case eIntID_ScrollArrowStyle:
-      aResult = eScrollArrow_None;
-      break;
-    case eIntID_ScrollSliderStyle:
-      aResult = eScrollThumbStyle_Proportional;
-      break;
-    case eIntID_UseOverlayScrollbars:
-      if (!mUseOverlayScrollbarsCached) {
-        mUseOverlayScrollbars = SystemWantsOverlayScrollbars() ? 1 : 0;
-        mUseOverlayScrollbarsCached = true;
-      }
-      aResult = mUseOverlayScrollbars;
-      break;
-    case eIntID_AllowOverlayScrollbarsOverlap:
-      if (!mAllowOverlayScrollbarsOverlapCached) {
-        mAllowOverlayScrollbarsOverlap = AllowOverlayScrollbarsOverlap() ? 1 : 0;
-        mAllowOverlayScrollbarsOverlapCached = true;
-      }
-      aResult = mAllowOverlayScrollbarsOverlap;
-      break;
-    case eIntID_ScrollbarDisplayOnMouseMove:
-      aResult = 0;
-      break;
-    case eIntID_ScrollbarFadeBeginDelay:
-      aResult = 450;
-      break;
-    case eIntID_ScrollbarFadeDuration:
-      aResult = 200;
-      break;
-    case eIntID_TreeOpenDelay:
-      aResult = 1000;
-      break;
-    case eIntID_TreeCloseDelay:
-      aResult = 1000;
-      break;
-    case eIntID_TreeLazyScrollDelay:
-      aResult = 150;
-      break;
-    case eIntID_TreeScrollDelay:
-      aResult = 100;
-      break;
-    case eIntID_TreeScrollLinesMax:
-      aResult = 3;
-      break;
-    case eIntID_DWMCompositor:
-    case eIntID_WindowsClassic:
-    case eIntID_WindowsDefaultTheme:
-    case eIntID_TouchEnabled:
-    case eIntID_WindowsThemeIdentifier:
-    case eIntID_OperatingSystemVersionIdentifier:
-      aResult = 0;
-      res = NS_ERROR_NOT_IMPLEMENTED;
-      break;
-    case eIntID_MacGraphiteTheme:
-      aResult = [NSColor currentControlTint] == NSGraphiteControlTint;
-      break;
-    case eIntID_MacLionTheme:
-      aResult = 1;
-      break;
-    case eIntID_MacYosemiteTheme:
-      aResult = nsCocoaFeatures::OnYosemiteOrLater();
-      break;
-    case eIntID_AlertNotificationOrigin:
-      aResult = NS_ALERT_TOP;
-      break;
-    case eIntID_TabFocusModel:
-      aResult = [NSApp isFullKeyboardAccessEnabled] ?
-                  nsIContent::eTabFocus_any : nsIContent::eTabFocus_textControlsMask;
-      break;
-    case eIntID_ScrollToClick:
-    {
-      aResult = [[NSUserDefaults standardUserDefaults] boolForKey:@"AppleScrollerPagingBehavior"];
-    }
-      break;
-    case eIntID_ChosenMenuItemsShouldBlink:
-      aResult = 1;
-      break;
-    case eIntID_IMERawInputUnderlineStyle:
-    case eIntID_IMEConvertedTextUnderlineStyle:
-    case eIntID_IMESelectedRawTextUnderlineStyle:
-    case eIntID_IMESelectedConvertedTextUnderline:
-      aResult = NS_STYLE_TEXT_DECORATION_STYLE_SOLID;
-      break;
-    case eIntID_SpellCheckerUnderlineStyle:
-      aResult = NS_STYLE_TEXT_DECORATION_STYLE_DOTTED;
-      break;
-    case eIntID_ScrollbarButtonAutoRepeatBehavior:
-      aResult = 0;
-      break;
-    case eIntID_SwipeAnimationEnabled:
-      aResult = 0;
-      if ([NSEvent respondsToSelector:@selector(
-            isSwipeTrackingFromScrollEventsEnabled)]) {
-        aResult = [NSEvent isSwipeTrackingFromScrollEventsEnabled] ? 1 : 0;
-      }
-      break;
-    case eIntID_ColorPickerAvailable:
-      aResult = 1;
-      break;
-    case eIntID_ContextMenuOffsetVertical:
-      aResult = -6;
-      break;
-    case eIntID_ContextMenuOffsetHorizontal:
-      aResult = 1;
-      break;
-    default:
-      aResult = 0;
-      res = NS_ERROR_FAILURE;
-  }
-  return res;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-nsresult
-nsLookAndFeel::GetFloatImpl(FloatID aID, float &aResult)
-{
-  nsresult res = nsXPLookAndFeel::GetFloatImpl(aID, aResult);
-  if (NS_SUCCEEDED(res))
-    return res;
-  res = NS_OK;
-
-  switch (aID) {
-    case eFloatID_IMEUnderlineRelativeSize:
-      aResult = 2.0f;
-      break;
-    case eFloatID_SpellCheckerUnderlineRelativeSize:
-      aResult = 2.0f;
-      break;
-    default:
-      aResult = -1.0;
-      res = NS_ERROR_FAILURE;
-  }
-
-  return res;
-}
-
-bool nsLookAndFeel::UseOverlayScrollbars()
-{
-  return GetInt(eIntID_UseOverlayScrollbars) != 0;
-}
-
-bool nsLookAndFeel::SystemWantsOverlayScrollbars()
-{
-  return ([NSScroller respondsToSelector:@selector(preferredScrollerStyle)] &&
-          [NSScroller preferredScrollerStyle] == mozNSScrollerStyleOverlay);
-}
-
-bool nsLookAndFeel::AllowOverlayScrollbarsOverlap()
-{
-  return (UseOverlayScrollbars());
-}
-
-bool
-nsLookAndFeel::GetFontImpl(FontID aID, nsString &aFontName,
-                           gfxFontStyle &aFontStyle,
-                           float aDevPixPerCSSPixel)
-{
-    NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-    // hack for now
-    if (aID == eFont_Window || aID == eFont_Document) {
-        aFontStyle.style      = NS_FONT_STYLE_NORMAL;
-        aFontStyle.weight     = NS_FONT_WEIGHT_NORMAL;
-        aFontStyle.stretch    = NS_FONT_STRETCH_NORMAL;
-        aFontStyle.size       = 14 * aDevPixPerCSSPixel;
-        aFontStyle.systemFont = true;
-
-        aFontName.AssignLiteral("sans-serif");
-        return true;
-    }
-
-    gfxPlatformMac::LookupSystemFont(aID, aFontName, aFontStyle,
-                                     aDevPixPerCSSPixel);
-
-    return true;
-
-    NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(false);
-}
-
-nsTArray<LookAndFeelInt>
-nsLookAndFeel::GetIntCacheImpl()
-{
-  nsTArray<LookAndFeelInt> lookAndFeelIntCache =
-    nsXPLookAndFeel::GetIntCacheImpl();
-
-  LookAndFeelInt useOverlayScrollbars;
-  useOverlayScrollbars.id = eIntID_UseOverlayScrollbars;
-  useOverlayScrollbars.value = GetInt(eIntID_UseOverlayScrollbars);
-  lookAndFeelIntCache.AppendElement(useOverlayScrollbars);
-
-  LookAndFeelInt allowOverlayScrollbarsOverlap;
-  allowOverlayScrollbarsOverlap.id = eIntID_AllowOverlayScrollbarsOverlap;
-  allowOverlayScrollbarsOverlap.value = GetInt(eIntID_AllowOverlayScrollbarsOverlap);
-  lookAndFeelIntCache.AppendElement(allowOverlayScrollbarsOverlap);
-
-  return lookAndFeelIntCache;
-}
-
-void
-nsLookAndFeel::SetIntCacheImpl(const nsTArray<LookAndFeelInt>& aLookAndFeelIntCache)
-{
-  for (auto entry : aLookAndFeelIntCache) {
-    switch(entry.id) {
-      case eIntID_UseOverlayScrollbars:
-        mUseOverlayScrollbars = entry.value;
-        mUseOverlayScrollbarsCached = true;
-        break;
-      case eIntID_AllowOverlayScrollbarsOverlap:
-        mAllowOverlayScrollbarsOverlap = entry.value;
-        mAllowOverlayScrollbarsOverlapCached = true;
-        break;
-    }
-  }
-}
-
-void
-nsLookAndFeel::RefreshImpl()
-{
-  // We should only clear the cache if we're in the main browser process.
-  // Otherwise, we should wait for the parent to inform us of new values
-  // to cache via LookAndFeel::SetIntCache.
-  if (XRE_IsParentProcess()) {
-    mUseOverlayScrollbarsCached = false;
-    mAllowOverlayScrollbarsOverlapCached = false;
-  }
-}
diff --git a/widget/cocoa/nsMacCursor.h b/widget/cocoa/nsMacCursor.h
deleted file mode 100644
index cf9c84c7ea..0000000000
--- a/widget/cocoa/nsMacCursor.h
+++ /dev/null
@@ -1,105 +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/. */
-
-#ifndef nsMacCursor_h_
-#define nsMacCursor_h_
-
-#import <Cocoa/Cocoa.h>
-#import "nsIWidget.h"
-
-/*! @class      nsMacCursor
-    @abstract   Represents a native Mac cursor.
-    @discussion <code>nsMacCursor</code> provides a simple API for creating and working with native Macintosh cursors.
-                Cursors can be created used without needing to be aware of the way different cursors are implemented,
-                in particular the details of managing an animated cursor are hidden.
-*/
-@interface nsMacCursor : NSObject
-{
-  @private
-  NSTimer *mTimer;
-  @protected
-  nsCursor mType;
-  int mFrameCounter;    
-}
-
-/*! @method     cursorWithCursor:
-    @abstract   Create a cursor by specifying a Cocoa <code>NSCursor</code>.
-    @discussion Creates a cursor representing the given Cocoa built-in cursor.
-    @param      aCursor the <code>NSCursor</code> to use
-    @param      aType the corresponding <code>nsCursor</code> constant
-    @result     an autoreleased instance of <code>nsMacCursor</code> representing the given <code>NSCursor</code>
- */
-+ (nsMacCursor *) cursorWithCursor: (NSCursor *) aCursor type: (nsCursor) aType;
-
-/*! @method     cursorWithImageNamed:hotSpot:type:
-    @abstract   Create a cursor by specifying the name of an image resource to use for the cursor and a hotspot.
-    @discussion Creates a cursor by loading the named image using the <code>+[NSImage imageNamed:]</code> method.
-                <p>The image must be compatible with any restrictions laid down by <code>NSCursor</code>. These vary
-                by operating system version.</p>
-                <p>The hotspot precisely determines the point where the user clicks when using the cursor.</p>
-    @param      aCursor the name of the image to use for the cursor
-    @param      aPoint the point within the cursor to use as the hotspot
-    @param      aType the corresponding <code>nsCursor</code> constant
-    @result     an autoreleased instance of <code>nsMacCursor</code> that uses the given image and hotspot
- */
-+ (nsMacCursor *) cursorWithImageNamed: (NSString *) aCursorImage hotSpot: (NSPoint) aPoint type: (nsCursor) aType;
-
-/*! @method     cursorWithFrames:type:
-    @abstract   Create an animated cursor by specifying the frames to use for the animation.
-    @discussion Creates a cursor that will animate by cycling through the given frames. Each element of the array
-                must be an instance of <code>NSCursor</code>
-    @param      aCursorFrames an array of <code>NSCursor</code>, representing the frames of an animated cursor, in the
-                order they should be played.
-    @param      aType the corresponding <code>nsCursor</code> constant
-    @result     an autoreleased instance of <code>nsMacCursor</code> that will animate the given cursor frames
- */
-+ (nsMacCursor *) cursorWithFrames: (NSArray *) aCursorFrames type: (nsCursor) aType;
-
-/*! @method     cocoaCursorWithImageNamed:hotSpot:
-    @abstract   Create a Cocoa NSCursor object with a Gecko image resource name and a hotspot point.
-    @discussion Create a Cocoa NSCursor object with a Gecko image resource name and a hotspot point.
-    @param      imageName the name of the gecko image resource, "tiff" extension is assumed, do not append.
-    @param      aPoint the point within the cursor to use as the hotspot
-    @result     an autoreleased instance of <code>nsMacCursor</code> that will animate the given cursor frames
- */
-+ (NSCursor *) cocoaCursorWithImageNamed: (NSString *) imageName hotSpot: (NSPoint) aPoint;
-
-/*! @method     isSet
-    @abstract   Determines whether this cursor is currently active.
-    @discussion This can be helpful when the Cocoa NSCursor state can be influenced without going
-                through nsCursorManager.
-    @result     whether the cursor is currently set
- */
-- (BOOL) isSet;
-
-/*! @method     set
-    @abstract   Set the cursor.
-    @discussion Makes this cursor the current cursor. If the cursor is animated, the animation is started.
- */
-- (void) set;
-
-/*! @method     unset
-    @abstract   Unset the cursor. The cursor will return to the default (usually the arrow cursor).
-    @discussion Unsets the cursor. If the cursor is animated, the animation is stopped.
- */
-- (void) unset;
-
-/*! @method     isAnimated
-    @abstract   Tests whether this cursor is animated.
-    @discussion Use this method to determine whether a cursor is animated
-    @result     YES if the cursor is animated (has more than one frame), NO if it is a simple static cursor.
- */
-- (BOOL) isAnimated;
-
-/** @method     cursorType
-    @abstract   Get the cursor type for this cursor
-    @discussion This method returns the <code>nsCursor</code> constant that corresponds to this cursor, which is  
-                equivalent to the CSS name for the cursor.
-    @result     The nsCursor constant corresponding to this cursor, or nsCursor's 'eCursorCount' if the cursor 
-                is a custom cursor loaded from a URI
- */
-- (nsCursor) type;
-@end
-
-#endif // nsMacCursor_h_
diff --git a/widget/cocoa/nsMacCursor.mm b/widget/cocoa/nsMacCursor.mm
deleted file mode 100644
index 4fcdfd3e5d..0000000000
--- a/widget/cocoa/nsMacCursor.mm
+++ /dev/null
@@ -1,382 +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 "nsMacCursor.h"
-#include "nsObjCExceptions.h"
-#include "nsDebug.h"
-#include "nsDirectoryServiceDefs.h"
-#include "nsCOMPtr.h"
-#include "nsIFile.h"
-#include "nsString.h"
-
-/*! @category   nsMacCursor (PrivateMethods)
-    @abstract   Private methods internal to the nsMacCursor class.
-    @discussion <code>nsMacCursor</code> is effectively an abstract class. It does not define complete 
-                behaviour in and of itself, the subclasses defined in this file provide the useful implementations.
-*/
-@interface nsMacCursor (PrivateMethods)
-
-/*! @method     getNextCursorFrame
-    @abstract   get the index of the next cursor frame to display.
-    @discussion Increments and returns the frame counter of an animated cursor.
-    @result     The index of the next frame to display in the cursor animation
-*/
-- (int) getNextCursorFrame;
-
-/*! @method     numFrames
-    @abstract   Query the number of frames in this cursor's animation.
-    @discussion Returns the number of frames in this cursor's animation. Static cursors return 1.
-*/
-- (int) numFrames;
-
-/*! @method     createTimer
-    @abstract   Create a Timer to use to animate the cursor.
-    @discussion Creates an instance of <code>NSTimer</code> which is used to drive the cursor animation.
-                This method should only be called for cursors that are animated.
-*/
-- (void) createTimer;
-
-/*! @method     destroyTimer
-    @abstract   Destroy any timer instance associated with this cursor.
-    @discussion Invalidates and releases any <code>NSTimer</code> instance associated with this cursor.
- */
-- (void) destroyTimer;
-/*! @method     destroyTimer
-    @abstract   Destroy any timer instance associated with this cursor.
-    @discussion Invalidates and releases any <code>NSTimer</code> instance associated with this cursor.
-*/
-
-/*! @method     advanceAnimatedCursor:
-    @abstract   Method called by animation timer to perform animation.
-    @discussion Called by an animated cursor's associated timer to advance the animation to the next frame.
-                Determines which frame should occur next and sets the cursor to that frame.
-    @param      aTimer the timer causing the animation
-*/
-- (void) advanceAnimatedCursor: (NSTimer *) aTimer;
-
-/*! @method     setFrame:
-    @abstract   Sets the current cursor, using an index to determine which frame in the animation to display.
-    @discussion Sets the current cursor. The frame index determines which frame is shown if the cursor is animated.
-                Frames and numbered from <code>0</code> to <code>-[nsMacCursor numFrames] - 1</code>. A static cursor
-                has a single frame, numbered 0.
-    @param      aFrameIndex the index indicating which frame from the animation to display
-*/
-- (void) setFrame: (int) aFrameIndex;
-
-@end
-
-/*! @class      nsCocoaCursor
-    @abstract   Implementation of <code>nsMacCursor</code> that uses Cocoa <code>NSCursor</code> instances.
-    @discussion Displays a static or animated cursor, using Cocoa <code>NSCursor</code> instances. These can be either
-                built-in <code>NSCursor</code> instances, or custom <code>NSCursor</code>s created from images.
-                When more than one <code>NSCursor</code> is provided, the cursor will use these as animation frames.
-*/
-@interface nsCocoaCursor : nsMacCursor
-{
-  @private
-  NSArray *mFrames;
-  NSCursor *mLastSetCocoaCursor;
-}
-
-/*! @method     initWithFrames:
-    @abstract   Create an animated cursor by specifying the frames to use for the animation.
-    @discussion Creates a cursor that will animate by cycling through the given frames. Each element of the array
-                must be an instance of <code>NSCursor</code>
-    @param      aCursorFrames an array of <code>NSCursor</code>, representing the frames of an animated cursor, in the
-                order they should be played.
-    @param      aType the corresponding <code>nsCursor</code> constant
-    @result     an instance of <code>nsCocoaCursor</code> that will animate the given cursor frames
- */
-- (id) initWithFrames: (NSArray *) aCursorFrames type: (nsCursor) aType;
-
-/*! @method     initWithCursor:
-    @abstract   Create a cursor by specifying a Cocoa <code>NSCursor</code>.
-    @discussion Creates a cursor representing the given Cocoa built-in cursor.
-    @param      aCursor the <code>NSCursor</code> to use
-    @param      aType the corresponding <code>nsCursor</code> constant
-    @result     an instance of <code>nsCocoaCursor</code> representing the given <code>NSCursor</code>
-*/
-- (id) initWithCursor: (NSCursor *) aCursor type: (nsCursor) aType;
-
-/*! @method     initWithImageNamed:hotSpot:
-    @abstract   Create a cursor by specifying the name of an image resource to use for the cursor and a hotspot.
-    @discussion Creates a cursor by loading the named image using the <code>+[NSImage imageNamed:]</code> method.
-                <p>The image must be compatible with any restrictions laid down by <code>NSCursor</code>. These vary
-                by operating system version.</p>
-                <p>The hotspot precisely determines the point where the user clicks when using the cursor.</p>
-    @param      aCursor the name of the image to use for the cursor
-    @param      aPoint the point within the cursor to use as the hotspot
-    @param      aType the corresponding <code>nsCursor</code> constant
-    @result     an instance of <code>nsCocoaCursor</code> that uses the given image and hotspot
-*/
-- (id) initWithImageNamed: (NSString *) aCursorImage hotSpot: (NSPoint) aPoint type: (nsCursor) aType;
-
-@end
-
-@implementation nsMacCursor
-
-+ (nsMacCursor *) cursorWithCursor: (NSCursor *) aCursor type: (nsCursor) aType
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  return [[[nsCocoaCursor alloc] initWithCursor:aCursor type:aType] autorelease];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-+ (nsMacCursor *) cursorWithImageNamed: (NSString *) aCursorImage hotSpot: (NSPoint) aPoint type: (nsCursor) aType
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  return [[[nsCocoaCursor alloc] initWithImageNamed:aCursorImage hotSpot:aPoint type:aType] autorelease];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-+ (nsMacCursor *) cursorWithFrames: (NSArray *) aCursorFrames type: (nsCursor) aType
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  return [[[nsCocoaCursor alloc] initWithFrames:aCursorFrames type:aType] autorelease];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-+ (NSCursor *) cocoaCursorWithImageNamed: (NSString *) imageName hotSpot: (NSPoint) aPoint
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  nsCOMPtr<nsIFile> resDir;
-  nsAutoCString resPath;
-  NSString* pathToImage, *pathToHiDpiImage;
-  NSImage* cursorImage, *hiDpiCursorImage;
-
-  nsresult rv = NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(resDir));
-  if (NS_FAILED(rv))
-    goto INIT_FAILURE;
-  resDir->AppendNative(NS_LITERAL_CSTRING("res"));
-  resDir->AppendNative(NS_LITERAL_CSTRING("cursors"));
-
-  rv = resDir->GetNativePath(resPath);
-  if (NS_FAILED(rv))
-    goto INIT_FAILURE;
-
-  pathToImage = [NSString stringWithUTF8String:(const char*)resPath.get()];
-  if (!pathToImage)
-    goto INIT_FAILURE;
-  pathToImage = [pathToImage stringByAppendingPathComponent:imageName];
-  pathToHiDpiImage = [pathToImage stringByAppendingString:@"@2x"];
-  // Add same extension to both image paths.
-  pathToImage      = [pathToImage      stringByAppendingPathExtension:@"png"];
-  pathToHiDpiImage = [pathToHiDpiImage stringByAppendingPathExtension:@"png"];
-
-  cursorImage = [[[NSImage alloc] initWithContentsOfFile:pathToImage] autorelease];
-  if (!cursorImage)
-    goto INIT_FAILURE;
-
-  // Note 1: There are a few different ways to get a hidpi image via
-  // initWithContentsOfFile. We let the OS handle this here: when the
-  // file basename ends in "@2x", it will be displayed at native resolution
-  // instead of being pixel-doubled. See bug 784909 comment 7 for alternates ways.
-  //
-  // Note 2: The OS is picky, and will ignore the hidpi representation
-  // unless it is exactly twice the size of the lowdpi image.
-  hiDpiCursorImage = [[[NSImage alloc] initWithContentsOfFile:pathToHiDpiImage] autorelease];
-  if (hiDpiCursorImage) {
-    NSImageRep *imageRep = [[hiDpiCursorImage representations] objectAtIndex:0];
-    [cursorImage addRepresentation: imageRep];
-  }
-  return [[[NSCursor alloc] initWithImage:cursorImage hotSpot:aPoint] autorelease];
-
-INIT_FAILURE:
-  NS_WARNING("Problem getting path to cursor image file!");
-  [self release];
-  return nil;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-- (BOOL) isSet
-{
-  // implemented by subclasses
-  return NO;
-}
-
-- (void) set
-{
-  if ([self isAnimated]) {
-    [self createTimer];
-  }
-  // if the cursor isn't animated or the timer creation fails for any reason...
-  if (!mTimer) {
-    [self setFrame:0];
-  }
-}
-
-- (void) unset
-{
-  [self destroyTimer];    
-}
-
-- (BOOL) isAnimated
-{
-  return [self numFrames] > 1;
-}
-
-- (int) numFrames
-{
-  // subclasses need to override this to support animation
-  return 1;
-}
-
-- (int) getNextCursorFrame
-{
-  mFrameCounter = (mFrameCounter + 1) % [self numFrames];
-  return mFrameCounter;
-}
-
-- (void) createTimer
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!mTimer) {
-    mTimer = [[NSTimer scheduledTimerWithTimeInterval:0.25
-                                               target:self
-                                             selector:@selector(advanceAnimatedCursor:)
-                                             userInfo:nil
-                                              repeats:YES] retain];
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (void) destroyTimer
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (mTimer) {
-      [mTimer invalidate];
-      [mTimer release];
-      mTimer = nil;
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (void) advanceAnimatedCursor: (NSTimer *) aTimer
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if ([aTimer isValid]) {
-    [self setFrame:[self getNextCursorFrame]];
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (void) setFrame: (int) aFrameIndex
-{
-  // subclasses need to do something useful here
-}
-
-- (nsCursor) type {
-  return mType;
-}
-
-- (void) dealloc
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  [self destroyTimer];
-  [super dealloc];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-@end
-
-@implementation nsCocoaCursor
-
-- (id) initWithFrames: (NSArray *) aCursorFrames type: (nsCursor) aType
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  self = [super init];
-  NSEnumerator *it = [aCursorFrames objectEnumerator];
-  NSObject *frame = nil;
-  while ((frame = [it nextObject])) {
-    NS_ASSERTION([frame isKindOfClass:[NSCursor class]], "Invalid argument: All frames must be of type NSCursor");
-  }
-  mFrames = [aCursorFrames retain];
-  mFrameCounter = 0;
-  mType = aType;
-  return self;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-- (id) initWithCursor: (NSCursor *) aCursor type: (nsCursor) aType
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  NSArray *frame = [NSArray arrayWithObjects:aCursor, nil];
-  return [self initWithFrames:frame type:aType];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-- (id) initWithImageNamed: (NSString *) aCursorImage hotSpot: (NSPoint) aPoint type: (nsCursor) aType
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  return [self initWithCursor:[nsMacCursor cocoaCursorWithImageNamed:aCursorImage hotSpot:aPoint] type:aType];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-- (BOOL) isSet
-{
-  return [NSCursor currentCursor] == mLastSetCocoaCursor;
-}
-
-- (void) setFrame: (int) aFrameIndex
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  NSCursor* newCursor = [mFrames objectAtIndex:aFrameIndex];
-  [newCursor set];
-  mLastSetCocoaCursor = newCursor;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (int) numFrames
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  return [mFrames count];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(0);
-}
-
-- (NSString *) description
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  return [mFrames description];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-- (void) dealloc
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  [mFrames release];
-  [super dealloc];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-@end
diff --git a/widget/cocoa/nsMacDockSupport.h b/widget/cocoa/nsMacDockSupport.h
deleted file mode 100644
index a638b89e03..0000000000
--- a/widget/cocoa/nsMacDockSupport.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
-/* 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 "nsIMacDockSupport.h"
-#include "nsIStandaloneNativeMenu.h"
-#include "nsITaskbarProgress.h"
-#include "nsITimer.h"
-#include "nsCOMPtr.h"
-#include "nsString.h"
-#include "nsNativeThemeCocoa.h"
-
-class nsMacDockSupport : public nsIMacDockSupport, public nsITaskbarProgress
-{
-public:
-  nsMacDockSupport();
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIMACDOCKSUPPORT
-  NS_DECL_NSITASKBARPROGRESS
-
-protected:
-  virtual ~nsMacDockSupport();
-
-  nsCOMPtr<nsIStandaloneNativeMenu> mDockMenu;
-  nsString mBadgeText;
-
-  NSImage *mAppIcon, *mProgressBackground;
-
-  HIRect mProgressBounds;
-  nsTaskbarProgressState mProgressState;
-  double mProgressFraction;
-  nsCOMPtr<nsITimer> mProgressTimer;
-  RefPtr<nsNativeThemeCocoa> mTheme;
-
-  static void RedrawIconCallback(nsITimer* aTimer, void* aClosure);
-
-  bool InitProgress();
-  nsresult RedrawIcon();
-};
diff --git a/widget/cocoa/nsMacDockSupport.mm b/widget/cocoa/nsMacDockSupport.mm
deleted file mode 100644
index 56b37822bd..0000000000
--- a/widget/cocoa/nsMacDockSupport.mm
+++ /dev/null
@@ -1,174 +0,0 @@
-/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
-/* 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/. */
-
-#import <Cocoa/Cocoa.h>
-
-#include "nsComponentManagerUtils.h"
-#include "nsMacDockSupport.h"
-#include "nsObjCExceptions.h"
-
-NS_IMPL_ISUPPORTS(nsMacDockSupport, nsIMacDockSupport, nsITaskbarProgress)
-
-nsMacDockSupport::nsMacDockSupport()
-: mAppIcon(nil)
-, mProgressBackground(nil)
-, mProgressState(STATE_NO_PROGRESS)
-, mProgressFraction(0.0)
-{
-  mProgressTimer = do_CreateInstance(NS_TIMER_CONTRACTID);
-}
-
-nsMacDockSupport::~nsMacDockSupport()
-{
-  if (mAppIcon) {
-    [mAppIcon release];
-    mAppIcon = nil;
-  }
-  if (mProgressBackground) {
-    [mProgressBackground release];
-    mProgressBackground = nil;
-  }
-  if (mProgressTimer) {
-    mProgressTimer->Cancel();
-    mProgressTimer = nullptr;
-  }
-}
-
-NS_IMETHODIMP
-nsMacDockSupport::GetDockMenu(nsIStandaloneNativeMenu ** aDockMenu)
-{
-  nsCOMPtr<nsIStandaloneNativeMenu> dockMenu(mDockMenu);
-  dockMenu.forget(aDockMenu);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMacDockSupport::SetDockMenu(nsIStandaloneNativeMenu * aDockMenu)
-{
-  mDockMenu = aDockMenu;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMacDockSupport::ActivateApplication(bool aIgnoreOtherApplications)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  [[NSApplication sharedApplication] activateIgnoringOtherApps:aIgnoreOtherApplications];
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-nsMacDockSupport::SetBadgeText(const nsAString& aBadgeText)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  NSDockTile *tile = [[NSApplication sharedApplication] dockTile];
-  mBadgeText = aBadgeText;
-  if (aBadgeText.IsEmpty())
-    [tile setBadgeLabel: nil];
-  else
-    [tile setBadgeLabel:[NSString stringWithCharacters:reinterpret_cast<const unichar*>(mBadgeText.get())
-                                                length:mBadgeText.Length()]];
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-nsMacDockSupport::GetBadgeText(nsAString& aBadgeText)
-{
-  aBadgeText = mBadgeText;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMacDockSupport::SetProgressState(nsTaskbarProgressState aState,
-                                   uint64_t aCurrentValue,
-                                   uint64_t aMaxValue)
-{
-  NS_ENSURE_ARG_RANGE(aState, 0, STATE_PAUSED);
-  if (aState == STATE_NO_PROGRESS || aState == STATE_INDETERMINATE) {
-    NS_ENSURE_TRUE(aCurrentValue == 0, NS_ERROR_INVALID_ARG);
-    NS_ENSURE_TRUE(aMaxValue == 0, NS_ERROR_INVALID_ARG);
-  }
-  if (aCurrentValue > aMaxValue) {
-    return NS_ERROR_ILLEGAL_VALUE;
-  }
-
-  mProgressState = aState;
-  if (aMaxValue == 0) {
-    mProgressFraction = 0;
-  } else {
-    mProgressFraction = (double)aCurrentValue / aMaxValue;
-  }
-
-  if (mProgressState == STATE_NORMAL || mProgressState == STATE_INDETERMINATE) {
-    int perSecond = 8; // Empirically determined, see bug 848792 
-    mProgressTimer->InitWithFuncCallback(RedrawIconCallback, this, 1000 / perSecond,
-      nsITimer::TYPE_REPEATING_SLACK);
-    return NS_OK;
-  } else {
-    mProgressTimer->Cancel();
-    return RedrawIcon();
-  }
-}
-
-// static
-void nsMacDockSupport::RedrawIconCallback(nsITimer* aTimer, void* aClosure)
-{
-  static_cast<nsMacDockSupport*>(aClosure)->RedrawIcon();
-}
-
-// Return whether to draw progress
-bool nsMacDockSupport::InitProgress()
-{
-  if (mProgressState != STATE_NORMAL && mProgressState != STATE_INDETERMINATE) {
-    return false;
-  }
-
-  if (!mAppIcon) {
-    mProgressTimer = do_CreateInstance(NS_TIMER_CONTRACTID);
-    mAppIcon = [[NSImage imageNamed:@"NSApplicationIcon"] retain];
-    mProgressBackground = [mAppIcon copyWithZone:nil];
-    mTheme = new nsNativeThemeCocoa();
-
-    NSSize sz = [mProgressBackground size];
-    mProgressBounds = CGRectMake(sz.width * 1/32, sz.height * 3/32,
-                                 sz.width * 30/32, sz.height * 4/32);
-    [mProgressBackground lockFocus];
-    [[NSColor whiteColor] set];
-    NSRectFill(NSRectFromCGRect(mProgressBounds));
-    [mProgressBackground unlockFocus];
-  }
-  return true;
-}
-
-nsresult
-nsMacDockSupport::RedrawIcon()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  if (InitProgress()) {
-    // TODO: - Implement ERROR and PAUSED states?
-    NSImage *icon = [mProgressBackground copyWithZone:nil];
-    bool isIndeterminate = (mProgressState != STATE_NORMAL);
-
-    [icon lockFocus];
-    CGContextRef ctx = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
-    mTheme->DrawProgress(ctx, mProgressBounds, isIndeterminate,
-      true, mProgressFraction, 1.0, NULL);
-    [icon unlockFocus];
-    [NSApp setApplicationIconImage:icon];
-    [icon release];
-  } else {
-    [NSApp setApplicationIconImage:mAppIcon];
-  }
-
-  return NS_OK;
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
diff --git a/widget/cocoa/nsMacWebAppUtils.h b/widget/cocoa/nsMacWebAppUtils.h
deleted file mode 100644
index 98ef235615..0000000000
--- a/widget/cocoa/nsMacWebAppUtils.h
+++ /dev/null
@@ -1,22 +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/. */
-#ifndef _MAC_WEB_APP_UTILS_H_
-#define _MAC_WEB_APP_UTILS_H_
-
-#include "nsIMacWebAppUtils.h"
-
-#define NS_MACWEBAPPUTILS_CONTRACTID "@mozilla.org/widget/mac-web-app-utils;1"
-
-class nsMacWebAppUtils : public nsIMacWebAppUtils {
-public:
-  nsMacWebAppUtils() {}
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIMACWEBAPPUTILS
-
-protected:
-  virtual ~nsMacWebAppUtils() {}
-};
-
-#endif //_MAC_WEB_APP_UTILS_H_
diff --git a/widget/cocoa/nsMacWebAppUtils.mm b/widget/cocoa/nsMacWebAppUtils.mm
deleted file mode 100644
index 1b98cef7cc..0000000000
--- a/widget/cocoa/nsMacWebAppUtils.mm
+++ /dev/null
@@ -1,82 +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/. */
-
-#import <Cocoa/Cocoa.h>
-
-#include "nsMacWebAppUtils.h"
-#include "nsCOMPtr.h"
-#include "nsCocoaUtils.h"
-#include "nsString.h"
-
-// This must be included last:
-#include "nsObjCExceptions.h"
-
-// Find the path to the app with the given bundleIdentifier, if any.
-// Note that the OS will return the path to the newest binary, if there is more than one.
-// The determination of 'newest' is complex and beyond the scope of this comment.
-
-NS_IMPL_ISUPPORTS(nsMacWebAppUtils, nsIMacWebAppUtils)
-
-NS_IMETHODIMP nsMacWebAppUtils::PathForAppWithIdentifier(const nsAString& bundleIdentifier, nsAString& outPath) {
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  outPath.Truncate();
-
-  nsAutoreleasePool localPool;
-
-  //note that the result of this expression might be nil, meaning no matching app was found. 
-  NSString* temp = [[NSWorkspace sharedWorkspace] absolutePathForAppBundleWithIdentifier:
-                        [NSString stringWithCharacters:reinterpret_cast<const unichar*>(((nsString)bundleIdentifier).get())
-                                                length:((nsString)bundleIdentifier).Length()]];
-
-  if (temp) {
-    // Copy out the resultant absolute path into outPath if non-nil.
-    nsCocoaUtils::GetStringForNSString(temp, outPath);
-  }
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP nsMacWebAppUtils::LaunchAppWithIdentifier(const nsAString& bundleIdentifier) {
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  nsAutoreleasePool localPool;
-
-  // Note this might return false, meaning the app wasnt launched for some reason. 
-  BOOL success = [[NSWorkspace sharedWorkspace] launchAppWithBundleIdentifier:
-                        [NSString stringWithCharacters:reinterpret_cast<const unichar*>(((nsString)bundleIdentifier).get())
-                                                length:((nsString)bundleIdentifier).Length()]
-                        options: (NSWorkspaceLaunchOptions)0
-                        additionalEventParamDescriptor: nil
-                        launchIdentifier: NULL];
-
-  return success ? NS_OK : NS_ERROR_FAILURE;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP nsMacWebAppUtils::TrashApp(const nsAString& path, nsITrashAppCallback* aCallback) {
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  if (NS_WARN_IF(!aCallback)) {
-    return NS_ERROR_INVALID_ARG;
-  }
-
-  nsCOMPtr<nsITrashAppCallback> callback = aCallback;
-
-  NSString* tempString = [NSString stringWithCharacters:reinterpret_cast<const unichar*>(((nsString)path).get())
-                                   length:path.Length()];
-
-  [[NSWorkspace sharedWorkspace] recycleURLs: [NSArray arrayWithObject:[NSURL fileURLWithPath:tempString]]
-    completionHandler: ^(NSDictionary *newURLs, NSError *error) {
-      nsresult rv = (error == nil) ? NS_OK : NS_ERROR_FAILURE;
-      callback->TrashAppFinished(rv);
-    }];
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
diff --git a/widget/cocoa/nsMenuBarX.h b/widget/cocoa/nsMenuBarX.h
deleted file mode 100644
index 7cbb8ce62a..0000000000
--- a/widget/cocoa/nsMenuBarX.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsMenuBarX_h_
-#define nsMenuBarX_h_
-
-#import <Cocoa/Cocoa.h>
-
-#include "mozilla/UniquePtr.h"
-#include "nsMenuBaseX.h"
-#include "nsMenuGroupOwnerX.h"
-#include "nsChangeObserver.h"
-#include "nsINativeMenuService.h"
-#include "nsString.h"
-
-class nsMenuX;
-class nsIWidget;
-class nsIContent;
-
-// The native menu service for creating native menu bars.
-class nsNativeMenuServiceX : public nsINativeMenuService
-{
-public:
-  NS_DECL_ISUPPORTS
-
-  nsNativeMenuServiceX() {}
-
-  NS_IMETHOD CreateNativeMenuBar(nsIWidget* aParent, nsIContent* aMenuBarNode) override;
-
-protected:
-  virtual ~nsNativeMenuServiceX() {}
-};
-
-// Objective-C class used to allow us to intervene with keyboard event handling.
-// We allow mouse actions to work normally.
-@interface GeckoNSMenu : NSMenu
-{
-}
-@end
-
-// Objective-C class used as action target for menu items
-@interface NativeMenuItemTarget : NSObject
-{
-}
--(IBAction)menuItemHit:(id)sender;
-@end
-
-// Objective-C class used for menu items on the Services menu to allow Gecko
-// to override their standard behavior in order to stop key equivalents from
-// firing in certain instances.
-@interface GeckoServicesNSMenuItem : NSMenuItem
-{
-}
-- (id) target;
-- (SEL) action;
-- (void) _doNothing:(id)sender;
-@end
-
-// Objective-C class used as the Services menu so that Gecko can override the
-// standard behavior of the Services menu in order to stop key equivalents
-// from firing in certain instances.
-@interface GeckoServicesNSMenu : NSMenu
-{
-}
-- (void)addItem:(NSMenuItem *)newItem;
-- (NSMenuItem *)addItemWithTitle:(NSString *)aString action:(SEL)aSelector keyEquivalent:(NSString *)keyEquiv;
-- (void)insertItem:(NSMenuItem *)newItem atIndex:(NSInteger)index;
-- (NSMenuItem *)insertItemWithTitle:(NSString *)aString action:(SEL)aSelector  keyEquivalent:(NSString *)keyEquiv atIndex:(NSInteger)index;
-- (void) _overrideClassOfMenuItem:(NSMenuItem *)menuItem;
-@end
-
-// Once instantiated, this object lives until its DOM node or its parent window is destroyed.
-// Do not hold references to this, they can become invalid any time the DOM node can be destroyed.
-class nsMenuBarX : public nsMenuGroupOwnerX, public nsChangeObserver
-{
-public:
-  nsMenuBarX();
-  virtual ~nsMenuBarX();
-
-  static NativeMenuItemTarget* sNativeEventTarget;
-  static nsMenuBarX*           sLastGeckoMenuBarPainted;
-
-  // The following content nodes have been removed from the menu system.
-  // We save them here for use in command handling.
-  nsCOMPtr<nsIContent> mAboutItemContent;
-  nsCOMPtr<nsIContent> mPrefItemContent;
-  nsCOMPtr<nsIContent> mQuitItemContent;
-
-  // nsChangeObserver
-  NS_DECL_CHANGEOBSERVER
-
-  // nsMenuObjectX
-  void*             NativeData() override {return (void*)mNativeMenu;}
-  nsMenuObjectTypeX MenuObjectType() override {return eMenuBarObjectType;}
-
-  // nsMenuBarX
-  nsresult          Create(nsIWidget* aParent, nsIContent* aContent);
-  void              SetParent(nsIWidget* aParent);
-  uint32_t          GetMenuCount();
-  bool              MenuContainsAppMenu();
-  nsMenuX*          GetMenuAt(uint32_t aIndex);
-  nsMenuX*          GetXULHelpMenu();
-  void              SetSystemHelpMenu();
-  nsresult          Paint();
-  void              ForceUpdateNativeMenuAt(const nsAString& indexString);
-  void              ForceNativeMenuReload(); // used for testing
-  static char       GetLocalizedAccelKey(const char *shortcutID);
-  static void       ResetNativeApplicationMenu();
-
-protected:
-  void              ConstructNativeMenus();
-  void              ConstructFallbackNativeMenus();
-  nsresult          InsertMenuAtIndex(nsMenuX* aMenu, uint32_t aIndex);
-  void              RemoveMenuAtIndex(uint32_t aIndex);
-  void              HideItem(nsIDOMDocument* inDoc, const nsAString & inID, nsIContent** outHiddenNode);
-  void              AquifyMenuBar();
-  NSMenuItem*       CreateNativeAppMenuItem(nsMenuX* inMenu, const nsAString& nodeID, SEL action,
-                                            int tag, NativeMenuItemTarget* target);
-  nsresult          CreateApplicationMenu(nsMenuX* inMenu);
-
-  nsTArray<mozilla::UniquePtr<nsMenuX>> mMenuArray;
-  nsIWidget*         mParentWindow;        // [weak]
-  GeckoNSMenu*       mNativeMenu;            // root menu, representing entire menu bar
-};
-
-#endif // nsMenuBarX_h_
diff --git a/widget/cocoa/nsMenuBarX.mm b/widget/cocoa/nsMenuBarX.mm
deleted file mode 100644
index ff25eb81fc..0000000000
--- a/widget/cocoa/nsMenuBarX.mm
+++ /dev/null
@@ -1,979 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include <objc/objc-runtime.h>
-
-#include "nsMenuBarX.h"
-#include "nsMenuX.h"
-#include "nsMenuItemX.h"
-#include "nsMenuUtilsX.h"
-#include "nsCocoaUtils.h"
-#include "nsCocoaWindow.h"
-#include "nsChildView.h"
-
-#include "nsCOMPtr.h"
-#include "nsString.h"
-#include "nsGkAtoms.h"
-#include "nsObjCExceptions.h"
-#include "nsThreadUtils.h"
-
-#include "nsIContent.h"
-#include "nsIWidget.h"
-#include "nsIDocument.h"
-#include "nsIDOMDocument.h"
-#include "nsIDOMElement.h"
-#include "nsIAppStartup.h"
-#include "nsIStringBundle.h"
-#include "nsToolkitCompsCID.h"
-
-NativeMenuItemTarget* nsMenuBarX::sNativeEventTarget = nil;
-nsMenuBarX* nsMenuBarX::sLastGeckoMenuBarPainted = nullptr;
-NSMenu* sApplicationMenu = nil;
-BOOL sApplicationMenuIsFallback = NO;
-BOOL gSomeMenuBarPainted = NO;
-
-// We keep references to the first quit and pref item content nodes we find, which
-// will be from the hidden window. We use these when the document for the current
-// window does not have a quit or pref item. We don't need strong refs here because
-// these items are always strong ref'd by their owning menu bar (instance variable).
-static nsIContent* sAboutItemContent  = nullptr;
-static nsIContent* sPrefItemContent   = nullptr;
-static nsIContent* sQuitItemContent   = nullptr;
-
-NS_IMPL_ISUPPORTS(nsNativeMenuServiceX, nsINativeMenuService)
-
-NS_IMETHODIMP nsNativeMenuServiceX::CreateNativeMenuBar(nsIWidget* aParent, nsIContent* aMenuBarNode)
-{
-  NS_ASSERTION(NS_IsMainThread(), "Attempting to create native menu bar on wrong thread!");
-
-  RefPtr<nsMenuBarX> mb = new nsMenuBarX();
-  if (!mb)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  return mb->Create(aParent, aMenuBarNode);
-}
-
-nsMenuBarX::nsMenuBarX()
-: nsMenuGroupOwnerX(), mParentWindow(nullptr)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  mNativeMenu = [[GeckoNSMenu alloc] initWithTitle:@"MainMenuBar"];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-nsMenuBarX::~nsMenuBarX()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (nsMenuBarX::sLastGeckoMenuBarPainted == this)
-    nsMenuBarX::sLastGeckoMenuBarPainted = nullptr;
-
-  // the quit/pref items of a random window might have been used if there was no
-  // hidden window, thus we need to invalidate the weak references.
-  if (sAboutItemContent == mAboutItemContent)
-    sAboutItemContent = nullptr;
-  if (sQuitItemContent == mQuitItemContent)
-    sQuitItemContent = nullptr;
-  if (sPrefItemContent == mPrefItemContent)
-    sPrefItemContent = nullptr;
-
-  // make sure we unregister ourselves as a content observer
-  if (mContent) {
-    UnregisterForContentChanges(mContent);
-  }
-
-  // We have to manually clear the array here because clearing causes menu items
-  // to call back into the menu bar to unregister themselves. We don't want to
-  // depend on member variable ordering to ensure that the array gets cleared
-  // before the registration hash table is destroyed.
-  mMenuArray.Clear();
-
-  [mNativeMenu release];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-nsresult nsMenuBarX::Create(nsIWidget* aParent, nsIContent* aContent)
-{
-  if (!aParent)
-    return NS_ERROR_INVALID_ARG;
-
-  mParentWindow = aParent;
-  mContent = aContent;
-
-  if (mContent) {
-    AquifyMenuBar();
-
-    nsresult rv = nsMenuGroupOwnerX::Create(mContent);
-    if (NS_FAILED(rv))
-      return rv;
-
-    RegisterForContentChanges(mContent, this);
-    ConstructNativeMenus();
-  } else {
-    ConstructFallbackNativeMenus();
-  }
-
-  // Give this to the parent window. The parent takes ownership.
-  static_cast<nsCocoaWindow*>(mParentWindow)->SetMenuBar(this);
-
-  return NS_OK;
-}
-
-void nsMenuBarX::ConstructNativeMenus()
-{
-  uint32_t count = mContent->GetChildCount();
-  for (uint32_t i = 0; i < count; i++) {
-    nsIContent *menuContent = mContent->GetChildAt(i);
-    if (menuContent &&
-        menuContent->IsXULElement(nsGkAtoms::menu)) {
-      nsMenuX* newMenu = new nsMenuX();
-      if (newMenu) {
-        nsresult rv = newMenu->Create(this, this, menuContent);
-        if (NS_SUCCEEDED(rv))
-          InsertMenuAtIndex(newMenu, GetMenuCount());
-        else
-          delete newMenu;
-      }
-    }
-  }
-}
-
-void nsMenuBarX::ConstructFallbackNativeMenus()
-{
-  if (sApplicationMenu) {
-    // Menu has already been built.
-    return;
-  }
-
-  nsCOMPtr<nsIStringBundle> stringBundle;
-
-  nsCOMPtr<nsIStringBundleService> bundleSvc = do_GetService(NS_STRINGBUNDLE_CONTRACTID);
-  bundleSvc->CreateBundle("chrome://global/locale/fallbackMenubar.properties", getter_AddRefs(stringBundle));
-
-  if (!stringBundle) {
-    return;
-  }
-
-  nsXPIDLString labelUTF16;
-  nsXPIDLString keyUTF16;
-
-  const char16_t* labelProp = u"quitMenuitem.label";
-  const char16_t* keyProp = u"quitMenuitem.key";
-
-  stringBundle->GetStringFromName(labelProp, getter_Copies(labelUTF16));
-  stringBundle->GetStringFromName(keyProp, getter_Copies(keyUTF16));
-
-  NSString* labelStr = [NSString stringWithUTF8String:
-                        NS_ConvertUTF16toUTF8(labelUTF16).get()];
-  NSString* keyStr= [NSString stringWithUTF8String:
-                     NS_ConvertUTF16toUTF8(keyUTF16).get()];
-
-  if (!nsMenuBarX::sNativeEventTarget) {
-    nsMenuBarX::sNativeEventTarget = [[NativeMenuItemTarget alloc] init];
-  }
-
-  sApplicationMenu = [[[[NSApp mainMenu] itemAtIndex:0] submenu] retain];
-  NSMenuItem* quitMenuItem = [[[NSMenuItem alloc] initWithTitle:labelStr
-                                                  action:@selector(menuItemHit:)
-                                                  keyEquivalent:keyStr] autorelease];
-  [quitMenuItem setTarget:nsMenuBarX::sNativeEventTarget];
-  [quitMenuItem setTag:eCommand_ID_Quit];
-  [sApplicationMenu addItem:quitMenuItem];
-  sApplicationMenuIsFallback = YES;
-}
-
-uint32_t nsMenuBarX::GetMenuCount()
-{
-  return mMenuArray.Length();
-}
-
-bool nsMenuBarX::MenuContainsAppMenu()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  return ([mNativeMenu numberOfItems] > 0 &&
-          [[mNativeMenu itemAtIndex:0] submenu] == sApplicationMenu);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(false);
-}
-
-nsresult nsMenuBarX::InsertMenuAtIndex(nsMenuX* aMenu, uint32_t aIndex)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  // If we've only yet created a fallback global Application menu (using
-  // ContructFallbackNativeMenus()), destroy it before recreating it properly.
-  if (sApplicationMenu && sApplicationMenuIsFallback) {
-    ResetNativeApplicationMenu();
-  }
-  // If we haven't created a global Application menu yet, do it.
-  if (!sApplicationMenu) {
-    nsresult rv = NS_OK; // avoid warning about rv being unused
-    rv = CreateApplicationMenu(aMenu);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Can't create Application menu");
-
-    // Hook the new Application menu up to the menu bar.
-    NSMenu* mainMenu = [NSApp mainMenu];
-    NS_ASSERTION([mainMenu numberOfItems] > 0, "Main menu does not have any items, something is terribly wrong!");
-    [[mainMenu itemAtIndex:0] setSubmenu:sApplicationMenu];
-  }
-
-  // add menu to array that owns our menus
-  mMenuArray.InsertElementAt(aIndex, aMenu);
-
-  // hook up submenus
-  nsIContent* menuContent = aMenu->Content();
-  if (menuContent->GetChildCount() > 0 &&
-      !nsMenuUtilsX::NodeIsHiddenOrCollapsed(menuContent)) {
-    int insertionIndex = nsMenuUtilsX::CalculateNativeInsertionPoint(this, aMenu);
-    if (MenuContainsAppMenu())
-      insertionIndex++;
-    [mNativeMenu insertItem:aMenu->NativeMenuItem() atIndex:insertionIndex];
-  }
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-void nsMenuBarX::RemoveMenuAtIndex(uint32_t aIndex)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (mMenuArray.Length() <= aIndex) {
-    NS_ERROR("Attempting submenu removal with bad index!");
-    return;
-  }
-
-  // Our native menu and our internal menu object array might be out of sync.
-  // This happens, for example, when a submenu is hidden. Because of this we
-  // should not assume that a native submenu is hooked up.
-  NSMenuItem* nativeMenuItem = mMenuArray[aIndex]->NativeMenuItem();
-  int nativeMenuItemIndex = [mNativeMenu indexOfItem:nativeMenuItem];
-  if (nativeMenuItemIndex != -1)
-    [mNativeMenu removeItemAtIndex:nativeMenuItemIndex];
-
-  mMenuArray.RemoveElementAt(aIndex);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void nsMenuBarX::ObserveAttributeChanged(nsIDocument* aDocument,
-                                         nsIContent* aContent,
-                                         nsIAtom* aAttribute)
-{
-}
-
-void nsMenuBarX::ObserveContentRemoved(nsIDocument* aDocument,
-                                       nsIContent* aChild,
-                                       int32_t aIndexInContainer)
-{
-  RemoveMenuAtIndex(aIndexInContainer);
-}
-
-void nsMenuBarX::ObserveContentInserted(nsIDocument* aDocument,
-                                        nsIContent* aContainer,
-                                        nsIContent* aChild)
-{
-  nsMenuX* newMenu = new nsMenuX();
-  if (newMenu) {
-    nsresult rv = newMenu->Create(this, this, aChild);
-    if (NS_SUCCEEDED(rv))
-      InsertMenuAtIndex(newMenu, aContainer->IndexOf(aChild));
-    else
-      delete newMenu;
-  }
-}
-
-void nsMenuBarX::ForceUpdateNativeMenuAt(const nsAString& indexString)
-{
-  NSString* locationString = [NSString stringWithCharacters:reinterpret_cast<const unichar*>(indexString.BeginReading())
-                                                     length:indexString.Length()];
-  NSArray* indexes = [locationString componentsSeparatedByString:@"|"];
-  unsigned int indexCount = [indexes count];
-  if (indexCount == 0)
-    return;
-
-  nsMenuX* currentMenu = NULL;
-  int targetIndex = [[indexes objectAtIndex:0] intValue];
-  int visible = 0;
-  uint32_t length = mMenuArray.Length();
-  // first find a menu in the menu bar
-  for (unsigned int i = 0; i < length; i++) {
-    nsMenuX* menu = mMenuArray[i].get();
-    if (!nsMenuUtilsX::NodeIsHiddenOrCollapsed(menu->Content())) {
-      visible++;
-      if (visible == (targetIndex + 1)) {
-        currentMenu = menu;
-        break;
-      }
-    }
-  }
-
-  if (!currentMenu)
-    return;
-
-  // fake open/close to cause lazy update to happen so submenus populate
-  currentMenu->MenuOpened();
-  currentMenu->MenuClosed();
-
-  // now find the correct submenu
-  for (unsigned int i = 1; currentMenu && i < indexCount; i++) {
-    targetIndex = [[indexes objectAtIndex:i] intValue];
-    visible = 0;
-    length = currentMenu->GetItemCount();
-    for (unsigned int j = 0; j < length; j++) {
-      nsMenuObjectX* targetMenu = currentMenu->GetItemAt(j);
-      if (!targetMenu)
-        return;
-      if (!nsMenuUtilsX::NodeIsHiddenOrCollapsed(targetMenu->Content())) {
-        visible++;
-        if (targetMenu->MenuObjectType() == eSubmenuObjectType && visible == (targetIndex + 1)) {
-          currentMenu = static_cast<nsMenuX*>(targetMenu);
-          // fake open/close to cause lazy update to happen
-          currentMenu->MenuOpened();
-          currentMenu->MenuClosed();
-          break;
-        }
-      }
-    }
-  }
-}
-
-// Calling this forces a full reload of the menu system, reloading all native
-// menus and their items.
-// Without this testing is hard because changes to the DOM affect the native
-// menu system lazily.
-void nsMenuBarX::ForceNativeMenuReload()
-{
-  // tear down everything
-  while (GetMenuCount() > 0)
-    RemoveMenuAtIndex(0);
-
-  // construct everything
-  ConstructNativeMenus();
-}
-
-nsMenuX* nsMenuBarX::GetMenuAt(uint32_t aIndex)
-{
-  if (mMenuArray.Length() <= aIndex) {
-    NS_ERROR("Requesting menu at invalid index!");
-    return NULL;
-  }
-  return mMenuArray[aIndex].get();
-}
-
-nsMenuX* nsMenuBarX::GetXULHelpMenu()
-{
-  // The Help menu is usually (always?) the last one, so we start there and
-  // count back.
-  for (int32_t i = GetMenuCount() - 1; i >= 0; --i) {
-    nsMenuX* aMenu = GetMenuAt(i);
-    if (aMenu && nsMenuX::IsXULHelpMenu(aMenu->Content()))
-      return aMenu;
-  }
-  return nil;
-}
-
-// On SnowLeopard and later we must tell the OS which is our Help menu.
-// Otherwise it will only add Spotlight for Help (the Search item) to our
-// Help menu if its label/title is "Help" -- i.e. if the menu is in English.
-// This resolves bugs 489196 and 539317.
-void nsMenuBarX::SetSystemHelpMenu()
-{
-  nsMenuX* xulHelpMenu = GetXULHelpMenu();
-  if (xulHelpMenu) {
-    NSMenu* helpMenu = (NSMenu*)xulHelpMenu->NativeData();
-    if (helpMenu)
-      [NSApp setHelpMenu:helpMenu];
-  }
-}
-
-nsresult nsMenuBarX::Paint()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  // Don't try to optimize anything in this painting by checking
-  // sLastGeckoMenuBarPainted because the menubar can be manipulated by
-  // native dialogs and sheet code and other things besides this paint method.
-
-  // We have to keep the same menu item for the Application menu so we keep
-  // passing it along.
-  NSMenu* outgoingMenu = [NSApp mainMenu];
-  NS_ASSERTION([outgoingMenu numberOfItems] > 0, "Main menu does not have any items, something is terribly wrong!");
-
-  NSMenuItem* appMenuItem = [[outgoingMenu itemAtIndex:0] retain];
-  [outgoingMenu removeItemAtIndex:0];
-  [mNativeMenu insertItem:appMenuItem atIndex:0];
-  [appMenuItem release];
-
-  // Set menu bar and event target.
-  [NSApp setMainMenu:mNativeMenu];
-  SetSystemHelpMenu();
-  nsMenuBarX::sLastGeckoMenuBarPainted = this;
-
-  gSomeMenuBarPainted = YES;
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-// Returns the 'key' attribute of the 'shortcutID' object (if any) in the
-// currently active menubar's DOM document.  'shortcutID' should be the id
-// (i.e. the name) of a component that defines a commonly used (and
-// localized) cmd+key shortcut, and belongs to a keyset containing similar
-// objects.  For example "key_selectAll".  Returns a value that can be
-// compared to the first character of [NSEvent charactersIgnoringModifiers]
-// when [NSEvent modifierFlags] == NSCommandKeyMask.
-char nsMenuBarX::GetLocalizedAccelKey(const char *shortcutID)
-{
-  if (!sLastGeckoMenuBarPainted)
-    return 0;
-
-  nsCOMPtr<nsIDOMDocument> domDoc(do_QueryInterface(sLastGeckoMenuBarPainted->mContent->OwnerDoc()));
-  if (!domDoc)
-    return 0;
-
-  NS_ConvertASCIItoUTF16 shortcutIDStr((const char *)shortcutID);
-  nsCOMPtr<nsIDOMElement> shortcutElement;
-  domDoc->GetElementById(shortcutIDStr, getter_AddRefs(shortcutElement));
-  nsCOMPtr<nsIContent> shortcutContent = do_QueryInterface(shortcutElement);
-  if (!shortcutContent)
-    return 0;
-
-  nsAutoString key;
-  shortcutContent->GetAttr(kNameSpaceID_None, nsGkAtoms::key, key);
-  NS_LossyConvertUTF16toASCII keyASC(key.get());
-  const char *keyASCPtr = keyASC.get();
-  if (!keyASCPtr)
-    return 0;
-  // If keyID's 'key' attribute isn't exactly one character long, it's not
-  // what we're looking for.
-  if (strlen(keyASCPtr) != sizeof(char))
-    return 0;
-  // Make sure retval is lower case.
-  char retval = tolower(keyASCPtr[0]);
-
-  return retval;
-}
-
-/* static */
-void nsMenuBarX::ResetNativeApplicationMenu()
-{
-  [sApplicationMenu removeAllItems];
-  [sApplicationMenu release];
-  sApplicationMenu = nil;
-  sApplicationMenuIsFallback = NO;
-}
-
-// Hide the item in the menu by setting the 'hidden' attribute. Returns it in |outHiddenNode| so
-// the caller can hang onto it if they so choose. It is acceptable to pass nsull
-// for |outHiddenNode| if the caller doesn't care about the hidden node.
-void nsMenuBarX::HideItem(nsIDOMDocument* inDoc, const nsAString & inID, nsIContent** outHiddenNode)
-{
-  nsCOMPtr<nsIDOMElement> menuItem;
-  inDoc->GetElementById(inID, getter_AddRefs(menuItem));
-  nsCOMPtr<nsIContent> menuContent(do_QueryInterface(menuItem));
-  if (menuContent) {
-    menuContent->SetAttr(kNameSpaceID_None, nsGkAtoms::hidden, NS_LITERAL_STRING("true"), false);
-    if (outHiddenNode) {
-      *outHiddenNode = menuContent.get();
-      NS_IF_ADDREF(*outHiddenNode);
-    }
-  }
-}
-
-// Do what is necessary to conform to the Aqua guidelines for menus.
-void nsMenuBarX::AquifyMenuBar()
-{
-  nsCOMPtr<nsIDOMDocument> domDoc(do_QueryInterface(mContent->GetComposedDoc()));
-  if (domDoc) {
-    // remove the "About..." item and its separator
-    HideItem(domDoc, NS_LITERAL_STRING("aboutSeparator"), nullptr);
-    HideItem(domDoc, NS_LITERAL_STRING("aboutName"), getter_AddRefs(mAboutItemContent));
-    if (!sAboutItemContent)
-      sAboutItemContent = mAboutItemContent;
-
-    // remove quit item and its separator
-    HideItem(domDoc, NS_LITERAL_STRING("menu_FileQuitSeparator"), nullptr);
-    HideItem(domDoc, NS_LITERAL_STRING("menu_FileQuitItem"), getter_AddRefs(mQuitItemContent));
-    if (!sQuitItemContent)
-      sQuitItemContent = mQuitItemContent;
-
-    // remove prefs item and its separator, but save off the pref content node
-    // so we can invoke its command later.
-    HideItem(domDoc, NS_LITERAL_STRING("menu_PrefsSeparator"), nullptr);
-    HideItem(domDoc, NS_LITERAL_STRING("menu_preferences"), getter_AddRefs(mPrefItemContent));
-    if (!sPrefItemContent)
-      sPrefItemContent = mPrefItemContent;
-
-    // hide items that we use for the Application menu
-    HideItem(domDoc, NS_LITERAL_STRING("menu_mac_services"), nullptr);
-    HideItem(domDoc, NS_LITERAL_STRING("menu_mac_hide_app"), nullptr);
-    HideItem(domDoc, NS_LITERAL_STRING("menu_mac_hide_others"), nullptr);
-    HideItem(domDoc, NS_LITERAL_STRING("menu_mac_show_all"), nullptr);
-  }
-}
-
-// for creating menu items destined for the Application menu
-NSMenuItem* nsMenuBarX::CreateNativeAppMenuItem(nsMenuX* inMenu, const nsAString& nodeID, SEL action,
-                                                int tag, NativeMenuItemTarget* target)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  nsCOMPtr<nsIDocument> doc = inMenu->Content()->GetUncomposedDoc();
-  if (!doc) {
-    return nil;
-  }
-
-  nsCOMPtr<nsIDOMDocument> domdoc(do_QueryInterface(doc));
-  if (!domdoc) {
-    return nil;
-  }
-
-  // Get information from the gecko menu item
-  nsAutoString label;
-  nsAutoString modifiers;
-  nsAutoString key;
-  nsCOMPtr<nsIDOMElement> menuItem;
-  domdoc->GetElementById(nodeID, getter_AddRefs(menuItem));
-  if (menuItem) {
-    menuItem->GetAttribute(NS_LITERAL_STRING("label"), label);
-    menuItem->GetAttribute(NS_LITERAL_STRING("modifiers"), modifiers);
-    menuItem->GetAttribute(NS_LITERAL_STRING("key"), key);
-  }
-  else {
-    return nil;
-  }
-
-  // Get more information about the key equivalent. Start by
-  // finding the key node we need.
-  NSString* keyEquiv = nil;
-  unsigned int macKeyModifiers = 0;
-  if (!key.IsEmpty()) {
-    nsCOMPtr<nsIDOMElement> keyElement;
-    domdoc->GetElementById(key, getter_AddRefs(keyElement));
-    if (keyElement) {
-      nsCOMPtr<nsIContent> keyContent (do_QueryInterface(keyElement));
-      // first grab the key equivalent character
-      nsAutoString keyChar(NS_LITERAL_STRING(" "));
-      keyContent->GetAttr(kNameSpaceID_None, nsGkAtoms::key, keyChar);
-      if (!keyChar.EqualsLiteral(" ")) {
-        keyEquiv = [[NSString stringWithCharacters:reinterpret_cast<const unichar*>(keyChar.get())
-                                            length:keyChar.Length()] lowercaseString];
-      }
-      // now grab the key equivalent modifiers
-      nsAutoString modifiersStr;
-      keyContent->GetAttr(kNameSpaceID_None, nsGkAtoms::modifiers, modifiersStr);
-      uint8_t geckoModifiers = nsMenuUtilsX::GeckoModifiersForNodeAttribute(modifiersStr);
-      macKeyModifiers = nsMenuUtilsX::MacModifiersForGeckoModifiers(geckoModifiers);
-    }
-  }
-  // get the label into NSString-form
-  NSString* labelString = [NSString stringWithCharacters:reinterpret_cast<const unichar*>(label.get())
-                                                  length:label.Length()];
-
-  if (!labelString)
-    labelString = @"";
-  if (!keyEquiv)
-    keyEquiv = @"";
-
-  // put together the actual NSMenuItem
-  NSMenuItem* newMenuItem = [[NSMenuItem alloc] initWithTitle:labelString action:action keyEquivalent:keyEquiv];
-
-  [newMenuItem setTag:tag];
-  [newMenuItem setTarget:target];
-  [newMenuItem setKeyEquivalentModifierMask:macKeyModifiers];
-
-  MenuItemInfo * info = [[MenuItemInfo alloc] initWithMenuGroupOwner:this];
-  [newMenuItem setRepresentedObject:info];
-  [info release];
-
-  return newMenuItem;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-// build the Application menu shared by all menu bars
-nsresult nsMenuBarX::CreateApplicationMenu(nsMenuX* inMenu)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  // At this point, the application menu is the application menu from
-  // the nib in cocoa widgets. We do not have a way to create an application
-  // menu manually, so we grab the one from the nib and use that.
-  sApplicationMenu = [[[[NSApp mainMenu] itemAtIndex:0] submenu] retain];
-
-/*
-  We support the following menu items here:
-
-  Menu Item                DOM Node ID             Notes
-
-  ========================
-  = About This App       = <- aboutName
-  ========================
-  = Preferences...       = <- menu_preferences
-  ========================
-  = Services     >       = <- menu_mac_services    <- (do not define key equivalent)
-  ========================
-  = Hide App             = <- menu_mac_hide_app
-  = Hide Others          = <- menu_mac_hide_others
-  = Show All             = <- menu_mac_show_all
-  ========================
-  = Quit                 = <- menu_FileQuitItem
-  ========================
-
-  If any of them are ommitted from the application's DOM, we just don't add
-  them. We always add a "Quit" item, but if an app developer does not provide a
-  DOM node with the right ID for the Quit item, we add it in English. App
-  developers need only add each node with a label and a key equivalent (if they
-  want one). Other attributes are optional. Like so:
-
-  <menuitem id="menu_preferences"
-         label="&preferencesCmdMac.label;"
-           key="open_prefs_key"/>
-
-  We need to use this system for localization purposes, until we have a better way
-  to define the Application menu to be used on Mac OS X.
-*/
-
-  if (sApplicationMenu) {
-    // This code reads attributes we are going to care about from the DOM elements
-
-    NSMenuItem *itemBeingAdded = nil;
-    BOOL addAboutSeparator = FALSE;
-
-    // Add the About menu item
-    itemBeingAdded = CreateNativeAppMenuItem(inMenu, NS_LITERAL_STRING("aboutName"), @selector(menuItemHit:),
-                                             eCommand_ID_About, nsMenuBarX::sNativeEventTarget);
-    if (itemBeingAdded) {
-      [sApplicationMenu addItem:itemBeingAdded];
-      [itemBeingAdded release];
-      itemBeingAdded = nil;
-
-      addAboutSeparator = TRUE;
-    }
-
-    // Add separator if either the About item or software update item exists
-    if (addAboutSeparator)
-      [sApplicationMenu addItem:[NSMenuItem separatorItem]];
-
-    // Add the Preferences menu item
-    itemBeingAdded = CreateNativeAppMenuItem(inMenu, NS_LITERAL_STRING("menu_preferences"), @selector(menuItemHit:),
-                                             eCommand_ID_Prefs, nsMenuBarX::sNativeEventTarget);
-    if (itemBeingAdded) {
-      [sApplicationMenu addItem:itemBeingAdded];
-      [itemBeingAdded release];
-      itemBeingAdded = nil;
-
-      // Add separator after Preferences menu
-      [sApplicationMenu addItem:[NSMenuItem separatorItem]];
-    }
-
-    // Add Services menu item
-    itemBeingAdded = CreateNativeAppMenuItem(inMenu, NS_LITERAL_STRING("menu_mac_services"), nil,
-                                             0, nil);
-    if (itemBeingAdded) {
-      [sApplicationMenu addItem:itemBeingAdded];
-
-      // set this menu item up as the Mac OS X Services menu
-      NSMenu* servicesMenu = [[GeckoServicesNSMenu alloc] initWithTitle:@""];
-      [itemBeingAdded setSubmenu:servicesMenu];
-      [NSApp setServicesMenu:servicesMenu];
-
-      [itemBeingAdded release];
-      itemBeingAdded = nil;
-
-      // Add separator after Services menu
-      [sApplicationMenu addItem:[NSMenuItem separatorItem]];
-    }
-
-    BOOL addHideShowSeparator = FALSE;
-
-    // Add menu item to hide this application
-    itemBeingAdded = CreateNativeAppMenuItem(inMenu, NS_LITERAL_STRING("menu_mac_hide_app"), @selector(menuItemHit:),
-                                             eCommand_ID_HideApp, nsMenuBarX::sNativeEventTarget);
-    if (itemBeingAdded) {
-      [sApplicationMenu addItem:itemBeingAdded];
-      [itemBeingAdded release];
-      itemBeingAdded = nil;
-
-      addHideShowSeparator = TRUE;
-    }
-
-    // Add menu item to hide other applications
-    itemBeingAdded = CreateNativeAppMenuItem(inMenu, NS_LITERAL_STRING("menu_mac_hide_others"), @selector(menuItemHit:),
-                                             eCommand_ID_HideOthers, nsMenuBarX::sNativeEventTarget);
-    if (itemBeingAdded) {
-      [sApplicationMenu addItem:itemBeingAdded];
-      [itemBeingAdded release];
-      itemBeingAdded = nil;
-
-      addHideShowSeparator = TRUE;
-    }
-
-    // Add menu item to show all applications
-    itemBeingAdded = CreateNativeAppMenuItem(inMenu, NS_LITERAL_STRING("menu_mac_show_all"), @selector(menuItemHit:),
-                                             eCommand_ID_ShowAll, nsMenuBarX::sNativeEventTarget);
-    if (itemBeingAdded) {
-      [sApplicationMenu addItem:itemBeingAdded];
-      [itemBeingAdded release];
-      itemBeingAdded = nil;
-
-      addHideShowSeparator = TRUE;
-    }
-
-    // Add a separator after the hide/show menus if at least one exists
-    if (addHideShowSeparator)
-      [sApplicationMenu addItem:[NSMenuItem separatorItem]];
-
-    // Add quit menu item
-    itemBeingAdded = CreateNativeAppMenuItem(inMenu, NS_LITERAL_STRING("menu_FileQuitItem"), @selector(menuItemHit:),
-                                             eCommand_ID_Quit, nsMenuBarX::sNativeEventTarget);
-    if (itemBeingAdded) {
-      [sApplicationMenu addItem:itemBeingAdded];
-      [itemBeingAdded release];
-      itemBeingAdded = nil;
-    }
-    else {
-      // the current application does not have a DOM node for "Quit". Add one
-      // anyway, in English.
-      NSMenuItem* defaultQuitItem = [[[NSMenuItem alloc] initWithTitle:@"Quit" action:@selector(menuItemHit:)
-                                                         keyEquivalent:@"q"] autorelease];
-      [defaultQuitItem setTarget:nsMenuBarX::sNativeEventTarget];
-      [defaultQuitItem setTag:eCommand_ID_Quit];
-      [sApplicationMenu addItem:defaultQuitItem];
-    }
-  }
-
-  return (sApplicationMenu) ? NS_OK : NS_ERROR_FAILURE;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-void nsMenuBarX::SetParent(nsIWidget* aParent)
-{
-  mParentWindow = aParent;
-}
-
-//
-// Objective-C class used to allow us to have keyboard commands
-// look like they are doing something but actually do nothing.
-// We allow mouse actions to work normally.
-//
-
-// Controls whether or not native menu items should invoke their commands.
-static BOOL gMenuItemsExecuteCommands = YES;
-
-@implementation GeckoNSMenu
-
-// Keyboard commands should not cause menu items to invoke their
-// commands when there is a key window because we'd rather send
-// the keyboard command to the window. We still have the menus
-// go through the mechanics so they'll give the proper visual
-// feedback.
-- (BOOL)performKeyEquivalent:(NSEvent *)theEvent
-{
-  // We've noticed that Mac OS X expects this check in subclasses before
-  // calling NSMenu's "performKeyEquivalent:".
-  //
-  // There is no case in which we'd need to do anything or return YES
-  // when we have no items so we can just do this check first.
-  if ([self numberOfItems] <= 0) {
-    return NO;
-  }
-
-  NSWindow *keyWindow = [NSApp keyWindow];
-
-  // If there is no key window then just behave normally. This
-  // probably means that this menu is associated with Gecko's
-  // hidden window.
-  if (!keyWindow) {
-    return [super performKeyEquivalent:theEvent];
-  }
-
-  NSResponder *firstResponder = [keyWindow firstResponder];
-
-  gMenuItemsExecuteCommands = NO;
-  [super performKeyEquivalent:theEvent];
-  gMenuItemsExecuteCommands = YES; // return to default
-
-  // Return YES if we invoked a command and there is now no key window or we changed
-  // the first responder. In this case we do not want to propagate the event because
-  // we don't want it handled again.
-  if (![NSApp keyWindow] || [[NSApp keyWindow] firstResponder] != firstResponder) {
-    return YES;
-  }
-
-  // Return NO so that we can handle the event via NSView's "keyDown:".
-  return NO;
-}
-
-@end
-
-//
-// Objective-C class used as action target for menu items
-//
-
-@implementation NativeMenuItemTarget
-
-// called when some menu item in this menu gets hit
--(IBAction)menuItemHit:(id)sender
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!gMenuItemsExecuteCommands) {
-    return;
-  }
-
-  int tag = [sender tag];
-
-  nsMenuGroupOwnerX* menuGroupOwner = nullptr;
-  nsMenuBarX* menuBar = nullptr;
-  MenuItemInfo* info = [sender representedObject];
-
-  if (info) {
-    menuGroupOwner = [info menuGroupOwner];
-    if (!menuGroupOwner) {
-      return;
-    }
-    if (menuGroupOwner->MenuObjectType() == eMenuBarObjectType) {
-      menuBar = static_cast<nsMenuBarX*>(menuGroupOwner);
-    }
-  }
-
-  // Do special processing if this is for an app-global command.
-  if (tag == eCommand_ID_About) {
-    nsIContent* mostSpecificContent = sAboutItemContent;
-    if (menuBar && menuBar->mAboutItemContent)
-      mostSpecificContent = menuBar->mAboutItemContent;
-    nsMenuUtilsX::DispatchCommandTo(mostSpecificContent);
-    return;
-  }
-  else if (tag == eCommand_ID_Prefs) {
-    nsIContent* mostSpecificContent = sPrefItemContent;
-    if (menuBar && menuBar->mPrefItemContent)
-      mostSpecificContent = menuBar->mPrefItemContent;
-    nsMenuUtilsX::DispatchCommandTo(mostSpecificContent);
-    return;
-  }
-  else if (tag == eCommand_ID_HideApp) {
-    [NSApp hide:sender];
-    return;
-  }
-  else if (tag == eCommand_ID_HideOthers) {
-    [NSApp hideOtherApplications:sender];
-    return;
-  }
-  else if (tag == eCommand_ID_ShowAll) {
-    [NSApp unhideAllApplications:sender];
-    return;
-  }
-  else if (tag == eCommand_ID_Quit) {
-    nsIContent* mostSpecificContent = sQuitItemContent;
-    if (menuBar && menuBar->mQuitItemContent)
-      mostSpecificContent = menuBar->mQuitItemContent;
-    // If we have some content for quit we execute it. Otherwise we send a native app terminate
-    // message. If you want to stop a quit from happening, provide quit content and return
-    // the event as unhandled.
-    if (mostSpecificContent) {
-      nsMenuUtilsX::DispatchCommandTo(mostSpecificContent);
-    }
-    else {
-      nsCOMPtr<nsIAppStartup> appStartup = do_GetService(NS_APPSTARTUP_CONTRACTID);
-      if (appStartup) {
-        appStartup->Quit(nsIAppStartup::eAttemptQuit);
-      }
-    }
-    return;
-  }
-
-  // given the commandID, look it up in our hashtable and dispatch to
-  // that menu item.
-  if (menuGroupOwner) {
-    nsMenuItemX* menuItem = menuGroupOwner->GetMenuItemForCommandID(static_cast<uint32_t>(tag));
-    if (menuItem)
-      menuItem->DoCommand();
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-@end
-
-// Objective-C class used for menu items on the Services menu to allow Gecko
-// to override their standard behavior in order to stop key equivalents from
-// firing in certain instances. When gMenuItemsExecuteCommands is NO, we return
-// a dummy target and action instead of the actual target and action.
-
-@implementation GeckoServicesNSMenuItem
-
-- (id) target
-{
-  id realTarget = [super target];
-  if (gMenuItemsExecuteCommands)
-    return realTarget;
-  else
-    return realTarget ? self : nil;
-}
-
-- (SEL) action
-{
-  SEL realAction = [super action];
-  if (gMenuItemsExecuteCommands)
-    return realAction;
-  else
-    return realAction ? @selector(_doNothing:) : NULL;
-}
-
-- (void) _doNothing:(id)sender
-{
-}
-
-@end
-
-// Objective-C class used as the Services menu so that Gecko can override the
-// standard behavior of the Services menu in order to stop key equivalents
-// from firing in certain instances.
-
-@implementation GeckoServicesNSMenu
-
-- (void)addItem:(NSMenuItem *)newItem
-{
-  [self _overrideClassOfMenuItem:newItem];
-  [super addItem:newItem];
-}
-
-- (NSMenuItem *)addItemWithTitle:(NSString *)aString action:(SEL)aSelector keyEquivalent:(NSString *)keyEquiv
-{
-  NSMenuItem * newItem = [super addItemWithTitle:aString action:aSelector keyEquivalent:keyEquiv];
-  [self _overrideClassOfMenuItem:newItem];
-  return newItem;
-}
-
-- (void)insertItem:(NSMenuItem *)newItem atIndex:(NSInteger)index
-{
-  [self _overrideClassOfMenuItem:newItem];
-  [super insertItem:newItem atIndex:index];
-}
-
-- (NSMenuItem *)insertItemWithTitle:(NSString *)aString action:(SEL)aSelector  keyEquivalent:(NSString *)keyEquiv atIndex:(NSInteger)index
-{
-  NSMenuItem * newItem = [super insertItemWithTitle:aString action:aSelector keyEquivalent:keyEquiv atIndex:index];
-  [self _overrideClassOfMenuItem:newItem];
-  return newItem;
-}
-
-- (void) _overrideClassOfMenuItem:(NSMenuItem *)menuItem
-{
-  if ([menuItem class] == [NSMenuItem class])
-    object_setClass(menuItem, [GeckoServicesNSMenuItem class]);
-}
-
-@end
diff --git a/widget/cocoa/nsMenuBaseX.h b/widget/cocoa/nsMenuBaseX.h
deleted file mode 100644
index 5b9f89c560..0000000000
--- a/widget/cocoa/nsMenuBaseX.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsMenuBaseX_h_
-#define nsMenuBaseX_h_
-
-#import <Foundation/Foundation.h>
-
-#include "nsCOMPtr.h"
-#include "nsIContent.h"
-
-enum nsMenuObjectTypeX {
-  eMenuBarObjectType,
-  eSubmenuObjectType,
-  eMenuItemObjectType,
-  eStandaloneNativeMenuObjectType,
-};
-
-// All menu objects subclass this.
-// Menu bars are owned by their top-level nsIWidgets.
-// All other objects are memory-managed based on the DOM.
-// Content removal deletes them immediately and nothing else should.
-// Do not attempt to hold strong references to them or delete them.
-class nsMenuObjectX
-{
-public:
-  virtual ~nsMenuObjectX() { }
-  virtual nsMenuObjectTypeX MenuObjectType()=0;
-  virtual void*             NativeData()=0;
-  nsIContent*               Content() { return mContent; }
-
-  /**
-   * Called when an icon of a menu item somewhere in this menu has updated.
-   * Menu objects with parents need to propagate the notification to their
-   * parent.
-   */
-  virtual void IconUpdated() {}
-
-protected:
-  nsCOMPtr<nsIContent> mContent;
-};
-
-
-//
-// Object stored as "representedObject" for all menu items
-//
-
-class nsMenuGroupOwnerX;
-
-@interface MenuItemInfo : NSObject
-{
-  nsMenuGroupOwnerX * mMenuGroupOwner;
-}
-
-- (id) initWithMenuGroupOwner:(nsMenuGroupOwnerX *)aMenuGroupOwner;
-- (nsMenuGroupOwnerX *) menuGroupOwner;
-- (void) setMenuGroupOwner:(nsMenuGroupOwnerX *)aMenuGroupOwner;
-
-@end
-
-
-// Special command IDs that we know Mac OS X does not use for anything else.
-// We use these in place of carbon's IDs for these commands in order to stop
-// Carbon from messing with our event handlers. See bug 346883.
-
-enum {
-  eCommand_ID_About      = 1,
-  eCommand_ID_Prefs      = 2,
-  eCommand_ID_Quit       = 3,
-  eCommand_ID_HideApp    = 4,
-  eCommand_ID_HideOthers = 5,
-  eCommand_ID_ShowAll    = 6,
-  eCommand_ID_Update     = 7,
-  eCommand_ID_Last       = 8
-};
-
-#endif // nsMenuBaseX_h_
diff --git a/widget/cocoa/nsMenuGroupOwnerX.h b/widget/cocoa/nsMenuGroupOwnerX.h
deleted file mode 100644
index 657f420b56..0000000000
--- a/widget/cocoa/nsMenuGroupOwnerX.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsMenuGroupOwnerX_h_
-#define nsMenuGroupOwnerX_h_
-
-#import <Cocoa/Cocoa.h>
-
-#include "nsMenuBaseX.h"
-#include "nsIMutationObserver.h"
-#include "nsHashKeys.h"
-#include "nsDataHashtable.h"
-#include "nsString.h"
-
-class nsMenuItemX;
-class nsChangeObserver;
-class nsIWidget;
-class nsIContent;
-
-class nsMenuGroupOwnerX : public nsMenuObjectX, public nsIMutationObserver
-{
-public:
-  nsMenuGroupOwnerX();
-
-  nsresult Create(nsIContent * aContent);
-
-  void RegisterForContentChanges(nsIContent* aContent,
-                                 nsChangeObserver* aMenuObject);
-  void UnregisterForContentChanges(nsIContent* aContent);
-  uint32_t RegisterForCommand(nsMenuItemX* aItem);
-  void UnregisterCommand(uint32_t aCommandID);
-  nsMenuItemX* GetMenuItemForCommandID(uint32_t inCommandID);
-  void AddMenuItemInfoToSet(MenuItemInfo* info);
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIMUTATIONOBSERVER
-
-protected:
-  virtual ~nsMenuGroupOwnerX();
-
-  nsChangeObserver* LookupContentChangeObserver(nsIContent* aContent);
-
-  uint32_t  mCurrentCommandID;  // unique command id (per menu-bar) to
-                                // give to next item that asks
-
-  // stores observers for content change notification
-  nsDataHashtable<nsPtrHashKey<nsIContent>, nsChangeObserver *> mContentToObserverTable;
-
-  // stores mapping of command IDs to menu objects
-  nsDataHashtable<nsUint32HashKey, nsMenuItemX *> mCommandToMenuObjectTable;
-
-  // Stores references to all the MenuItemInfo objects created with weak
-  // references to us.  They may live longer than we do, so when we're
-  // destroyed we need to clear all their weak references.  This avoids
-  // crashes in -[NativeMenuItemTarget menuItemHit:].  See bug 1131473.
-  NSMutableSet* mInfoSet;
-};
-
-#endif // nsMenuGroupOwner_h_
diff --git a/widget/cocoa/nsMenuGroupOwnerX.mm b/widget/cocoa/nsMenuGroupOwnerX.mm
deleted file mode 100644
index 661a52bd80..0000000000
--- a/widget/cocoa/nsMenuGroupOwnerX.mm
+++ /dev/null
@@ -1,261 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "nsMenuGroupOwnerX.h"
-#include "nsMenuBarX.h"
-#include "nsMenuX.h"
-#include "nsMenuItemX.h"
-#include "nsMenuUtilsX.h"
-#include "nsCocoaUtils.h"
-#include "nsCocoaWindow.h"
-
-#include "nsCOMPtr.h"
-#include "nsString.h"
-#include "nsObjCExceptions.h"
-#include "nsThreadUtils.h"
-
-#include "mozilla/dom/Element.h"
-#include "nsIWidget.h"
-#include "nsIDocument.h"
-#include "nsIDOMDocument.h"
-#include "nsIDOMElement.h"
-
-#include "nsINode.h"
-
-using namespace mozilla;
-
-NS_IMPL_ISUPPORTS(nsMenuGroupOwnerX, nsIMutationObserver)
-
-
-nsMenuGroupOwnerX::nsMenuGroupOwnerX()
-: mCurrentCommandID(eCommand_ID_Last)
-{
-  mInfoSet = [[NSMutableSet setWithCapacity:10] retain];
-}
-
-
-nsMenuGroupOwnerX::~nsMenuGroupOwnerX()
-{
-  MOZ_ASSERT(mContentToObserverTable.Count() == 0, "have outstanding mutation observers!\n");
-
-  // The MenuItemInfo objects in mInfoSet may live longer than we do.  So when
-  // we get destroyed we need to invalidate all their mMenuGroupOwner pointers.
-  NSEnumerator* counter = [mInfoSet objectEnumerator];
-  MenuItemInfo* info;
-  while ((info = (MenuItemInfo*) [counter nextObject])) {
-    [info setMenuGroupOwner:nil];
-  }
-  [mInfoSet release];
-}
-
-
-nsresult nsMenuGroupOwnerX::Create(nsIContent* aContent)
-{
-  if (!aContent)
-    return NS_ERROR_INVALID_ARG;
-
-  mContent = aContent;
-
-  return NS_OK;
-}
-
-
-//
-// nsIMutationObserver
-//
-
-
-void nsMenuGroupOwnerX::CharacterDataWillChange(nsIDocument* aDocument,
-                                                nsIContent* aContent,
-                                                CharacterDataChangeInfo* aInfo)
-{
-}
-
-
-void nsMenuGroupOwnerX::CharacterDataChanged(nsIDocument* aDocument,
-                                             nsIContent* aContent,
-                                             CharacterDataChangeInfo* aInfo)
-{
-}
-
-
-void nsMenuGroupOwnerX::ContentAppended(nsIDocument* aDocument,
-                                        nsIContent* aContainer,
-                                        nsIContent* aFirstNewContent,
-                                        int32_t /* unused */)
-{
-  for (nsIContent* cur = aFirstNewContent; cur; cur = cur->GetNextSibling()) {
-    ContentInserted(aDocument, aContainer, cur, 0);
-  }
-}
-
-
-void nsMenuGroupOwnerX::NodeWillBeDestroyed(const nsINode * aNode)
-{
-}
-
-
-void nsMenuGroupOwnerX::AttributeWillChange(nsIDocument* aDocument,
-                                            dom::Element* aContent,
-                                            int32_t aNameSpaceID,
-                                            nsIAtom* aAttribute,
-                                            int32_t aModType,
-                                            const nsAttrValue* aNewValue)
-{
-}
-
-void nsMenuGroupOwnerX::NativeAnonymousChildListChange(nsIDocument* aDocument,
-                                                       nsIContent* aContent,
-                                                       bool aIsRemove)
-{
-}
-
-void nsMenuGroupOwnerX::AttributeChanged(nsIDocument* aDocument,
-                                         dom::Element* aElement,
-                                         int32_t aNameSpaceID,
-                                         nsIAtom* aAttribute,
-                                         int32_t aModType,
-                                         const nsAttrValue* aOldValue)
-{
-  nsCOMPtr<nsIMutationObserver> kungFuDeathGrip(this);
-  nsChangeObserver* obs = LookupContentChangeObserver(aElement);
-  if (obs)
-    obs->ObserveAttributeChanged(aDocument, aElement, aAttribute);
-}
-
-
-void nsMenuGroupOwnerX::ContentRemoved(nsIDocument * aDocument,
-                                       nsIContent * aContainer,
-                                       nsIContent * aChild,
-                                       int32_t aIndexInContainer,
-                                       nsIContent * aPreviousSibling)
-{
-  if (!aContainer) {
-    return;
-  }
-
-  nsCOMPtr<nsIMutationObserver> kungFuDeathGrip(this);
-  nsChangeObserver* obs = LookupContentChangeObserver(aContainer);
-  if (obs)
-    obs->ObserveContentRemoved(aDocument, aChild, aIndexInContainer);
-  else if (aContainer != mContent) {
-    // We do a lookup on the parent container in case things were removed
-    // under a "menupopup" item. That is basically a wrapper for the contents
-    // of a "menu" node.
-    nsCOMPtr<nsIContent> parent = aContainer->GetParent();
-    if (parent) {
-      obs = LookupContentChangeObserver(parent);
-      if (obs)
-        obs->ObserveContentRemoved(aDocument, aChild, aIndexInContainer);
-    }
-  }
-}
-
-
-void nsMenuGroupOwnerX::ContentInserted(nsIDocument * aDocument,
-                                        nsIContent * aContainer,
-                                        nsIContent * aChild,
-                                        int32_t /* unused */)
-{
-  if (!aContainer) {
-    return;
-  }
-
-  nsCOMPtr<nsIMutationObserver> kungFuDeathGrip(this);
-  nsChangeObserver* obs = LookupContentChangeObserver(aContainer);
-  if (obs)
-    obs->ObserveContentInserted(aDocument, aContainer, aChild);
-  else if (aContainer != mContent) {
-    // We do a lookup on the parent container in case things were removed
-    // under a "menupopup" item. That is basically a wrapper for the contents
-    // of a "menu" node.
-    nsCOMPtr<nsIContent> parent = aContainer->GetParent();
-    if (parent) {
-      obs = LookupContentChangeObserver(parent);
-      if (obs)
-        obs->ObserveContentInserted(aDocument, aContainer, aChild);
-    }
-  }
-}
-
-
-void nsMenuGroupOwnerX::ParentChainChanged(nsIContent *aContent)
-{
-}
-
-
-// For change management, we don't use a |nsSupportsHashtable| because
-// we know that the lifetime of all these items is bounded by the
-// lifetime of the menubar. No need to add any more strong refs to the
-// picture because the containment hierarchy already uses strong refs.
-void nsMenuGroupOwnerX::RegisterForContentChanges(nsIContent *aContent,
-                                                  nsChangeObserver *aMenuObject)
-{
-  if (!mContentToObserverTable.Contains(aContent)) {
-    aContent->AddMutationObserver(this);
-  }
-  mContentToObserverTable.Put(aContent, aMenuObject);
-}
-
-
-void nsMenuGroupOwnerX::UnregisterForContentChanges(nsIContent *aContent)
-{
-  if (mContentToObserverTable.Contains(aContent)) {
-    aContent->RemoveMutationObserver(this);
-  }
-  mContentToObserverTable.Remove(aContent);
-}
-
-
-nsChangeObserver* nsMenuGroupOwnerX::LookupContentChangeObserver(nsIContent* aContent)
-{
-  nsChangeObserver * result;
-  if (mContentToObserverTable.Get(aContent, &result))
-    return result;
-  else
-    return nullptr;
-}
-
-
-// Given a menu item, creates a unique 4-character command ID and
-// maps it to the item. Returns the id for use by the client.
-uint32_t nsMenuGroupOwnerX::RegisterForCommand(nsMenuItemX* inMenuItem)
-{
-  // no real need to check for uniqueness. We always start afresh with each
-  // window at 1. Even if we did get close to the reserved Apple command id's,
-  // those don't start until at least '    ', which is integer 538976288. If
-  // we have that many menu items in one window, I think we have other
-  // problems.
-
-  // make id unique
-  ++mCurrentCommandID;
-
-  mCommandToMenuObjectTable.Put(mCurrentCommandID, inMenuItem);
-
-  return mCurrentCommandID;
-}
-
-
-// Removes the mapping between the given 4-character command ID
-// and its associated menu item.
-void nsMenuGroupOwnerX::UnregisterCommand(uint32_t inCommandID)
-{
-  mCommandToMenuObjectTable.Remove(inCommandID);
-}
-
-
-nsMenuItemX* nsMenuGroupOwnerX::GetMenuItemForCommandID(uint32_t inCommandID)
-{
-  nsMenuItemX * result;
-  if (mCommandToMenuObjectTable.Get(inCommandID, &result))
-    return result;
-  else
-    return nullptr;
-}
-
-void nsMenuGroupOwnerX::AddMenuItemInfoToSet(MenuItemInfo* info)
-{
-  [mInfoSet addObject:info];
-}
diff --git a/widget/cocoa/nsMenuItemIconX.h b/widget/cocoa/nsMenuItemIconX.h
deleted file mode 100644
index 7352a94e2a..0000000000
--- a/widget/cocoa/nsMenuItemIconX.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-/*
- * Retrieves and displays icons in native menu items on Mac OS X.
- */
-
-#ifndef nsMenuItemIconX_h_
-#define nsMenuItemIconX_h_
-
-#include "mozilla/RefPtr.h"
-#include "nsCOMPtr.h"
-#include "imgINotificationObserver.h"
-
-class nsIURI;
-class nsIContent;
-class imgRequestProxy;
-class nsMenuObjectX;
-
-#import <Cocoa/Cocoa.h>
-
-class nsMenuItemIconX : public imgINotificationObserver
-{
-public:
-  nsMenuItemIconX(nsMenuObjectX* aMenuItem,
-                  nsIContent*    aContent,
-                  NSMenuItem*    aNativeMenuItem);
-private:
-  virtual ~nsMenuItemIconX();
-
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_IMGINOTIFICATIONOBSERVER
-
-  // SetupIcon succeeds if it was able to set up the icon, or if there should
-  // be no icon, in which case it clears any existing icon but still succeeds.
-  nsresult SetupIcon();
-
-  // GetIconURI fails if the item should not have any icon.
-  nsresult GetIconURI(nsIURI** aIconURI);
-
-  // LoadIcon will set a placeholder image and start a load request for the
-  // icon.  The request may not complete until after LoadIcon returns.
-  nsresult LoadIcon(nsIURI* aIconURI);
-
-  // Unless we take precautions, we may outlive the object that created us
-  // (mMenuObject, which owns our native menu item (mNativeMenuItem)).
-  // Destroy() should be called from mMenuObject's destructor to prevent
-  // this from happening.  See bug 499600.
-  void Destroy();
-
-protected:
-  nsresult OnFrameComplete(imgIRequest* aRequest);
-
-  nsCOMPtr<nsIContent>      mContent;
-  RefPtr<imgRequestProxy> mIconRequest;
-  nsMenuObjectX*            mMenuObject; // [weak]
-  nsIntRect                 mImageRegionRect;
-  bool                      mLoadedIcon;
-  bool                      mSetIcon;
-  NSMenuItem*               mNativeMenuItem; // [weak]
-};
-
-#endif // nsMenuItemIconX_h_
diff --git a/widget/cocoa/nsMenuItemIconX.mm b/widget/cocoa/nsMenuItemIconX.mm
deleted file mode 100644
index 7589c279e5..0000000000
--- a/widget/cocoa/nsMenuItemIconX.mm
+++ /dev/null
@@ -1,466 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-/*
- * Retrieves and displays icons in native menu items on Mac OS X.
- */
-
-/* exception_defines.h defines 'try' to 'if (true)' which breaks objective-c
-   exceptions and produces errors like: error: unexpected '@' in program'.
-   If we define __EXCEPTIONS exception_defines.h will avoid doing this.
-
-   See bug 666609 for more information.
-
-   We use <limits> to get the libstdc++ version. */
-#include <limits>
-#if __GLIBCXX__ <= 20070719
-#ifndef __EXCEPTIONS
-#define __EXCEPTIONS
-#endif
-#endif
-
-#include "nsMenuItemIconX.h"
-#include "nsObjCExceptions.h"
-#include "nsIContent.h"
-#include "nsIDocument.h"
-#include "nsNameSpaceManager.h"
-#include "nsGkAtoms.h"
-#include "nsIDOMElement.h"
-#include "nsICSSDeclaration.h"
-#include "nsIDOMCSSValue.h"
-#include "nsIDOMCSSPrimitiveValue.h"
-#include "nsIDOMRect.h"
-#include "nsThreadUtils.h"
-#include "nsToolkit.h"
-#include "nsNetUtil.h"
-#include "imgLoader.h"
-#include "imgRequestProxy.h"
-#include "nsMenuItemX.h"
-#include "gfxPlatform.h"
-#include "imgIContainer.h"
-#include "nsCocoaUtils.h"
-#include "nsContentUtils.h"
-#include "nsIContentPolicy.h"
-
-using mozilla::dom::Element;
-using mozilla::gfx::SourceSurface;
-
-static const uint32_t kIconWidth = 16;
-static const uint32_t kIconHeight = 16;
-
-typedef NS_STDCALL_FUNCPROTO(nsresult, GetRectSideMethod, nsIDOMRect,
-                             GetBottom, (nsIDOMCSSPrimitiveValue**));
-
-NS_IMPL_ISUPPORTS(nsMenuItemIconX, imgINotificationObserver)
-
-nsMenuItemIconX::nsMenuItemIconX(nsMenuObjectX* aMenuItem,
-                                 nsIContent*    aContent,
-                                 NSMenuItem*    aNativeMenuItem)
-: mContent(aContent)
-, mMenuObject(aMenuItem)
-, mLoadedIcon(false)
-, mSetIcon(false)
-, mNativeMenuItem(aNativeMenuItem)
-{
-  //  printf("Creating icon for menu item %d, menu %d, native item is %d\n", aMenuItem, aMenu, aNativeMenuItem);
-}
-
-nsMenuItemIconX::~nsMenuItemIconX()
-{
-  if (mIconRequest)
-    mIconRequest->CancelAndForgetObserver(NS_BINDING_ABORTED);
-}
-
-// Called from mMenuObjectX's destructor, to prevent us from outliving it
-// (as might otherwise happen if calls to our imgINotificationObserver methods
-// are still outstanding).  mMenuObjectX owns our nNativeMenuItem.
-void nsMenuItemIconX::Destroy()
-{
-  if (mIconRequest) {
-    mIconRequest->CancelAndForgetObserver(NS_BINDING_ABORTED);
-    mIconRequest = nullptr;
-  }
-  mMenuObject = nullptr;
-  mNativeMenuItem = nil;
-}
-
-nsresult
-nsMenuItemIconX::SetupIcon()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  // Still don't have one, then something is wrong, get out of here.
-  if (!mNativeMenuItem) {
-    NS_ERROR("No native menu item");
-    return NS_ERROR_FAILURE;
-  }
-
-  nsCOMPtr<nsIURI> iconURI;
-  nsresult rv = GetIconURI(getter_AddRefs(iconURI));
-  if (NS_FAILED(rv)) {
-    // There is no icon for this menu item. An icon might have been set
-    // earlier.  Clear it.
-    [mNativeMenuItem setImage:nil];
-
-    return NS_OK;
-  }
-
-  rv = LoadIcon(iconURI);
-  if (NS_FAILED(rv)) {
-    // There is no icon for this menu item, as an error occurred while loading it.
-    // An icon might have been set earlier or the place holder icon may have
-    // been set.  Clear it.
-    [mNativeMenuItem setImage:nil];
-  }
-  return rv;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-static int32_t
-GetDOMRectSide(nsIDOMRect* aRect, GetRectSideMethod aMethod)
-{
-  nsCOMPtr<nsIDOMCSSPrimitiveValue> dimensionValue;
-  (aRect->*aMethod)(getter_AddRefs(dimensionValue));
-  if (!dimensionValue)
-    return -1;
-
-  uint16_t primitiveType;
-  nsresult rv = dimensionValue->GetPrimitiveType(&primitiveType);
-  if (NS_FAILED(rv) || primitiveType != nsIDOMCSSPrimitiveValue::CSS_PX)
-    return -1;
-
-  float dimension = 0;
-  rv = dimensionValue->GetFloatValue(nsIDOMCSSPrimitiveValue::CSS_PX,
-                                     &dimension);
-  if (NS_FAILED(rv))
-    return -1;
-
-  return NSToIntRound(dimension);
-}
-
-nsresult
-nsMenuItemIconX::GetIconURI(nsIURI** aIconURI)
-{
-  if (!mMenuObject)
-    return NS_ERROR_FAILURE;
-
-  // Mac native menu items support having both a checkmark and an icon
-  // simultaneously, but this is unheard of in the cross-platform toolkit,
-  // seemingly because the win32 theme is unable to cope with both at once.
-  // The downside is that it's possible to get a menu item marked with a
-  // native checkmark and a checkmark for an icon.  Head off that possibility
-  // by pretending that no icon exists if this is a checkable menu item.
-  if (mMenuObject->MenuObjectType() == eMenuItemObjectType) {
-    nsMenuItemX* menuItem = static_cast<nsMenuItemX*>(mMenuObject);
-    if (menuItem->GetMenuItemType() != eRegularMenuItemType)
-      return NS_ERROR_FAILURE;
-  }
-
-  if (!mContent)
-    return NS_ERROR_FAILURE;
-
-  // First, look at the content node's "image" attribute.
-  nsAutoString imageURIString;
-  bool hasImageAttr = mContent->GetAttr(kNameSpaceID_None,
-                                        nsGkAtoms::image,
-                                        imageURIString);
-
-  nsresult rv;
-  nsCOMPtr<nsIDOMCSSValue> cssValue;
-  nsCOMPtr<nsICSSDeclaration> cssStyleDecl;
-  nsCOMPtr<nsIDOMCSSPrimitiveValue> primitiveValue;
-  uint16_t primitiveType;
-  if (!hasImageAttr) {
-    // If the content node has no "image" attribute, get the
-    // "list-style-image" property from CSS.
-    nsCOMPtr<nsIDocument> document = mContent->GetComposedDoc();
-    if (!document)
-      return NS_ERROR_FAILURE;
-
-    nsCOMPtr<nsPIDOMWindowInner> window = document->GetInnerWindow();
-    if (!window)
-      return NS_ERROR_FAILURE;
-
-    nsCOMPtr<Element> domElement = do_QueryInterface(mContent);
-    if (!domElement)
-      return NS_ERROR_FAILURE;
-
-    ErrorResult dummy;
-    cssStyleDecl = window->GetComputedStyle(*domElement, EmptyString(), dummy);
-    dummy.SuppressException();
-    if (!cssStyleDecl)
-      return NS_ERROR_FAILURE;
-
-    NS_NAMED_LITERAL_STRING(listStyleImage, "list-style-image");
-    rv = cssStyleDecl->GetPropertyCSSValue(listStyleImage,
-                                           getter_AddRefs(cssValue));
-    if (NS_FAILED(rv)) return rv;
-
-    primitiveValue = do_QueryInterface(cssValue);
-    if (!primitiveValue) return NS_ERROR_FAILURE;
-
-    rv = primitiveValue->GetPrimitiveType(&primitiveType);
-    if (NS_FAILED(rv)) return rv;
-    if (primitiveType != nsIDOMCSSPrimitiveValue::CSS_URI)
-      return NS_ERROR_FAILURE;
-
-    rv = primitiveValue->GetStringValue(imageURIString);
-    if (NS_FAILED(rv)) return rv;
-  }
-
-  // Empty the mImageRegionRect initially as the image region CSS could
-  // have been changed and now have an error or have been removed since the
-  // last GetIconURI call.
-  mImageRegionRect.SetEmpty();
-
-  // If this menu item shouldn't have an icon, the string will be empty,
-  // and NS_NewURI will fail.
-  nsCOMPtr<nsIURI> iconURI;
-  rv = NS_NewURI(getter_AddRefs(iconURI), imageURIString);
-  if (NS_FAILED(rv)) return rv;
-
-  *aIconURI = iconURI;
-  NS_ADDREF(*aIconURI);
-
-  if (!hasImageAttr) {
-    // Check if the icon has a specified image region so that it can be
-    // cropped appropriately before being displayed.
-    NS_NAMED_LITERAL_STRING(imageRegion, "-moz-image-region");
-    rv = cssStyleDecl->GetPropertyCSSValue(imageRegion,
-                                           getter_AddRefs(cssValue));
-    // Just return NS_OK if there if there is a failure due to no
-    // moz-image region specified so the whole icon will be drawn anyway.
-    if (NS_FAILED(rv)) return NS_OK;
-
-    primitiveValue = do_QueryInterface(cssValue);
-    if (!primitiveValue) return NS_OK;
-
-    rv = primitiveValue->GetPrimitiveType(&primitiveType);
-    if (NS_FAILED(rv)) return NS_OK;
-    if (primitiveType != nsIDOMCSSPrimitiveValue::CSS_RECT)
-      return NS_OK;
-
-    nsCOMPtr<nsIDOMRect> imageRegionRect;
-    rv = primitiveValue->GetRectValue(getter_AddRefs(imageRegionRect));
-    if (NS_FAILED(rv)) return NS_OK;
-
-    if (imageRegionRect) {
-      // Return NS_ERROR_FAILURE if the image region is invalid so the image
-      // is not drawn, and behavior is similar to XUL menus.
-      int32_t bottom = GetDOMRectSide(imageRegionRect, &nsIDOMRect::GetBottom);
-      int32_t right = GetDOMRectSide(imageRegionRect, &nsIDOMRect::GetRight);
-      int32_t top = GetDOMRectSide(imageRegionRect, &nsIDOMRect::GetTop);
-      int32_t left = GetDOMRectSide(imageRegionRect, &nsIDOMRect::GetLeft);
-
-      if (top < 0 || left < 0 || bottom <= top || right <= left)
-        return NS_ERROR_FAILURE;
-
-      mImageRegionRect.SetRect(left, top, right - left, bottom - top);
-    }
-  }
-
-  return NS_OK;
-}
-
-nsresult
-nsMenuItemIconX::LoadIcon(nsIURI* aIconURI)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  if (mIconRequest) {
-    // Another icon request is already in flight.  Kill it.
-    mIconRequest->Cancel(NS_BINDING_ABORTED);
-    mIconRequest = nullptr;
-  }
-
-  mLoadedIcon = false;
-
-  if (!mContent) return NS_ERROR_FAILURE;
-
-  nsCOMPtr<nsIDocument> document = mContent->OwnerDoc();
-
-  nsCOMPtr<nsILoadGroup> loadGroup = document->GetDocumentLoadGroup();
-  if (!loadGroup) return NS_ERROR_FAILURE;
-
-  RefPtr<imgLoader> loader = nsContentUtils::GetImgLoaderForDocument(document);
-  if (!loader) return NS_ERROR_FAILURE;
-
-  if (!mSetIcon) {
-    // Set a completely transparent 16x16 image as the icon on this menu item
-    // as a placeholder.  This keeps the menu item text displayed in the same
-    // position that it will be displayed when the real icon is loaded, and
-    // prevents it from jumping around or looking misaligned.
-
-    static bool sInitializedPlaceholder;
-    static NSImage* sPlaceholderIconImage;
-    if (!sInitializedPlaceholder) {
-      sInitializedPlaceholder = true;
-
-      // Note that we only create the one and reuse it forever, so this is not a leak.
-      sPlaceholderIconImage = [[NSImage alloc] initWithSize:NSMakeSize(kIconWidth, kIconHeight)];
-    }
-
-    if (!sPlaceholderIconImage) return NS_ERROR_FAILURE;
-
-    if (mNativeMenuItem)
-      [mNativeMenuItem setImage:sPlaceholderIconImage];
-  }
-
-  nsresult rv = loader->LoadImage(aIconURI, nullptr, nullptr,
-                                  mozilla::net::RP_Default,
-                                  nullptr, loadGroup, this,
-                                  nullptr, nullptr, nsIRequest::LOAD_NORMAL, nullptr,
-                                  nsIContentPolicy::TYPE_INTERNAL_IMAGE, EmptyString(),
-                                  getter_AddRefs(mIconRequest));
-  if (NS_FAILED(rv)) return rv;
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-//
-// imgINotificationObserver
-//
-
-NS_IMETHODIMP
-nsMenuItemIconX::Notify(imgIRequest* aRequest,
-                        int32_t aType,
-                        const nsIntRect* aData)
-{
-  if (aType == imgINotificationObserver::LOAD_COMPLETE) {
-    // Make sure the image loaded successfully.
-    uint32_t status = imgIRequest::STATUS_ERROR;
-    if (NS_FAILED(aRequest->GetImageStatus(&status)) ||
-        (status & imgIRequest::STATUS_ERROR)) {
-      mIconRequest->Cancel(NS_BINDING_ABORTED);
-      mIconRequest = nullptr;
-      return NS_ERROR_FAILURE;
-    }
-
-    nsCOMPtr<imgIContainer> image;
-    aRequest->GetImage(getter_AddRefs(image));
-    MOZ_ASSERT(image);
-
-    // Ask the image to decode at its intrinsic size.
-    int32_t width = 0, height = 0;
-    image->GetWidth(&width);
-    image->GetHeight(&height);
-    image->RequestDecodeForSize(nsIntSize(width, height), imgIContainer::FLAG_NONE);
-  }
-
-  if (aType == imgINotificationObserver::FRAME_COMPLETE) {
-    return OnFrameComplete(aRequest);
-  }
-
-  if (aType == imgINotificationObserver::DECODE_COMPLETE) {
-    if (mIconRequest && mIconRequest == aRequest) {
-      mIconRequest->Cancel(NS_BINDING_ABORTED);
-      mIconRequest = nullptr;
-    }
-  }
-
-  return NS_OK;
-}
-
-nsresult
-nsMenuItemIconX::OnFrameComplete(imgIRequest* aRequest)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  if (aRequest != mIconRequest)
-    return NS_ERROR_FAILURE;
-
-  // Only support one frame.
-  if (mLoadedIcon)
-    return NS_OK;
-
-  if (!mNativeMenuItem)
-    return NS_ERROR_FAILURE;
-
-  nsCOMPtr<imgIContainer> imageContainer;
-  aRequest->GetImage(getter_AddRefs(imageContainer));
-  if (!imageContainer) {
-    [mNativeMenuItem setImage:nil];
-    return NS_ERROR_FAILURE;
-  }
-
-  int32_t origWidth = 0, origHeight = 0;
-  imageContainer->GetWidth(&origWidth);
-  imageContainer->GetHeight(&origHeight);
-
-  // If the image region is invalid, don't draw the image to almost match
-  // the behavior of other platforms.
-  if (!mImageRegionRect.IsEmpty() &&
-      (mImageRegionRect.XMost() > origWidth ||
-       mImageRegionRect.YMost() > origHeight)) {
-    [mNativeMenuItem setImage:nil];
-    return NS_ERROR_FAILURE;
-  }
-
-  if (mImageRegionRect.IsEmpty()) {
-    mImageRegionRect.SetRect(0, 0, origWidth, origHeight);
-  }
-
-  RefPtr<SourceSurface> surface =
-    imageContainer->GetFrame(imgIContainer::FRAME_CURRENT,
-                             imgIContainer::FLAG_SYNC_DECODE);
-  if (!surface) {
-    [mNativeMenuItem setImage:nil];
-    return NS_ERROR_FAILURE;
-  }
-
-  CGImageRef origImage = NULL;
-  nsresult rv = nsCocoaUtils::CreateCGImageFromSurface(surface, &origImage);
-  if (NS_FAILED(rv) || !origImage) {
-    [mNativeMenuItem setImage:nil];
-    return NS_ERROR_FAILURE;
-  }
-
-  bool createSubImage = !(mImageRegionRect.x == 0 && mImageRegionRect.y == 0 &&
-                            mImageRegionRect.width == origWidth && mImageRegionRect.height == origHeight);
-
-  CGImageRef finalImage = origImage;
-  if (createSubImage) {
-    // if mImageRegionRect is set using CSS, we need to slice a piece out of the overall
-    // image to use as the icon
-    finalImage = ::CGImageCreateWithImageInRect(origImage,
-                                                ::CGRectMake(mImageRegionRect.x,
-                                                mImageRegionRect.y,
-                                                mImageRegionRect.width,
-                                                mImageRegionRect.height));
-    ::CGImageRelease(origImage);
-    if (!finalImage) {
-      [mNativeMenuItem setImage:nil];
-      return NS_ERROR_FAILURE;
-    }
-  }
-
-  NSImage *newImage = nil;
-  rv = nsCocoaUtils::CreateNSImageFromCGImage(finalImage, &newImage);
-  if (NS_FAILED(rv) || !newImage) {
-    [mNativeMenuItem setImage:nil];
-    ::CGImageRelease(finalImage);
-    return NS_ERROR_FAILURE;
-  }
-
-  [newImage setSize:NSMakeSize(kIconWidth, kIconHeight)];
-  [mNativeMenuItem setImage:newImage];
-
-  [newImage release];
-  ::CGImageRelease(finalImage);
-
-  mLoadedIcon = true;
-  mSetIcon = true;
-
-  if (mMenuObject) {
-    mMenuObject->IconUpdated();
-  }
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
diff --git a/widget/cocoa/nsMenuItemX.h b/widget/cocoa/nsMenuItemX.h
deleted file mode 100644
index 67ae32c99c..0000000000
--- a/widget/cocoa/nsMenuItemX.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsMenuItemX_h_
-#define nsMenuItemX_h_
-
-#include "mozilla/RefPtr.h"
-#include "nsMenuBaseX.h"
-#include "nsMenuGroupOwnerX.h"
-#include "nsChangeObserver.h"
-
-#import <Cocoa/Cocoa.h>
-
-class nsString;
-class nsMenuItemIconX;
-class nsMenuX;
-
-enum {
-  knsMenuItemNoModifier      = 0,
-  knsMenuItemShiftModifier   = (1 << 0),
-  knsMenuItemAltModifier     = (1 << 1),
-  knsMenuItemControlModifier = (1 << 2),
-  knsMenuItemCommandModifier = (1 << 3)
-};
-
-enum EMenuItemType {
-  eRegularMenuItemType = 0,
-  eCheckboxMenuItemType,
-  eRadioMenuItemType,
-  eSeparatorMenuItemType
-};
-
-
-// Once instantiated, this object lives until its DOM node or its parent window is destroyed.
-// Do not hold references to this, they can become invalid any time the DOM node can be destroyed.
-class nsMenuItemX : public nsMenuObjectX,
-                    public nsChangeObserver
-{
-public:
-  nsMenuItemX();
-  virtual ~nsMenuItemX();
-
-  NS_DECL_CHANGEOBSERVER
-
-  // nsMenuObjectX
-  void*             NativeData() override {return (void*)mNativeMenuItem;}
-  nsMenuObjectTypeX MenuObjectType() override {return eMenuItemObjectType;}
-
-  // nsMenuItemX
-  nsresult      Create(nsMenuX* aParent, const nsString& aLabel, EMenuItemType aItemType,
-                       nsMenuGroupOwnerX* aMenuGroupOwner, nsIContent* aNode);
-  nsresult      SetChecked(bool aIsChecked);
-  EMenuItemType GetMenuItemType();
-  void          DoCommand();
-  nsresult      DispatchDOMEvent(const nsString &eventName, bool* preventDefaultCalled);
-  void          SetupIcon();
-
-protected:
-  void UncheckRadioSiblings(nsIContent* inCheckedElement);
-  void SetKeyEquiv();
-
-  EMenuItemType             mType;
-  // nsMenuItemX objects should always have a valid native menu item.
-  NSMenuItem*               mNativeMenuItem;      // [strong]
-  nsMenuX*                  mMenuParent;          // [weak]
-  nsMenuGroupOwnerX*        mMenuGroupOwner;      // [weak]
-  nsCOMPtr<nsIContent>      mCommandContent;
-  // The icon object should never outlive its creating nsMenuItemX object.
-  RefPtr<nsMenuItemIconX> mIcon;
-  bool                      mIsChecked;
-};
-
-#endif // nsMenuItemX_h_
diff --git a/widget/cocoa/nsMenuItemX.mm b/widget/cocoa/nsMenuItemX.mm
deleted file mode 100644
index 114b69f430..0000000000
--- a/widget/cocoa/nsMenuItemX.mm
+++ /dev/null
@@ -1,369 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "nsMenuItemX.h"
-#include "nsMenuBarX.h"
-#include "nsMenuX.h"
-#include "nsMenuItemIconX.h"
-#include "nsMenuUtilsX.h"
-#include "nsCocoaUtils.h"
-
-#include "nsObjCExceptions.h"
-
-#include "nsCOMPtr.h"
-#include "nsGkAtoms.h"
-
-#include "mozilla/dom/Element.h"
-#include "nsIWidget.h"
-#include "nsIDocument.h"
-#include "nsIDOMDocument.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMEvent.h"
-
-nsMenuItemX::nsMenuItemX()
-{
-  mType           = eRegularMenuItemType;
-  mNativeMenuItem = nil;
-  mMenuParent     = nullptr;
-  mMenuGroupOwner = nullptr;
-  mIsChecked      = false;
-
-  MOZ_COUNT_CTOR(nsMenuItemX);
-}
-
-nsMenuItemX::~nsMenuItemX()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  // Prevent the icon object from outliving us.
-  if (mIcon)
-    mIcon->Destroy();
-
-  // autorelease the native menu item so that anything else happening to this
-  // object happens before the native menu item actually dies
-  [mNativeMenuItem autorelease];
-
-  if (mContent)
-    mMenuGroupOwner->UnregisterForContentChanges(mContent);
-  if (mCommandContent)
-    mMenuGroupOwner->UnregisterForContentChanges(mCommandContent);
-
-  MOZ_COUNT_DTOR(nsMenuItemX);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-nsresult nsMenuItemX::Create(nsMenuX* aParent, const nsString& aLabel, EMenuItemType aItemType,
-                             nsMenuGroupOwnerX* aMenuGroupOwner, nsIContent* aNode)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  mType = aItemType;
-  mMenuParent = aParent;
-  mContent = aNode;
-
-  mMenuGroupOwner = aMenuGroupOwner;
-  NS_ASSERTION(mMenuGroupOwner, "No menu owner given, must have one!");
-
-  mMenuGroupOwner->RegisterForContentChanges(mContent, this);
-
-  nsIDocument *doc = mContent->GetUncomposedDoc();
-
-  // if we have a command associated with this menu item, register for changes
-  // to the command DOM node
-  if (doc) {
-    nsAutoString ourCommand;
-    mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::command, ourCommand);
-
-    if (!ourCommand.IsEmpty()) {
-      nsIContent *commandElement = doc->GetElementById(ourCommand);
-
-      if (commandElement) {
-        mCommandContent = commandElement;
-        // register to observe the command DOM element
-        mMenuGroupOwner->RegisterForContentChanges(mCommandContent, this);
-      }
-    }
-  }
-
-  // decide enabled state based on command content if it exists, otherwise do it based
-  // on our own content
-  bool isEnabled;
-  if (mCommandContent)
-    isEnabled = !mCommandContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::disabled, nsGkAtoms::_true, eCaseMatters);
-  else
-    isEnabled = !mContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::disabled, nsGkAtoms::_true, eCaseMatters);
-
-  // set up the native menu item
-  if (mType == eSeparatorMenuItemType) {
-    mNativeMenuItem = [[NSMenuItem separatorItem] retain];
-  }
-  else {
-    NSString *newCocoaLabelString = nsMenuUtilsX::GetTruncatedCocoaLabel(aLabel);
-    mNativeMenuItem = [[NSMenuItem alloc] initWithTitle:newCocoaLabelString action:nil keyEquivalent:@""];
-
-    [mNativeMenuItem setEnabled:(BOOL)isEnabled];
-
-    SetChecked(mContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::checked,
-                                     nsGkAtoms::_true, eCaseMatters));
-    SetKeyEquiv();
-  }
-
-  mIcon = new nsMenuItemIconX(this, mContent, mNativeMenuItem);
-  if (!mIcon)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-nsresult nsMenuItemX::SetChecked(bool aIsChecked)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  mIsChecked = aIsChecked;
-
-  // update the content model. This will also handle unchecking our siblings
-  // if we are a radiomenu
-  mContent->SetAttr(kNameSpaceID_None, nsGkAtoms::checked,
-                    mIsChecked ? NS_LITERAL_STRING("true") : NS_LITERAL_STRING("false"), true);
-
-  // update native menu item
-  if (mIsChecked)
-    [mNativeMenuItem setState:NSOnState];
-  else
-    [mNativeMenuItem setState:NSOffState];
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-EMenuItemType nsMenuItemX::GetMenuItemType()
-{
-  return mType;
-}
-
-// Executes the "cached" javaScript command.
-// Returns NS_OK if the command was executed properly, otherwise an error code.
-void nsMenuItemX::DoCommand()
-{
-  // flip "checked" state if we're a checkbox menu, or an un-checked radio menu
-  if (mType == eCheckboxMenuItemType ||
-      (mType == eRadioMenuItemType && !mIsChecked)) {
-    if (!mContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::autocheck,
-                               nsGkAtoms::_false, eCaseMatters))
-    SetChecked(!mIsChecked);
-    /* the AttributeChanged code will update all the internal state */
-  }
-
-  nsMenuUtilsX::DispatchCommandTo(mContent);
-}
-
-nsresult nsMenuItemX::DispatchDOMEvent(const nsString &eventName, bool *preventDefaultCalled)
-{
-  if (!mContent)
-    return NS_ERROR_FAILURE;
-
-  // get owner document for content
-  nsCOMPtr<nsIDocument> parentDoc = mContent->OwnerDoc();
-
-  // get interface for creating DOM events from content owner document
-  nsCOMPtr<nsIDOMDocument> domDoc = do_QueryInterface(parentDoc);
-  if (!domDoc) {
-    NS_WARNING("Failed to QI parent nsIDocument to nsIDOMDocument");
-    return NS_ERROR_FAILURE;
-  }
-
-  // create DOM event
-  nsCOMPtr<nsIDOMEvent> event;
-  nsresult rv = domDoc->CreateEvent(NS_LITERAL_STRING("Events"), getter_AddRefs(event));
-  if (NS_FAILED(rv)) {
-    NS_WARNING("Failed to create nsIDOMEvent");
-    return rv;
-  }
-  event->InitEvent(eventName, true, true);
-
-  // mark DOM event as trusted
-  event->SetTrusted(true);
-
-  // send DOM event
-  rv = mContent->DispatchEvent(event, preventDefaultCalled);
-  if (NS_FAILED(rv)) {
-    NS_WARNING("Failed to send DOM event via EventTarget");
-    return rv;
-  }
-
-  return NS_OK;
-}
-
-// Walk the sibling list looking for nodes with the same name and
-// uncheck them all.
-void nsMenuItemX::UncheckRadioSiblings(nsIContent* inCheckedContent)
-{
-  nsAutoString myGroupName;
-  inCheckedContent->GetAttr(kNameSpaceID_None, nsGkAtoms::name, myGroupName);
-  if (!myGroupName.Length()) // no groupname, nothing to do
-    return;
-
-  nsCOMPtr<nsIContent> parent = inCheckedContent->GetParent();
-  if (!parent)
-    return;
-
-  // loop over siblings
-  uint32_t count = parent->GetChildCount();
-  for (uint32_t i = 0; i < count; i++) {
-    nsIContent *sibling = parent->GetChildAt(i);
-    if (sibling) {
-      if (sibling != inCheckedContent) { // skip this node
-        // if the current sibling is in the same group, clear it
-        if (sibling->AttrValueIs(kNameSpaceID_None, nsGkAtoms::name,
-                                 myGroupName, eCaseMatters))
-          sibling->SetAttr(kNameSpaceID_None, nsGkAtoms::checked, NS_LITERAL_STRING("false"), true);
-      }
-    }
-  }
-}
-
-void nsMenuItemX::SetKeyEquiv()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  // Set key shortcut and modifiers
-  nsAutoString keyValue;
-  mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::key, keyValue);
-  if (!keyValue.IsEmpty() && mContent->GetUncomposedDoc()) {
-    nsIContent *keyContent = mContent->GetUncomposedDoc()->GetElementById(keyValue);
-    if (keyContent) {
-      nsAutoString keyChar;
-      bool hasKey = keyContent->GetAttr(kNameSpaceID_None, nsGkAtoms::key, keyChar);
-
-      if (!hasKey || keyChar.IsEmpty()) {
-        nsAutoString keyCodeName;
-        keyContent->GetAttr(kNameSpaceID_None, nsGkAtoms::keycode, keyCodeName);
-        uint32_t charCode =
-          nsCocoaUtils::ConvertGeckoNameToMacCharCode(keyCodeName);
-        if (charCode) {
-          keyChar.Assign(charCode);
-        }
-        else {
-          keyChar.Assign(NS_LITERAL_STRING(" "));
-        }
-      }
-
-      nsAutoString modifiersStr;
-      keyContent->GetAttr(kNameSpaceID_None, nsGkAtoms::modifiers, modifiersStr);
-      uint8_t modifiers = nsMenuUtilsX::GeckoModifiersForNodeAttribute(modifiersStr);
-
-      unsigned int macModifiers = nsMenuUtilsX::MacModifiersForGeckoModifiers(modifiers);
-      [mNativeMenuItem setKeyEquivalentModifierMask:macModifiers];
-
-      NSString *keyEquivalent = [[NSString stringWithCharacters:(unichar*)keyChar.get()
-                                                         length:keyChar.Length()] lowercaseString];
-      if ([keyEquivalent isEqualToString:@" "])
-        [mNativeMenuItem setKeyEquivalent:@""];
-      else
-        [mNativeMenuItem setKeyEquivalent:keyEquivalent];
-
-      return;
-    }
-  }
-
-  // if the key was removed, clear the key
-  [mNativeMenuItem setKeyEquivalent:@""];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-//
-// nsChangeObserver
-//
-
-void
-nsMenuItemX::ObserveAttributeChanged(nsIDocument *aDocument, nsIContent *aContent, nsIAtom *aAttribute)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!aContent)
-    return;
-
-  if (aContent == mContent) { // our own content node changed
-    if (aAttribute == nsGkAtoms::checked) {
-      // if we're a radio menu, uncheck our sibling radio items. No need to
-      // do any of this if we're just a normal check menu.
-      if (mType == eRadioMenuItemType) {
-        if (mContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::checked,
-                                  nsGkAtoms::_true, eCaseMatters))
-          UncheckRadioSiblings(mContent);
-      }
-      mMenuParent->SetRebuild(true);
-    }
-    else if (aAttribute == nsGkAtoms::hidden ||
-             aAttribute == nsGkAtoms::collapsed ||
-             aAttribute == nsGkAtoms::label) {
-      mMenuParent->SetRebuild(true);
-    }
-    else if (aAttribute == nsGkAtoms::key) {
-      SetKeyEquiv();
-    }
-    else if (aAttribute == nsGkAtoms::image) {
-      SetupIcon();
-    }
-    else if (aAttribute == nsGkAtoms::disabled) {
-      if (aContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::disabled, nsGkAtoms::_true, eCaseMatters))
-        [mNativeMenuItem setEnabled:NO];
-      else
-        [mNativeMenuItem setEnabled:YES];
-    }
-  }
-  else if (aContent == mCommandContent) {
-    // the only thing that really matters when the menu isn't showing is the
-    // enabled state since it enables/disables keyboard commands
-    if (aAttribute == nsGkAtoms::disabled) {
-      // first we sync our menu item DOM node with the command DOM node
-      nsAutoString commandDisabled;
-      nsAutoString menuDisabled;
-      aContent->GetAttr(kNameSpaceID_None, nsGkAtoms::disabled, commandDisabled);
-      mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::disabled, menuDisabled);
-      if (!commandDisabled.Equals(menuDisabled)) {
-        // The menu's disabled state needs to be updated to match the command.
-        if (commandDisabled.IsEmpty())
-          mContent->UnsetAttr(kNameSpaceID_None, nsGkAtoms::disabled, true);
-        else
-          mContent->SetAttr(kNameSpaceID_None, nsGkAtoms::disabled, commandDisabled, true);
-      }
-      // now we sync our native menu item with the command DOM node
-      if (aContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::disabled, nsGkAtoms::_true, eCaseMatters))
-        [mNativeMenuItem setEnabled:NO];
-      else
-        [mNativeMenuItem setEnabled:YES];
-    }
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void nsMenuItemX::ObserveContentRemoved(nsIDocument *aDocument, nsIContent *aChild, int32_t aIndexInContainer)
-{
-  if (aChild == mCommandContent) {
-    mMenuGroupOwner->UnregisterForContentChanges(mCommandContent);
-    mCommandContent = nullptr;
-  }
-
-  mMenuParent->SetRebuild(true);
-}
-
-void nsMenuItemX::ObserveContentInserted(nsIDocument *aDocument, nsIContent* aContainer,
-                                         nsIContent *aChild)
-{
-  mMenuParent->SetRebuild(true);
-}
-
-void nsMenuItemX::SetupIcon()
-{
-  if (mIcon)
-    mIcon->SetupIcon();
-}
diff --git a/widget/cocoa/nsMenuUtilsX.h b/widget/cocoa/nsMenuUtilsX.h
deleted file mode 100644
index 1571cdfb0a..0000000000
--- a/widget/cocoa/nsMenuUtilsX.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsMenuUtilsX_h_
-#define nsMenuUtilsX_h_
-
-#include "nscore.h"
-#include "nsMenuBaseX.h"
-
-#import <Cocoa/Cocoa.h>
-
-class nsIContent;
-class nsString;
-class nsMenuBarX;
-
-// Namespace containing utility functions used in our native menu implementation.
-namespace nsMenuUtilsX
-{
-  void          DispatchCommandTo(nsIContent* aTargetContent);
-  NSString*     GetTruncatedCocoaLabel(const nsString& itemLabel);
-  uint8_t       GeckoModifiersForNodeAttribute(const nsString& modifiersAttribute);
-  unsigned int  MacModifiersForGeckoModifiers(uint8_t geckoModifiers);
-  nsMenuBarX*   GetHiddenWindowMenuBar(); // returned object is not retained
-  NSMenuItem*   GetStandardEditMenuItem(); // returned object is not retained
-  bool          NodeIsHiddenOrCollapsed(nsIContent* inContent);
-  int           CalculateNativeInsertionPoint(nsMenuObjectX* aParent, nsMenuObjectX* aChild);
-} // namespace nsMenuUtilsX
-
-#endif // nsMenuUtilsX_h_
diff --git a/widget/cocoa/nsMenuUtilsX.mm b/widget/cocoa/nsMenuUtilsX.mm
deleted file mode 100644
index db64717127..0000000000
--- a/widget/cocoa/nsMenuUtilsX.mm
+++ /dev/null
@@ -1,223 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "mozilla/dom/Event.h"
-#include "nsMenuUtilsX.h"
-#include "nsMenuBarX.h"
-#include "nsMenuX.h"
-#include "nsMenuItemX.h"
-#include "nsStandaloneNativeMenu.h"
-#include "nsObjCExceptions.h"
-#include "nsCocoaUtils.h"
-#include "nsCocoaWindow.h"
-#include "nsGkAtoms.h"
-#include "nsIDocument.h"
-#include "nsIDOMDocument.h"
-#include "nsIDOMXULCommandEvent.h"
-#include "nsPIDOMWindow.h"
-#include "nsQueryObject.h"
-
-using namespace mozilla;
-
-void nsMenuUtilsX::DispatchCommandTo(nsIContent* aTargetContent)
-{
-  NS_PRECONDITION(aTargetContent, "null ptr");
-
-  nsIDocument* doc = aTargetContent->OwnerDoc();
-  if (doc) {
-    ErrorResult rv;
-    RefPtr<dom::Event> event =
-      doc->CreateEvent(NS_LITERAL_STRING("xulcommandevent"), rv);
-    nsCOMPtr<nsIDOMXULCommandEvent> command = do_QueryObject(event);
-
-    // FIXME: Should probably figure out how to init this with the actual
-    // pressed keys, but this is a big old edge case anyway. -dwh
-    if (command &&
-        NS_SUCCEEDED(command->InitCommandEvent(NS_LITERAL_STRING("command"),
-                                               true, true,
-                                               doc->GetInnerWindow(), 0,
-                                               false, false, false,
-                                               false, nullptr))) {
-      event->SetTrusted(true);
-      bool dummy;
-      aTargetContent->DispatchEvent(event, &dummy);
-    }
-  }
-}
-
-NSString* nsMenuUtilsX::GetTruncatedCocoaLabel(const nsString& itemLabel)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  // We want to truncate long strings to some reasonable pixel length but there is no
-  // good API for doing that which works for all OS versions and architectures. For now
-  // we'll do nothing for consistency and depend on good user interface design to limit
-  // string lengths.
-  return [NSString stringWithCharacters:reinterpret_cast<const unichar*>(itemLabel.get())
-                                 length:itemLabel.Length()];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-uint8_t nsMenuUtilsX::GeckoModifiersForNodeAttribute(const nsString& modifiersAttribute)
-{
-  uint8_t modifiers = knsMenuItemNoModifier;
-  char* str = ToNewCString(modifiersAttribute);
-  char* newStr;
-  char* token = strtok_r(str, ", \t", &newStr);
-  while (token != NULL) {
-    if (strcmp(token, "shift") == 0)
-      modifiers |= knsMenuItemShiftModifier;
-    else if (strcmp(token, "alt") == 0) 
-      modifiers |= knsMenuItemAltModifier;
-    else if (strcmp(token, "control") == 0) 
-      modifiers |= knsMenuItemControlModifier;
-    else if ((strcmp(token, "accel") == 0) ||
-             (strcmp(token, "meta") == 0)) {
-      modifiers |= knsMenuItemCommandModifier;
-    }
-    token = strtok_r(newStr, ", \t", &newStr);
-  }
-  free(str);
-
-  return modifiers;
-}
-
-unsigned int nsMenuUtilsX::MacModifiersForGeckoModifiers(uint8_t geckoModifiers)
-{
-  unsigned int macModifiers = 0;
-  
-  if (geckoModifiers & knsMenuItemShiftModifier)
-    macModifiers |= NSShiftKeyMask;
-  if (geckoModifiers & knsMenuItemAltModifier)
-    macModifiers |= NSAlternateKeyMask;
-  if (geckoModifiers & knsMenuItemControlModifier)
-    macModifiers |= NSControlKeyMask;
-  if (geckoModifiers & knsMenuItemCommandModifier)
-    macModifiers |= NSCommandKeyMask;
-
-  return macModifiers;
-}
-
-nsMenuBarX* nsMenuUtilsX::GetHiddenWindowMenuBar()
-{
-  nsIWidget* hiddenWindowWidgetNoCOMPtr = nsCocoaUtils::GetHiddenWindowWidget();
-  if (hiddenWindowWidgetNoCOMPtr)
-    return static_cast<nsCocoaWindow*>(hiddenWindowWidgetNoCOMPtr)->GetMenuBar();
-  else
-    return nullptr;
-}
-
-// It would be nice if we could localize these edit menu names.
-NSMenuItem* nsMenuUtilsX::GetStandardEditMenuItem()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  // In principle we should be able to allocate this once and then always
-  // return the same object.  But weird interactions happen between native
-  // app-modal dialogs and Gecko-modal dialogs that open above them.  So what
-  // we return here isn't always released before it needs to be added to
-  // another menu.  See bmo bug 468393.
-  NSMenuItem* standardEditMenuItem =
-    [[[NSMenuItem alloc] initWithTitle:@"Edit" action:nil keyEquivalent:@""] autorelease];
-  NSMenu* standardEditMenu = [[NSMenu alloc] initWithTitle:@"Edit"];
-  [standardEditMenuItem setSubmenu:standardEditMenu];
-  [standardEditMenu release];
-
-  // Add Undo
-  NSMenuItem* undoItem = [[NSMenuItem alloc] initWithTitle:@"Undo" action:@selector(undo:) keyEquivalent:@"z"];
-  [standardEditMenu addItem:undoItem];
-  [undoItem release];
-
-  // Add Redo
-  NSMenuItem* redoItem = [[NSMenuItem alloc] initWithTitle:@"Redo" action:@selector(redo:) keyEquivalent:@"Z"];
-  [standardEditMenu addItem:redoItem];
-  [redoItem release];
-
-  // Add separator
-  [standardEditMenu addItem:[NSMenuItem separatorItem]];
-
-  // Add Cut
-  NSMenuItem* cutItem = [[NSMenuItem alloc] initWithTitle:@"Cut" action:@selector(cut:) keyEquivalent:@"x"];
-  [standardEditMenu addItem:cutItem];
-  [cutItem release];
-
-  // Add Copy
-  NSMenuItem* copyItem = [[NSMenuItem alloc] initWithTitle:@"Copy" action:@selector(copy:) keyEquivalent:@"c"];
-  [standardEditMenu addItem:copyItem];
-  [copyItem release];
-
-  // Add Paste
-  NSMenuItem* pasteItem = [[NSMenuItem alloc] initWithTitle:@"Paste" action:@selector(paste:) keyEquivalent:@"v"];
-  [standardEditMenu addItem:pasteItem];
-  [pasteItem release];
-
-  // Add Delete
-  NSMenuItem* deleteItem = [[NSMenuItem alloc] initWithTitle:@"Delete" action:@selector(delete:) keyEquivalent:@""];
-  [standardEditMenu addItem:deleteItem];
-  [deleteItem release];
-
-  // Add Select All
-  NSMenuItem* selectAllItem = [[NSMenuItem alloc] initWithTitle:@"Select All" action:@selector(selectAll:) keyEquivalent:@"a"];
-  [standardEditMenu addItem:selectAllItem];
-  [selectAllItem release];
-
-  return standardEditMenuItem;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-bool nsMenuUtilsX::NodeIsHiddenOrCollapsed(nsIContent* inContent)
-{
-  return (inContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::hidden,
-                                 nsGkAtoms::_true, eCaseMatters) ||
-          inContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::collapsed,
-                                 nsGkAtoms::_true, eCaseMatters));
-}
-
-// Determines how many items are visible among the siblings in a menu that are
-// before the given child. This will not count the application menu.
-int nsMenuUtilsX::CalculateNativeInsertionPoint(nsMenuObjectX* aParent,
-                                                nsMenuObjectX* aChild)
-{
-  int insertionPoint = 0;
-  nsMenuObjectTypeX parentType = aParent->MenuObjectType();
-  if (parentType == eMenuBarObjectType) {
-    nsMenuBarX* menubarParent = static_cast<nsMenuBarX*>(aParent);
-    uint32_t numMenus = menubarParent->GetMenuCount();
-    for (uint32_t i = 0; i < numMenus; i++) {
-      nsMenuX* currMenu = menubarParent->GetMenuAt(i);
-      if (currMenu == aChild)
-        return insertionPoint; // we found ourselves, break out
-      if (currMenu && [currMenu->NativeMenuItem() menu])
-        insertionPoint++;
-    }
-  }
-  else if (parentType == eSubmenuObjectType ||
-           parentType == eStandaloneNativeMenuObjectType) {
-    nsMenuX* menuParent;
-    if (parentType == eSubmenuObjectType)
-      menuParent = static_cast<nsMenuX*>(aParent);
-    else
-      menuParent = static_cast<nsStandaloneNativeMenu*>(aParent)->GetMenuXObject();
-
-    uint32_t numItems = menuParent->GetItemCount();
-    for (uint32_t i = 0; i < numItems; i++) {
-      // Using GetItemAt instead of GetVisibleItemAt to avoid O(N^2)
-      nsMenuObjectX* currItem = menuParent->GetItemAt(i);
-      if (currItem == aChild)
-        return insertionPoint; // we found ourselves, break out
-      NSMenuItem* nativeItem = nil;
-      nsMenuObjectTypeX currItemType = currItem->MenuObjectType();
-      if (currItemType == eSubmenuObjectType)
-        nativeItem = static_cast<nsMenuX*>(currItem)->NativeMenuItem();
-      else
-        nativeItem = (NSMenuItem*)(currItem->NativeData());
-      if ([nativeItem menu])
-        insertionPoint++;
-    }
-  }
-  return insertionPoint;
-}
diff --git a/widget/cocoa/nsMenuX.h b/widget/cocoa/nsMenuX.h
deleted file mode 100644
index 7b5146a0b8..0000000000
--- a/widget/cocoa/nsMenuX.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsMenuX_h_
-#define nsMenuX_h_
-
-#import <Cocoa/Cocoa.h>
-
-#include "mozilla/RefPtr.h"
-#include "mozilla/UniquePtr.h"
-#include "nsMenuBaseX.h"
-#include "nsMenuBarX.h"
-#include "nsMenuGroupOwnerX.h"
-#include "nsCOMPtr.h"
-#include "nsChangeObserver.h"
-
-class nsMenuX;
-class nsMenuItemIconX;
-class nsMenuItemX;
-class nsIWidget;
-
-// MenuDelegate is used to receive Cocoa notifications for setting
-// up carbon events. Protocol is defined as of 10.6 SDK.
-@interface MenuDelegate : NSObject < NSMenuDelegate >
-{
-  nsMenuX* mGeckoMenu; // weak ref
-}
-- (id)initWithGeckoMenu:(nsMenuX*)geckoMenu;
-@end
-
-// Once instantiated, this object lives until its DOM node or its parent window is destroyed.
-// Do not hold references to this, they can become invalid any time the DOM node can be destroyed.
-class nsMenuX : public nsMenuObjectX,
-                public nsChangeObserver
-{
-public:
-  nsMenuX();
-  virtual ~nsMenuX();
-
-  // If > 0, the OS is indexing all the app's menus (triggered by opening
-  // Help menu on Leopard and higher).  There are some things that are
-  // unsafe to do while this is happening.
-  static int32_t sIndexingMenuLevel;
-
-  NS_DECL_CHANGEOBSERVER
-
-  // nsMenuObjectX
-  void*             NativeData() override {return (void*)mNativeMenu;}
-  nsMenuObjectTypeX MenuObjectType() override {return eSubmenuObjectType;}
-  void              IconUpdated() override { mParent->IconUpdated(); }
-
-  // nsMenuX
-  nsresult       Create(nsMenuObjectX* aParent, nsMenuGroupOwnerX* aMenuGroupOwner, nsIContent* aNode);
-  uint32_t       GetItemCount();
-  nsMenuObjectX* GetItemAt(uint32_t aPos);
-  nsresult       GetVisibleItemCount(uint32_t &aCount);
-  nsMenuObjectX* GetVisibleItemAt(uint32_t aPos);
-  nsEventStatus  MenuOpened();
-  void           MenuClosed();
-  void           SetRebuild(bool aMenuEvent);
-  NSMenuItem*    NativeMenuItem();
-  nsresult       SetupIcon();
-
-  static bool    IsXULHelpMenu(nsIContent* aMenuContent);
-
-protected:
-  void           MenuConstruct();
-  nsresult       RemoveAll();
-  nsresult       SetEnabled(bool aIsEnabled);
-  nsresult       GetEnabled(bool* aIsEnabled);
-  void           GetMenuPopupContent(nsIContent** aResult);
-  bool           OnOpen();
-  bool           OnClose();
-  nsresult       AddMenuItem(nsMenuItemX* aMenuItem);
-  nsMenuX*       AddMenu(mozilla::UniquePtr<nsMenuX> aMenu);
-  void           LoadMenuItem(nsIContent* inMenuItemContent);
-  void           LoadSubMenu(nsIContent* inMenuContent);
-  GeckoNSMenu*   CreateMenuWithGeckoString(nsString& menuTitle);
-
-  nsTArray<mozilla::UniquePtr<nsMenuObjectX>> mMenuObjectsArray;
-  nsString                  mLabel;
-  uint32_t                  mVisibleItemsCount; // cache
-  nsMenuObjectX*            mParent; // [weak]
-  nsMenuGroupOwnerX*        mMenuGroupOwner; // [weak]
-  // The icon object should never outlive its creating nsMenuX object.
-  RefPtr<nsMenuItemIconX> mIcon;
-  GeckoNSMenu*              mNativeMenu; // [strong]
-  MenuDelegate*             mMenuDelegate; // [strong]
-  // nsMenuX objects should always have a valid native menu item.
-  NSMenuItem*               mNativeMenuItem; // [strong]
-  bool                      mIsEnabled;
-  bool                      mDestroyHandlerCalled;
-  bool                      mNeedsRebuild;
-  bool                      mConstructed;
-  bool                      mVisible;
-  bool                      mXBLAttached;
-};
-
-#endif // nsMenuX_h_
diff --git a/widget/cocoa/nsMenuX.mm b/widget/cocoa/nsMenuX.mm
deleted file mode 100644
index 757221eac6..0000000000
--- a/widget/cocoa/nsMenuX.mm
+++ /dev/null
@@ -1,1051 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include <dlfcn.h>
-
-#include "nsMenuX.h"
-#include "nsMenuItemX.h"
-#include "nsMenuUtilsX.h"
-#include "nsMenuItemIconX.h"
-#include "nsStandaloneNativeMenu.h"
-
-#include "nsObjCExceptions.h"
-
-#include "nsToolkit.h"
-#include "nsCocoaUtils.h"
-#include "nsCOMPtr.h"
-#include "prinrval.h"
-#include "nsString.h"
-#include "nsReadableUtils.h"
-#include "nsUnicharUtils.h"
-#include "plstr.h"
-#include "nsGkAtoms.h"
-#include "nsCRT.h"
-#include "nsBaseWidget.h"
-
-#include "nsIDocument.h"
-#include "nsIContent.h"
-#include "nsIDOMDocument.h"
-#include "nsIDocumentObserver.h"
-#include "nsIComponentManager.h"
-#include "nsIRollupListener.h"
-#include "nsIDOMElement.h"
-#include "nsBindingManager.h"
-#include "nsIServiceManager.h"
-#include "nsXULPopupManager.h"
-#include "mozilla/dom/ScriptSettings.h"
-
-#include "jsapi.h"
-#include "nsIScriptGlobalObject.h"
-#include "nsIScriptContext.h"
-#include "nsIXPConnect.h"
-
-#include "mozilla/MouseEvents.h"
-
-using namespace mozilla;
-
-static bool gConstructingMenu = false;
-static bool gMenuMethodsSwizzled = false;
-
-int32_t nsMenuX::sIndexingMenuLevel = 0;
-
-
-//
-// Objective-C class used for representedObject
-//
-
-@implementation MenuItemInfo
-
-- (id) initWithMenuGroupOwner:(nsMenuGroupOwnerX *)aMenuGroupOwner
-{
-  if ((self = [super init]) != nil) {
-    [self setMenuGroupOwner:aMenuGroupOwner];
-  }
-  return self;
-}
-
-- (void) dealloc
-{
-  [self setMenuGroupOwner:nullptr];
-  [super dealloc];
-}
-
-- (nsMenuGroupOwnerX *) menuGroupOwner
-{
-  return mMenuGroupOwner;
-}
-
-- (void) setMenuGroupOwner:(nsMenuGroupOwnerX *)aMenuGroupOwner
-{
-  // weak reference as the nsMenuGroupOwnerX owns all of its sub-objects
-  mMenuGroupOwner = aMenuGroupOwner;
-  if (aMenuGroupOwner) {
-    aMenuGroupOwner->AddMenuItemInfoToSet(self);
-  }
-}
-
-@end
-
-
-//
-// nsMenuX
-//
-
-nsMenuX::nsMenuX()
-: mVisibleItemsCount(0), mParent(nullptr), mMenuGroupOwner(nullptr),
-  mNativeMenu(nil), mNativeMenuItem(nil), mIsEnabled(true),
-  mDestroyHandlerCalled(false), mNeedsRebuild(true),
-  mConstructed(false), mVisible(true), mXBLAttached(false)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!gMenuMethodsSwizzled) {
-    nsToolkit::SwizzleMethods([NSMenu class], @selector(_addItem:toTable:),
-                              @selector(nsMenuX_NSMenu_addItem:toTable:), true);
-    nsToolkit::SwizzleMethods([NSMenu class], @selector(_removeItem:fromTable:),
-                              @selector(nsMenuX_NSMenu_removeItem:fromTable:), true);
-    // On SnowLeopard the Shortcut framework (which contains the
-    // SCTGRLIndex class) is loaded on demand, whenever the user first opens
-    // a menu (which normally hasn't happened yet).  So we need to load it
-    // here explicitly.
-    dlopen("/System/Library/PrivateFrameworks/Shortcut.framework/Shortcut", RTLD_LAZY);
-    Class SCTGRLIndexClass = ::NSClassFromString(@"SCTGRLIndex");
-    nsToolkit::SwizzleMethods(SCTGRLIndexClass, @selector(indexMenuBarDynamically),
-                              @selector(nsMenuX_SCTGRLIndex_indexMenuBarDynamically));
-
-    gMenuMethodsSwizzled = true;
-  }
-
-  mMenuDelegate = [[MenuDelegate alloc] initWithGeckoMenu:this];
-
-  if (!nsMenuBarX::sNativeEventTarget)
-    nsMenuBarX::sNativeEventTarget = [[NativeMenuItemTarget alloc] init];
-
-  MOZ_COUNT_CTOR(nsMenuX);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-nsMenuX::~nsMenuX()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  // Prevent the icon object from outliving us.
-  if (mIcon)
-    mIcon->Destroy();
-
-  RemoveAll();
-
-  [mNativeMenu setDelegate:nil];
-  [mNativeMenu release];
-  [mMenuDelegate release];
-  // autorelease the native menu item so that anything else happening to this
-  // object happens before the native menu item actually dies
-  [mNativeMenuItem autorelease];
-
-  // alert the change notifier we don't care no more
-  if (mContent)
-    mMenuGroupOwner->UnregisterForContentChanges(mContent);
-
-  MOZ_COUNT_DTOR(nsMenuX);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-nsresult nsMenuX::Create(nsMenuObjectX* aParent, nsMenuGroupOwnerX* aMenuGroupOwner, nsIContent* aNode)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  mContent = aNode;
-  mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::label, mLabel);
-  mNativeMenu = CreateMenuWithGeckoString(mLabel);
-
-  // register this menu to be notified when changes are made to our content object
-  mMenuGroupOwner = aMenuGroupOwner; // weak ref
-  NS_ASSERTION(mMenuGroupOwner, "No menu owner given, must have one");
-  mMenuGroupOwner->RegisterForContentChanges(mContent, this);
-
-  mParent = aParent;
-  // our parent could be either a menu bar (if we're toplevel) or a menu (if we're a submenu)
-
-#ifdef DEBUG
-  nsMenuObjectTypeX parentType =
-#endif
-    mParent->MenuObjectType();
-  NS_ASSERTION((parentType == eMenuBarObjectType || parentType == eSubmenuObjectType || parentType == eStandaloneNativeMenuObjectType),
-               "Menu parent not a menu bar, menu, or native menu!");
-
-  if (nsMenuUtilsX::NodeIsHiddenOrCollapsed(mContent))
-    mVisible = false;
-  if (mContent->GetChildCount() == 0)
-    mVisible = false;
-
-  NSString *newCocoaLabelString = nsMenuUtilsX::GetTruncatedCocoaLabel(mLabel);
-  mNativeMenuItem = [[NSMenuItem alloc] initWithTitle:newCocoaLabelString action:nil keyEquivalent:@""];
-  [mNativeMenuItem setSubmenu:mNativeMenu];
-
-  SetEnabled(!mContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::disabled,
-                                    nsGkAtoms::_true, eCaseMatters));
-
-  // We call MenuConstruct here because keyboard commands are dependent upon
-  // native menu items being created. If we only call MenuConstruct when a menu
-  // is actually selected, then we can't access keyboard commands until the
-  // menu gets selected, which is bad.
-  MenuConstruct();
-
-  mIcon = new nsMenuItemIconX(this, mContent, mNativeMenuItem);
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-nsresult nsMenuX::AddMenuItem(nsMenuItemX* aMenuItem)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  if (!aMenuItem)
-    return NS_ERROR_INVALID_ARG;
-
-  mMenuObjectsArray.AppendElement(aMenuItem);
-  if (nsMenuUtilsX::NodeIsHiddenOrCollapsed(aMenuItem->Content()))
-    return NS_OK;
-  ++mVisibleItemsCount;
-
-  NSMenuItem* newNativeMenuItem = (NSMenuItem*)aMenuItem->NativeData();
-
-  // add the menu item to this menu
-  [mNativeMenu addItem:newNativeMenuItem];
-
-  // set up target/action
-  [newNativeMenuItem setTarget:nsMenuBarX::sNativeEventTarget];
-  [newNativeMenuItem setAction:@selector(menuItemHit:)];
-
-  // set its command. we get the unique command id from the menubar
-  [newNativeMenuItem setTag:mMenuGroupOwner->RegisterForCommand(aMenuItem)];
-  MenuItemInfo * info = [[MenuItemInfo alloc] initWithMenuGroupOwner:mMenuGroupOwner];
-  [newNativeMenuItem setRepresentedObject:info];
-  [info release];
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-nsMenuX* nsMenuX::AddMenu(UniquePtr<nsMenuX> aMenu)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  // aMenu transfers ownership to mMenuObjectsArray and becomes nullptr, so
-  // we need to keep a raw pointer to access it conveniently.
-  nsMenuX* menu = aMenu.get();
-  mMenuObjectsArray.AppendElement(Move(aMenu));
-
-  if (nsMenuUtilsX::NodeIsHiddenOrCollapsed(menu->Content())) {
-    return menu;
-  }
-
-  ++mVisibleItemsCount;
-
-  // We have to add a menu item and then associate the menu with it
-  NSMenuItem* newNativeMenuItem = menu->NativeMenuItem();
-  if (newNativeMenuItem) {
-    [mNativeMenu addItem:newNativeMenuItem];
-    [newNativeMenuItem setSubmenu:(NSMenu*)menu->NativeData()];
-  }
-
-  return menu;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(nullptr);
-}
-
-// Includes all items, including hidden/collapsed ones
-uint32_t nsMenuX::GetItemCount()
-{
-  return mMenuObjectsArray.Length();
-}
-
-// Includes all items, including hidden/collapsed ones
-nsMenuObjectX* nsMenuX::GetItemAt(uint32_t aPos)
-{
-  if (aPos >= (uint32_t)mMenuObjectsArray.Length())
-    return NULL;
-
-  return mMenuObjectsArray[aPos].get();
-}
-
-// Only includes visible items
-nsresult nsMenuX::GetVisibleItemCount(uint32_t &aCount)
-{
-  aCount = mVisibleItemsCount;
-  return NS_OK;
-}
-
-// Only includes visible items. Note that this is provides O(N) access
-// If you need to iterate or search, consider using GetItemAt and doing your own filtering
-nsMenuObjectX* nsMenuX::GetVisibleItemAt(uint32_t aPos)
-{
-
-  uint32_t count = mMenuObjectsArray.Length();
-  if (aPos >= mVisibleItemsCount || aPos >= count)
-    return NULL;
-
-  // If there are no invisible items, can provide direct access
-  if (mVisibleItemsCount == count)
-    return mMenuObjectsArray[aPos].get();
-
-  // Otherwise, traverse the array until we find the the item we're looking for.
-  nsMenuObjectX* item;
-  uint32_t visibleNodeIndex = 0;
-  for (uint32_t i = 0; i < count; i++) {
-    item = mMenuObjectsArray[i].get();
-    if (!nsMenuUtilsX::NodeIsHiddenOrCollapsed(item->Content())) {
-      if (aPos == visibleNodeIndex) {
-        // we found the visible node we're looking for, return it
-        return item;
-      }
-      visibleNodeIndex++;
-    }
-  }
-
-  return NULL;
-}
-
-nsresult nsMenuX::RemoveAll()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  if (mNativeMenu) {
-    // clear command id's
-    int itemCount = [mNativeMenu numberOfItems];
-    for (int i = 0; i < itemCount; i++)
-      mMenuGroupOwner->UnregisterCommand((uint32_t)[[mNativeMenu itemAtIndex:i] tag]);
-    // get rid of Cocoa menu items
-    for (int i = [mNativeMenu numberOfItems] - 1; i >= 0; i--)
-      [mNativeMenu removeItemAtIndex:i];
-  }
-
-  mMenuObjectsArray.Clear();
-  mVisibleItemsCount = 0;
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-nsEventStatus nsMenuX::MenuOpened()
-{
-  // Open the node.
-  mContent->SetAttr(kNameSpaceID_None, nsGkAtoms::open, NS_LITERAL_STRING("true"), true);
-
-  // Fire a handler. If we're told to stop, don't build the menu at all
-  bool keepProcessing = OnOpen();
-
-  if (!mNeedsRebuild || !keepProcessing)
-    return nsEventStatus_eConsumeNoDefault;
-
-  if (!mConstructed || mNeedsRebuild) {
-    if (mNeedsRebuild)
-      RemoveAll();
-
-    MenuConstruct();
-    mConstructed = true;
-  }
-
-  nsEventStatus status = nsEventStatus_eIgnore;
-  WidgetMouseEvent event(true, eXULPopupShown, nullptr,
-                         WidgetMouseEvent::eReal);
-
-  nsCOMPtr<nsIContent> popupContent;
-  GetMenuPopupContent(getter_AddRefs(popupContent));
-  nsIContent* dispatchTo = popupContent ? popupContent : mContent;
-  dispatchTo->DispatchDOMEvent(&event, nullptr, nullptr, &status);
-
-  return nsEventStatus_eConsumeNoDefault;
-}
-
-void nsMenuX::MenuClosed()
-{
-  if (mConstructed) {
-    // Don't close if a handler tells us to stop.
-    if (!OnClose())
-      return;
-
-    if (mNeedsRebuild)
-      mConstructed = false;
-
-    mContent->UnsetAttr(kNameSpaceID_None, nsGkAtoms::open, true);
-
-    nsEventStatus status = nsEventStatus_eIgnore;
-    WidgetMouseEvent event(true, eXULPopupHidden, nullptr,
-                           WidgetMouseEvent::eReal);
-
-    nsCOMPtr<nsIContent> popupContent;
-    GetMenuPopupContent(getter_AddRefs(popupContent));
-    nsIContent* dispatchTo = popupContent ? popupContent : mContent;
-    dispatchTo->DispatchDOMEvent(&event, nullptr, nullptr, &status);
-
-    mDestroyHandlerCalled = true;
-    mConstructed = false;
-  }
-}
-
-void nsMenuX::MenuConstruct()
-{
-  mConstructed = false;
-  gConstructingMenu = true;
-
-  // reset destroy handler flag so that we'll know to fire it next time this menu goes away.
-  mDestroyHandlerCalled = false;
-
-  //printf("nsMenuX::MenuConstruct called for %s = %d \n", NS_LossyConvertUTF16toASCII(mLabel).get(), mNativeMenu);
-
-  // Retrieve our menupopup.
-  nsCOMPtr<nsIContent> menuPopup;
-  GetMenuPopupContent(getter_AddRefs(menuPopup));
-  if (!menuPopup) {
-    gConstructingMenu = false;
-    return;
-  }
-
-  // bug 365405: Manually wrap the menupopup node to make sure it's bounded
-  if (!mXBLAttached) {
-    nsresult rv;
-    nsCOMPtr<nsIXPConnect> xpconnect =
-      do_GetService(nsIXPConnect::GetCID(), &rv);
-    if (NS_SUCCEEDED(rv)) {
-      nsIDocument* ownerDoc = menuPopup->OwnerDoc();
-      dom::AutoJSAPI jsapi;
-      if (ownerDoc && jsapi.Init(ownerDoc->GetInnerWindow())) {
-        JSContext* cx = jsapi.cx();
-        JS::RootedObject ignoredObj(cx);
-        xpconnect->WrapNative(cx, JS::CurrentGlobalOrNull(cx), menuPopup,
-                              NS_GET_IID(nsISupports), ignoredObj.address());
-        mXBLAttached = true;
-      }
-    }
-  }
-
-  // Iterate over the kids
-  uint32_t count = menuPopup->GetChildCount();
-  for (uint32_t i = 0; i < count; i++) {
-    nsIContent *child = menuPopup->GetChildAt(i);
-    if (child) {
-      // depending on the type, create a menu item, separator, or submenu
-      if (child->IsAnyOfXULElements(nsGkAtoms::menuitem,
-                                    nsGkAtoms::menuseparator)) {
-        LoadMenuItem(child);
-      } else if (child->IsXULElement(nsGkAtoms::menu)) {
-        LoadSubMenu(child);
-      }
-    }
-  } // for each menu item
-
-  gConstructingMenu = false;
-  mNeedsRebuild = false;
-  // printf("Done building, mMenuObjectsArray.Count() = %d \n", mMenuObjectsArray.Count());
-}
-
-void nsMenuX::SetRebuild(bool aNeedsRebuild)
-{
-  if (!gConstructingMenu)
-    mNeedsRebuild = aNeedsRebuild;
-}
-
-nsresult nsMenuX::SetEnabled(bool aIsEnabled)
-{
-  if (aIsEnabled != mIsEnabled) {
-    // we always want to rebuild when this changes
-    mIsEnabled = aIsEnabled;
-    [mNativeMenuItem setEnabled:(BOOL)mIsEnabled];
-  }
-  return NS_OK;
-}
-
-nsresult nsMenuX::GetEnabled(bool* aIsEnabled)
-{
-  NS_ENSURE_ARG_POINTER(aIsEnabled);
-  *aIsEnabled = mIsEnabled;
-  return NS_OK;
-}
-
-GeckoNSMenu* nsMenuX::CreateMenuWithGeckoString(nsString& menuTitle)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  NSString* title = [NSString stringWithCharacters:(UniChar*)menuTitle.get() length:menuTitle.Length()];
-  GeckoNSMenu* myMenu = [[GeckoNSMenu alloc] initWithTitle:title];
-  [myMenu setDelegate:mMenuDelegate];
-
-  // We don't want this menu to auto-enable menu items because then Cocoa
-  // overrides our decisions and things get incorrectly enabled/disabled.
-  [myMenu setAutoenablesItems:NO];
-
-  // we used to install Carbon event handlers here, but since NSMenu* doesn't
-  // create its underlying MenuRef until just before display, we delay until
-  // that happens. Now we install the event handlers when Cocoa notifies
-  // us that a menu is about to display - see the Cocoa MenuDelegate class.
-
-  return myMenu;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-void nsMenuX::LoadMenuItem(nsIContent* inMenuItemContent)
-{
-  if (!inMenuItemContent)
-    return;
-
-  nsAutoString menuitemName;
-  inMenuItemContent->GetAttr(kNameSpaceID_None, nsGkAtoms::label, menuitemName);
-
-  // printf("menuitem %s \n", NS_LossyConvertUTF16toASCII(menuitemName).get());
-
-  EMenuItemType itemType = eRegularMenuItemType;
-  if (inMenuItemContent->IsXULElement(nsGkAtoms::menuseparator)) {
-    itemType = eSeparatorMenuItemType;
-  }
-  else {
-    static nsIContent::AttrValuesArray strings[] =
-  {&nsGkAtoms::checkbox, &nsGkAtoms::radio, nullptr};
-    switch (inMenuItemContent->FindAttrValueIn(kNameSpaceID_None, nsGkAtoms::type,
-                                               strings, eCaseMatters)) {
-      case 0: itemType = eCheckboxMenuItemType; break;
-      case 1: itemType = eRadioMenuItemType; break;
-    }
-  }
-
-  // Create the item.
-  nsMenuItemX* menuItem = new nsMenuItemX();
-  if (!menuItem)
-    return;
-
-  nsresult rv = menuItem->Create(this, menuitemName, itemType, mMenuGroupOwner, inMenuItemContent);
-  if (NS_FAILED(rv)) {
-    delete menuItem;
-    return;
-  }
-
-  AddMenuItem(menuItem);
-
-  // This needs to happen after the nsIMenuItem object is inserted into
-  // our item array in AddMenuItem()
-  menuItem->SetupIcon();
-}
-
-void nsMenuX::LoadSubMenu(nsIContent* inMenuContent)
-{
-  auto menu = MakeUnique<nsMenuX>();
-  if (!menu)
-    return;
-
-  nsresult rv = menu->Create(this, mMenuGroupOwner, inMenuContent);
-  if (NS_FAILED(rv))
-    return;
-
-  // |menu|'s ownership is transfer to AddMenu but, if it is successfully
-  // added, we can access it via the returned raw pointer.
-  nsMenuX* menu_ptr = AddMenu(Move(menu));
-
-  // This needs to happen after the nsIMenu object is inserted into
-  // our item array in AddMenu()
-  if (menu_ptr) {
-    menu_ptr->SetupIcon();
-  }
-}
-
-// This menu is about to open. Returns TRUE if we should keep processing the event,
-// FALSE if the handler wants to stop the opening of the menu.
-bool nsMenuX::OnOpen()
-{
-  nsEventStatus status = nsEventStatus_eIgnore;
-  WidgetMouseEvent event(true, eXULPopupShowing, nullptr,
-                         WidgetMouseEvent::eReal);
-
-  nsCOMPtr<nsIContent> popupContent;
-  GetMenuPopupContent(getter_AddRefs(popupContent));
-
-  nsresult rv = NS_OK;
-  nsIContent* dispatchTo = popupContent ? popupContent : mContent;
-  rv = dispatchTo->DispatchDOMEvent(&event, nullptr, nullptr, &status);
-  if (NS_FAILED(rv) || status == nsEventStatus_eConsumeNoDefault)
-    return false;
-
-  // If the open is going to succeed we need to walk our menu items, checking to
-  // see if any of them have a command attribute. If so, several attributes
-  // must potentially be updated.
-
-  // Get new popup content first since it might have changed as a result of the
-  // eXULPopupShowing event above.
-  GetMenuPopupContent(getter_AddRefs(popupContent));
-  if (!popupContent)
-    return true;
-
-  nsXULPopupManager* pm = nsXULPopupManager::GetInstance();
-  if (pm) {
-    pm->UpdateMenuItems(popupContent);
-  }
-
-  return true;
-}
-
-// Returns TRUE if we should keep processing the event, FALSE if the handler
-// wants to stop the closing of the menu.
-bool nsMenuX::OnClose()
-{
-  if (mDestroyHandlerCalled)
-    return true;
-
-  nsEventStatus status = nsEventStatus_eIgnore;
-  WidgetMouseEvent event(true, eXULPopupHiding, nullptr,
-                         WidgetMouseEvent::eReal);
-
-  nsCOMPtr<nsIContent> popupContent;
-  GetMenuPopupContent(getter_AddRefs(popupContent));
-
-  nsresult rv = NS_OK;
-  nsIContent* dispatchTo = popupContent ? popupContent : mContent;
-  rv = dispatchTo->DispatchDOMEvent(&event, nullptr, nullptr, &status);
-
-  mDestroyHandlerCalled = true;
-
-  if (NS_FAILED(rv) || status == nsEventStatus_eConsumeNoDefault)
-    return false;
-
-  return true;
-}
-
-// Find the |menupopup| child in the |popup| representing this menu. It should be one
-// of a very few children so we won't be iterating over a bazillion menu items to find
-// it (so the strcmp won't kill us).
-void nsMenuX::GetMenuPopupContent(nsIContent** aResult)
-{
-  if (!aResult)
-    return;
-  *aResult = nullptr;
-
-  // Check to see if we are a "menupopup" node (if we are a native menu).
-  {
-    int32_t dummy;
-    nsCOMPtr<nsIAtom> tag = mContent->OwnerDoc()->BindingManager()->ResolveTag(mContent, &dummy);
-    if (tag == nsGkAtoms::menupopup) {
-      *aResult = mContent;
-      NS_ADDREF(*aResult);
-      return;
-    }
-  }
-
-  // Otherwise check our child nodes.
-
-  uint32_t count = mContent->GetChildCount();
-
-  for (uint32_t i = 0; i < count; i++) {
-    int32_t dummy;
-    nsIContent *child = mContent->GetChildAt(i);
-    nsCOMPtr<nsIAtom> tag = child->OwnerDoc()->BindingManager()->ResolveTag(child, &dummy);
-    if (tag == nsGkAtoms::menupopup) {
-      *aResult = child;
-      NS_ADDREF(*aResult);
-      return;
-    }
-  }
-}
-
-NSMenuItem* nsMenuX::NativeMenuItem()
-{
-  return mNativeMenuItem;
-}
-
-bool nsMenuX::IsXULHelpMenu(nsIContent* aMenuContent)
-{
-  bool retval = false;
-  if (aMenuContent) {
-    nsAutoString id;
-    aMenuContent->GetAttr(kNameSpaceID_None, nsGkAtoms::id, id);
-    if (id.Equals(NS_LITERAL_STRING("helpMenu")))
-      retval = true;
-  }
-  return retval;
-}
-
-//
-// nsChangeObserver
-//
-
-void nsMenuX::ObserveAttributeChanged(nsIDocument *aDocument, nsIContent *aContent,
-                                      nsIAtom *aAttribute)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  // ignore the |open| attribute, which is by far the most common
-  if (gConstructingMenu || (aAttribute == nsGkAtoms::open))
-    return;
-
-  nsMenuObjectTypeX parentType = mParent->MenuObjectType();
-
-  if (aAttribute == nsGkAtoms::disabled) {
-    SetEnabled(!mContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::disabled,
-                                      nsGkAtoms::_true, eCaseMatters));
-  }
-  else if (aAttribute == nsGkAtoms::label) {
-    mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::label, mLabel);
-
-    // invalidate my parent. If we're a submenu parent, we have to rebuild
-    // the parent menu in order for the changes to be picked up. If we're
-    // a regular menu, just change the title and redraw the menubar.
-    if (parentType == eMenuBarObjectType) {
-      // reuse the existing menu, to avoid rebuilding the root menu bar.
-      NS_ASSERTION(mNativeMenu, "nsMenuX::AttributeChanged: invalid menu handle.");
-      NSString *newCocoaLabelString = nsMenuUtilsX::GetTruncatedCocoaLabel(mLabel);
-      [mNativeMenu setTitle:newCocoaLabelString];
-    }
-    else if (parentType == eSubmenuObjectType) {
-      static_cast<nsMenuX*>(mParent)->SetRebuild(true);
-    }
-    else if (parentType == eStandaloneNativeMenuObjectType) {
-      static_cast<nsStandaloneNativeMenu*>(mParent)->GetMenuXObject()->SetRebuild(true);
-    }
-  }
-  else if (aAttribute == nsGkAtoms::hidden || aAttribute == nsGkAtoms::collapsed) {
-    SetRebuild(true);
-
-    bool contentIsHiddenOrCollapsed = nsMenuUtilsX::NodeIsHiddenOrCollapsed(mContent);
-
-    // don't do anything if the state is correct already
-    if (contentIsHiddenOrCollapsed != mVisible)
-      return;
-
-    if (contentIsHiddenOrCollapsed) {
-      if (parentType == eMenuBarObjectType ||
-          parentType == eSubmenuObjectType ||
-          parentType == eStandaloneNativeMenuObjectType) {
-        NSMenu* parentMenu = (NSMenu*)mParent->NativeData();
-        // An exception will get thrown if we try to remove an item that isn't
-        // in the menu.
-        if ([parentMenu indexOfItem:mNativeMenuItem] != -1)
-          [parentMenu removeItem:mNativeMenuItem];
-        mVisible = false;
-      }
-    }
-    else {
-      if (parentType == eMenuBarObjectType ||
-          parentType == eSubmenuObjectType ||
-          parentType == eStandaloneNativeMenuObjectType) {
-        int insertionIndex = nsMenuUtilsX::CalculateNativeInsertionPoint(mParent, this);
-        if (parentType == eMenuBarObjectType) {
-          // Before inserting we need to figure out if we should take the native
-          // application menu into account.
-          nsMenuBarX* mb = static_cast<nsMenuBarX*>(mParent);
-          if (mb->MenuContainsAppMenu())
-            insertionIndex++;
-        }
-        NSMenu* parentMenu = (NSMenu*)mParent->NativeData();
-        [parentMenu insertItem:mNativeMenuItem atIndex:insertionIndex];
-        [mNativeMenuItem setSubmenu:mNativeMenu];
-        mVisible = true;
-      }
-    }
-  }
-  else if (aAttribute == nsGkAtoms::image) {
-    SetupIcon();
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void nsMenuX::ObserveContentRemoved(nsIDocument *aDocument, nsIContent *aChild,
-                                    int32_t aIndexInContainer)
-{
-  if (gConstructingMenu)
-    return;
-
-  SetRebuild(true);
-  mMenuGroupOwner->UnregisterForContentChanges(aChild);
-}
-
-void nsMenuX::ObserveContentInserted(nsIDocument *aDocument, nsIContent* aContainer,
-                                     nsIContent *aChild)
-{
-  if (gConstructingMenu)
-    return;
-
-  SetRebuild(true);
-}
-
-nsresult nsMenuX::SetupIcon()
-{
-  // In addition to out-of-memory, menus that are children of the menu bar
-  // will not have mIcon set.
-  if (!mIcon)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  return mIcon->SetupIcon();
-}
-
-//
-// MenuDelegate Objective-C class, used to set up Carbon events
-//
-
-@implementation MenuDelegate
-
-- (id)initWithGeckoMenu:(nsMenuX*)geckoMenu
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  if ((self = [super init])) {
-    NS_ASSERTION(geckoMenu, "Cannot initialize native menu delegate with NULL gecko menu! Will crash!");
-    mGeckoMenu = geckoMenu;
-  }
-  return self;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-- (void)menu:(NSMenu *)menu willHighlightItem:(NSMenuItem *)item
-{
-  if (!menu || !item || !mGeckoMenu)
-    return;
-
-  nsMenuObjectX* target = mGeckoMenu->GetVisibleItemAt((uint32_t)[menu indexOfItem:item]);
-  if (target && (target->MenuObjectType() == eMenuItemObjectType)) {
-    nsMenuItemX* targetMenuItem = static_cast<nsMenuItemX*>(target);
-    bool handlerCalledPreventDefault; // but we don't actually care
-    targetMenuItem->DispatchDOMEvent(NS_LITERAL_STRING("DOMMenuItemActive"), &handlerCalledPreventDefault);
-  }
-}
-
-- (void)menuWillOpen:(NSMenu *)menu
-{
-  if (!mGeckoMenu)
-    return;
-
-  // Don't do anything while the OS is (re)indexing our menus (on Leopard and
-  // higher).  This stops the Help menu from being able to search in our
-  // menus, but it also resolves many other problems.
-  if (nsMenuX::sIndexingMenuLevel > 0)
-    return;
-
-  nsIRollupListener* rollupListener = nsBaseWidget::GetActiveRollupListener();
-  if (rollupListener) {
-    nsCOMPtr<nsIWidget> rollupWidget = rollupListener->GetRollupWidget();
-    if (rollupWidget) {
-      rollupListener->Rollup(0, true, nullptr, nullptr);
-      [menu cancelTracking];
-      return;
-    }
-  }
-  mGeckoMenu->MenuOpened();
-}
-
-- (void)menuDidClose:(NSMenu *)menu
-{
-  if (!mGeckoMenu)
-    return;
-
-  // Don't do anything while the OS is (re)indexing our menus (on Leopard and
-  // higher).  This stops the Help menu from being able to search in our
-  // menus, but it also resolves many other problems.
-  if (nsMenuX::sIndexingMenuLevel > 0)
-    return;
-
-  mGeckoMenu->MenuClosed();
-}
-
-@end
-
-// OS X Leopard (at least as of 10.5.2) has an obscure bug triggered by some
-// behavior that's present in Mozilla.org browsers but not (as best I can
-// tell) in Apple products like Safari.  (It's not yet clear exactly what this
-// behavior is.)
-//
-// The bug is that sometimes you crash on quit in nsMenuX::RemoveAll(), on a
-// call to [NSMenu removeItemAtIndex:].  The crash is caused by trying to
-// access a deleted NSMenuItem object (sometimes (perhaps always?) by trying
-// to send it a _setChangedFlags: message).  Though this object was deleted
-// some time ago, it remains registered as a potential target for a particular
-// key equivalent.  So when [NSMenu removeItemAtIndex:] removes the current
-// target for that same key equivalent, the OS tries to "activate" the
-// previous target.
-//
-// The underlying reason appears to be that NSMenu's _addItem:toTable: and
-// _removeItem:fromTable: methods (which are used to keep a hashtable of
-// registered key equivalents) don't properly "retain" and "release"
-// NSMenuItem objects as they are added to and removed from the hashtable.
-//
-// Our (hackish) workaround is to shadow the OS's hashtable with another
-// hastable of our own (gShadowKeyEquivDB), and use it to "retain" and
-// "release" NSMenuItem objects as needed.  This resolves bmo bugs 422287 and
-// 423669.  When (if) Apple fixes this bug, we can remove this workaround.
-
-static NSMutableDictionary *gShadowKeyEquivDB = nil;
-
-// Class for values in gShadowKeyEquivDB.
-
-@interface KeyEquivDBItem : NSObject
-{
-  NSMenuItem *mItem;
-  NSMutableSet *mTables;
-}
-
-- (id)initWithItem:(NSMenuItem *)aItem table:(NSMapTable *)aTable;
-- (BOOL)hasTable:(NSMapTable *)aTable;
-- (int)addTable:(NSMapTable *)aTable;
-- (int)removeTable:(NSMapTable *)aTable;
-
-@end
-
-@implementation KeyEquivDBItem
-
-- (id)initWithItem:(NSMenuItem *)aItem table:(NSMapTable *)aTable
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  if (!gShadowKeyEquivDB)
-    gShadowKeyEquivDB = [[NSMutableDictionary alloc] init];
-  self = [super init];
-  if (aItem && aTable) {
-    mTables = [[NSMutableSet alloc] init];
-    mItem = [aItem retain];
-    [mTables addObject:[NSValue valueWithPointer:aTable]];
-  } else {
-    mTables = nil;
-    mItem = nil;
-  }
-  return self;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-- (void)dealloc
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (mTables)
-    [mTables release];
-  if (mItem)
-    [mItem release];
-  [super dealloc];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (BOOL)hasTable:(NSMapTable *)aTable
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  return [mTables member:[NSValue valueWithPointer:aTable]] ? YES : NO;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NO);
-}
-
-// Does nothing if aTable (its index value) is already present in mTables.
-- (int)addTable:(NSMapTable *)aTable
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  if (aTable)
-    [mTables addObject:[NSValue valueWithPointer:aTable]];
-  return [mTables count];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(0);
-}
-
-- (int)removeTable:(NSMapTable *)aTable
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  if (aTable) {
-    NSValue *objectToRemove =
-      [mTables member:[NSValue valueWithPointer:aTable]];
-    if (objectToRemove)
-      [mTables removeObject:objectToRemove];
-  }
-  return [mTables count];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(0);
-}
-
-@end
-
-@interface NSMenu (MethodSwizzling)
-+ (void)nsMenuX_NSMenu_addItem:(NSMenuItem *)aItem toTable:(NSMapTable *)aTable;
-+ (void)nsMenuX_NSMenu_removeItem:(NSMenuItem *)aItem fromTable:(NSMapTable *)aTable;
-@end
-
-@implementation NSMenu (MethodSwizzling)
-
-+ (void)nsMenuX_NSMenu_addItem:(NSMenuItem *)aItem toTable:(NSMapTable *)aTable
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (aItem && aTable) {
-    NSValue *key = [NSValue valueWithPointer:aItem];
-    KeyEquivDBItem *shadowItem = [gShadowKeyEquivDB objectForKey:key];
-    if (shadowItem) {
-      [shadowItem addTable:aTable];
-    } else {
-      shadowItem = [[KeyEquivDBItem alloc] initWithItem:aItem table:aTable];
-      [gShadowKeyEquivDB setObject:shadowItem forKey:key];
-      // Release after [NSMutableDictionary setObject:forKey:] retains it (so
-      // that it will get dealloced when removeObjectForKey: is called).
-      [shadowItem release];
-    }
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-
-  [self nsMenuX_NSMenu_addItem:aItem toTable:aTable];
-}
-
-+ (void)nsMenuX_NSMenu_removeItem:(NSMenuItem *)aItem fromTable:(NSMapTable *)aTable
-{
-  [self nsMenuX_NSMenu_removeItem:aItem fromTable:aTable];
-
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (aItem && aTable) {
-    NSValue *key = [NSValue valueWithPointer:aItem];
-    KeyEquivDBItem *shadowItem = [gShadowKeyEquivDB objectForKey:key];
-    if (shadowItem && [shadowItem hasTable:aTable]) {
-      if (![shadowItem removeTable:aTable])
-        [gShadowKeyEquivDB removeObjectForKey:key];
-    }
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-@end
-
-// This class is needed to keep track of when the OS is (re)indexing all of
-// our menus.  This appears to only happen on Leopard and higher, and can
-// be triggered by opening the Help menu.  Some operations are unsafe while
-// this is happening -- notably the calls to [[NSImage alloc]
-// initWithSize:imageRect.size] and [newImage lockFocus] in nsMenuItemIconX::
-// OnStopFrame().  But we don't yet have a complete list, and Apple doesn't
-// yet have any documentation on this subject.  (Apple also doesn't yet have
-// any documented way to find the information we seek here.)  The "original"
-// of this class (the one whose indexMenuBarDynamically method we hook) is
-// defined in the Shortcut framework in /System/Library/PrivateFrameworks.
-@interface NSObject (SCTGRLIndexMethodSwizzling)
-- (void)nsMenuX_SCTGRLIndex_indexMenuBarDynamically;
-@end
-
-@implementation NSObject (SCTGRLIndexMethodSwizzling)
-
-- (void)nsMenuX_SCTGRLIndex_indexMenuBarDynamically
-{
-  // This method appears to be called (once) whenever the OS (re)indexes our
-  // menus.  sIndexingMenuLevel is a int32_t just in case it might be
-  // reentered.  As it's running, it spawns calls to two undocumented
-  // HIToolbox methods (_SimulateMenuOpening() and _SimulateMenuClosed()),
-  // which "simulate" the opening and closing of our menus without actually
-  // displaying them.
-  ++nsMenuX::sIndexingMenuLevel;
-  [self nsMenuX_SCTGRLIndex_indexMenuBarDynamically];
-  --nsMenuX::sIndexingMenuLevel;
-}
-
-@end
diff --git a/widget/cocoa/nsNativeThemeCocoa.h b/widget/cocoa/nsNativeThemeCocoa.h
deleted file mode 100644
index 23f2bc4d32..0000000000
--- a/widget/cocoa/nsNativeThemeCocoa.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsNativeThemeCocoa_h_
-#define nsNativeThemeCocoa_h_
-
-#import <Carbon/Carbon.h>
-#import <Cocoa/Cocoa.h>
-
-#include "nsITheme.h"
-#include "nsCOMPtr.h"
-#include "nsIAtom.h"
-#include "nsNativeTheme.h"
-
-@class CellDrawView;
-@class NSProgressBarCell;
-@class ContextAwareSearchFieldCell;
-class nsDeviceContext;
-struct SegmentedControlRenderSettings;
-
-namespace mozilla {
-class EventStates;
-} // namespace mozilla
-
-class nsNativeThemeCocoa : private nsNativeTheme,
-                           public nsITheme
-{
-public:
-  enum {
-    eThemeGeometryTypeTitlebar = eThemeGeometryTypeUnknown + 1,
-    eThemeGeometryTypeToolbar,
-    eThemeGeometryTypeToolbox,
-    eThemeGeometryTypeWindowButtons,
-    eThemeGeometryTypeFullscreenButton,
-    eThemeGeometryTypeMenu,
-    eThemeGeometryTypeHighlightedMenuItem,
-    eThemeGeometryTypeVibrancyLight,
-    eThemeGeometryTypeVibrancyDark,
-    eThemeGeometryTypeTooltip,
-    eThemeGeometryTypeSheet,
-    eThemeGeometryTypeSourceList,
-    eThemeGeometryTypeSourceListSelection,
-    eThemeGeometryTypeActiveSourceListSelection
-  };
-
-  nsNativeThemeCocoa();
-
-  NS_DECL_ISUPPORTS_INHERITED
-
-  // The nsITheme interface.
-  NS_IMETHOD DrawWidgetBackground(nsRenderingContext* aContext,
-                                  nsIFrame* aFrame,
-                                  uint8_t aWidgetType,
-                                  const nsRect& aRect,
-                                  const nsRect& aDirtyRect) override;
-  NS_IMETHOD GetWidgetBorder(nsDeviceContext* aContext, 
-                             nsIFrame* aFrame,
-                             uint8_t aWidgetType,
-                             nsIntMargin* aResult) override;
-
-  virtual bool GetWidgetPadding(nsDeviceContext* aContext,
-                                  nsIFrame* aFrame,
-                                  uint8_t aWidgetType,
-                                  nsIntMargin* aResult) override;
-
-  virtual bool GetWidgetOverflow(nsDeviceContext* aContext, nsIFrame* aFrame,
-                                   uint8_t aWidgetType, nsRect* aOverflowRect) override;
-
-  NS_IMETHOD GetMinimumWidgetSize(nsPresContext* aPresContext, nsIFrame* aFrame,
-                                  uint8_t aWidgetType,
-                                  mozilla::LayoutDeviceIntSize* aResult, bool* aIsOverridable) override;
-  NS_IMETHOD WidgetStateChanged(nsIFrame* aFrame, uint8_t aWidgetType, 
-                                nsIAtom* aAttribute, bool* aShouldRepaint,
-                                const nsAttrValue* aOldValue) override;
-  NS_IMETHOD ThemeChanged() override;
-  bool ThemeSupportsWidget(nsPresContext* aPresContext, nsIFrame* aFrame, uint8_t aWidgetType) override;
-  bool WidgetIsContainer(uint8_t aWidgetType) override;
-  bool ThemeDrawsFocusForWidget(uint8_t aWidgetType) override;
-  bool ThemeNeedsComboboxDropmarker() override;
-  virtual bool WidgetAppearanceDependsOnWindowFocus(uint8_t aWidgetType) override;
-  virtual bool NeedToClearBackgroundBehindWidget(nsIFrame* aFrame,
-                                                 uint8_t aWidgetType) override;
-  virtual bool WidgetProvidesFontSmoothingBackgroundColor(nsIFrame* aFrame, uint8_t aWidgetType,
-                                                          nscolor* aColor) override;
-  virtual ThemeGeometryType ThemeGeometryTypeForWidget(nsIFrame* aFrame,
-                                                       uint8_t aWidgetType) override;
-  virtual Transparency GetWidgetTransparency(nsIFrame* aFrame, uint8_t aWidgetType) override;
-
-  void DrawProgress(CGContextRef context, const HIRect& inBoxRect,
-                    bool inIsIndeterminate, bool inIsHorizontal,
-                    double inValue, double inMaxValue, nsIFrame* aFrame);
-
-  static void DrawNativeTitlebar(CGContextRef aContext, CGRect aTitlebarRect,
-                                 CGFloat aUnifiedHeight, BOOL aIsMain, BOOL aIsFlipped);
-
-protected:
-  virtual ~nsNativeThemeCocoa();
-
-  nsIntMargin DirectionAwareMargin(const nsIntMargin& aMargin, nsIFrame* aFrame);
-  nsIFrame* SeparatorResponsibility(nsIFrame* aBefore, nsIFrame* aAfter);
-  CGRect SeparatorAdjustedRect(CGRect aRect, nsIFrame* aLeft,
-                               nsIFrame* aCurrent, nsIFrame* aRight);
-  bool IsWindowSheet(nsIFrame* aFrame);
-
-  // HITheme drawing routines
-  void DrawFrame(CGContextRef context, HIThemeFrameKind inKind,
-                 const HIRect& inBoxRect, bool inReadOnly,
-                 mozilla::EventStates inState);
-  void DrawMeter(CGContextRef context, const HIRect& inBoxRect,
-                 nsIFrame* aFrame);
-  void DrawSegment(CGContextRef cgContext, const HIRect& inBoxRect,
-                   mozilla::EventStates inState, nsIFrame* aFrame,
-                   const SegmentedControlRenderSettings& aSettings);
-  void DrawTabPanel(CGContextRef context, const HIRect& inBoxRect, nsIFrame* aFrame);
-  void DrawScale(CGContextRef context, const HIRect& inBoxRect,
-                 mozilla::EventStates inState, bool inDirection,
-                 bool inIsReverse, int32_t inCurrentValue, int32_t inMinValue,
-                 int32_t inMaxValue, nsIFrame* aFrame);
-  void DrawCheckboxOrRadio(CGContextRef cgContext, bool inCheckbox,
-                           const HIRect& inBoxRect, bool inSelected,
-                           mozilla::EventStates inState, nsIFrame* aFrame);
-  void DrawSearchField(CGContextRef cgContext, const HIRect& inBoxRect,
-                       nsIFrame* aFrame, mozilla::EventStates inState);
-  void DrawPushButton(CGContextRef cgContext, const HIRect& inBoxRect,
-                      mozilla::EventStates inState, uint8_t aWidgetType,
-                      nsIFrame* aFrame, float aOriginalHeight);
-  void DrawMenuIcon(CGContextRef cgContext, const CGRect& aRect,
-                    mozilla::EventStates inState, nsIFrame* aFrame,
-                    const NSSize& aIconSize, NSString* aImageName,
-                    bool aCenterHorizontally);
-  void DrawButton(CGContextRef context, ThemeButtonKind inKind,
-                  const HIRect& inBoxRect, bool inIsDefault, 
-                  ThemeButtonValue inValue, ThemeButtonAdornment inAdornment,
-                  mozilla::EventStates inState, nsIFrame* aFrame);
-  void DrawFocusOutline(CGContextRef cgContext, const HIRect& inBoxRect,
-                        mozilla::EventStates inState, uint8_t aWidgetType,
-                        nsIFrame* aFrame);
-  void DrawDropdown(CGContextRef context, const HIRect& inBoxRect,
-                    mozilla::EventStates inState, uint8_t aWidgetType,
-                    nsIFrame* aFrame);
-  void DrawSpinButtons(CGContextRef context, ThemeButtonKind inKind,
-                       const HIRect& inBoxRect, ThemeDrawState inDrawState,
-                       ThemeButtonAdornment inAdornment,
-                       mozilla::EventStates inState, nsIFrame* aFrame);
-  void DrawSpinButton(CGContextRef context, ThemeButtonKind inKind,
-                      const HIRect& inBoxRect, ThemeDrawState inDrawState,
-                      ThemeButtonAdornment inAdornment,
-                      mozilla::EventStates inState,
-                      nsIFrame* aFrame, uint8_t aWidgetType);
-  void DrawUnifiedToolbar(CGContextRef cgContext, const HIRect& inBoxRect,
-                          NSWindow* aWindow);
-  void DrawStatusBar(CGContextRef cgContext, const HIRect& inBoxRect,
-                     nsIFrame *aFrame);
-  void DrawResizer(CGContextRef cgContext, const HIRect& aRect, nsIFrame *aFrame);
-
-  // Scrollbars
-  void GetScrollbarPressStates(nsIFrame *aFrame,
-                               mozilla::EventStates aButtonStates[]);
-  nsIFrame* GetParentScrollbarFrame(nsIFrame *aFrame);
-  bool IsParentScrollbarRolledOver(nsIFrame* aFrame);
-
-private:
-  NSButtonCell* mDisclosureButtonCell;
-  NSButtonCell* mHelpButtonCell;
-  NSButtonCell* mPushButtonCell;
-  NSButtonCell* mRadioButtonCell;
-  NSButtonCell* mCheckboxCell;
-  ContextAwareSearchFieldCell* mSearchFieldCell;
-  NSPopUpButtonCell* mDropdownCell;
-  NSComboBoxCell* mComboBoxCell;
-  NSProgressBarCell* mProgressBarCell;
-  NSLevelIndicatorCell* mMeterBarCell;
-  CellDrawView* mCellDrawView;
-};
-
-#endif // nsNativeThemeCocoa_h_
diff --git a/widget/cocoa/nsNativeThemeCocoa.mm b/widget/cocoa/nsNativeThemeCocoa.mm
deleted file mode 100644
index 056c453f2a..0000000000
--- a/widget/cocoa/nsNativeThemeCocoa.mm
+++ /dev/null
@@ -1,3961 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "nsNativeThemeCocoa.h"
-
-#include "mozilla/gfx/2D.h"
-#include "mozilla/gfx/Helpers.h"
-#include "nsChildView.h"
-#include "nsDeviceContext.h"
-#include "nsLayoutUtils.h"
-#include "nsObjCExceptions.h"
-#include "nsNumberControlFrame.h"
-#include "nsRangeFrame.h"
-#include "nsRenderingContext.h"
-#include "nsRect.h"
-#include "nsSize.h"
-#include "nsThemeConstants.h"
-#include "nsIPresShell.h"
-#include "nsPresContext.h"
-#include "nsIContent.h"
-#include "nsIDocument.h"
-#include "nsIFrame.h"
-#include "nsIAtom.h"
-#include "nsNameSpaceManager.h"
-#include "nsPresContext.h"
-#include "nsGkAtoms.h"
-#include "nsCocoaFeatures.h"
-#include "nsCocoaWindow.h"
-#include "nsNativeThemeColors.h"
-#include "nsIScrollableFrame.h"
-#include "mozilla/EventStates.h"
-#include "mozilla/dom/Element.h"
-#include "mozilla/dom/HTMLMeterElement.h"
-#include "nsLookAndFeel.h"
-#include "VibrancyManager.h"
-
-#include "gfxContext.h"
-#include "gfxQuartzSurface.h"
-#include "gfxQuartzNativeDrawing.h"
-#include <algorithm>
-
-using namespace mozilla;
-using namespace mozilla::gfx;
-using mozilla::dom::HTMLMeterElement;
-
-#define DRAW_IN_FRAME_DEBUG 0
-#define SCROLLBARS_VISUAL_DEBUG 0
-
-// private Quartz routines needed here
-extern "C" {
-  CG_EXTERN void CGContextSetCTM(CGContextRef, CGAffineTransform);
-  CG_EXTERN void CGContextSetBaseCTM(CGContextRef, CGAffineTransform);
-  typedef CFTypeRef CUIRendererRef;
-  void CUIDraw(CUIRendererRef r, CGRect rect, CGContextRef ctx, CFDictionaryRef options, CFDictionaryRef* result);
-}
-
-// Workaround for NSCell control tint drawing
-// Without this workaround, NSCells are always drawn with the clear control tint
-// as long as they're not attached to an NSControl which is a subview of an active window.
-// XXXmstange Why doesn't Webkit need this?
-@implementation NSCell (ControlTintWorkaround)
-- (int)_realControlTint { return [self controlTint]; }
-@end
-
-// The purpose of this class is to provide objects that can be used when drawing
-// NSCells using drawWithFrame:inView: without causing any harm. The only
-// messages that will be sent to such an object are "isFlipped" and
-// "currentEditor": isFlipped needs to return YES in order to avoid drawing bugs
-// on 10.4 (see bug 465069); currentEditor (which isn't even a method of
-// NSView) will be called when drawing search fields, and we only provide it in
-// order to prevent "unrecognized selector" exceptions.
-// There's no need to pass the actual NSView that we're drawing into to
-// drawWithFrame:inView:. What's more, doing so even causes unnecessary
-// invalidations as soon as we draw a focusring!
-@interface CellDrawView : NSView
-
-@end;
-
-@implementation CellDrawView
-
-- (BOOL)isFlipped
-{
-  return YES;
-}
-
-- (NSText*)currentEditor
-{
-  return nil;
-}
-
-@end
-
-// These two classes don't actually add any behavior over NSButtonCell. Their
-// purpose is to make it easy to distinguish NSCell objects that are used for
-// drawing radio buttons / checkboxes from other cell types.
-// The class names are made up, there are no classes with these names in AppKit.
-// The reason we need them is that calling [cell setButtonType:NSRadioButton]
-// doesn't leave an easy-to-check "marker" on the cell object - there is no
-// -[NSButtonCell buttonType] method.
-@interface RadioButtonCell : NSButtonCell
-@end;
-@implementation RadioButtonCell @end;
-@interface CheckboxCell : NSButtonCell
-@end;
-@implementation CheckboxCell @end;
-
-static void
-DrawFocusRingForCellIfNeeded(NSCell* aCell, NSRect aWithFrame, NSView* aInView)
-{
-  if ([aCell showsFirstResponder]) {
-    CGContextRef cgContext = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
-    CGContextSaveGState(cgContext);
-
-    // It's important to set the focus ring style before we enter the
-    // transparency layer so that the transparency layer only contains
-    // the normal button mask without the focus ring, and the conversion
-    // to the focus ring shape happens only when the transparency layer is
-    // ended.
-    NSSetFocusRingStyle(NSFocusRingOnly);
-
-    // We need to draw the whole button into a transparency layer because
-    // many button types are composed of multiple parts, and if these parts
-    // were drawn while the focus ring style was active, each individual part
-    // would produce a focus ring for itself. But we only want one focus ring
-    // for the whole button. The transparency layer is a way to merge the
-    // individual button parts together before the focus ring shape is
-    // calculated.
-    CGContextBeginTransparencyLayerWithRect(cgContext, NSRectToCGRect(aWithFrame), 0);
-    [aCell drawFocusRingMaskWithFrame:aWithFrame inView:aInView];
-    CGContextEndTransparencyLayer(cgContext);
-
-    CGContextRestoreGState(cgContext);
-  }
-}
-
-static bool
-FocusIsDrawnByDrawWithFrame(NSCell* aCell)
-{
-#if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8
-  // When building with the 10.8 SDK or higher, focus rings don't draw as part
-  // of -[NSCell drawWithFrame:inView:] and must be drawn by a separate call
-  // to -[NSCell drawFocusRingMaskWithFrame:inView:]; .
-  // See the NSButtonCell section under
-  // https://developer.apple.com/library/mac/releasenotes/AppKit/RN-AppKitOlderNotes/#X10_8Notes
-  return false;
-#else
-  if (!nsCocoaFeatures::OnYosemiteOrLater()) {
-    // When building with the 10.7 SDK or lower, focus rings always draw as
-    // part of -[NSCell drawWithFrame:inView:] if the build is run on 10.9 or
-    // lower.
-    return true;
-  }
-
-  // On 10.10, whether the focus ring is drawn as part of
-  // -[NSCell drawWithFrame:inView:] depends on the cell type.
-  // Radio buttons and checkboxes draw their own focus rings, other cell
-  // types need -[NSCell drawFocusRingMaskWithFrame:inView:].
-  return [aCell isKindOfClass:[RadioButtonCell class]] ||
-         [aCell isKindOfClass:[CheckboxCell class]];
-#endif
-}
-
-static void
-DrawCellIncludingFocusRing(NSCell* aCell, NSRect aWithFrame, NSView* aInView)
-{
-  [aCell drawWithFrame:aWithFrame inView:aInView];
-
-  if (!FocusIsDrawnByDrawWithFrame(aCell)) {
-    DrawFocusRingForCellIfNeeded(aCell, aWithFrame, aInView);
-  }
-}
-
-/**
- * NSProgressBarCell is used to draw progress bars of any size.
- */
-@interface NSProgressBarCell : NSCell
-{
-    /*All instance variables are private*/
-    double mValue;
-    double mMax;
-    bool   mIsIndeterminate;
-    bool   mIsHorizontal;
-}
-
-- (void)setValue:(double)value;
-- (double)value;
-- (void)setMax:(double)max;
-- (double)max;
-- (void)setIndeterminate:(bool)aIndeterminate;
-- (bool)isIndeterminate;
-- (void)setHorizontal:(bool)aIsHorizontal;
-- (bool)isHorizontal;
-- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView;
-@end
-
-@implementation NSProgressBarCell
-
-- (void)setMax:(double)aMax
-{
-  mMax = aMax;
-}
-
-- (double)max
-{
-  return mMax;
-}
-
-- (void)setValue:(double)aValue
-{
-  mValue = aValue;
-}
-
-- (double)value
-{
-  return mValue;
-}
-
-- (void)setIndeterminate:(bool)aIndeterminate
-{
-  mIsIndeterminate = aIndeterminate;
-}
-
-- (bool)isIndeterminate
-{
-  return mIsIndeterminate;
-}
-
-- (void)setHorizontal:(bool)aIsHorizontal
-{
-  mIsHorizontal = aIsHorizontal;
-}
-
-- (bool)isHorizontal
-{
-  return mIsHorizontal;
-}
-
-- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView
-{
-  CGContext* cgContext = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
-
-  HIThemeTrackDrawInfo tdi;
-
-  tdi.version = 0;
-  tdi.min = 0;
-
-  tdi.value = INT32_MAX * (mValue / mMax);
-  tdi.max = INT32_MAX;
-  tdi.bounds = NSRectToCGRect(cellFrame);
-  tdi.attributes = mIsHorizontal ? kThemeTrackHorizontal : 0;
-  tdi.enableState = [self controlTint] == NSClearControlTint ? kThemeTrackInactive
-                                                             : kThemeTrackActive;
-
-  NSControlSize size = [self controlSize];
-  if (size == NSRegularControlSize) {
-    tdi.kind = mIsIndeterminate ? kThemeLargeIndeterminateBar
-                                : kThemeLargeProgressBar;
-  } else {
-    NS_ASSERTION(size == NSSmallControlSize,
-                 "We shouldn't have another size than small and regular for the moment");
-    tdi.kind = mIsIndeterminate ? kThemeMediumIndeterminateBar
-                                : kThemeMediumProgressBar;
-  }
-
-  int32_t stepsPerSecond = mIsIndeterminate ? 60 : 30;
-  int32_t milliSecondsPerStep = 1000 / stepsPerSecond;
-  tdi.trackInfo.progress.phase = uint8_t(PR_IntervalToMilliseconds(PR_IntervalNow()) /
-                                         milliSecondsPerStep);
-
-  HIThemeDrawTrack(&tdi, NULL, cgContext, kHIThemeOrientationNormal);
-}
-
-@end
-
-@interface ContextAwareSearchFieldCell : NSSearchFieldCell
-{
-  nsIFrame* mContext;
-}
-
-// setContext: stores the searchfield nsIFrame so that it can be consulted
-// during painting. Please reset this by calling setContext:nullptr as soon as
-// you're done with painting because we don't want to keep a dangling pointer.
-- (void)setContext:(nsIFrame*)aContext;
-@end
-
-@implementation ContextAwareSearchFieldCell
-
-- (id)initTextCell:(NSString*)aString
-{
-  if ((self = [super initTextCell:aString])) {
-    mContext = nullptr;
-  }
-  return self;
-}
-
-- (void)setContext:(nsIFrame*)aContext
-{
-  mContext = aContext;
-}
-
-static BOOL IsToolbarStyleContainer(nsIFrame* aFrame)
-{
-  nsIContent* content = aFrame->GetContent();
-  if (!content)
-    return NO;
-
-  if (content->IsAnyOfXULElements(nsGkAtoms::toolbar,
-                                  nsGkAtoms::toolbox,
-                                  nsGkAtoms::statusbar))
-    return YES;
-
-  switch (aFrame->StyleDisplay()->mAppearance) {
-    case NS_THEME_TOOLBAR:
-    case NS_THEME_STATUSBAR:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-- (BOOL)_isToolbarMode
-{
-  // On 10.7, searchfields have two different styles, depending on whether
-  // the searchfield is on top of of window chrome. This function is called on
-  // 10.7 during drawing in order to determine which style to use.
-  for (nsIFrame* frame = mContext; frame; frame = frame->GetParent()) {
-    if (IsToolbarStyleContainer(frame)) {
-      return YES;
-    }
-  }
-  return NO;
-}
-
-@end
-
-// Workaround for Bug 542048
-// On 64-bit, NSSearchFieldCells don't draw focus rings.
-#if defined(__x86_64__)
-
-@interface SearchFieldCellWithFocusRing : ContextAwareSearchFieldCell {} @end
-
-@implementation SearchFieldCellWithFocusRing
-
-- (void)drawWithFrame:(NSRect)rect inView:(NSView*)controlView
-{
-  [super drawWithFrame:rect inView:controlView];
-
-  if (FocusIsDrawnByDrawWithFrame(self)) {
-    // For some reason, -[NSSearchFieldCell drawWithFrame:inView] doesn't draw a
-    // focus ring in 64 bit mode, no matter what SDK is used or what OS X version
-    // we're running on. But if FocusIsDrawnByDrawWithFrame(self), then our
-    // caller expects us to draw a focus ring. So we just do that here.
-    DrawFocusRingForCellIfNeeded(self, rect, controlView);
-  }
-}
-
-- (void)drawFocusRingMaskWithFrame:(NSRect)rect inView:(NSView*)controlView
-{
-  // By default this draws nothing. I don't know why.
-  // We just draw the search field again. It's a great mask shape for its own
-  // focus ring.
-  [super drawWithFrame:rect inView:controlView];
-}
-
-@end
-
-#endif
-
-#define HITHEME_ORIENTATION kHIThemeOrientationNormal
-
-static CGFloat kMaxFocusRingWidth = 0; // initialized by the nsNativeThemeCocoa constructor
-
-// These enums are for indexing into the margin array.
-enum {
-  leopardOSorlater = 0, // 10.6 - 10.9
-  yosemiteOSorlater = 1 // 10.10+
-};
-
-enum {
-  miniControlSize,
-  smallControlSize,
-  regularControlSize
-};
-
-enum {
-  leftMargin,
-  topMargin,
-  rightMargin,
-  bottomMargin
-};
-
-static size_t EnumSizeForCocoaSize(NSControlSize cocoaControlSize) {
-  if (cocoaControlSize == NSMiniControlSize)
-    return miniControlSize;
-  else if (cocoaControlSize == NSSmallControlSize)
-    return smallControlSize;
-  else
-    return regularControlSize;
-}
-
-static NSControlSize CocoaSizeForEnum(int32_t enumControlSize) {
-  if (enumControlSize == miniControlSize)
-    return NSMiniControlSize;
-  else if (enumControlSize == smallControlSize)
-    return NSSmallControlSize;
-  else
-    return NSRegularControlSize;
-}
-
-static NSString* CUIControlSizeForCocoaSize(NSControlSize aControlSize)
-{
-  if (aControlSize == NSRegularControlSize)
-    return @"regular";
-  else if (aControlSize == NSSmallControlSize)
-    return @"small";
-  else
-    return @"mini";
-}
-
-static void InflateControlRect(NSRect* rect, NSControlSize cocoaControlSize, const float marginSet[][3][4])
-{
-  if (!marginSet)
-    return;
-
-  static int osIndex = nsCocoaFeatures::OnYosemiteOrLater() ?
-                         yosemiteOSorlater : leopardOSorlater;
-  size_t controlSize = EnumSizeForCocoaSize(cocoaControlSize);
-  const float* buttonMargins = marginSet[osIndex][controlSize];
-  rect->origin.x -= buttonMargins[leftMargin];
-  rect->origin.y -= buttonMargins[bottomMargin];
-  rect->size.width += buttonMargins[leftMargin] + buttonMargins[rightMargin];
-  rect->size.height += buttonMargins[bottomMargin] + buttonMargins[topMargin];
-}
-
-static ChildView* ChildViewForFrame(nsIFrame* aFrame)
-{
-  if (!aFrame)
-    return nil;
-
-  nsIWidget* widget = aFrame->GetNearestWidget();
-  if (!widget)
-    return nil;
-
-  NSWindow* window = (NSWindow*)widget->GetNativeData(NS_NATIVE_WINDOW);
-  return [window isKindOfClass:[BaseWindow class]] ? [(BaseWindow*)window mainChildView]  : nil;
-}
-
-static NSWindow* NativeWindowForFrame(nsIFrame* aFrame,
-                                      nsIWidget** aTopLevelWidget = NULL)
-{
-  if (!aFrame)
-    return nil;  
-
-  nsIWidget* widget = aFrame->GetNearestWidget();
-  if (!widget)
-    return nil;
-
-  nsIWidget* topLevelWidget = widget->GetTopLevelWidget();
-  if (aTopLevelWidget)
-    *aTopLevelWidget = topLevelWidget;
-
-  return (NSWindow*)topLevelWidget->GetNativeData(NS_NATIVE_WINDOW);
-}
-
-static NSSize
-WindowButtonsSize(nsIFrame* aFrame)
-{
-  NSWindow* window = NativeWindowForFrame(aFrame);
-  if (!window) {
-    // Return fallback values.
-    return NSMakeSize(54, 16);
-  }
-
-  NSRect buttonBox = NSZeroRect;
-  NSButton* closeButton = [window standardWindowButton:NSWindowCloseButton];
-  if (closeButton) {
-    buttonBox = NSUnionRect(buttonBox, [closeButton frame]);
-  }
-  NSButton* minimizeButton = [window standardWindowButton:NSWindowMiniaturizeButton];
-  if (minimizeButton) {
-    buttonBox = NSUnionRect(buttonBox, [minimizeButton frame]);
-  }
-  NSButton* zoomButton = [window standardWindowButton:NSWindowZoomButton];
-  if (zoomButton) {
-    buttonBox = NSUnionRect(buttonBox, [zoomButton frame]);
-  }
-  return buttonBox.size;
-}
-
-static BOOL FrameIsInActiveWindow(nsIFrame* aFrame)
-{
-  nsIWidget* topLevelWidget = NULL;
-  NSWindow* win = NativeWindowForFrame(aFrame, &topLevelWidget);
-  if (!topLevelWidget || !win)
-    return YES;
-
-  // XUL popups, e.g. the toolbar customization popup, can't become key windows,
-  // but controls in these windows should still get the active look.
-  if (topLevelWidget->WindowType() == eWindowType_popup)
-    return YES;
-  if ([win isSheet])
-    return [win isKeyWindow];
-  return [win isMainWindow] && ![win attachedSheet];
-}
-
-// Toolbar controls and content controls respond to different window
-// activeness states.
-static BOOL IsActive(nsIFrame* aFrame, BOOL aIsToolbarControl)
-{
-  if (aIsToolbarControl)
-    return [NativeWindowForFrame(aFrame) isMainWindow];
-  return FrameIsInActiveWindow(aFrame);
-}
-
-static bool IsInSourceList(nsIFrame* aFrame) {
-  for (nsIFrame* frame = aFrame->GetParent(); frame; frame = frame->GetParent()) {
-    if (frame->StyleDisplay()->mAppearance == NS_THEME_MAC_SOURCE_LIST) {
-      return true;
-    }
-  }
-  return false;
-}
-
-NS_IMPL_ISUPPORTS_INHERITED(nsNativeThemeCocoa, nsNativeTheme, nsITheme)
-
-nsNativeThemeCocoa::nsNativeThemeCocoa()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  kMaxFocusRingWidth = nsCocoaFeatures::OnYosemiteOrLater() ? 7 : 4;
-
-  // provide a local autorelease pool, as this is called during startup
-  // before the main event-loop pool is in place
-  nsAutoreleasePool pool;
-
-  mDisclosureButtonCell = [[NSButtonCell alloc] initTextCell:@""];
-  [mDisclosureButtonCell setBezelStyle:NSRoundedDisclosureBezelStyle];
-  [mDisclosureButtonCell setButtonType:NSPushOnPushOffButton];
-  [mDisclosureButtonCell setHighlightsBy:NSPushInCellMask];
-  
-  mHelpButtonCell = [[NSButtonCell alloc] initTextCell:@""];
-  [mHelpButtonCell setBezelStyle:NSHelpButtonBezelStyle];
-  [mHelpButtonCell setButtonType:NSMomentaryPushInButton];
-  [mHelpButtonCell setHighlightsBy:NSPushInCellMask];
-
-  mPushButtonCell = [[NSButtonCell alloc] initTextCell:@""];
-  [mPushButtonCell setButtonType:NSMomentaryPushInButton];
-  [mPushButtonCell setHighlightsBy:NSPushInCellMask];
-
-  mRadioButtonCell = [[RadioButtonCell alloc] initTextCell:@""];
-  [mRadioButtonCell setButtonType:NSRadioButton];
-
-  mCheckboxCell = [[CheckboxCell alloc] initTextCell:@""];
-  [mCheckboxCell setButtonType:NSSwitchButton];
-  [mCheckboxCell setAllowsMixedState:YES];
-
-#if defined(__x86_64__)
-  mSearchFieldCell = [[SearchFieldCellWithFocusRing alloc] initTextCell:@""];
-#else
-  mSearchFieldCell = [[ContextAwareSearchFieldCell alloc] initTextCell:@""];
-#endif
-  [mSearchFieldCell setBezelStyle:NSTextFieldRoundedBezel];
-  [mSearchFieldCell setBezeled:YES];
-  [mSearchFieldCell setEditable:YES];
-  [mSearchFieldCell setFocusRingType:NSFocusRingTypeExterior];
-
-  mDropdownCell = [[NSPopUpButtonCell alloc] initTextCell:@"" pullsDown:NO];
-
-  mComboBoxCell = [[NSComboBoxCell alloc] initTextCell:@""];
-  [mComboBoxCell setBezeled:YES];
-  [mComboBoxCell setEditable:YES];
-  [mComboBoxCell setFocusRingType:NSFocusRingTypeExterior];
-
-  mProgressBarCell = [[NSProgressBarCell alloc] init];
-
-  mMeterBarCell = [[NSLevelIndicatorCell alloc]
-                    initWithLevelIndicatorStyle:NSContinuousCapacityLevelIndicatorStyle];
-
-  mCellDrawView = [[CellDrawView alloc] init];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-nsNativeThemeCocoa::~nsNativeThemeCocoa()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  [mMeterBarCell release];
-  [mProgressBarCell release];
-  [mDisclosureButtonCell release];
-  [mHelpButtonCell release];
-  [mPushButtonCell release];
-  [mRadioButtonCell release];
-  [mCheckboxCell release];
-  [mSearchFieldCell release];
-  [mDropdownCell release];
-  [mComboBoxCell release];
-  [mCellDrawView release];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-// Limit on the area of the target rect (in pixels^2) in
-// DrawCellWithScaling() and DrawButton() and above which we
-// don't draw the object into a bitmap buffer.  This is to avoid crashes in
-// [NSGraphicsContext graphicsContextWithGraphicsPort:flipped:] and
-// CGContextDrawImage(), and also to avoid very poor drawing performance in
-// CGContextDrawImage() when it scales the bitmap (particularly if xscale or
-// yscale is less than but near 1 -- e.g. 0.9).  This value was determined
-// by trial and error, on OS X 10.4.11 and 10.5.4, and on systems with
-// different amounts of RAM.
-#define BITMAP_MAX_AREA 500000
-
-static int
-GetBackingScaleFactorForRendering(CGContextRef cgContext)
-{
-  CGAffineTransform ctm = CGContextGetUserSpaceToDeviceSpaceTransform(cgContext);
-  CGRect transformedUserSpacePixel = CGRectApplyAffineTransform(CGRectMake(0, 0, 1, 1), ctm);
-  float maxScale = std::max(fabs(transformedUserSpacePixel.size.width),
-                          fabs(transformedUserSpacePixel.size.height));
-  return maxScale > 1.0 ? 2 : 1;  
-}
-
-/*
- * Draw the given NSCell into the given cgContext.
- *
- * destRect - the size and position of the resulting control rectangle
- * controlSize - the NSControlSize which will be given to the NSCell before
- *  asking it to render
- * naturalSize - The natural dimensions of this control.
- *  If the control rect size is not equal to either of these, a scale
- *  will be applied to the context so that rendering the control at the
- *  natural size will result in it filling the destRect space.
- *  If a control has no natural dimensions in either/both axes, pass 0.0f.
- * minimumSize - The minimum dimensions of this control.
- *  If the control rect size is less than the minimum for a given axis,
- *  a scale will be applied to the context so that the minimum is used
- *  for drawing.  If a control has no minimum dimensions in either/both
- *  axes, pass 0.0f.
- * marginSet - an array of margins; a multidimensional array of [2][3][4],
- *  with the first dimension being the OS version (Tiger or Leopard),
- *  the second being the control size (mini, small, regular), and the third
- *  being the 4 margin values (left, top, right, bottom).
- * view - The NSView that we're drawing into. As far as I can tell, it doesn't
- *  matter if this is really the right view; it just has to return YES when
- *  asked for isFlipped. Otherwise we'll get drawing bugs on 10.4.
- * mirrorHorizontal - whether to mirror the cell horizontally
- */
-static void DrawCellWithScaling(NSCell *cell,
-                                CGContextRef cgContext,
-                                const HIRect& destRect,
-                                NSControlSize controlSize,
-                                NSSize naturalSize,
-                                NSSize minimumSize,
-                                const float marginSet[][3][4],
-                                NSView* view,
-                                BOOL mirrorHorizontal)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  NSRect drawRect = NSMakeRect(destRect.origin.x, destRect.origin.y, destRect.size.width, destRect.size.height);
-
-  if (naturalSize.width != 0.0f)
-    drawRect.size.width = naturalSize.width;
-  if (naturalSize.height != 0.0f)
-    drawRect.size.height = naturalSize.height;
-
-  // Keep aspect ratio when scaling if one dimension is free.
-  if (naturalSize.width == 0.0f && naturalSize.height != 0.0f)
-    drawRect.size.width = destRect.size.width * naturalSize.height / destRect.size.height;
-  if (naturalSize.height == 0.0f && naturalSize.width != 0.0f)
-    drawRect.size.height = destRect.size.height * naturalSize.width / destRect.size.width;
-
-  // Honor minimum sizes.
-  if (drawRect.size.width < minimumSize.width)
-    drawRect.size.width = minimumSize.width;
-  if (drawRect.size.height < minimumSize.height)
-    drawRect.size.height = minimumSize.height;
-
-  [NSGraphicsContext saveGraphicsState];
-
-  // Only skip the buffer if the area of our cell (in pixels^2) is too large.
-  if (drawRect.size.width * drawRect.size.height > BITMAP_MAX_AREA) {
-    // Inflate the rect Gecko gave us by the margin for the control.
-    InflateControlRect(&drawRect, controlSize, marginSet);
-
-    NSGraphicsContext* savedContext = [NSGraphicsContext currentContext];
-    [NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithGraphicsPort:cgContext flipped:YES]];
-
-    DrawCellIncludingFocusRing(cell, drawRect, view);
-
-    [NSGraphicsContext setCurrentContext:savedContext];
-  }
-  else {
-    float w = ceil(drawRect.size.width);
-    float h = ceil(drawRect.size.height);
-    NSRect tmpRect = NSMakeRect(kMaxFocusRingWidth, kMaxFocusRingWidth, w, h);
-
-    // inflate to figure out the frame we need to tell NSCell to draw in, to get something that's 0,0,w,h
-    InflateControlRect(&tmpRect, controlSize, marginSet);
-
-    // and then, expand by kMaxFocusRingWidth size to make sure we can capture any focus ring
-    w += kMaxFocusRingWidth * 2.0;
-    h += kMaxFocusRingWidth * 2.0;
-
-    int backingScaleFactor = GetBackingScaleFactorForRendering(cgContext);
-    CGColorSpaceRef rgb = CGColorSpaceCreateDeviceRGB();
-    CGContextRef ctx = CGBitmapContextCreate(NULL,
-                                             (int) w * backingScaleFactor, (int) h * backingScaleFactor,
-                                             8, (int) w * backingScaleFactor * 4,
-                                             rgb, kCGImageAlphaPremultipliedFirst);
-    CGColorSpaceRelease(rgb);
-
-    // We need to flip the image twice in order to avoid drawing bugs on 10.4, see bug 465069.
-    // This is the first flip transform, applied to cgContext.
-    CGContextScaleCTM(cgContext, 1.0f, -1.0f);
-    CGContextTranslateCTM(cgContext, 0.0f, -(2.0 * destRect.origin.y + destRect.size.height));
-    if (mirrorHorizontal) {
-      CGContextScaleCTM(cgContext, -1.0f, 1.0f);
-      CGContextTranslateCTM(cgContext, -(2.0 * destRect.origin.x + destRect.size.width), 0.0f);
-    }
-
-    NSGraphicsContext* savedContext = [NSGraphicsContext currentContext];
-    [NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithGraphicsPort:ctx flipped:YES]];
-
-    CGContextScaleCTM(ctx, backingScaleFactor, backingScaleFactor);
-
-    // Set the context's "base transform" to in order to get correctly-sized focus rings.
-    CGContextSetBaseCTM(ctx, CGAffineTransformMakeScale(backingScaleFactor, backingScaleFactor));
-
-    // This is the second flip transform, applied to ctx.
-    CGContextScaleCTM(ctx, 1.0f, -1.0f);
-    CGContextTranslateCTM(ctx, 0.0f, -(2.0 * tmpRect.origin.y + tmpRect.size.height));
-
-    DrawCellIncludingFocusRing(cell, tmpRect, view);
-
-    [NSGraphicsContext setCurrentContext:savedContext];
-
-    CGImageRef img = CGBitmapContextCreateImage(ctx);
-
-    // Drop the image into the original destination rectangle, scaling to fit
-    // Only scale kMaxFocusRingWidth by xscale/yscale when the resulting rect
-    // doesn't extend beyond the overflow rect
-    float xscale = destRect.size.width / drawRect.size.width;
-    float yscale = destRect.size.height / drawRect.size.height;
-    float scaledFocusRingX = xscale < 1.0f ? kMaxFocusRingWidth * xscale : kMaxFocusRingWidth;
-    float scaledFocusRingY = yscale < 1.0f ? kMaxFocusRingWidth * yscale : kMaxFocusRingWidth;
-    CGContextDrawImage(cgContext, CGRectMake(destRect.origin.x - scaledFocusRingX,
-                                             destRect.origin.y - scaledFocusRingY,
-                                             destRect.size.width + scaledFocusRingX * 2,
-                                             destRect.size.height + scaledFocusRingY * 2),
-                       img);
-
-    CGImageRelease(img);
-    CGContextRelease(ctx);
-  }
-
-  [NSGraphicsContext restoreGraphicsState];
-
-#if DRAW_IN_FRAME_DEBUG
-  CGContextSetRGBFillColor(cgContext, 0.0, 0.0, 0.5, 0.25);
-  CGContextFillRect(cgContext, destRect);
-#endif
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-struct CellRenderSettings {
-  // The natural dimensions of the control.
-  // If a control has no natural dimensions in either/both axes, set to 0.0f.
-  NSSize naturalSizes[3];
-
-  // The minimum dimensions of the control.
-  // If a control has no minimum dimensions in either/both axes, set to 0.0f.
-  NSSize minimumSizes[3];
-
-  // A three-dimensional array,
-  // with the first dimension being the OS version ([0] 10.6-10.9, [1] 10.10 and above),
-  // the second being the control size (mini, small, regular), and the third
-  // being the 4 margin values (left, top, right, bottom).
-  float margins[2][3][4];
-};
-
-/*
- * This is a helper method that returns the required NSControlSize given a size
- * and the size of the three controls plus a tolerance.
- * size - The width or the height of the element to draw.
- * sizes - An array with the all the width/height of the element for its
- *         different sizes.
- * tolerance - The tolerance as passed to DrawCellWithSnapping.
- * NOTE: returns NSRegularControlSize if all values in 'sizes' are zero.
- */
-static NSControlSize FindControlSize(CGFloat size, const CGFloat* sizes, CGFloat tolerance)
-{
-  for (uint32_t i = miniControlSize; i <= regularControlSize; ++i) {
-    if (sizes[i] == 0) {
-      continue;
-    }
-
-    CGFloat next = 0;
-    // Find next value.
-    for (uint32_t j = i+1; j <= regularControlSize; ++j) {
-      if (sizes[j] != 0) {
-        next = sizes[j];
-        break;
-      }
-    }
-
-    // If it's the latest value, we pick it.
-    if (next == 0) {
-      return CocoaSizeForEnum(i);
-    }
-
-    if (size <= sizes[i] + tolerance && size < next) {
-      return CocoaSizeForEnum(i);
-    }
-  }
-
-  // If we are here, that means sizes[] was an array with only empty values
-  // or the algorithm above is wrong.
-  // The former can happen but the later would be wrong.
-  NS_ASSERTION(sizes[0] == 0 && sizes[1] == 0 && sizes[2] == 0,
-               "We found no control! We shouldn't be there!");
-  return CocoaSizeForEnum(regularControlSize);
-}
-
-/*
- * Draw the given NSCell into the given cgContext with a nice control size.
- *
- * This function is similar to DrawCellWithScaling, but it decides what
- * control size to use based on the destRect's size.
- * Scaling is only applied when the difference between the destRect's size
- * and the next smaller natural size is greater than snapTolerance. Otherwise
- * it snaps to the next smaller control size without scaling because unscaled
- * controls look nicer.
- */
-static void DrawCellWithSnapping(NSCell *cell,
-                                 CGContextRef cgContext,
-                                 const HIRect& destRect,
-                                 const CellRenderSettings settings,
-                                 float verticalAlignFactor,
-                                 NSView* view,
-                                 BOOL mirrorHorizontal,
-                                 float snapTolerance = 2.0f)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  const float rectWidth = destRect.size.width, rectHeight = destRect.size.height;
-  const NSSize *sizes = settings.naturalSizes;
-  const NSSize miniSize = sizes[EnumSizeForCocoaSize(NSMiniControlSize)];
-  const NSSize smallSize = sizes[EnumSizeForCocoaSize(NSSmallControlSize)];
-  const NSSize regularSize = sizes[EnumSizeForCocoaSize(NSRegularControlSize)];
-
-  HIRect drawRect = destRect;
-
-  CGFloat controlWidths[3] = { miniSize.width, smallSize.width, regularSize.width };
-  NSControlSize controlSizeX = FindControlSize(rectWidth, controlWidths, snapTolerance);
-  CGFloat controlHeights[3] = { miniSize.height, smallSize.height, regularSize.height };
-  NSControlSize controlSizeY = FindControlSize(rectHeight, controlHeights, snapTolerance);
-
-  NSControlSize controlSize = NSRegularControlSize;
-  size_t sizeIndex = 0;
-
-  // At some sizes, don't scale but snap.
-  const NSControlSize smallerControlSize =
-    EnumSizeForCocoaSize(controlSizeX) < EnumSizeForCocoaSize(controlSizeY) ?
-    controlSizeX : controlSizeY;
-  const size_t smallerControlSizeIndex = EnumSizeForCocoaSize(smallerControlSize);
-  const NSSize size = sizes[smallerControlSizeIndex];
-  float diffWidth = size.width ? rectWidth - size.width : 0.0f;
-  float diffHeight = size.height ? rectHeight - size.height : 0.0f;
-  if (diffWidth >= 0.0f && diffHeight >= 0.0f &&
-      diffWidth <= snapTolerance && diffHeight <= snapTolerance) {
-    // Snap to the smaller control size.
-    controlSize = smallerControlSize;
-    sizeIndex = smallerControlSizeIndex;
-    MOZ_ASSERT(sizeIndex < ArrayLength(settings.naturalSizes));
-
-    // Resize and center the drawRect.
-    if (sizes[sizeIndex].width) {
-      drawRect.origin.x += ceil((destRect.size.width - sizes[sizeIndex].width) / 2);
-      drawRect.size.width = sizes[sizeIndex].width;
-    }
-    if (sizes[sizeIndex].height) {
-      drawRect.origin.y += floor((destRect.size.height - sizes[sizeIndex].height) * verticalAlignFactor);
-      drawRect.size.height = sizes[sizeIndex].height;
-    }
-  } else {
-    // Use the larger control size.
-    controlSize = EnumSizeForCocoaSize(controlSizeX) > EnumSizeForCocoaSize(controlSizeY) ?
-                  controlSizeX : controlSizeY;
-    sizeIndex = EnumSizeForCocoaSize(controlSize);
-   }
-
-  [cell setControlSize:controlSize];
-
-  MOZ_ASSERT(sizeIndex < ArrayLength(settings.minimumSizes));
-  const NSSize minimumSize = settings.minimumSizes[sizeIndex];
-  DrawCellWithScaling(cell, cgContext, drawRect, controlSize, sizes[sizeIndex],
-                      minimumSize, settings.margins, view, mirrorHorizontal);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-@interface NSWindow(CoreUIRendererPrivate)
-+ (CUIRendererRef)coreUIRenderer;
-@end
-
-static id
-GetAquaAppearance()
-{
-  // We only need NSAppearance on 10.10 and up.
-  if (nsCocoaFeatures::OnYosemiteOrLater()) {
-    Class NSAppearanceClass = NSClassFromString(@"NSAppearance");
-    if (NSAppearanceClass &&
-        [NSAppearanceClass respondsToSelector:@selector(appearanceNamed:)]) {
-      return [NSAppearanceClass performSelector:@selector(appearanceNamed:)
-                                     withObject:@"NSAppearanceNameAqua"];
-    }
-  }
-  return nil;
-}
-
-@interface NSObject(NSAppearanceCoreUIRendering)
-- (void)_drawInRect:(CGRect)rect context:(CGContextRef)cgContext options:(id)options;
-@end
-
-static void
-RenderWithCoreUI(CGRect aRect, CGContextRef cgContext, NSDictionary* aOptions, bool aSkipAreaCheck = false)
-{
-  id appearance = GetAquaAppearance();
-
-  if (!aSkipAreaCheck && aRect.size.width * aRect.size.height > BITMAP_MAX_AREA) {
-    return;
-  }
-
-  if (appearance && [appearance respondsToSelector:@selector(_drawInRect:context:options:)]) {
-    // Render through NSAppearance on Mac OS 10.10 and up. This will call
-    // CUIDraw with a CoreUI renderer that will give us the correct 10.10
-    // style. Calling CUIDraw directly with [NSWindow coreUIRenderer] still
-    // renders 10.9-style widgets on 10.10.
-    [appearance _drawInRect:aRect context:cgContext options:aOptions];
-  } else {
-    // 10.9 and below
-    CUIRendererRef renderer = [NSWindow respondsToSelector:@selector(coreUIRenderer)]
-      ? [NSWindow coreUIRenderer] : nil;
-    CUIDraw(renderer, aRect, cgContext, (CFDictionaryRef)aOptions, NULL);
-  }
-}
-
-static float VerticalAlignFactor(nsIFrame *aFrame)
-{
-  if (!aFrame)
-    return 0.5f; // default: center
-
-  const nsStyleCoord& va = aFrame->StyleDisplay()->mVerticalAlign;
-  uint8_t intval = (va.GetUnit() == eStyleUnit_Enumerated)
-                     ? va.GetIntValue()
-                     : NS_STYLE_VERTICAL_ALIGN_MIDDLE;
-  switch (intval) {
-    case NS_STYLE_VERTICAL_ALIGN_TOP:
-    case NS_STYLE_VERTICAL_ALIGN_TEXT_TOP:
-      return 0.0f;
-
-    case NS_STYLE_VERTICAL_ALIGN_SUB:
-    case NS_STYLE_VERTICAL_ALIGN_SUPER:
-    case NS_STYLE_VERTICAL_ALIGN_MIDDLE:
-    case NS_STYLE_VERTICAL_ALIGN_MIDDLE_WITH_BASELINE:
-      return 0.5f;
-
-    case NS_STYLE_VERTICAL_ALIGN_BASELINE:
-    case NS_STYLE_VERTICAL_ALIGN_TEXT_BOTTOM:
-    case NS_STYLE_VERTICAL_ALIGN_BOTTOM:
-      return 1.0f;
-
-    default:
-      NS_NOTREACHED("invalid vertical-align");
-      return 0.5f;
-  }
-}
-
-// These are the sizes that Gecko needs to request to draw if it wants
-// to get a standard-sized Aqua radio button drawn. Note that the rects
-// that draw these are actually a little bigger.
-static const CellRenderSettings radioSettings = {
-  {
-    NSMakeSize(11, 11), // mini
-    NSMakeSize(13, 13), // small
-    NSMakeSize(16, 16)  // regular
-  },
-  {
-    NSZeroSize, NSZeroSize, NSZeroSize
-  },
-  {
-    { // Leopard
-      {0, 0, 0, 0},     // mini
-      {0, 1, 1, 1},     // small
-      {0, 0, 0, 0}      // regular
-    },
-    { // Yosemite
-      {0, 0, 0, 0},     // mini
-      {1, 1, 1, 2},     // small
-      {0, 0, 0, 0}      // regular
-    }
-  }
-};
-
-static const CellRenderSettings checkboxSettings = {
-  {
-    NSMakeSize(11, 11), // mini
-    NSMakeSize(13, 13), // small
-    NSMakeSize(16, 16)  // regular
-  },
-  {
-    NSZeroSize, NSZeroSize, NSZeroSize
-  },
-  {
-    { // Leopard
-      {0, 1, 0, 0},     // mini
-      {0, 1, 0, 1},     // small
-      {0, 1, 0, 1}      // regular
-    },
-    { // Yosemite
-      {0, 1, 0, 0},     // mini
-      {0, 1, 0, 1},     // small
-      {0, 1, 0, 1}      // regular
-    }
-  }
-};
-
-void
-nsNativeThemeCocoa::DrawCheckboxOrRadio(CGContextRef cgContext, bool inCheckbox,
-                                        const HIRect& inBoxRect, bool inSelected,
-                                        EventStates inState, nsIFrame* aFrame)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  NSButtonCell *cell = inCheckbox ? mCheckboxCell : mRadioButtonCell;
-  NSCellStateValue state = inSelected ? NSOnState : NSOffState;
-
-  // Check if we have an indeterminate checkbox
-  if (inCheckbox && GetIndeterminate(aFrame))
-    state = NSMixedState;
-
-  [cell setEnabled:!IsDisabled(aFrame, inState)];
-  [cell setShowsFirstResponder:inState.HasState(NS_EVENT_STATE_FOCUS)];
-  [cell setState:state];
-  [cell setHighlighted:inState.HasAllStates(NS_EVENT_STATE_ACTIVE | NS_EVENT_STATE_HOVER)];
-  [cell setControlTint:(FrameIsInActiveWindow(aFrame) ? [NSColor currentControlTint] : NSClearControlTint)];
-
-  // Ensure that the control is square.
-  float length = std::min(inBoxRect.size.width, inBoxRect.size.height);
-  HIRect drawRect = CGRectMake(inBoxRect.origin.x + (int)((inBoxRect.size.width - length) / 2.0f),
-                               inBoxRect.origin.y + (int)((inBoxRect.size.height - length) / 2.0f),
-                               length, length);
-
-  DrawCellWithSnapping(cell, cgContext, drawRect,
-                       inCheckbox ? checkboxSettings : radioSettings,
-                       VerticalAlignFactor(aFrame), mCellDrawView, NO);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-static const CellRenderSettings searchFieldSettings = {
-  {
-    NSMakeSize(0, 16), // mini
-    NSMakeSize(0, 19), // small
-    NSMakeSize(0, 22)  // regular
-  },
-  {
-    NSMakeSize(32, 0), // mini
-    NSMakeSize(38, 0), // small
-    NSMakeSize(44, 0)  // regular
-  },
-  {
-    { // Leopard
-      {0, 0, 0, 0},     // mini
-      {0, 0, 0, 0},     // small
-      {0, 0, 0, 0}      // regular
-    },
-    { // Yosemite
-      {0, 0, 0, 0},     // mini
-      {0, 0, 0, 0},     // small
-      {0, 0, 0, 0}      // regular
-    }
-  }
-};
-
-void
-nsNativeThemeCocoa::DrawSearchField(CGContextRef cgContext, const HIRect& inBoxRect,
-                                    nsIFrame* aFrame, EventStates inState)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  ContextAwareSearchFieldCell* cell = mSearchFieldCell;
-  [cell setContext:aFrame];
-  [cell setEnabled:!IsDisabled(aFrame, inState)];
-  // NOTE: this could probably use inState
-  [cell setShowsFirstResponder:IsFocused(aFrame)];
-
-  // When using the 10.11 SDK, the default string will be shown if we don't
-  // set the placeholder string.
-  [cell setPlaceholderString:@""];
-
-  DrawCellWithSnapping(cell, cgContext, inBoxRect, searchFieldSettings,
-                       VerticalAlignFactor(aFrame), mCellDrawView,
-                       IsFrameRTL(aFrame));
-
-  [cell setContext:nullptr];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-static const NSSize kCheckmarkSize = NSMakeSize(11, 11);
-static const NSSize kMenuarrowSize = NSMakeSize(9, 10);
-static const NSSize kMenuScrollArrowSize = NSMakeSize(10, 8);
-static NSString* kCheckmarkImage = @"MenuOnState";
-static NSString* kMenuarrowRightImage = @"MenuSubmenu";
-static NSString* kMenuarrowLeftImage = @"MenuSubmenuLeft";
-static NSString* kMenuDownScrollArrowImage = @"MenuScrollDown";
-static NSString* kMenuUpScrollArrowImage = @"MenuScrollUp";
-static const CGFloat kMenuIconIndent = 6.0f;
-
-void
-nsNativeThemeCocoa::DrawMenuIcon(CGContextRef cgContext, const CGRect& aRect,
-                                 EventStates inState, nsIFrame* aFrame,
-                                 const NSSize& aIconSize, NSString* aImageName,
-                                 bool aCenterHorizontally)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  // Adjust size and position of our drawRect.
-  CGFloat paddingX = std::max(CGFloat(0.0), aRect.size.width - aIconSize.width);
-  CGFloat paddingY = std::max(CGFloat(0.0), aRect.size.height - aIconSize.height);
-  CGFloat paddingStartX = std::min(paddingX, kMenuIconIndent);
-  CGFloat paddingEndX = std::max(CGFloat(0.0), paddingX - kMenuIconIndent);
-  CGRect drawRect = CGRectMake(
-    aRect.origin.x + (aCenterHorizontally ? ceil(paddingX / 2) :
-                      IsFrameRTL(aFrame) ? paddingEndX : paddingStartX),
-    aRect.origin.y + ceil(paddingY / 2),
-    aIconSize.width, aIconSize.height);
-
-  NSString* state = IsDisabled(aFrame, inState) ? @"disabled" :
-    (CheckBooleanAttr(aFrame, nsGkAtoms::menuactive) ? @"pressed" : @"normal");
-
-  NSString* imageName = aImageName;
-  if (!nsCocoaFeatures::OnElCapitanOrLater()) {
-    // Pre-10.11, image names are prefixed with "image."
-    imageName = [@"image." stringByAppendingString:aImageName];
-  }
-
-  RenderWithCoreUI(drawRect, cgContext,
-          [NSDictionary dictionaryWithObjectsAndKeys:
-            @"kCUIBackgroundTypeMenu", @"backgroundTypeKey",
-            imageName, @"imageNameKey",
-            state, @"state",
-            @"image", @"widget",
-            [NSNumber numberWithBool:YES], @"is.flipped",
-            nil]);
-
-#if DRAW_IN_FRAME_DEBUG
-  CGContextSetRGBFillColor(cgContext, 0.0, 0.0, 0.5, 0.25);
-  CGContextFillRect(cgContext, drawRect);
-#endif
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-static const NSSize kHelpButtonSize = NSMakeSize(20, 20);
-static const NSSize kDisclosureButtonSize = NSMakeSize(21, 21);
-
-static const CellRenderSettings pushButtonSettings = {
-  {
-    NSMakeSize(0, 16), // mini
-    NSMakeSize(0, 19), // small
-    NSMakeSize(0, 22)  // regular
-  },
-  {
-    NSMakeSize(18, 0), // mini
-    NSMakeSize(26, 0), // small
-    NSMakeSize(30, 0)  // regular
-  },
-  {
-    { // Leopard
-      {0, 0, 0, 0},    // mini
-      {4, 0, 4, 1},    // small
-      {5, 0, 5, 2}     // regular
-    },
-    { // Yosemite
-      {0, 0, 0, 0},    // mini
-      {4, 0, 4, 1},    // small
-      {5, 0, 5, 2}     // regular
-    }
-  }
-};
-
-// The height at which we start doing square buttons instead of rounded buttons
-// Rounded buttons look bad if drawn at a height greater than 26, so at that point
-// we switch over to doing square buttons which looks fine at any size.
-#define DO_SQUARE_BUTTON_HEIGHT 26
-
-void
-nsNativeThemeCocoa::DrawPushButton(CGContextRef cgContext, const HIRect& inBoxRect,
-                                   EventStates inState, uint8_t aWidgetType,
-                                   nsIFrame* aFrame, float aOriginalHeight)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  BOOL isActive = FrameIsInActiveWindow(aFrame);
-  BOOL isDisabled = IsDisabled(aFrame, inState);
-
-  NSButtonCell* cell = (aWidgetType == NS_THEME_BUTTON) ? mPushButtonCell :
-    (aWidgetType == NS_THEME_MAC_HELP_BUTTON) ? mHelpButtonCell : mDisclosureButtonCell;
-  [cell setEnabled:!isDisabled];
-  [cell setHighlighted:isActive &&
-                       inState.HasAllStates(NS_EVENT_STATE_ACTIVE | NS_EVENT_STATE_HOVER)];
-  [cell setShowsFirstResponder:inState.HasState(NS_EVENT_STATE_FOCUS) && !isDisabled && isActive];
-
-  if (aWidgetType != NS_THEME_BUTTON) { // Help button or disclosure button.
-    NSSize buttonSize = NSMakeSize(0, 0);
-    if (aWidgetType == NS_THEME_MAC_HELP_BUTTON) {
-      buttonSize = kHelpButtonSize;
-    } else { // Disclosure button.
-      buttonSize = kDisclosureButtonSize;
-      [cell setState:(aWidgetType == NS_THEME_MAC_DISCLOSURE_BUTTON_CLOSED) ? NSOffState : NSOnState];
-    }
-
-    DrawCellWithScaling(cell, cgContext, inBoxRect, NSRegularControlSize,
-                        NSZeroSize, buttonSize, NULL, mCellDrawView,
-                        false); // Don't mirror icon in RTL.
-  } else {
-    // If the button is tall enough, draw the square button style so that
-    // buttons with non-standard content look good. Otherwise draw normal
-    // rounded aqua buttons.
-    // This comparison is done based on the height that is calculated without
-    // the top, because the snapped height can be affected by the top of the
-    // rect and that may result in different height depending on the top value.
-    if (aOriginalHeight > DO_SQUARE_BUTTON_HEIGHT) {
-      [cell setBezelStyle:NSShadowlessSquareBezelStyle];
-      DrawCellWithScaling(cell, cgContext, inBoxRect, NSRegularControlSize,
-                          NSZeroSize, NSMakeSize(14, 0), NULL, mCellDrawView,
-                          IsFrameRTL(aFrame));
-    } else {
-      [cell setBezelStyle:NSRoundedBezelStyle];
-      DrawCellWithSnapping(cell, cgContext, inBoxRect, pushButtonSettings, 0.5f,
-                           mCellDrawView, IsFrameRTL(aFrame), 1.0f);
-    }
-  }
-
-#if DRAW_IN_FRAME_DEBUG
-  CGContextSetRGBFillColor(cgContext, 0.0, 0.0, 0.5, 0.25);
-  CGContextFillRect(cgContext, inBoxRect);
-#endif
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void
-nsNativeThemeCocoa::DrawFocusOutline(CGContextRef cgContext, const HIRect& inBoxRect,
-                                     EventStates inState, uint8_t aWidgetType,
-                                     nsIFrame* aFrame)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  HIThemeFrameDrawInfo fdi;
-  fdi.version = 0;
-  fdi.kind = kHIThemeFrameTextFieldSquare;
-  fdi.state = kThemeStateActive;
-  fdi.isFocused = TRUE;
-
-#if DRAW_IN_FRAME_DEBUG
-  CGContextSetRGBFillColor(cgContext, 0.0, 0.0, 0.5, 0.25);
-  CGContextFillRect(cgContext, inBoxRect);
-#endif
-
-  HIThemeDrawFrame(&inBoxRect, &fdi, cgContext, HITHEME_ORIENTATION);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-typedef void (*RenderHIThemeControlFunction)(CGContextRef cgContext, const HIRect& aRenderRect, void* aData);
-
-static void
-RenderTransformedHIThemeControl(CGContextRef aCGContext, const HIRect& aRect,
-                                RenderHIThemeControlFunction aFunc, void* aData,
-                                BOOL mirrorHorizontally = NO)
-{
-  CGAffineTransform savedCTM = CGContextGetCTM(aCGContext);
-  CGContextTranslateCTM(aCGContext, aRect.origin.x, aRect.origin.y);
-
-  bool drawDirect;
-  HIRect drawRect = aRect;
-  drawRect.origin = CGPointZero;
-
-  if (!mirrorHorizontally && savedCTM.a == 1.0f && savedCTM.b == 0.0f &&
-      savedCTM.c == 0.0f && (savedCTM.d == 1.0f || savedCTM.d == -1.0f)) {
-    drawDirect = TRUE;
-  } else {
-    drawDirect = FALSE;
-  }
-
-  // Fall back to no bitmap buffer if the area of our control (in pixels^2)
-  // is too large.
-  if (drawDirect || (aRect.size.width * aRect.size.height > BITMAP_MAX_AREA)) {
-    aFunc(aCGContext, drawRect, aData);
-  } else {
-    // Inflate the buffer to capture focus rings.
-    int w = ceil(drawRect.size.width) + 2 * kMaxFocusRingWidth;
-    int h = ceil(drawRect.size.height) + 2 * kMaxFocusRingWidth;
-
-    int backingScaleFactor = GetBackingScaleFactorForRendering(aCGContext);
-    CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
-    CGContextRef bitmapctx = CGBitmapContextCreate(NULL,
-                                                   w * backingScaleFactor,
-                                                   h * backingScaleFactor,
-                                                   8,
-                                                   w * backingScaleFactor * 4,
-                                                   colorSpace,
-                                                   kCGImageAlphaPremultipliedFirst);
-    CGColorSpaceRelease(colorSpace);
-
-    CGContextScaleCTM(bitmapctx, backingScaleFactor, backingScaleFactor);
-    CGContextTranslateCTM(bitmapctx, kMaxFocusRingWidth, kMaxFocusRingWidth);
-
-    // Set the context's "base transform" to in order to get correctly-sized focus rings.
-    CGContextSetBaseCTM(bitmapctx, CGAffineTransformMakeScale(backingScaleFactor, backingScaleFactor));
-
-    // HITheme always wants to draw into a flipped context, or things
-    // get confused.
-    CGContextTranslateCTM(bitmapctx, 0.0f, aRect.size.height);
-    CGContextScaleCTM(bitmapctx, 1.0f, -1.0f);
-
-    aFunc(bitmapctx, drawRect, aData);
-
-    CGImageRef bitmap = CGBitmapContextCreateImage(bitmapctx);
-
-    CGAffineTransform ctm = CGContextGetCTM(aCGContext);
-
-    // We need to unflip, so that we can do a DrawImage without getting a flipped image.
-    CGContextTranslateCTM(aCGContext, 0.0f, aRect.size.height);
-    CGContextScaleCTM(aCGContext, 1.0f, -1.0f);
-
-    if (mirrorHorizontally) {
-      CGContextTranslateCTM(aCGContext, aRect.size.width, 0);
-      CGContextScaleCTM(aCGContext, -1.0f, 1.0f);
-    }
-
-    HIRect inflatedDrawRect = CGRectMake(-kMaxFocusRingWidth, -kMaxFocusRingWidth, w, h);
-    CGContextDrawImage(aCGContext, inflatedDrawRect, bitmap);
-
-    CGContextSetCTM(aCGContext, ctm);
-
-    CGImageRelease(bitmap);
-    CGContextRelease(bitmapctx);
-  }
-
-  CGContextSetCTM(aCGContext, savedCTM);
-}
-
-static void
-RenderButton(CGContextRef cgContext, const HIRect& aRenderRect, void* aData)
-{
-  HIThemeButtonDrawInfo* bdi = (HIThemeButtonDrawInfo*)aData;
-  HIThemeDrawButton(&aRenderRect, bdi, cgContext, kHIThemeOrientationNormal, NULL);
-}
-
-void
-nsNativeThemeCocoa::DrawButton(CGContextRef cgContext, ThemeButtonKind inKind,
-                               const HIRect& inBoxRect, bool inIsDefault,
-                               ThemeButtonValue inValue, ThemeButtonAdornment inAdornment,
-                               EventStates inState, nsIFrame* aFrame)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  BOOL isActive = FrameIsInActiveWindow(aFrame);
-  BOOL isDisabled = IsDisabled(aFrame, inState);
-
-  HIThemeButtonDrawInfo bdi;
-  bdi.version = 0;
-  bdi.kind = inKind;
-  bdi.value = inValue;
-  bdi.adornment = inAdornment;
-
-  if (isDisabled) {
-    bdi.state = kThemeStateUnavailable;
-  }
-  else if (inState.HasAllStates(NS_EVENT_STATE_ACTIVE | NS_EVENT_STATE_HOVER)) {
-    bdi.state = kThemeStatePressed;
-  }
-  else {
-    if (inKind == kThemeArrowButton)
-      bdi.state = kThemeStateUnavailable; // these are always drawn as unavailable
-    else if (!isActive && inKind == kThemeListHeaderButton)
-      bdi.state = kThemeStateInactive;
-    else
-      bdi.state = kThemeStateActive;
-  }
-
-  if (inState.HasState(NS_EVENT_STATE_FOCUS) && isActive)
-    bdi.adornment |= kThemeAdornmentFocus;
-
-  if (inIsDefault && !isDisabled &&
-      !inState.HasState(NS_EVENT_STATE_ACTIVE)) {
-    bdi.adornment |= kThemeAdornmentDefault;
-    bdi.animation.time.start = 0;
-    bdi.animation.time.current = CFAbsoluteTimeGetCurrent();
-  }
-
-  HIRect drawFrame = inBoxRect;
-
-  if (inKind == kThemePushButton) {
-    drawFrame.size.height -= 2;
-    if (inBoxRect.size.height < pushButtonSettings.naturalSizes[smallControlSize].height) {
-      bdi.kind = kThemePushButtonMini;
-    }
-    else if (inBoxRect.size.height < pushButtonSettings.naturalSizes[regularControlSize].height) {
-      bdi.kind = kThemePushButtonSmall;
-      drawFrame.origin.y -= 1;
-      drawFrame.origin.x += 1;
-      drawFrame.size.width -= 2;
-    }
-  }
-  else if (inKind == kThemeListHeaderButton) {
-    CGContextClipToRect(cgContext, inBoxRect);
-    // Always remove the top border.
-    drawFrame.origin.y -= 1;
-    drawFrame.size.height += 1;
-    // Remove the left border in LTR mode and the right border in RTL mode.
-    drawFrame.size.width += 1;
-    bool isLast = IsLastTreeHeaderCell(aFrame);
-    if (isLast)
-      drawFrame.size.width += 1; // Also remove the other border.
-    if (!IsFrameRTL(aFrame) || isLast)
-      drawFrame.origin.x -= 1;
-  }
-
-  RenderTransformedHIThemeControl(cgContext, drawFrame, RenderButton, &bdi,
-                                  IsFrameRTL(aFrame));
-
-#if DRAW_IN_FRAME_DEBUG
-  CGContextSetRGBFillColor(cgContext, 0.0, 0.0, 0.5, 0.25);
-  CGContextFillRect(cgContext, inBoxRect);
-#endif
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-static const CellRenderSettings dropdownSettings = {
-  {
-    NSMakeSize(0, 16), // mini
-    NSMakeSize(0, 19), // small
-    NSMakeSize(0, 22)  // regular
-  },
-  {
-    NSMakeSize(18, 0), // mini
-    NSMakeSize(38, 0), // small
-    NSMakeSize(44, 0)  // regular
-  },
-  {
-    { // Leopard
-      {1, 1, 2, 1},    // mini
-      {3, 0, 3, 1},    // small
-      {3, 0, 3, 0}     // regular
-    },
-    { // Yosemite
-      {1, 1, 2, 1},    // mini
-      {3, 0, 3, 1},    // small
-      {3, 0, 3, 0}     // regular
-    }
-  }
-};
-
-static const CellRenderSettings editableMenulistSettings = {
-  {
-    NSMakeSize(0, 15), // mini
-    NSMakeSize(0, 18), // small
-    NSMakeSize(0, 21)  // regular
-  },
-  {
-    NSMakeSize(18, 0), // mini
-    NSMakeSize(38, 0), // small
-    NSMakeSize(44, 0)  // regular
-  },
-  {
-    { // Leopard
-      {0, 0, 2, 2},    // mini
-      {0, 0, 3, 2},    // small
-      {0, 1, 3, 3}     // regular
-    },
-    { // Yosemite
-      {0, 0, 2, 2},    // mini
-      {0, 0, 3, 2},    // small
-      {0, 1, 3, 3}     // regular
-    }
-  }
-};
-
-void
-nsNativeThemeCocoa::DrawDropdown(CGContextRef cgContext, const HIRect& inBoxRect,
-                                 EventStates inState, uint8_t aWidgetType,
-                                 nsIFrame* aFrame)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  [mDropdownCell setPullsDown:(aWidgetType == NS_THEME_BUTTON)];
-
-  BOOL isEditable = (aWidgetType == NS_THEME_MENULIST_TEXTFIELD);
-  NSCell* cell = isEditable ? (NSCell*)mComboBoxCell : (NSCell*)mDropdownCell;
-
-  [cell setEnabled:!IsDisabled(aFrame, inState)];
-  [cell setShowsFirstResponder:(IsFocused(aFrame) || inState.HasState(NS_EVENT_STATE_FOCUS))];
-  [cell setHighlighted:IsOpenButton(aFrame)];
-  [cell setControlTint:(FrameIsInActiveWindow(aFrame) ? [NSColor currentControlTint] : NSClearControlTint)];
-
-  const CellRenderSettings& settings = isEditable ? editableMenulistSettings : dropdownSettings;
-  DrawCellWithSnapping(cell, cgContext, inBoxRect, settings,
-                       0.5f, mCellDrawView, IsFrameRTL(aFrame));
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-static const CellRenderSettings spinnerSettings = {
-  {
-    NSMakeSize(11, 16), // mini (width trimmed by 2px to reduce blank border)
-    NSMakeSize(15, 22), // small
-    NSMakeSize(19, 27)  // regular
-  },
-  {
-    NSMakeSize(11, 16), // mini (width trimmed by 2px to reduce blank border)
-    NSMakeSize(15, 22), // small
-    NSMakeSize(19, 27)  // regular
-  },
-  {
-    { // Leopard
-      {0, 0, 0, 0},    // mini
-      {0, 0, 0, 0},    // small
-      {0, 0, 0, 0}     // regular
-    },
-    { // Yosemite
-      {0, 0, 0, 0},    // mini
-      {0, 0, 0, 0},    // small
-      {0, 0, 0, 0}     // regular
-    }
-  }
-};
-
-void
-nsNativeThemeCocoa::DrawSpinButtons(CGContextRef cgContext, ThemeButtonKind inKind,
-                                    const HIRect& inBoxRect, ThemeDrawState inDrawState,
-                                    ThemeButtonAdornment inAdornment,
-                                    EventStates inState, nsIFrame* aFrame)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  HIThemeButtonDrawInfo bdi;
-  bdi.version = 0;
-  bdi.kind = inKind;
-  bdi.value = kThemeButtonOff;
-  bdi.adornment = inAdornment;
-
-  if (IsDisabled(aFrame, inState))
-    bdi.state = kThemeStateUnavailable;
-  else
-    bdi.state = FrameIsInActiveWindow(aFrame) ? inDrawState : kThemeStateActive;
-
-  HIThemeDrawButton(&inBoxRect, &bdi, cgContext, HITHEME_ORIENTATION, NULL);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void
-nsNativeThemeCocoa::DrawSpinButton(CGContextRef cgContext,
-                                   ThemeButtonKind inKind,
-                                   const HIRect& inBoxRect,
-                                   ThemeDrawState inDrawState,
-                                   ThemeButtonAdornment inAdornment,
-                                   EventStates inState,
-                                   nsIFrame* aFrame,
-                                   uint8_t aWidgetType)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  MOZ_ASSERT(aWidgetType == NS_THEME_SPINNER_UPBUTTON ||
-             aWidgetType == NS_THEME_SPINNER_DOWNBUTTON);
-
-  HIThemeButtonDrawInfo bdi;
-  bdi.version = 0;
-  bdi.kind = inKind;
-  bdi.value = kThemeButtonOff;
-  bdi.adornment = inAdornment;
-
-  if (IsDisabled(aFrame, inState))
-    bdi.state = kThemeStateUnavailable;
-  else
-    bdi.state = FrameIsInActiveWindow(aFrame) ? inDrawState : kThemeStateActive;
-
-  // Cocoa only allows kThemeIncDecButton to paint the up and down spin buttons
-  // together as a single unit (presumably because when one button is active,
-  // the appearance of both changes (in different ways)). Here we have to paint
-  // both buttons, using clip to hide the one we don't want to paint.
-  HIRect drawRect = inBoxRect;
-  drawRect.size.height *= 2;
-  if (aWidgetType == NS_THEME_SPINNER_DOWNBUTTON) {
-    drawRect.origin.y -= inBoxRect.size.height;
-  }
-
-  // Shift the drawing a little to the left, since cocoa paints with more
-  // blank space around the visual buttons than we'd like:
-  drawRect.origin.x -= 1;
-
-  CGContextSaveGState(cgContext);
-  CGContextClipToRect(cgContext, inBoxRect);
-
-  HIThemeDrawButton(&drawRect, &bdi, cgContext, HITHEME_ORIENTATION, NULL);
-
-  CGContextRestoreGState(cgContext);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void
-nsNativeThemeCocoa::DrawFrame(CGContextRef cgContext, HIThemeFrameKind inKind,
-                              const HIRect& inBoxRect, bool inDisabled,
-                              EventStates inState)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  HIThemeFrameDrawInfo fdi;
-  fdi.version = 0;
-  fdi.kind = inKind;
-
-  // We don't ever set an inactive state for this because it doesn't
-  // look right (see other apps).
-  fdi.state = inDisabled ? kThemeStateUnavailable : kThemeStateActive;
-
-  // for some reason focus rings on listboxes draw incorrectly
-  if (inKind == kHIThemeFrameListBox)
-    fdi.isFocused = 0;
-  else
-    fdi.isFocused = inState.HasState(NS_EVENT_STATE_FOCUS);
-
-  // HIThemeDrawFrame takes the rect for the content area of the frame, not
-  // the bounding rect for the frame. Here we reduce the size of the rect we
-  // will pass to make it the size of the content.
-  HIRect drawRect = inBoxRect;
-  if (inKind == kHIThemeFrameTextFieldSquare) {
-    SInt32 frameOutset = 0;
-    ::GetThemeMetric(kThemeMetricEditTextFrameOutset, &frameOutset);
-    drawRect.origin.x += frameOutset;
-    drawRect.origin.y += frameOutset;
-    drawRect.size.width -= frameOutset * 2;
-    drawRect.size.height -= frameOutset * 2;
-  }
-  else if (inKind == kHIThemeFrameListBox) {
-    SInt32 frameOutset = 0;
-    ::GetThemeMetric(kThemeMetricListBoxFrameOutset, &frameOutset);
-    drawRect.origin.x += frameOutset;
-    drawRect.origin.y += frameOutset;
-    drawRect.size.width -= frameOutset * 2;
-    drawRect.size.height -= frameOutset * 2;
-  }
-
-#if DRAW_IN_FRAME_DEBUG
-  CGContextSetRGBFillColor(cgContext, 0.0, 0.0, 0.5, 0.25);
-  CGContextFillRect(cgContext, inBoxRect);
-#endif
-
-  HIThemeDrawFrame(&drawRect, &fdi, cgContext, HITHEME_ORIENTATION);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-static const CellRenderSettings progressSettings[2][2] = {
-  // Vertical progress bar.
-  {
-    // Determined settings.
-    {
-      {
-        NSZeroSize, // mini
-        NSMakeSize(10, 0), // small
-        NSMakeSize(16, 0)  // regular
-      },
-      {
-        NSZeroSize, NSZeroSize, NSZeroSize
-      },
-      {
-        { // Leopard
-          {0, 0, 0, 0},     // mini
-          {1, 1, 1, 1},     // small
-          {1, 1, 1, 1}      // regular
-        }
-      }
-    },
-    // There is no horizontal margin in regular undetermined size.
-    {
-      {
-        NSZeroSize, // mini
-        NSMakeSize(10, 0), // small
-        NSMakeSize(16, 0)  // regular
-      },
-      {
-        NSZeroSize, NSZeroSize, NSZeroSize
-      },
-      {
-        { // Leopard
-          {0, 0, 0, 0},     // mini
-          {1, 1, 1, 1},     // small
-          {1, 0, 1, 0}      // regular
-        },
-        { // Yosemite
-          {0, 0, 0, 0},     // mini
-          {1, 1, 1, 1},     // small
-          {1, 0, 1, 0}      // regular
-        }
-      }
-    }
-  },
-  // Horizontal progress bar.
-  {
-    // Determined settings.
-    {
-      {
-        NSZeroSize, // mini
-        NSMakeSize(0, 10), // small
-        NSMakeSize(0, 16)  // regular
-      },
-      {
-        NSZeroSize, NSZeroSize, NSZeroSize
-      },
-      {
-        { // Leopard
-          {0, 0, 0, 0},     // mini
-          {1, 1, 1, 1},     // small
-          {1, 1, 1, 1}      // regular
-        },
-        { // Yosemite
-          {0, 0, 0, 0},     // mini
-          {1, 1, 1, 1},     // small
-          {1, 1, 1, 1}      // regular
-        }
-      }
-    },
-    // There is no horizontal margin in regular undetermined size.
-    {
-      {
-        NSZeroSize, // mini
-        NSMakeSize(0, 10), // small
-        NSMakeSize(0, 16)  // regular
-      },
-      {
-        NSZeroSize, NSZeroSize, NSZeroSize
-      },
-      {
-        { // Leopard
-          {0, 0, 0, 0},     // mini
-          {1, 1, 1, 1},     // small
-          {0, 1, 0, 1}      // regular
-        },
-        { // Yosemite
-          {0, 0, 0, 0},     // mini
-          {1, 1, 1, 1},     // small
-          {0, 1, 0, 1}      // regular
-        }
-      }
-    }
-  }
-};
-
-void
-nsNativeThemeCocoa::DrawProgress(CGContextRef cgContext, const HIRect& inBoxRect,
-                                 bool inIsIndeterminate, bool inIsHorizontal,
-                                 double inValue, double inMaxValue,
-                                 nsIFrame* aFrame)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  NSProgressBarCell* cell = mProgressBarCell;
-
-  [cell setValue:inValue];
-  [cell setMax:inMaxValue];
-  [cell setIndeterminate:inIsIndeterminate];
-  [cell setHorizontal:inIsHorizontal];
-  [cell setControlTint:(FrameIsInActiveWindow(aFrame) ? [NSColor currentControlTint]
-                                                      : NSClearControlTint)];
-
-  DrawCellWithSnapping(cell, cgContext, inBoxRect,
-                       progressSettings[inIsHorizontal][inIsIndeterminate],
-                       VerticalAlignFactor(aFrame), mCellDrawView,
-                       IsFrameRTL(aFrame));
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-static const CellRenderSettings meterSetting = {
-  {
-    NSMakeSize(0, 16), // mini
-    NSMakeSize(0, 16), // small
-    NSMakeSize(0, 16)  // regular
-  },
-  {
-    NSZeroSize, NSZeroSize, NSZeroSize
-  },
-  {
-    { // Leopard
-      {1, 1, 1, 1},     // mini
-      {1, 1, 1, 1},     // small
-      {1, 1, 1, 1}      // regular
-    },
-    { // Yosemite
-      {1, 1, 1, 1},     // mini
-      {1, 1, 1, 1},     // small
-      {1, 1, 1, 1}      // regular
-    }
-  }
-};
-
-void
-nsNativeThemeCocoa::DrawMeter(CGContextRef cgContext, const HIRect& inBoxRect,
-                              nsIFrame* aFrame)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK
-
-  NS_PRECONDITION(aFrame, "aFrame should not be null here!");
-
-  // When using -moz-meterbar on an non meter element, we will not be able to
-  // get all the needed information so we just draw an empty meter.
-  nsIContent* content = aFrame->GetContent();
-  if (!(content && content->IsHTMLElement(nsGkAtoms::meter))) {
-    DrawCellWithSnapping(mMeterBarCell, cgContext, inBoxRect,
-                         meterSetting, VerticalAlignFactor(aFrame),
-                         mCellDrawView, IsFrameRTL(aFrame));
-    return;
-  }
-
-  HTMLMeterElement* meterElement = static_cast<HTMLMeterElement*>(content);
-  double value = meterElement->Value();
-  double min = meterElement->Min();
-  double max = meterElement->Max();
-
-  NSLevelIndicatorCell* cell = mMeterBarCell;
-
-  [cell setMinValue:min];
-  [cell setMaxValue:max];
-  [cell setDoubleValue:value];
-
-  /**
-   * The way HTML and Cocoa defines the meter/indicator widget are different.
-   * So, we are going to use a trick to get the Cocoa widget showing what we
-   * are expecting: we set the warningValue or criticalValue to the current
-   * value when we want to have the widget to be in the warning or critical
-   * state.
-   */
-  EventStates states = aFrame->GetContent()->AsElement()->State();
-
-  // Reset previously set warning and critical values.
-  [cell setWarningValue:max+1];
-  [cell setCriticalValue:max+1];
-
-  if (states.HasState(NS_EVENT_STATE_SUB_OPTIMUM)) {
-    [cell setWarningValue:value];
-  } else if (states.HasState(NS_EVENT_STATE_SUB_SUB_OPTIMUM)) {
-    [cell setCriticalValue:value];
-  }
-
-  HIRect rect = CGRectStandardize(inBoxRect);
-  BOOL vertical = IsVerticalMeter(aFrame);
-
-  CGContextSaveGState(cgContext);
-
-  if (vertical) {
-    /**
-     * Cocoa doesn't provide a vertical meter bar so to show one, we have to
-     * show a rotated horizontal meter bar.
-     * Given that we want to show a vertical meter bar, we assume that the rect
-     * has vertical dimensions but we can't correctly draw a meter widget inside
-     * such a rectangle so we need to inverse width and height (and re-position)
-     * to get a rectangle with horizontal dimensions.
-     * Finally, we want to show a vertical meter so we want to rotate the result
-     * so it is vertical. We do that by changing the context.
-     */
-    CGFloat tmp = rect.size.width;
-    rect.size.width = rect.size.height;
-    rect.size.height = tmp;
-    rect.origin.x += rect.size.height / 2.f - rect.size.width / 2.f;
-    rect.origin.y += rect.size.width / 2.f - rect.size.height / 2.f;
-
-    CGContextTranslateCTM(cgContext, CGRectGetMidX(rect), CGRectGetMidY(rect));
-    CGContextRotateCTM(cgContext, -M_PI / 2.f);
-    CGContextTranslateCTM(cgContext, -CGRectGetMidX(rect), -CGRectGetMidY(rect));
-  }
-
-  DrawCellWithSnapping(cell, cgContext, rect,
-                       meterSetting, VerticalAlignFactor(aFrame),
-                       mCellDrawView, !vertical && IsFrameRTL(aFrame));
-
-  CGContextRestoreGState(cgContext);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK
-}
-
-void
-nsNativeThemeCocoa::DrawTabPanel(CGContextRef cgContext, const HIRect& inBoxRect,
-                                 nsIFrame* aFrame)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  HIThemeTabPaneDrawInfo tpdi;
-
-  tpdi.version = 1;
-  tpdi.state = FrameIsInActiveWindow(aFrame) ? kThemeStateActive : kThemeStateInactive;
-  tpdi.direction = kThemeTabNorth;
-  tpdi.size = kHIThemeTabSizeNormal;
-  tpdi.kind = kHIThemeTabKindNormal;
-
-  HIThemeDrawTabPane(&inBoxRect, &tpdi, cgContext, HITHEME_ORIENTATION);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void
-nsNativeThemeCocoa::DrawScale(CGContextRef cgContext, const HIRect& inBoxRect,
-                              EventStates inState, bool inIsVertical,
-                              bool inIsReverse, int32_t inCurrentValue,
-                              int32_t inMinValue, int32_t inMaxValue,
-                              nsIFrame* aFrame)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  HIThemeTrackDrawInfo tdi;
-
-  tdi.version = 0;
-  tdi.kind = kThemeMediumSlider;
-  tdi.bounds = inBoxRect;
-  tdi.min = inMinValue;
-  tdi.max = inMaxValue;
-  tdi.value = inCurrentValue;
-  tdi.attributes = kThemeTrackShowThumb;
-  if (!inIsVertical)
-    tdi.attributes |= kThemeTrackHorizontal;
-  if (inIsReverse)
-    tdi.attributes |= kThemeTrackRightToLeft;
-  if (inState.HasState(NS_EVENT_STATE_FOCUS))
-    tdi.attributes |= kThemeTrackHasFocus;
-  if (IsDisabled(aFrame, inState))
-    tdi.enableState = kThemeTrackDisabled;
-  else
-    tdi.enableState = FrameIsInActiveWindow(aFrame) ? kThemeTrackActive : kThemeTrackInactive;
-  tdi.trackInfo.slider.thumbDir = kThemeThumbPlain;
-  tdi.trackInfo.slider.pressState = 0;
-
-  HIThemeDrawTrack(&tdi, NULL, cgContext, HITHEME_ORIENTATION);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-nsIFrame*
-nsNativeThemeCocoa::SeparatorResponsibility(nsIFrame* aBefore, nsIFrame* aAfter)
-{
-  // Usually a separator is drawn by the segment to the right of the
-  // separator, but pressed and selected segments have higher priority.
-  if (!aBefore || !aAfter)
-    return nullptr;
-  if (IsSelectedButton(aAfter))
-    return aAfter;
-  if (IsSelectedButton(aBefore) || IsPressedButton(aBefore))
-    return aBefore;
-  return aAfter;
-}
-
-CGRect
-nsNativeThemeCocoa::SeparatorAdjustedRect(CGRect aRect, nsIFrame* aLeft,
-                                          nsIFrame* aCurrent, nsIFrame* aRight)
-{
-  // A separator between two segments should always be located in the leftmost
-  // pixel column of the segment to the right of the separator, regardless of
-  // who ends up drawing it.
-  // CoreUI draws the separators inside the drawing rect.
-  if (aLeft && SeparatorResponsibility(aLeft, aCurrent) == aLeft) {
-    // The left button draws the separator, so we need to make room for it.
-    aRect.origin.x += 1;
-    aRect.size.width -= 1;
-  }
-  if (SeparatorResponsibility(aCurrent, aRight) == aCurrent) {
-    // We draw the right separator, so we need to extend the draw rect into the
-    // segment to our right.
-    aRect.size.width += 1;
-  }
-  return aRect;
-}
-
-static NSString* ToolbarButtonPosition(BOOL aIsFirst, BOOL aIsLast)
-{
-  if (aIsFirst) {
-    if (aIsLast)
-      return @"kCUISegmentPositionOnly";
-    return @"kCUISegmentPositionFirst";
-  }
-  if (aIsLast)
-    return @"kCUISegmentPositionLast";
-  return @"kCUISegmentPositionMiddle";
-}
-
-struct SegmentedControlRenderSettings {
-  const CGFloat* heights;
-  const NSString* widgetName;
-  const BOOL ignoresPressedWhenSelected;
-  const BOOL isToolbarControl;
-};
-
-static const CGFloat tabHeights[3] = { 17, 20, 23 };
-
-static const SegmentedControlRenderSettings tabRenderSettings = {
-  tabHeights, @"tab", YES, NO
-};
-
-static const CGFloat toolbarButtonHeights[3] = { 15, 18, 22 };
-
-static const SegmentedControlRenderSettings toolbarButtonRenderSettings = {
-  toolbarButtonHeights, @"kCUIWidgetButtonSegmentedSCurve", NO, YES
-};
-
-void
-nsNativeThemeCocoa::DrawSegment(CGContextRef cgContext, const HIRect& inBoxRect,
-                                EventStates inState, nsIFrame* aFrame,
-                                const SegmentedControlRenderSettings& aSettings)
-{
-  BOOL isActive = IsActive(aFrame, aSettings.isToolbarControl);
-  BOOL isFocused = inState.HasState(NS_EVENT_STATE_FOCUS);
-  BOOL isSelected = IsSelectedButton(aFrame);
-  BOOL isPressed = IsPressedButton(aFrame);
-  if (isSelected && aSettings.ignoresPressedWhenSelected) {
-    isPressed = NO;
-  }
-
-  BOOL isRTL = IsFrameRTL(aFrame);
-  nsIFrame* left = GetAdjacentSiblingFrameWithSameAppearance(aFrame, isRTL);
-  nsIFrame* right = GetAdjacentSiblingFrameWithSameAppearance(aFrame, !isRTL);
-  CGRect drawRect = SeparatorAdjustedRect(inBoxRect, left, aFrame, right);
-  BOOL drawLeftSeparator = SeparatorResponsibility(left, aFrame) == aFrame;
-  BOOL drawRightSeparator = SeparatorResponsibility(aFrame, right) == aFrame;
-  NSControlSize controlSize = FindControlSize(drawRect.size.height, aSettings.heights, 4.0f);
-
-  RenderWithCoreUI(drawRect, cgContext, [NSDictionary dictionaryWithObjectsAndKeys:
-            aSettings.widgetName, @"widget",
-            (isActive ? @"kCUIPresentationStateActiveKey" : @"kCUIPresentationStateInactive"), @"kCUIPresentationStateKey",
-            ToolbarButtonPosition(!left, !right), @"kCUIPositionKey",
-            [NSNumber numberWithBool:drawLeftSeparator], @"kCUISegmentLeadingSeparatorKey",
-            [NSNumber numberWithBool:drawRightSeparator], @"kCUISegmentTrailingSeparatorKey",
-            [NSNumber numberWithBool:isSelected], @"value",
-            (isPressed ? @"pressed" : (isActive ? @"normal" : @"inactive")), @"state",
-            [NSNumber numberWithBool:isFocused], @"focus",
-            CUIControlSizeForCocoaSize(controlSize), @"size",
-            [NSNumber numberWithBool:YES], @"is.flipped",
-            @"up", @"direction",
-            nil]);
-}
-
-void 
-nsNativeThemeCocoa::GetScrollbarPressStates(nsIFrame* aFrame,
-                                            EventStates aButtonStates[])
-{
-  static nsIContent::AttrValuesArray attributeValues[] = {
-    &nsGkAtoms::scrollbarUpTop,
-    &nsGkAtoms::scrollbarDownTop,
-    &nsGkAtoms::scrollbarUpBottom,
-    &nsGkAtoms::scrollbarDownBottom,
-    nullptr
-  };
-
-  // Get the state of any scrollbar buttons in our child frames
-  for (nsIFrame *childFrame : aFrame->PrincipalChildList()) {
-    nsIContent *childContent = childFrame->GetContent();
-    if (!childContent) continue;
-    int32_t attrIndex = childContent->FindAttrValueIn(kNameSpaceID_None, nsGkAtoms::sbattr, 
-                                                      attributeValues, eCaseMatters);
-    if (attrIndex < 0) continue;
-
-    aButtonStates[attrIndex] = GetContentState(childFrame, NS_THEME_BUTTON);
-  }
-}
-
-nsIFrame*
-nsNativeThemeCocoa::GetParentScrollbarFrame(nsIFrame *aFrame)
-{
-  // Walk our parents to find a scrollbar frame
-  nsIFrame *scrollbarFrame = aFrame;
-  do {
-    if (scrollbarFrame->GetType() == nsGkAtoms::scrollbarFrame) break;
-  } while ((scrollbarFrame = scrollbarFrame->GetParent()));
-
-  // We return null if we can't find a parent scrollbar frame
-  return scrollbarFrame;
-}
-
-static bool
-ToolbarCanBeUnified(CGContextRef cgContext, const HIRect& inBoxRect, NSWindow* aWindow)
-{
-  if (![aWindow isKindOfClass:[ToolbarWindow class]])
-    return false;
-
-  ToolbarWindow* win = (ToolbarWindow*)aWindow;
-  float unifiedToolbarHeight = [win unifiedToolbarHeight];
-  return inBoxRect.origin.x == 0 &&
-         inBoxRect.size.width >= [win frame].size.width &&
-         CGRectGetMaxY(inBoxRect) <= unifiedToolbarHeight;
-}
-
-// By default, kCUIWidgetWindowFrame drawing draws rounded corners in the
-// upper corners. Depending on the context type, it fills the background in
-// the corners with black or leaves it transparent. Unfortunately, this corner
-// rounding interacts poorly with the window corner masking we apply during
-// titlebar drawing and results in small remnants of the corner background
-// appearing at the rounded edge.
-// So we draw square corners.
-static void
-DrawNativeTitlebarToolbarWithSquareCorners(CGContextRef aContext, const CGRect& aRect,
-                                           CGFloat aUnifiedHeight, BOOL aIsMain, BOOL aIsFlipped)
-{
-  // We extend the draw rect horizontally and clip away the rounded corners.
-  const CGFloat extendHorizontal = 10;
-  CGRect drawRect = CGRectInset(aRect, -extendHorizontal, 0);
-  CGContextSaveGState(aContext);
-  CGContextClipToRect(aContext, aRect);
-
-  RenderWithCoreUI(drawRect, aContext,
-          [NSDictionary dictionaryWithObjectsAndKeys:
-            @"kCUIWidgetWindowFrame", @"widget",
-            @"regularwin", @"windowtype",
-            (aIsMain ? @"normal" : @"inactive"), @"state",
-            [NSNumber numberWithDouble:aUnifiedHeight], @"kCUIWindowFrameUnifiedTitleBarHeightKey",
-            [NSNumber numberWithBool:YES], @"kCUIWindowFrameDrawTitleSeparatorKey",
-            [NSNumber numberWithBool:aIsFlipped], @"is.flipped",
-            nil]);
-
-  CGContextRestoreGState(aContext);
-}
-
-void
-nsNativeThemeCocoa::DrawUnifiedToolbar(CGContextRef cgContext, const HIRect& inBoxRect,
-                                       NSWindow* aWindow)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  CGContextSaveGState(cgContext);
-  CGContextClipToRect(cgContext, inBoxRect);
-
-  CGFloat unifiedHeight = std::max([(ToolbarWindow*)aWindow unifiedToolbarHeight],
-                                   inBoxRect.size.height);
-  BOOL isMain = [aWindow isMainWindow];
-  CGFloat titlebarHeight = unifiedHeight - inBoxRect.size.height;
-  CGRect drawRect = CGRectMake(inBoxRect.origin.x, inBoxRect.origin.y - titlebarHeight,
-                               inBoxRect.size.width, inBoxRect.size.height + titlebarHeight);
-  DrawNativeTitlebarToolbarWithSquareCorners(cgContext, drawRect, unifiedHeight, isMain, YES);
-
-  CGContextRestoreGState(cgContext);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void
-nsNativeThemeCocoa::DrawStatusBar(CGContextRef cgContext, const HIRect& inBoxRect,
-                                  nsIFrame *aFrame)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (inBoxRect.size.height < 2.0f)
-    return;
-
-  CGContextSaveGState(cgContext);
-  CGContextClipToRect(cgContext, inBoxRect);
-
-  // kCUIWidgetWindowFrame draws a complete window frame with both title bar
-  // and bottom bar. We only want the bottom bar, so we extend the draw rect
-  // upwards to make space for the title bar, and then we clip it away.
-  CGRect drawRect = inBoxRect;
-  const int extendUpwards = 40;
-  drawRect.origin.y -= extendUpwards;
-  drawRect.size.height += extendUpwards;
-  RenderWithCoreUI(drawRect, cgContext,
-          [NSDictionary dictionaryWithObjectsAndKeys:
-            @"kCUIWidgetWindowFrame", @"widget",
-            @"regularwin", @"windowtype",
-            (IsActive(aFrame, YES) ? @"normal" : @"inactive"), @"state",
-            [NSNumber numberWithInt:inBoxRect.size.height], @"kCUIWindowFrameBottomBarHeightKey",
-            [NSNumber numberWithBool:YES], @"kCUIWindowFrameDrawBottomBarSeparatorKey",
-            [NSNumber numberWithBool:YES], @"is.flipped",
-            nil]);
-
-  CGContextRestoreGState(cgContext);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void
-nsNativeThemeCocoa::DrawNativeTitlebar(CGContextRef aContext, CGRect aTitlebarRect,
-                                       CGFloat aUnifiedHeight, BOOL aIsMain, BOOL aIsFlipped)
-{
-  CGFloat unifiedHeight = std::max(aUnifiedHeight, aTitlebarRect.size.height);
-  DrawNativeTitlebarToolbarWithSquareCorners(aContext, aTitlebarRect, unifiedHeight, aIsMain, aIsFlipped);
-}
-
-static void
-RenderResizer(CGContextRef cgContext, const HIRect& aRenderRect, void* aData)
-{
-  HIThemeGrowBoxDrawInfo* drawInfo = (HIThemeGrowBoxDrawInfo*)aData;
-  HIThemeDrawGrowBox(&CGPointZero, drawInfo, cgContext, kHIThemeOrientationNormal);
-}
-
-void
-nsNativeThemeCocoa::DrawResizer(CGContextRef cgContext, const HIRect& aRect,
-                                nsIFrame *aFrame)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  HIThemeGrowBoxDrawInfo drawInfo;
-  drawInfo.version = 0;
-  drawInfo.state = kThemeStateActive;
-  drawInfo.kind = kHIThemeGrowBoxKindNormal;
-  drawInfo.direction = kThemeGrowRight | kThemeGrowDown;
-  drawInfo.size = kHIThemeGrowBoxSizeNormal;
-
-  RenderTransformedHIThemeControl(cgContext, aRect, RenderResizer, &drawInfo,
-                                  IsFrameRTL(aFrame));
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-static void
-DrawVibrancyBackground(CGContextRef cgContext, CGRect inBoxRect,
-                       nsIFrame* aFrame, nsITheme::ThemeGeometryType aThemeGeometryType,
-                       int aCornerRadiusIfOpaque = 0)
-{
-  ChildView* childView = ChildViewForFrame(aFrame);
-  if (childView) {
-    NSRect rect = NSRectFromCGRect(inBoxRect);
-    NSGraphicsContext* savedContext = [NSGraphicsContext currentContext];
-    [NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithGraphicsPort:cgContext flipped:YES]];
-    [NSGraphicsContext saveGraphicsState];
-
-    NSColor* fillColor = [childView vibrancyFillColorForThemeGeometryType:aThemeGeometryType];
-    if ([fillColor alphaComponent] == 1.0 && aCornerRadiusIfOpaque > 0) {
-      // The fillColor being opaque means that the system-wide pref "reduce
-      // transparency" is set. In that scenario, we still go through all the
-      // vibrancy rendering paths (VibrancyManager::SystemSupportsVibrancy()
-      // will still return true), but the result just won't look "vibrant".
-      // However, there's one unfortunate change of behavior that this pref
-      // has: It stops the window server from applying window masks. We use
-      // a window mask to get rounded corners on menus. So since the mask
-      // doesn't work in "reduce vibrancy" mode, we need to do our own rounded
-      // corner clipping here.
-      [[NSBezierPath bezierPathWithRoundedRect:rect
-                                       xRadius:aCornerRadiusIfOpaque
-                                       yRadius:aCornerRadiusIfOpaque] addClip];
-    }
-
-    [fillColor set];
-    NSRectFill(rect);
-
-    [NSGraphicsContext restoreGraphicsState];
-    [NSGraphicsContext setCurrentContext:savedContext];
-  }
-}
-
-bool
-nsNativeThemeCocoa::IsParentScrollbarRolledOver(nsIFrame* aFrame)
-{
-  nsIFrame* scrollbarFrame = GetParentScrollbarFrame(aFrame);
-  return nsLookAndFeel::UseOverlayScrollbars()
-    ? CheckBooleanAttr(scrollbarFrame, nsGkAtoms::hover)
-    : GetContentState(scrollbarFrame, NS_THEME_NONE).HasState(NS_EVENT_STATE_HOVER);
-}
-
-static bool
-IsHiDPIContext(nsPresContext* aContext)
-{
-  return nsPresContext::AppUnitsPerCSSPixel() >=
-    2 * aContext->DeviceContext()->AppUnitsPerDevPixelAtUnitFullZoom();
-}
-
-static bool
-IsScrollbarWidthThin(nsIFrame* aFrame)
-{
-  return aFrame->StyleUserInterface()->mScrollbarWidth == StyleScrollbarWidth::Thin;
-}
-
-NS_IMETHODIMP
-nsNativeThemeCocoa::DrawWidgetBackground(nsRenderingContext* aContext,
-                                         nsIFrame* aFrame,
-                                         uint8_t aWidgetType,
-                                         const nsRect& aRect,
-                                         const nsRect& aDirtyRect)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  DrawTarget& aDrawTarget = *aContext->GetDrawTarget();
-
-  // setup to draw into the correct port
-  int32_t p2a = aFrame->PresContext()->AppUnitsPerDevPixel();
-
-  gfx::Rect nativeDirtyRect = NSRectToRect(aDirtyRect, p2a);
-  gfxRect nativeWidgetRect(aRect.x, aRect.y, aRect.width, aRect.height);
-  nativeWidgetRect.ScaleInverse(gfxFloat(p2a));
-  float nativeWidgetHeight = round(nativeWidgetRect.Height());
-  nativeWidgetRect.Round();
-  if (nativeWidgetRect.IsEmpty())
-    return NS_OK; // Don't attempt to draw invisible widgets.
-
-  AutoRestoreTransform autoRestoreTransform(&aDrawTarget);
-
-  bool hidpi = IsHiDPIContext(aFrame->PresContext());
-  if (hidpi) {
-    // Use high-resolution drawing.
-    nativeWidgetRect.Scale(0.5f);
-    nativeWidgetHeight *= 0.5f;
-    nativeDirtyRect.Scale(0.5f);
-    aDrawTarget.SetTransform(aDrawTarget.GetTransform().PreScale(2.0f, 2.0f));
-  }
-
-  gfxQuartzNativeDrawing nativeDrawing(aDrawTarget, nativeDirtyRect);
-
-  CGContextRef cgContext = nativeDrawing.BeginNativeDrawing();
-  if (cgContext == nullptr) {
-    // The Quartz surface handles 0x0 surfaces by internally
-    // making all operations no-ops; there's no cgcontext created for them.
-    // Unfortunately, this means that callers that want to render
-    // directly to the CGContext need to be aware of this quirk.
-    return NS_OK;
-  }
-
-  if (hidpi) {
-    // Set the context's "base transform" to in order to get correctly-sized focus rings.
-    CGContextSetBaseCTM(cgContext, CGAffineTransformMakeScale(2, 2));
-  }
-
-#if 0
-  if (1 /*aWidgetType == NS_THEME_TEXTFIELD*/) {
-    fprintf(stderr, "Native theme drawing widget %d [%p] dis:%d in rect [%d %d %d %d]\n",
-            aWidgetType, aFrame, IsDisabled(aFrame), aRect.x, aRect.y, aRect.width, aRect.height);
-    fprintf(stderr, "Cairo matrix: [%f %f %f %f %f %f]\n",
-            mat._11, mat._12, mat._21, mat._22, mat._31, mat._32);
-    fprintf(stderr, "Native theme xform[0]: [%f %f %f %f %f %f]\n",
-            mm0.a, mm0.b, mm0.c, mm0.d, mm0.tx, mm0.ty);
-    CGAffineTransform mm = CGContextGetCTM(cgContext);
-    fprintf(stderr, "Native theme xform[1]: [%f %f %f %f %f %f]\n",
-            mm.a, mm.b, mm.c, mm.d, mm.tx, mm.ty);
-  }
-#endif
-
-  CGRect macRect = CGRectMake(nativeWidgetRect.X(), nativeWidgetRect.Y(),
-                              nativeWidgetRect.Width(), nativeWidgetRect.Height());
-
-#if 0
-  fprintf(stderr, "    --> macRect %f %f %f %f\n",
-          macRect.origin.x, macRect.origin.y, macRect.size.width, macRect.size.height);
-  CGRect bounds = CGContextGetClipBoundingBox(cgContext);
-  fprintf(stderr, "    --> clip bounds: %f %f %f %f\n",
-          bounds.origin.x, bounds.origin.y, bounds.size.width, bounds.size.height);
-
-  //CGContextSetRGBFillColor(cgContext, 0.0, 0.0, 1.0, 0.1);
-  //CGContextFillRect(cgContext, bounds);
-#endif
-
-  EventStates eventState = GetContentState(aFrame, aWidgetType);
-
-  switch (aWidgetType) {
-    case NS_THEME_DIALOG: {
-      if (IsWindowSheet(aFrame)) {
-        if (VibrancyManager::SystemSupportsVibrancy()) {
-          ThemeGeometryType type = ThemeGeometryTypeForWidget(aFrame, aWidgetType);
-          DrawVibrancyBackground(cgContext, macRect, aFrame, type);
-        } else {
-          HIThemeSetFill(kThemeBrushSheetBackgroundTransparent, NULL, cgContext, HITHEME_ORIENTATION);
-          CGContextFillRect(cgContext, macRect);
-        }
-      } else {
-        HIThemeSetFill(kThemeBrushDialogBackgroundActive, NULL, cgContext, HITHEME_ORIENTATION);
-        CGContextFillRect(cgContext, macRect);
-      }
-
-    }
-      break;
-
-    case NS_THEME_MENUPOPUP:
-      if (VibrancyManager::SystemSupportsVibrancy()) {
-        DrawVibrancyBackground(cgContext, macRect, aFrame, eThemeGeometryTypeMenu, 4);
-      } else {
-        HIThemeMenuDrawInfo mdi;
-        memset(&mdi, 0, sizeof(mdi));
-        mdi.version = 0;
-        mdi.menuType = IsDisabled(aFrame, eventState) ?
-                         static_cast<ThemeMenuType>(kThemeMenuTypeInactive) :
-                         static_cast<ThemeMenuType>(kThemeMenuTypePopUp);
-
-        bool isLeftOfParent = false;
-        if (IsSubmenu(aFrame, &isLeftOfParent) && !isLeftOfParent) {
-          mdi.menuType = kThemeMenuTypeHierarchical;
-        }
-
-        // The rounded corners draw outside the frame.
-        CGRect deflatedRect = CGRectMake(macRect.origin.x, macRect.origin.y + 4,
-                                         macRect.size.width, macRect.size.height - 8);
-        HIThemeDrawMenuBackground(&deflatedRect, &mdi, cgContext, HITHEME_ORIENTATION);
-      }
-      break;
-
-    case NS_THEME_MENUARROW: {
-      bool isRTL = IsFrameRTL(aFrame);
-      DrawMenuIcon(cgContext, macRect, eventState, aFrame, kMenuarrowSize,
-                   isRTL ? kMenuarrowLeftImage : kMenuarrowRightImage, true);
-    }
-      break;
-
-    case NS_THEME_MENUITEM:
-    case NS_THEME_CHECKMENUITEM: {
-      if (VibrancyManager::SystemSupportsVibrancy()) {
-        ThemeGeometryType type = ThemeGeometryTypeForWidget(aFrame, aWidgetType);
-        DrawVibrancyBackground(cgContext, macRect, aFrame, type);
-      } else {
-        bool isDisabled = IsDisabled(aFrame, eventState);
-        bool isSelected = !isDisabled && CheckBooleanAttr(aFrame, nsGkAtoms::menuactive);
-        // maybe use kThemeMenuItemHierBackground or PopUpBackground instead of just Plain?
-        HIThemeMenuItemDrawInfo drawInfo;
-        memset(&drawInfo, 0, sizeof(drawInfo));
-        drawInfo.version = 0;
-        drawInfo.itemType = kThemeMenuItemPlain;
-        drawInfo.state = (isDisabled ?
-                           static_cast<ThemeMenuState>(kThemeMenuDisabled) :
-                           isSelected ?
-                             static_cast<ThemeMenuState>(kThemeMenuSelected) :
-                             static_cast<ThemeMenuState>(kThemeMenuActive));
-
-        // XXX pass in the menu rect instead of always using the item rect
-        HIRect ignored;
-        HIThemeDrawMenuItem(&macRect, &macRect, &drawInfo, cgContext, HITHEME_ORIENTATION, &ignored);
-      }
-
-      if (aWidgetType == NS_THEME_CHECKMENUITEM) {
-        DrawMenuIcon(cgContext, macRect, eventState, aFrame, kCheckmarkSize, kCheckmarkImage, false);
-      }
-    }
-      break;
-
-    case NS_THEME_MENUSEPARATOR: {
-      // Workaround for visual artifacts issues with
-      // HIThemeDrawMenuSeparator on macOS Big Sur.
-      if (nsCocoaFeatures::OnBigSurOrLater()) {
-        CGRect separatorRect = macRect;
-        separatorRect.size.height = 1;
-        separatorRect.size.width -= 42;
-        separatorRect.origin.x += 21;
-        // Use a gray color similar to the native separator
-        CGContextSetRGBFillColor(cgContext, 0.816, 0.816, 0.816, 1.0);
-        CGContextFillRect(cgContext, separatorRect);
-      }
-      else
-      {
-        ThemeMenuState menuState;
-        if (IsDisabled(aFrame, eventState)) {
-           menuState = kThemeMenuDisabled;
-        }
-        else {
-          menuState = CheckBooleanAttr(aFrame, nsGkAtoms::menuactive) ?
-                      kThemeMenuSelected : kThemeMenuActive;
-        }
-        HIThemeMenuItemDrawInfo midi = { 0, kThemeMenuItemPlain, menuState };
-        HIThemeDrawMenuSeparator(&macRect, &macRect, &midi, cgContext, HITHEME_ORIENTATION);
-      }
-    }
-      break;
-
-    case NS_THEME_BUTTON_ARROW_UP:
-    case NS_THEME_BUTTON_ARROW_DOWN:
-      DrawMenuIcon(cgContext, macRect, eventState, aFrame, kMenuScrollArrowSize,
-                   aWidgetType == NS_THEME_BUTTON_ARROW_UP ?
-                   kMenuUpScrollArrowImage : kMenuDownScrollArrowImage, true);
-      break;
-
-    case NS_THEME_TOOLTIP:
-      if (VibrancyManager::SystemSupportsVibrancy()) {
-        DrawVibrancyBackground(cgContext, macRect, aFrame, ThemeGeometryTypeForWidget(aFrame, aWidgetType));
-      } else {
-        CGContextSetRGBFillColor(cgContext, 0.996, 1.000, 0.792, 0.950);
-        CGContextFillRect(cgContext, macRect);
-      }
-      break;
-
-    case NS_THEME_CHECKBOX:
-    case NS_THEME_RADIO: {
-      bool isCheckbox = (aWidgetType == NS_THEME_CHECKBOX);
-      DrawCheckboxOrRadio(cgContext, isCheckbox, macRect, GetCheckedOrSelected(aFrame, !isCheckbox),
-                          eventState, aFrame);
-    }
-      break;
-
-    case NS_THEME_BUTTON:
-      if (IsDefaultButton(aFrame)) {
-        // Check whether the default button is in a document that does not
-        // match the :-moz-window-inactive pseudoclass. This activeness check
-        // is different from the other "active window" checks in this file
-        // because we absolutely need the button's default button appearance to
-        // be in sync with its text color, and the text color is changed by
-        // such a :-moz-window-inactive rule. (That's because on 10.10 and up,
-        // default buttons in active windows have blue background and white
-        // text, and default buttons in inactive windows have white background
-        // and black text.)
-        EventStates docState = aFrame->GetContent()->OwnerDoc()->GetDocumentState();
-        bool isInActiveWindow = !docState.HasState(NS_DOCUMENT_STATE_WINDOW_INACTIVE);
-        if (!IsDisabled(aFrame, eventState) && isInActiveWindow &&
-            !QueueAnimatedContentForRefresh(aFrame->GetContent(), 10)) {
-          NS_WARNING("Unable to animate button!");
-        }
-        DrawButton(cgContext, kThemePushButton, macRect, isInActiveWindow,
-                   kThemeButtonOff, kThemeAdornmentNone, eventState, aFrame);
-      } else if (IsButtonTypeMenu(aFrame)) {
-        DrawDropdown(cgContext, macRect, eventState, aWidgetType, aFrame);
-      } else {
-        DrawPushButton(cgContext, macRect, eventState, aWidgetType, aFrame,
-                       nativeWidgetHeight);
-      }
-      break;
-
-    case NS_THEME_FOCUS_OUTLINE:
-      DrawFocusOutline(cgContext, macRect, eventState, aWidgetType, aFrame);
-      break;
-
-    case NS_THEME_MAC_HELP_BUTTON:
-    case NS_THEME_MAC_DISCLOSURE_BUTTON_OPEN:
-    case NS_THEME_MAC_DISCLOSURE_BUTTON_CLOSED:
-      DrawPushButton(cgContext, macRect, eventState, aWidgetType, aFrame,
-                     nativeWidgetHeight);
-      break;
-
-    case NS_THEME_BUTTON_BEVEL:
-      DrawButton(cgContext, kThemeMediumBevelButton, macRect,
-                 IsDefaultButton(aFrame), kThemeButtonOff, kThemeAdornmentNone,
-                 eventState, aFrame);
-      break;
-
-    case NS_THEME_SPINNER: {
-      nsIContent* content = aFrame->GetContent();
-      if (content->IsHTMLElement()) {
-        // In HTML the theming for the spin buttons is drawn individually into
-        // their own backgrounds instead of being drawn into the background of
-        // their spinner parent as it is for XUL.
-        break;
-      }
-      ThemeDrawState state = kThemeStateActive;
-      if (content->AttrValueIs(kNameSpaceID_None, nsGkAtoms::state,
-                               NS_LITERAL_STRING("up"), eCaseMatters)) {
-        state = kThemeStatePressedUp;
-      }
-      else if (content->AttrValueIs(kNameSpaceID_None, nsGkAtoms::state,
-                                    NS_LITERAL_STRING("down"), eCaseMatters)) {
-        state = kThemeStatePressedDown;
-      }
-
-      DrawSpinButtons(cgContext, kThemeIncDecButton, macRect, state,
-                      kThemeAdornmentNone, eventState, aFrame);
-    }
-      break;
-
-    case NS_THEME_SPINNER_UPBUTTON:
-    case NS_THEME_SPINNER_DOWNBUTTON: {
-      nsNumberControlFrame* numberControlFrame =
-        nsNumberControlFrame::GetNumberControlFrameForSpinButton(aFrame);
-      if (numberControlFrame) {
-        ThemeDrawState state = kThemeStateActive;
-        if (numberControlFrame->SpinnerUpButtonIsDepressed()) {
-          state = kThemeStatePressedUp;
-        } else if (numberControlFrame->SpinnerDownButtonIsDepressed()) {
-          state = kThemeStatePressedDown;
-        }
-        DrawSpinButton(cgContext, kThemeIncDecButtonMini, macRect, state,
-                       kThemeAdornmentNone, eventState, aFrame, aWidgetType);
-      }
-    }
-      break;
-
-    case NS_THEME_TOOLBARBUTTON:
-      DrawSegment(cgContext, macRect, eventState, aFrame, toolbarButtonRenderSettings);
-      break;
-
-    case NS_THEME_SEPARATOR: {
-      HIThemeSeparatorDrawInfo sdi = { 0, kThemeStateActive };
-      HIThemeDrawSeparator(&macRect, &sdi, cgContext, HITHEME_ORIENTATION);
-    }
-      break;
-
-    case NS_THEME_TOOLBAR: {
-      NSWindow* win = NativeWindowForFrame(aFrame);
-      if (ToolbarCanBeUnified(cgContext, macRect, win)) {
-        DrawUnifiedToolbar(cgContext, macRect, win);
-        break;
-      }
-      BOOL isMain = [win isMainWindow];
-      CGRect drawRect = macRect;
-
-      // top border
-      drawRect.size.height = 1.0f;
-      DrawNativeGreyColorInRect(cgContext, toolbarTopBorderGrey, drawRect, isMain);
-
-      // background
-      drawRect.origin.y += drawRect.size.height;
-      drawRect.size.height = macRect.size.height - 2.0f;
-      DrawNativeGreyColorInRect(cgContext, toolbarFillGrey, drawRect, isMain);
-
-      // bottom border
-      drawRect.origin.y += drawRect.size.height;
-      drawRect.size.height = 1.0f;
-      DrawNativeGreyColorInRect(cgContext, toolbarBottomBorderGrey, drawRect, isMain);
-    }
-      break;
-
-    case NS_THEME_WINDOW_TITLEBAR: {
-      NSWindow* win = NativeWindowForFrame(aFrame);
-      BOOL isMain = [win isMainWindow];
-      float unifiedToolbarHeight = [win isKindOfClass:[ToolbarWindow class]] ?
-        [(ToolbarWindow*)win unifiedToolbarHeight] : macRect.size.height;
-      DrawNativeTitlebar(cgContext, macRect, unifiedToolbarHeight, isMain, YES);
-    }
-      break;
-
-    case NS_THEME_STATUSBAR: 
-      DrawStatusBar(cgContext, macRect, aFrame);
-      break;
-
-    case NS_THEME_MENULIST:
-    case NS_THEME_MENULIST_TEXTFIELD:
-      DrawDropdown(cgContext, macRect, eventState, aWidgetType, aFrame);
-      break;
-
-    case NS_THEME_MENULIST_BUTTON:
-      DrawButton(cgContext, kThemeArrowButton, macRect, false, kThemeButtonOn,
-                 kThemeAdornmentArrowDownArrow, eventState, aFrame);
-      break;
-
-    case NS_THEME_GROUPBOX: {
-      HIThemeGroupBoxDrawInfo gdi = { 0, kThemeStateActive, kHIThemeGroupBoxKindPrimary };
-      HIThemeDrawGroupBox(&macRect, &gdi, cgContext, HITHEME_ORIENTATION);
-      break;
-    }
-
-    case NS_THEME_TEXTFIELD:
-    case NS_THEME_NUMBER_INPUT:
-      // HIThemeSetFill is not available on 10.3
-      CGContextSetRGBFillColor(cgContext, 1.0, 1.0, 1.0, 1.0);
-      CGContextFillRect(cgContext, macRect);
-
-      // XUL textboxes set the native appearance on the containing box, while
-      // concrete focus is set on the html:input element within it. We can
-      // though, check the focused attribute of xul textboxes in this case.
-      // On Mac, focus rings are always shown for textboxes, so we do not need
-      // to check the window's focus ring state here
-      if (aFrame->GetContent()->IsXULElement() && IsFocused(aFrame)) {
-        eventState |= NS_EVENT_STATE_FOCUS;
-      }
-
-      DrawFrame(cgContext, kHIThemeFrameTextFieldSquare, macRect,
-                IsDisabled(aFrame, eventState) || IsReadOnly(aFrame), eventState);
-      break;
-      
-    case NS_THEME_SEARCHFIELD:
-      DrawSearchField(cgContext, macRect, aFrame, eventState);
-      break;
-
-    case NS_THEME_PROGRESSBAR:
-    {
-      double value = GetProgressValue(aFrame);
-      double maxValue = GetProgressMaxValue(aFrame);
-      // Don't request repaints for scrollbars at 100% because those don't animate.
-      if (value < maxValue) {
-        if (!QueueAnimatedContentForRefresh(aFrame->GetContent(), 30)) {
-          NS_WARNING("Unable to animate progressbar!");
-        }
-      }
-      DrawProgress(cgContext, macRect, IsIndeterminateProgress(aFrame, eventState),
-                   !IsVerticalProgress(aFrame),
-                   value, maxValue, aFrame);
-      break;
-    }
-
-    case NS_THEME_PROGRESSBAR_VERTICAL:
-      DrawProgress(cgContext, macRect, IsIndeterminateProgress(aFrame, eventState),
-                   false, GetProgressValue(aFrame),
-                   GetProgressMaxValue(aFrame), aFrame);
-      break;
-
-    case NS_THEME_METERBAR:
-      DrawMeter(cgContext, macRect, aFrame);
-      break;
-
-    case NS_THEME_PROGRESSCHUNK:
-    case NS_THEME_PROGRESSCHUNK_VERTICAL:
-    case NS_THEME_METERCHUNK:
-      // Do nothing: progress and meter bars cases will draw chunks.
-      break;
-
-    case NS_THEME_TREETWISTY:
-      DrawButton(cgContext, kThemeDisclosureButton, macRect, false,
-                 kThemeDisclosureRight, kThemeAdornmentNone, eventState, aFrame);
-      break;
-
-    case NS_THEME_TREETWISTYOPEN:
-      DrawButton(cgContext, kThemeDisclosureButton, macRect, false,
-                 kThemeDisclosureDown, kThemeAdornmentNone, eventState, aFrame);
-      break;
-
-    case NS_THEME_TREEHEADERCELL: {
-      TreeSortDirection sortDirection = GetTreeSortDirection(aFrame);
-      DrawButton(cgContext, kThemeListHeaderButton, macRect, false,
-                 sortDirection == eTreeSortDirection_Natural ? kThemeButtonOff : kThemeButtonOn,
-                 sortDirection == eTreeSortDirection_Ascending ?
-                 kThemeAdornmentHeaderButtonSortUp : kThemeAdornmentNone, eventState, aFrame);
-    }
-      break;
-
-    case NS_THEME_TREEITEM:
-    case NS_THEME_TREEVIEW:
-      // HIThemeSetFill is not available on 10.3
-      // HIThemeSetFill(kThemeBrushWhite, NULL, cgContext, HITHEME_ORIENTATION);
-      CGContextSetRGBFillColor(cgContext, 1.0, 1.0, 1.0, 1.0);
-      CGContextFillRect(cgContext, macRect);
-      break;
-
-    case NS_THEME_TREEHEADER:
-      // do nothing, taken care of by individual header cells
-    case NS_THEME_TREEHEADERSORTARROW:
-      // do nothing, taken care of by treeview header
-    case NS_THEME_TREELINE:
-      // do nothing, these lines don't exist on macos
-      break;
-
-    case NS_THEME_SCALE_HORIZONTAL:
-    case NS_THEME_SCALE_VERTICAL: {
-      int32_t curpos = CheckIntAttr(aFrame, nsGkAtoms::curpos, 0);
-      int32_t minpos = CheckIntAttr(aFrame, nsGkAtoms::minpos, 0);
-      int32_t maxpos = CheckIntAttr(aFrame, nsGkAtoms::maxpos, 100);
-      if (!maxpos)
-        maxpos = 100;
-
-      bool reverse = aFrame->GetContent()->
-        AttrValueIs(kNameSpaceID_None, nsGkAtoms::dir,
-                    NS_LITERAL_STRING("reverse"), eCaseMatters);
-      DrawScale(cgContext, macRect, eventState,
-                (aWidgetType == NS_THEME_SCALE_VERTICAL), reverse,
-                curpos, minpos, maxpos, aFrame);
-    }
-      break;
-
-    case NS_THEME_SCALETHUMB_HORIZONTAL:
-    case NS_THEME_SCALETHUMB_VERTICAL:
-      // do nothing, drawn by scale
-      break;
-
-    case NS_THEME_RANGE: {
-      nsRangeFrame *rangeFrame = do_QueryFrame(aFrame);
-      if (!rangeFrame) {
-        break;
-      }
-      // DrawScale requires integer min, max and value. This is purely for
-      // drawing, so we normalize to a range 0-1000 here.
-      int32_t value = int32_t(rangeFrame->GetValueAsFractionOfRange() * 1000);
-      int32_t min = 0;
-      int32_t max = 1000;
-      bool isVertical = !IsRangeHorizontal(aFrame);
-      bool reverseDir = isVertical || rangeFrame->IsRightToLeft();
-      DrawScale(cgContext, macRect, eventState, isVertical, reverseDir,
-                value, min, max, aFrame);
-      break;
-    }
-
-    case NS_THEME_SCROLLBAR_SMALL:
-    case NS_THEME_SCROLLBAR:
-      break;
-    case NS_THEME_SCROLLBARTHUMB_VERTICAL:
-    case NS_THEME_SCROLLBARTHUMB_HORIZONTAL: {
-      BOOL isOverlay = nsLookAndFeel::UseOverlayScrollbars();
-      BOOL isHorizontal = (aWidgetType == NS_THEME_SCROLLBARTHUMB_HORIZONTAL);
-      BOOL isRolledOver = IsParentScrollbarRolledOver(aFrame);
-      nsIFrame* scrollbarFrame = GetParentScrollbarFrame(aFrame);
-      bool isSmall = (scrollbarFrame && scrollbarFrame->StyleDisplay()->mAppearance == NS_THEME_SCROLLBAR_SMALL);
-      if (isOverlay && !isRolledOver) {
-        if (isHorizontal) {
-          macRect.origin.y += 4;
-          macRect.size.height -= 4;
-        } else {
-          if (aFrame->StyleVisibility()->mDirection !=
-              NS_STYLE_DIRECTION_RTL) {
-            macRect.origin.x += 4;
-          }
-          macRect.size.width -= 4;
-        }
-      }
-      const BOOL isOnTopOfDarkBackground = IsDarkBackground(aFrame);
-      NSMutableDictionary* options = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-        (isOverlay ? @"kCUIWidgetOverlayScrollBar" : @"scrollbar"), @"widget",
-        (isSmall ? @"small" : @"regular"), @"size",
-        (isHorizontal ? @"kCUIOrientHorizontal" : @"kCUIOrientVertical"), @"kCUIOrientationKey",
-        (isOverlay && isOnTopOfDarkBackground ? @"kCUIVariantWhite" : @""), @"kCUIVariantKey",
-        [NSNumber numberWithBool:YES], @"indiconly",
-        [NSNumber numberWithBool:YES], @"kCUIThumbProportionKey",
-        [NSNumber numberWithBool:YES], @"is.flipped",
-        nil];
-      if (isRolledOver) {
-        [options setObject:@"rollover" forKey:@"state"];
-      }
-      RenderWithCoreUI(macRect, cgContext, options, true);
-    }
-      break;
-
-    case NS_THEME_SCROLLBARBUTTON_UP:
-    case NS_THEME_SCROLLBARBUTTON_LEFT:
-#if SCROLLBARS_VISUAL_DEBUG
-      CGContextSetRGBFillColor(cgContext, 1.0, 0, 0, 0.6);
-      CGContextFillRect(cgContext, macRect);
-#endif
-    break;
-    case NS_THEME_SCROLLBARBUTTON_DOWN:
-    case NS_THEME_SCROLLBARBUTTON_RIGHT:
-#if SCROLLBARS_VISUAL_DEBUG
-      CGContextSetRGBFillColor(cgContext, 0, 1.0, 0, 0.6);
-      CGContextFillRect(cgContext, macRect);
-#endif
-    break;
-    case NS_THEME_SCROLLBARTRACK_HORIZONTAL:
-    case NS_THEME_SCROLLBARTRACK_VERTICAL: {
-      BOOL isOverlay = nsLookAndFeel::UseOverlayScrollbars();
-      if (!isOverlay || IsParentScrollbarRolledOver(aFrame)) {
-        BOOL isHorizontal = (aWidgetType == NS_THEME_SCROLLBARTRACK_HORIZONTAL);
-        nsIFrame* scrollbarFrame = GetParentScrollbarFrame(aFrame);
-        bool isSmall = (scrollbarFrame && scrollbarFrame->StyleDisplay()->mAppearance == NS_THEME_SCROLLBAR_SMALL);
-        const BOOL isOnTopOfDarkBackground = IsDarkBackground(aFrame);
-        RenderWithCoreUI(macRect, cgContext,
-                [NSDictionary dictionaryWithObjectsAndKeys:
-                  (isOverlay ? @"kCUIWidgetOverlayScrollBar" : @"scrollbar"), @"widget",
-                  (isSmall ? @"small" : @"regular"), @"size",
-                  (isHorizontal ? @"kCUIOrientHorizontal" : @"kCUIOrientVertical"), @"kCUIOrientationKey",
-                  (isOnTopOfDarkBackground ? @"kCUIVariantWhite" : @""), @"kCUIVariantKey",
-                  [NSNumber numberWithBool:YES], @"noindicator",
-                  [NSNumber numberWithBool:YES], @"kCUIThumbProportionKey",
-                  [NSNumber numberWithBool:YES], @"is.flipped",
-                  nil],
-                true);
-      }
-    }
-      break;
-
-    case NS_THEME_TEXTFIELD_MULTILINE: {
-      // we have to draw this by hand because there is no HITheme value for it
-      CGContextSetRGBFillColor(cgContext, 1.0, 1.0, 1.0, 1.0);
-      
-      CGContextFillRect(cgContext, macRect);
-
-      // #737373 for the top border, #999999 for the rest.
-      float x = macRect.origin.x, y = macRect.origin.y;
-      float w = macRect.size.width, h = macRect.size.height;
-      CGContextSetRGBFillColor(cgContext, 0.4510, 0.4510, 0.4510, 1.0);
-      CGContextFillRect(cgContext, CGRectMake(x, y, w, 1));
-      CGContextSetRGBFillColor(cgContext, 0.6, 0.6, 0.6, 1.0);
-      CGContextFillRect(cgContext, CGRectMake(x, y + 1, 1, h - 1));
-      CGContextFillRect(cgContext, CGRectMake(x + w - 1, y + 1, 1, h - 1));
-      CGContextFillRect(cgContext, CGRectMake(x + 1, y + h - 1, w - 2, 1));
-
-      // draw a focus ring
-      if (eventState.HasState(NS_EVENT_STATE_FOCUS)) {
-        NSGraphicsContext* savedContext = [NSGraphicsContext currentContext];
-        [NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithGraphicsPort:cgContext flipped:YES]];
-        CGContextSaveGState(cgContext);
-        NSSetFocusRingStyle(NSFocusRingOnly);
-        NSRectFill(NSRectFromCGRect(macRect));
-        CGContextRestoreGState(cgContext);
-        [NSGraphicsContext setCurrentContext:savedContext];
-      }
-    }
-      break;
-
-    case NS_THEME_LISTBOX: {
-      // We have to draw this by hand because kHIThemeFrameListBox drawing
-      // is buggy on 10.5, see bug 579259.
-      CGContextSetRGBFillColor(cgContext, 1.0, 1.0, 1.0, 1.0);
-      CGContextFillRect(cgContext, macRect);
-
-      // #8E8E8E for the top border, #BEBEBE for the rest.
-      float x = macRect.origin.x, y = macRect.origin.y;
-      float w = macRect.size.width, h = macRect.size.height;
-      CGContextSetRGBFillColor(cgContext, 0.557, 0.557, 0.557, 1.0);
-      CGContextFillRect(cgContext, CGRectMake(x, y, w, 1));
-      CGContextSetRGBFillColor(cgContext, 0.745, 0.745, 0.745, 1.0);
-      CGContextFillRect(cgContext, CGRectMake(x, y + 1, 1, h - 1));
-      CGContextFillRect(cgContext, CGRectMake(x + w - 1, y + 1, 1, h - 1));
-      CGContextFillRect(cgContext, CGRectMake(x + 1, y + h - 1, w - 2, 1));
-    }
-      break;
-
-    case NS_THEME_MAC_SOURCE_LIST: {
-      if (VibrancyManager::SystemSupportsVibrancy()) {
-        ThemeGeometryType type = ThemeGeometryTypeForWidget(aFrame, aWidgetType);
-        DrawVibrancyBackground(cgContext, macRect, aFrame, type);
-      } else {
-        CGGradientRef backgroundGradient;
-        CGColorSpaceRef rgb = CGColorSpaceCreateDeviceRGB();
-        CGFloat activeGradientColors[8] = { 0.9137, 0.9294, 0.9490, 1.0,
-                                            0.8196, 0.8471, 0.8784, 1.0 };
-        CGFloat inactiveGradientColors[8] = { 0.9686, 0.9686, 0.9686, 1.0,
-                                              0.9216, 0.9216, 0.9216, 1.0 };
-        CGPoint start = macRect.origin;
-        CGPoint end = CGPointMake(macRect.origin.x,
-                                  macRect.origin.y + macRect.size.height);
-        BOOL isActive = FrameIsInActiveWindow(aFrame);
-        backgroundGradient =
-          CGGradientCreateWithColorComponents(rgb, isActive ? activeGradientColors
-                                                            : inactiveGradientColors, NULL, 2);
-        CGContextDrawLinearGradient(cgContext, backgroundGradient, start, end, 0);
-        CGGradientRelease(backgroundGradient);
-        CGColorSpaceRelease(rgb);
-      }
-    }
-      break;
-
-    case NS_THEME_MAC_SOURCE_LIST_SELECTION:
-    case NS_THEME_MAC_ACTIVE_SOURCE_LIST_SELECTION: {
-      // If we're in XUL tree, we need to rely on the source list's clear
-      // background display item. If we cleared the background behind the
-      // selections, the source list would not pick up the right font
-      // smoothing background. So, to simplify a bit, we only support vibrancy
-      // if we're in a source list.
-      if (VibrancyManager::SystemSupportsVibrancy() && IsInSourceList(aFrame)) {
-        ThemeGeometryType type = ThemeGeometryTypeForWidget(aFrame, aWidgetType);
-        DrawVibrancyBackground(cgContext, macRect, aFrame, type);
-      } else {
-        BOOL isActiveSelection =
-          aWidgetType == NS_THEME_MAC_ACTIVE_SOURCE_LIST_SELECTION;
-        RenderWithCoreUI(macRect, cgContext,
-          [NSDictionary dictionaryWithObjectsAndKeys:
-            [NSNumber numberWithBool:isActiveSelection], @"focus",
-            [NSNumber numberWithBool:YES], @"is.flipped",
-            @"kCUIVariantGradientSideBarSelection", @"kCUIVariantKey",
-            (FrameIsInActiveWindow(aFrame) ? @"normal" : @"inactive"), @"state",
-            @"gradient", @"widget",
-            nil]);
-      }
-    }
-      break;
-    
-    case NS_THEME_TAB:
-      DrawSegment(cgContext, macRect, eventState, aFrame, tabRenderSettings);
-      break;
-
-    case NS_THEME_TABPANELS:
-      DrawTabPanel(cgContext, macRect, aFrame);
-      break;
-
-    case NS_THEME_RESIZER:
-      DrawResizer(cgContext, macRect, aFrame);
-      break;
-
-    case NS_THEME_MAC_VIBRANCY_LIGHT:
-    case NS_THEME_MAC_VIBRANCY_DARK: {
-      ThemeGeometryType type = ThemeGeometryTypeForWidget(aFrame, aWidgetType);
-      DrawVibrancyBackground(cgContext, macRect, aFrame, type);
-      break;
-    }
-  }
-
-  if (hidpi) {
-    // Reset the base CTM.
-    CGContextSetBaseCTM(cgContext, CGAffineTransformIdentity);
-  }
-
-  nativeDrawing.EndNativeDrawing();
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-nsIntMargin
-nsNativeThemeCocoa::DirectionAwareMargin(const nsIntMargin& aMargin,
-                                         nsIFrame* aFrame)
-{
-  // Assuming aMargin was originally specified for a horizontal LTR context,
-  // reinterpret the values as logical, and then map to physical coords
-  // according to aFrame's actual writing mode.
-  WritingMode wm = aFrame->GetWritingMode();
-  nsMargin m = LogicalMargin(wm, aMargin.top, aMargin.right, aMargin.bottom,
-                             aMargin.left).GetPhysicalMargin(wm);
-  return nsIntMargin(m.top, m.right, m.bottom, m.left);
-}
-
-static const nsIntMargin kAquaDropdownBorder(1, 22, 2, 5);
-static const nsIntMargin kAquaComboboxBorder(3, 20, 3, 4);
-static const nsIntMargin kAquaSearchfieldBorder(3, 5, 2, 19);
-
-NS_IMETHODIMP
-nsNativeThemeCocoa::GetWidgetBorder(nsDeviceContext* aContext, 
-                                    nsIFrame* aFrame,
-                                    uint8_t aWidgetType,
-                                    nsIntMargin* aResult)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  aResult->SizeTo(0, 0, 0, 0);
-
-  switch (aWidgetType) {
-    case NS_THEME_BUTTON:
-    {
-      if (IsButtonTypeMenu(aFrame)) {
-        *aResult = DirectionAwareMargin(kAquaDropdownBorder, aFrame);
-      } else {
-        *aResult = DirectionAwareMargin(nsIntMargin(1, 7, 3, 7), aFrame);
-      }
-      break;
-    }
-
-    case NS_THEME_TOOLBARBUTTON:
-    {
-      *aResult = DirectionAwareMargin(nsIntMargin(1, 4, 1, 4), aFrame);
-      break;
-    }
-
-    case NS_THEME_CHECKBOX:
-    case NS_THEME_RADIO:
-    {
-      // nsFormControlFrame::GetIntrinsicWidth and nsFormControlFrame::GetIntrinsicHeight
-      // assume a border width of 2px.
-      aResult->SizeTo(2, 2, 2, 2);
-      break;
-    }
-
-    case NS_THEME_MENULIST:
-    case NS_THEME_MENULIST_BUTTON:
-      *aResult = DirectionAwareMargin(kAquaDropdownBorder, aFrame);
-      break;
-
-    case NS_THEME_MENULIST_TEXTFIELD:
-      *aResult = DirectionAwareMargin(kAquaComboboxBorder, aFrame);
-      break;
-
-    case NS_THEME_NUMBER_INPUT:
-    case NS_THEME_TEXTFIELD:
-    {
-      SInt32 frameOutset = 0;
-      ::GetThemeMetric(kThemeMetricEditTextFrameOutset, &frameOutset);
-
-      SInt32 textPadding = 0;
-      ::GetThemeMetric(kThemeMetricEditTextWhitespace, &textPadding);
-
-      frameOutset += textPadding;
-
-      aResult->SizeTo(frameOutset, frameOutset, frameOutset, frameOutset);
-      break;
-    }
-
-    case NS_THEME_TEXTFIELD_MULTILINE:
-      aResult->SizeTo(1, 1, 1, 1);
-      break;
-
-    case NS_THEME_SEARCHFIELD:
-      *aResult = DirectionAwareMargin(kAquaSearchfieldBorder, aFrame);
-      break;
-
-    case NS_THEME_LISTBOX:
-    {
-      SInt32 frameOutset = 0;
-      ::GetThemeMetric(kThemeMetricListBoxFrameOutset, &frameOutset);
-      aResult->SizeTo(frameOutset, frameOutset, frameOutset, frameOutset);
-      break;
-    }
-
-    case NS_THEME_SCROLLBARTRACK_HORIZONTAL:
-    case NS_THEME_SCROLLBARTRACK_VERTICAL:
-    {
-      bool isHorizontal = (aWidgetType == NS_THEME_SCROLLBARTRACK_HORIZONTAL);
-      if (nsLookAndFeel::UseOverlayScrollbars()) {
-        if (!nsCocoaFeatures::OnYosemiteOrLater()) {
-          // Pre-10.10, we have to center the thumb rect in the middle of the
-          // scrollbar. Starting with 10.10, the expected rect for thumb
-          // rendering is the full width of the scrollbar.
-          if (isHorizontal) {
-            aResult->top = 2;
-            aResult->bottom = 1;
-          } else {
-            aResult->left = 2;
-            aResult->right = 1;
-          }
-        }
-        // Leave a bit of space at the start and the end on all OS X versions.
-        if (isHorizontal) {
-          aResult->left = 1;
-          aResult->right = 1;
-        } else {
-          aResult->top = 1;
-          aResult->bottom = 1;
-        }
-      }
-
-      break;
-    }
-
-    case NS_THEME_STATUSBAR:
-      aResult->SizeTo(1, 0, 0, 0);
-      break;
-  }
-
-  if (IsHiDPIContext(aFrame->PresContext())) {
-    *aResult = *aResult + *aResult; // doubled
-  }
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-// Return false here to indicate that CSS padding values should be used. There is
-// no reason to make a distinction between padding and border values, just specify
-// whatever values you want in GetWidgetBorder and only use this to return true
-// if you want to override CSS padding values.
-bool
-nsNativeThemeCocoa::GetWidgetPadding(nsDeviceContext* aContext, 
-                                     nsIFrame* aFrame,
-                                     uint8_t aWidgetType,
-                                     nsIntMargin* aResult)
-{
-  // We don't want CSS padding being used for certain widgets.
-  // See bug 381639 for an example of why.
-  switch (aWidgetType) {
-    // Radios and checkboxes return a fixed size in GetMinimumWidgetSize
-    // and have a meaningful baseline, so they can't have
-    // author-specified padding.
-    case NS_THEME_CHECKBOX:
-    case NS_THEME_RADIO:
-      aResult->SizeTo(0, 0, 0, 0);
-      return true;
-  }
-  return false;
-}
-
-bool
-nsNativeThemeCocoa::GetWidgetOverflow(nsDeviceContext* aContext, nsIFrame* aFrame,
-                                      uint8_t aWidgetType, nsRect* aOverflowRect)
-{
-  int32_t p2a = aFrame->PresContext()->AppUnitsPerDevPixel();
-  switch (aWidgetType) {
-    case NS_THEME_BUTTON:
-    case NS_THEME_MAC_DISCLOSURE_BUTTON_OPEN:
-    case NS_THEME_MAC_DISCLOSURE_BUTTON_CLOSED:
-    case NS_THEME_MAC_HELP_BUTTON:
-    case NS_THEME_TOOLBARBUTTON:
-    case NS_THEME_NUMBER_INPUT:
-    case NS_THEME_TEXTFIELD:
-    case NS_THEME_TEXTFIELD_MULTILINE:
-    case NS_THEME_SEARCHFIELD:
-    case NS_THEME_LISTBOX:
-    case NS_THEME_MENULIST:
-    case NS_THEME_MENULIST_BUTTON:
-    case NS_THEME_MENULIST_TEXTFIELD:
-    case NS_THEME_CHECKBOX:
-    case NS_THEME_RADIO:
-    case NS_THEME_TAB:
-    {
-      // We assume that the above widgets can draw a focus ring that will be less than
-      // or equal to 4 pixels thick.
-      nsIntMargin extraSize = nsIntMargin(kMaxFocusRingWidth,
-                                          kMaxFocusRingWidth,
-                                          kMaxFocusRingWidth,
-                                          kMaxFocusRingWidth);
-      nsMargin m(NSIntPixelsToAppUnits(extraSize.top, p2a),
-                 NSIntPixelsToAppUnits(extraSize.right, p2a),
-                 NSIntPixelsToAppUnits(extraSize.bottom, p2a),
-                 NSIntPixelsToAppUnits(extraSize.left, p2a));
-      aOverflowRect->Inflate(m);
-      return true;
-    }
-    case NS_THEME_PROGRESSBAR:
-    {
-      // Progress bars draw a 2 pixel white shadow under their progress indicators
-      nsMargin m(0, 0, NSIntPixelsToAppUnits(2, p2a), 0);
-      aOverflowRect->Inflate(m);
-      return true;
-    }
-    case NS_THEME_FOCUS_OUTLINE:
-    {
-      aOverflowRect->Inflate(NSIntPixelsToAppUnits(2, p2a));
-      return true;
-    }
-  }
-
-  return false;
-}
-
-static const int32_t kRegularScrollbarThumbMinSize = 26;
-static const int32_t kSmallScrollbarThumbMinSize = 26;
-
-NS_IMETHODIMP
-nsNativeThemeCocoa::GetMinimumWidgetSize(nsPresContext* aPresContext,
-                                         nsIFrame* aFrame,
-                                         uint8_t aWidgetType,
-                                         LayoutDeviceIntSize* aResult,
-                                         bool* aIsOverridable)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  aResult->SizeTo(0,0);
-  *aIsOverridable = true;
-
-  switch (aWidgetType) {
-    case NS_THEME_BUTTON:
-    {
-      aResult->SizeTo(pushButtonSettings.minimumSizes[miniControlSize].width,
-                      pushButtonSettings.naturalSizes[miniControlSize].height);
-      break;
-    }
-
-    case NS_THEME_BUTTON_ARROW_UP:
-    case NS_THEME_BUTTON_ARROW_DOWN:
-    {
-      aResult->SizeTo(kMenuScrollArrowSize.width, kMenuScrollArrowSize.height);
-      *aIsOverridable = false;
-      break;
-    }
-
-    case NS_THEME_MENUARROW:
-    {
-      aResult->SizeTo(kMenuarrowSize.width, kMenuarrowSize.height);
-      *aIsOverridable = false;
-      break;
-    }
-
-    case NS_THEME_MAC_DISCLOSURE_BUTTON_OPEN:
-    case NS_THEME_MAC_DISCLOSURE_BUTTON_CLOSED:
-    {
-      aResult->SizeTo(kDisclosureButtonSize.width, kDisclosureButtonSize.height);
-      *aIsOverridable = false;
-      break;
-    }
-
-    case NS_THEME_MAC_HELP_BUTTON:
-    {
-      aResult->SizeTo(kHelpButtonSize.width, kHelpButtonSize.height);
-      *aIsOverridable = false;
-      break;
-    }
-
-    case NS_THEME_TOOLBARBUTTON:
-    {
-      aResult->SizeTo(0, toolbarButtonHeights[miniControlSize]);
-      break;
-    }
-
-    case NS_THEME_SPINNER:
-    case NS_THEME_SPINNER_UPBUTTON:
-    case NS_THEME_SPINNER_DOWNBUTTON:
-    {
-      SInt32 buttonHeight = 0, buttonWidth = 0;
-      if (aFrame->GetContent()->IsXULElement()) {
-        ::GetThemeMetric(kThemeMetricLittleArrowsWidth, &buttonWidth);
-        ::GetThemeMetric(kThemeMetricLittleArrowsHeight, &buttonHeight);
-      } else {
-        NSSize size =
-          spinnerSettings.minimumSizes[EnumSizeForCocoaSize(NSMiniControlSize)];
-        buttonWidth = size.width;
-        buttonHeight = size.height;
-        if (aWidgetType != NS_THEME_SPINNER) {
-          // the buttons are half the height of the spinner
-          buttonHeight /= 2;
-        }
-      }
-      aResult->SizeTo(buttonWidth, buttonHeight);
-      *aIsOverridable = true;
-      break;
-    }
-
-    case NS_THEME_MENULIST:
-    case NS_THEME_MENULIST_BUTTON:
-    {
-      SInt32 popupHeight = 0;
-      ::GetThemeMetric(kThemeMetricPopupButtonHeight, &popupHeight);
-      aResult->SizeTo(0, popupHeight);
-      break;
-    }
-
-    case NS_THEME_NUMBER_INPUT:
-    case NS_THEME_TEXTFIELD:
-    case NS_THEME_TEXTFIELD_MULTILINE:
-    case NS_THEME_SEARCHFIELD:
-    {
-      // at minimum, we should be tall enough for 9pt text.
-      // I'm using hardcoded values here because the appearance manager
-      // values for the frame size are incorrect.
-      aResult->SizeTo(0, (2 + 2) /* top */ + 9 + (1 + 1) /* bottom */);
-      break;
-    }
-
-    case NS_THEME_WINDOW_BUTTON_BOX: {
-      NSSize size = WindowButtonsSize(aFrame);
-      aResult->SizeTo(size.width, size.height);
-      *aIsOverridable = false;
-      break;
-    }
-
-    case NS_THEME_MAC_FULLSCREEN_BUTTON: {
-      if ([NativeWindowForFrame(aFrame) respondsToSelector:@selector(toggleFullScreen:)] &&
-          !nsCocoaFeatures::OnYosemiteOrLater()) {
-        // This value is hardcoded because it's needed before we can measure the
-        // position and size of the fullscreen button.
-        aResult->SizeTo(16, 17);
-      }
-      *aIsOverridable = false;
-      break;
-    }
-
-    case NS_THEME_PROGRESSBAR:
-    {
-      SInt32 barHeight = 0;
-      ::GetThemeMetric(kThemeMetricNormalProgressBarThickness, &barHeight);
-      aResult->SizeTo(0, barHeight);
-      break;
-    }
-
-    case NS_THEME_TREETWISTY:
-    case NS_THEME_TREETWISTYOPEN:   
-    {
-      SInt32 twistyHeight = 0, twistyWidth = 0;
-      ::GetThemeMetric(kThemeMetricDisclosureButtonWidth, &twistyWidth);
-      ::GetThemeMetric(kThemeMetricDisclosureButtonHeight, &twistyHeight);
-      aResult->SizeTo(twistyWidth, twistyHeight);
-      *aIsOverridable = false;
-      break;
-    }
-    
-    case NS_THEME_TREEHEADER:
-    case NS_THEME_TREEHEADERCELL:
-    {
-      SInt32 headerHeight = 0;
-      ::GetThemeMetric(kThemeMetricListHeaderHeight, &headerHeight);
-      aResult->SizeTo(0, headerHeight - 1); // We don't need the top border.
-      break;
-    }
-
-    case NS_THEME_TAB:
-    {
-      aResult->SizeTo(0, tabHeights[miniControlSize]);
-      break;
-    }
-
-    case NS_THEME_RANGE:
-    {
-      // The Mac Appearance Manager API (the old API we're currently using)
-      // doesn't define constants to obtain a minimum size for sliders. We use
-      // the "thickness" of a slider that has default dimensions for both the
-      // minimum width and height to get something sane and so that paint
-      // invalidation works.
-      SInt32 size = 0;
-      if (IsRangeHorizontal(aFrame)) {
-        ::GetThemeMetric(kThemeMetricHSliderHeight, &size);
-      } else {
-        ::GetThemeMetric(kThemeMetricVSliderWidth, &size);
-      }
-      aResult->SizeTo(size, size);
-      *aIsOverridable = true;
-      break;
-    }
-
-    case NS_THEME_RANGE_THUMB:
-    {
-      SInt32 width = 0;
-      SInt32 height = 0;
-      ::GetThemeMetric(kThemeMetricSliderMinThumbWidth, &width);
-      ::GetThemeMetric(kThemeMetricSliderMinThumbHeight, &height);
-      aResult->SizeTo(width, height);
-      *aIsOverridable = false;
-      break;
-    }
-
-    case NS_THEME_SCALE_HORIZONTAL:
-    {
-      SInt32 scaleHeight = 0;
-      ::GetThemeMetric(kThemeMetricHSliderHeight, &scaleHeight);
-      aResult->SizeTo(scaleHeight, scaleHeight);
-      *aIsOverridable = false;
-      break;
-    }
-
-    case NS_THEME_SCALE_VERTICAL:
-    {
-      SInt32 scaleWidth = 0;
-      ::GetThemeMetric(kThemeMetricVSliderWidth, &scaleWidth);
-      aResult->SizeTo(scaleWidth, scaleWidth);
-      *aIsOverridable = false;
-      break;
-    }
-
-    case NS_THEME_SCROLLBARTHUMB_HORIZONTAL:
-    case NS_THEME_SCROLLBARTHUMB_VERTICAL:
-    {
-      // Find our parent scrollbar frame in order to find out whether we're in
-      // a small or a large scrollbar.
-      nsIFrame *scrollbarFrame = GetParentScrollbarFrame(aFrame);
-      if (!scrollbarFrame) {
-        return NS_ERROR_FAILURE;
-      }
-      
-      bool isSmall = (scrollbarFrame->StyleDisplay()->mAppearance == NS_THEME_SCROLLBAR_SMALL);
-      bool isHorizontal = (aWidgetType == NS_THEME_SCROLLBARTHUMB_HORIZONTAL);
-      int32_t& minSize = isHorizontal ? aResult->width : aResult->height;
-      minSize = isSmall ? kSmallScrollbarThumbMinSize : kRegularScrollbarThumbMinSize;
-      break;
-    }
-
-    case NS_THEME_SCROLLBAR:
-    case NS_THEME_SCROLLBAR_SMALL:
-    case NS_THEME_SCROLLBARTRACK_VERTICAL:
-    case NS_THEME_SCROLLBARTRACK_HORIZONTAL:
-    {
-      *aIsOverridable = false;
-
-      if (nsLookAndFeel::UseOverlayScrollbars()) {
-        nsIFrame* scrollbarFrame = GetParentScrollbarFrame(aFrame);
-        if (scrollbarFrame &&
-            scrollbarFrame->StyleDisplay()->mAppearance ==
-              NS_THEME_SCROLLBAR_SMALL) {
-          aResult->SizeTo(14, 14);
-        }
-        else {
-          aResult->SizeTo(16, 16);
-        }
-        if (IsScrollbarWidthThin(aFrame)) {
-          aResult->SizeTo(8, 8);
-        }
-        break;
-      }
-
-      // yeah, i know i'm cheating a little here, but i figure that it
-      // really doesn't matter if the scrollbar is vertical or horizontal
-      // and the width metric is a really good metric for every piece
-      // of the scrollbar.
-
-      nsIFrame *scrollbarFrame = GetParentScrollbarFrame(aFrame);
-      if (!scrollbarFrame) return NS_ERROR_FAILURE;
-
-      int32_t themeMetric = (scrollbarFrame->StyleDisplay()->mAppearance == NS_THEME_SCROLLBAR_SMALL) ?
-                            kThemeMetricSmallScrollBarWidth :
-                            kThemeMetricScrollBarWidth;
-      SInt32 scrollbarWidth = 0;
-      ::GetThemeMetric(themeMetric, &scrollbarWidth);
-      if (IsScrollbarWidthThin(aFrame)) {
-        scrollbarWidth /= 2;
-      }
-      aResult->SizeTo(scrollbarWidth, scrollbarWidth);
-      break;
-    }
-
-    case NS_THEME_SCROLLBAR_NON_DISAPPEARING:
-    {
-      int32_t themeMetric = kThemeMetricScrollBarWidth;
-
-      if (aFrame) {
-        nsIFrame* scrollbarFrame = GetParentScrollbarFrame(aFrame);
-        if (scrollbarFrame &&
-            scrollbarFrame->StyleDisplay()->mAppearance ==
-            NS_THEME_SCROLLBAR_SMALL) {
-          // XXX We're interested in the width of non-disappearing scrollbars
-          // to leave enough space for a dropmarker in non-native styled
-          // comboboxes (bug 869314). It isn't clear to me if comboboxes can
-          // ever have small scrollbars.
-          themeMetric = kThemeMetricSmallScrollBarWidth;
-        }
-      }
-
-      SInt32 scrollbarWidth = 0;
-      ::GetThemeMetric(themeMetric, &scrollbarWidth);
-      aResult->SizeTo(scrollbarWidth, scrollbarWidth);
-      break;
-    }
-
-    case NS_THEME_SCROLLBARBUTTON_UP:
-    case NS_THEME_SCROLLBARBUTTON_DOWN:
-    case NS_THEME_SCROLLBARBUTTON_LEFT:
-    case NS_THEME_SCROLLBARBUTTON_RIGHT:
-    {
-      if (!IsScrollbarWidthThin(aFrame)) {
-        // Get scrollbar button metrics from the system, except in the case of
-        // thin scrollbars, where we leave them at 0 (collapse)
-
-        nsIFrame *scrollbarFrame = GetParentScrollbarFrame(aFrame);
-        if (!scrollbarFrame) return NS_ERROR_FAILURE;
-
-        // Since there is no NS_THEME_SCROLLBARBUTTON_UP_SMALL we need to ask the parent what appearance style it has.
-        int32_t themeMetric = (scrollbarFrame->StyleDisplay()->mAppearance == NS_THEME_SCROLLBAR_SMALL) ?
-                              kThemeMetricSmallScrollBarWidth :
-                              kThemeMetricScrollBarWidth;
-        SInt32 scrollbarWidth = 0;
-        ::GetThemeMetric(themeMetric, &scrollbarWidth);
-
-        // It seems that for both sizes of scrollbar, the buttons are one pixel "longer".
-        if (aWidgetType == NS_THEME_SCROLLBARBUTTON_LEFT || aWidgetType == NS_THEME_SCROLLBARBUTTON_RIGHT)
-          aResult->SizeTo(scrollbarWidth+1, scrollbarWidth);
-        else
-          aResult->SizeTo(scrollbarWidth, scrollbarWidth+1);
-      }
-      *aIsOverridable = false;
-      break;
-    }
-    case NS_THEME_RESIZER:
-    {
-      HIThemeGrowBoxDrawInfo drawInfo;
-      drawInfo.version = 0;
-      drawInfo.state = kThemeStateActive;
-      drawInfo.kind = kHIThemeGrowBoxKindNormal;
-      drawInfo.direction = kThemeGrowRight | kThemeGrowDown;
-      drawInfo.size = kHIThemeGrowBoxSizeNormal;
-      HIPoint pnt = { 0, 0 };
-      HIRect bounds;
-      HIThemeGetGrowBoxBounds(&pnt, &drawInfo, &bounds);
-      aResult->SizeTo(bounds.size.width, bounds.size.height);
-      *aIsOverridable = false;
-    }
-  }
-
-  if (IsHiDPIContext(aPresContext)) {
-    *aResult = *aResult * 2;
-  }
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-nsNativeThemeCocoa::WidgetStateChanged(nsIFrame* aFrame, uint8_t aWidgetType, 
-                                       nsIAtom* aAttribute, bool* aShouldRepaint,
-                                       const nsAttrValue* aOldValue)
-{
-  // Some widget types just never change state.
-  switch (aWidgetType) {
-    case NS_THEME_WINDOW_TITLEBAR:
-    case NS_THEME_TOOLBOX:
-    case NS_THEME_TOOLBAR:
-    case NS_THEME_STATUSBAR:
-    case NS_THEME_STATUSBARPANEL:
-    case NS_THEME_RESIZERPANEL:
-    case NS_THEME_TOOLTIP:
-    case NS_THEME_TABPANELS:
-    case NS_THEME_TABPANEL:
-    case NS_THEME_DIALOG:
-    case NS_THEME_MENUPOPUP:
-    case NS_THEME_GROUPBOX:
-    case NS_THEME_PROGRESSCHUNK:
-    case NS_THEME_PROGRESSCHUNK_VERTICAL:
-    case NS_THEME_PROGRESSBAR:
-    case NS_THEME_PROGRESSBAR_VERTICAL:
-    case NS_THEME_METERBAR:
-    case NS_THEME_METERCHUNK:
-    case NS_THEME_MAC_VIBRANCY_LIGHT:
-    case NS_THEME_MAC_VIBRANCY_DARK:
-      *aShouldRepaint = false;
-      return NS_OK;
-  }
-
-  // XXXdwh Not sure what can really be done here.  Can at least guess for
-  // specific widgets that they're highly unlikely to have certain states.
-  // For example, a toolbar doesn't care about any states.
-  if (!aAttribute) {
-    // Hover/focus/active changed.  Always repaint.
-    *aShouldRepaint = true;
-  } else {
-    // Check the attribute to see if it's relevant.  
-    // disabled, checked, dlgtype, default, etc.
-    *aShouldRepaint = false;
-    if (aAttribute == nsGkAtoms::disabled ||
-        aAttribute == nsGkAtoms::checked ||
-        aAttribute == nsGkAtoms::selected ||
-        aAttribute == nsGkAtoms::visuallyselected ||
-        aAttribute == nsGkAtoms::menuactive ||
-        aAttribute == nsGkAtoms::sortDirection ||
-        aAttribute == nsGkAtoms::focused ||
-        aAttribute == nsGkAtoms::_default ||
-        aAttribute == nsGkAtoms::open ||
-        aAttribute == nsGkAtoms::hover)
-      *aShouldRepaint = true;
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNativeThemeCocoa::ThemeChanged()
-{
-  // This is unimplemented because we don't care if gecko changes its theme
-  // and Mac OS X doesn't have themes.
-  return NS_OK;
-}
-
-bool 
-nsNativeThemeCocoa::ThemeSupportsWidget(nsPresContext* aPresContext, nsIFrame* aFrame,
-                                      uint8_t aWidgetType)
-{
-  // We don't have CSS set up to render non-native scrollbars on Mac OS X so we
-  // render natively even if native theme support is disabled.
-  if (aWidgetType != NS_THEME_SCROLLBAR &&
-      aPresContext && !aPresContext->PresShell()->IsThemeSupportEnabled())
-    return false;
-
-  // if this is a dropdown button in a combobox the answer is always no
-  if (aWidgetType == NS_THEME_MENULIST_BUTTON) {
-    nsIFrame* parentFrame = aFrame->GetParent();
-    if (parentFrame && (parentFrame->GetType() == nsGkAtoms::comboboxControlFrame))
-      return false;
-  }
-
-  switch (aWidgetType) {
-    // Combobox dropdowns don't support native theming in vertical mode.
-    case NS_THEME_MENULIST:
-    case NS_THEME_MENULIST_BUTTON:
-    case NS_THEME_MENULIST_TEXT:
-    case NS_THEME_MENULIST_TEXTFIELD:
-      if (aFrame && aFrame->GetWritingMode().IsVertical()) {
-        return false;
-      }
-      MOZ_FALLTHROUGH;
-
-    case NS_THEME_LISTBOX:
-
-    case NS_THEME_DIALOG:
-    case NS_THEME_WINDOW:
-    case NS_THEME_WINDOW_BUTTON_BOX:
-    case NS_THEME_WINDOW_TITLEBAR:
-    case NS_THEME_CHECKMENUITEM:
-    case NS_THEME_MENUPOPUP:
-    case NS_THEME_MENUARROW:
-    case NS_THEME_MENUITEM:
-    case NS_THEME_MENUSEPARATOR:
-    case NS_THEME_MAC_FULLSCREEN_BUTTON:
-    case NS_THEME_TOOLTIP:
-    
-    case NS_THEME_CHECKBOX:
-    case NS_THEME_CHECKBOX_CONTAINER:
-    case NS_THEME_RADIO:
-    case NS_THEME_RADIO_CONTAINER:
-    case NS_THEME_GROUPBOX:
-    case NS_THEME_MAC_HELP_BUTTON:
-    case NS_THEME_MAC_DISCLOSURE_BUTTON_OPEN:
-    case NS_THEME_MAC_DISCLOSURE_BUTTON_CLOSED:
-    case NS_THEME_BUTTON:
-    case NS_THEME_BUTTON_ARROW_UP:
-    case NS_THEME_BUTTON_ARROW_DOWN:
-    case NS_THEME_BUTTON_BEVEL:
-    case NS_THEME_TOOLBARBUTTON:
-    case NS_THEME_SPINNER:
-    case NS_THEME_SPINNER_UPBUTTON:
-    case NS_THEME_SPINNER_DOWNBUTTON:
-    case NS_THEME_TOOLBAR:
-    case NS_THEME_STATUSBAR:
-    case NS_THEME_NUMBER_INPUT:
-    case NS_THEME_TEXTFIELD:
-    case NS_THEME_TEXTFIELD_MULTILINE:
-    case NS_THEME_SEARCHFIELD:
-    case NS_THEME_TOOLBOX:
-    //case NS_THEME_TOOLBARBUTTON:
-    case NS_THEME_PROGRESSBAR:
-    case NS_THEME_PROGRESSBAR_VERTICAL:
-    case NS_THEME_PROGRESSCHUNK:
-    case NS_THEME_PROGRESSCHUNK_VERTICAL:
-    case NS_THEME_METERBAR:
-    case NS_THEME_METERCHUNK:
-    case NS_THEME_SEPARATOR:
-    
-    case NS_THEME_TABPANELS:
-    case NS_THEME_TAB:
-    
-    case NS_THEME_TREETWISTY:
-    case NS_THEME_TREETWISTYOPEN:
-    case NS_THEME_TREEVIEW:
-    case NS_THEME_TREEHEADER:
-    case NS_THEME_TREEHEADERCELL:
-    case NS_THEME_TREEHEADERSORTARROW:
-    case NS_THEME_TREEITEM:
-    case NS_THEME_TREELINE:
-    case NS_THEME_MAC_SOURCE_LIST:
-    case NS_THEME_MAC_SOURCE_LIST_SELECTION:
-    case NS_THEME_MAC_ACTIVE_SOURCE_LIST_SELECTION:
-
-    case NS_THEME_RANGE:
-
-    case NS_THEME_SCALE_HORIZONTAL:
-    case NS_THEME_SCALETHUMB_HORIZONTAL:
-    case NS_THEME_SCALE_VERTICAL:
-    case NS_THEME_SCALETHUMB_VERTICAL:
-
-    case NS_THEME_SCROLLBAR:
-    case NS_THEME_SCROLLBAR_SMALL:
-    case NS_THEME_SCROLLBARBUTTON_UP:
-    case NS_THEME_SCROLLBARBUTTON_DOWN:
-    case NS_THEME_SCROLLBARBUTTON_LEFT:
-    case NS_THEME_SCROLLBARBUTTON_RIGHT:
-    case NS_THEME_SCROLLBARTHUMB_HORIZONTAL:
-    case NS_THEME_SCROLLBARTHUMB_VERTICAL:
-    case NS_THEME_SCROLLBARTRACK_VERTICAL:
-    case NS_THEME_SCROLLBARTRACK_HORIZONTAL:
-    case NS_THEME_SCROLLBAR_NON_DISAPPEARING:
-      return !IsWidgetStyled(aPresContext, aFrame, aWidgetType);
-
-    case NS_THEME_RESIZER:
-    {
-      nsIFrame* parentFrame = aFrame->GetParent();
-      if (!parentFrame || parentFrame->GetType() != nsGkAtoms::scrollFrame)
-        return true;
-
-      // Note that IsWidgetStyled is not called for resizers on Mac. This is
-      // because for scrollable containers, the native resizer looks better
-      // when (non-overlay) scrollbars are present even when the style is
-      // overriden, and the custom transparent resizer looks better when
-      // scrollbars are not present.
-      nsIScrollableFrame* scrollFrame = do_QueryFrame(parentFrame);
-      return (!nsLookAndFeel::UseOverlayScrollbars() &&
-              scrollFrame && scrollFrame->GetScrollbarVisibility());
-    }
-
-    case NS_THEME_FOCUS_OUTLINE:
-      return true;
-
-    case NS_THEME_MAC_VIBRANCY_LIGHT:
-    case NS_THEME_MAC_VIBRANCY_DARK:
-      return VibrancyManager::SystemSupportsVibrancy();
-  }
-
-  return false;
-}
-
-bool
-nsNativeThemeCocoa::WidgetIsContainer(uint8_t aWidgetType)
-{
-  // flesh this out at some point
-  switch (aWidgetType) {
-   case NS_THEME_MENULIST_BUTTON:
-   case NS_THEME_RADIO:
-   case NS_THEME_CHECKBOX:
-   case NS_THEME_PROGRESSBAR:
-   case NS_THEME_METERBAR:
-   case NS_THEME_RANGE:
-   case NS_THEME_MAC_HELP_BUTTON:
-   case NS_THEME_MAC_DISCLOSURE_BUTTON_OPEN:
-   case NS_THEME_MAC_DISCLOSURE_BUTTON_CLOSED:
-    return false;
-  }
-  return true;
-}
-
-bool
-nsNativeThemeCocoa::ThemeDrawsFocusForWidget(uint8_t aWidgetType)
-{
-  if (aWidgetType == NS_THEME_MENULIST ||
-      aWidgetType == NS_THEME_MENULIST_TEXTFIELD ||
-      aWidgetType == NS_THEME_BUTTON ||
-      aWidgetType == NS_THEME_MAC_HELP_BUTTON ||
-      aWidgetType == NS_THEME_MAC_DISCLOSURE_BUTTON_OPEN ||
-      aWidgetType == NS_THEME_MAC_DISCLOSURE_BUTTON_CLOSED ||
-      aWidgetType == NS_THEME_RADIO ||
-      aWidgetType == NS_THEME_RANGE ||
-      aWidgetType == NS_THEME_CHECKBOX)
-    return true;
-
-  return false;
-}
-
-bool
-nsNativeThemeCocoa::ThemeNeedsComboboxDropmarker()
-{
-  return false;
-}
-
-bool
-nsNativeThemeCocoa::WidgetAppearanceDependsOnWindowFocus(uint8_t aWidgetType)
-{
-  switch (aWidgetType) {
-    case NS_THEME_DIALOG:
-    case NS_THEME_GROUPBOX:
-    case NS_THEME_TABPANELS:
-    case NS_THEME_BUTTON_ARROW_UP:
-    case NS_THEME_BUTTON_ARROW_DOWN:
-    case NS_THEME_CHECKMENUITEM:
-    case NS_THEME_MENUPOPUP:
-    case NS_THEME_MENUARROW:
-    case NS_THEME_MENUITEM:
-    case NS_THEME_MENUSEPARATOR:
-    case NS_THEME_TOOLTIP:
-    case NS_THEME_SPINNER:
-    case NS_THEME_SPINNER_UPBUTTON:
-    case NS_THEME_SPINNER_DOWNBUTTON:
-    case NS_THEME_SEPARATOR:
-    case NS_THEME_TOOLBOX:
-    case NS_THEME_NUMBER_INPUT:
-    case NS_THEME_TEXTFIELD:
-    case NS_THEME_TREEVIEW:
-    case NS_THEME_TREELINE:
-    case NS_THEME_TEXTFIELD_MULTILINE:
-    case NS_THEME_LISTBOX:
-    case NS_THEME_RESIZER:
-      return false;
-    default:
-      return true;
-  }
-}
-
-bool
-nsNativeThemeCocoa::IsWindowSheet(nsIFrame* aFrame)
-{
-  NSWindow* win = NativeWindowForFrame(aFrame);
-  id winDelegate = [win delegate];
-  nsIWidget* widget = [(WindowDelegate *)winDelegate geckoWidget];
-  if (!widget) {
-    return false;
-  }
-  return (widget->WindowType() == eWindowType_sheet);
-}
-
-bool
-nsNativeThemeCocoa::NeedToClearBackgroundBehindWidget(nsIFrame* aFrame,
-                                                      uint8_t aWidgetType)
-{
-  switch (aWidgetType) {
-    case NS_THEME_MAC_SOURCE_LIST:
-    // If we're in a XUL tree, we don't want to clear the background behind the
-    // selections below, since that would make our source list to not pick up
-    // the right font smoothing background. But since we don't call this method
-    // in nsTreeBodyFrame::BuildDisplayList, we never get here.
-    case NS_THEME_MAC_SOURCE_LIST_SELECTION:
-    case NS_THEME_MAC_ACTIVE_SOURCE_LIST_SELECTION:
-    case NS_THEME_MAC_VIBRANCY_LIGHT:
-    case NS_THEME_MAC_VIBRANCY_DARK:
-    case NS_THEME_TOOLTIP:
-    case NS_THEME_MENUPOPUP:
-    case NS_THEME_MENUITEM:
-    case NS_THEME_CHECKMENUITEM:
-      return true;
-    case NS_THEME_DIALOG:
-      return IsWindowSheet(aFrame);
-    default:
-      return false;
-  }
-}
-
-static nscolor ConvertNSColor(NSColor* aColor)
-{
-  NSColor* deviceColor = [aColor colorUsingColorSpaceName:NSDeviceRGBColorSpace];
-  return NS_RGBA((unsigned int)([deviceColor redComponent] * 255.0),
-                 (unsigned int)([deviceColor greenComponent] * 255.0),
-                 (unsigned int)([deviceColor blueComponent] * 255.0),
-                 (unsigned int)([deviceColor alphaComponent] * 255.0));
-}
-
-bool
-nsNativeThemeCocoa::WidgetProvidesFontSmoothingBackgroundColor(nsIFrame* aFrame,
-                                                               uint8_t aWidgetType,
-                                                               nscolor* aColor)
-{
-  switch (aWidgetType) {
-    case NS_THEME_MAC_SOURCE_LIST:
-    case NS_THEME_MAC_SOURCE_LIST_SELECTION:
-    case NS_THEME_MAC_ACTIVE_SOURCE_LIST_SELECTION:
-    case NS_THEME_MAC_VIBRANCY_LIGHT:
-    case NS_THEME_MAC_VIBRANCY_DARK:
-    case NS_THEME_TOOLTIP:
-    case NS_THEME_MENUPOPUP:
-    case NS_THEME_MENUITEM:
-    case NS_THEME_CHECKMENUITEM:
-    case NS_THEME_DIALOG:
-    {
-      if ((aWidgetType == NS_THEME_DIALOG && !IsWindowSheet(aFrame)) ||
-          ((aWidgetType == NS_THEME_MAC_SOURCE_LIST_SELECTION ||
-            aWidgetType == NS_THEME_MAC_ACTIVE_SOURCE_LIST_SELECTION) &&
-            !IsInSourceList(aFrame))) {
-        return false;
-      }
-      ChildView* childView = ChildViewForFrame(aFrame);
-      if (childView) {
-        ThemeGeometryType type = ThemeGeometryTypeForWidget(aFrame, aWidgetType);
-        NSColor* color = [childView vibrancyFontSmoothingBackgroundColorForThemeGeometryType:type];
-        *aColor = ConvertNSColor(color);
-        return true;
-      }
-      return false;
-    }
-    default:
-      return false;
-  }
-}
-
-nsITheme::ThemeGeometryType
-nsNativeThemeCocoa::ThemeGeometryTypeForWidget(nsIFrame* aFrame, uint8_t aWidgetType)
-{
-  switch (aWidgetType) {
-    case NS_THEME_WINDOW_TITLEBAR:
-      return eThemeGeometryTypeTitlebar;
-    case NS_THEME_TOOLBAR:
-      return eThemeGeometryTypeToolbar;
-    case NS_THEME_TOOLBOX:
-      return eThemeGeometryTypeToolbox;
-    case NS_THEME_WINDOW_BUTTON_BOX:
-      return eThemeGeometryTypeWindowButtons;
-    case NS_THEME_MAC_FULLSCREEN_BUTTON:
-      return eThemeGeometryTypeFullscreenButton;
-    case NS_THEME_MAC_VIBRANCY_LIGHT:
-      return eThemeGeometryTypeVibrancyLight;
-    case NS_THEME_MAC_VIBRANCY_DARK:
-      return eThemeGeometryTypeVibrancyDark;
-    case NS_THEME_TOOLTIP:
-      return eThemeGeometryTypeTooltip;
-    case NS_THEME_MENUPOPUP:
-      return eThemeGeometryTypeMenu;
-    case NS_THEME_MENUITEM:
-    case NS_THEME_CHECKMENUITEM: {
-      EventStates eventState = GetContentState(aFrame, aWidgetType);
-      bool isDisabled = IsDisabled(aFrame, eventState);
-      bool isSelected = !isDisabled && CheckBooleanAttr(aFrame, nsGkAtoms::menuactive);
-      return isSelected ? eThemeGeometryTypeHighlightedMenuItem : eThemeGeometryTypeMenu;
-    }
-    case NS_THEME_DIALOG:
-      return IsWindowSheet(aFrame) ? eThemeGeometryTypeSheet : eThemeGeometryTypeUnknown;
-    case NS_THEME_MAC_SOURCE_LIST:
-      return eThemeGeometryTypeSourceList;
-    case NS_THEME_MAC_SOURCE_LIST_SELECTION:
-      return IsInSourceList(aFrame) ? eThemeGeometryTypeSourceListSelection
-                                    : eThemeGeometryTypeUnknown;
-    case NS_THEME_MAC_ACTIVE_SOURCE_LIST_SELECTION:
-      return IsInSourceList(aFrame) ? eThemeGeometryTypeActiveSourceListSelection
-                                    : eThemeGeometryTypeUnknown;
-    default:
-      return eThemeGeometryTypeUnknown;
-  }
-}
-
-nsITheme::Transparency
-nsNativeThemeCocoa::GetWidgetTransparency(nsIFrame* aFrame, uint8_t aWidgetType)
-{
-  switch (aWidgetType) {
-  case NS_THEME_MENUPOPUP:
-  case NS_THEME_TOOLTIP:
-    return eTransparent;
-
-  case NS_THEME_DIALOG:
-    return IsWindowSheet(aFrame) ? eTransparent : eOpaque;
-
-  case NS_THEME_SCROLLBAR_SMALL:
-  case NS_THEME_SCROLLBAR:
-    return nsLookAndFeel::UseOverlayScrollbars() ? eTransparent : eOpaque;
-
-  case NS_THEME_STATUSBAR:
-    // Knowing that scrollbars and statusbars are opaque improves
-    // performance, because we create layers for them.
-    return eOpaque;
-
-  case NS_THEME_TOOLBAR:
-    return eOpaque;
-
-  default:
-    return eUnknownTransparency;
-  }
-}
diff --git a/widget/cocoa/nsNativeThemeColors.h b/widget/cocoa/nsNativeThemeColors.h
deleted file mode 100644
index b1691b5163..0000000000
--- a/widget/cocoa/nsNativeThemeColors.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsNativeThemeColors_h_
-#define nsNativeThemeColors_h_
-
-#include "nsCocoaFeatures.h"
-#import <Cocoa/Cocoa.h>
-
-enum ColorName {
-  toolbarTopBorderGrey,
-  toolbarFillGrey,
-  toolbarBottomBorderGrey,
-};
-
-static const int sLionThemeColors[][2] = {
-  /* { active window, inactive window } */
-  // toolbar:
-  { 0xD0, 0xF0 }, // top separator line
-  { 0xB2, 0xE1 }, // fill color
-  { 0x59, 0x87 }, // bottom separator line
-};
-
-static const int sYosemiteThemeColors[][2] = {
-  /* { active window, inactive window } */
-  // toolbar:
-  { 0xBD, 0xDF }, // top separator line
-  { 0xD3, 0xF6 }, // fill color
-  { 0xB3, 0xD1 }, // bottom separator line
-};
-
-__attribute__((unused))
-static int NativeGreyColorAsInt(ColorName name, BOOL isMain)
-{
-  if (nsCocoaFeatures::OnYosemiteOrLater())
-    return sYosemiteThemeColors[name][isMain ? 0 : 1];
-  return sLionThemeColors[name][isMain ? 0 : 1];
-}
-
-__attribute__((unused))
-static float NativeGreyColorAsFloat(ColorName name, BOOL isMain)
-{
-  return NativeGreyColorAsInt(name, isMain) / 255.0f;
-}
-
-__attribute__((unused))
-static void DrawNativeGreyColorInRect(CGContextRef context, ColorName name,
-                                      CGRect rect, BOOL isMain)
-{
-  float grey = NativeGreyColorAsFloat(name, isMain);
-  CGContextSetRGBFillColor(context, grey, grey, grey, 1.0f);
-  CGContextFillRect(context, rect);
-}
-
-#endif // nsNativeThemeColors_h_
diff --git a/widget/cocoa/nsPIWidgetCocoa.idl b/widget/cocoa/nsPIWidgetCocoa.idl
deleted file mode 100644
index a8fd8149ce..0000000000
--- a/widget/cocoa/nsPIWidgetCocoa.idl
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "nsISupports.idl"
-
-interface nsIWidget;
-
-[ptr] native NSWindowPtr(NSWindow);
-
-//
-// nsPIWidgetCocoa
-//
-// A private interface (unfrozen, private to the widget implementation) that
-// gives us access to some extra features on a widget/window.
-//
-[uuid(f75ff69e-3a51-419e-bd29-042f804bc2ed)]
-interface nsPIWidgetCocoa : nsISupports
-{
-  void SendSetZLevelEvent();
-
-  // Find the displayed child sheet (if aShown) or a child sheet that
-  // wants to be displayed (if !aShown)
-  nsIWidget GetChildSheet(in boolean aShown);
-  
-  // Get the parent widget (if any) StandardCreate() was called with.
-  nsIWidget GetRealParent();
-  
-  // If the object implementing this interface is a sheet, this will return the
-  // native NSWindow it is attached to
-  readonly attribute NSWindowPtr sheetWindowParent;
-
-  // True if window is a sheet
-  readonly attribute boolean isSheet;
-  
-}; // nsPIWidgetCocoa
diff --git a/widget/cocoa/nsPrintDialogX.h b/widget/cocoa/nsPrintDialogX.h
deleted file mode 100644
index 470f17d99d..0000000000
--- a/widget/cocoa/nsPrintDialogX.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsPrintDialog_h_
-#define nsPrintDialog_h_
-
-#include "nsIPrintDialogService.h"
-#include "nsCOMPtr.h"
-#include "nsCocoaUtils.h"
-
-#import <Cocoa/Cocoa.h>
-
-class nsIPrintSettings;
-class nsIStringBundle;
-
-class nsPrintDialogServiceX : public nsIPrintDialogService
-{
-public:
-  nsPrintDialogServiceX();
-
-  NS_DECL_ISUPPORTS
-
-  NS_IMETHOD Init() override;
-  NS_IMETHOD Show(nsPIDOMWindowOuter *aParent, nsIPrintSettings *aSettings,
-                  nsIWebBrowserPrint *aWebBrowserPrint) override;
-  NS_IMETHOD ShowPageSetup(nsPIDOMWindowOuter *aParent,
-                           nsIPrintSettings *aSettings) override;
-
-protected:
-  virtual ~nsPrintDialogServiceX();
-};
-
-@interface PrintPanelAccessoryView : NSView
-{
-  nsIPrintSettings* mSettings;
-  nsIStringBundle* mPrintBundle;
-  NSButton* mPrintSelectionOnlyCheckbox;
-  NSButton* mShrinkToFitCheckbox;
-  NSButton* mPrintBGColorsCheckbox;
-  NSButton* mPrintBGImagesCheckbox;
-  NSButtonCell* mAsLaidOutRadio;
-  NSButtonCell* mSelectedFrameRadio;
-  NSButtonCell* mSeparateFramesRadio;
-  NSPopUpButton* mHeaderLeftList;
-  NSPopUpButton* mHeaderCenterList;
-  NSPopUpButton* mHeaderRightList;
-  NSPopUpButton* mFooterLeftList;
-  NSPopUpButton* mFooterCenterList;
-  NSPopUpButton* mFooterRightList;
-}
-
-- (id)initWithSettings:(nsIPrintSettings*)aSettings;
-
-- (void)exportSettings;
-
-@end
-
-@interface PrintPanelAccessoryController : NSViewController <NSPrintPanelAccessorizing>
-
-- (id)initWithSettings:(nsIPrintSettings*)aSettings;
-
-- (void)exportSettings;
-
-@end
-
-#endif // nsPrintDialog_h_
diff --git a/widget/cocoa/nsPrintDialogX.mm b/widget/cocoa/nsPrintDialogX.mm
deleted file mode 100644
index a6d58d5bfb..0000000000
--- a/widget/cocoa/nsPrintDialogX.mm
+++ /dev/null
@@ -1,682 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "mozilla/ArrayUtils.h"
-
-#include "nsPrintDialogX.h"
-#include "nsIPrintSettings.h"
-#include "nsIPrintSettingsService.h"
-#include "nsPrintSettingsX.h"
-#include "nsCOMPtr.h"
-#include "nsQueryObject.h"
-#include "nsServiceManagerUtils.h"
-#include "nsIWebProgressListener.h"
-#include "nsIStringBundle.h"
-#include "nsIWebBrowserPrint.h"
-#include "nsCRT.h"
-
-#import <Cocoa/Cocoa.h>
-#include "nsObjCExceptions.h"
-
-using namespace mozilla;
-
-NS_IMPL_ISUPPORTS(nsPrintDialogServiceX, nsIPrintDialogService)
-
-nsPrintDialogServiceX::nsPrintDialogServiceX()
-{
-}
-
-nsPrintDialogServiceX::~nsPrintDialogServiceX()
-{
-}
-
-NS_IMETHODIMP
-nsPrintDialogServiceX::Init()
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsPrintDialogServiceX::Show(nsPIDOMWindowOuter *aParent, nsIPrintSettings *aSettings,
-                            nsIWebBrowserPrint *aWebBrowserPrint)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  NS_PRECONDITION(aSettings, "aSettings must not be null");
-
-  RefPtr<nsPrintSettingsX> settingsX(do_QueryObject(aSettings));
-  if (!settingsX)
-    return NS_ERROR_FAILURE;
-
-  nsCOMPtr<nsIPrintSettingsService> printSettingsSvc
-    = do_GetService("@mozilla.org/gfx/printsettings-service;1");
-
-  // Set the print job title
-  char16_t** docTitles;
-  uint32_t titleCount;
-  nsresult rv = aWebBrowserPrint->EnumerateDocumentNames(&titleCount, &docTitles);
-  if (NS_SUCCEEDED(rv) && titleCount > 0) {
-    CFStringRef cfTitleString = CFStringCreateWithCharacters(NULL, reinterpret_cast<const UniChar*>(docTitles[0]),
-                                                             NS_strlen(docTitles[0]));
-    if (cfTitleString) {
-      ::PMPrintSettingsSetJobName(settingsX->GetPMPrintSettings(), cfTitleString);
-      CFRelease(cfTitleString);
-    }
-    for (int32_t i = titleCount - 1; i >= 0; i--) {
-      free(docTitles[i]);
-    }
-    free(docTitles);
-    docTitles = NULL;
-    titleCount = 0;
-  }
-
-  // Read default print settings from prefs
-  printSettingsSvc->InitPrintSettingsFromPrefs(settingsX, true,
-    nsIPrintSettings::kInitSaveNativeData);
-  NSPrintInfo* printInfo = settingsX->GetCocoaPrintInfo();
-
-  // Put the print info into the current print operation, since that's where
-  // [panel runModal] will look for it. We create the view because otherwise
-  // we'll get unrelated warnings printed to the console.
-  NSView* tmpView = [[NSView alloc] init];
-  NSPrintOperation* printOperation = [NSPrintOperation printOperationWithView:tmpView printInfo:printInfo];
-  [NSPrintOperation setCurrentOperation:printOperation];
-
-  NSPrintPanel* panel = [NSPrintPanel printPanel];
-  [panel setOptions:NSPrintPanelShowsCopies
-    | NSPrintPanelShowsPageRange
-    | NSPrintPanelShowsPaperSize
-    | NSPrintPanelShowsOrientation
-    | NSPrintPanelShowsScaling ];
-  PrintPanelAccessoryController* viewController =
-    [[PrintPanelAccessoryController alloc] initWithSettings:aSettings];
-  [panel addAccessoryController:viewController];
-  [viewController release];
-
-  // Show the dialog.
-  nsCocoaUtils::PrepareForNativeAppModalDialog();
-  int button = [panel runModal];
-  nsCocoaUtils::CleanUpAfterNativeAppModalDialog();
-
-  NSPrintInfo* copy = [[[NSPrintOperation currentOperation] printInfo] copy];
-  if (!copy) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  [NSPrintOperation setCurrentOperation:nil];
-  [tmpView release];
-
-  if (button != NSFileHandlingPanelOKButton)
-    return NS_ERROR_ABORT;
-
-  settingsX->SetCocoaPrintInfo(copy);
-  settingsX->InitUnwriteableMargin();
-
-  // Save settings unless saving is pref'd off
-  if (Preferences::GetBool("print.save_print_settings", false)) {
-    printSettingsSvc->SavePrintSettingsToPrefs(settingsX, true,
-      nsIPrintSettings::kInitSaveNativeData);
-  }
-
-  // Get coordinate space resolution for converting paper size units to inches
-  NSWindow *win = [[NSApplication sharedApplication] mainWindow];
-  if (win) {
-    NSDictionary *devDesc = [win deviceDescription];
-    if (devDesc) {
-      NSSize res = [[devDesc objectForKey: NSDeviceResolution] sizeValue];
-      float scale = [win backingScaleFactor];
-      if (scale > 0) {
-        settingsX->SetInchesScale(res.width / scale, res.height / scale);
-      }
-    }
-  }
-
-  // Export settings.
-  [viewController exportSettings];
-
-  // If "ignore scaling" is checked, overwrite scaling factor with 1.
-  bool isShrinkToFitChecked;
-  settingsX->GetShrinkToFit(&isShrinkToFitChecked);
-  if (isShrinkToFitChecked) {
-    NSMutableDictionary* dict = [copy dictionary];
-    if (dict) {
-      [dict setObject: [NSNumber numberWithFloat: 1]
-               forKey: NSPrintScalingFactor];
-    }
-    // Set the scaling factor to 100% in the NSPrintInfo
-    // object so that it will not affect the paper size
-    // retrieved from the PMPageFormat routines.
-    [copy setScalingFactor:1.0];
-  } else {
-    aSettings->SetScaling([copy scalingFactor]);
-  }
-
-  // Set the adjusted paper size now that we've updated
-  // the scaling factor.
-  settingsX->InitAdjustedPaperSize();
-
-  [copy release];
-
-  int16_t pageRange;
-  aSettings->GetPrintRange(&pageRange);
-  if (pageRange != nsIPrintSettings::kRangeSelection) {
-    PMPrintSettings nativePrintSettings = settingsX->GetPMPrintSettings();
-    UInt32 firstPage, lastPage;
-    OSStatus status = ::PMGetFirstPage(nativePrintSettings, &firstPage);
-    if (status == noErr) {
-      status = ::PMGetLastPage(nativePrintSettings, &lastPage);
-      if (status == noErr && lastPage != UINT32_MAX) {
-        aSettings->SetPrintRange(nsIPrintSettings::kRangeSpecifiedPageRange);
-        aSettings->SetStartPageRange(firstPage);
-        aSettings->SetEndPageRange(lastPage);
-      }
-    }
-  }
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-nsPrintDialogServiceX::ShowPageSetup(nsPIDOMWindowOuter *aParent,
-                                     nsIPrintSettings *aNSSettings)
-{
-  NS_PRECONDITION(aParent, "aParent must not be null");
-  NS_PRECONDITION(aNSSettings, "aSettings must not be null");
-  NS_ENSURE_TRUE(aNSSettings, NS_ERROR_FAILURE);
-
-  RefPtr<nsPrintSettingsX> settingsX(do_QueryObject(aNSSettings));
-  if (!settingsX)
-    return NS_ERROR_FAILURE;
-
-  NSPrintInfo* printInfo = settingsX->GetCocoaPrintInfo();
-  NSPageLayout *pageLayout = [NSPageLayout pageLayout];
-  nsCocoaUtils::PrepareForNativeAppModalDialog();
-  int button = [pageLayout runModalWithPrintInfo:printInfo];
-  nsCocoaUtils::CleanUpAfterNativeAppModalDialog();
-
-  return button == NSFileHandlingPanelOKButton ? NS_OK : NS_ERROR_ABORT;
-}
-
-// Accessory view
-
-@interface PrintPanelAccessoryView (Private)
-
-- (NSString*)localizedString:(const char*)aKey;
-
-- (int16_t)chosenFrameSetting;
-
-- (const char*)headerFooterStringForList:(NSPopUpButton*)aList;
-
-- (void)exportHeaderFooterSettings;
-
-- (void)initBundle;
-
-- (NSTextField*)label:(const char*)aLabel
-            withFrame:(NSRect)aRect
-            alignment:(NSTextAlignment)aAlignment;
-
-- (void)addLabel:(const char*)aLabel
-       withFrame:(NSRect)aRect
-       alignment:(NSTextAlignment)aAlignment;
-
-- (void)addLabel:(const char*)aLabel withFrame:(NSRect)aRect;
-
-- (void)addCenteredLabel:(const char*)aLabel withFrame:(NSRect)aRect;
-
-- (NSButton*)checkboxWithLabel:(const char*)aLabel andFrame:(NSRect)aRect;
-
-- (NSPopUpButton*)headerFooterItemListWithFrame:(NSRect)aRect
-                                   selectedItem:(const char16_t*)aCurrentString;
-
-- (void)addOptionsSection;
-
-- (void)addAppearanceSection;
-
-- (void)addFramesSection;
-
-- (void)addHeaderFooterSection;
-
-- (NSString*)summaryValueForCheckbox:(NSButton*)aCheckbox;
-
-- (NSString*)framesSummaryValue;
-
-- (NSString*)headerSummaryValue;
-
-- (NSString*)footerSummaryValue;
-
-@end
-
-static const char sHeaderFooterTags[][4] =  {"", "&T", "&U", "&D", "&P", "&PT"};
-
-@implementation PrintPanelAccessoryView
-
-// Public methods
-
-- (id)initWithSettings:(nsIPrintSettings*)aSettings
-{
-  [super initWithFrame:NSMakeRect(0, 0, 540, 270)];
-
-  mSettings = aSettings;
-  [self initBundle];
-  [self addOptionsSection];
-  [self addAppearanceSection];
-  [self addFramesSection];
-  [self addHeaderFooterSection];
-
-  return self;
-}
-
-- (void)exportSettings
-{
-  mSettings->SetPrintRange([mPrintSelectionOnlyCheckbox state] == NSOnState ?
-                             (int16_t)nsIPrintSettings::kRangeSelection :
-                             (int16_t)nsIPrintSettings::kRangeAllPages);
-  mSettings->SetShrinkToFit([mShrinkToFitCheckbox state] == NSOnState);
-  mSettings->SetPrintBGColors([mPrintBGColorsCheckbox state] == NSOnState);
-  mSettings->SetPrintBGImages([mPrintBGImagesCheckbox state] == NSOnState);
-  mSettings->SetPrintFrameType([self chosenFrameSetting]);
-
-  [self exportHeaderFooterSettings];
-}
-
-- (void)dealloc
-{
-  NS_IF_RELEASE(mPrintBundle);
-  [super dealloc];
-}
-
-// Localization
-
-- (void)initBundle
-{
-  nsCOMPtr<nsIStringBundleService> bundleSvc = do_GetService(NS_STRINGBUNDLE_CONTRACTID);
-  bundleSvc->CreateBundle("chrome://global/locale/printdialog.properties", &mPrintBundle);
-}
-
-- (NSString*)localizedString:(const char*)aKey
-{
-  if (!mPrintBundle)
-    return @"";
-
-  nsXPIDLString intlString;
-  mPrintBundle->GetStringFromName(NS_ConvertUTF8toUTF16(aKey).get(), getter_Copies(intlString));
-  NSMutableString* s = [NSMutableString stringWithUTF8String:NS_ConvertUTF16toUTF8(intlString).get()];
-
-  // Remove all underscores (they're used in the GTK dialog for accesskeys).
-  [s replaceOccurrencesOfString:@"_" withString:@"" options:0 range:NSMakeRange(0, [s length])];
-  return s;
-}
-
-// Widget helpers
-
-- (NSTextField*)label:(const char*)aLabel
-            withFrame:(NSRect)aRect
-            alignment:(NSTextAlignment)aAlignment
-{
-  NSTextField* label = [[[NSTextField alloc] initWithFrame:aRect] autorelease];
-  [label setStringValue:[self localizedString:aLabel]];
-  [label setEditable:NO];
-  [label setSelectable:NO];
-  [label setBezeled:NO];
-  [label setBordered:NO];
-  [label setDrawsBackground:NO];
-  [label setFont:[NSFont systemFontOfSize:[NSFont systemFontSize]]];
-  [label setAlignment:aAlignment];
-  return label;
-}
-
-- (void)addLabel:(const char*)aLabel
-       withFrame:(NSRect)aRect
-       alignment:(NSTextAlignment)aAlignment
-{
-  NSTextField* label = [self label:aLabel withFrame:aRect alignment:aAlignment];
-  [self addSubview:label];
-}
-
-- (void)addLabel:(const char*)aLabel withFrame:(NSRect)aRect
-{
-  [self addLabel:aLabel withFrame:aRect alignment:NSRightTextAlignment];
-}
-
-- (void)addCenteredLabel:(const char*)aLabel withFrame:(NSRect)aRect
-{
-  [self addLabel:aLabel withFrame:aRect alignment:NSCenterTextAlignment];
-}
-
-- (NSButton*)checkboxWithLabel:(const char*)aLabel andFrame:(NSRect)aRect
-{
-  aRect.origin.y += 4.0f;
-  NSButton* checkbox = [[[NSButton alloc] initWithFrame:aRect] autorelease];
-  [checkbox setButtonType:NSSwitchButton];
-  [checkbox setTitle:[self localizedString:aLabel]];
-  [checkbox setFont:[NSFont systemFontOfSize:[NSFont systemFontSize]]];
-  [checkbox sizeToFit];
-  return checkbox;
-}
-
-- (NSPopUpButton*)headerFooterItemListWithFrame:(NSRect)aRect
-                                   selectedItem:(const char16_t*)aCurrentString
-{
-  NSPopUpButton* list = [[[NSPopUpButton alloc] initWithFrame:aRect pullsDown:NO] autorelease];
-  [list setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
-  [[list cell] setControlSize:NSSmallControlSize];
-  NSArray* items =
-    [NSArray arrayWithObjects:[self localizedString:"headerFooterBlank"],
-                              [self localizedString:"headerFooterTitle"],
-                              [self localizedString:"headerFooterURL"],
-                              [self localizedString:"headerFooterDate"],
-                              [self localizedString:"headerFooterPage"],
-                              [self localizedString:"headerFooterPageTotal"],
-                              nil];
-  [list addItemsWithTitles:items];
-
-  NS_ConvertUTF16toUTF8 currentStringUTF8(aCurrentString);
-  for (unsigned int i = 0; i < ArrayLength(sHeaderFooterTags); i++) {
-    if (!strcmp(currentStringUTF8.get(), sHeaderFooterTags[i])) {
-      [list selectItemAtIndex:i];
-      break;
-    }
-  }
-
-  return list;
-}
-
-// Build sections
-
-- (void)addOptionsSection
-{
-  // Title
-  [self addLabel:"optionsTitleMac" withFrame:NSMakeRect(0, 240, 151, 22)];
-
-  // "Print Selection Only"
-  mPrintSelectionOnlyCheckbox = [self checkboxWithLabel:"selectionOnly"
-                                               andFrame:NSMakeRect(156, 240, 0, 0)];
-
-  bool canPrintSelection;
-  mSettings->GetPrintOptions(nsIPrintSettings::kEnableSelectionRB,
-                             &canPrintSelection);
-  [mPrintSelectionOnlyCheckbox setEnabled:canPrintSelection];
-
-  int16_t printRange;
-  mSettings->GetPrintRange(&printRange);
-  if (printRange == nsIPrintSettings::kRangeSelection) {
-    [mPrintSelectionOnlyCheckbox setState:NSOnState];
-  }
-
-  [self addSubview:mPrintSelectionOnlyCheckbox];
-
-  // "Shrink To Fit"
-  mShrinkToFitCheckbox = [self checkboxWithLabel:"shrinkToFit"
-                                        andFrame:NSMakeRect(156, 218, 0, 0)];
-
-  bool shrinkToFit;
-  mSettings->GetShrinkToFit(&shrinkToFit);
-  [mShrinkToFitCheckbox setState:(shrinkToFit ? NSOnState : NSOffState)];
-
-  [self addSubview:mShrinkToFitCheckbox];
-}
-
-- (void)addAppearanceSection
-{
-  // Title
-  [self addLabel:"appearanceTitleMac" withFrame:NSMakeRect(0, 188, 151, 22)];
-
-  // "Print Background Colors"
-  mPrintBGColorsCheckbox = [self checkboxWithLabel:"printBGColors"
-                                          andFrame:NSMakeRect(156, 188, 0, 0)];
-
-  bool geckoBool;
-  mSettings->GetPrintBGColors(&geckoBool);
-  [mPrintBGColorsCheckbox setState:(geckoBool ? NSOnState : NSOffState)];
-
-  [self addSubview:mPrintBGColorsCheckbox];
-
-  // "Print Background Images"
-  mPrintBGImagesCheckbox = [self checkboxWithLabel:"printBGImages"
-                                          andFrame:NSMakeRect(156, 166, 0, 0)];
-
-  mSettings->GetPrintBGImages(&geckoBool);
-  [mPrintBGImagesCheckbox setState:(geckoBool ? NSOnState : NSOffState)];
-
-  [self addSubview:mPrintBGImagesCheckbox];
-}
-
-- (void)addFramesSection
-{
-  // Title
-  [self addLabel:"framesTitleMac" withFrame:NSMakeRect(0, 124, 151, 22)];
-
-  // Radio matrix
-  NSButtonCell *radio = [[NSButtonCell alloc] init];
-  [radio setButtonType:NSRadioButton];
-  [radio setFont:[NSFont systemFontOfSize:[NSFont systemFontSize]]];
-  NSMatrix *matrix = [[NSMatrix alloc] initWithFrame:NSMakeRect(156, 81, 400, 66)
-                                                mode:NSRadioModeMatrix
-                                           prototype:(NSCell*)radio
-                                        numberOfRows:3
-                                     numberOfColumns:1];
-  [radio release];
-  [matrix setCellSize:NSMakeSize(400, 21)];
-  [self addSubview:matrix];
-  [matrix release];
-  NSArray *cellArray = [matrix cells];
-  mAsLaidOutRadio = [cellArray objectAtIndex:0];
-  mSelectedFrameRadio = [cellArray objectAtIndex:1];
-  mSeparateFramesRadio = [cellArray objectAtIndex:2];
-  [mAsLaidOutRadio setTitle:[self localizedString:"asLaidOut"]];
-  [mSelectedFrameRadio setTitle:[self localizedString:"selectedFrame"]];
-  [mSeparateFramesRadio setTitle:[self localizedString:"separateFrames"]];
-
-  // Radio enabled state
-  int16_t frameUIFlag;
-  mSettings->GetHowToEnableFrameUI(&frameUIFlag);
-  if (frameUIFlag == nsIPrintSettings::kFrameEnableNone) {
-    [mAsLaidOutRadio setEnabled:NO];
-    [mSelectedFrameRadio setEnabled:NO];
-    [mSeparateFramesRadio setEnabled:NO];
-  } else if (frameUIFlag == nsIPrintSettings::kFrameEnableAsIsAndEach) {
-    [mSelectedFrameRadio setEnabled:NO];
-  }
-
-  // Radio values
-  int16_t printFrameType;
-  mSettings->GetPrintFrameType(&printFrameType);
-  switch (printFrameType) {
-    case nsIPrintSettings::kFramesAsIs:
-      [mAsLaidOutRadio setState:NSOnState];
-      break;
-    case nsIPrintSettings::kSelectedFrame:
-      [mSelectedFrameRadio setState:NSOnState];
-      break;
-    case nsIPrintSettings::kEachFrameSep:
-      [mSeparateFramesRadio setState:NSOnState];
-      break;
-  }
-}
-
-- (void)addHeaderFooterSection
-{
-  // Labels
-  [self addLabel:"pageHeadersTitleMac" withFrame:NSMakeRect(0, 44, 151, 22)];
-  [self addLabel:"pageFootersTitleMac" withFrame:NSMakeRect(0, 0, 151, 22)];
-  [self addCenteredLabel:"left" withFrame:NSMakeRect(156, 22, 100, 22)];
-  [self addCenteredLabel:"center" withFrame:NSMakeRect(256, 22, 100, 22)];
-  [self addCenteredLabel:"right" withFrame:NSMakeRect(356, 22, 100, 22)];
-
-  // Lists
-  nsXPIDLString sel;
-
-  mSettings->GetHeaderStrLeft(getter_Copies(sel));
-  mHeaderLeftList = [self headerFooterItemListWithFrame:NSMakeRect(156, 44, 100, 22)
-                                           selectedItem:sel];
-  [self addSubview:mHeaderLeftList];
-
-  mSettings->GetHeaderStrCenter(getter_Copies(sel));
-  mHeaderCenterList = [self headerFooterItemListWithFrame:NSMakeRect(256, 44, 100, 22)
-                                             selectedItem:sel];
-  [self addSubview:mHeaderCenterList];
-
-  mSettings->GetHeaderStrRight(getter_Copies(sel));
-  mHeaderRightList = [self headerFooterItemListWithFrame:NSMakeRect(356, 44, 100, 22)
-                                            selectedItem:sel];
-  [self addSubview:mHeaderRightList];
-
-  mSettings->GetFooterStrLeft(getter_Copies(sel));
-  mFooterLeftList = [self headerFooterItemListWithFrame:NSMakeRect(156, 0, 100, 22)
-                                           selectedItem:sel];
-  [self addSubview:mFooterLeftList];
-
-  mSettings->GetFooterStrCenter(getter_Copies(sel));
-  mFooterCenterList = [self headerFooterItemListWithFrame:NSMakeRect(256, 0, 100, 22)
-                                             selectedItem:sel];
-  [self addSubview:mFooterCenterList];
-
-  mSettings->GetFooterStrRight(getter_Copies(sel));
-  mFooterRightList = [self headerFooterItemListWithFrame:NSMakeRect(356, 0, 100, 22)
-                                            selectedItem:sel];
-  [self addSubview:mFooterRightList];
-}
-
-// Export settings
-
-- (int16_t)chosenFrameSetting
-{
-  if ([mAsLaidOutRadio state] == NSOnState)
-    return nsIPrintSettings::kFramesAsIs;
-  if ([mSelectedFrameRadio state] == NSOnState)
-    return nsIPrintSettings::kSelectedFrame;
-  if ([mSeparateFramesRadio state] == NSOnState)
-    return nsIPrintSettings::kEachFrameSep;
-  return nsIPrintSettings::kNoFrames;
-}
-
-- (const char*)headerFooterStringForList:(NSPopUpButton*)aList
-{
-  NSInteger index = [aList indexOfSelectedItem];
-  NS_ASSERTION(index < NSInteger(ArrayLength(sHeaderFooterTags)), "Index of dropdown is higher than expected!");
-  return sHeaderFooterTags[index];
-}
-
-- (void)exportHeaderFooterSettings
-{
-  const char* headerFooterStr;
-  headerFooterStr = [self headerFooterStringForList:mHeaderLeftList];
-  mSettings->SetHeaderStrLeft(NS_ConvertUTF8toUTF16(headerFooterStr).get());
-
-  headerFooterStr = [self headerFooterStringForList:mHeaderCenterList];
-  mSettings->SetHeaderStrCenter(NS_ConvertUTF8toUTF16(headerFooterStr).get());
-
-  headerFooterStr = [self headerFooterStringForList:mHeaderRightList];
-  mSettings->SetHeaderStrRight(NS_ConvertUTF8toUTF16(headerFooterStr).get());
-
-  headerFooterStr = [self headerFooterStringForList:mFooterLeftList];
-  mSettings->SetFooterStrLeft(NS_ConvertUTF8toUTF16(headerFooterStr).get());
-
-  headerFooterStr = [self headerFooterStringForList:mFooterCenterList];
-  mSettings->SetFooterStrCenter(NS_ConvertUTF8toUTF16(headerFooterStr).get());
-
-  headerFooterStr = [self headerFooterStringForList:mFooterRightList];
-  mSettings->SetFooterStrRight(NS_ConvertUTF8toUTF16(headerFooterStr).get());
-}
-
-// Summary
-
-- (NSString*)summaryValueForCheckbox:(NSButton*)aCheckbox
-{
-  if (![aCheckbox isEnabled])
-    return [self localizedString:"summaryNAValue"];
-
-  return [aCheckbox state] == NSOnState ?
-    [self localizedString:"summaryOnValue"] :
-    [self localizedString:"summaryOffValue"];
-}
-
-- (NSString*)framesSummaryValue
-{
-  switch([self chosenFrameSetting]) {
-    case nsIPrintSettings::kFramesAsIs:
-      return [self localizedString:"asLaidOut"];
-    case nsIPrintSettings::kSelectedFrame:
-      return [self localizedString:"selectedFrame"];
-    case nsIPrintSettings::kEachFrameSep:
-      return [self localizedString:"separateFrames"];
-  }
-  return [self localizedString:"summaryNAValue"];
-}
-
-- (NSString*)headerSummaryValue
-{
-  return [[mHeaderLeftList titleOfSelectedItem] stringByAppendingString:
-    [@", " stringByAppendingString:
-      [[mHeaderCenterList titleOfSelectedItem] stringByAppendingString:
-        [@", " stringByAppendingString:
-          [mHeaderRightList titleOfSelectedItem]]]]];
-}
-
-- (NSString*)footerSummaryValue
-{
-  return [[mFooterLeftList titleOfSelectedItem] stringByAppendingString:
-    [@", " stringByAppendingString:
-      [[mFooterCenterList titleOfSelectedItem] stringByAppendingString:
-        [@", " stringByAppendingString:
-          [mFooterRightList titleOfSelectedItem]]]]];
-}
-
-- (NSArray*)localizedSummaryItems
-{
-  return [NSArray arrayWithObjects:
-    [NSDictionary dictionaryWithObjectsAndKeys:
-      [self localizedString:"summaryFramesTitle"], NSPrintPanelAccessorySummaryItemNameKey,
-      [self framesSummaryValue], NSPrintPanelAccessorySummaryItemDescriptionKey, nil],
-    [NSDictionary dictionaryWithObjectsAndKeys:
-      [self localizedString:"summarySelectionOnlyTitle"], NSPrintPanelAccessorySummaryItemNameKey,
-      [self summaryValueForCheckbox:mPrintSelectionOnlyCheckbox], NSPrintPanelAccessorySummaryItemDescriptionKey, nil],
-    [NSDictionary dictionaryWithObjectsAndKeys:
-      [self localizedString:"summaryShrinkToFitTitle"], NSPrintPanelAccessorySummaryItemNameKey,
-      [self summaryValueForCheckbox:mShrinkToFitCheckbox], NSPrintPanelAccessorySummaryItemDescriptionKey, nil],
-    [NSDictionary dictionaryWithObjectsAndKeys:
-      [self localizedString:"summaryPrintBGColorsTitle"], NSPrintPanelAccessorySummaryItemNameKey,
-      [self summaryValueForCheckbox:mPrintBGColorsCheckbox], NSPrintPanelAccessorySummaryItemDescriptionKey, nil],
-    [NSDictionary dictionaryWithObjectsAndKeys:
-      [self localizedString:"summaryPrintBGImagesTitle"], NSPrintPanelAccessorySummaryItemNameKey,
-      [self summaryValueForCheckbox:mPrintBGImagesCheckbox], NSPrintPanelAccessorySummaryItemDescriptionKey, nil],
-    [NSDictionary dictionaryWithObjectsAndKeys:
-      [self localizedString:"summaryHeaderTitle"], NSPrintPanelAccessorySummaryItemNameKey,
-      [self headerSummaryValue], NSPrintPanelAccessorySummaryItemDescriptionKey, nil],
-    [NSDictionary dictionaryWithObjectsAndKeys:
-      [self localizedString:"summaryFooterTitle"], NSPrintPanelAccessorySummaryItemNameKey,
-      [self footerSummaryValue], NSPrintPanelAccessorySummaryItemDescriptionKey, nil],
-    nil];
-}
-
-@end
-
-// Accessory controller
-
-@implementation PrintPanelAccessoryController
-
-- (id)initWithSettings:(nsIPrintSettings*)aSettings
-{
-  [super initWithNibName:nil bundle:nil];
-
-  NSView* accView = [[PrintPanelAccessoryView alloc] initWithSettings:aSettings];
-  [self setView:accView];
-  [accView release];
-  return self;
-}
-
-- (void)exportSettings
-{
-  return [(PrintPanelAccessoryView*)[self view] exportSettings];
-}
-
-- (NSArray *)localizedSummaryItems
-{
-  return [(PrintPanelAccessoryView*)[self view] localizedSummaryItems];
-}
-
-@end
diff --git a/widget/cocoa/nsPrintOptionsX.h b/widget/cocoa/nsPrintOptionsX.h
deleted file mode 100644
index e34e75059e..0000000000
--- a/widget/cocoa/nsPrintOptionsX.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsPrintOptionsX_h_
-#define nsPrintOptionsX_h_
-
-#include "nsPrintOptionsImpl.h"
-
-namespace mozilla
-{
-namespace embedding
-{
-  class PrintData;
-} // namespace embedding
-} // namespace mozilla
-
-class nsPrintOptionsX : public nsPrintOptions
-{
-public:
-             nsPrintOptionsX();
-  virtual    ~nsPrintOptionsX();
-
-  /*
-   * These serialize and deserialize methods are not symmetrical in that
-   * printSettingsX != deserialize(serialize(printSettingsX)). This is because
-   * the native print settings stored in the nsPrintSettingsX's NSPrintInfo
-   * object are not fully serialized. Only the values needed for successful
-   * printing are.
-   */
-  NS_IMETHODIMP SerializeToPrintData(nsIPrintSettings* aSettings,
-                                     nsIWebBrowserPrint* aWBP,
-                                     mozilla::embedding::PrintData* data);
-  NS_IMETHODIMP DeserializeToPrintSettings(const mozilla::embedding::PrintData& data,
-                                           nsIPrintSettings* settings);
-
-protected:
-  nsresult   _CreatePrintSettings(nsIPrintSettings **_retval);
-  nsresult   ReadPrefs(nsIPrintSettings* aPS, const nsAString& aPrinterName, uint32_t aFlags);
-  nsresult   WritePrefs(nsIPrintSettings* aPS, const nsAString& aPrinterName, uint32_t aFlags);
-};
-
-#endif // nsPrintOptionsX_h_
diff --git a/widget/cocoa/nsPrintOptionsX.mm b/widget/cocoa/nsPrintOptionsX.mm
deleted file mode 100644
index d9aa17b42e..0000000000
--- a/widget/cocoa/nsPrintOptionsX.mm
+++ /dev/null
@@ -1,349 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "nsCOMPtr.h"
-#include "nsQueryObject.h"
-#include "nsIServiceManager.h"
-#include "nsPrintOptionsX.h"
-#include "nsPrintSettingsX.h"
-
-// The constants for paper orientation were renamed in 10.9. __MAC_10_9 is
-// defined on OS X 10.9 and later. Although 10.8 and earlier are not supported
-// at this time, this allows for building on those older OS versions. The
-// values are consistent across OS versions so the rename does not affect
-// runtime, just compilation.
-#ifdef __MAC_10_9
-#define NS_PAPER_ORIENTATION_PORTRAIT   (NSPaperOrientationPortrait)
-#define NS_PAPER_ORIENTATION_LANDSCAPE  (NSPaperOrientationLandscape)
-#else
-#define NS_PAPER_ORIENTATION_PORTRAIT   (NSPortraitOrientation)
-#define NS_PAPER_ORIENTATION_LANDSCAPE  (NSLandscapeOrientation)
-#endif
-
-using namespace mozilla::embedding;
-
-nsPrintOptionsX::nsPrintOptionsX()
-{
-}
-
-nsPrintOptionsX::~nsPrintOptionsX()
-{
-}
-
-NS_IMETHODIMP
-nsPrintOptionsX::SerializeToPrintData(nsIPrintSettings* aSettings,
-                                      nsIWebBrowserPrint* aWBP,
-                                      PrintData* data)
-{
-  nsresult rv = nsPrintOptions::SerializeToPrintData(aSettings, aWBP, data);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  if (aWBP) {
-    // When serializing an nsIWebBrowserPrint, we need to pass up the first
-    // document name. We could pass up the entire collection of document
-    // names, but the OS X printing prompt code only really cares about
-    // the first one, so we just send the first to save IPC traffic.
-    char16_t** docTitles;
-    uint32_t titleCount;
-    rv = aWBP->EnumerateDocumentNames(&titleCount, &docTitles);
-    if (NS_SUCCEEDED(rv) && titleCount > 0) {
-      data->printJobName().Assign(docTitles[0]);
-    }
-
-    for (int32_t i = titleCount - 1; i >= 0; i--) {
-      free(docTitles[i]);
-    }
-    free(docTitles);
-    docTitles = nullptr;
-  }
-
-  RefPtr<nsPrintSettingsX> settingsX(do_QueryObject(aSettings));
-  if (NS_WARN_IF(!settingsX)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  NSPrintInfo* printInfo = settingsX->GetCocoaPrintInfo();
-  if (NS_WARN_IF(!printInfo)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  double adjustedWidth, adjustedHeight;
-  settingsX->GetAdjustedPaperSize(&adjustedWidth, &adjustedHeight);
-  data->adjustedPaperWidth() = adjustedWidth;
-  data->adjustedPaperHeight() = adjustedHeight;
-
-  NSDictionary* dict = [printInfo dictionary];
-  if (NS_WARN_IF(!dict)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  NSString* printerName = [dict objectForKey: NSPrintPrinterName];
-  if (printerName) {
-    nsCocoaUtils::GetStringForNSString(printerName, data->printerName());
-  }
-
-  NSString* faxNumber = [dict objectForKey: NSPrintFaxNumber];
-  if (faxNumber) {
-    nsCocoaUtils::GetStringForNSString(faxNumber, data->faxNumber());
-  }
-
-  NSURL* printToFileURL = [dict objectForKey: NSPrintJobSavingURL];
-  if (printToFileURL) {
-    nsCocoaUtils::GetStringForNSString([printToFileURL absoluteString],
-                                       data->toFileName());
-  }
-
-  NSDate* printTime = [dict objectForKey: NSPrintTime];
-  if (printTime) {
-    NSTimeInterval timestamp = [printTime timeIntervalSinceReferenceDate];
-    data->printTime() = timestamp;
-  }
-
-  NSString* disposition = [dict objectForKey: NSPrintJobDisposition];
-  if (disposition) {
-    nsCocoaUtils::GetStringForNSString(disposition, data->disposition());
-  }
-
-  NSString* paperName = [dict objectForKey: NSPrintPaperName];
-  if (paperName) {
-    nsCocoaUtils::GetStringForNSString(paperName, data->paperName());
-  }
-
-  float scalingFactor = [[dict objectForKey: NSPrintScalingFactor] floatValue];
-  data->scalingFactor() = scalingFactor;
-
-  int32_t orientation;
-  if ([printInfo orientation] == NS_PAPER_ORIENTATION_PORTRAIT) {
-    orientation = nsIPrintSettings::kPortraitOrientation;
-  } else {
-    orientation = nsIPrintSettings::kLandscapeOrientation;
-  }
-  data->orientation() = orientation;
-
-  NSSize paperSize = [printInfo paperSize];
-  float widthScale, heightScale;
-  settingsX->GetInchesScale(&widthScale, &heightScale);
-  if (orientation == nsIPrintSettings::kLandscapeOrientation) {
-    // switch widths and heights
-    data->widthScale() = heightScale;
-    data->heightScale() = widthScale;
-    data->paperWidth() = paperSize.height / heightScale;
-    data->paperHeight() = paperSize.width / widthScale;
-  } else {
-    data->widthScale() = widthScale;
-    data->heightScale() = heightScale;
-    data->paperWidth() = paperSize.width / widthScale;
-    data->paperHeight() = paperSize.height / heightScale;
-  }
-
-  data->numCopies() = [[dict objectForKey: NSPrintCopies] intValue];
-  data->printAllPages() = [[dict objectForKey: NSPrintAllPages] boolValue];
-  data->startPageRange() = [[dict objectForKey: NSPrintFirstPage] intValue];
-  data->endPageRange() = [[dict objectForKey: NSPrintLastPage] intValue];
-  data->mustCollate() = [[dict objectForKey: NSPrintMustCollate] boolValue];
-  data->printReversed() = [[dict objectForKey: NSPrintReversePageOrder] boolValue];
-  data->pagesAcross() = [[dict objectForKey: NSPrintPagesAcross] unsignedShortValue];
-  data->pagesDown() = [[dict objectForKey: NSPrintPagesDown] unsignedShortValue];
-  data->detailedErrorReporting() = [[dict objectForKey: NSPrintDetailedErrorReporting] boolValue];
-  data->addHeaderAndFooter() = [[dict objectForKey: NSPrintHeaderAndFooter] boolValue];
-  data->fileNameExtensionHidden() =
-    [[dict objectForKey: NSPrintJobSavingFileNameExtensionHidden] boolValue];
-
-  bool printSelectionOnly = [[dict objectForKey: NSPrintSelectionOnly] boolValue];
-  aSettings->SetPrintOptions(nsIPrintSettings::kEnableSelectionRB,
-                             printSelectionOnly);
-  aSettings->GetPrintOptionsBits(&data->optionFlags());
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsPrintOptionsX::DeserializeToPrintSettings(const PrintData& data,
-                                            nsIPrintSettings* settings)
-{
-  nsresult rv = nsPrintOptions::DeserializeToPrintSettings(data, settings);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  RefPtr<nsPrintSettingsX> settingsX(do_QueryObject(settings));
-  if (NS_WARN_IF(!settingsX)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  NSPrintInfo* sharedPrintInfo = [NSPrintInfo sharedPrintInfo];
-  if (NS_WARN_IF(!sharedPrintInfo)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  NSDictionary* sharedDict = [sharedPrintInfo dictionary];
-  if (NS_WARN_IF(!sharedDict)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  // We need to create a new NSMutableDictionary to pass to NSPrintInfo with
-  // the values that we got from the other process.
-  NSMutableDictionary* newPrintInfoDict =
-    [NSMutableDictionary dictionaryWithDictionary:sharedDict];
-  if (NS_WARN_IF(!newPrintInfoDict)) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  NSString* printerName = nsCocoaUtils::ToNSString(data.printerName());
-  if (printerName) {
-    NSPrinter* printer = [NSPrinter printerWithName: printerName];
-    if (printer) {
-      [newPrintInfoDict setObject: printer forKey: NSPrintPrinter];
-      [newPrintInfoDict setObject: printerName forKey: NSPrintPrinterName];
-    }
-  }
-
-  [newPrintInfoDict setObject: [NSNumber numberWithInt: data.numCopies()]
-                    forKey: NSPrintCopies];
-  [newPrintInfoDict setObject: [NSNumber numberWithBool: data.printAllPages()]
-                    forKey: NSPrintAllPages];
-  [newPrintInfoDict setObject: [NSNumber numberWithInt: data.startPageRange()]
-                    forKey: NSPrintFirstPage];
-  [newPrintInfoDict setObject: [NSNumber numberWithInt: data.endPageRange()]
-                    forKey: NSPrintLastPage];
-  [newPrintInfoDict setObject: [NSNumber numberWithBool: data.mustCollate()]
-                    forKey: NSPrintMustCollate];
-  [newPrintInfoDict setObject: [NSNumber numberWithBool: data.printReversed()]
-                    forKey: NSPrintReversePageOrder];
-
-  [newPrintInfoDict setObject: nsCocoaUtils::ToNSString(data.disposition())
-                    forKey: NSPrintJobDisposition];
-
-  [newPrintInfoDict setObject: nsCocoaUtils::ToNSString(data.paperName())
-                    forKey: NSPrintPaperName];
-
-  [newPrintInfoDict setObject: [NSNumber numberWithFloat: data.scalingFactor()]
-                    forKey: NSPrintScalingFactor];
-
-  CGFloat width = data.paperWidth() * data.widthScale();
-  CGFloat height = data.paperHeight() * data.heightScale();
-  [newPrintInfoDict setObject: [NSValue valueWithSize:NSMakeSize(width,height)]
-                    forKey: NSPrintPaperSize];
-
-  int paperOrientation;
-  if (data.orientation() == nsIPrintSettings::kPortraitOrientation) {
-    paperOrientation = NS_PAPER_ORIENTATION_PORTRAIT;
-    settings->SetOrientation(nsIPrintSettings::kPortraitOrientation);
-  } else {
-    paperOrientation = NS_PAPER_ORIENTATION_LANDSCAPE;
-    settings->SetOrientation(nsIPrintSettings::kLandscapeOrientation);
-  }
-  [newPrintInfoDict setObject: [NSNumber numberWithInt:paperOrientation]
-                    forKey: NSPrintOrientation];
-
-  [newPrintInfoDict setObject: [NSNumber numberWithShort: data.pagesAcross()]
-                    forKey: NSPrintPagesAcross];
-  [newPrintInfoDict setObject: [NSNumber numberWithShort: data.pagesDown()]
-                    forKey: NSPrintPagesDown];
-  [newPrintInfoDict setObject: [NSNumber numberWithBool: data.detailedErrorReporting()]
-                    forKey: NSPrintDetailedErrorReporting];
-  [newPrintInfoDict setObject: nsCocoaUtils::ToNSString(data.faxNumber())
-                    forKey: NSPrintFaxNumber];
-  [newPrintInfoDict setObject: [NSNumber numberWithBool: data.addHeaderAndFooter()]
-                    forKey: NSPrintHeaderAndFooter];
-  [newPrintInfoDict setObject: [NSNumber numberWithBool: data.fileNameExtensionHidden()]
-                    forKey: NSPrintJobSavingFileNameExtensionHidden];
-
-  // At this point, the base class should have properly deserialized the print
-  // options bitfield for nsIPrintSettings, so that it holds the correct value
-  // for kEnableSelectionRB, which we use to set NSPrintSelectionOnly.
-
-  bool printSelectionOnly = false;
-  rv = settings->GetPrintOptions(nsIPrintSettings::kEnableSelectionRB, &printSelectionOnly);
-  if (NS_SUCCEEDED(rv)) {
-    [newPrintInfoDict setObject: [NSNumber numberWithBool: printSelectionOnly]
-                      forKey: NSPrintSelectionOnly];
-  } else {
-    [newPrintInfoDict setObject: [NSNumber numberWithBool: NO]
-                      forKey: NSPrintSelectionOnly];
-  }
-
-  NSURL* jobSavingURL =
-    [NSURL URLWithString: nsCocoaUtils::ToNSString(data.toFileName())];
-  if (jobSavingURL) {
-    [newPrintInfoDict setObject: jobSavingURL forKey: NSPrintJobSavingURL];
-  }
-
-  NSTimeInterval timestamp = data.printTime();
-  NSDate* printTime = [NSDate dateWithTimeIntervalSinceReferenceDate: timestamp];
-  if (printTime) {
-    [newPrintInfoDict setObject: printTime forKey: NSPrintTime];
-  }
-
-  // Next, we create a new NSPrintInfo with the values in our dictionary.
-  NSPrintInfo* newPrintInfo =
-    [[NSPrintInfo alloc] initWithDictionary: newPrintInfoDict];
-  if (NS_WARN_IF(!newPrintInfo)) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  // And now swap in the new NSPrintInfo we've just populated.
-  settingsX->SetCocoaPrintInfo(newPrintInfo);
-  [newPrintInfo release];
-
-  settingsX->SetAdjustedPaperSize(data.adjustedPaperWidth(),
-                                  data.adjustedPaperHeight());
-
-  return NS_OK;
-}
-
-nsresult
-nsPrintOptionsX::ReadPrefs(nsIPrintSettings* aPS, const nsAString& aPrinterName, uint32_t aFlags)
-{
-  nsresult rv;
-  
-  rv = nsPrintOptions::ReadPrefs(aPS, aPrinterName, aFlags);
-  NS_ASSERTION(NS_SUCCEEDED(rv), "nsPrintOptions::ReadPrefs() failed");
-  
-  RefPtr<nsPrintSettingsX> printSettingsX(do_QueryObject(aPS));
-  if (!printSettingsX)
-    return NS_ERROR_NO_INTERFACE;
-  rv = printSettingsX->ReadPageFormatFromPrefs();
-  
-  return NS_OK;
-}
-
-nsresult nsPrintOptionsX::_CreatePrintSettings(nsIPrintSettings **_retval)
-{
-  nsresult rv;
-  *_retval = nullptr;
-
-  nsPrintSettingsX* printSettings = new nsPrintSettingsX; // does not initially ref count
-  NS_ENSURE_TRUE(printSettings, NS_ERROR_OUT_OF_MEMORY);
-  NS_ADDREF(*_retval = printSettings);
-
-  rv = printSettings->Init();
-  if (NS_FAILED(rv)) {
-    NS_RELEASE(*_retval);
-    return rv;
-  }
-
-  InitPrintSettingsFromPrefs(*_retval, false, nsIPrintSettings::kInitSaveAll);
-  return rv;
-}
-
-nsresult
-nsPrintOptionsX::WritePrefs(nsIPrintSettings* aPS, const nsAString& aPrinterName, uint32_t aFlags)
-{
-  nsresult rv;
-
-  rv = nsPrintOptions::WritePrefs(aPS, aPrinterName, aFlags);
-  NS_ASSERTION(NS_SUCCEEDED(rv), "nsPrintOptions::WritePrefs() failed");
-
-  RefPtr<nsPrintSettingsX> printSettingsX(do_QueryObject(aPS));
-  if (!printSettingsX)
-    return NS_ERROR_NO_INTERFACE;
-  rv = printSettingsX->WritePageFormatToPrefs();
-  NS_ASSERTION(NS_SUCCEEDED(rv), "nsPrintSettingsX::WritePageFormatToPrefs() failed");
-
-  return NS_OK;
-}
diff --git a/widget/cocoa/nsPrintSettingsX.h b/widget/cocoa/nsPrintSettingsX.h
deleted file mode 100644
index 1d755b2505..0000000000
--- a/widget/cocoa/nsPrintSettingsX.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsPrintSettingsX_h_
-#define nsPrintSettingsX_h_
-
-#include "nsPrintSettingsImpl.h"  
-#import <Cocoa/Cocoa.h>
-
-#define NS_PRINTSETTINGSX_IID \
-{ 0x0DF2FDBD, 0x906D, 0x4726, \
-  { 0x9E, 0x4D, 0xCF, 0xE0, 0x87, 0x8D, 0x70, 0x7C } }
-
-class nsPrintSettingsX : public nsPrintSettings
-{
-public:
-  NS_DECLARE_STATIC_IID_ACCESSOR(NS_PRINTSETTINGSX_IID)
-  NS_DECL_ISUPPORTS_INHERITED
-
-  nsPrintSettingsX();
-  nsresult Init();
-  NSPrintInfo* GetCocoaPrintInfo() { return mPrintInfo; }
-  void SetCocoaPrintInfo(NSPrintInfo* aPrintInfo);
-  virtual nsresult ReadPageFormatFromPrefs();
-  virtual nsresult WritePageFormatToPrefs();
-  virtual nsresult GetEffectivePageSize(double *aWidth,
-      double *aHeight) override;
-
-  // In addition to setting the paper width and height, these
-  // overrides set the adjusted width and height returned from
-  // GetEffectivePageSize. This is needed when a paper size is
-  // set manually without using a print dialog a la reftest-print.
-  virtual nsresult SetPaperWidth(double aPaperWidth) override;
-  virtual nsresult SetPaperHeight(double aPaperWidth) override;
-
-  PMPrintSettings GetPMPrintSettings();
-  PMPrintSession GetPMPrintSession();
-  PMPageFormat GetPMPageFormat();
-  void SetPMPageFormat(PMPageFormat aPageFormat);
-
-  // Re-initialize mUnwriteableMargin with values from mPageFormat.
-  // Should be called whenever mPageFormat is initialized or overwritten.
-  nsresult InitUnwriteableMargin();
-
-  // Re-initialize mAdjustedPaper{Width,Height} with values from mPageFormat.
-  // Should be called whenever mPageFormat is initialized or overwritten.
-  nsresult InitAdjustedPaperSize();
-
-  void SetInchesScale(float aWidthScale, float aHeightScale);
-  void GetInchesScale(float *aWidthScale, float *aHeightScale);
-
-  void SetAdjustedPaperSize(double aWidth, double aHeight);
-  void GetAdjustedPaperSize(double *aWidth, double *aHeight);
-
-protected:
-  virtual ~nsPrintSettingsX();
-
-  nsPrintSettingsX(const nsPrintSettingsX& src);
-  nsPrintSettingsX& operator=(const nsPrintSettingsX& rhs);
-
-  nsresult _Clone(nsIPrintSettings **_retval) override;
-  nsresult _Assign(nsIPrintSettings *aPS) override;
-
-  // The out param has a ref count of 1 on return so caller needs to PMRelase() when done.
-  OSStatus CreateDefaultPageFormat(PMPrintSession aSession, PMPageFormat& outFormat);
-  OSStatus CreateDefaultPrintSettings(PMPrintSession aSession, PMPrintSettings& outSettings);
-
-  NSPrintInfo* mPrintInfo;
-
-  // Scaling factors used to convert the NSPrintInfo
-  // paper size units to inches
-  float mWidthScale;
-  float mHeightScale;
-  double mAdjustedPaperWidth;
-  double mAdjustedPaperHeight;
-};
-
-NS_DEFINE_STATIC_IID_ACCESSOR(nsPrintSettingsX, NS_PRINTSETTINGSX_IID)
-
-#endif // nsPrintSettingsX_h_
diff --git a/widget/cocoa/nsPrintSettingsX.mm b/widget/cocoa/nsPrintSettingsX.mm
deleted file mode 100644
index 73a8e78d2b..0000000000
--- a/widget/cocoa/nsPrintSettingsX.mm
+++ /dev/null
@@ -1,272 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "nsPrintSettingsX.h"
-#include "nsObjCExceptions.h"
-
-#include "plbase64.h"
-#include "plstr.h"
-
-#include "nsCocoaUtils.h"
-
-#include "mozilla/Preferences.h"
-
-using namespace mozilla;
-
-#define MAC_OS_X_PAGE_SETUP_PREFNAME    "print.macosx.pagesetup-2"
-#define COCOA_PAPER_UNITS_PER_INCH      72.0
-
-NS_IMPL_ISUPPORTS_INHERITED(nsPrintSettingsX, nsPrintSettings, nsPrintSettingsX)
-
-nsPrintSettingsX::nsPrintSettingsX()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  mPrintInfo = [[NSPrintInfo sharedPrintInfo] copy];
-  mWidthScale = COCOA_PAPER_UNITS_PER_INCH;
-  mHeightScale = COCOA_PAPER_UNITS_PER_INCH;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-nsPrintSettingsX::nsPrintSettingsX(const nsPrintSettingsX& src)
-{
-  *this = src;
-}
-
-nsPrintSettingsX::~nsPrintSettingsX()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  [mPrintInfo release];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-nsPrintSettingsX& nsPrintSettingsX::operator=(const nsPrintSettingsX& rhs)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  if (this == &rhs) {
-    return *this;
-  }
-  
-  nsPrintSettings::operator=(rhs);
-
-  [mPrintInfo release];
-  mPrintInfo = [rhs.mPrintInfo copy];
-
-  return *this;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(*this);
-}
-
-nsresult nsPrintSettingsX::Init()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  InitUnwriteableMargin();
-  InitAdjustedPaperSize();
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-// Should be called whenever the page format changes.
-NS_IMETHODIMP nsPrintSettingsX::InitUnwriteableMargin()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  PMPaper paper;
-  PMPaperMargins paperMargin;
-  PMPageFormat pageFormat = GetPMPageFormat();
-  ::PMGetPageFormatPaper(pageFormat, &paper);
-  ::PMPaperGetMargins(paper, &paperMargin);
-  mUnwriteableMargin.top    = NS_POINTS_TO_INT_TWIPS(paperMargin.top);
-  mUnwriteableMargin.left   = NS_POINTS_TO_INT_TWIPS(paperMargin.left);
-  mUnwriteableMargin.bottom = NS_POINTS_TO_INT_TWIPS(paperMargin.bottom);
-  mUnwriteableMargin.right  = NS_POINTS_TO_INT_TWIPS(paperMargin.right);
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;  
-}
-
-NS_IMETHODIMP nsPrintSettingsX::InitAdjustedPaperSize()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  PMPageFormat pageFormat = GetPMPageFormat();
-
-  PMRect paperRect;
-  ::PMGetAdjustedPaperRect(pageFormat, &paperRect);
-
-  mAdjustedPaperWidth = paperRect.right - paperRect.left;
-  mAdjustedPaperHeight = paperRect.bottom - paperRect.top;
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-void
-nsPrintSettingsX::SetCocoaPrintInfo(NSPrintInfo* aPrintInfo)
-{
-  if (mPrintInfo != aPrintInfo) {
-    [mPrintInfo release];
-    mPrintInfo = [aPrintInfo retain];
-  }
-}
-
-NS_IMETHODIMP nsPrintSettingsX::ReadPageFormatFromPrefs()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  nsAutoCString encodedData;
-  nsresult rv =
-    Preferences::GetCString(MAC_OS_X_PAGE_SETUP_PREFNAME, &encodedData);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  // decode the base64
-  char* decodedData = PL_Base64Decode(encodedData.get(), encodedData.Length(), nullptr);
-  NSData* data = [NSData dataWithBytes:decodedData length:strlen(decodedData)];
-  if (!data)
-    return NS_ERROR_FAILURE;
-
-  PMPageFormat newPageFormat;
-  OSStatus status = ::PMPageFormatCreateWithDataRepresentation((CFDataRef)data, &newPageFormat);
-  if (status == noErr) {
-    SetPMPageFormat(newPageFormat);
-  }
-  InitUnwriteableMargin();
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP nsPrintSettingsX::WritePageFormatToPrefs()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  PMPageFormat pageFormat = GetPMPageFormat();
-  if (pageFormat == kPMNoPageFormat)
-    return NS_ERROR_NOT_INITIALIZED;
-
-  NSData* data = nil;
-  OSStatus err = ::PMPageFormatCreateDataRepresentation(pageFormat, (CFDataRef*)&data, kPMDataFormatXMLDefault);
-  if (err != noErr)
-    return NS_ERROR_FAILURE;
-
-  nsAutoCString encodedData;
-  encodedData.Adopt(PL_Base64Encode((char*)[data bytes], [data length], nullptr));
-  if (!encodedData.get())
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  return Preferences::SetCString(MAC_OS_X_PAGE_SETUP_PREFNAME, encodedData);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-nsresult nsPrintSettingsX::_Clone(nsIPrintSettings **_retval)
-{
-  NS_ENSURE_ARG_POINTER(_retval);
-  *_retval = nullptr;
-  
-  nsPrintSettingsX *newSettings = new nsPrintSettingsX(*this);
-  if (!newSettings)
-    return NS_ERROR_FAILURE;
-  *_retval = newSettings;
-  NS_ADDREF(*_retval);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsPrintSettingsX::_Assign(nsIPrintSettings *aPS)
-{
-  nsPrintSettingsX *printSettingsX = static_cast<nsPrintSettingsX*>(aPS);
-  if (!printSettingsX)
-    return NS_ERROR_UNEXPECTED;
-  *this = *printSettingsX;
-  return NS_OK;
-}
-
-PMPrintSettings
-nsPrintSettingsX::GetPMPrintSettings()
-{
-  return static_cast<PMPrintSettings>([mPrintInfo PMPrintSettings]);
-}
-
-PMPrintSession
-nsPrintSettingsX::GetPMPrintSession()
-{
-  return static_cast<PMPrintSession>([mPrintInfo PMPrintSession]);
-}
-
-PMPageFormat
-nsPrintSettingsX::GetPMPageFormat()
-{
-  return static_cast<PMPageFormat>([mPrintInfo PMPageFormat]);
-}
-
-void
-nsPrintSettingsX::SetPMPageFormat(PMPageFormat aPageFormat)
-{
-  PMPageFormat oldPageFormat = GetPMPageFormat();
-  ::PMCopyPageFormat(aPageFormat, oldPageFormat);
-  [mPrintInfo updateFromPMPageFormat];
-}
-
-void
-nsPrintSettingsX::SetInchesScale(float aWidthScale, float aHeightScale)
-{
-  if (aWidthScale > 0 && aHeightScale > 0) {
-    mWidthScale = aWidthScale;
-    mHeightScale = aHeightScale;
-  }
-}
-
-void
-nsPrintSettingsX::GetInchesScale(float *aWidthScale, float *aHeightScale)
-{
-  *aWidthScale = mWidthScale;
-  *aHeightScale = mHeightScale;
-}
-
-NS_IMETHODIMP nsPrintSettingsX::SetPaperWidth(double aPaperWidth)
-{
-  mPaperWidth = aPaperWidth;
-  mAdjustedPaperWidth = aPaperWidth * mWidthScale;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsPrintSettingsX::SetPaperHeight(double aPaperHeight)
-{
-  mPaperHeight = aPaperHeight;
-  mAdjustedPaperHeight = aPaperHeight * mHeightScale;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsPrintSettingsX::GetEffectivePageSize(double *aWidth, double *aHeight)
-{
-  *aWidth  = NS_INCHES_TO_TWIPS(mAdjustedPaperWidth / mWidthScale);
-  *aHeight = NS_INCHES_TO_TWIPS(mAdjustedPaperHeight / mHeightScale);
-  return NS_OK;
-}
-
-void nsPrintSettingsX::SetAdjustedPaperSize(double aWidth, double aHeight)
-{
-  mAdjustedPaperWidth = aWidth;
-  mAdjustedPaperHeight = aHeight;
-}
-
-void nsPrintSettingsX::GetAdjustedPaperSize(double *aWidth, double *aHeight)
-{
-  *aWidth = mAdjustedPaperWidth;
-  *aHeight = mAdjustedPaperHeight;
-}
diff --git a/widget/cocoa/nsSandboxViolationSink.h b/widget/cocoa/nsSandboxViolationSink.h
deleted file mode 100644
index 35b5d89af5..0000000000
--- a/widget/cocoa/nsSandboxViolationSink.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsSandboxViolationSink_h_
-#define nsSandboxViolationSink_h_
-
-#include <stdint.h>
-
-// Class for tracking sandbox violations.  Currently it just logs them to
-// stdout and the system console.  In the future it may do more.
-
-// What makes this possible is the fact that Apple' sandboxd calls
-// notify_post("com.apple.sandbox.violation.*") whenever it's notified by the
-// Sandbox kernel extension of a sandbox violation.  We register to receive
-// these notifications.  But the notifications are empty, and are sent for
-// every violation in every process.  So we need to do more to get only "our"
-// violations, and to find out what kind of violation they were.  See the
-// implementation of nsSandboxViolationSink::ViolationHandler().
-
-#define SANDBOX_VIOLATION_QUEUE_NAME "org.mozilla.sandbox.violation.queue"
-#define SANDBOX_VIOLATION_NOTIFICATION_NAME "com.apple.sandbox.violation.*"
-
-class nsSandboxViolationSink
-{
-public:
-  static void Start();
-  static void Stop();
-private:
-  static void ViolationHandler();
-  static int mNotifyToken;
-  static uint64_t mLastMsgReceived;
-};
-
-#endif // nsSandboxViolationSink_h_
diff --git a/widget/cocoa/nsSandboxViolationSink.mm b/widget/cocoa/nsSandboxViolationSink.mm
deleted file mode 100644
index 0572173344..0000000000
--- a/widget/cocoa/nsSandboxViolationSink.mm
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "nsSandboxViolationSink.h"
-
-#include <unistd.h>
-#include <time.h>
-#include <asl.h>
-#include <dispatch/dispatch.h>
-#include <notify.h>
-#include "nsCocoaDebugUtils.h"
-#include "mozilla/Preferences.h"
-#include "mozilla/Sprintf.h"
-
-int nsSandboxViolationSink::mNotifyToken = 0;
-uint64_t nsSandboxViolationSink::mLastMsgReceived = 0;
-
-void
-nsSandboxViolationSink::Start()
-{
-  if (mNotifyToken) {
-    return;
-  }
-  notify_register_dispatch(SANDBOX_VIOLATION_NOTIFICATION_NAME,
-                           &mNotifyToken,
-                           dispatch_queue_create(SANDBOX_VIOLATION_QUEUE_NAME,
-                                                 DISPATCH_QUEUE_SERIAL),
-                           ^(int token) { ViolationHandler(); });
-}
-
-void
-nsSandboxViolationSink::Stop()
-{
-  if (!mNotifyToken) {
-    return;
-  }
-  notify_cancel(mNotifyToken);
-  mNotifyToken = 0;
-}
-
-// We need to query syslogd to find out what violations occurred, and whether
-// they were "ours".  We can use the Apple System Log facility to do this.
-// Besides calling notify_post("com.apple.sandbox.violation.*"), Apple's
-// sandboxd also reports all sandbox violations (sent to it by the Sandbox
-// kernel extension) to syslogd, which stores them and makes them viewable
-// in the system console.  This is the database we query.
-
-// ViolationHandler() is always called on its own secondary thread.  This
-// makes it unlikely it will interfere with other browser activity.
-
-void
-nsSandboxViolationSink::ViolationHandler()
-{
-  aslmsg query = asl_new(ASL_TYPE_QUERY);
-
-  asl_set_query(query, ASL_KEY_FACILITY, "com.apple.sandbox",
-                ASL_QUERY_OP_EQUAL);
-
-  // Only get reports that were generated very recently.
-  char query_time[30] = {0};
-  SprintfLiteral(query_time, "%li", time(NULL) - 2);
-  asl_set_query(query, ASL_KEY_TIME, query_time,
-                ASL_QUERY_OP_NUMERIC | ASL_QUERY_OP_GREATER_EQUAL);
-
-  // This code is easier to test if we don't just track "our" violations,
-  // which are (normally) few and far between.  For example (for the time
-  // being at least) four appleeventsd sandbox violations happen every time
-  // we start the browser in e10s mode.  But it makes sense to default to
-  // only tracking "our" violations.
-  if (mozilla::Preferences::GetBool(
-      "security.sandbox.mac.track.violations.oursonly", true)) {
-    // This makes each of our processes log its own violations.  It might
-    // be better to make the chrome process log all the other processes'
-    // violations.
-    char query_pid[20] = {0};
-    SprintfLiteral(query_pid, "%u", getpid());
-    asl_set_query(query, ASL_KEY_REF_PID, query_pid, ASL_QUERY_OP_EQUAL);
-  }
-
-  aslresponse response = asl_search(nullptr, query);
-
-  // Each time ViolationHandler() is called we grab as many messages as are
-  // available.  Otherwise we might not get them all.
-  if (response) {
-    while (true) {
-      aslmsg hit = nullptr;
-      aslmsg found = nullptr;
-      const char* id_str;
-
-      while ((hit = aslresponse_next(response))) {
-        // Record the message id to avoid logging the same violation more
-        // than once.
-        id_str = asl_get(hit, ASL_KEY_MSG_ID);
-        uint64_t id_val = atoll(id_str);
-        if (id_val <= mLastMsgReceived) {
-          continue;
-        }
-        mLastMsgReceived = id_val;
-        found = hit;
-        break;
-      }
-      if (!found) {
-        break;
-      }
-
-      const char* pid_str = asl_get(found, ASL_KEY_REF_PID);
-      const char* message_str = asl_get(found, ASL_KEY_MSG);
-      nsCocoaDebugUtils::DebugLog("nsSandboxViolationSink::ViolationHandler(): id %s, pid %s, message %s",
-                                  id_str, pid_str, message_str);
-    }
-    aslresponse_free(response);
-  }
-}
diff --git a/widget/cocoa/nsScreenCocoa.h b/widget/cocoa/nsScreenCocoa.h
deleted file mode 100644
index 268d5beb0a..0000000000
--- a/widget/cocoa/nsScreenCocoa.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsScreenCocoa_h_
-#define nsScreenCocoa_h_
-
-#import <Cocoa/Cocoa.h>
-
-#include "nsBaseScreen.h"
-
-class nsScreenCocoa : public nsBaseScreen
-{
-public:
-    explicit nsScreenCocoa (NSScreen *screen);
-    ~nsScreenCocoa ();
-
-    NS_IMETHOD GetId(uint32_t* outId);
-    NS_IMETHOD GetRect(int32_t* aLeft, int32_t* aTop, int32_t* aWidth, int32_t* aHeight);
-    NS_IMETHOD GetAvailRect(int32_t* aLeft, int32_t* aTop, int32_t* aWidth, int32_t* aHeight);
-    NS_IMETHOD GetRectDisplayPix(int32_t* aLeft, int32_t* aTop, int32_t* aWidth, int32_t* aHeight);
-    NS_IMETHOD GetAvailRectDisplayPix(int32_t* aLeft, int32_t* aTop, int32_t* aWidth, int32_t* aHeight);
-    NS_IMETHOD GetPixelDepth(int32_t* aPixelDepth);
-    NS_IMETHOD GetColorDepth(int32_t* aColorDepth);
-    NS_IMETHOD GetContentsScaleFactor(double* aContentsScaleFactor);
-    NS_IMETHOD GetDefaultCSSScaleFactor(double* aScaleFactor)
-    {
-      return GetContentsScaleFactor(aScaleFactor);
-    }
-
-    NSScreen *CocoaScreen() { return mScreen; }
-
-private:
-    CGFloat BackingScaleFactor();
-
-    NSScreen *mScreen;
-    uint32_t mId;
-};
-
-#endif // nsScreenCocoa_h_
diff --git a/widget/cocoa/nsScreenCocoa.mm b/widget/cocoa/nsScreenCocoa.mm
deleted file mode 100644
index 08905bf0ad..0000000000
--- a/widget/cocoa/nsScreenCocoa.mm
+++ /dev/null
@@ -1,147 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "nsScreenCocoa.h"
-#include "nsObjCExceptions.h"
-#include "nsCocoaUtils.h"
-
-static uint32_t sScreenId = 0;
-
-nsScreenCocoa::nsScreenCocoa (NSScreen *screen)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  mScreen = [screen retain];
-  mId = ++sScreenId;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-nsScreenCocoa::~nsScreenCocoa ()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  [mScreen release];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-NS_IMETHODIMP
-nsScreenCocoa::GetId(uint32_t *outId)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  *outId = mId;
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-NS_IMETHODIMP
-nsScreenCocoa::GetRect(int32_t *outX, int32_t *outY, int32_t *outWidth, int32_t *outHeight)
-{
-  NSRect frame = [mScreen frame];
-
-  mozilla::LayoutDeviceIntRect r =
-    nsCocoaUtils::CocoaRectToGeckoRectDevPix(frame, BackingScaleFactor());
-
-  *outX = r.x;
-  *outY = r.y;
-  *outWidth = r.width;
-  *outHeight = r.height;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsScreenCocoa::GetAvailRect(int32_t *outX, int32_t *outY, int32_t *outWidth, int32_t *outHeight)
-{
-  NSRect frame = [mScreen visibleFrame];
-
-  mozilla::LayoutDeviceIntRect r =
-    nsCocoaUtils::CocoaRectToGeckoRectDevPix(frame, BackingScaleFactor());
-
-  *outX = r.x;
-  *outY = r.y;
-  *outWidth = r.width;
-  *outHeight = r.height;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsScreenCocoa::GetRectDisplayPix(int32_t *outX, int32_t *outY, int32_t *outWidth, int32_t *outHeight)
-{
-  NSRect frame = [mScreen frame];
-
-  mozilla::DesktopIntRect r = nsCocoaUtils::CocoaRectToGeckoRect(frame);
-
-  *outX = r.x;
-  *outY = r.y;
-  *outWidth = r.width;
-  *outHeight = r.height;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsScreenCocoa::GetAvailRectDisplayPix(int32_t *outX, int32_t *outY, int32_t *outWidth, int32_t *outHeight)
-{
-  NSRect frame = [mScreen visibleFrame];
-
-  mozilla::DesktopIntRect r = nsCocoaUtils::CocoaRectToGeckoRect(frame);
-
-  *outX = r.x;
-  *outY = r.y;
-  *outWidth = r.width;
-  *outHeight = r.height;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsScreenCocoa::GetPixelDepth(int32_t *aPixelDepth)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  NSWindowDepth depth = [mScreen depth];
-  int bpp = NSBitsPerPixelFromDepth(depth);
-
-  *aPixelDepth = bpp;
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-nsScreenCocoa::GetColorDepth(int32_t *aColorDepth)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  NSWindowDepth depth = [mScreen depth];
-  int bpp = NSBitsPerPixelFromDepth (depth);
-
-  *aColorDepth = bpp;
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-nsScreenCocoa::GetContentsScaleFactor(double *aContentsScaleFactor)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  *aContentsScaleFactor = (double) BackingScaleFactor();
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-CGFloat
-nsScreenCocoa::BackingScaleFactor()
-{
-  return nsCocoaUtils::GetBackingScaleFactor(mScreen);
-}
diff --git a/widget/cocoa/nsScreenManagerCocoa.h b/widget/cocoa/nsScreenManagerCocoa.h
deleted file mode 100644
index 61a059d977..0000000000
--- a/widget/cocoa/nsScreenManagerCocoa.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsScreenManagerCocoa_h_
-#define nsScreenManagerCocoa_h_
-
-#import <Cocoa/Cocoa.h>
-
-#include "mozilla/RefPtr.h"
-#include "nsTArray.h"
-#include "nsIScreenManager.h"
-#include "nsScreenCocoa.h"
-
-class nsScreenManagerCocoa : public nsIScreenManager
-{
-public:
-    nsScreenManagerCocoa();
-
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSISCREENMANAGER
-
-protected:
-    virtual ~nsScreenManagerCocoa();
-
-private:
-
-    nsScreenCocoa *ScreenForCocoaScreen(NSScreen *screen);
-    nsTArray< RefPtr<nsScreenCocoa> > mScreenList;
-};
-
-#endif // nsScreenManagerCocoa_h_
diff --git a/widget/cocoa/nsScreenManagerCocoa.mm b/widget/cocoa/nsScreenManagerCocoa.mm
deleted file mode 100644
index 9a0cbb9cc5..0000000000
--- a/widget/cocoa/nsScreenManagerCocoa.mm
+++ /dev/null
@@ -1,152 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "nsScreenManagerCocoa.h"
-#include "nsObjCExceptions.h"
-#include "nsCOMPtr.h"
-#include "nsCocoaUtils.h"
-
-using namespace mozilla;
-
-NS_IMPL_ISUPPORTS(nsScreenManagerCocoa, nsIScreenManager)
-
-nsScreenManagerCocoa::nsScreenManagerCocoa()
-{
-}
-
-nsScreenManagerCocoa::~nsScreenManagerCocoa()
-{
-}
-
-nsScreenCocoa*
-nsScreenManagerCocoa::ScreenForCocoaScreen(NSScreen *screen)
-{
-    for (uint32_t i = 0; i < mScreenList.Length(); ++i) {
-        nsScreenCocoa* sc = mScreenList[i];
-        if (sc->CocoaScreen() == screen) {
-            // doesn't addref
-            return sc;
-        }
-    }
-
-    // didn't find it; create and insert
-    RefPtr<nsScreenCocoa> sc = new nsScreenCocoa(screen);
-    mScreenList.AppendElement(sc);
-    return sc.get();
-}
-
-NS_IMETHODIMP
-nsScreenManagerCocoa::ScreenForId (uint32_t aId, nsIScreen **outScreen)
-{
-    NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT
-
-    *outScreen = nullptr;
-
-    for (uint32_t i = 0; i < mScreenList.Length(); ++i) {
-        nsScreenCocoa* sc = mScreenList[i];
-        uint32_t id;
-        nsresult rv = sc->GetId(&id);
-
-        if (NS_SUCCEEDED(rv) && id == aId) {
-            *outScreen = sc;
-            NS_ADDREF(*outScreen);
-            return NS_OK;
-        }
-    }
-
-    return NS_ERROR_FAILURE;
-
-    NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-nsScreenManagerCocoa::ScreenForRect (int32_t aX, int32_t aY,
-                                     int32_t aWidth, int32_t aHeight,
-                                     nsIScreen **outScreen)
-{
-    NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-    NSEnumerator *screenEnum = [[NSScreen screens] objectEnumerator];
-    NSRect inRect =
-      nsCocoaUtils::GeckoRectToCocoaRect(DesktopIntRect(aX, aY,
-                                                        aWidth, aHeight));
-    NSScreen *screenWindowIsOn = [NSScreen mainScreen];
-    float greatestArea = 0;
-
-    while (NSScreen *screen = [screenEnum nextObject]) {
-        NSDictionary *desc = [screen deviceDescription];
-        if ([desc objectForKey:NSDeviceIsScreen] == nil)
-            continue;
-
-        NSRect r = NSIntersectionRect([screen frame], inRect);
-        float area = r.size.width * r.size.height;
-        if (area > greatestArea) {
-            greatestArea = area;
-            screenWindowIsOn = screen;
-        }
-    }
-
-    *outScreen = ScreenForCocoaScreen(screenWindowIsOn);
-    NS_ADDREF(*outScreen);
-    return NS_OK;
-
-    NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-nsScreenManagerCocoa::GetPrimaryScreen (nsIScreen **outScreen)
-{
-    NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-    // the mainScreen is the screen with the "key window" (focus, I assume?)
-    NSScreen *sc = [[NSScreen screens] objectAtIndex:0];
-
-    *outScreen = ScreenForCocoaScreen(sc);
-    NS_ADDREF(*outScreen);
-
-    return NS_OK;
-
-    NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-nsScreenManagerCocoa::GetNumberOfScreens (uint32_t *aNumberOfScreens)
-{
-    NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-    NSArray *ss = [NSScreen screens];
-
-    *aNumberOfScreens = [ss count];
-
-    return NS_OK;
-
-    NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-nsScreenManagerCocoa::GetSystemDefaultScale(float *aDefaultScale)
-{
-    *aDefaultScale = 1.0f;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsScreenManagerCocoa::ScreenForNativeWidget (void *nativeWidget, nsIScreen **outScreen)
-{
-    NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-    NSWindow *window = static_cast<NSWindow*>(nativeWidget);
-    if (window) {
-        nsIScreen *screen = ScreenForCocoaScreen([window screen]);
-        *outScreen = screen;
-        NS_ADDREF(*outScreen);
-        return NS_OK;
-    }
-
-    *outScreen = nullptr;
-    return NS_OK;
-
-    NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
diff --git a/widget/cocoa/nsSound.h b/widget/cocoa/nsSound.h
deleted file mode 100644
index 0e0293ae28..0000000000
--- a/widget/cocoa/nsSound.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsSound_h_
-#define nsSound_h_
-
-#include "nsISound.h"
-#include "nsIStreamLoader.h"
-
-class nsSound : public nsISound,
-                public nsIStreamLoaderObserver
-{
-public: 
-    nsSound();
-
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSISOUND
-    NS_DECL_NSISTREAMLOADEROBSERVER
-
-protected:
-    virtual ~nsSound();
-};
-
-#endif // nsSound_h_
diff --git a/widget/cocoa/nsSound.mm b/widget/cocoa/nsSound.mm
deleted file mode 100644
index 04c6b4d764..0000000000
--- a/widget/cocoa/nsSound.mm
+++ /dev/null
@@ -1,108 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "nsSound.h"
-#include "nsContentUtils.h"
-#include "nsObjCExceptions.h"
-#include "nsNetUtil.h"
-#include "nsCOMPtr.h"
-#include "nsIURL.h"
-#include "nsString.h"
-
-#import <Cocoa/Cocoa.h>
-
-NS_IMPL_ISUPPORTS(nsSound, nsISound, nsIStreamLoaderObserver)
-
-nsSound::nsSound()
-{
-}
-
-nsSound::~nsSound()
-{
-}
-
-NS_IMETHODIMP
-nsSound::Beep()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  NSBeep();
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-nsSound::OnStreamComplete(nsIStreamLoader *aLoader,
-                          nsISupports *context,
-                          nsresult aStatus,
-                          uint32_t dataLen,
-                          const uint8_t *data)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  NSData *value = [NSData dataWithBytes:data length:dataLen];
-
-  NSSound *sound = [[NSSound alloc] initWithData:value];
-
-  [sound play];
-
-  [sound autorelease];
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-nsSound::Play(nsIURL *aURL)
-{
-  nsCOMPtr<nsIURI> uri(do_QueryInterface(aURL));
-  nsCOMPtr<nsIStreamLoader> loader;
-  return NS_NewStreamLoader(getter_AddRefs(loader),
-                            uri,
-                            this, // aObserver
-                            nsContentUtils::GetSystemPrincipal(),
-                            nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL,
-                            nsIContentPolicy::TYPE_OTHER);
-}
-
-NS_IMETHODIMP
-nsSound::Init()
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSound::PlaySystemSound(const nsAString &aSoundAlias)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  if (NS_IsMozAliasSound(aSoundAlias)) {
-    NS_WARNING("nsISound::playSystemSound is called with \"_moz_\" events, they are obsolete, use nsISound::playEventSound instead");
-    // Mac doesn't have system sound settings for each user actions.
-    return NS_OK;
-  }
-
-  NSString *name = [NSString stringWithCharacters:reinterpret_cast<const unichar*>(aSoundAlias.BeginReading())
-                                           length:aSoundAlias.Length()];
-  NSSound *sound = [NSSound soundNamed:name];
-  if (sound) {
-    [sound stop];
-    [sound play];
-  }
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-nsSound::PlayEventSound(uint32_t aEventId)
-{
-  // Mac doesn't have system sound settings for each user actions.
-  return NS_OK;
-}
diff --git a/widget/cocoa/nsStandaloneNativeMenu.h b/widget/cocoa/nsStandaloneNativeMenu.h
deleted file mode 100644
index e03742b1e0..0000000000
--- a/widget/cocoa/nsStandaloneNativeMenu.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nsStandaloneNativeMenu_h_
-#define nsStandaloneNativeMenu_h_
-
-#include "nsMenuGroupOwnerX.h"
-#include "nsMenuX.h"
-#include "nsIStandaloneNativeMenu.h"
-
-class nsStandaloneNativeMenu : public nsMenuGroupOwnerX, public nsIStandaloneNativeMenu
-{
-public:
-  nsStandaloneNativeMenu();
-
-  NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_NSISTANDALONENATIVEMENU
-
-  // nsMenuObjectX
-  nsMenuObjectTypeX MenuObjectType() override { return eStandaloneNativeMenuObjectType; }
-  void * NativeData() override { return mMenu != nullptr ? mMenu->NativeData() : nullptr; }
-  virtual void IconUpdated() override;
-
-  nsMenuX * GetMenuXObject() { return mMenu; }
-
-  // If this menu is the menu of a system status bar item (NSStatusItem),
-  // let the menu know about the status item so that it can propagate
-  // any icon changes to the status item.
-  void SetContainerStatusBarItem(NSStatusItem* aItem);
-
-protected:
-  virtual ~nsStandaloneNativeMenu();
-
-  nsMenuX * mMenu;
-  NSStatusItem* mContainerStatusBarItem;
-};
-
-#endif
diff --git a/widget/cocoa/nsStandaloneNativeMenu.mm b/widget/cocoa/nsStandaloneNativeMenu.mm
deleted file mode 100644
index 98a5fd8f6f..0000000000
--- a/widget/cocoa/nsStandaloneNativeMenu.mm
+++ /dev/null
@@ -1,213 +0,0 @@
-/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
-/* 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/. */
-
-#import <Cocoa/Cocoa.h>
-
-#include "nsStandaloneNativeMenu.h"
-#include "nsMenuUtilsX.h"
-#include "nsIDOMElement.h"
-#include "nsIMutationObserver.h"
-#include "nsGkAtoms.h"
-#include "nsObjCExceptions.h"
-
-
-NS_IMPL_ISUPPORTS_INHERITED(nsStandaloneNativeMenu, nsMenuGroupOwnerX,
-                            nsIMutationObserver, nsIStandaloneNativeMenu)
-
-nsStandaloneNativeMenu::nsStandaloneNativeMenu()
-: mMenu(nullptr)
-, mContainerStatusBarItem(nil)
-{
-}
-
-nsStandaloneNativeMenu::~nsStandaloneNativeMenu()
-{
-  if (mMenu) delete mMenu;
-}
-
-NS_IMETHODIMP
-nsStandaloneNativeMenu::Init(nsIDOMElement * aDOMElement)
-{
-  NS_ASSERTION(mMenu == nullptr, "nsNativeMenu::Init - mMenu not null!");
-
-  nsresult rv;
-
-  nsCOMPtr<nsIContent> content = do_QueryInterface(aDOMElement, &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (!content->IsAnyOfXULElements(nsGkAtoms::menu, nsGkAtoms::menupopup))
-    return NS_ERROR_FAILURE;
-
-  rv = nsMenuGroupOwnerX::Create(content);
-  if (NS_FAILED(rv))
-    return rv;
-
-  mMenu = new nsMenuX();
-  rv = mMenu->Create(this, this, content);
-  if (NS_FAILED(rv)) {
-    delete mMenu;
-    mMenu = nullptr;
-    return rv;
-  }
-
-  mMenu->SetupIcon();
-
-  return NS_OK;
-}
-
-static void
-UpdateMenu(nsMenuX * aMenu)
-{
-  aMenu->MenuOpened();
-  aMenu->MenuClosed();
-
-  uint32_t itemCount = aMenu->GetItemCount();
-  for (uint32_t i = 0; i < itemCount; i++) {
-    nsMenuObjectX * menuObject = aMenu->GetItemAt(i);
-    if (menuObject->MenuObjectType() == eSubmenuObjectType) {
-      UpdateMenu(static_cast<nsMenuX*>(menuObject));
-    }
-  }
-}
-
-NS_IMETHODIMP
-nsStandaloneNativeMenu::MenuWillOpen(bool * aResult)
-{
-  NS_ASSERTION(mMenu != nullptr, "nsStandaloneNativeMenu::OnOpen - mMenu is null!");
-
-  // Force an update on the mMenu by faking an open/close on all of
-  // its submenus.
-  UpdateMenu(mMenu);
-
-  *aResult = true;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsStandaloneNativeMenu::GetNativeMenu(void ** aVoidPointer)
-{
-  if (mMenu) {
-    *aVoidPointer = mMenu->NativeData();
-    [[(NSObject *)(*aVoidPointer) retain] autorelease];
-    return NS_OK;
-  }  else {
-    *aVoidPointer = nullptr;
-    return NS_ERROR_NOT_INITIALIZED;
-  }
-}
-
-static NSMenuItem *
-NativeMenuItemWithLocation(NSMenu * currentSubmenu, NSString * locationString)
-{
-  NSArray * indexes = [locationString componentsSeparatedByString:@"|"];
-  NSUInteger indexCount = [indexes count];
-  if (indexCount == 0)
-    return nil;
-
-  for (NSUInteger i = 0; i < indexCount; i++) {
-    NSInteger targetIndex = [[indexes objectAtIndex:i] integerValue];
-    NSInteger itemCount = [currentSubmenu numberOfItems];
-    if (targetIndex < itemCount) {
-      NSMenuItem* menuItem = [currentSubmenu itemAtIndex:targetIndex];
-
-      // If this is the last index, just return the menu item.
-      if (i == (indexCount - 1))
-        return menuItem;
-
-      // If this is not the last index, find the submenu and keep going.
-      if ([menuItem hasSubmenu])
-        currentSubmenu = [menuItem submenu];
-      else
-        return nil;
-    }
-  }
-
-  return nil;
-}
-
-NS_IMETHODIMP
-nsStandaloneNativeMenu::ActivateNativeMenuItemAt(const nsAString& indexString)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-  
-  if (!mMenu)
-    return NS_ERROR_NOT_INITIALIZED;
-
-  NSString * locationString = [NSString stringWithCharacters:reinterpret_cast<const unichar*>(indexString.BeginReading())
-                                                      length:indexString.Length()];
-  NSMenu * menu = static_cast<NSMenu *> (mMenu->NativeData());
-  NSMenuItem * item = NativeMenuItemWithLocation(menu, locationString);
-
-  // We can't perform an action on an item with a submenu, that will raise
-  // an obj-c exception.
-  if (item && ![item hasSubmenu]) {
-    NSMenu * parent = [item menu];
-    if (parent) {
-      // NSLog(@"Performing action for native menu item titled: %@\n",
-      //       [[currentSubmenu itemAtIndex:targetIndex] title]);
-      [parent performActionForItemAtIndex:[parent indexOfItem:item]];
-      return NS_OK;
-    }
-  }
-
-  return NS_ERROR_FAILURE;
-  
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-nsStandaloneNativeMenu::ForceUpdateNativeMenuAt(const nsAString& indexString)
-{
-  if (!mMenu)
-    return NS_ERROR_NOT_INITIALIZED;
-
-  NSString* locationString = [NSString stringWithCharacters:reinterpret_cast<const unichar*>(indexString.BeginReading())
-                                                     length:indexString.Length()];
-  NSArray* indexes = [locationString componentsSeparatedByString:@"|"];
-  unsigned int indexCount = [indexes count];
-  if (indexCount == 0)
-    return NS_OK;
-
-  nsMenuX* currentMenu = mMenu;
-
-  // now find the correct submenu
-  for (unsigned int i = 1; currentMenu && i < indexCount; i++) {
-    int targetIndex = [[indexes objectAtIndex:i] intValue];
-    int visible = 0;
-    uint32_t length = currentMenu->GetItemCount();
-    for (unsigned int j = 0; j < length; j++) {
-      nsMenuObjectX* targetMenu = currentMenu->GetItemAt(j);
-      if (!targetMenu)
-        return NS_OK;
-      if (!nsMenuUtilsX::NodeIsHiddenOrCollapsed(targetMenu->Content())) {
-        visible++;
-        if (targetMenu->MenuObjectType() == eSubmenuObjectType && visible == (targetIndex + 1)) {
-          currentMenu = static_cast<nsMenuX*>(targetMenu);
-          // fake open/close to cause lazy update to happen
-          currentMenu->MenuOpened();
-          currentMenu->MenuClosed();
-          break;
-        }
-      }
-    }
-  }
-
-  return NS_OK;
-}
-
-void
-nsStandaloneNativeMenu::IconUpdated()
-{
-  if (mContainerStatusBarItem) {
-    [mContainerStatusBarItem setImage:[mMenu->NativeMenuItem() image]];
-  }
-}
-
-void
-nsStandaloneNativeMenu::SetContainerStatusBarItem(NSStatusItem* aItem)
-{
-  mContainerStatusBarItem = aItem;
-  IconUpdated();
-}
diff --git a/widget/cocoa/nsSystemStatusBarCocoa.h b/widget/cocoa/nsSystemStatusBarCocoa.h
deleted file mode 100644
index 51aa4df00d..0000000000
--- a/widget/cocoa/nsSystemStatusBarCocoa.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nsSystemStatusBarCocoa_h_
-#define nsSystemStatusBarCocoa_h_
-
-#include "mozilla/RefPtr.h"
-#include "nsISystemStatusBar.h"
-#include "nsClassHashtable.h"
-
-class nsStandaloneNativeMenu;
-@class NSStatusItem;
-
-class nsSystemStatusBarCocoa : public nsISystemStatusBar
-{
-public:
-  nsSystemStatusBarCocoa() {}
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSISYSTEMSTATUSBAR
-
-protected:
-  virtual ~nsSystemStatusBarCocoa() {}
-
-  struct StatusItem
-  {
-    explicit StatusItem(nsStandaloneNativeMenu* aMenu);
-    ~StatusItem();
-
-  private:
-    RefPtr<nsStandaloneNativeMenu> mMenu;
-    NSStatusItem* mStatusItem;
-  };
-
-  nsClassHashtable<nsISupportsHashKey, StatusItem> mItems;
-};
-
-#endif // nsSystemStatusBarCocoa_h_
diff --git a/widget/cocoa/nsSystemStatusBarCocoa.mm b/widget/cocoa/nsSystemStatusBarCocoa.mm
deleted file mode 100644
index 522da71451..0000000000
--- a/widget/cocoa/nsSystemStatusBarCocoa.mm
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
-/* 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/. */
-
-#import <Cocoa/Cocoa.h>
-
-#include "nsComponentManagerUtils.h"
-#include "nsSystemStatusBarCocoa.h"
-#include "nsStandaloneNativeMenu.h"
-#include "nsObjCExceptions.h"
-#include "nsIDOMElement.h"
-
-NS_IMPL_ISUPPORTS(nsSystemStatusBarCocoa, nsISystemStatusBar)
-
-NS_IMETHODIMP
-nsSystemStatusBarCocoa::AddItem(nsIDOMElement* aDOMElement)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  RefPtr<nsStandaloneNativeMenu> menu = new nsStandaloneNativeMenu();
-  nsresult rv = menu->Init(aDOMElement);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  nsCOMPtr<nsISupports> keyPtr = aDOMElement;
-  mItems.Put(keyPtr, new StatusItem(menu));
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-NS_IMETHODIMP
-nsSystemStatusBarCocoa::RemoveItem(nsIDOMElement* aDOMElement)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  mItems.Remove(aDOMElement);
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-nsSystemStatusBarCocoa::StatusItem::StatusItem(nsStandaloneNativeMenu* aMenu)
-  : mMenu(aMenu)
-{
-  MOZ_COUNT_CTOR(nsSystemStatusBarCocoa::StatusItem);
-
-  NSMenu* nativeMenu = nil;
-  mMenu->GetNativeMenu(reinterpret_cast<void**>(&nativeMenu));
-
-  mStatusItem = [[[NSStatusBar systemStatusBar] statusItemWithLength:NSSquareStatusItemLength] retain];
-  [mStatusItem setMenu:nativeMenu];
-  [mStatusItem setHighlightMode:YES];
-
-  // We want the status item to get its image from menu item that mMenu was
-  // initialized with. Icon loads are asynchronous, so we need to let the menu
-  // know about the item so that it can update its icon as soon as it has
-  // loaded.
-  mMenu->SetContainerStatusBarItem(mStatusItem);
-}
-
-nsSystemStatusBarCocoa::StatusItem::~StatusItem()
-{
-  mMenu->SetContainerStatusBarItem(nil);
-  [[NSStatusBar systemStatusBar] removeStatusItem:mStatusItem];
-  [mStatusItem release];
-  mStatusItem = nil;
-
-  MOZ_COUNT_DTOR(nsSystemStatusBarCocoa::StatusItem);
-}
diff --git a/widget/cocoa/nsToolkit.h b/widget/cocoa/nsToolkit.h
deleted file mode 100644
index 1631a8ac24..0000000000
--- a/widget/cocoa/nsToolkit.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsToolkit_h_
-#define nsToolkit_h_
-
-#include "nscore.h"
-
-#import <Carbon/Carbon.h>
-#import <Cocoa/Cocoa.h>
-#import <objc/Object.h>
-#import <IOKit/IOKitLib.h>
-
-class nsToolkit
-{
-public:
-                     nsToolkit();
-  virtual            ~nsToolkit();
-
-  static nsToolkit*  GetToolkit();
-
-  static void Shutdown() {
-    delete gToolkit;
-    gToolkit = nullptr;
-  }
-
-  static void        PostSleepWakeNotification(const char* aNotification);
-
-  static nsresult    SwizzleMethods(Class aClass, SEL orgMethod, SEL posedMethod,
-                                    bool classMethods = false);
-
-  void               RegisterForAllProcessMouseEvents();
-  void               UnregisterAllProcessMouseEventHandlers();
-
-protected:
-
-  nsresult           RegisterForSleepWakeNotifications();
-  void               RemoveSleepWakeNotifications();
-
-protected:
-
-  static nsToolkit*  gToolkit;
-
-  CFRunLoopSourceRef mSleepWakeNotificationRLS;
-  io_object_t        mPowerNotifier;
-
-  CFMachPortRef      mEventTapPort;
-  CFRunLoopSourceRef mEventTapRLS;
-};
-
-#endif // nsToolkit_h_
diff --git a/widget/cocoa/nsToolkit.mm b/widget/cocoa/nsToolkit.mm
deleted file mode 100644
index 4d0222d5d3..0000000000
--- a/widget/cocoa/nsToolkit.mm
+++ /dev/null
@@ -1,326 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "nsToolkit.h"
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <mach/mach_port.h>
-#include <mach/mach_interface.h>
-#include <mach/mach_init.h>
-
-extern "C" {
-#include <mach-o/getsect.h>
-}
-#include <unistd.h>
-#include <dlfcn.h>
-
-#import <Cocoa/Cocoa.h>
-#import <IOKit/pwr_mgt/IOPMLib.h>
-#import <IOKit/IOMessage.h>
-
-#include "nsCocoaUtils.h"
-#include "nsObjCExceptions.h"
-
-#include "nsGkAtoms.h"
-#include "nsIRollupListener.h"
-#include "nsIWidget.h"
-#include "nsBaseWidget.h"
-
-#include "nsIObserverService.h"
-#include "nsIServiceManager.h"
-
-#include "mozilla/Preferences.h"
-#include "mozilla/Services.h"
-
-using namespace mozilla;
-
-static io_connect_t gRootPort = MACH_PORT_NULL;
-
-nsToolkit* nsToolkit::gToolkit = nullptr;
-
-nsToolkit::nsToolkit()
-: mSleepWakeNotificationRLS(nullptr)
-, mEventTapPort(nullptr)
-, mEventTapRLS(nullptr)
-{
-  MOZ_COUNT_CTOR(nsToolkit);
-  RegisterForSleepWakeNotifications();
-}
-
-nsToolkit::~nsToolkit()
-{
-  MOZ_COUNT_DTOR(nsToolkit);
-  RemoveSleepWakeNotifications();
-  UnregisterAllProcessMouseEventHandlers();
-}
-
-void
-nsToolkit::PostSleepWakeNotification(const char* aNotification)
-{
-  nsCOMPtr<nsIObserverService> observerService = services::GetObserverService();
-  if (observerService)
-    observerService->NotifyObservers(nullptr, aNotification, nullptr);
-}
-
-// http://developer.apple.com/documentation/DeviceDrivers/Conceptual/IOKitFundamentals/PowerMgmt/chapter_10_section_3.html
-static void ToolkitSleepWakeCallback(void *refCon, io_service_t service, natural_t messageType, void * messageArgument)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  switch (messageType)
-  {
-    case kIOMessageSystemWillSleep:
-      // System is going to sleep now.
-      nsToolkit::PostSleepWakeNotification(NS_WIDGET_SLEEP_OBSERVER_TOPIC);
-      ::IOAllowPowerChange(gRootPort, (long)messageArgument);
-      break;
-      
-    case kIOMessageCanSystemSleep:
-      // In this case, the computer has been idle for several minutes
-      // and will sleep soon so you must either allow or cancel
-      // this notification. Important: if you don’t respond, there will
-      // be a 30-second timeout before the computer sleeps.
-      // In Mozilla's case, we always allow sleep.
-      ::IOAllowPowerChange(gRootPort,(long)messageArgument);
-      break;
-      
-    case kIOMessageSystemHasPoweredOn:
-      // Handle wakeup.
-      nsToolkit::PostSleepWakeNotification(NS_WIDGET_WAKE_OBSERVER_TOPIC);
-      break;
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-nsresult
-nsToolkit::RegisterForSleepWakeNotifications()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  IONotificationPortRef notifyPortRef;
-
-  NS_ASSERTION(!mSleepWakeNotificationRLS, "Already registered for sleep/wake");
-
-  gRootPort = ::IORegisterForSystemPower(0, &notifyPortRef, ToolkitSleepWakeCallback, &mPowerNotifier);
-  if (gRootPort == MACH_PORT_NULL) {
-    NS_ERROR("IORegisterForSystemPower failed");
-    return NS_ERROR_FAILURE;
-  }
-
-  mSleepWakeNotificationRLS = ::IONotificationPortGetRunLoopSource(notifyPortRef);
-  ::CFRunLoopAddSource(::CFRunLoopGetCurrent(),
-                       mSleepWakeNotificationRLS,
-                       kCFRunLoopDefaultMode);
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
-void
-nsToolkit::RemoveSleepWakeNotifications()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (mSleepWakeNotificationRLS) {
-    ::IODeregisterForSystemPower(&mPowerNotifier);
-    ::CFRunLoopRemoveSource(::CFRunLoopGetCurrent(),
-                            mSleepWakeNotificationRLS,
-                            kCFRunLoopDefaultMode);
-
-    mSleepWakeNotificationRLS = nullptr;
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-// Converts aPoint from the CoreGraphics "global display coordinate" system
-// (which includes all displays/screens and has a top-left origin) to its
-// (presumed) Cocoa counterpart (assumed to be the same as the "screen
-// coordinates" system), which has a bottom-left origin.
-static NSPoint ConvertCGGlobalToCocoaScreen(CGPoint aPoint)
-{
-  NSPoint cocoaPoint;
-  cocoaPoint.x = aPoint.x;
-  cocoaPoint.y = nsCocoaUtils::FlippedScreenY(aPoint.y);
-  return cocoaPoint;
-}
-
-// Since our event tap is "listen only", events arrive here a little after
-// they've already been processed.
-static CGEventRef EventTapCallback(CGEventTapProxy proxy, CGEventType type, CGEventRef event, void *refcon)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  if ((type == kCGEventTapDisabledByUserInput) ||
-      (type == kCGEventTapDisabledByTimeout))
-    return event;
-  if ([NSApp isActive])
-    return event;
-
-  nsIRollupListener* rollupListener = nsBaseWidget::GetActiveRollupListener();
-  NS_ENSURE_TRUE(rollupListener, event);
-  nsCOMPtr<nsIWidget> rollupWidget = rollupListener->GetRollupWidget();
-  if (!rollupWidget)
-    return event;
-
-  // Don't bother with rightMouseDown events here -- because of the delay,
-  // we'll end up closing browser context menus that we just opened.  Since
-  // these events usually raise a context menu, we'll handle them by hooking
-  // the @"com.apple.HIToolbox.beginMenuTrackingNotification" distributed
-  // notification (in nsAppShell.mm's AppShellDelegate).
-  if (type == kCGEventRightMouseDown)
-    return event;
-  NSWindow *ctxMenuWindow = (NSWindow*) rollupWidget->GetNativeData(NS_NATIVE_WINDOW);
-  if (!ctxMenuWindow)
-    return event;
-  NSPoint screenLocation = ConvertCGGlobalToCocoaScreen(CGEventGetLocation(event));
-  // Don't roll up the rollup widget if our mouseDown happens over it (doing
-  // so would break the corresponding context menu).
-  if (NSPointInRect(screenLocation, [ctxMenuWindow frame]))
-    return event;
-  rollupListener->Rollup(0, false, nullptr, nullptr);
-  return event;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NULL);
-}
-
-// Cocoa Firefox's use of custom context menus requires that we explicitly
-// handle mouse events from other processes that the OS handles
-// "automatically" for native context menus -- mouseMoved events so that
-// right-click context menus work properly when our browser doesn't have the
-// focus (bmo bug 368077), and mouseDown events so that our browser can
-// dismiss a context menu when a mouseDown happens in another process (bmo
-// bug 339945).
-void
-nsToolkit::RegisterForAllProcessMouseEvents()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (getenv("MOZ_DEBUG"))
-    return;
-
-  // Don't do this for apps that use native context menus.
-#ifdef MOZ_USE_NATIVE_POPUP_WINDOWS
-  return;
-#endif /* MOZ_USE_NATIVE_POPUP_WINDOWS */
-
-  if (!mEventTapRLS) {
-    // Using an event tap for mouseDown events (instead of installing a
-    // handler for them on the EventMonitor target) works around an Apple
-    // bug that causes OS menus (like the Clock menu) not to work properly
-    // on OS X 10.4.X and below (bmo bug 381448).
-    // We install our event tap "listen only" to get around yet another Apple
-    // bug -- when we install it as an event filter on any kind of mouseDown
-    // event, that kind of event stops working in the main menu, and usually
-    // mouse event processing stops working in all apps in the current login
-    // session (so the entire OS appears to be hung)!  The downside of
-    // installing listen-only is that events arrive at our handler slightly
-    // after they've already been processed.
-    mEventTapPort = CGEventTapCreate(kCGSessionEventTap,
-                                     kCGHeadInsertEventTap,
-                                     kCGEventTapOptionListenOnly,
-                                     CGEventMaskBit(kCGEventLeftMouseDown)
-                                       | CGEventMaskBit(kCGEventRightMouseDown)
-                                       | CGEventMaskBit(kCGEventOtherMouseDown),
-                                     EventTapCallback,
-                                     nullptr);
-    if (!mEventTapPort)
-      return;
-    mEventTapRLS = CFMachPortCreateRunLoopSource(nullptr, mEventTapPort, 0);
-    if (!mEventTapRLS) {
-      CFRelease(mEventTapPort);
-      mEventTapPort = nullptr;
-      return;
-    }
-    CFRunLoopAddSource(CFRunLoopGetCurrent(), mEventTapRLS, kCFRunLoopDefaultMode);
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-void
-nsToolkit::UnregisterAllProcessMouseEventHandlers()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (mEventTapRLS) {
-    CFRunLoopRemoveSource(CFRunLoopGetCurrent(), mEventTapRLS,
-                          kCFRunLoopDefaultMode);
-    CFRelease(mEventTapRLS);
-    mEventTapRLS = nullptr;
-  }
-  if (mEventTapPort) {
-    // mEventTapPort must be invalidated as well as released.  Otherwise the
-    // event tap doesn't get destroyed until the browser process ends (it
-    // keeps showing up in the list returned by CGGetEventTapList()).
-    CFMachPortInvalidate(mEventTapPort);
-    CFRelease(mEventTapPort);
-    mEventTapPort = nullptr;
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-// Return the nsToolkit instance.  If a toolkit does not yet exist, then one
-// will be created.
-// static
-nsToolkit* nsToolkit::GetToolkit()
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  if (!gToolkit) {
-    gToolkit = new nsToolkit();
-  }
-
-  return gToolkit;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(nullptr);
-}
-
-// An alternative to [NSObject poseAsClass:] that isn't deprecated on OS X
-// Leopard and is available to 64-bit binaries on Leopard and above.  Based on
-// ideas and code from http://www.cocoadev.com/index.pl?MethodSwizzling.
-// Since the Method type becomes an opaque type as of Objective-C 2.0, we'll
-// have to switch to using accessor methods like method_exchangeImplementations()
-// when we build 64-bit binaries that use Objective-C 2.0 (on and for Leopard
-// and above).
-//
-// Be aware that, if aClass doesn't have an orgMethod selector but one of its
-// superclasses does, the method substitution will (in effect) take place in
-// that superclass (rather than in aClass itself).  The substitution has
-// effect on the class where it takes place and all of that class's
-// subclasses.  In order for method swizzling to work properly, posedMethod
-// needs to be unique in the class where the substitution takes place and all
-// of its subclasses.
-nsresult nsToolkit::SwizzleMethods(Class aClass, SEL orgMethod, SEL posedMethod,
-                                   bool classMethods)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  Method original = nil;
-  Method posed = nil;
-
-  if (classMethods) {
-    original = class_getClassMethod(aClass, orgMethod);
-    posed = class_getClassMethod(aClass, posedMethod);
-  } else {
-    original = class_getInstanceMethod(aClass, orgMethod);
-    posed = class_getInstanceMethod(aClass, posedMethod);
-  }
-
-  if (!original || !posed)
-    return NS_ERROR_FAILURE;
-
-  method_exchangeImplementations(original, posed);
-
-  return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
diff --git a/widget/cocoa/nsWidgetFactory.mm b/widget/cocoa/nsWidgetFactory.mm
deleted file mode 100644
index 3bddaf95ce..0000000000
--- a/widget/cocoa/nsWidgetFactory.mm
+++ /dev/null
@@ -1,219 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "nsIFactory.h"
-#include "nsISupports.h"
-#include "nsIComponentManager.h"
-#include "mozilla/ModuleUtils.h"
-#include "mozilla/WidgetUtils.h"
-
-#include "nsWidgetsCID.h"
-
-#include "nsChildView.h"
-#include "nsCocoaWindow.h"
-#include "nsAppShell.h"
-#include "nsAppShellSingleton.h"
-#include "nsFilePicker.h"
-#include "nsColorPicker.h"
-
-#include "nsClipboard.h"
-#include "nsClipboardHelper.h"
-#include "nsTransferable.h"
-#include "nsHTMLFormatConverter.h"
-#include "nsDragService.h"
-#include "nsToolkit.h"
-
-#include "nsLookAndFeel.h"
-
-#include "nsSound.h"
-#include "nsIdleServiceX.h"
-#include "NativeKeyBindings.h"
-#include "OSXNotificationCenter.h"
-
-#include "nsScreenManagerCocoa.h"
-#include "nsDeviceContextSpecX.h"
-#include "nsPrintOptionsX.h"
-#include "nsPrintDialogX.h"
-#include "nsPrintSession.h"
-#include "nsToolkitCompsCID.h"
-
-using namespace mozilla;
-using namespace mozilla::widget;
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsCocoaWindow)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsChildView)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsFilePicker)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsColorPicker)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsSound)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsTransferable)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLFormatConverter)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboard)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboardHelper)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsDragService)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsScreenManagerCocoa)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextSpecX)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintOptionsX, Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintDialogServiceX, Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintSession, Init)
-NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsIdleServiceX, nsIdleServiceX::GetInstance)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(OSXNotificationCenter, Init)
-
-#include "nsMenuBarX.h"
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsNativeMenuServiceX)
-
-#include "nsBidiKeyboard.h"
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsBidiKeyboard)
-
-#include "nsNativeThemeCocoa.h"
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsNativeThemeCocoa)
-
-#include "nsMacDockSupport.h"
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacDockSupport)
-
-#include "nsMacWebAppUtils.h"
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacWebAppUtils)
-
-#include "nsStandaloneNativeMenu.h"
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsStandaloneNativeMenu)
-
-#include "nsSystemStatusBarCocoa.h"
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsSystemStatusBarCocoa)
-
-#include "GfxInfo.h"
-namespace mozilla {
-namespace widget {
-// This constructor should really be shared with all platforms.
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(GfxInfo, Init)
-} // namespace widget
-} // namespace mozilla
-
-NS_DEFINE_NAMED_CID(NS_WINDOW_CID);
-NS_DEFINE_NAMED_CID(NS_POPUP_CID);
-NS_DEFINE_NAMED_CID(NS_CHILD_CID);
-NS_DEFINE_NAMED_CID(NS_FILEPICKER_CID);
-NS_DEFINE_NAMED_CID(NS_COLORPICKER_CID);
-NS_DEFINE_NAMED_CID(NS_APPSHELL_CID);
-NS_DEFINE_NAMED_CID(NS_SOUND_CID);
-NS_DEFINE_NAMED_CID(NS_TRANSFERABLE_CID);
-NS_DEFINE_NAMED_CID(NS_HTMLFORMATCONVERTER_CID);
-NS_DEFINE_NAMED_CID(NS_CLIPBOARD_CID);
-NS_DEFINE_NAMED_CID(NS_CLIPBOARDHELPER_CID);
-NS_DEFINE_NAMED_CID(NS_DRAGSERVICE_CID);
-NS_DEFINE_NAMED_CID(NS_BIDIKEYBOARD_CID);
-NS_DEFINE_NAMED_CID(NS_THEMERENDERER_CID);
-NS_DEFINE_NAMED_CID(NS_SCREENMANAGER_CID);
-NS_DEFINE_NAMED_CID(NS_DEVICE_CONTEXT_SPEC_CID);
-NS_DEFINE_NAMED_CID(NS_PRINTSESSION_CID);
-NS_DEFINE_NAMED_CID(NS_PRINTSETTINGSSERVICE_CID);
-NS_DEFINE_NAMED_CID(NS_PRINTDIALOGSERVICE_CID);
-NS_DEFINE_NAMED_CID(NS_IDLE_SERVICE_CID);
-NS_DEFINE_NAMED_CID(NS_SYSTEMALERTSSERVICE_CID);
-NS_DEFINE_NAMED_CID(NS_NATIVEMENUSERVICE_CID);
-NS_DEFINE_NAMED_CID(NS_MACDOCKSUPPORT_CID);
-NS_DEFINE_NAMED_CID(NS_MACWEBAPPUTILS_CID);
-NS_DEFINE_NAMED_CID(NS_STANDALONENATIVEMENU_CID);
-NS_DEFINE_NAMED_CID(NS_MACSYSTEMSTATUSBAR_CID);
-NS_DEFINE_NAMED_CID(NS_GFXINFO_CID);
-
-static const mozilla::Module::CIDEntry kWidgetCIDs[] = {
-  { &kNS_WINDOW_CID, false, NULL, nsCocoaWindowConstructor },
-  { &kNS_POPUP_CID, false, NULL, nsCocoaWindowConstructor },
-  { &kNS_CHILD_CID, false, NULL, nsChildViewConstructor },
-  { &kNS_FILEPICKER_CID, false, NULL, nsFilePickerConstructor,
-    mozilla::Module::MAIN_PROCESS_ONLY },
-  { &kNS_COLORPICKER_CID, false, NULL, nsColorPickerConstructor,
-    mozilla::Module::MAIN_PROCESS_ONLY },
-  { &kNS_APPSHELL_CID, false, NULL, nsAppShellConstructor, mozilla::Module::ALLOW_IN_GPU_PROCESS },
-  { &kNS_SOUND_CID, false, NULL, nsSoundConstructor,
-    mozilla::Module::MAIN_PROCESS_ONLY },
-  { &kNS_TRANSFERABLE_CID, false, NULL, nsTransferableConstructor },
-  { &kNS_HTMLFORMATCONVERTER_CID, false, NULL, nsHTMLFormatConverterConstructor },
-  { &kNS_CLIPBOARD_CID, false, NULL, nsClipboardConstructor,
-    mozilla::Module::MAIN_PROCESS_ONLY },
-  { &kNS_CLIPBOARDHELPER_CID, false, NULL, nsClipboardHelperConstructor },
-  { &kNS_DRAGSERVICE_CID, false, NULL, nsDragServiceConstructor,
-    mozilla::Module::MAIN_PROCESS_ONLY },
-  { &kNS_BIDIKEYBOARD_CID, false, NULL, nsBidiKeyboardConstructor,
-    mozilla::Module::MAIN_PROCESS_ONLY },
-  { &kNS_THEMERENDERER_CID, false, NULL, nsNativeThemeCocoaConstructor },
-  { &kNS_SCREENMANAGER_CID, false, NULL, nsScreenManagerCocoaConstructor,
-    mozilla::Module::MAIN_PROCESS_ONLY },
-  { &kNS_DEVICE_CONTEXT_SPEC_CID, false, NULL, nsDeviceContextSpecXConstructor },
-  { &kNS_PRINTSESSION_CID, false, NULL, nsPrintSessionConstructor },
-  { &kNS_PRINTSETTINGSSERVICE_CID, false, NULL, nsPrintOptionsXConstructor },
-  { &kNS_PRINTDIALOGSERVICE_CID, false, NULL, nsPrintDialogServiceXConstructor },
-  { &kNS_IDLE_SERVICE_CID, false, NULL, nsIdleServiceXConstructor },
-  { &kNS_SYSTEMALERTSSERVICE_CID, false, NULL, OSXNotificationCenterConstructor },
-  { &kNS_NATIVEMENUSERVICE_CID, false, NULL, nsNativeMenuServiceXConstructor },
-  { &kNS_MACDOCKSUPPORT_CID, false, NULL, nsMacDockSupportConstructor },
-  { &kNS_MACWEBAPPUTILS_CID, false, NULL, nsMacWebAppUtilsConstructor },
-  { &kNS_STANDALONENATIVEMENU_CID, false, NULL, nsStandaloneNativeMenuConstructor },
-  { &kNS_MACSYSTEMSTATUSBAR_CID, false, NULL, nsSystemStatusBarCocoaConstructor },
-  { &kNS_GFXINFO_CID, false, NULL, mozilla::widget::GfxInfoConstructor },
-  { NULL }
-};
-
-static const mozilla::Module::ContractIDEntry kWidgetContracts[] = {
-  { "@mozilla.org/widgets/window/mac;1", &kNS_WINDOW_CID },
-  { "@mozilla.org/widgets/popup/mac;1", &kNS_POPUP_CID },
-  { "@mozilla.org/widgets/childwindow/mac;1", &kNS_CHILD_CID },
-  { "@mozilla.org/filepicker;1", &kNS_FILEPICKER_CID,
-    mozilla::Module::MAIN_PROCESS_ONLY },
-  { "@mozilla.org/colorpicker;1", &kNS_COLORPICKER_CID,
-    mozilla::Module::MAIN_PROCESS_ONLY },
-  { "@mozilla.org/widget/appshell/mac;1", &kNS_APPSHELL_CID, mozilla::Module::ALLOW_IN_GPU_PROCESS },
-  { "@mozilla.org/sound;1", &kNS_SOUND_CID,
-    mozilla::Module::MAIN_PROCESS_ONLY },
-  { "@mozilla.org/widget/transferable;1", &kNS_TRANSFERABLE_CID },
-  { "@mozilla.org/widget/htmlformatconverter;1", &kNS_HTMLFORMATCONVERTER_CID },
-  { "@mozilla.org/widget/clipboard;1", &kNS_CLIPBOARD_CID,
-    mozilla::Module::MAIN_PROCESS_ONLY },
-  { "@mozilla.org/widget/clipboardhelper;1", &kNS_CLIPBOARDHELPER_CID },
-  { "@mozilla.org/widget/dragservice;1", &kNS_DRAGSERVICE_CID,
-    mozilla::Module::MAIN_PROCESS_ONLY },
-  { "@mozilla.org/widget/bidikeyboard;1", &kNS_BIDIKEYBOARD_CID,
-    mozilla::Module::MAIN_PROCESS_ONLY },
-  { "@mozilla.org/chrome/chrome-native-theme;1", &kNS_THEMERENDERER_CID },
-  { "@mozilla.org/gfx/screenmanager;1", &kNS_SCREENMANAGER_CID,
-    mozilla::Module::MAIN_PROCESS_ONLY },
-  { "@mozilla.org/gfx/devicecontextspec;1", &kNS_DEVICE_CONTEXT_SPEC_CID },
-  { "@mozilla.org/gfx/printsession;1", &kNS_PRINTSESSION_CID },
-  { "@mozilla.org/gfx/printsettings-service;1", &kNS_PRINTSETTINGSSERVICE_CID },
-  { NS_PRINTDIALOGSERVICE_CONTRACTID, &kNS_PRINTDIALOGSERVICE_CID },
-  { "@mozilla.org/widget/idleservice;1", &kNS_IDLE_SERVICE_CID },
-  { "@mozilla.org/system-alerts-service;1", &kNS_SYSTEMALERTSSERVICE_CID },
-  { "@mozilla.org/widget/nativemenuservice;1", &kNS_NATIVEMENUSERVICE_CID },
-  { "@mozilla.org/widget/macdocksupport;1", &kNS_MACDOCKSUPPORT_CID },
-  { "@mozilla.org/widget/mac-web-app-utils;1", &kNS_MACWEBAPPUTILS_CID },
-  { "@mozilla.org/widget/standalonenativemenu;1", &kNS_STANDALONENATIVEMENU_CID },
-  { "@mozilla.org/widget/macsystemstatusbar;1", &kNS_MACSYSTEMSTATUSBAR_CID },
-  { "@mozilla.org/gfx/info;1", &kNS_GFXINFO_CID },
-  { NULL }
-};
-
-static void
-nsWidgetCocoaModuleDtor()
-{
-  // Shutdown all XP level widget classes.
-  WidgetUtils::Shutdown();
-
-  NativeKeyBindings::Shutdown();
-  nsLookAndFeel::Shutdown();
-  nsToolkit::Shutdown();
-  nsAppShellShutdown();
-}
-
-static const mozilla::Module kWidgetModule = {
-  mozilla::Module::kVersion,
-  kWidgetCIDs,
-  kWidgetContracts,
-  NULL,
-  NULL,
-  nsAppShellInit,
-  nsWidgetCocoaModuleDtor,
-  mozilla::Module::ALLOW_IN_GPU_PROCESS
-};
-
-NSMODULE_DEFN(nsWidgetMacModule) = &kWidgetModule;
diff --git a/widget/cocoa/nsWindowMap.h b/widget/cocoa/nsWindowMap.h
deleted file mode 100644
index c6ad72c010..0000000000
--- a/widget/cocoa/nsWindowMap.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsWindowMap_h_
-#define nsWindowMap_h_
-
-#import <Cocoa/Cocoa.h>
-
-//  WindowDataMap
-// 
-//  In both mozilla and embedding apps, we need to have a place to put
-//  per-top-level-window logic and data, to handle such things as IME
-//  commit when the window gains/loses focus. We can't use a window 
-//  delegate, because an embeddor probably already has one. Nor can we
-//  subclass NSWindow, again because we can't impose that burden on the
-//  embeddor.
-// 
-//  So we have a global map of NSWindow -> TopLevelWindowData, and set
-//  up TopLevelWindowData as a notification observer etc.
-
-@interface WindowDataMap : NSObject
-{
-@private
-  NSMutableDictionary*    mWindowMap;   // dict of TopLevelWindowData keyed by address of NSWindow
-}
-
-+ (WindowDataMap*)sharedWindowDataMap;
-
-- (void)ensureDataForWindow:(NSWindow*)inWindow;
-- (id)dataForWindow:(NSWindow*)inWindow;
-
-// set data for a given window. inData is retained (and any previously set data
-// is released).
-- (void)setData:(id)inData forWindow:(NSWindow*)inWindow;
-
-// remove the data for the given window. the data is released.
-- (void)removeDataForWindow:(NSWindow*)inWindow;
-
-@end
-
-@class ChildView;
-
-//  TopLevelWindowData
-// 
-//  Class to hold per-window data, and handle window state changes.
-
-@interface TopLevelWindowData : NSObject
-{
-@private
-}
-
-- (id)initWithWindow:(NSWindow*)inWindow;
-+ (void)activateInWindow:(NSWindow*)aWindow;
-+ (void)deactivateInWindow:(NSWindow*)aWindow;
-+ (void)activateInWindowViews:(NSWindow*)aWindow;
-+ (void)deactivateInWindowViews:(NSWindow*)aWindow;
-
-@end
-
-#endif // nsWindowMap_h_
diff --git a/widget/cocoa/nsWindowMap.mm b/widget/cocoa/nsWindowMap.mm
deleted file mode 100644
index c43b024086..0000000000
--- a/widget/cocoa/nsWindowMap.mm
+++ /dev/null
@@ -1,311 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "nsWindowMap.h"
-#include "nsObjCExceptions.h"
-#include "nsChildView.h"
-#include "nsCocoaWindow.h"
-
-@interface WindowDataMap(Private)
-
-- (NSString*)keyForWindow:(NSWindow*)inWindow;
-
-@end
-
-@interface TopLevelWindowData(Private)
-
-- (void)windowResignedKey:(NSNotification*)inNotification;
-- (void)windowBecameKey:(NSNotification*)inNotification;
-- (void)windowWillClose:(NSNotification*)inNotification;
-
-@end
-
-#pragma mark -
-
-@implementation WindowDataMap
-
-+ (WindowDataMap*)sharedWindowDataMap
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  static WindowDataMap* sWindowMap = nil;
-  if (!sWindowMap)
-    sWindowMap = [[WindowDataMap alloc] init];
-
-  return sWindowMap;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-- (id)init
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  if ((self = [super init])) {
-    mWindowMap = [[NSMutableDictionary alloc] initWithCapacity:10];
-  }
-  return self;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-- (void)dealloc
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  [mWindowMap release];
-  [super dealloc];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (void)ensureDataForWindow:(NSWindow*)inWindow
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  if (!inWindow || [self dataForWindow:inWindow])
-    return;
-
-  TopLevelWindowData* windowData = [[TopLevelWindowData alloc] initWithWindow:inWindow];
-  [self setData:windowData forWindow:inWindow]; // takes ownership
-  [windowData release];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (id)dataForWindow:(NSWindow*)inWindow
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  return [mWindowMap objectForKey:[self keyForWindow:inWindow]];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-- (void)setData:(id)inData forWindow:(NSWindow*)inWindow
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  [mWindowMap setObject:inData forKey:[self keyForWindow:inWindow]];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (void)removeDataForWindow:(NSWindow*)inWindow
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  [mWindowMap removeObjectForKey:[self keyForWindow:inWindow]];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-- (NSString*)keyForWindow:(NSWindow*)inWindow
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  return [NSString stringWithFormat:@"%p", inWindow];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-@end
-
-//  TopLevelWindowData
-// 
-//  This class holds data about top-level windows. We can't use a window
-//  delegate, because an embedder may already have one.
-
-@implementation TopLevelWindowData
-
-- (id)initWithWindow:(NSWindow*)inWindow
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-  if ((self = [super init])) {
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(windowBecameKey:)
-                                                 name:NSWindowDidBecomeKeyNotification
-                                               object:inWindow];
-
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(windowResignedKey:)
-                                                 name:NSWindowDidResignKeyNotification
-                                               object:inWindow];
-
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(windowBecameMain:)
-                                                 name:NSWindowDidBecomeMainNotification
-                                               object:inWindow];
-
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(windowResignedMain:)
-                                                 name:NSWindowDidResignMainNotification
-                                               object:inWindow];
-
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(windowWillClose:)
-                                                 name:NSWindowWillCloseNotification
-                                               object:inWindow];
-  }
-  return self;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
-}
-
-- (void)dealloc
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
-  [super dealloc];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-// As best I can tell, if the notification's object has a corresponding
-// top-level widget (an nsCocoaWindow object), it has a delegate (set in
-// nsCocoaWindow::StandardCreate()) of class WindowDelegate, and otherwise
-// not (Camino didn't use top-level widgets (nsCocoaWindow objects) --
-// only child widgets (nsChildView objects)).  (The notification is sent
-// to windowBecameKey: or windowBecameMain: below.)
-//
-// For use with clients that (like Firefox) do use top-level widgets (and
-// have NSWindow delegates of class WindowDelegate).
-+ (void)activateInWindow:(NSWindow*)aWindow
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  WindowDelegate* delegate = (WindowDelegate*) [aWindow delegate];
-  if (!delegate || ![delegate isKindOfClass:[WindowDelegate class]])
-    return;
-
-  if ([delegate toplevelActiveState])
-    return;
-  [delegate sendToplevelActivateEvents];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-// See comments above activateInWindow:
-//
-// If we're using top-level widgets (nsCocoaWindow objects), we send them
-// NS_DEACTIVATE events (which propagate to child widgets (nsChildView
-// objects) via nsWebShellWindow::HandleEvent()).
-//
-// For use with clients that (like Firefox) do use top-level widgets (and
-// have NSWindow delegates of class WindowDelegate).
-+ (void)deactivateInWindow:(NSWindow*)aWindow
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  WindowDelegate* delegate = (WindowDelegate*) [aWindow delegate];
-  if (!delegate || ![delegate isKindOfClass:[WindowDelegate class]])
-    return;
-
-  if (![delegate toplevelActiveState])
-    return;
-  [delegate sendToplevelDeactivateEvents];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-// For use with clients that (like Camino) don't use top-level widgets (and
-// don't have NSWindow delegates of class WindowDelegate).
-+ (void)activateInWindowViews:(NSWindow*)aWindow
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  id firstResponder = [aWindow firstResponder];
-  if ([firstResponder isKindOfClass:[ChildView class]])
-    [firstResponder viewsWindowDidBecomeKey];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-// For use with clients that (like Camino) don't use top-level widgets (and
-// don't have NSWindow delegates of class WindowDelegate).
-+ (void)deactivateInWindowViews:(NSWindow*)aWindow
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  id firstResponder = [aWindow firstResponder];
-  if ([firstResponder isKindOfClass:[ChildView class]])
-    [firstResponder viewsWindowDidResignKey];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-// We make certain exceptions for top-level windows in non-embedders (see
-// comment above windowBecameMain below).  And we need (elsewhere) to guard
-// against sending duplicate events.  But in general the NS_ACTIVATE event
-// should be sent when a native window becomes key, and the NS_DEACTIVATE
-// event should be sent when it resignes key.
-- (void)windowBecameKey:(NSNotification*)inNotification
-{
-  NSWindow* window = (NSWindow*)[inNotification object];
-
-  id delegate = [window delegate];
-  if (!delegate || ![delegate isKindOfClass:[WindowDelegate class]]) {
-    [TopLevelWindowData activateInWindowViews:window];
-  } else if ([window isSheet]) {
-    [TopLevelWindowData activateInWindow:window];
-  }
-
-  [[window contentView] setNeedsDisplay:YES];
-}
-
-- (void)windowResignedKey:(NSNotification*)inNotification
-{
-  NSWindow* window = (NSWindow*)[inNotification object];
-
-  id delegate = [window delegate];
-  if (!delegate || ![delegate isKindOfClass:[WindowDelegate class]]) {
-    [TopLevelWindowData deactivateInWindowViews:window];
-  } else if ([window isSheet]) {
-    [TopLevelWindowData deactivateInWindow:window];
-  }
-
-  [[window contentView] setNeedsDisplay:YES];
-}
-
-// The appearance of a top-level window depends on its main state (not its key
-// state).  So (for non-embedders) we need to ensure that a top-level window
-// is main when an NS_ACTIVATE event is sent to Gecko for it.
-- (void)windowBecameMain:(NSNotification*)inNotification
-{
-  NSWindow* window = (NSWindow*)[inNotification object];
-
-  id delegate = [window delegate];
-  // Don't send events to a top-level window that has a sheet open above it --
-  // as far as Gecko is concerned, it's inactive, and stays so until the sheet
-  // closes.
-  if (delegate && [delegate isKindOfClass:[WindowDelegate class]] && ![window attachedSheet])
-    [TopLevelWindowData activateInWindow:window];
-}
-
-- (void)windowResignedMain:(NSNotification*)inNotification
-{
-  NSWindow* window = (NSWindow*)[inNotification object];
-
-  id delegate = [window delegate];
-  if (delegate && [delegate isKindOfClass:[WindowDelegate class]] && ![window attachedSheet])
-    [TopLevelWindowData deactivateInWindow:window];
-}
-
-- (void)windowWillClose:(NSNotification*)inNotification
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  // postpone our destruction
-  [[self retain] autorelease];
-
-  // remove ourselves from the window map (which owns us)
-  [[WindowDataMap sharedWindowDataMap] removeDataForWindow:[inNotification object]];
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-@end
diff --git a/widget/cocoa/resources/MainMenu.nib/classes.nib b/widget/cocoa/resources/MainMenu.nib/classes.nib
deleted file mode 100644
index b9b4b09f6b..0000000000
--- a/widget/cocoa/resources/MainMenu.nib/classes.nib
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    IBClasses = ({CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }); 
-    IBVersion = 1; 
-}
\ No newline at end of file
diff --git a/widget/cocoa/resources/MainMenu.nib/info.nib b/widget/cocoa/resources/MainMenu.nib/info.nib
deleted file mode 100644
index bcf3ace841..0000000000
--- a/widget/cocoa/resources/MainMenu.nib/info.nib
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IBDocumentLocation</key>
-	<string>159 127 356 240 0 0 1920 1178 </string>
-	<key>IBEditorPositions</key>
-	<dict>
-		<key>29</key>
-		<string>413 971 130 44 0 0 1920 1178 </string>
-	</dict>
-	<key>IBFramework Version</key>
-	<string>443.0</string>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>29</integer>
-	</array>
-	<key>IBSystem Version</key>
-	<string>8F46</string>
-</dict>
-</plist>
diff --git a/widget/cocoa/resources/MainMenu.nib/keyedobjects.nib b/widget/cocoa/resources/MainMenu.nib/keyedobjects.nib
deleted file mode 100644
index 16b3f7e523ed223596981d8b5ce48d7c05993cf3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1877
zcmZWpYitx{6rJw{<=Jh4<xLA+o~5u9tfd8OTPU=2x20RU+wIai-5p@)?hNeA778jK
zND+w&q7f01+Ez^v0}>Sj#so!zfECM2B&0E52thPzkRXP7XJ#P=_s4#Zx%b?2&b>4B
zE5fp-JDukcCY1H)*}K{yMuW@bMk(rZz@H|oN~J?rSNI%i{c<U&Yjw6nw`YOWB!%+h
zfyn~e)bf2ouf@d$Q>>tnsEZu!w`KO}JMFQVPZk!HxEC&}35J%fefpUV&u!fN;!7{D
zef9MnJKx&9=iR;g4}N^;@X-_BoIG{<yUz2A97-%4?y@EK>z`;#N**w9kbUrwp~Hrc
z7&$5>b@Z4t$JlY>Crq4_J~?B`RHw<M%;HrghGP=28|wDt2ZNHP$@Owr)|(1dMFHMw
z)M8#37Bx-MtZ2X6QznNrP@~njJ#H}~nft|VPdv<c@_$Gp#{vjg01s;0+@2~K3Wp`H
ztc286T9qSc)H47r8epe!GD}%maEdFiiVc2*|9=P;MS<ZeHQE3<MXI8^L`7UGMXLc%
zTCGE1mD^LHsyZLdr||K70w2T2aVMY1d-7?#7f<7T_*CA53$_l9JMEd%XMku^s6mG_
zPCB#fk7oni6ituH%2FtkzXAp%DC)qQ)6SgSS+jkXBuVpI8wGOPW<QZ<_QDm@MNscC
z(|vBw!;K{o0P+i33-W5AZcNkFNc=j>J}0}*W-BfzRD-JcP$pEIXP;jTU5d|@*1{72
zV?k+KsVfh>e^5@+7eOsahw!rU7Tz0TDm-nTN~2IbCO;Y#o4g>%SRt;;-{$pI^S(Th
z59O)n0*mdnbx(=)5K$@XVF{cxOaX&jk`gP{rHID+@f1Fi_xHI(Sut(_MJj*C2ME1?
zl$SSz0}(~Fukc2->R98d)lF*v!w3TxU5XS@6**X{2J37|=Ib+eWlU~#sUerBHGt!u
zSbYRyVOORUN1&@98s@=_GK9*jrI2|KrsfCDcJxhN*WKNnEZ77AB-nT|PvUkyiVvxE
zscYnLSS*jK#v5CH_E~%8I=&vfsE{-@77a>fzX$R`d;sV*VXf`~gTiG}upuHw8^FWn
zO>LW=hsMHKTkU#~4<g1sdS_I5fv@L-4OlbB5N{Iq=%OywYL-NceU9n))@|Z;K8%k5
zTZe<2uNl1y)LBy}nHJ~dz9F~Dc|hjPU9G$Fz!l@#=tm92J?unI?%S2Em3e^C;%{?$
zeH@#eO@)j1{H;!}c{WZT_*?gV$Q^tvPlaJWkR2$J!_s&ywQQ9lMPc5u?7?hv>^||g
zK*&7%XYuujzuo8bRztH5Xc!rI_NBl5t7Bgu=aYCkpUg9Osx8}wY$I(m;n}z59L}?!
ziRYg+*PPr77h5kHV_95a&HfztR0;_~k}zCw2or@&VUAENlnQ<!AiN^%5WW!32)_vT
zQ7<$IrJ+1jit5l3q@xXJ8`_ILMaNJFI*%@*OXxDXg1XR8=qmadT}L<2O>_(WhJHtX
zqTA>Wx{L1P-ncLBj|bq9I2~u;Oq`30a0w1z2`gB`jkp<a!MpJu+>ZC-1Nb05gpc48
zxC5WX=kNu58F%4d@n85J?k0#3!bneIBST0ENhcX(Dw#&6lUXF66q31Q9tn^jSxK77
zR<e_{laI(@@;Nz5j*}DQBsonw$QjZ}&XKF+8o5dSCjXH8RG<lT7)_yRG>ewdh15eA
zQ7>Iio9G6*k#3@!=@z<`Zll}j9@<Xdr~BxBdYB%kr)UQ~OE1z(^fJ9dyXZA~o!+1~
z=`H#Py-n}XyYwCtSU;A?1~NMv&PK3NER8wXIF`<wER)S(SuC67usk-06|woOgq1Qk
oD`yp~l2x%97GSk3$U<xhYhYofFpV_|<_{xl6@G}X@r5=23$CMkV*mgE

diff --git a/widget/moz.build b/widget/moz.build
index c72b2066c3..acb1387341 100644
--- a/widget/moz.build
+++ b/widget/moz.build
@@ -5,9 +5,6 @@
 
 toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
 
-if toolkit in ('cocoa', 'uikit'):
-    DIRS += [toolkit]
-
 if toolkit in ('gtk2', 'gtk3'):
     EXPORTS += ['nsIPrintDialogService.h']
 
@@ -28,19 +25,8 @@ if toolkit == 'windows':
         'nsIWindowsUIUtils.idl',
         'nsIWinTaskbar.idl',
     ]
-elif toolkit == 'cocoa':
-    XPIDL_SOURCES += [
-        'nsIMacDockSupport.idl',
-        'nsIMacWebAppUtils.idl',
-        'nsIStandaloneNativeMenu.idl',
-        'nsISystemStatusBar.idl',
-        'nsITaskbarProgress.idl',
-    ]
-    EXPORTS += [
-        'nsIPrintDialogService.h',
-    ]
 
-if toolkit in ('cocoa', 'gtk2', 'gtk3'):
+if toolkit in ('gtk2', 'gtk3'):
     EXPORTS += ['nsINativeMenuService.h']
 
 # Don't build the DSO under the 'build' directory as windows does.
@@ -216,15 +202,15 @@ if CONFIG['MOZ_X11']:
         'WindowSurfaceX11SHM.cpp',
     ]
 
-if toolkit in ('cocoa', 'windows'):
+if toolkit in ('windows'):
     UNIFIED_SOURCES += [
         'nsBaseClipboard.cpp',
     ]
 
-if toolkit in {'gtk2', 'gtk3', 'cocoa', 'windows', 'uikit'}:
+if toolkit in {'gtk2', 'gtk3', 'windows', 'uikit'}:
     UNIFIED_SOURCES += ['nsBaseFilePicker.cpp']
 
-if toolkit in ('gtk2', 'gtk3', 'windows', 'cocoa'):
+if toolkit in ('gtk2', 'gtk3', 'windows'):
     UNIFIED_SOURCES += ['nsNativeTheme.cpp']
 
 if toolkit == 'gtk3':
diff --git a/widget/nsIMacDockSupport.idl b/widget/nsIMacDockSupport.idl
deleted file mode 100644
index 5783e9c0b9..0000000000
--- a/widget/nsIMacDockSupport.idl
+++ /dev/null
@@ -1,39 +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 "nsISupports.idl"
-
-interface nsIStandaloneNativeMenu;
-
-/**
- * Allow applications to interface with the Mac OS X Dock.
- *
- * Applications may indicate progress on their Dock icon. Only one such
- * progress indicator is available to the entire application.
- */
-
-[scriptable, uuid(8BE66B0C-5F71-4B74-98CF-6C2551B999B1)]
-interface nsIMacDockSupport : nsISupports
-{
-  /**
-   * Menu to use for application-specific dock menu items.
-   */
-  attribute nsIStandaloneNativeMenu dockMenu;
-
-  /**
-   * Activate the application. This should be used by an application to
-   * activate itself when a dock menu is selected as selection of a dock menu
-   * item does not automatically activate the application.
-   *
-   * @param aIgnoreOtherApplications If false, the application is activated
-   *        only if no other application is currently active. If true, the
-   *        application activates regardless. 
-   */
-  void activateApplication(in boolean aIgnoreOtherApplications);
-
-  /**
-   * Text used to badge the dock tile.
-   */
-  attribute AString badgeText;
-};
diff --git a/widget/nsIMacWebAppUtils.idl b/widget/nsIMacWebAppUtils.idl
deleted file mode 100644
index 4d570a8bf0..0000000000
--- a/widget/nsIMacWebAppUtils.idl
+++ /dev/null
@@ -1,35 +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 "nsISupports.idl"
-
-interface nsIMacWebAppUtils;
-
-[scriptable, function, uuid(8c899c4f-58c1-4b74-9034-3bb64e484b68)]
-interface nsITrashAppCallback : nsISupports
-{
-  void trashAppFinished(in nsresult rv);
-};
-
-/**
- * Allow MozApps API to locate and manipulate natively installed apps
- */
-
-[scriptable, uuid(c69cf343-ea41-428b-b161-4655fd54d8e7)]
-interface nsIMacWebAppUtils : nsISupports {
-  /**
-   * Find the path for an app with the given signature.
-   */
-  AString pathForAppWithIdentifier(in AString bundleIdentifier);
-
-  /**
-   * Launch the app with the given identifier, if it exists.
-   */
-  void launchAppWithIdentifier(in AString bundleIdentifier);
-
-  /**
-   * Move the app from the given directory to the Trash.
-   */
-  void trashApp(in AString path, in nsITrashAppCallback callback);
-};
diff --git a/widget/nsISystemStatusBar.idl b/widget/nsISystemStatusBar.idl
deleted file mode 100644
index 9db8015199..0000000000
--- a/widget/nsISystemStatusBar.idl
+++ /dev/null
@@ -1,36 +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 "nsISupports.idl"
-
-interface nsIDOMElement;
-
-/**
- * Allow applications to interface with the Mac OS X system status bar.
- */
-
-[scriptable, uuid(24493180-ee81-4b7c-8b17-9e69480b7b8a)]
-interface nsISystemStatusBar : nsISupports
-{
-  /**
-   * Add an item to the system status bar. Each item can only be present once,
-   * subsequent addItem calls with the same element will be ignored.
-   * The system status bar holds a strong reference to the added XUL menu
-   * element and the item will stay in the status bar until it is removed via
-   * a call to removeItem, or until the process shuts down.
-   * @param aDOMMenuElement A XUL menu element that contains a XUL menupopup
-   *                        with regular menu content. The menu's icon is put
-   *                        into the system status bar; clicking it will open
-   *                        a menu with the contents of the menupopup.
-   *                        The menu label is not shown.
-   */
-  void addItem(in nsIDOMElement aDOMMenuElement);
-
-  /**
-   * Remove a previously-added item from the menu bar. Calling this with an
-   * element that has not been added before will be silently ignored.
-   * @param aDOMMenuElement The XUL menu element that you called addItem with.
-   */
-  void removeItem(in nsIDOMElement aDOMMenuElement);
-};
diff --git a/widget/uikit/GfxInfo.cpp b/widget/uikit/GfxInfo.cpp
deleted file mode 100644
index cabe993dd0..0000000000
--- a/widget/uikit/GfxInfo.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "GfxInfo.h"
-#include "nsServiceManagerUtils.h"
-
-namespace mozilla {
-namespace widget {
-
-
-#ifdef DEBUG
-NS_IMPL_ISUPPORTS_INHERITED(GfxInfo, GfxInfoBase, nsIGfxInfoDebug)
-#endif
-
-GfxInfo::GfxInfo()
-{
-}
-
-GfxInfo::~GfxInfo()
-{
-}
-
-nsresult
-GfxInfo::GetD2DEnabled(bool *aEnabled)
-{
-  return NS_ERROR_FAILURE;
-}
-
-nsresult
-GfxInfo::GetDWriteEnabled(bool *aEnabled)
-{
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-GfxInfo::GetDWriteVersion(nsAString & aDwriteVersion)
-{
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-GfxInfo::GetCleartypeParameters(nsAString & aCleartypeParams)
-{
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-GfxInfo::GetAdapterDescription(nsAString & aAdapterDescription)
-{
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-GfxInfo::GetAdapterDescription2(nsAString & aAdapterDescription)
-{
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-GfxInfo::GetAdapterRAM(nsAString & aAdapterRAM)
-{
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-GfxInfo::GetAdapterRAM2(nsAString & aAdapterRAM)
-{
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-GfxInfo::GetAdapterDriver(nsAString & aAdapterDriver)
-{
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-GfxInfo::GetAdapterDriver2(nsAString & aAdapterDriver)
-{
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-GfxInfo::GetAdapterDriverVersion(nsAString & aAdapterDriverVersion)
-{
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-GfxInfo::GetAdapterDriverVersion2(nsAString & aAdapterDriverVersion)
-{
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-GfxInfo::GetAdapterDriverDate(nsAString & aAdapterDriverDate)
-{
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-GfxInfo::GetAdapterDriverDate2(nsAString & aAdapterDriverDate)
-{
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-GfxInfo::GetAdapterVendorID(nsAString & aAdapterVendorID)
-{
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-GfxInfo::GetAdapterVendorID2(nsAString & aAdapterVendorID)
-{
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-GfxInfo::GetAdapterDeviceID(nsAString & aAdapterDeviceID)
-{
-  return NS_ERROR_FAILURE;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-GfxInfo::GetAdapterDeviceID2(nsAString & aAdapterDeviceID)
-{
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-GfxInfo::GetAdapterSubsysID(nsAString & aAdapterSubsysID)
-{
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-GfxInfo::GetAdapterSubsysID2(nsAString & aAdapterSubsysID)
-{
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-GfxInfo::GetIsGPU2Active(bool* aIsGPU2Active)
-{
-  return NS_ERROR_FAILURE;
-}
-
-const nsTArray<GfxDriverInfo>&
-GfxInfo::GetGfxDriverInfo()
-{
-  if (mDriverInfo->IsEmpty()) {
-    APPEND_TO_DRIVER_BLOCKLIST2(OperatingSystem::Ios,
-      (nsAString&) GfxDriverInfo::GetDeviceVendor(VendorAll), GfxDriverInfo::allDevices,
-      nsIGfxInfo::FEATURE_OPENGL_LAYERS, nsIGfxInfo::FEATURE_STATUS_OK,
-      DRIVER_COMPARISON_IGNORED, GfxDriverInfo::allDriverVersions );
-  }
-
-  return *mDriverInfo;
-}
-
-nsresult
-GfxInfo::GetFeatureStatusImpl(int32_t aFeature,
-                              int32_t *aStatus,
-                              nsAString & aSuggestedDriverVersion,
-                              const nsTArray<GfxDriverInfo>& aDriverInfo,
-                              OperatingSystem* aOS /* = nullptr */)
-{
-  NS_ENSURE_ARG_POINTER(aStatus);
-  aSuggestedDriverVersion.SetIsVoid(true);
-  *aStatus = nsIGfxInfo::FEATURE_STATUS_UNKNOWN;
-  if (aOS)
-    *aOS = OperatingSystem::Ios;
-
-  if (mShutdownOccurred) {
-    return NS_OK;
-  }
-
-  // OpenGL layers are never blacklisted on iOS.
-  // This early return is so we avoid potentially slow
-  // GLStrings initialization on startup when we initialize GL layers.
-  if (aFeature == nsIGfxInfo::FEATURE_OPENGL_LAYERS ||
-      aFeature == nsIGfxInfo::FEATURE_WEBGL_OPENGL ||
-      aFeature == nsIGfxInfo::FEATURE_WEBGL_MSAA) {
-    *aStatus = nsIGfxInfo::FEATURE_STATUS_OK;
-    return NS_OK;
-  }
-
-  return GfxInfoBase::GetFeatureStatusImpl(aFeature, aStatus, aSuggestedDriverVersion, aDriverInfo, aOS);
-}
-
-#ifdef DEBUG
-
-// Implement nsIGfxInfoDebug
-
-NS_IMETHODIMP GfxInfo::SpoofVendorID(const nsAString & aVendorID)
-{
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP GfxInfo::SpoofDeviceID(const nsAString & aDeviceID)
-{
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP GfxInfo::SpoofDriverVersion(const nsAString & aDriverVersion)
-{
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP GfxInfo::SpoofOSVersion(uint32_t aVersion)
-{
-  return NS_ERROR_FAILURE;
-}
-
-#endif
-
-}
-}
diff --git a/widget/uikit/GfxInfo.h b/widget/uikit/GfxInfo.h
deleted file mode 100644
index 16a2242515..0000000000
--- a/widget/uikit/GfxInfo.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* vim: se cin sw=2 ts=2 et : */
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef __mozilla_widget_GfxInfo_h__
-#define __mozilla_widget_GfxInfo_h__
-
-#include "GfxInfoBase.h"
-#include "GfxDriverInfo.h"
-
-#include "nsString.h"
-#include "mozilla/UniquePtr.h"
-
-namespace mozilla {
-
-namespace gl {
-class GLContext;
-}
-
-namespace widget {
-
-class GfxInfo : public GfxInfoBase
-{
-private:
-  ~GfxInfo();
-
-public:
-  GfxInfo();
-
-  // We only declare the subset of nsIGfxInfo that we actually implement. The
-  // rest is brought forward from GfxInfoBase.
-  NS_IMETHOD GetD2DEnabled(bool *aD2DEnabled);
-  NS_IMETHOD GetDWriteEnabled(bool *aDWriteEnabled);
-  NS_IMETHOD GetDWriteVersion(nsAString & aDwriteVersion);
-  NS_IMETHOD GetCleartypeParameters(nsAString & aCleartypeParams);
-  NS_IMETHOD GetAdapterDescription(nsAString & aAdapterDescription);
-  NS_IMETHOD GetAdapterDriver(nsAString & aAdapterDriver);
-  NS_IMETHOD GetAdapterVendorID(nsAString & aAdapterVendorID);
-  NS_IMETHOD GetAdapterDeviceID(nsAString & aAdapterDeviceID);
-  NS_IMETHOD GetAdapterSubsysID(nsAString & aAdapterSubsysID);
-  NS_IMETHOD GetAdapterRAM(nsAString & aAdapterRAM);
-  NS_IMETHOD GetAdapterDriverVersion(nsAString & aAdapterDriverVersion);
-  NS_IMETHOD GetAdapterDriverDate(nsAString & aAdapterDriverDate);
-  NS_IMETHOD GetAdapterDescription2(nsAString & aAdapterDescription);
-  NS_IMETHOD GetAdapterDriver2(nsAString & aAdapterDriver);
-  NS_IMETHOD GetAdapterVendorID2(nsAString & aAdapterVendorID);
-  NS_IMETHOD GetAdapterDeviceID2(nsAString & aAdapterDeviceID);
-  NS_IMETHOD GetAdapterSubsysID2(nsAString & aAdapterSubsysID);
-  NS_IMETHOD GetAdapterRAM2(nsAString & aAdapterRAM);
-  NS_IMETHOD GetAdapterDriverVersion2(nsAString & aAdapterDriverVersion);
-  NS_IMETHOD GetAdapterDriverDate2(nsAString & aAdapterDriverDate);
-  NS_IMETHOD GetIsGPU2Active(bool *aIsGPU2Active);
-  using GfxInfoBase::GetFeatureStatus;
-  using GfxInfoBase::GetFeatureSuggestedDriverVersion;
-  using GfxInfoBase::GetWebGLParameter;
-
-#ifdef DEBUG
-  NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_NSIGFXINFODEBUG
-#endif
-
-protected:
-
-  virtual nsresult GetFeatureStatusImpl(int32_t aFeature,
-                                        int32_t *aStatus,
-                                        nsAString & aSuggestedDriverVersion,
-                                        const nsTArray<GfxDriverInfo>& aDriverInfo,
-                                        OperatingSystem* aOS = nullptr);
-  virtual const nsTArray<GfxDriverInfo>& GetGfxDriverInfo();
-};
-
-} // namespace widget
-} // namespace mozilla
-
-#endif /* __mozilla_widget_GfxInfo_h__ */
diff --git a/widget/uikit/moz.build b/widget/uikit/moz.build
deleted file mode 100644
index 2c6c188de6..0000000000
--- a/widget/uikit/moz.build
+++ /dev/null
@@ -1,18 +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/.
-
-SOURCES += [
-    'GfxInfo.cpp',
-    'nsAppShell.mm',
-    'nsLookAndFeel.mm',
-    'nsScreenManager.mm',
-    'nsWidgetFactory.mm',
-    'nsWindow.mm',
-]
-
-FINAL_LIBRARY = 'xul'
-LOCAL_INCLUDES += [
-    '/widget',
-]
diff --git a/widget/uikit/nsAppShell.h b/widget/uikit/nsAppShell.h
deleted file mode 100644
index a88fa8b4f1..0000000000
--- a/widget/uikit/nsAppShell.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-/*
- * Runs the main native UIKit run loop, interrupting it as needed to process
- * Gecko events.
- */
-
-#ifndef nsAppShell_h_
-#define nsAppShell_h_
-
-#include "nsBaseAppShell.h"
-#include "nsTArray.h"
-
-#include <Foundation/NSAutoreleasePool.h>
-#include <CoreFoundation/CFRunLoop.h>
-#include <UIKit/UIWindow.h>
-
-@class AppShellDelegate;
-
-class nsAppShell : public nsBaseAppShell
-{
-public:
-  NS_IMETHOD ResumeNative(void);
-
-  nsAppShell();
-
-  nsresult Init();
-
-  NS_IMETHOD Run(void);
-  NS_IMETHOD Exit(void);
-  // Called by the application delegate
-  void WillTerminate(void);
-
-  static nsAppShell* gAppShell;
-  static UIWindow* gWindow;
-  static NSMutableArray* gTopLevelViews;
-
-protected:
-  virtual ~nsAppShell();
-
-  static void ProcessGeckoEvents(void* aInfo);
-  virtual void ScheduleNativeEventCallback();
-  virtual bool ProcessNextNativeEvent(bool aMayWait);
-
-  NSAutoreleasePool* mAutoreleasePool;
-  AppShellDelegate*  mDelegate;
-  CFRunLoopRef       mCFRunLoop;
-  CFRunLoopSourceRef mCFRunLoopSource;
-
-  bool               mTerminated;
-  bool               mNotifiedWillTerminate;
-};
-
-#endif // nsAppShell_h_
diff --git a/widget/uikit/nsAppShell.mm b/widget/uikit/nsAppShell.mm
deleted file mode 100644
index ac007132fd..0000000000
--- a/widget/uikit/nsAppShell.mm
+++ /dev/null
@@ -1,271 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#import <UIKit/UIApplication.h>
-#import <UIKit/UIScreen.h>
-#import <UIKit/UIWindow.h>
-#import <UIKit/UIViewController.h>
-
-#include "nsAppShell.h"
-#include "nsCOMPtr.h"
-#include "nsIFile.h"
-#include "nsDirectoryServiceDefs.h"
-#include "nsString.h"
-#include "nsIRollupListener.h"
-#include "nsIWidget.h"
-#include "nsThreadUtils.h"
-#include "nsIWindowMediator.h"
-#include "nsMemoryPressure.h"
-#include "nsServiceManagerUtils.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIWebBrowserChrome.h"
-
-nsAppShell *nsAppShell::gAppShell = NULL;
-UIWindow *nsAppShell::gWindow = nil;
-NSMutableArray *nsAppShell::gTopLevelViews = [[NSMutableArray alloc] init];
-
-#define ALOG(args...) fprintf(stderr, args); fprintf(stderr, "\n")
-
-// ViewController
-@interface ViewController : UIViewController
-@end
-
-
-@implementation ViewController
-
-- (void)loadView {
-    ALOG("[ViewController loadView]");
-    CGRect r = {{0, 0}, {100, 100}};
-    self.view = [[UIView alloc] initWithFrame:r];
-    [self.view setBackgroundColor:[UIColor lightGrayColor]];
-    // add all of the top level views as children
-    for (UIView* v in nsAppShell::gTopLevelViews) {
-        ALOG("[ViewController.view addSubView:%p]", v);
-        [self.view addSubview:v];
-    }
-    [nsAppShell::gTopLevelViews release];
-    nsAppShell::gTopLevelViews = nil;
-}
-@end
-
-// AppShellDelegate
-//
-// Acts as a delegate for the UIApplication
-
-@interface AppShellDelegate : NSObject <UIApplicationDelegate> {
-}
-@property (strong, nonatomic) UIWindow *window;
-@end
-
-@implementation AppShellDelegate
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
-  ALOG("[AppShellDelegate application:didFinishLaunchingWithOptions:]");
-  // We only create one window, since we can only display one window at
-  // a time anyway. Also, iOS 4 fails to display UIWindows if you
-  // create them before calling UIApplicationMain, so this makes more sense.
-  nsAppShell::gWindow = [[[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] retain];
-  self.window = nsAppShell::gWindow;
-
-  self.window.rootViewController = [[ViewController alloc] init];
-
-  // just to make things more visible for now
-  nsAppShell::gWindow.backgroundColor = [UIColor blueColor];
-  [nsAppShell::gWindow makeKeyAndVisible];
-
-  return YES;
-}
-
-- (void)applicationWillTerminate:(UIApplication *)application
-{
-  ALOG("[AppShellDelegate applicationWillTerminate:]");
-  nsAppShell::gAppShell->WillTerminate();
-}
-
-- (void)applicationDidBecomeActive:(UIApplication *)application
-{
-  ALOG("[AppShellDelegate applicationDidBecomeActive:]");
-}
-
-- (void)applicationWillResignActive:(UIApplication *)application
-{
-  ALOG("[AppShellDelegate applicationWillResignActive:]");
-}
-
-- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application
-{
-  ALOG("[AppShellDelegate applicationDidReceiveMemoryWarning:]");
-  NS_DispatchMemoryPressure(MemPressure_New);
-}
-@end
-
-// nsAppShell implementation
-
-NS_IMETHODIMP
-nsAppShell::ResumeNative(void)
-{
-  return nsBaseAppShell::ResumeNative();
-}
-
-nsAppShell::nsAppShell()
-  : mAutoreleasePool(NULL),
-    mDelegate(NULL),
-    mCFRunLoop(NULL),
-    mCFRunLoopSource(NULL),
-    mTerminated(false),
-    mNotifiedWillTerminate(false)
-{
-  gAppShell = this;
-}
-
-nsAppShell::~nsAppShell()
-{
-  if (mAutoreleasePool) {
-    [mAutoreleasePool release];
-    mAutoreleasePool = NULL;
-  }
-
-  if (mCFRunLoop) {
-    if (mCFRunLoopSource) {
-      ::CFRunLoopRemoveSource(mCFRunLoop, mCFRunLoopSource,
-                              kCFRunLoopCommonModes);
-      ::CFRelease(mCFRunLoopSource);
-    }
-    ::CFRelease(mCFRunLoop);
-  }
-
-  gAppShell = NULL;
-}
-
-// Init
-//
-// public
-nsresult
-nsAppShell::Init()
-{
-  mAutoreleasePool = [[NSAutoreleasePool alloc] init];
-
-  // Add a CFRunLoopSource to the main native run loop.  The source is
-  // responsible for interrupting the run loop when Gecko events are ready.
-
-  mCFRunLoop = [[NSRunLoop currentRunLoop] getCFRunLoop];
-  NS_ENSURE_STATE(mCFRunLoop);
-  ::CFRetain(mCFRunLoop);
-
-  CFRunLoopSourceContext context;
-  bzero(&context, sizeof(context));
-  // context.version = 0;
-  context.info = this;
-  context.perform = ProcessGeckoEvents;
-
-  mCFRunLoopSource = ::CFRunLoopSourceCreate(kCFAllocatorDefault, 0, &context);
-  NS_ENSURE_STATE(mCFRunLoopSource);
-
-  ::CFRunLoopAddSource(mCFRunLoop, mCFRunLoopSource, kCFRunLoopCommonModes);
-
-  return nsBaseAppShell::Init();
-}
-
-// ProcessGeckoEvents
-//
-// The "perform" target of mCFRunLoop, called when mCFRunLoopSource is
-// signalled from ScheduleNativeEventCallback.
-//
-// protected static
-void
-nsAppShell::ProcessGeckoEvents(void* aInfo)
-{
-  nsAppShell* self = static_cast<nsAppShell*> (aInfo);
-  self->NativeEventCallback();
-  self->Release();
-}
-
-// WillTerminate
-//
-// public
-void
-nsAppShell::WillTerminate()
-{
-  mNotifiedWillTerminate = true;
-  if (mTerminated)
-    return;
-  mTerminated = true;
-  // We won't get another chance to process events
-  NS_ProcessPendingEvents(NS_GetCurrentThread());
-
-  // Unless we call nsBaseAppShell::Exit() here, it might not get called
-  // at all.
-  nsBaseAppShell::Exit();
-}
-
-// ScheduleNativeEventCallback
-//
-// protected virtual
-void
-nsAppShell::ScheduleNativeEventCallback()
-{
-  if (mTerminated)
-    return;
-
-  NS_ADDREF_THIS();
-
-  // This will invoke ProcessGeckoEvents on the main thread.
-  ::CFRunLoopSourceSignal(mCFRunLoopSource);
-  ::CFRunLoopWakeUp(mCFRunLoop);
-}
-
-// ProcessNextNativeEvent
-//
-// protected virtual
-bool
-nsAppShell::ProcessNextNativeEvent(bool aMayWait)
-{
-  if (mTerminated)
-    return false;
-
-  NSString* currentMode = nil;
-  NSDate* waitUntil = nil;
-  if (aMayWait)
-    waitUntil = [NSDate distantFuture];
-  NSRunLoop* currentRunLoop = [NSRunLoop currentRunLoop];
-
-  BOOL eventProcessed = NO;
-  do {
-    currentMode = [currentRunLoop currentMode];
-    if (!currentMode)
-      currentMode = NSDefaultRunLoopMode;
-
-    if (aMayWait)
-      eventProcessed = [currentRunLoop runMode:currentMode beforeDate:waitUntil];
-    else
-      [currentRunLoop acceptInputForMode:currentMode beforeDate:waitUntil];
-  } while(eventProcessed && aMayWait);
-
-  return false;
-}
-
-// Run
-//
-// public
-NS_IMETHODIMP
-nsAppShell::Run(void)
-{
-  ALOG("nsAppShell::Run");
-  char argv[1][4] = {"app"};
-  UIApplicationMain(1, (char**)argv, nil, @"AppShellDelegate");
-  // UIApplicationMain doesn't exit. :-(
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsAppShell::Exit(void)
-{
-  if (mTerminated)
-    return NS_OK;
-
-  mTerminated = true;
-  return nsBaseAppShell::Exit();
-}
diff --git a/widget/uikit/nsLookAndFeel.h b/widget/uikit/nsLookAndFeel.h
deleted file mode 100644
index 91c0c2d73e..0000000000
--- a/widget/uikit/nsLookAndFeel.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef __nsLookAndFeel
-#define __nsLookAndFeel
-
-#include "nsXPLookAndFeel.h"
-
-class nsLookAndFeel: public nsXPLookAndFeel
-{
-public:
-    nsLookAndFeel();
-    virtual ~nsLookAndFeel();
-
-    virtual nsresult NativeGetColor(const ColorID aID, nscolor &aResult);
-    virtual nsresult GetIntImpl(IntID aID, int32_t &aResult);
-    virtual nsresult GetFloatImpl(FloatID aID, float &aResult);
-    virtual bool GetFontImpl(FontID aID, nsString& aFontName,
-                             gfxFontStyle& aFontStyle,
-                             float aDevPixPerCSSPixel);
-    virtual char16_t GetPasswordCharacterImpl()
-    {
-        // unicode value for the bullet character, used for password textfields.
-        return 0x2022;
-    }
-
-    static bool UseOverlayScrollbars()
-    {
-        return true;
-    }
-};
-
-#endif
diff --git a/widget/uikit/nsLookAndFeel.mm b/widget/uikit/nsLookAndFeel.mm
deleted file mode 100644
index bb593eb51e..0000000000
--- a/widget/uikit/nsLookAndFeel.mm
+++ /dev/null
@@ -1,401 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#import <UIKit/UIColor.h>
-#import <UIKit/UIInterface.h>
-
-#include "nsLookAndFeel.h"
-#include "nsStyleConsts.h"
-#include "gfxFont.h"
-#include "gfxFontConstants.h"
-
-nsLookAndFeel::nsLookAndFeel()
-    : nsXPLookAndFeel()
-{
-}
-
-nsLookAndFeel::~nsLookAndFeel()
-{
-}
-
-static nscolor GetColorFromUIColor(UIColor* aColor)
-{
-    CGColorRef cgColor = [aColor CGColor];
-    CGColorSpaceModel model = CGColorSpaceGetModel(CGColorGetColorSpace(cgColor));
-    const CGFloat* components = CGColorGetComponents(cgColor);
-    if (model == kCGColorSpaceModelRGB) {
-        return NS_RGB((unsigned int)(components[0] * 255.0),
-                      (unsigned int)(components[1] * 255.0),
-                      (unsigned int)(components[2] * 255.0));
-    }
-    else if (model == kCGColorSpaceModelMonochrome) {
-        unsigned int val = (unsigned int)(components[0] * 255.0);
-        return NS_RGBA(val, val, val,
-                       (unsigned int)(components[1] * 255.0));
-    }
-    NS_NOTREACHED("Unhandled color space!");
-    return 0;
-}
-
-nsresult
-nsLookAndFeel::NativeGetColor(const ColorID aID, nscolor &aResult)
-{
-  nsresult res = NS_OK;
-
-  switch (aID) {
-    case eColorID_WindowBackground:
-      aResult = NS_RGB(0xff,0xff,0xff);
-      break;
-    case eColorID_WindowForeground:
-      aResult = NS_RGB(0x00,0x00,0x00);
-      break;
-    case eColorID_WidgetBackground:
-      aResult = NS_RGB(0xdd,0xdd,0xdd);
-      break;
-    case eColorID_WidgetForeground:
-      aResult = NS_RGB(0x00,0x00,0x00);
-      break;
-    case eColorID_WidgetSelectBackground:
-      aResult = NS_RGB(0x80,0x80,0x80);
-      break;
-    case eColorID_WidgetSelectForeground:
-      aResult = NS_RGB(0x00,0x00,0x80);
-      break;
-    case eColorID_Widget3DHighlight:
-      aResult = NS_RGB(0xa0,0xa0,0xa0);
-      break;
-    case eColorID_Widget3DShadow:
-      aResult = NS_RGB(0x40,0x40,0x40);
-      break;
-    case eColorID_TextBackground:
-      aResult = NS_RGB(0xff,0xff,0xff);
-      break;
-    case eColorID_TextForeground:
-      aResult = NS_RGB(0x00,0x00,0x00);
-      break;
-    case eColorID_TextSelectBackground:
-    case eColorID_highlight: // CSS2 color
-      aResult = NS_RGB(0xaa,0xaa,0xaa);
-      break;
-    case eColorID__moz_menuhover:
-      aResult = NS_RGB(0xee,0xee,0xee);
-      break;
-    case eColorID_TextSelectForeground:
-    case eColorID_highlighttext:  // CSS2 color
-    case eColorID__moz_menuhovertext:
-      GetColor(eColorID_TextSelectBackground, aResult);
-      if (aResult == 0x000000)
-        aResult = NS_RGB(0xff,0xff,0xff);
-      else
-        aResult = NS_DONT_CHANGE_COLOR;
-      break;
-    case eColorID_IMESelectedRawTextBackground:
-    case eColorID_IMESelectedConvertedTextBackground:
-    case eColorID_IMERawInputBackground:
-    case eColorID_IMEConvertedTextBackground:
-      aResult = NS_TRANSPARENT;
-      break;
-    case eColorID_IMESelectedRawTextForeground:
-    case eColorID_IMESelectedConvertedTextForeground:
-    case eColorID_IMERawInputForeground:
-    case eColorID_IMEConvertedTextForeground:
-      aResult = NS_SAME_AS_FOREGROUND_COLOR;
-      break;
-    case eColorID_IMERawInputUnderline:
-    case eColorID_IMEConvertedTextUnderline:
-      aResult = NS_40PERCENT_FOREGROUND_COLOR;
-      break;
-    case eColorID_IMESelectedRawTextUnderline:
-    case eColorID_IMESelectedConvertedTextUnderline:
-      aResult = NS_SAME_AS_FOREGROUND_COLOR;
-      break;
-    case eColorID_SpellCheckerUnderline:
-      aResult = NS_RGB(0xff, 0, 0);
-      break;
-
-    //
-    // css2 system colors http://www.w3.org/TR/REC-CSS2/ui.html#system-colors
-    //
-    case eColorID_buttontext:
-    case eColorID__moz_buttonhovertext:
-    case eColorID_captiontext:
-    case eColorID_menutext:
-    case eColorID_infotext:
-    case eColorID__moz_menubartext:
-    case eColorID_windowtext:
-      aResult = GetColorFromUIColor([UIColor darkTextColor]);
-      break;
-    case eColorID_activecaption:
-      aResult = NS_RGB(0xff,0xff,0xff);
-      break;
-    case eColorID_activeborder:
-      aResult = NS_RGB(0x00,0x00,0x00);
-      break;
-     case eColorID_appworkspace:
-      aResult = NS_RGB(0xFF,0xFF,0xFF);
-      break;
-    case eColorID_background:
-      aResult = NS_RGB(0x63,0x63,0xCE);
-      break;
-    case eColorID_buttonface:
-    case eColorID__moz_buttonhoverface:
-      aResult = NS_RGB(0xF0,0xF0,0xF0);
-      break;
-    case eColorID_buttonhighlight:
-      aResult = NS_RGB(0xFF,0xFF,0xFF);
-      break;
-    case eColorID_buttonshadow:
-      aResult = NS_RGB(0xDC,0xDC,0xDC);
-      break;
-    case eColorID_graytext:
-      aResult = NS_RGB(0x44,0x44,0x44);
-      break;
-    case eColorID_inactiveborder:
-      aResult = NS_RGB(0xff,0xff,0xff);
-      break;
-    case eColorID_inactivecaption:
-      aResult = NS_RGB(0xaa,0xaa,0xaa);
-      break;
-    case eColorID_inactivecaptiontext:
-      aResult = NS_RGB(0x45,0x45,0x45);
-      break;
-    case eColorID_scrollbar:
-      aResult = NS_RGB(0,0,0); //XXX
-      break;
-    case eColorID_threeddarkshadow:
-      aResult = NS_RGB(0xDC,0xDC,0xDC);
-      break;
-    case eColorID_threedshadow:
-      aResult = NS_RGB(0xE0,0xE0,0xE0);
-      break;
-    case eColorID_threedface:
-      aResult = NS_RGB(0xF0,0xF0,0xF0);
-      break;
-    case eColorID_threedhighlight:
-      aResult = NS_RGB(0xff,0xff,0xff);
-      break;
-    case eColorID_threedlightshadow:
-      aResult = NS_RGB(0xDA,0xDA,0xDA);
-      break;
-    case eColorID_menu:
-      aResult = NS_RGB(0xff,0xff,0xff);
-      break;
-    case eColorID_infobackground:
-      aResult = NS_RGB(0xFF,0xFF,0xC7);
-      break;
-    case eColorID_windowframe:
-      aResult = NS_RGB(0xaa,0xaa,0xaa);
-      break;
-    case eColorID_window:
-    case eColorID__moz_field:
-    case eColorID__moz_combobox:
-      aResult = NS_RGB(0xff,0xff,0xff);
-      break;
-    case eColorID__moz_fieldtext:
-    case eColorID__moz_comboboxtext:
-      aResult = GetColorFromUIColor([UIColor darkTextColor]);
-      break;
-    case eColorID__moz_dialog:
-      aResult = NS_RGB(0xaa,0xaa,0xaa);
-      break;
-    case eColorID__moz_dialogtext:
-    case eColorID__moz_cellhighlighttext:
-    case eColorID__moz_html_cellhighlighttext:
-      aResult = GetColorFromUIColor([UIColor darkTextColor]);
-      break;
-    case eColorID__moz_dragtargetzone:
-    case eColorID__moz_mac_chrome_active:
-    case eColorID__moz_mac_chrome_inactive:
-      aResult = NS_RGB(0xaa,0xaa,0xaa);
-      break;
-    case eColorID__moz_mac_focusring:
-      aResult = NS_RGB(0x3F,0x98,0xDD);
-      break;
-    case eColorID__moz_mac_menushadow:
-      aResult = NS_RGB(0xA3,0xA3,0xA3);
-      break;
-    case eColorID__moz_mac_menutextdisable:
-      aResult = NS_RGB(0x88,0x88,0x88);
-      break;
-    case eColorID__moz_mac_menutextselect:
-      aResult = NS_RGB(0xaa,0xaa,0xaa);
-      break;
-    case eColorID__moz_mac_disabledtoolbartext:
-      aResult = NS_RGB(0x3F,0x3F,0x3F);
-      break;
-    case eColorID__moz_mac_menuselect:
-      aResult = NS_RGB(0xaa,0xaa,0xaa);
-      break;
-    case eColorID__moz_buttondefault:
-      aResult = NS_RGB(0xDC,0xDC,0xDC);
-      break;
-    case eColorID__moz_cellhighlight:
-    case eColorID__moz_html_cellhighlight:
-    case eColorID__moz_mac_secondaryhighlight:
-      // For inactive list selection
-      aResult = NS_RGB(0xaa,0xaa,0xaa);
-      break;
-    case eColorID__moz_eventreerow:
-      // Background color of even list rows.
-      aResult = NS_RGB(0xff,0xff,0xff);
-      break;
-    case eColorID__moz_oddtreerow:
-      // Background color of odd list rows.
-      aResult = NS_TRANSPARENT;
-      break;
-    case eColorID__moz_nativehyperlinktext:
-      // There appears to be no available system defined color. HARDCODING to the appropriate color.
-      aResult = NS_RGB(0x14,0x4F,0xAE);
-      break;
-    default:
-      NS_WARNING("Someone asked nsILookAndFeel for a color I don't know about");
-      aResult = NS_RGB(0xff,0xff,0xff);
-      res = NS_ERROR_FAILURE;
-      break;
-    }
-
-  return res;
-}
-
-NS_IMETHODIMP
-nsLookAndFeel::GetIntImpl(IntID aID, int32_t &aResult)
-{
-  nsresult res = nsXPLookAndFeel::GetIntImpl(aID, aResult);
-  if (NS_SUCCEEDED(res))
-    return res;
-  res = NS_OK;
-
-  switch (aID) {
-    case eIntID_CaretBlinkTime:
-      aResult = 567;
-      break;
-    case eIntID_CaretWidth:
-      aResult = 1;
-      break;
-    case eIntID_ShowCaretDuringSelection:
-      aResult = 0;
-      break;
-    case eIntID_SelectTextfieldsOnKeyFocus:
-      // Select textfield content when focused by kbd
-      // used by nsEventStateManager::sTextfieldSelectModel
-      aResult = 1;
-      break;
-    case eIntID_SubmenuDelay:
-      aResult = 200;
-      break;
-    case eIntID_MenusCanOverlapOSBar:
-      // xul popups are not allowed to overlap the menubar.
-      aResult = 0;
-      break;
-    case eIntID_SkipNavigatingDisabledMenuItem:
-      aResult = 1;
-      break;
-    case eIntID_DragThresholdX:
-    case eIntID_DragThresholdY:
-      aResult = 4;
-      break;
-    case eIntID_ScrollArrowStyle:
-      aResult = eScrollArrow_None;
-      break;
-    case eIntID_ScrollSliderStyle:
-      aResult = eScrollThumbStyle_Proportional;
-      break;
-    case eIntID_TreeOpenDelay:
-      aResult = 1000;
-      break;
-    case eIntID_TreeCloseDelay:
-      aResult = 1000;
-      break;
-    case eIntID_TreeLazyScrollDelay:
-      aResult = 150;
-      break;
-    case eIntID_TreeScrollDelay:
-      aResult = 100;
-      break;
-    case eIntID_TreeScrollLinesMax:
-      aResult = 3;
-      break;
-    case eIntID_DWMCompositor:
-    case eIntID_WindowsClassic:
-    case eIntID_WindowsDefaultTheme:
-    case eIntID_TouchEnabled:
-      aResult = 0;
-      res = NS_ERROR_NOT_IMPLEMENTED;
-      break;
-    case eIntID_MacGraphiteTheme:
-      aResult = 0;
-      break;
-    case eIntID_TabFocusModel:
-      aResult = 1;    // default to just textboxes
-      break;
-    case eIntID_ScrollToClick:
-      aResult = 0;
-      break;
-    case eIntID_ChosenMenuItemsShouldBlink:
-      aResult = 1;
-      break;
-    case eIntID_IMERawInputUnderlineStyle:
-    case eIntID_IMEConvertedTextUnderlineStyle:
-    case eIntID_IMESelectedRawTextUnderlineStyle:
-    case eIntID_IMESelectedConvertedTextUnderline:
-      aResult = NS_STYLE_TEXT_DECORATION_STYLE_SOLID;
-      break;
-    case eIntID_SpellCheckerUnderlineStyle:
-      aResult = NS_STYLE_TEXT_DECORATION_STYLE_DOTTED;
-      break;
-    case eIntID_ContextMenuOffsetVertical:
-    case eIntID_ContextMenuOffsetHorizontal:
-      aResult = 2;
-      break;
-    default:
-      aResult = 0;
-      res = NS_ERROR_FAILURE;
-  }
-  return res;
-}
-
-NS_IMETHODIMP
-nsLookAndFeel::GetFloatImpl(FloatID aID, float &aResult)
-{
-  nsresult res = nsXPLookAndFeel::GetFloatImpl(aID, aResult);
-  if (NS_SUCCEEDED(res))
-    return res;
-  res = NS_OK;
-
-  switch (aID) {
-    case eFloatID_IMEUnderlineRelativeSize:
-      aResult = 2.0f;
-      break;
-    case eFloatID_SpellCheckerUnderlineRelativeSize:
-      aResult = 2.0f;
-      break;
-    default:
-      aResult = -1.0;
-      res = NS_ERROR_FAILURE;
-  }
-
-  return res;
-}
-
-bool
-nsLookAndFeel::GetFontImpl(FontID aID, nsString &aFontName,
-                           gfxFontStyle &aFontStyle,
-                           float aDevPixPerCSSPixel)
-{
-    // hack for now
-    if (aID == eFont_Window || aID == eFont_Document) {
-        aFontStyle.style      = NS_FONT_STYLE_NORMAL;
-        aFontStyle.weight     = NS_FONT_WEIGHT_NORMAL;
-        aFontStyle.stretch    = NS_FONT_STRETCH_NORMAL;
-        aFontStyle.size       = 14 * aDevPixPerCSSPixel;
-        aFontStyle.systemFont = true;
-
-        aFontName.AssignLiteral("sans-serif");
-        return true;
-    }
-
-    //TODO: implement more here?
-    return false;
-}
diff --git a/widget/uikit/nsScreenManager.h b/widget/uikit/nsScreenManager.h
deleted file mode 100644
index 1ff6a87ec7..0000000000
--- a/widget/uikit/nsScreenManager.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsScreenManager_h_
-#define nsScreenManager_h_
-
-#include "nsBaseScreen.h"
-#include "nsIScreenManager.h"
-#include "nsCOMPtr.h"
-#include "nsRect.h"
-
-@class UIScreen;
-
-class UIKitScreen : public nsBaseScreen
-{
-public:
-    explicit UIKitScreen (UIScreen* screen);
-    ~UIKitScreen () {}
-
-    NS_IMETHOD GetId(uint32_t* outId) {
-        *outId = 0;
-        return NS_OK;
-    }
-
-    NS_IMETHOD GetRect(int32_t* aLeft, int32_t* aTop, int32_t* aWidth, int32_t* aHeight);
-    NS_IMETHOD GetAvailRect(int32_t* aLeft, int32_t* aTop, int32_t* aWidth, int32_t* aHeight);
-    NS_IMETHOD GetRectDisplayPix(int32_t* aLeft, int32_t* aTop, int32_t* aWidth, int32_t* aHeight);
-    NS_IMETHOD GetAvailRectDisplayPix(int32_t* aLeft, int32_t* aTop, int32_t* aWidth, int32_t* aHeight);
-    NS_IMETHOD GetPixelDepth(int32_t* aPixelDepth);
-    NS_IMETHOD GetColorDepth(int32_t* aColorDepth);
-    NS_IMETHOD GetContentsScaleFactor(double* aContentsScaleFactor);
-    NS_IMETHOD GetDefaultCSSScaleFactor(double* aScaleFactor)
-    {
-      return GetContentsScaleFactor(aScaleFactor);
-    }
-
-private:
-    UIScreen* mScreen;
-};
-
-class UIKitScreenManager : public nsIScreenManager
-{
-public:
-    UIKitScreenManager ();
-
-    NS_DECL_ISUPPORTS
-
-    NS_DECL_NSISCREENMANAGER
-
-    static LayoutDeviceIntRect GetBounds();
-
-private:
-    virtual ~UIKitScreenManager () {}
-    //TODO: support >1 screen, iPad supports external displays
-    nsCOMPtr<nsIScreen> mScreen;
-};
-
-#endif // nsScreenManager_h_
diff --git a/widget/uikit/nsScreenManager.mm b/widget/uikit/nsScreenManager.mm
deleted file mode 100644
index 601c911cd9..0000000000
--- a/widget/uikit/nsScreenManager.mm
+++ /dev/null
@@ -1,146 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#import <UIKit/UIScreen.h>
-
-#include "gfxPoint.h"
-#include "nsScreenManager.h"
-#include "nsAppShell.h"
-
-static LayoutDeviceIntRect gScreenBounds;
-static bool gScreenBoundsSet = false;
-
-UIKitScreen::UIKitScreen(UIScreen* aScreen)
-{
-    mScreen = [aScreen retain];
-}
-
-NS_IMETHODIMP
-UIKitScreen::GetRect(int32_t *outX, int32_t *outY, int32_t *outWidth, int32_t *outHeight)
-{
-    return GetRectDisplayPix(outX, outY, outWidth, outHeight);
-}
-
-NS_IMETHODIMP
-UIKitScreen::GetAvailRect(int32_t *outX, int32_t *outY, int32_t *outWidth, int32_t *outHeight)
-{
-    return GetAvailRectDisplayPix(outX, outY, outWidth, outHeight);
-}
-
-NS_IMETHODIMP
-UIKitScreen::GetRectDisplayPix(int32_t *outX, int32_t *outY, int32_t *outWidth, int32_t *outHeight)
-{
-    nsIntRect rect = UIKitScreenManager::GetBounds();
-    *outX = rect.x;
-    *outY = rect.y;
-    *outWidth = rect.width;
-    *outHeight = rect.height;
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-UIKitScreen::GetAvailRectDisplayPix(int32_t *outX, int32_t *outY, int32_t *outWidth, int32_t *outHeight)
-{
-    CGRect rect = [mScreen applicationFrame];
-    CGFloat scale = [mScreen scale];
-
-    *outX = rect.origin.x * scale;
-    *outY = rect.origin.y * scale;
-    *outWidth = rect.size.width * scale;
-    *outHeight = rect.size.height * scale;
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-UIKitScreen::GetPixelDepth(int32_t *aPixelDepth)
-{
-  // Close enough.
-  *aPixelDepth = 24;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-UIKitScreen::GetColorDepth(int32_t *aColorDepth)
-{
-  return GetPixelDepth(aColorDepth);
-}
-
-NS_IMETHODIMP
-UIKitScreen::GetContentsScaleFactor(double* aContentsScaleFactor)
-{
-    *aContentsScaleFactor = [mScreen scale];
-    return NS_OK;
-}
-
-NS_IMPL_ISUPPORTS(UIKitScreenManager, nsIScreenManager)
-
-UIKitScreenManager::UIKitScreenManager()
-: mScreen(new UIKitScreen([UIScreen mainScreen]))
-{
-}
-
-LayoutDeviceIntRect
-UIKitScreenManager::GetBounds()
-{
-    if (!gScreenBoundsSet) {
-        CGRect rect = [[UIScreen mainScreen] bounds];
-        CGFloat scale = [[UIScreen mainScreen] scale];
-        gScreenBounds.x = rect.origin.x * scale;
-        gScreenBounds.y = rect.origin.y * scale;
-        gScreenBounds.width = rect.size.width * scale;
-        gScreenBounds.height = rect.size.height * scale;
-        gScreenBoundsSet = true;
-    }
-    printf("UIKitScreenManager::GetBounds: %d %d %d %d\n",
-           gScreenBounds.x, gScreenBounds.y, gScreenBounds.width, gScreenBounds.height);
-    return gScreenBounds;
-}
-
-NS_IMETHODIMP
-UIKitScreenManager::GetPrimaryScreen(nsIScreen** outScreen)
-{
-  NS_IF_ADDREF(*outScreen = mScreen.get());
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-UIKitScreenManager::ScreenForRect(int32_t inLeft,
-                               int32_t inTop,
-                               int32_t inWidth,
-                               int32_t inHeight,
-                               nsIScreen** outScreen)
-{
-  return GetPrimaryScreen(outScreen);
-}
-
-NS_IMETHODIMP
-UIKitScreenManager::ScreenForId(uint32_t id,
-                                nsIScreen** outScreen)
-{
-    return GetPrimaryScreen(outScreen);
-}
-
-NS_IMETHODIMP
-UIKitScreenManager::ScreenForNativeWidget(void* aWidget, nsIScreen** outScreen)
-{
-  return GetPrimaryScreen(outScreen);
-}
-
-NS_IMETHODIMP
-UIKitScreenManager::GetNumberOfScreens(uint32_t* aNumberOfScreens)
-{
-  //TODO: support multiple screens
-  *aNumberOfScreens = 1;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-UIKitScreenManager::GetSystemDefaultScale(float* aScale)
-{
-    *aScale = [UIScreen mainScreen].scale;
-    return NS_OK;
-}
diff --git a/widget/uikit/nsWidgetFactory.mm b/widget/uikit/nsWidgetFactory.mm
deleted file mode 100644
index 9e4f028ff6..0000000000
--- a/widget/uikit/nsWidgetFactory.mm
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "nsIFactory.h"
-#include "nsISupports.h"
-#include "nsIComponentManager.h"
-#include "mozilla/ModuleUtils.h"
-
-#include "nsWidgetsCID.h"
-
-#include "nsAppShell.h"
-#include "nsAppShellSingleton.h"
-#include "nsLookAndFeel.h"
-#include "nsScreenManager.h"
-#include "nsWindow.h"
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(UIKitScreenManager)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindow)
-
-#include "GfxInfo.h"
-namespace mozilla {
-namespace widget {
-// This constructor should really be shared with all platforms.
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(GfxInfo, Init)
-}
-}
-
-NS_DEFINE_NAMED_CID(NS_WINDOW_CID);
-NS_DEFINE_NAMED_CID(NS_CHILD_CID);
-NS_DEFINE_NAMED_CID(NS_APPSHELL_CID);
-NS_DEFINE_NAMED_CID(NS_SCREENMANAGER_CID);
-NS_DEFINE_NAMED_CID(NS_GFXINFO_CID);
-
-static const mozilla::Module::CIDEntry kWidgetCIDs[] = {
-  { &kNS_WINDOW_CID, false, nullptr, nsWindowConstructor },
-  { &kNS_CHILD_CID, false, nullptr, nsWindowConstructor },
-  { &kNS_APPSHELL_CID, false, nullptr, nsAppShellConstructor },
-  { &kNS_SCREENMANAGER_CID, false, nullptr, UIKitScreenManagerConstructor },
-  { &kNS_GFXINFO_CID, false, nullptr, mozilla::widget::GfxInfoConstructor },
-  { nullptr }
-};
-
-static const mozilla::Module::ContractIDEntry kWidgetContracts[] = {
-  { "@mozilla.org/widgets/window/uikit;1", &kNS_WINDOW_CID },
-  { "@mozilla.org/widgets/childwindow/uikit;1", &kNS_CHILD_CID },
-  { "@mozilla.org/widget/appshell/uikit;1", &kNS_APPSHELL_CID },
-  { "@mozilla.org/gfx/screenmanager;1", &kNS_SCREENMANAGER_CID },
-  { "@mozilla.org/gfx/info;1", &kNS_GFXINFO_CID },
-  { nullptr }
-};
-
-static void
-nsWidgetUIKitModuleDtor()
-{
-  nsLookAndFeel::Shutdown();
-  nsAppShellShutdown();
-}
-
-static const mozilla::Module kWidgetModule = {
-  mozilla::Module::kVersion,
-  kWidgetCIDs,
-  kWidgetContracts,
-  nullptr,
-  nullptr,
-  nsAppShellInit,
-  nsWidgetUIKitModuleDtor
-};
-
-NSMODULE_DEFN(nsWidgetUIKitModule) = &kWidgetModule;
diff --git a/widget/uikit/nsWindow.h b/widget/uikit/nsWindow.h
deleted file mode 100644
index cb18c09069..0000000000
--- a/widget/uikit/nsWindow.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef NSWINDOW_H_
-#define NSWINDOW_H_
-
-#include "nsBaseWidget.h"
-#include "gfxPoint.h"
-
-#include "nsTArray.h"
-
-@class UIWindow;
-@class UIView;
-@class ChildView;
-
-class nsWindow :
-    public nsBaseWidget
-{
-    typedef nsBaseWidget Inherited;
-
-public:
-    nsWindow();
-
-    NS_DECL_ISUPPORTS_INHERITED
-
-    //
-    // nsIWidget
-    //
-
-    virtual MOZ_MUST_USE nsresult Create(nsIWidget* aParent,
-                                         nsNativeWidget aNativeParent,
-                                         const LayoutDeviceIntRect& aRect,
-                                         nsWidgetInitData* aInitData = nullptr)
-                                         override;
-    virtual void Destroy() override;
-    NS_IMETHOD Show(bool aState) override;
-    NS_IMETHOD              Enable(bool aState) override {
-        return NS_OK;
-    }
-    virtual bool            IsEnabled() const override {
-        return true;
-    }
-    virtual bool            IsVisible() const override {
-        return mVisible;
-    }
-    NS_IMETHOD              SetFocus(bool aState=false) override;
-    virtual LayoutDeviceIntPoint WidgetToScreenOffset() override;
-
-    virtual void SetBackgroundColor(const nscolor &aColor) override;
-    virtual void* GetNativeData(uint32_t aDataType) override;
-
-    NS_IMETHOD              Move(double aX, double aY) override;
-    virtual void            SetSizeMode(nsSizeMode aMode) override;
-    void                    EnteredFullScreen(bool aFullScreen);
-    NS_IMETHOD              Resize(double aWidth, double aHeight, bool aRepaint) override;
-    NS_IMETHOD              Resize(double aX, double aY, double aWidth, double aHeight, bool aRepaint) override;
-    virtual LayoutDeviceIntRect GetScreenBounds() override;
-    void                    ReportMoveEvent();
-    void                    ReportSizeEvent();
-    void                    ReportSizeModeEvent(nsSizeMode aMode);
-
-    CGFloat                 BackingScaleFactor();
-    void                    BackingScaleFactorChanged();
-    virtual float           GetDPI() override {
-        //XXX: terrible
-        return 326.0f;
-    }
-    virtual double          GetDefaultScaleInternal() override {
-        return BackingScaleFactor();
-    }
-    virtual int32_t         RoundsWidgetCoordinatesTo() override;
-
-    NS_IMETHOD              SetTitle(const nsAString& aTitle) override {
-        return NS_OK;
-    }
-
-    NS_IMETHOD Invalidate(const LayoutDeviceIntRect& aRect) override;
-    virtual nsresult ConfigureChildren(const nsTArray<Configuration>& aConfigurations) override;
-    NS_IMETHOD DispatchEvent(mozilla::WidgetGUIEvent* aEvent,
-                             nsEventStatus& aStatus) override;
-
-    void WillPaintWindow();
-    bool PaintWindow(LayoutDeviceIntRegion aRegion);
-
-    bool HasModalDescendents() { return false; }
-
-    //NS_IMETHOD NotifyIME(const IMENotification& aIMENotification) override;
-    NS_IMETHOD_(void) SetInputContext(
-                        const InputContext& aContext,
-                        const InputContextAction& aAction);
-    NS_IMETHOD_(InputContext) GetInputContext();
-    /*
-    NS_IMETHOD_(bool) ExecuteNativeKeyBinding(
-                        NativeKeyBindingsType aType,
-                        const mozilla::WidgetKeyboardEvent& aEvent,
-                        DoCommandCallback aCallback,
-                        void* aCallbackData) override;
-    */
-
-protected:
-    virtual ~nsWindow();
-    void BringToFront();
-    nsWindow *FindTopLevel();
-    bool IsTopLevel();
-    nsresult GetCurrentOffset(uint32_t &aOffset, uint32_t &aLength);
-    nsresult DeleteRange(int aOffset, int aLen);
-
-    void TearDownView();
-
-    ChildView*   mNativeView;
-    bool mVisible;
-    nsTArray<nsWindow*> mChildren;
-    nsWindow* mParent;
-    InputContext         mInputContext;
-
-    void OnSizeChanged(const mozilla::gfx::IntSize& aSize);
-
-    static void DumpWindows();
-    static void DumpWindows(const nsTArray<nsWindow*>& wins, int indent = 0);
-    static void LogWindow(nsWindow *win, int index, int indent);
-};
-
-#endif /* NSWINDOW_H_ */
diff --git a/widget/uikit/nsWindow.mm b/widget/uikit/nsWindow.mm
deleted file mode 100644
index 874626237c..0000000000
--- a/widget/uikit/nsWindow.mm
+++ /dev/null
@@ -1,862 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#import <UIKit/UIEvent.h>
-#import <UIKit/UIGraphics.h>
-#import <UIKit/UIInterface.h>
-#import <UIKit/UIScreen.h>
-#import <UIKit/UITapGestureRecognizer.h>
-#import <UIKit/UITouch.h>
-#import <UIKit/UIView.h>
-#import <UIKit/UIViewController.h>
-#import <UIKit/UIWindow.h>
-#import <QuartzCore/QuartzCore.h>
-
-#include <algorithm>
-
-#include "nsWindow.h"
-#include "nsScreenManager.h"
-#include "nsAppShell.h"
-
-#include "nsWidgetsCID.h"
-#include "nsGfxCIID.h"
-
-#include "gfxQuartzSurface.h"
-#include "gfxUtils.h"
-#include "gfxImageSurface.h"
-#include "gfxContext.h"
-#include "nsRegion.h"
-#include "Layers.h"
-#include "nsTArray.h"
-
-#include "mozilla/BasicEvents.h"
-#include "mozilla/TouchEvents.h"
-#include "mozilla/Unused.h"
-
-#include "GeckoProfiler.h"
-
-using namespace mozilla;
-using namespace mozilla::dom;
-using namespace mozilla::layers;
-
-#define ALOG(args...) fprintf(stderr, args); fprintf(stderr, "\n")
-
-static LayoutDeviceIntPoint
-UIKitPointsToDevPixels(CGPoint aPoint, CGFloat aBackingScale)
-{
-    return LayoutDeviceIntPoint(NSToIntRound(aPoint.x * aBackingScale),
-                                NSToIntRound(aPoint.y * aBackingScale));
-}
-
-static CGRect
-DevPixelsToUIKitPoints(const LayoutDeviceIntRect& aRect, CGFloat aBackingScale)
-{
-    return CGRectMake((CGFloat)aRect.x / aBackingScale,
-                      (CGFloat)aRect.y / aBackingScale,
-                      (CGFloat)aRect.width / aBackingScale,
-                      (CGFloat)aRect.height / aBackingScale);
-}
-
-// Used to retain a Cocoa object for the remainder of a method's execution.
-class nsAutoRetainUIKitObject {
-public:
-nsAutoRetainUIKitObject(id anObject)
-{
-  mObject = [anObject retain];
-}
-~nsAutoRetainUIKitObject()
-{
-  [mObject release];
-}
-private:
-  id mObject;  // [STRONG]
-};
-
-@interface ChildView : UIView
-{
-@public
-    nsWindow* mGeckoChild; // weak ref
-    BOOL mWaitingForPaint;
-    CFMutableDictionaryRef mTouches;
-    int mNextTouchID;
-}
-// sets up our view, attaching it to its owning gecko view
-- (id)initWithFrame:(CGRect)inFrame geckoChild:(nsWindow*)inChild;
-// Our Gecko child was Destroy()ed
-- (void)widgetDestroyed;
-// Tear down this ChildView
-- (void)delayedTearDown;
-- (void)sendMouseEvent:(EventMessage) aType point:(LayoutDeviceIntPoint)aPoint widget:(nsWindow*)aWindow;
-- (void)handleTap:(UITapGestureRecognizer *)sender;
-- (BOOL)isUsingMainThreadOpenGL;
-- (void)drawUsingOpenGL;
-- (void)drawUsingOpenGLCallback;
-- (void)sendTouchEvent:(EventMessage) aType touches:(NSSet*)aTouches widget:(nsWindow*)aWindow;
-// Event handling (UIResponder)
-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event;
-- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event;
-- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event;
-- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event;
-@end
-
-@implementation ChildView
-+ (Class)layerClass {
-    return [CAEAGLLayer class];
-}
-
-- (id)initWithFrame:(CGRect)inFrame geckoChild:(nsWindow*)inChild
-{
-    self.multipleTouchEnabled = YES;
-    if ((self = [super initWithFrame:inFrame])) {
-      mGeckoChild = inChild;
-    }
-    ALOG("[ChildView[%p] initWithFrame:] (mGeckoChild = %p)", (void*)self, (void*)mGeckoChild);
-    self.opaque = YES;
-    self.alpha = 1.0;
-
-    UITapGestureRecognizer *tapRecognizer = [[UITapGestureRecognizer alloc]
-          initWithTarget:self action:@selector(handleTap:)];
-    tapRecognizer.numberOfTapsRequired = 1;
-    [self addGestureRecognizer:tapRecognizer];
-
-    mTouches = CFDictionaryCreateMutable(kCFAllocatorDefault, 0, nullptr, nullptr);
-    mNextTouchID = 0;
-    return self;
-}
-
-- (void)widgetDestroyed
-{
-  mGeckoChild = nullptr;
-  CFRelease(mTouches);
-}
-
-- (void)delayedTearDown
-{
-  [self removeFromSuperview];
-  [self release];
-}
-
-- (void)sendMouseEvent:(EventMessage) aType point:(LayoutDeviceIntPoint)aPoint widget:(nsWindow*)aWindow
-{
-    WidgetMouseEvent event(true, aType, aWindow,
-                           WidgetMouseEvent::eReal, WidgetMouseEvent::eNormal);
-
-    event.mRefPoint = aPoint;
-    event.mClickCount = 1;
-    event.button = WidgetMouseEvent::eLeftButton;
-    event.mTime = PR_IntervalNow();
-    event.inputSource = nsIDOMMouseEvent::MOZ_SOURCE_UNKNOWN;
-
-    nsEventStatus status;
-    aWindow->DispatchEvent(&event, status);
-}
-
-- (void)handleTap:(UITapGestureRecognizer *)sender
-{
-    if (sender.state == UIGestureRecognizerStateEnded) {
-        ALOG("[ChildView[%p] handleTap]", self);
-        LayoutDeviceIntPoint lp = UIKitPointsToDevPixels([sender locationInView:self], [self contentScaleFactor]);
-        [self sendMouseEvent:eMouseMove point:lp widget:mGeckoChild];
-        [self sendMouseEvent:eMouseDown point:lp widget:mGeckoChild];
-        [self sendMouseEvent:eMouseUp point:lp widget:mGeckoChild];
-    }
-}
-
-- (void)sendTouchEvent:(EventMessage) aType touches:(NSSet*)aTouches widget:(nsWindow*)aWindow
-{
-    WidgetTouchEvent event(true, aType, aWindow);
-    //XXX: I think nativeEvent.timestamp * 1000 is probably usable here but
-    // I don't care that much right now.
-    event.mTime = PR_IntervalNow();
-    event.mTouches.SetCapacity(aTouches.count);
-    for (UITouch* touch in aTouches) {
-        LayoutDeviceIntPoint loc = UIKitPointsToDevPixels([touch locationInView:self], [self contentScaleFactor]);
-        LayoutDeviceIntPoint radius = UIKitPointsToDevPixels([touch majorRadius], [touch majorRadius]);
-        void* value;
-        if (!CFDictionaryGetValueIfPresent(mTouches, touch, (const void**)&value)) {
-            // This shouldn't happen.
-            NS_ASSERTION(false, "Got a touch that we didn't know about");
-            continue;
-        }
-        int id = reinterpret_cast<int>(value);
-        RefPtr<Touch> t = new Touch(id, loc, radius, 0.0f, 1.0f);
-        event.mRefPoint = loc;
-        event.mTouches.AppendElement(t);
-    }
-    aWindow->DispatchInputEvent(&event);
-}
-
-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    ALOG("[ChildView[%p] touchesBegan", self);
-    if (!mGeckoChild)
-        return;
-
-    for (UITouch* touch : touches) {
-        CFDictionaryAddValue(mTouches, touch, (void*)mNextTouchID);
-        mNextTouchID++;
-    }
-    [self sendTouchEvent:eTouchStart
-                 touches:[event allTouches]
-                  widget:mGeckoChild];
-}
-
-- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    ALOG("[ChildView[%p] touchesCancelled", self);
-    [self sendTouchEvent:eTouchCancel touches:touches widget:mGeckoChild];
-    for (UITouch* touch : touches) {
-        CFDictionaryRemoveValue(mTouches, touch);
-    }
-    if (CFDictionaryGetCount(mTouches) == 0) {
-        mNextTouchID = 0;
-    }
-}
-
-- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    ALOG("[ChildView[%p] touchesEnded", self);
-    if (!mGeckoChild)
-        return;
-
-    [self sendTouchEvent:eTouchEnd touches:touches widget:mGeckoChild];
-    for (UITouch* touch : touches) {
-        CFDictionaryRemoveValue(mTouches, touch);
-    }
-    if (CFDictionaryGetCount(mTouches) == 0) {
-        mNextTouchID = 0;
-    }
-}
-
-- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    ALOG("[ChildView[%p] touchesMoved", self);
-    if (!mGeckoChild)
-        return;
-
-    [self sendTouchEvent:eTouchMove
-                 touches:[event allTouches]
-                  widget:mGeckoChild];
-}
-
-- (void)setNeedsDisplayInRect:(CGRect)aRect
-{
-    if ([self isUsingMainThreadOpenGL]) {
-    // Draw without calling drawRect. This prevent us from
-    // needing to access the normal window buffer surface unnecessarily, so we
-    // waste less time synchronizing the two surfaces.
-    if (!mWaitingForPaint) {
-      mWaitingForPaint = YES;
-      // Use NSRunLoopCommonModes instead of the default NSDefaultRunLoopMode
-      // so that the timer also fires while a native menu is open.
-      [self performSelector:@selector(drawUsingOpenGLCallback)
-                 withObject:nil
-                 afterDelay:0
-                    inModes:[NSArray arrayWithObject:NSRunLoopCommonModes]];
-    }
-  }
-}
-
-- (BOOL)isUsingMainThreadOpenGL
-{
-  if (!mGeckoChild || ![self window])
-    return NO;
-
-  return mGeckoChild->GetLayerManager(nullptr)->GetBackendType() == mozilla::layers::LayersBackend::LAYERS_OPENGL;
-}
-
-- (void)drawUsingOpenGL
-{
-    ALOG("drawUsingOpenGL");
-  PROFILER_LABEL("ChildView", "drawUsingOpenGL",
-    js::ProfileEntry::Category::GRAPHICS);
-
-  if (!mGeckoChild->IsVisible())
-    return;
-
-  mWaitingForPaint = NO;
-
-  LayoutDeviceIntRect geckoBounds = mGeckoChild->GetBounds();
-  LayoutDeviceIntRegion region(geckoBounds);
-
-  mGeckoChild->PaintWindow(region);
-}
-
-// Called asynchronously after setNeedsDisplay in order to avoid entering the
-// normal drawing machinery.
-- (void)drawUsingOpenGLCallback
-{
-  if (mWaitingForPaint) {
-    [self drawUsingOpenGL];
-  }
-}
-
-// The display system has told us that a portion of our view is dirty. Tell
-// gecko to paint it
-- (void)drawRect:(CGRect)aRect
-{
-    CGContextRef cgContext = UIGraphicsGetCurrentContext();
-    [self drawRect:aRect inContext:cgContext];
-}
-
-- (void)drawRect:(CGRect)aRect inContext:(CGContextRef)aContext
-{
-#ifdef DEBUG_UPDATE
-  LayoutDeviceIntRect geckoBounds = mGeckoChild->GetBounds();
-
-  fprintf (stderr, "---- Update[%p][%p] [%f %f %f %f] cgc: %p\n  gecko bounds: [%d %d %d %d]\n",
-           self, mGeckoChild,
-           aRect.origin.x, aRect.origin.y, aRect.size.width, aRect.size.height, aContext,
-           geckoBounds.x, geckoBounds.y, geckoBounds.width, geckoBounds.height);
-
-  CGAffineTransform xform = CGContextGetCTM(aContext);
-  fprintf (stderr, "  xform in: [%f %f %f %f %f %f]\n", xform.a, xform.b, xform.c, xform.d, xform.tx, xform.ty);
-#endif
-
-  if (true) {
-    // For Gecko-initiated repaints in OpenGL mode, drawUsingOpenGL is
-    // directly called from a delayed perform callback - without going through
-    // drawRect.
-    // Paints that come through here are triggered by something that Cocoa
-    // controls, for example by window resizing or window focus changes.
-
-    // Do GL composition and return.
-    [self drawUsingOpenGL];
-    return;
-  }
-  PROFILER_LABEL("ChildView", "drawRect",
-    js::ProfileEntry::Category::GRAPHICS);
-
-  // The CGContext that drawRect supplies us with comes with a transform that
-  // scales one user space unit to one Cocoa point, which can consist of
-  // multiple dev pixels. But Gecko expects its supplied context to be scaled
-  // to device pixels, so we need to reverse the scaling.
-  double scale = mGeckoChild->BackingScaleFactor();
-  CGContextSaveGState(aContext);
-  CGContextScaleCTM(aContext, 1.0 / scale, 1.0 / scale);
-
-  CGSize viewSize = [self bounds].size;
-  gfx::IntSize backingSize(viewSize.width * scale, viewSize.height * scale);
-
-  CGContextSaveGState(aContext);
-
-  LayoutDeviceIntRegion region =
-    LayoutDeviceIntRect(NSToIntRound(aRect.origin.x * scale),
-                        NSToIntRound(aRect.origin.y * scale),
-                        NSToIntRound(aRect.size.width * scale),
-                        NSToIntRound(aRect.size.height * scale));
-
-  // Create Cairo objects.
-  RefPtr<gfxQuartzSurface> targetSurface;
-
-  RefPtr<gfxContext> targetContext;
-  if (gfxPlatform::GetPlatform()->SupportsAzureContentForType(gfx::BackendType::CAIRO)) {
-    // This is dead code unless you mess with prefs, but keep it around for
-    // debugging.
-    targetSurface = new gfxQuartzSurface(aContext, backingSize);
-    targetSurface->SetAllowUseAsSource(false);
-    RefPtr<gfx::DrawTarget> dt =
-      gfxPlatform::GetPlatform()->CreateDrawTargetForSurface(targetSurface,
-                                                             backingSize);
-    if (!dt || !dt->IsValid()) {
-        gfxDevCrash(mozilla::gfx::LogReason::InvalidContext) << "Window context problem 2 " << backingSize;
-        return;
-    }
-    dt->AddUserData(&gfxContext::sDontUseAsSourceKey, dt, nullptr);
-    targetContext = gfxContext::CreateOrNull(dt);
-  } else {
-    MOZ_ASSERT_UNREACHABLE("COREGRAPHICS is the only supported backend");
-  }
-  MOZ_ASSERT(targetContext); // already checked for valid draw targets above
-
-  // Set up the clip region.
-  targetContext->NewPath();
-  for (auto iter = region.RectIter(); !iter.Done(); iter.Next()) {
-    const LayoutDeviceIntRect& r = iter.Get();
-    targetContext->Rectangle(gfxRect(r.x, r.y, r.width, r.height));
-  }
-  targetContext->Clip();
-
-  //nsAutoRetainCocoaObject kungFuDeathGrip(self);
-  bool painted = false;
-  if (mGeckoChild->GetLayerManager()->GetBackendType() == LayersBackend::LAYERS_BASIC) {
-    nsBaseWidget::AutoLayerManagerSetup
-      setupLayerManager(mGeckoChild, targetContext, BufferMode::BUFFER_NONE);
-    painted = mGeckoChild->PaintWindow(region);
-  } else if (mGeckoChild->GetLayerManager()->GetBackendType() == LayersBackend::LAYERS_CLIENT) {
-    // We only need this so that we actually get DidPaintWindow fired
-    painted = mGeckoChild->PaintWindow(region);
-  }
-
-  targetContext = nullptr;
-  targetSurface = nullptr;
-
-  CGContextRestoreGState(aContext);
-
-  // Undo the scale transform so that from now on the context is in
-  // CocoaPoints again.
-  CGContextRestoreGState(aContext);
-  if (!painted && [self isOpaque]) {
-    // Gecko refused to draw, but we've claimed to be opaque, so we have to
-    // draw something--fill with white.
-    CGContextSetRGBFillColor(aContext, 1, 1, 1, 1);
-    CGContextFillRect(aContext, aRect);
-  }
-
-#ifdef DEBUG_UPDATE
-  fprintf (stderr, "---- update done ----\n");
-
-#if 0
-  CGContextSetRGBStrokeColor (aContext,
-                            ((((unsigned long)self) & 0xff)) / 255.0,
-                            ((((unsigned long)self) & 0xff00) >> 8) / 255.0,
-                            ((((unsigned long)self) & 0xff0000) >> 16) / 255.0,
-                            0.5);
-#endif
-  CGContextSetRGBStrokeColor(aContext, 1, 0, 0, 0.8);
-  CGContextSetLineWidth(aContext, 4.0);
-  CGContextStrokeRect(aContext, aRect);
-#endif
-}
-@end
-
-NS_IMPL_ISUPPORTS_INHERITED0(nsWindow, Inherited)
-
-nsWindow::nsWindow()
-: mNativeView(nullptr),
-  mVisible(false),
-  mParent(nullptr)
-{
-}
-
-nsWindow::~nsWindow()
-{
-    [mNativeView widgetDestroyed]; // Safe if mNativeView is nil.
-    TearDownView(); // Safe if called twice.
-}
-
-void nsWindow::TearDownView()
-{
-  if (!mNativeView)
-    return;
-
-  [mNativeView performSelectorOnMainThread:@selector(delayedTearDown) withObject:nil waitUntilDone:false];
-  mNativeView = nil;
-}
-
-bool
-nsWindow::IsTopLevel()
-{
-    return mWindowType == eWindowType_toplevel ||
-        mWindowType == eWindowType_dialog ||
-        mWindowType == eWindowType_invisible;
-}
-
-//
-// nsIWidget
-//
-
-nsresult
-nsWindow::Create(nsIWidget* aParent,
-                 nsNativeWidget aNativeParent,
-                 const LayoutDeviceIntRect& aRect,
-                 nsWidgetInitData* aInitData)
-{
-    ALOG("nsWindow[%p]::Create %p/%p [%d %d %d %d]", (void*)this, (void*)aParent, (void*)aNativeParent, aRect.x, aRect.y, aRect.width, aRect.height);
-    nsWindow* parent = (nsWindow*) aParent;
-    ChildView* nativeParent = (ChildView*)aNativeParent;
-
-    if (parent == nullptr && nativeParent)
-        parent = nativeParent->mGeckoChild;
-    if (parent && nativeParent == nullptr)
-        nativeParent = parent->mNativeView;
-
-    // for toplevel windows, bounds are fixed to full screen size
-    if (parent == nullptr) {
-        if (nsAppShell::gWindow == nil) {
-            mBounds = UIKitScreenManager::GetBounds();
-        } else {
-            CGRect cgRect = [nsAppShell::gWindow bounds];
-            mBounds.x = cgRect.origin.x;
-            mBounds.y = cgRect.origin.y;
-            mBounds.width = cgRect.size.width;
-            mBounds.height = cgRect.size.height;
-        }
-    } else {
-        mBounds = aRect;
-    }
-
-    ALOG("nsWindow[%p]::Create bounds: %d %d %d %d", (void*)this,
-         mBounds.x, mBounds.y, mBounds.width, mBounds.height);
-
-    // Set defaults which can be overriden from aInitData in BaseCreate
-    mWindowType = eWindowType_toplevel;
-    mBorderStyle = eBorderStyle_default;
-
-    Inherited::BaseCreate(aParent, aInitData);
-
-    NS_ASSERTION(IsTopLevel() || parent, "non top level window doesn't have a parent!");
-
-    mNativeView = [[ChildView alloc] initWithFrame:DevPixelsToUIKitPoints(mBounds, BackingScaleFactor()) geckoChild:this];
-    mNativeView.hidden = YES;
-
-    if (parent) {
-        parent->mChildren.AppendElement(this);
-        mParent = parent;
-    }
-
-    if (nativeParent) {
-        [nativeParent addSubview:mNativeView];
-    } else if (nsAppShell::gWindow) {
-        [nsAppShell::gWindow.rootViewController.view addSubview:mNativeView];
-    }
-    else {
-        [nsAppShell::gTopLevelViews addObject:mNativeView];
-    }
-
-  return NS_OK;
-}
-
-void
-nsWindow::Destroy()
-{
-    for (uint32_t i = 0; i < mChildren.Length(); ++i) {
-        // why do we still have children?
-        mChildren[i]->SetParent(nullptr);
-    }
-
-    if (mParent)
-        mParent->mChildren.RemoveElement(this);
-
-    [mNativeView widgetDestroyed];
-
-    nsBaseWidget::Destroy();
-
-    //ReportDestroyEvent();
-
-    TearDownView();
-
-    nsBaseWidget::OnDestroy();
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsWindow::ConfigureChildren(const nsTArray<nsIWidget::Configuration>& config)
-{
-    for (uint32_t i = 0; i < config.Length(); ++i) {
-        nsWindow *childWin = (nsWindow*) config[i].mChild.get();
-        childWin->Resize(config[i].mBounds.x,
-                         config[i].mBounds.y,
-                         config[i].mBounds.width,
-                         config[i].mBounds.height,
-                         false);
-    }
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsWindow::Show(bool aState)
-{
-  if (aState != mVisible) {
-      mNativeView.hidden = aState ? NO : YES;
-      if (aState) {
-          UIView* parentView = mParent ? mParent->mNativeView : nsAppShell::gWindow.rootViewController.view;
-          [parentView bringSubviewToFront:mNativeView];
-          [mNativeView setNeedsDisplay];
-      }
-      mVisible = aState;
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsWindow::Move(double aX, double aY)
-{
-  if (!mNativeView || (mBounds.x == aX && mBounds.y == aY))
-    return NS_OK;
-
-  //XXX: handle this
-  // The point we have is in Gecko coordinates (origin top-left). Convert
-  // it to Cocoa ones (origin bottom-left).
-  mBounds.x = aX;
-  mBounds.y = aY;
-
-  mNativeView.frame = DevPixelsToUIKitPoints(mBounds, BackingScaleFactor());
-
-  if (mVisible)
-    [mNativeView setNeedsDisplay];
-
-  ReportMoveEvent();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsWindow::Resize(double aX, double aY,
-                 double aWidth, double aHeight,
-                 bool aRepaint)
-{
-    BOOL isMoving = (mBounds.x != aX || mBounds.y != aY);
-    BOOL isResizing = (mBounds.width != aWidth || mBounds.height != aHeight);
-    if (!mNativeView || (!isMoving && !isResizing))
-        return NS_OK;
-
-    if (isMoving) {
-        mBounds.x = aX;
-        mBounds.y = aY;
-    }
-    if (isResizing) {
-        mBounds.width  = aWidth;
-        mBounds.height  = aHeight;
-    }
-
-    [mNativeView setFrame:DevPixelsToUIKitPoints(mBounds, BackingScaleFactor())];
-
-    if (mVisible && aRepaint)
-        [mNativeView setNeedsDisplay];
-
-    if (isMoving)
-        ReportMoveEvent();
-
-    if (isResizing)
-        ReportSizeEvent();
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsWindow::Resize(double aWidth, double aHeight, bool aRepaint)
-{
-    if (!mNativeView || (mBounds.width == aWidth && mBounds.height == aHeight))
-        return NS_OK;
-
-    mBounds.width  = aWidth;
-    mBounds.height = aHeight;
-
-    [mNativeView setFrame:DevPixelsToUIKitPoints(mBounds, BackingScaleFactor())];
-
-    if (mVisible && aRepaint)
-        [mNativeView setNeedsDisplay];
-
-    ReportSizeEvent();
-
-    return NS_OK;
-}
-
-void
-nsWindow::SetSizeMode(nsSizeMode aMode)
-{
-    if (aMode == static_cast<int32_t>(mSizeMode)) {
-        return;
-    }
-
-    mSizeMode = static_cast<nsSizeMode>(aMode);
-    if (aMode == nsSizeMode_Maximized || aMode == nsSizeMode_Fullscreen) {
-        // Resize to fill screen
-        nsBaseWidget::InfallibleMakeFullScreen(true);
-    }
-    ReportSizeModeEvent(aMode);
-}
-
-NS_IMETHODIMP
-nsWindow::Invalidate(const LayoutDeviceIntRect& aRect)
-{
-  if (!mNativeView || !mVisible)
-    return NS_OK;
-
-  MOZ_RELEASE_ASSERT(GetLayerManager()->GetBackendType() != LayersBackend::LAYERS_CLIENT,
-                     "Shouldn't need to invalidate with accelerated OMTC layers!");
-
-
-  [mNativeView setNeedsLayout];
-  [mNativeView setNeedsDisplayInRect:DevPixelsToUIKitPoints(mBounds, BackingScaleFactor())];
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsWindow::SetFocus(bool aRaise)
-{
-  [[mNativeView window] makeKeyWindow];
-  [mNativeView becomeFirstResponder];
-  return NS_OK;
-}
-
-void nsWindow::WillPaintWindow()
-{
-  if (mWidgetListener) {
-    mWidgetListener->WillPaintWindow(this);
-  }
-}
-
-bool nsWindow::PaintWindow(LayoutDeviceIntRegion aRegion)
-{
-  if (!mWidgetListener)
-    return false;
-
-  bool returnValue = false;
-  returnValue = mWidgetListener->PaintWindow(this, aRegion);
-
-  if (mWidgetListener) {
-    mWidgetListener->DidPaintWindow();
-  }
-
-  return returnValue;
-}
-
-void nsWindow::ReportMoveEvent()
-{
-    NotifyWindowMoved(mBounds.x, mBounds.y);
-}
-
-void nsWindow::ReportSizeModeEvent(nsSizeMode aMode)
-{
-    if (mWidgetListener) {
-        // This is terrible.
-        nsSizeMode theMode;
-        switch (aMode) {
-        case nsSizeMode_Maximized:
-            theMode = nsSizeMode_Maximized;
-            break;
-        case nsSizeMode_Fullscreen:
-            theMode = nsSizeMode_Fullscreen;
-            break;
-        default:
-            return;
-        }
-        mWidgetListener->SizeModeChanged(theMode);
-    }
-}
-
-void nsWindow::ReportSizeEvent()
-{
-    if (mWidgetListener) {
-        LayoutDeviceIntRect innerBounds = GetClientBounds();
-        mWidgetListener->WindowResized(this, innerBounds.width, innerBounds.height);
-    }
-}
-
-LayoutDeviceIntRect
-nsWindow::GetScreenBounds()
-{
-    return LayoutDeviceIntRect(WidgetToScreenOffset(), mBounds.Size());
-}
-
-LayoutDeviceIntPoint nsWindow::WidgetToScreenOffset()
-{
-    LayoutDeviceIntPoint offset(0, 0);
-    if (mParent) {
-        offset = mParent->WidgetToScreenOffset();
-    }
-
-    CGPoint temp = [mNativeView convertPoint:temp toView:nil];
-
-    if (!mParent && nsAppShell::gWindow) {
-        // convert to screen coords
-        temp = [nsAppShell::gWindow convertPoint:temp toWindow:nil];
-    }
-
-    offset.x += temp.x;
-    offset.y += temp.y;
-
-    return offset;
-}
-
-NS_IMETHODIMP
-nsWindow::DispatchEvent(mozilla::WidgetGUIEvent* aEvent,
-                        nsEventStatus& aStatus)
-{
-  aStatus = nsEventStatus_eIgnore;
-  nsCOMPtr<nsIWidget> kungFuDeathGrip(aEvent->mWidget);
-
-  if (mWidgetListener)
-    aStatus = mWidgetListener->HandleEvent(aEvent, mUseAttachedEvents);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP_(void)
-nsWindow::SetInputContext(const InputContext& aContext,
-                          const InputContextAction& aAction)
-{
-    //TODO: actually show VKB
-    mInputContext = aContext;
-}
-
-NS_IMETHODIMP_(mozilla::widget::InputContext)
-nsWindow::GetInputContext()
-{
-    return mInputContext;
-}
-
-void
-nsWindow::SetBackgroundColor(const nscolor &aColor)
-{
-    mNativeView.backgroundColor = [UIColor colorWithRed:NS_GET_R(aColor)
-                                   green:NS_GET_G(aColor)
-                                   blue:NS_GET_B(aColor)
-                                   alpha:NS_GET_A(aColor)];
-}
-
-void* nsWindow::GetNativeData(uint32_t aDataType)
-{
-  void* retVal = nullptr;
-
-  switch (aDataType)
-  {
-    case NS_NATIVE_WIDGET:
-    case NS_NATIVE_DISPLAY:
-      retVal = (void*)mNativeView;
-      break;
-
-    case NS_NATIVE_WINDOW:
-      retVal = [mNativeView window];
-      break;
-
-    case NS_NATIVE_GRAPHIC:
-      NS_ERROR("Requesting NS_NATIVE_GRAPHIC on a UIKit child view!");
-      break;
-
-    case NS_NATIVE_OFFSETX:
-      retVal = 0;
-      break;
-
-    case NS_NATIVE_OFFSETY:
-      retVal = 0;
-      break;
-
-    case NS_NATIVE_PLUGIN_PORT:
-        // not implemented
-        break;
-
-    case NS_RAW_NATIVE_IME_CONTEXT:
-      retVal = GetPseudoIMEContext();
-      if (retVal) {
-        break;
-      }
-      retVal = NS_ONLY_ONE_NATIVE_IME_CONTEXT;
-      break;
-  }
-
-  return retVal;
-}
-
-CGFloat
-nsWindow::BackingScaleFactor()
-{
-    if (mNativeView) {
-        return [mNativeView contentScaleFactor];
-    }
-    return [UIScreen mainScreen].scale;
-}
-
-int32_t
-nsWindow::RoundsWidgetCoordinatesTo()
-{
-  if (BackingScaleFactor() == 2.0) {
-    return 2;
-  }
-  return 1;
-}

From 70b9128474c75ab5011ea17287089870f3c8f6bb Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Sun, 9 May 2021 00:29:23 +0000
Subject: [PATCH 3/4] Issue #1751 -- Update crashtests

---
 testing/crashtest/crashtests.list | 1 -
 1 file changed, 1 deletion(-)

diff --git a/testing/crashtest/crashtests.list b/testing/crashtest/crashtests.list
index 863c10b9f6..3d798220ef 100644
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -67,7 +67,6 @@ include ../../security/manager/ssl/crashtests/crashtests.list
 
 include ../../view/crashtests/crashtests.list
 
-include ../../widget/cocoa/crashtests/crashtests.list
 include ../../widget/crashtests/crashtests.list
 include ../../widget/gtk/crashtests/crashtests.list
 

From 214ac352e5a8417487197837d06aa2f88835de4a Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Fri, 7 May 2021 01:37:36 +0000
Subject: [PATCH 4/4] [Pale-Moon] Issue #1865 - Remove mac-specific resources

This removes Mac-specific branding resources, shell service components, and the
Mac browser theme.
---
 application/palemoon/base/moz.build           |    4 +-
 .../branding/shared/branding.mozbuild         |    8 -
 .../palemoon/branding/unofficial/disk.icns    |  Bin 39250 -> 0 bytes
 .../branding/unofficial/document.icns         |  Bin 12451 -> 0 bytes
 .../palemoon/branding/unofficial/dsstore      |  Bin 6148 -> 0 bytes
 .../palemoon/branding/unofficial/firefox.icns |  Bin 12079 -> 0 bytes
 .../palemoon/components/build/moz.build       |    5 +-
 .../palemoon/components/preferences/moz.build |    2 +-
 .../palemoon/components/shell/moz.build       |    4 -
 .../components/shell/nsIMacShellService.idl   |   15 -
 .../components/shell/nsMacShellService.cpp    |  434 ---
 .../components/shell/nsMacShellService.h      |   32 -
 application/palemoon/themes/moz.build         |    4 +-
 .../palemoon/themes/osx/Geolocation-16.png    |  Bin 704 -> 0 bytes
 .../palemoon/themes/osx/Geolocation-64.png    |  Bin 8424 -> 0 bytes
 application/palemoon/themes/osx/Info.png      |  Bin 641 -> 0 bytes
 .../palemoon/themes/osx/KUI-background.png    |  Bin 222 -> 0 bytes
 application/palemoon/themes/osx/KUI-close.png |  Bin 393 -> 0 bytes
 application/palemoon/themes/osx/Makefile.in   |    7 -
 .../palemoon/themes/osx/Privacy-16.png        |  Bin 800 -> 0 bytes
 .../palemoon/themes/osx/Privacy-32.png        |  Bin 1995 -> 0 bytes
 .../palemoon/themes/osx/Privacy-48.png        |  Bin 3884 -> 0 bytes
 .../palemoon/themes/osx/Privacy-64.png        |  Bin 8140 -> 0 bytes
 application/palemoon/themes/osx/Search.png    |  Bin 437 -> 0 bytes
 application/palemoon/themes/osx/Secure24.png  |  Bin 1098 -> 0 bytes
 .../palemoon/themes/osx/Toolbar-inverted.png  |  Bin 7101 -> 0 bytes
 .../palemoon/themes/osx/Toolbar-inverted.svg  |  302 --
 application/palemoon/themes/osx/Toolbar.png   |  Bin 16015 -> 0 bytes
 application/palemoon/themes/osx/Toolbar.svg   | 1356 --------
 .../palemoon/themes/osx/aboutCertError.css    |   73 -
 .../aboutCertError_sectionCollapsed-rtl.png   |  Bin 791 -> 0 bytes
 .../osx/aboutCertError_sectionCollapsed.png   |  Bin 776 -> 0 bytes
 .../osx/aboutCertError_sectionExpanded.png    |  Bin 767 -> 0 bytes
 .../themes/osx/aboutPrivateBrowsing.css       |   47 -
 .../themes/osx/aboutSessionRestore.css        |   73 -
 .../palemoon/themes/osx/aboutSyncTabs.css     |  101 -
 .../palemoon/themes/osx/actionicon-tab.png    |  Bin 425 -> 0 bytes
 .../palemoon/themes/osx/autocomplete.css      |  198 --
 application/palemoon/themes/osx/browser.css   | 2884 -----------------
 .../osx/click-to-play-warning-stripes.png     |  Bin 1563 -> 0 bytes
 .../themes/osx/communicator/communicator.css  |    6 -
 .../palemoon/themes/osx/communicator/jar.mn   |    7 -
 .../themes/osx/communicator/moz.build         |    6 -
 .../osx/downloads/allDownloadsViewOverlay.css |  146 -
 .../palemoon/themes/osx/downloads/buttons.png |  Bin 6881 -> 0 bytes
 .../downloads/contentAreaDownloadsView.css    |   22 -
 .../download-notification-finish.png          |  Bin 3755 -> 0 bytes
 .../downloads/download-notification-start.png |  Bin 3166 -> 0 bytes
 .../themes/osx/downloads/download-summary.png |  Bin 741 -> 0 bytes
 .../themes/osx/downloads/downloads.css        |  396 ---
 .../palemoon/themes/osx/engineManager.css     |   16 -
 .../themes/osx/feeds/feed-icons-16.png        |  Bin 2187 -> 0 bytes
 .../palemoon/themes/osx/feeds/feedIcon.png    |  Bin 1833 -> 0 bytes
 .../palemoon/themes/osx/feeds/feedIcon16.png  |  Bin 791 -> 0 bytes
 .../themes/osx/feeds/subscribe-ui.css         |   29 -
 .../palemoon/themes/osx/feeds/subscribe.css   |  159 -
 application/palemoon/themes/osx/icon.png      |  Bin 2185 -> 0 bytes
 .../themes/osx/identity-icons-generic.png     |  Bin 965 -> 0 bytes
 .../themes/osx/identity-icons-https-ev.png    |  Bin 708 -> 0 bytes
 .../osx/identity-icons-https-mixed-active.png |  Bin 984 -> 0 bytes
 .../themes/osx/identity-icons-https.png       |  Bin 672 -> 0 bytes
 application/palemoon/themes/osx/identity.png  |  Bin 10508 -> 0 bytes
 .../palemoon/themes/osx/imagedocument.png     |  Bin 2185 -> 0 bytes
 application/palemoon/themes/osx/jar.mn        |  181 --
 .../themes/osx/keyhole-forward-mask.svg       |   15 -
 .../palemoon/themes/osx/livemark-folder.png   |  Bin 680 -> 0 bytes
 application/palemoon/themes/osx/menu-back.png |  Bin 341 -> 0 bytes
 .../palemoon/themes/osx/menu-forward.png      |  Bin 343 -> 0 bytes
 .../themes/osx/mixed-content-blocked-16.png   |  Bin 346 -> 0 bytes
 .../themes/osx/mixed-content-blocked-64.png   |  Bin 2063 -> 0 bytes
 application/palemoon/themes/osx/monitor.png   |  Bin 6217 -> 0 bytes
 .../palemoon/themes/osx/monitor_16-10.png     |  Bin 6787 -> 0 bytes
 application/palemoon/themes/osx/moz.build     |    8 -
 .../palemoon/themes/osx/newtab/newTab.css     |   36 -
 .../palemoon/themes/osx/page-livemarks.png    |  Bin 683 -> 0 bytes
 .../palemoon/themes/osx/page-livemarks@2x.png |  Bin 1167 -> 0 bytes
 application/palemoon/themes/osx/pageInfo.css  |  258 --
 application/palemoon/themes/osx/pageInfo.png  |  Bin 8118 -> 0 bytes
 .../themes/osx/panel-expander-closed.png      |  Bin 155 -> 0 bytes
 .../themes/osx/panel-expander-closed@2x.png   |  Bin 362 -> 0 bytes
 .../themes/osx/panel-expander-open.png        |  Bin 155 -> 0 bytes
 .../themes/osx/panel-expander-open@2x.png     |  Bin 356 -> 0 bytes
 .../palemoon/themes/osx/panel-plus-sign.png   |  Bin 212 -> 0 bytes
 .../osx/permissions/aboutPermissions.css      |  153 -
 .../themes/osx/places/allBookmarks.png        |  Bin 673 -> 0 bytes
 .../palemoon/themes/osx/places/bookmark.png   |  Bin 1779 -> 0 bytes
 .../themes/osx/places/bookmarksMenu.png       |  Bin 353 -> 0 bytes
 .../themes/osx/places/bookmarksToolbar.png    |  Bin 524 -> 0 bytes
 .../themes/osx/places/bookmarksToolbar@2x.png |  Bin 1179 -> 0 bytes
 .../palemoon/themes/osx/places/calendar.png   |  Bin 614 -> 0 bytes
 .../palemoon/themes/osx/places/downloads.png  |  Bin 678 -> 0 bytes
 .../themes/osx/places/editBookmark.png        |  Bin 1642 -> 0 bytes
 .../themes/osx/places/editBookmarkOverlay.css |  105 -
 .../osx/places/expander-closed-active.png     |  Bin 1329 -> 0 bytes
 .../themes/osx/places/expander-closed.png     |  Bin 837 -> 0 bytes
 .../osx/places/expander-open-active.png       |  Bin 1329 -> 0 bytes
 .../themes/osx/places/expander-open.png       |  Bin 818 -> 0 bytes
 .../themes/osx/places/folderDropArrow.png     |  Bin 201 -> 0 bytes
 .../themes/osx/places/folderDropArrow@2x.png  |  Bin 443 -> 0 bytes
 .../palemoon/themes/osx/places/history.png    |  Bin 843 -> 0 bytes
 .../palemoon/themes/osx/places/history@2x.png |  Bin 1872 -> 0 bytes
 .../themes/osx/places/libraryToolbar.png      |  Bin 2217 -> 0 bytes
 .../themes/osx/places/libraryToolbar.svg      |   41 -
 .../themes/osx/places/livemark-item.png       |  Bin 863 -> 0 bytes
 .../palemoon/themes/osx/places/organizer.css  |  136 -
 .../palemoon/themes/osx/places/places.css     |  146 -
 .../palemoon/themes/osx/places/query.png      |  Bin 549 -> 0 bytes
 .../palemoon/themes/osx/places/query@2x.png   |  Bin 1055 -> 0 bytes
 .../palemoon/themes/osx/places/starred48.png  |  Bin 1785 -> 0 bytes
 .../palemoon/themes/osx/places/tag.png        |  Bin 789 -> 0 bytes
 .../palemoon/themes/osx/places/tag@2x.png     |  Bin 1593 -> 0 bytes
 .../themes/osx/places/toolbarDropMarker.png   |  Bin 302 -> 0 bytes
 .../themes/osx/places/unfiledBookmarks.png    |  Bin 586 -> 0 bytes
 .../themes/osx/places/unfiledBookmarks@2x.png |  Bin 1289 -> 0 bytes
 .../themes/osx/places/unsortedBookmarks.png   |  Bin 780 -> 0 bytes
 .../themes/osx/places/unstarred48.png         |  Bin 818 -> 0 bytes
 .../palemoon/themes/osx/pointerLock-16.png    |  Bin 249 -> 0 bytes
 .../palemoon/themes/osx/pointerLock-64.png    |  Bin 1119 -> 0 bytes
 .../themes/osx/preferences/Options-sync.png   |  Bin 3585 -> 0 bytes
 .../themes/osx/preferences/Options.png        |  Bin 9077 -> 0 bytes
 .../themes/osx/preferences/alwaysAsk.png      |  Bin 446 -> 0 bytes
 .../themes/osx/preferences/application.png    |  Bin 441 -> 0 bytes
 .../themes/osx/preferences/applications.css   |   64 -
 .../palemoon/themes/osx/preferences/mail.png  |  Bin 630 -> 0 bytes
 .../themes/osx/preferences/preferences.css    |  142 -
 .../themes/osx/preferences/saveFile.png       |  Bin 791 -> 0 bytes
 .../themes/osx/privatebrowsing-dark.png       |  Bin 1355 -> 0 bytes
 .../themes/osx/privatebrowsing-light.png      |  Bin 696 -> 0 bytes
 .../themes/osx/privatebrowsing-mask.png       |  Bin 1074 -> 0 bytes
 .../themes/osx/privatebrowsing-mask@2x.png    |  Bin 2639 -> 0 bytes
 .../palemoon/themes/osx/reload-stop-go.png    |  Bin 1945 -> 0 bytes
 .../palemoon/themes/osx/sanitizeDialog.css    |   93 -
 .../themes/osx/searchbar-dropdown-arrow.png   |  Bin 509 -> 0 bytes
 application/palemoon/themes/osx/searchbar.css |   79 -
 .../themes/osx/setDesktopBackground.css       |   18 -
 application/palemoon/themes/osx/shared.inc    |    6 -
 .../palemoon/themes/osx/slowStartup-16.png    |  Bin 512 -> 0 bytes
 .../palemoon/themes/osx/statusbar/overlay.css |  108 -
 .../palemoon/themes/osx/statusbar/prefs.css   |   13 -
 application/palemoon/themes/osx/sync-128.png  |  Bin 20229 -> 0 bytes
 application/palemoon/themes/osx/sync-16.png   |  Bin 1847 -> 0 bytes
 application/palemoon/themes/osx/sync-32.png   |  Bin 3384 -> 0 bytes
 application/palemoon/themes/osx/sync-bg.png   |  Bin 21309 -> 0 bytes
 .../palemoon/themes/osx/sync-desktopIcon.png  |  Bin 291 -> 0 bytes
 .../palemoon/themes/osx/sync-mobileIcon.png   |  Bin 352 -> 0 bytes
 .../palemoon/themes/osx/sync-throbber.png     |  Bin 10362 -> 0 bytes
 .../palemoon/themes/osx/syncCommon.css        |   49 -
 .../palemoon/themes/osx/syncProgress.css      |   46 -
 application/palemoon/themes/osx/syncQuota.css |   26 -
 application/palemoon/themes/osx/syncSetup.css |  132 -
 .../osx/tabbrowser/alltabs-inverted.png       |  Bin 469 -> 0 bytes
 .../themes/osx/tabbrowser/alltabs.png         |  Bin 584 -> 0 bytes
 .../themes/osx/tabbrowser/connecting.png      |  Bin 8540 -> 0 bytes
 .../themes/osx/tabbrowser/loading.png         |  Bin 10727 -> 0 bytes
 .../themes/osx/tabbrowser/newtab-inverted.png |  Bin 247 -> 0 bytes
 .../palemoon/themes/osx/tabbrowser/newtab.png |  Bin 237 -> 0 bytes
 .../tabbrowser/tab-arrow-left-inverted.png    |  Bin 250 -> 0 bytes
 .../themes/osx/tabbrowser/tab-arrow-left.png  |  Bin 368 -> 0 bytes
 .../osx/tabbrowser/tab-overflow-border.png    |  Bin 193 -> 0 bytes
 .../osx/tabbrowser/tabDragIndicator.png       |  Bin 3117 -> 0 bytes
 .../toolbarbutton-dropdown-arrow-inverted.png |  Bin 221 -> 0 bytes
 .../osx/toolbarbutton-dropdown-arrow.png      |  Bin 287 -> 0 bytes
 .../palemoon/themes/osx/urlbar-arrow.png      |  Bin 305 -> 0 bytes
 .../themes/osx/urlbar-history-dropmarker.png  |  Bin 480 -> 0 bytes
 .../themes/osx/urlbar-popup-blocked.png       |  Bin 745 -> 0 bytes
 .../themes/osx/web-notifications-icon.svg     |   15 -
 .../themes/osx/web-notifications-tray.svg     |   23 -
 .../themes/osx/webRTC-shareDevice-16.png      |  Bin 233 -> 0 bytes
 .../themes/osx/webRTC-shareDevice-64.png      |  Bin 1097 -> 0 bytes
 .../themes/osx/webRTC-sharingDevice-16.png    |  Bin 404 -> 0 bytes
 170 files changed, 5 insertions(+), 8224 deletions(-)
 delete mode 100644 application/palemoon/branding/unofficial/disk.icns
 delete mode 100644 application/palemoon/branding/unofficial/document.icns
 delete mode 100644 application/palemoon/branding/unofficial/dsstore
 delete mode 100644 application/palemoon/branding/unofficial/firefox.icns
 delete mode 100644 application/palemoon/components/shell/nsIMacShellService.idl
 delete mode 100644 application/palemoon/components/shell/nsMacShellService.cpp
 delete mode 100644 application/palemoon/components/shell/nsMacShellService.h
 delete mode 100644 application/palemoon/themes/osx/Geolocation-16.png
 delete mode 100644 application/palemoon/themes/osx/Geolocation-64.png
 delete mode 100644 application/palemoon/themes/osx/Info.png
 delete mode 100644 application/palemoon/themes/osx/KUI-background.png
 delete mode 100644 application/palemoon/themes/osx/KUI-close.png
 delete mode 100644 application/palemoon/themes/osx/Makefile.in
 delete mode 100644 application/palemoon/themes/osx/Privacy-16.png
 delete mode 100644 application/palemoon/themes/osx/Privacy-32.png
 delete mode 100644 application/palemoon/themes/osx/Privacy-48.png
 delete mode 100644 application/palemoon/themes/osx/Privacy-64.png
 delete mode 100644 application/palemoon/themes/osx/Search.png
 delete mode 100644 application/palemoon/themes/osx/Secure24.png
 delete mode 100644 application/palemoon/themes/osx/Toolbar-inverted.png
 delete mode 100644 application/palemoon/themes/osx/Toolbar-inverted.svg
 delete mode 100644 application/palemoon/themes/osx/Toolbar.png
 delete mode 100644 application/palemoon/themes/osx/Toolbar.svg
 delete mode 100644 application/palemoon/themes/osx/aboutCertError.css
 delete mode 100644 application/palemoon/themes/osx/aboutCertError_sectionCollapsed-rtl.png
 delete mode 100644 application/palemoon/themes/osx/aboutCertError_sectionCollapsed.png
 delete mode 100644 application/palemoon/themes/osx/aboutCertError_sectionExpanded.png
 delete mode 100644 application/palemoon/themes/osx/aboutPrivateBrowsing.css
 delete mode 100644 application/palemoon/themes/osx/aboutSessionRestore.css
 delete mode 100644 application/palemoon/themes/osx/aboutSyncTabs.css
 delete mode 100644 application/palemoon/themes/osx/actionicon-tab.png
 delete mode 100644 application/palemoon/themes/osx/autocomplete.css
 delete mode 100644 application/palemoon/themes/osx/browser.css
 delete mode 100644 application/palemoon/themes/osx/click-to-play-warning-stripes.png
 delete mode 100644 application/palemoon/themes/osx/communicator/communicator.css
 delete mode 100644 application/palemoon/themes/osx/communicator/jar.mn
 delete mode 100644 application/palemoon/themes/osx/communicator/moz.build
 delete mode 100644 application/palemoon/themes/osx/downloads/allDownloadsViewOverlay.css
 delete mode 100644 application/palemoon/themes/osx/downloads/buttons.png
 delete mode 100644 application/palemoon/themes/osx/downloads/contentAreaDownloadsView.css
 delete mode 100644 application/palemoon/themes/osx/downloads/download-notification-finish.png
 delete mode 100644 application/palemoon/themes/osx/downloads/download-notification-start.png
 delete mode 100644 application/palemoon/themes/osx/downloads/download-summary.png
 delete mode 100644 application/palemoon/themes/osx/downloads/downloads.css
 delete mode 100644 application/palemoon/themes/osx/engineManager.css
 delete mode 100644 application/palemoon/themes/osx/feeds/feed-icons-16.png
 delete mode 100644 application/palemoon/themes/osx/feeds/feedIcon.png
 delete mode 100644 application/palemoon/themes/osx/feeds/feedIcon16.png
 delete mode 100644 application/palemoon/themes/osx/feeds/subscribe-ui.css
 delete mode 100644 application/palemoon/themes/osx/feeds/subscribe.css
 delete mode 100644 application/palemoon/themes/osx/icon.png
 delete mode 100644 application/palemoon/themes/osx/identity-icons-generic.png
 delete mode 100644 application/palemoon/themes/osx/identity-icons-https-ev.png
 delete mode 100644 application/palemoon/themes/osx/identity-icons-https-mixed-active.png
 delete mode 100644 application/palemoon/themes/osx/identity-icons-https.png
 delete mode 100644 application/palemoon/themes/osx/identity.png
 delete mode 100644 application/palemoon/themes/osx/imagedocument.png
 delete mode 100644 application/palemoon/themes/osx/jar.mn
 delete mode 100644 application/palemoon/themes/osx/keyhole-forward-mask.svg
 delete mode 100644 application/palemoon/themes/osx/livemark-folder.png
 delete mode 100644 application/palemoon/themes/osx/menu-back.png
 delete mode 100644 application/palemoon/themes/osx/menu-forward.png
 delete mode 100644 application/palemoon/themes/osx/mixed-content-blocked-16.png
 delete mode 100644 application/palemoon/themes/osx/mixed-content-blocked-64.png
 delete mode 100644 application/palemoon/themes/osx/monitor.png
 delete mode 100644 application/palemoon/themes/osx/monitor_16-10.png
 delete mode 100644 application/palemoon/themes/osx/moz.build
 delete mode 100644 application/palemoon/themes/osx/newtab/newTab.css
 delete mode 100644 application/palemoon/themes/osx/page-livemarks.png
 delete mode 100644 application/palemoon/themes/osx/page-livemarks@2x.png
 delete mode 100644 application/palemoon/themes/osx/pageInfo.css
 delete mode 100644 application/palemoon/themes/osx/pageInfo.png
 delete mode 100644 application/palemoon/themes/osx/panel-expander-closed.png
 delete mode 100644 application/palemoon/themes/osx/panel-expander-closed@2x.png
 delete mode 100644 application/palemoon/themes/osx/panel-expander-open.png
 delete mode 100644 application/palemoon/themes/osx/panel-expander-open@2x.png
 delete mode 100644 application/palemoon/themes/osx/panel-plus-sign.png
 delete mode 100644 application/palemoon/themes/osx/permissions/aboutPermissions.css
 delete mode 100644 application/palemoon/themes/osx/places/allBookmarks.png
 delete mode 100644 application/palemoon/themes/osx/places/bookmark.png
 delete mode 100644 application/palemoon/themes/osx/places/bookmarksMenu.png
 delete mode 100644 application/palemoon/themes/osx/places/bookmarksToolbar.png
 delete mode 100644 application/palemoon/themes/osx/places/bookmarksToolbar@2x.png
 delete mode 100644 application/palemoon/themes/osx/places/calendar.png
 delete mode 100644 application/palemoon/themes/osx/places/downloads.png
 delete mode 100644 application/palemoon/themes/osx/places/editBookmark.png
 delete mode 100644 application/palemoon/themes/osx/places/editBookmarkOverlay.css
 delete mode 100644 application/palemoon/themes/osx/places/expander-closed-active.png
 delete mode 100644 application/palemoon/themes/osx/places/expander-closed.png
 delete mode 100644 application/palemoon/themes/osx/places/expander-open-active.png
 delete mode 100644 application/palemoon/themes/osx/places/expander-open.png
 delete mode 100644 application/palemoon/themes/osx/places/folderDropArrow.png
 delete mode 100644 application/palemoon/themes/osx/places/folderDropArrow@2x.png
 delete mode 100644 application/palemoon/themes/osx/places/history.png
 delete mode 100644 application/palemoon/themes/osx/places/history@2x.png
 delete mode 100644 application/palemoon/themes/osx/places/libraryToolbar.png
 delete mode 100644 application/palemoon/themes/osx/places/libraryToolbar.svg
 delete mode 100644 application/palemoon/themes/osx/places/livemark-item.png
 delete mode 100644 application/palemoon/themes/osx/places/organizer.css
 delete mode 100644 application/palemoon/themes/osx/places/places.css
 delete mode 100644 application/palemoon/themes/osx/places/query.png
 delete mode 100644 application/palemoon/themes/osx/places/query@2x.png
 delete mode 100644 application/palemoon/themes/osx/places/starred48.png
 delete mode 100644 application/palemoon/themes/osx/places/tag.png
 delete mode 100644 application/palemoon/themes/osx/places/tag@2x.png
 delete mode 100644 application/palemoon/themes/osx/places/toolbarDropMarker.png
 delete mode 100644 application/palemoon/themes/osx/places/unfiledBookmarks.png
 delete mode 100644 application/palemoon/themes/osx/places/unfiledBookmarks@2x.png
 delete mode 100644 application/palemoon/themes/osx/places/unsortedBookmarks.png
 delete mode 100644 application/palemoon/themes/osx/places/unstarred48.png
 delete mode 100644 application/palemoon/themes/osx/pointerLock-16.png
 delete mode 100644 application/palemoon/themes/osx/pointerLock-64.png
 delete mode 100644 application/palemoon/themes/osx/preferences/Options-sync.png
 delete mode 100644 application/palemoon/themes/osx/preferences/Options.png
 delete mode 100644 application/palemoon/themes/osx/preferences/alwaysAsk.png
 delete mode 100644 application/palemoon/themes/osx/preferences/application.png
 delete mode 100644 application/palemoon/themes/osx/preferences/applications.css
 delete mode 100644 application/palemoon/themes/osx/preferences/mail.png
 delete mode 100644 application/palemoon/themes/osx/preferences/preferences.css
 delete mode 100644 application/palemoon/themes/osx/preferences/saveFile.png
 delete mode 100644 application/palemoon/themes/osx/privatebrowsing-dark.png
 delete mode 100644 application/palemoon/themes/osx/privatebrowsing-light.png
 delete mode 100644 application/palemoon/themes/osx/privatebrowsing-mask.png
 delete mode 100644 application/palemoon/themes/osx/privatebrowsing-mask@2x.png
 delete mode 100644 application/palemoon/themes/osx/reload-stop-go.png
 delete mode 100644 application/palemoon/themes/osx/sanitizeDialog.css
 delete mode 100644 application/palemoon/themes/osx/searchbar-dropdown-arrow.png
 delete mode 100644 application/palemoon/themes/osx/searchbar.css
 delete mode 100644 application/palemoon/themes/osx/setDesktopBackground.css
 delete mode 100644 application/palemoon/themes/osx/shared.inc
 delete mode 100644 application/palemoon/themes/osx/slowStartup-16.png
 delete mode 100644 application/palemoon/themes/osx/statusbar/overlay.css
 delete mode 100644 application/palemoon/themes/osx/statusbar/prefs.css
 delete mode 100644 application/palemoon/themes/osx/sync-128.png
 delete mode 100644 application/palemoon/themes/osx/sync-16.png
 delete mode 100644 application/palemoon/themes/osx/sync-32.png
 delete mode 100644 application/palemoon/themes/osx/sync-bg.png
 delete mode 100644 application/palemoon/themes/osx/sync-desktopIcon.png
 delete mode 100644 application/palemoon/themes/osx/sync-mobileIcon.png
 delete mode 100644 application/palemoon/themes/osx/sync-throbber.png
 delete mode 100644 application/palemoon/themes/osx/syncCommon.css
 delete mode 100644 application/palemoon/themes/osx/syncProgress.css
 delete mode 100644 application/palemoon/themes/osx/syncQuota.css
 delete mode 100644 application/palemoon/themes/osx/syncSetup.css
 delete mode 100644 application/palemoon/themes/osx/tabbrowser/alltabs-inverted.png
 delete mode 100644 application/palemoon/themes/osx/tabbrowser/alltabs.png
 delete mode 100644 application/palemoon/themes/osx/tabbrowser/connecting.png
 delete mode 100644 application/palemoon/themes/osx/tabbrowser/loading.png
 delete mode 100644 application/palemoon/themes/osx/tabbrowser/newtab-inverted.png
 delete mode 100644 application/palemoon/themes/osx/tabbrowser/newtab.png
 delete mode 100644 application/palemoon/themes/osx/tabbrowser/tab-arrow-left-inverted.png
 delete mode 100644 application/palemoon/themes/osx/tabbrowser/tab-arrow-left.png
 delete mode 100644 application/palemoon/themes/osx/tabbrowser/tab-overflow-border.png
 delete mode 100644 application/palemoon/themes/osx/tabbrowser/tabDragIndicator.png
 delete mode 100644 application/palemoon/themes/osx/toolbarbutton-dropdown-arrow-inverted.png
 delete mode 100644 application/palemoon/themes/osx/toolbarbutton-dropdown-arrow.png
 delete mode 100644 application/palemoon/themes/osx/urlbar-arrow.png
 delete mode 100644 application/palemoon/themes/osx/urlbar-history-dropmarker.png
 delete mode 100644 application/palemoon/themes/osx/urlbar-popup-blocked.png
 delete mode 100644 application/palemoon/themes/osx/web-notifications-icon.svg
 delete mode 100644 application/palemoon/themes/osx/web-notifications-tray.svg
 delete mode 100644 application/palemoon/themes/osx/webRTC-shareDevice-16.png
 delete mode 100644 application/palemoon/themes/osx/webRTC-shareDevice-64.png
 delete mode 100644 application/palemoon/themes/osx/webRTC-sharingDevice-16.png

diff --git a/application/palemoon/base/moz.build b/application/palemoon/base/moz.build
index dfa89c7d30..c1470f25c9 100644
--- a/application/palemoon/base/moz.build
+++ b/application/palemoon/base/moz.build
@@ -6,11 +6,9 @@
 DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
 DEFINES['APP_LICENSE_BLOCK'] = '%s/content/overrides/app-license.html' % SRCDIR
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):
     DEFINES['HAVE_SHELL_SERVICE'] = 1
     DEFINES['CONTEXT_COPY_IMAGE_CONTENTS'] = 1
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):
     DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1
 
 JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/application/palemoon/branding/shared/branding.mozbuild b/application/palemoon/branding/shared/branding.mozbuild
index 284520add8..e253620d27 100644
--- a/application/palemoon/branding/shared/branding.mozbuild
+++ b/application/palemoon/branding/shared/branding.mozbuild
@@ -30,14 +30,6 @@ def ApplicationBranding():
             'wizHeaderRTL.bmp',
             'wizWatermark.bmp',
         ]
-    elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-        BRANDING_FILES += [
-            '../shared/background.png',
-            'disk.icns',
-            'document.icns',
-            'dsstore',
-            'firefox.icns',
-        ]
     elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
         BRANDING_FILES += [
             'default16.png',
diff --git a/application/palemoon/branding/unofficial/disk.icns b/application/palemoon/branding/unofficial/disk.icns
deleted file mode 100644
index e97e490585226e69da9cfff20b3b4db2384d963e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 39250
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

diff --git a/application/palemoon/branding/unofficial/document.icns b/application/palemoon/branding/unofficial/document.icns
deleted file mode 100644
index dd5f7aa8924682fa0bfde8072f91db79b87bf73c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12451
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
C>(<c#

diff --git a/application/palemoon/branding/unofficial/dsstore b/application/palemoon/branding/unofficial/dsstore
deleted file mode 100644
index bbba9ecce0d455ff3d5450fc965c8bd9571b4270..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK%We}f6g>`+QZ-cw>86{Y5eqhmQIS}6H415=>Y_+UY@suGFlsa&g`{*jf54V6
z={BFhKkyN3>AAj6N*Rz?Aq2jXeXj3gY@f)!F#t1Ij-CKr09$N=&24r+5%Ei_NyA%O
zM5EuR#RNlOATaRvGN5NS9-KTMrZbyzp*t_L#efI;A@yB0gZTK_>(kWQ84tM(Cm-^C
zAKb+kv)|}9KId6+L9YlS^6bL;h@R-`U|$us7;j=0@88)uM>}dM^K7A6ZgN=yub9?R
zJ|9o)C1Yx`>OVbw@yMBbo%Ad_pU&;F7{z5Vt;PO^VRzMke6^1IMxnmG<ksePd^3;i
zwMj>hQ4jnw55Dss+=RL%b#NaYq&P!{b4)RZ#S#TZh*1)!xXYWkg(KwjjWMDBk`~^+
ztN!dGXS%2Q_$%O62ef~Pj`{Tx<?+mBo8Jg{!`x4@BcHY2O~C({0Xfc;t+rz50|SA9
zz`%w9xgR1n!Ng;w=&lZSt~wH>3Ob=KZwbkXJSHA1MS3X47gjBxGS(-C(R7X@AD4Kn
z6g3^j*Ja~pHvWZT-0b{b<icSR#n1-^0t2@hxTC|a)c?a@zyEJ1g;8K2Fz`<?V4A~M
z!vVMCYin(DQfni&w`?L3S1Gy_cD@`tMN07=n-lsXQHY7hN|6>y_#@zG2wh;{k1}u#
DEgNTD

diff --git a/application/palemoon/branding/unofficial/firefox.icns b/application/palemoon/branding/unofficial/firefox.icns
deleted file mode 100644
index 117ddb195258602ac6214320942f55ce1af385c8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12079
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
J-v+*v{s+LxEp7k+

diff --git a/application/palemoon/components/build/moz.build b/application/palemoon/components/build/moz.build
index ebacbec8f3..26f2d14237 100644
--- a/application/palemoon/components/build/moz.build
+++ b/application/palemoon/components/build/moz.build
@@ -29,7 +29,6 @@ if CONFIG['OS_ARCH'] == 'WINNT':
         'netapi32.dll',
     ]
 
-# Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code)
-# GTK2: Need to link with glib for GNOME shell service
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'gtk2', 'gtk3'):
+# GTK: Need to link with glib for GNOME shell service
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
     OS_LIBS += CONFIG['TK_LIBS']
diff --git a/application/palemoon/components/preferences/moz.build b/application/palemoon/components/preferences/moz.build
index 49b3c3d766..c888607f0f 100644
--- a/application/palemoon/components/preferences/moz.build
+++ b/application/palemoon/components/preferences/moz.build
@@ -7,7 +7,7 @@
 for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'):
     DEFINES[var] = CONFIG[var]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):
     DEFINES['HAVE_SHELL_SERVICE'] = 1
 
 JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/application/palemoon/components/shell/moz.build b/application/palemoon/components/shell/moz.build
index 6e086f96d0..de34f17fb8 100644
--- a/application/palemoon/components/shell/moz.build
+++ b/application/palemoon/components/shell/moz.build
@@ -9,8 +9,6 @@ XPIDL_SOURCES += ['nsIShellService.idl']
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     XPIDL_SOURCES += ['nsIWindowsShellService.idl']
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    XPIDL_SOURCES += ['nsIMacShellService.idl']
 elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
     XPIDL_SOURCES += ['nsIGNOMEShellService.idl']
 
@@ -18,8 +16,6 @@ XPIDL_MODULE = 'shellservice'
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     SOURCES += ['nsWindowsShellService.cpp']
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    SOURCES += ['nsMacShellService.cpp']
 elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
     SOURCES += ['nsGNOMEShellService.cpp']
 
diff --git a/application/palemoon/components/shell/nsIMacShellService.idl b/application/palemoon/components/shell/nsIMacShellService.idl
deleted file mode 100644
index 6a532bbd0b..0000000000
--- a/application/palemoon/components/shell/nsIMacShellService.idl
+++ /dev/null
@@ -1,15 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "nsIShellService.idl"
-
-[scriptable, uuid(387fdc80-0077-4b60-a0d9-d9e80a83ba64)]
-interface nsIMacShellService : nsIShellService
-{
-  const long APPLICATION_KEYCHAIN_ACCESS  = 2;
-  const long APPLICATION_NETWORK          = 3;
-  const long APPLICATION_DESKTOP          = 4;
-};
-
diff --git a/application/palemoon/components/shell/nsMacShellService.cpp b/application/palemoon/components/shell/nsMacShellService.cpp
deleted file mode 100644
index d8d64039d3..0000000000
--- a/application/palemoon/components/shell/nsMacShellService.cpp
+++ /dev/null
@@ -1,434 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#include "nsDirectoryServiceDefs.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMHTMLImageElement.h"
-#include "nsIImageLoadingContent.h"
-#include "nsIDocument.h"
-#include "nsIContent.h"
-#include "nsILocalFileMac.h"
-#include "nsIObserverService.h"
-#include "nsIPrefService.h"
-#include "nsIServiceManager.h"
-#include "nsIStringBundle.h"
-#include "nsIURL.h"
-#include "nsIWebBrowserPersist.h"
-#include "nsMacShellService.h"
-#include "nsIProperties.h"
-#include "nsServiceManagerUtils.h"
-#include "nsShellService.h"
-#include "nsStringAPI.h"
-#include "nsIDocShell.h"
-#include "nsILoadContext.h"
-
-#include <CoreFoundation/CoreFoundation.h>
-#include <ApplicationServices/ApplicationServices.h>
-
-#define NETWORK_PREFPANE NS_LITERAL_CSTRING("/System/Library/PreferencePanes/Network.prefPane")
-#define DESKTOP_PREFPANE NS_LITERAL_CSTRING("/System/Library/PreferencePanes/DesktopScreenEffectsPref.prefPane")
-
-#define SAFARI_BUNDLE_IDENTIFIER "com.apple.Safari"
-
-NS_IMPL_ISUPPORTS(nsMacShellService, nsIMacShellService, nsIShellService, nsIWebProgressListener)
-
-NS_IMETHODIMP
-nsMacShellService::IsDefaultBrowser(bool aStartupCheck,
-                                    bool aForAllTypes,
-                                    bool* aIsDefaultBrowser)
-{
-  *aIsDefaultBrowser = false;
-
-  CFStringRef firefoxID = ::CFBundleGetIdentifier(::CFBundleGetMainBundle());
-  if (!firefoxID) {
-    // CFBundleGetIdentifier is expected to return nullptr only if the specified
-    // bundle doesn't have a bundle identifier in its plist. In this case, that
-    // means a failure, since our bundle does have an identifier.
-    return NS_ERROR_FAILURE;
-  }
-
-  // Get the default http handler's bundle ID (or nullptr if it has not been
-  // explicitly set)
-  CFStringRef defaultBrowserID = ::LSCopyDefaultHandlerForURLScheme(CFSTR("http"));
-  if (defaultBrowserID) {
-    *aIsDefaultBrowser = ::CFStringCompare(firefoxID, defaultBrowserID, 0) == kCFCompareEqualTo;
-    ::CFRelease(defaultBrowserID);
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMacShellService::SetDefaultBrowser(bool aClaimAllTypes, bool aForAllUsers)
-{
-  // Note: We don't support aForAllUsers on Mac OS X.
-
-  CFStringRef firefoxID = ::CFBundleGetIdentifier(::CFBundleGetMainBundle());
-  if (!firefoxID) {
-    return NS_ERROR_FAILURE;
-  }
-
-  if (::LSSetDefaultHandlerForURLScheme(CFSTR("http"), firefoxID) != noErr) {
-    return NS_ERROR_FAILURE;
-  }
-  if (::LSSetDefaultHandlerForURLScheme(CFSTR("https"), firefoxID) != noErr) {
-    return NS_ERROR_FAILURE;
-  }
-
-  if (aClaimAllTypes) {
-    if (::LSSetDefaultHandlerForURLScheme(CFSTR("ftp"), firefoxID) != noErr) {
-      return NS_ERROR_FAILURE;
-    }
-    if (::LSSetDefaultRoleHandlerForContentType(kUTTypeHTML, kLSRolesAll, firefoxID) != noErr) {
-      return NS_ERROR_FAILURE;
-    }
-  }
-
-  nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
-  if (prefs) {
-    (void) prefs->SetBoolPref(PREF_CHECKDEFAULTBROWSER, true);
-    // Reset the number of times the dialog should be shown
-    // before it is silenced.
-    (void) prefs->SetIntPref(PREF_DEFAULTBROWSERCHECKCOUNT, 0);
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMacShellService::SetDesktopBackground(nsIDOMElement* aElement, 
-                                        int32_t aPosition)
-{
-  // Note: We don't support aPosition on OS X.
-
-  // Get the image URI:
-  nsresult rv;
-  nsCOMPtr<nsIImageLoadingContent> imageContent = do_QueryInterface(aElement,
-                                                                    &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-  nsCOMPtr<nsIURI> imageURI;
-  rv = imageContent->GetCurrentURI(getter_AddRefs(imageURI));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // We need the referer URI for nsIWebBrowserPersist::saveURI
-  nsCOMPtr<nsIContent> content = do_QueryInterface(aElement, &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsIURI *docURI = content->OwnerDoc()->GetDocumentURI();
-  if (!docURI)
-    return NS_ERROR_FAILURE;
-
-  // Get the desired image file name
-  nsCOMPtr<nsIURL> imageURL(do_QueryInterface(imageURI));
-  if (!imageURL) {
-    // XXXmano (bug 300293): Non-URL images (e.g. the data: protocol) are not
-    // yet supported. What filename should we take here?
-    return NS_ERROR_NOT_IMPLEMENTED;
-  }
-
-  nsAutoCString fileName;
-  imageURL->GetFileName(fileName);
-  nsCOMPtr<nsIProperties> fileLocator
-    (do_GetService("@mozilla.org/file/directory_service;1", &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // Get the current user's "Pictures" folder (That's ~/Pictures):
-  fileLocator->Get(NS_OSX_PICTURE_DOCUMENTS_DIR, NS_GET_IID(nsIFile),
-                   getter_AddRefs(mBackgroundFile));
-  if (!mBackgroundFile)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  nsAutoString fileNameUnicode;
-  CopyUTF8toUTF16(fileName, fileNameUnicode);
-
-  // and add the imgage file name itself:
-  mBackgroundFile->Append(fileNameUnicode);
-
-  // Download the image; the desktop background will be set in OnStateChange()
-  nsCOMPtr<nsIWebBrowserPersist> wbp
-    (do_CreateInstance("@mozilla.org/embedding/browser/nsWebBrowserPersist;1", &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  uint32_t flags = nsIWebBrowserPersist::PERSIST_FLAGS_NO_CONVERSION | 
-                   nsIWebBrowserPersist::PERSIST_FLAGS_REPLACE_EXISTING_FILES |
-                   nsIWebBrowserPersist::PERSIST_FLAGS_FROM_CACHE;
-
-  wbp->SetPersistFlags(flags);
-  wbp->SetProgressListener(this);
-
-  nsCOMPtr<nsILoadContext> loadContext;
-  nsCOMPtr<nsISupports> container = content->OwnerDoc()->GetContainer();
-  nsCOMPtr<nsIDocShell> docShell = do_QueryInterface(container);
-  if (docShell) {
-    loadContext = do_QueryInterface(docShell);
-  }
-
-  return wbp->SaveURI(imageURI, nullptr,
-                      docURI, content->OwnerDoc()->GetReferrerPolicy(),
-                      nullptr, nullptr,
-                      mBackgroundFile, loadContext);
-}
-
-NS_IMETHODIMP
-nsMacShellService::OnProgressChange(nsIWebProgress* aWebProgress,
-                                    nsIRequest* aRequest,
-                                    int32_t aCurSelfProgress,
-                                    int32_t aMaxSelfProgress,
-                                    int32_t aCurTotalProgress,
-                                    int32_t aMaxTotalProgress)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMacShellService::OnLocationChange(nsIWebProgress* aWebProgress,
-                                    nsIRequest* aRequest,
-                                    nsIURI* aLocation,
-                                    uint32_t aFlags)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMacShellService::OnStatusChange(nsIWebProgress* aWebProgress,
-                                  nsIRequest* aRequest,
-                                  nsresult aStatus,
-                                  const char16_t* aMessage)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMacShellService::OnSecurityChange(nsIWebProgress* aWebProgress,
-                                    nsIRequest* aRequest,
-                                    uint32_t aState)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMacShellService::OnStateChange(nsIWebProgress* aWebProgress,
-                                 nsIRequest* aRequest,
-                                 uint32_t aStateFlags,
-                                 nsresult aStatus)
-{
-  if (aStateFlags & STATE_STOP) {
-    nsCOMPtr<nsIObserverService> os(do_GetService("@mozilla.org/observer-service;1"));
-    if (os)
-      os->NotifyObservers(nullptr, "shell:desktop-background-changed", nullptr);
-
-    bool exists = false;
-    mBackgroundFile->Exists(&exists);
-    if (!exists)
-      return NS_OK;
-
-    nsAutoCString nativePath;
-    mBackgroundFile->GetNativePath(nativePath);
-
-    AEDesc tAEDesc = { typeNull, nil };
-    OSErr err = noErr;
-    AliasHandle aliasHandle = nil;
-    FSRef pictureRef;
-    OSStatus status;
-
-    // Convert the path into a FSRef
-    status = ::FSPathMakeRef((const UInt8*)nativePath.get(), &pictureRef,
-                             nullptr);
-    if (status == noErr) {
-      err = ::FSNewAlias(nil, &pictureRef, &aliasHandle);
-      if (err == noErr && aliasHandle == nil)
-        err = paramErr;
-
-      if (err == noErr) {
-        // We need the descriptor (based on the picture file reference)
-        // for the 'Set Desktop Picture' apple event.
-        char handleState = ::HGetState((Handle)aliasHandle);
-        ::HLock((Handle)aliasHandle);
-        err = ::AECreateDesc(typeAlias, *aliasHandle,
-                             GetHandleSize((Handle)aliasHandle), &tAEDesc);
-        // unlock the alias handler
-        ::HSetState((Handle)aliasHandle, handleState);
-        ::DisposeHandle((Handle)aliasHandle);
-      }
-      if (err == noErr) {
-        AppleEvent tAppleEvent;
-        OSType sig = 'MACS';
-        AEBuildError tAEBuildError;
-        // Create a 'Set Desktop Pictue' Apple Event
-        err = ::AEBuildAppleEvent(kAECoreSuite, kAESetData, typeApplSignature,
-                                  &sig, sizeof(OSType), kAutoGenerateReturnID,
-                                  kAnyTransactionID, &tAppleEvent, &tAEBuildError,
-                                  "'----':'obj '{want:type (prop),form:prop" \
-                                  ",seld:type('dpic'),from:'null'()},data:(@)",
-                                  &tAEDesc);
-        if (err == noErr) {
-          AppleEvent reply = { typeNull, nil };
-          // Sent the event we built, the reply event isn't necessary
-          err = ::AESend(&tAppleEvent, &reply, kAENoReply, kAENormalPriority,
-                         kNoTimeOut, nil, nil);
-          ::AEDisposeDesc(&tAppleEvent);
-        }
-      }
-    }
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMacShellService::OpenApplication(int32_t aApplication)
-{
-  nsresult rv = NS_OK;
-  CFURLRef appURL = nil;
-  OSStatus err = noErr;
-
-  switch (aApplication) {
-  case nsIShellService::APPLICATION_MAIL:
-    {
-      CFURLRef tempURL = ::CFURLCreateWithString(kCFAllocatorDefault,
-                                                 CFSTR("mailto:"), nullptr);
-      err = ::LSGetApplicationForURL(tempURL, kLSRolesAll, nullptr, &appURL);
-      ::CFRelease(tempURL);
-    }
-    break;
-  case nsIShellService::APPLICATION_NEWS:
-    {
-      CFURLRef tempURL = ::CFURLCreateWithString(kCFAllocatorDefault,
-                                                 CFSTR("news:"), nullptr);
-      err = ::LSGetApplicationForURL(tempURL, kLSRolesAll, nullptr, &appURL);
-      ::CFRelease(tempURL);
-    }
-    break;
-  case nsIMacShellService::APPLICATION_KEYCHAIN_ACCESS:
-    err = ::LSGetApplicationForInfo('APPL', 'kcmr', nullptr, kLSRolesAll,
-                                    nullptr, &appURL);
-    break;
-  case nsIMacShellService::APPLICATION_NETWORK:
-    {
-      nsCOMPtr<nsIFile> lf;
-      rv = NS_NewNativeLocalFile(NETWORK_PREFPANE, true, getter_AddRefs(lf));
-      NS_ENSURE_SUCCESS(rv, rv);
-      bool exists;
-      lf->Exists(&exists);
-      if (!exists)
-        return NS_ERROR_FILE_NOT_FOUND;
-      return lf->Launch();
-    }
-  case nsIMacShellService::APPLICATION_DESKTOP:
-    {
-      nsCOMPtr<nsIFile> lf;
-      rv = NS_NewNativeLocalFile(DESKTOP_PREFPANE, true, getter_AddRefs(lf));
-      NS_ENSURE_SUCCESS(rv, rv);
-      bool exists;
-      lf->Exists(&exists);
-      if (!exists)
-        return NS_ERROR_FILE_NOT_FOUND;
-      return lf->Launch();
-    }
-  }
-
-  if (appURL && err == noErr) {
-    err = ::LSOpenCFURLRef(appURL, nullptr);
-    rv = err != noErr ? NS_ERROR_FAILURE : NS_OK;
-
-    ::CFRelease(appURL);
-  }
-
-  return rv;
-}
-
-NS_IMETHODIMP
-nsMacShellService::GetDesktopBackgroundColor(uint32_t *aColor)
-{
-  // This method and |SetDesktopBackgroundColor| has no meaning on Mac OS X.
-  // The mac desktop preferences UI uses pictures for the few solid colors it
-  // supports.
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsMacShellService::SetDesktopBackgroundColor(uint32_t aColor)
-{
-  // This method and |GetDesktopBackgroundColor| has no meaning on Mac OS X.
-  // The mac desktop preferences UI uses pictures for the few solid colors it
-  // supports.
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsMacShellService::OpenApplicationWithURI(nsIFile* aApplication, const nsACString& aURI)
-{
-  nsCOMPtr<nsILocalFileMac> lfm(do_QueryInterface(aApplication));
-  CFURLRef appURL;
-  nsresult rv = lfm->GetCFURL(&appURL);
-  if (NS_FAILED(rv))
-    return rv;
-  
-  const nsCString spec(aURI);
-  const UInt8* uriString = (const UInt8*)spec.get();
-  CFURLRef uri = ::CFURLCreateWithBytes(nullptr, uriString, aURI.Length(),
-                                        kCFStringEncodingUTF8, nullptr);
-  if (!uri) 
-    return NS_ERROR_OUT_OF_MEMORY;
-  
-  CFArrayRef uris = ::CFArrayCreate(nullptr, (const void**)&uri, 1, nullptr);
-  if (!uris) {
-    ::CFRelease(uri);
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  LSLaunchURLSpec launchSpec;
-  launchSpec.appURL = appURL;
-  launchSpec.itemURLs = uris;
-  launchSpec.passThruParams = nullptr;
-  launchSpec.launchFlags = kLSLaunchDefaults;
-  launchSpec.asyncRefCon = nullptr;
-  
-  OSErr err = ::LSOpenFromURLSpec(&launchSpec, nullptr);
-  
-  ::CFRelease(uris);
-  ::CFRelease(uri);
-  
-  return err != noErr ? NS_ERROR_FAILURE : NS_OK;
-}
-
-NS_IMETHODIMP
-nsMacShellService::GetDefaultFeedReader(nsIFile** _retval)
-{
-  nsresult rv = NS_ERROR_FAILURE;
-  *_retval = nullptr;
-
-  CFStringRef defaultHandlerID = ::LSCopyDefaultHandlerForURLScheme(CFSTR("feed"));
-  if (!defaultHandlerID) {
-    defaultHandlerID = ::CFStringCreateWithCString(kCFAllocatorDefault,
-                                                   SAFARI_BUNDLE_IDENTIFIER,
-                                                   kCFStringEncodingASCII);
-  }
-
-  CFURLRef defaultHandlerURL = nullptr;
-  OSStatus status = ::LSFindApplicationForInfo(kLSUnknownCreator,
-                                               defaultHandlerID,
-                                               nullptr, // inName
-                                               nullptr, // outAppRef
-                                               &defaultHandlerURL);
-
-  if (status == noErr && defaultHandlerURL) {
-    nsCOMPtr<nsILocalFileMac> defaultReader =
-      do_CreateInstance("@mozilla.org/file/local;1", &rv);
-    if (NS_SUCCEEDED(rv)) {
-      rv = defaultReader->InitWithCFURL(defaultHandlerURL);
-      if (NS_SUCCEEDED(rv)) {
-        NS_ADDREF(*_retval = defaultReader);
-        rv = NS_OK;
-      }
-    }
-
-    ::CFRelease(defaultHandlerURL);
-  }
-
-  ::CFRelease(defaultHandlerID);
-
-  return rv;
-}
diff --git a/application/palemoon/components/shell/nsMacShellService.h b/application/palemoon/components/shell/nsMacShellService.h
deleted file mode 100644
index db95278092..0000000000
--- a/application/palemoon/components/shell/nsMacShellService.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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/. */
-
-#ifndef nsmacshellservice_h____
-#define nsmacshellservice_h____
-
-#include "nsIMacShellService.h"
-#include "nsIWebProgressListener.h"
-#include "nsIFile.h"
-#include "nsCOMPtr.h"
-
-class nsMacShellService : public nsIMacShellService,
-                          public nsIWebProgressListener
-{
-public:
-  nsMacShellService() {};
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSISHELLSERVICE
-  NS_DECL_NSIMACSHELLSERVICE
-  NS_DECL_NSIWEBPROGRESSLISTENER
-
-protected:
-  virtual ~nsMacShellService() {};
-
-private:
-  nsCOMPtr<nsIFile> mBackgroundFile;
-};
-
-#endif // nsmacshellservice_h____
diff --git a/application/palemoon/themes/moz.build b/application/palemoon/themes/moz.build
index 4267990dd9..0fe67acd00 100644
--- a/application/palemoon/themes/moz.build
+++ b/application/palemoon/themes/moz.build
@@ -5,9 +5,7 @@
 
 toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
 
-if toolkit == 'cocoa':
-    DIRS += ['osx']
-elif toolkit in ('gtk2', 'gtk3', 'qt'):
+if toolkit in ('gtk2', 'gtk3', 'qt'):
     DIRS += ['linux']
 else:
     DIRS += ['windows']
diff --git a/application/palemoon/themes/osx/Geolocation-16.png b/application/palemoon/themes/osx/Geolocation-16.png
deleted file mode 100644
index d710e7336dbc445d36ee4868257d9139c50f8919..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 704
zcmV;x0zdtUP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007qNkl<ZILl-B
z|NlP&G6n(_AZ}z}VBf~TC3F{zL2R%Xg9?UvG|d^TyrMV66*O<F=$hRyuyMNt!XP$C
z3?v6qgJA#=umSNhQ8~3cidu%(BotJeWK=XQjI5ncfiQ>-5(CMB)PU52^dKA1ETy7*
zTUpEKsECw;Hq3MtZKJ(PS_V5{d|^p>Z6!^^qad|FJq=L344R^{YPU5FEw2el$Y~-w
zPgqiJv9N^P0%S2kaam1uL-VV`QYs)r)Ict2(loZZC9SB@j2=Lo{G!4fe4+yA;!+Cg
z&1(7<HyIdM8W=>Rl=hk0xm_2QQZz$Xhzkpd$(k8iIbY|OklW3mqGNKy)j#s8j+y-p
zUJ;p{3=FI*85kH9u|%&T(8gt4LXtZ)jjXTQdj?-t(9plYplxh@(?2p9C=hr{)6jgo
zu(bS2Mos}t12}jU`Nd?Hs_U3+w|4fq;Sn5tSxv|E3WJ7$`2o+s=v&&xmd3<-K||Nn
z*vUKOhO)NdZU$*Z^;So(pnGy^+AWy23dk_9^NXX4ODkzM+qih&5tmhNVi1&&*R*!=
zzGrIZexHR;SPNMpzl8j9UNPC(sD|=u8Cp5tHM4WO!zV1I2^Lh-Hf(bXh<vDHVSk>5
zR}^lDslC@RLtEDaaLt^2TIxpD=N!C3?klS6G{aM(n4B`3p{3n2&%l@`macwJfa$(n
zQOnpmJgwkXNMi0y8C5+CVHu@16FZMbPQIa!bc`*R0aGO#MrP7Awaj$&kGSt0k?=eu
zDerlHUH9YM+Rn#;@tIHEf?}RJcn9CrG&IY^nHxb^%g92-*vhflGbCznL{j#%@T9C~
m?g0^d49)GE)D289vNHgKsnY3}7pKGk0000<MNUMnLSTYaut7oq

diff --git a/application/palemoon/themes/osx/Geolocation-64.png b/application/palemoon/themes/osx/Geolocation-64.png
deleted file mode 100644
index 1bd46ba5e146737f93c1ec1dfb1c80a6e203a59a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8424
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
KMNUMnLSTaD2x3+M

diff --git a/application/palemoon/themes/osx/Info.png b/application/palemoon/themes/osx/Info.png
deleted file mode 100644
index d09e82b6c6138941336e5039b2561be1ab5e891f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 641
zcmV-{0)G98P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!BS}O-RCwB?Q%z_SK@|RGcas#gwS}lf
z2q*+eEr@u@!Rk%Wf+8XmJ$RASQcy2eyhzbQLGU6X+7wSBdennIc=4h_!B!e-5d~{P
zib&(y#Lae--JS8xOkxg2j5zS-{mi`Yz3&afgb?_j#kOS%!-nZj8b-aXguw5H6<Lw`
z%wjf?Wy#T;u%aQh?%}WtiMA`R<UJ4oGroT+!ueLi$7eoD??3+*x%#(TYwY76Mlh92
zqx@xFQ|LMHRMbif|I9rW-wFH0A!bG0CA_{rh@4$(E3s_#Vslhr<m?mWTXIXK`j8?m
zUnJx}NDt!&0)ezctpiSHA(ZXQOO0hU4f&d(V4!>8oGTzsj`3~=8?v_$nV$o5tKjR_
z!|U6H{obY)fKDO+Sw#YcvI-fqGl*Rt1HLZ7Z&s>0u-?AGRdXYpWOBejqjj#N1tM*6
z=LYJ<0z5*rPoG2n<pT2eo}+Z|7~*wX#>W)^=S;O5Hb5kx<m}DO!lmR&<~(rwI?Trp
zQR_{>9?GaVNm@~8Cbp<(?Uu`WKBq>p+Sv_r;u1`n;_BcK+#rxgoq7h1B-y^~Mopaj
zYODi-ICm8D2#=hAN6BL1BG~dW91ZYOQ$Uk9)7^00O}&3Ns^mC#Z=zlxki#e8WiG&*
zyr$wL(`?J$sXu<l9quBAiw_X@f2=txMS5g>AN$*Pe$>@9Kx&*MEji1!Nv27z9IaGd
b{SsgRWJpUVeM5OP00000NkvXXu0mjf_t_@n

diff --git a/application/palemoon/themes/osx/KUI-background.png b/application/palemoon/themes/osx/KUI-background.png
deleted file mode 100644
index 104a49f7b0e15a0a8c3ebab4b36750239e72ea80..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 222
zcmeAS@N?(olHy`uVBq!ia0vp^AodmxHXyn7)7~9GioL|s*OmPSyC9#uz$X9KKY&7<
z1s;*b3=I5<Ak4VJet9NPkR{#G*O7r?{Rwl{u9rZ5uBVG*NX4zU6Ap47FyJ{d>(a+f
z|E=<NIm$is2$B7f&JwhGRh{pfd6mDu^{hVIsUi8f1w_dByPRC`X@S)&bsv|LGoVDs
zGkcdQJ(Y)`1dkT~s>PLk>Wfm&2&*kh38=jGo^|?M{~zlZALjrqX7F_Nb6Mw<&;$U8
CZBdH=

diff --git a/application/palemoon/themes/osx/KUI-close.png b/application/palemoon/themes/osx/KUI-close.png
deleted file mode 100644
index 08eeb8183168c637770f7d891660dc844c7e0948..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 393
zcmV;40e1e0P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00007bV*G`2iOG{
z4h|;<fMHtz000SaNLh0L01sdQ01sdRdU!>R00004XF*Lt006O%3;baP0003PNkl<Z
zc-muNU|`??V%6m2<Ny#2#GDM|0Y)I^0b+HiS&Bf+29i*{apT6L|3Glz!i5K#nwqXq
zg`^rT;Oy)ie&^1e*C4Zw9653xC??NPP*4#09|>H$cI}0RhK3snmVga+a&n4%{P^)F
zm^pv`{P|~OWMlzSpaHX$3`?*Y4gx1np1cW^QvfOA0eKBw0TGtqG#sQ?OH0cc7N2+(
z;;@7mJ=~;f;2}dT$*$rBVnK2YC(05fC8Z!68=E9@4JT*`FrU1C@ZiB$3X?T{OQ>Nu
zvL%An*4D}Q@8AE1ZurHE7vCu>D+fU11t(x4$7X5(ng$U~Bblbjl%^StrbPwK3p<(@
n*R-v0=uu_Tw$f*yakB*gjUXBJFM#-B00000NkvXXu0mjfU}2Te

diff --git a/application/palemoon/themes/osx/Makefile.in b/application/palemoon/themes/osx/Makefile.in
deleted file mode 100644
index 173ca68435..0000000000
--- a/application/palemoon/themes/osx/Makefile.in
+++ /dev/null
@@ -1,7 +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/.
-
-ICON_FILES := icon.png
-ICON_DEST = $(FINAL_TARGET)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
-INSTALL_TARGETS += ICON
diff --git a/application/palemoon/themes/osx/Privacy-16.png b/application/palemoon/themes/osx/Privacy-16.png
deleted file mode 100644
index a4be3e9acf875dbe122c3ffdceea8d89259d9229..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 800
zcmV+*1K<3KP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0008#Nkl<ZIE|%~
z%WD&16vfXsGnq_G)0CuXOp~THRnfK<pG8GMT_^~Optulpp?h~CxX_Kb(Z4|uT!^|8
zbfF@?s*R$ywVJ9meWa5%6O$(M&dhwD3yq54%CoxnTsVu%`4Pq#{zt;62PfI$bQbpu
zS4h*G`l9$+TLWUOqeTaRQps4RYlgET)9(Boz+JoBJ=I*s#^jc2rE-3-Kb%{+LYn58
z^?;+s{Y)2T*7W)(tL5^A4-;|-0CFFT<nyQEQF89=)p|1SSLPP|laV%lVAbkKSGv0c
z!Jr?tnhw*n!5E;bCaR@xm@8-nRizWb07<B(n-T(ae6G7)>Pz(=%J@VEP2(|NWC*tb
zor&eBs}?@w7NIB}+=hT;x-BITFBJ+BjE+{n2pSz&;KMzAuih0*MXBT+dua?r+}YE!
zGP!HlT4=hBk(W8hg|D-OG=>Esv>}m9q<0U+0)|Otp{8QeN9dmVQu%f?nmz%fFq?nK
z%@@3^EO&0QtOoRY@p=EimL1Jsl}qn$c_w$Hrg|@gL@;YBN(;J@9fvie5^x;xT{5*^
zb)0(5GA&T%A{J{`Ekij?2nh+k#!x1m+BaR$Xt8A6BqKNWvPYwXShM~hrWY)Dt_y+Z
z;8B81CI$eQoh`$0T)3_WpHD=0%*2!Dg?p{>-u*&nd>P86{GH*K`RK;M@OG&+0tOL9
zSwTp0z$itFL=j0v!CV8z(gL!tOS#E><J6WoAOJw$@@EHbW&6dYTIZ#%gmOI6=IhW@
z)q6Z&oC0MCN_MYN3Gn5LrN|1qJ|o)~hqkV(0zU%)VDt8E4uCT+vg4P1JlRAUt6R1{
z0sxYq4Dp;D)(z*))*Txb<LN)D+#I6SV|ZIU0m?EZ-B9m=00GGl05C0knBYg#$KFi9
zbv;l@KnMZX3?NiTPxv83!2;oUaO4*n;0OW75&U8OzKy^C3;?iQ5z)W|lEJ6&sPu3A
e{u23LoWBFNQ(s)4;3@S00000<MNUMnLSTZn9(BS1

diff --git a/application/palemoon/themes/osx/Privacy-32.png b/application/palemoon/themes/osx/Privacy-32.png
deleted file mode 100644
index dd07c1a1280c94b1d4cede28738bc7b697b14fb5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1995
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

diff --git a/application/palemoon/themes/osx/Privacy-48.png b/application/palemoon/themes/osx/Privacy-48.png
deleted file mode 100644
index 2396f99e5b261982c0a3a07b617bef6db4f8aab9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3884
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

diff --git a/application/palemoon/themes/osx/Privacy-64.png b/application/palemoon/themes/osx/Privacy-64.png
deleted file mode 100644
index d3605015bea2662fb856affe56b71c77d20a3ec1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8140
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

diff --git a/application/palemoon/themes/osx/Search.png b/application/palemoon/themes/osx/Search.png
deleted file mode 100644
index 0b71db3b41ce566d0af2aa26b7388c0ef5156830..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 437
zcmV;m0ZRUfP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00004b3#c}2nYxW
zd<bNS0004ONkl<ZD3P6#u}Z^m5XQe4X$eVb(mFJShM379h?62BF1~_@Adb3-h&YH3
zAP7#?rB9%5;izt<rI@J=Nu<T0BqSk!O8>2kl_sPG{l>fd9e4K~gA|FPxK*iCP6a_&
z1Arh18n$iMT-SY_)G$d%QIs=H({9olw%hGn%d#E;fSpd{^Z5;3*Q)@iX`1(jVVpaT
zQyUJ4t|*F|k|gbTp7%xwablpZ>s5~9luoB}XIa(*r8J<F2A=1=kH_O-p-|Z6IBvPu
z>pd?_gMuKe0zkLheM*iwiSazY0st|PVHh?E%u)>WeZK(!vMe7Y3uRe81b{FM4Ipux
zD2mKdskARi()MUHiU=V#%d&jATt3n??HT|K!?+-XI59g^RlQVI^=j65({?av&|on5
z@_oOa%jMR8R;Z^wz%&$w;YYLCJSK#E&O6Q`0A#aS836kI{!6RXI-!(?^Ppd4GMS}f
fvAFjaJN~V2nuecC=}Ym700000NkvXXu0mjf$)vh`

diff --git a/application/palemoon/themes/osx/Secure24.png b/application/palemoon/themes/osx/Secure24.png
deleted file mode 100644
index 896343afc5f3630236dc26b3471789fba8394768..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1098
zcmV-Q1hxB#P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#>`6pHRCwC7R$Yi2RTMrmnPig8WF|Z5
zrkiFXnp$^TTWzz{6}nQXf?yw%qFZS3Nqo@?K8lZmAO&A5Dk37a=!2qQ5vhVAEn>Uc
zAG51AU7Hn~WGC4qGnq6q_ulc`z}k)5P3#sgx!lQ}d%y2|-#MH_@O>Zt&msI5g8b)u
z<Ec#UKx=7!@7Z$~nM>IZcV|aF$xWZB+&005Pp2Y+&t6d#<3-}N^{QEhe4%M&((!li
z+p*)djeCxp{q9TsUjBM=zfdgJjxN=$BMH59QPcDjp^(gDn*Qvot1l%J+IV>G^=W<l
zWoumoW~IDmzF2)>>VeTy0P>+-2Tw2ZegA`rcj`8M|J&1r{hKo9pTe#8*1{0`5nP!s
zKaty(5Yl&SIl2ta$K*5Tsypu;enSocT`0`$Ten4<Hp=OQ5u*YltCE>YCQEI*)vh-k
zy&pzj1zR@X#kk>)RateexNwyhh(IU^>n4zba)%NEo=Y14e&=-DI%gL}!M)`&{rb(V
zThnRdU`PrbsMi*^E1LecAO=d^3p`-_lq=@&qUk)BOepigpm<`b;ePbkk-6D{1gDOT
z%fVpaWbUD-_cgDbg@r!~Ft$Ahfk+B`(gL6HfPH9LCd|y_VR$G4cW%x?{+HjrVa$L0
z(dXwneUt1Fy8E87vB_}q5s;!;&{9QQGZ=~hzSjhwUdQQxDyc9r5daa@M4~DrhqcMS
zN{!tJ@qJ%{%xG#ftY}Jg_82gV8AM>penwCNN_-UlymA2?#|Fk23Sm4T;4T<LvZ6-)
z%)l~@MkG%J58O@zLFhmG97OOPi0e^MqY{2+K(GJ^@ql6=nyy1QB$I&zOSLL6K}3Q!
z@Cv#?z(5QtV45Zn&jYL=6o4eu@8$$V1{CiMB>3(p8=gJ<Ahen#v}Q#>2pCmVpvF*_
zm=p5IxdKcs7={LKeRv6W9Uee%{EL!s=*bc^n+*i$RX|w)%tcgyz7quZJPMtThtC8n
zw*g<CX~L^(DZpg%lJz$jvZ@-}usSaHDBw8=$x-mGYd~BFf!jD4NP>@ci4X}#FgF2p
zCDtkhxUWv_RI_$%7Hr$@CUK=jQqX}*`2t2xc-8W)?nF2QM>Q_ZB1Q~P+iO{*VHJ(U
zHr$WVUhc7o5AJnlL_uY&n^(RP!cYM~JRXBkpf-ZX`Vx3n%d@P?kJx{_9tB)+5c_kZ
z+3xzk96iM<;tH$=Dj<~q@VGZ^72G#mA_-l}Jv^aIha@4!R(275mSqX9l`RBiU5jp5
z%hd_i%<tsmy3J;AtG%3qo?e6;yt@Xt8-qISO~&#a>hqGjm46ktGyWD}0Q1HZ<GyOB
Q4gdfE07*qoM6N<$f)r-`U;qFB

diff --git a/application/palemoon/themes/osx/Toolbar-inverted.png b/application/palemoon/themes/osx/Toolbar-inverted.png
deleted file mode 100644
index 54d83bf5f2176cd92d74eb883cccccc0753e068a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7101
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

diff --git a/application/palemoon/themes/osx/Toolbar-inverted.svg b/application/palemoon/themes/osx/Toolbar-inverted.svg
deleted file mode 100644
index ce59313e68..0000000000
--- a/application/palemoon/themes/osx/Toolbar-inverted.svg
+++ /dev/null
@@ -1,302 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   enable-background="new 0 0 378 38"
-   viewBox="0 0 378 38"
-   height="38"
-   width="378"
-   y="0px"
-   x="0px"
-   id="strataToolbarSVG"
-   version="1.1">
-  <metadata
-     id="metadata146">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs144">
-    <filter
-       id="filter1070"
-       style="color-interpolation-filters:sRGB;">
-      <feFlood
-         id="feFlood1060"
-         result="flood"
-         flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039" />
-      <feComposite
-         id="feComposite1062"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" />
-      <feGaussianBlur
-         id="feGaussianBlur1064"
-         result="blur"
-         stdDeviation="0.5"
-         in="composite1" />
-      <feOffset
-         id="feOffset1066"
-         result="offset"
-         dy="0"
-         dx="0" />
-      <feComposite
-         id="feComposite1068"
-         result="fbSourceGraphic"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" />
-      <feColorMatrix
-         id="feColorMatrix1072"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
-         in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
-      <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039"
-         id="feFlood1074" />
-      <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
-         id="feComposite1076"
-         in2="fbSourceGraphic" />
-      <feGaussianBlur
-         result="blur"
-         stdDeviation="0.5"
-         in="composite1"
-         id="feGaussianBlur1078" />
-      <feOffset
-         result="offset"
-         dy="0"
-         dx="0"
-         id="feOffset1080" />
-      <feComposite
-         result="fbSourceGraphic"
-         operator="over"
-         in="fbSourceGraphic"
-         id="feComposite1082"
-         in2="offset" />
-      <feColorMatrix
-         id="feColorMatrix1084"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
-         in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
-      <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039"
-         id="feFlood1086" />
-      <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
-         id="feComposite1088"
-         in2="fbSourceGraphic" />
-      <feGaussianBlur
-         result="blur"
-         stdDeviation="0.5"
-         in="composite1"
-         id="feGaussianBlur1090" />
-      <feOffset
-         result="offset"
-         dy="0"
-         dx="0"
-         id="feOffset1092" />
-      <feComposite
-         result="fbSourceGraphic"
-         operator="over"
-         in="fbSourceGraphic"
-         id="feComposite1094"
-         in2="offset" />
-      <feColorMatrix
-         id="feColorMatrix1096"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
-         in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
-      <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039"
-         id="feFlood1098" />
-      <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
-         id="feComposite1100"
-         in2="fbSourceGraphic" />
-      <feGaussianBlur
-         result="blur"
-         stdDeviation="0.5"
-         in="composite1"
-         id="feGaussianBlur1102" />
-      <feOffset
-         result="offset"
-         dy="0"
-         dx="0"
-         id="feOffset1104" />
-      <feComposite
-         result="fbSourceGraphic"
-         operator="over"
-         in="fbSourceGraphic"
-         id="feComposite1106"
-         in2="offset" />
-      <feColorMatrix
-         id="feColorMatrix1108"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
-         in="fbSourceGraphic"
-         result="fbSourceGraphicAlpha" />
-      <feFlood
-         in="fbSourceGraphic"
-         result="flood"
-         flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039"
-         id="feFlood1110" />
-      <feComposite
-         result="composite1"
-         operator="in"
-         in="flood"
-         id="feComposite1112"
-         in2="fbSourceGraphic" />
-      <feGaussianBlur
-         result="blur"
-         stdDeviation="0.5"
-         in="composite1"
-         id="feGaussianBlur1114" />
-      <feOffset
-         result="offset"
-         dy="0"
-         dx="0"
-         id="feOffset1116" />
-      <feComposite
-         result="composite2"
-         operator="over"
-         in="fbSourceGraphic"
-         id="feComposite1118"
-         in2="offset" />
-    </filter>
-  </defs>
-  <g
-     style="fill:#ffffff;filter:url(#filter1070)"
-     id="toolbar">
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 14.7,10.7 C 14.464283,10.935746 14.000125,11 14.000125,11 H 9 l 2.132,2.085573 c 0.519423,0.508112 0.595,1.2729 0.198,1.6979 l -0.793,0.9549 c -0.396,0.424 -1.091,0.318 -1.587,-0.212 L 3.595,9.690773 3,8.946873 l 0.595,-0.743 5.256,-5.7295 c 0.496,-0.531 1.19,-0.637 1.587,-0.212 l 0.794,0.9549 c 0.396,0.425 0.297,1.1669 -0.198,1.6979 L 9,7 h 4.999875 c 0,0 0.464437,0.064342 0.700125,0.3 0.235717,0.2356875 0.299875,0.7 0.299875,0.7 l 2.5e-4,2 c 0,0 -0.06444,0.464283 -0.300125,0.7 z"
-       id="back" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="back-large"
-       d="m 16.441631,29.733331 c -0.275,0.275034 -0.816512,0.349996 -0.816512,0.349996 H 8.999927 l 2.487308,2.516543 c 0.595913,0.602917 0.694159,1.485034 0.230997,1.980862 l -0.925157,1.114039 C 10.33108,36.189432 9.5202547,36.065767 8.9415947,35.44744 L 2.6941594,28.639311 2,27.771437 2.6941594,26.904612 8.8260957,20.220265 c 0.57866,-0.619493 1.3883193,-0.743159 1.8514803,-0.24733 l 0.926324,1.114038 c 0.461995,0.495828 0.346497,1.361369 -0.230997,1.980863 l -2.37283,2.348836 h 6.6249 c 0,0 0.541837,0.07506 0.816804,0.349997 0.275,0.274966 0.34985,0.816658 0.34985,0.816658 l 1.46e-4,2.333346 c 0,0 -0.07518,0.541658 -0.350142,0.816658 z" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="forward"
-       d="m 21.30025,10.7 c 0.235717,0.235746 0.699875,0.3 0.699875,0.3 h 5.000125 l -2.132,2.085573 c -0.519423,0.508112 -0.595,1.2729 -0.198,1.6979 l 0.793,0.9549 c 0.396,0.424 1.091,0.318 1.587,-0.212 l 5.355,-5.8356 0.595,-0.7439 -0.595,-0.743 -5.256,-5.7295 c -0.496,-0.531 -1.19,-0.637 -1.587,-0.212 l -0.794,0.9549 c -0.396,0.425 -0.297,1.1669 0.198,1.6979 L 27.00025,7 h -4.999875 c 0,0 -0.464437,0.064342 -0.700125,0.3 C 21.064533,7.5356875 21.000375,8 21.000375,8 l -2.5e-4,2 c 0,0 0.06444,0.464283 0.300125,0.7 z" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 51.5,4.64955 47.233834,8.949625 51.5,13.248616 49.366916,15.398166 45,11.201008 40.733834,15.5 38.60075,13.35045 42.866916,8.9485416 38.5,4.64955 40.633084,2.5 45,6.800075 49.266166,2.5 Z"
-       id="stop" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 69,9 H 62 L 64.8,6.2 C 64.1,5.7 63.4,5.5 62.5,5.5 c -2.2,0 -4,1.8 -4,4 0,2.2 1.8,4 4,4 1.399,0 2.7,-0.7 3.399,-1.9 l 2.301,1 C 67.099,14.6 65,16 62.5,16 58.899,16 56,13.1 56,9.5 56,5.9 58.899,3 62.5,3 64,3 65.399,3.5 66.6,4.4 L 69,2 Z"
-       id="reload" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 76,9 h -3 l 8,-7 8,7 h -3 v 6.5 H 82 V 12 h -2 v 3.5 h -4 z"
-       id="home" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 91.5,9 h 4.453 V 2 h 6.093 V 9 H 106.5 L 99,16 Z"
-       id="download" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 117,2 c -3.866,0 -7,3.134 -7,7 0,3.866 3.134,7 7,7 3.866,0 7,-3.134 7,-7 0,-3.866 -3.134,-7 -7,-7 z m 0,2 c 2.761,0 5,2.238 5,5 0,2.762 -2.239,5 -5,5 -2.762,0 -5,-2.238 -5,-5 0,-2.762 2.239,-5 5,-5 z m -0.7,1.2 C 116.0643,5.4357023 116,6 116,6 v 4 l 4,2 -2,-3 V 6 C 118,6 117.9357,5.4357023 117.7,5.2 117.4643,4.9642977 117,5 117,5 c 0,0 -0.4643,-0.035702 -0.7,0.2 z"
-       id="history" />
-    <g
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="bookmarks">
-      <path
-         style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 131,2 v 14 h 7.44922 0.55078 1.94922 c 0.99175,-0.258441 1.76717,-1.038297 2,-2 V 12 6 4 c -0.23283,-0.9617034 -1.00825,-1.7415586 -2,-2 h -1.63672 -0.86328 z m 6.11523,2.4160156 1.05469,1.7714844 c 0,0 0.29209,0.4878333 0.51953,0.6425781 0.21313,0.1449479 0.73828,0.2285157 0.73828,0.2285157 h 2.15625 l -1.49804,2.4335937 c 0,0 -0.21789,0.4778906 -0.32617,0.7167965 -0.16271,0.357558 0.005,0.982547 0.0586,1.566407 0.0848,0.918442 0.15039,1.80664 0.15039,1.80664 l -1.75,-0.894531 c 0,0 -0.71714,-0.337318 -1.10156,-0.337891 -0.45203,0 -1.29883,0.392579 -1.29883,0.392579 l -1.75391,0.841796 c 0,0 0.12894,-0.80101 0.26758,-1.68164 0.0917,-0.579219 0.34458,-1.238485 0.14063,-1.636719 -0.11058,-0.216562 -0.33204,-0.6484375 -0.33204,-0.6484375 l -1.7246,-2.5019531 h 2.14257 c 0,0 0.69711,-0.049193 0.98243,-0.2285156 0.21656,-0.1352084 0.48242,-0.5957032 0.48242,-0.5957032 z"
-         id="bookmarks-star" />
-      <path
-         style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 129,2 c -0.99175,0.2584414 -1.76717,1.0382967 -2,2 v 2 6 2 c 0.23283,0.961703 1.00825,1.741559 2,2 h 2.5 V 12 6 2 Z"
-         id="bookmarks-overlay" />
-      <path
-         style="stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 131.49914,2 V 16"
-         id="bookmarks-divider" />
-    </g>
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 160,14 h -2 l 1,2 h -12 l 1,-2 h -2 c -0.601,0 -1,-0.4 -1,-1 V 8 c 0,-0.6 0.70113,-0.635443 1,-1 0.38098,-0.4647208 0.61902,-1.0352792 1,-1.5 0.29887,-0.364557 0.399,-1 1,-1 V 3 c 0,-0.6 0.399,-1 1,-1 h 8 c 0.6,0 1,0.4 1,1 v 1.5 c 0.6,0 0.70113,0.635443 1,1 0.38098,0.4647208 0.61902,1.0352792 1,1.5 0.29887,0.364557 1,0.4 1,1 v 5 c 0,0.6 -0.4,1 -1,1 z M 148.5,9 h -0.5 -0.5 c -0.3,0 -0.5,0.2 -0.5,0.5 0,0.3 0.2,0.5 0.5,0.5 h 1 C 148.8,10 149,9.8 149,9.5 149,9.2 148.8,9 148.5,9 Z M 157,4 c 0,-0.6 -0.4,-1 -1,-1 h -6 c -0.601,0 -1,0.4 -1,1 v 3 c 0,0.6 0.399,1 1,1 h 6 c 0.6,0 1,-0.4 1,-1 z m -0.9,9 h -6.2 l -0.899,2 h 8 z"
-       id="print" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="newtab"
-       d="m 170.93359,2 -4.01562,0.00195 c 0,0.00178 -0.87681,0.216686 -0.87695,1.4980469 v 2.8164062 c 0,0 -0.0732,0.3643751 -0.19922,0.484375 C 165.69982,6.9357812 165.29102,7 165.29102,7 c 0,0 -0.53242,-0.057 -0.7754,0 -0.36297,0.086 -0.73599,0.236 -1,0.5 -0.26399,0.264 -0.41502,0.637 -0.5,1 -0.038,0.162 0,0.5 0,0.5 v 5.537109 c 0,0 0.24003,0.710891 0.5,0.962891 0.27398,0.267 1.03516,0.5 1.03516,0.5 h 13.0957 c 0,0 0.60287,-0.276 0.83985,-0.5 0.21699,-0.205 0.49023,-0.742188 0.49023,-0.742188 V 9 c 0.026,-0.322 0.038,-0.338 0,-0.5 -0.086,-0.363 -0.22624,-0.736 -0.49023,-1 -0.26398,-0.264 -0.63802,-0.415 -1,-0.5 -0.22799,-0.054 -0.69922,0 -0.69922,0 0,0 -0.44657,-0.056219 -0.60156,-0.1992188 -0.12799,-0.1189999 -0.19922,-0.484375 -0.19922,-0.484375 L 175.98828,3.5 C 175.98843,2.1047456 174.9707,2 174.9707,2 Z m -0.79101,5 h 1.71484 V 9.1425781 H 174 v 1.7148439 h -2.14258 V 13 h -1.71484 V 10.857422 H 168 V 9.1425781 h 2.14258 z" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="newwindow"
-       d="M 182.4375,2 C 181.52354,2.2781435 181.28553,2.8114358 181,3.6875 V 14.125 c 0.21642,1.330001 0.75257,1.636052 2.0625,1.875 H 195 c 1.30474,-0.204204 1.70477,-0.57308 2,-1.875 V 4 C 196.8019,2.7723315 196.4998,2.3703399 195.3125,2 Z M 190,3 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 2 v 1 h -2 z m -11,3 h 12 v 8 h -12 z m 5.14258,1 V 9.1425781 H 186 v 1.7148439 h 2.14258 V 13 h 1.71484 V 10.857422 H 192 V 9.1425781 h -2.14258 V 7 Z" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 212.70159,16 c -0.79707,0 -1.49513,-0.2 -2.2922,-1.3 -0.79807,-1.1 -1.69515,-2.5 -1.69515,-2.5 0,0 -0.69706,-0.9 -1.09709,-1.6 -0.49805,-0.7 -1.0971,-0.5 -1.0971,-0.5 0,0 -2.89125,-4.7 -3.3903,-5.4 -0.59805,-1 0.59906,-2.7 0.59906,-2.7 l 4.38738,7 c 0,0 1.39612,1.9 1.89417,2.3 0.49904,0.4 1.39612,-0.4 2.79224,0.9 1.89417,1.8 1.29611,3.8 -0.10101,3.8 z m -0.29802,-2.9 c -0.89708,-1 -1.69415,-0.9 -1.89417,-0.6 -0.20002,0.3 0,1.2 0.39804,1.7 0.39803,0.5 0.79806,0.7 1.39612,0.7 0.59905,0.1 1.09709,-0.7 0.10001,-1.8 z m -3.78934,-4.7 -1.1961,-1.8 2.89125,-4.6 c 0,0 1.19611,1.7 0.59906,2.7 -0.29903,0.4 -1.39613,2.3 -2.29421,3.7 z m -4.5854,2.899 c 0.29903,-0.3 0.99709,-1.1 1.39613,-1.7 l 0.79806,1.2 c -0.39803,0.6 -0.89707,1.4 -0.89707,1.4 0,0 -0.89608,1.4 -1.69415,2.5 -0.69806,1.1 -1.39612,1.3 -2.2932,1.3 -1.39613,0 -2.09419,-2 -0.10001,-3.8 1.39412,-1.199 2.2912,-0.499 2.79024,-0.9 z m -2.39321,1.801 c -0.89708,1 -0.39803,1.8 0.19902,1.8 0.59905,0 0.99709,-0.2 1.39612,-0.7 0.39804,-0.5 0.59806,-1.5 0.39804,-1.7 -0.29803,-0.3 -1.0961,-0.4 -1.99318,0.6 z"
-       id="cut" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 231,16 h -6 c -0.601,0 -1,-0.4 -1,-1 V 12 9.4 7 c 0,-0.6 0.399,-1 1,-1 0,0 3.2,0 5,0 l 2,2 c 0,2.2 0,7 0,7 0,0.6 -0.4,1 -1,1 z m -2,-9 v 2 h 2 z M 223,5.9 V 7 8.9 12 h -4 c -0.601,0 -1,-0.4 -1,-1 V 3 c 0,-0.6 0.399,-1 1,-1 0,0 3.2,0 5,0 l 2,2 c 0,0.4 0,0.8 0,1.3 h -2.5 C 223.2,5.4 223,5.6 223,5.9 Z M 223,3 v 2 h 2 z"
-       id="copy" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 246.8507,16 h -7.7014 C 238.26914,16 237.5,15.3 237.5,14.5 v -9 c 0,-0.8 0.77014,-1.5 1.6493,-1.5 h 1.6503 c 0,0 0,-2 2.2004,-2 2.2004,0 2.2004,2 2.2004,2 h 1.6493 c 0.88016,0 1.6503,0.7 1.6503,1.5 v 9 c 0.001,0.799 -0.76914,1.5 -1.6493,1.5 z M 245.97054,5 244.76032,4.5 c 0,0 0,-1.5 -1.76032,-1.5 -1.76032,0 -1.76032,1.5 -1.76032,1.5 l -1.21122,0.5 -0.5501,1 h 2.7505 3.52164 0.88016 z m 0.11002,1.7 h -5.17094 l -3.3016,1.7 3.08056,4.9 7.26232,-3.8 z"
-       id="paste" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 265,12 V 6 l 3,3 z m -7,1 h 6 l -3,3 z m 0,-1 V 6 h 6 v 6 z m 5,-4 h -4 v 3 h 4 z m -2,-6 3,3 h -6 z m -4,4 v 6 l -3,-3 z"
-       id="fullscreen" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 274,8 h 10 v 2 h -10 z"
-       id="minus" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 302,10 h -4 v 4 h -2 v -4 h -4 V 8 h 4 V 4 h 2 v 4 h 4 z"
-       id="plus" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 321.96164,9.3589991 c -0.0996,0.5880529 -0.19907,1.1749739 -0.39904,1.6649929 -0.39904,1.272996 -2.49721,3.230982 -2.49721,3.230982 l 1.23012,1.745023 -4.92726,6e-6 V 9.849 c 0,0 0.89889,1.46799 1.39795,2.05599 1.19912,-0.588025 1.99814,-1.762997 2.09818,-2.9380158 0.10109,-0.8810027 -0.19905,-1.6639894 -0.59902,-2.2510039 -0.18813,-0.3229439 -0.42109,-0.5799624 -0.68685,-0.7931908 -0.30005,-0.23897 -1.01208,-0.5779774 -1.01208,-0.5779774 l 0.0174,-3.3306603 c 1.03186,0.2680556 1.4999,0.3864246 2.85781,1.3686643 1.67715,1.2509803 2.78224,3.5019854 2.52022,5.9759989 z m -6.99262,-1.9580198 c 0,0 -1.09884,-1.4681946 -1.59912,-1.9580122 -1.39809,0.6859994 -2.19718,1.957993 -2.19714,3.3290059 0.39151,1.955025 1.15486,2.878079 2.87049,3.728027 V 16 c -1.14823,-0.14515 -2.89657,-1.144129 -3.76062,-2.017966 -1.64214,-1.695027 -2.56324,-3.735 -2.20626,-6.1889776 0.1,-0.6850241 0.30006,-1.3699914 0.49903,-1.9580159 0.40011,-1.0769929 1.10011,-1.957978 2.09921,-2.6429982 0.0997,-0.098323 0.199,-0.098023 0.29929,-0.1955973 -0.39905,-0.3919885 -1.2861,-0.9964444 -1.2861,-0.9964444 l 5.35545,-1.3e-6 z"
-       id="sync" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 339.29905,15.9 h -1.49989 c -0.39997,0 -0.79995,-0.3 -0.79995,-0.8 0,0 0.29998,-3.6 -3.19977,-7.2 -2.49982,-3 -6.9995,-3.2 -6.9995,-3.2 C 326.29998,4.7 326,4.4 326,4 V 2.6 c 0,-0.4 0.29998,-0.7 0.79994,-0.7 0,0 6.29955,0.4 9.59932,4.5 3.29976,3.1 3.60074,8.8 3.60074,8.8 -10e-4,0.4 -0.20099,0.7 -0.70095,0.7 z m -12.49911,-9 c 0,0 3.69974,0.5 5.79959,2.4 2.09985,2 2.49982,5.9 2.49982,5.9 0,0.4 -0.1,0.8 -0.49996,0.8 h -1.4999 c -0.39997,0 -0.59995,-0.3 -0.59995,-0.8 0,0 0.1,-2.4 -1.80088,-4.2 C 329.19877,9.7 326.79994,9.6 326.79994,9.6 326.29998,9.6 326,9.3 326,8.9 V 7.6 c 0,-0.4 0.29998,-0.7 0.79994,-0.7 z m 1.19992,5 c 1.09992,0 1.99985,0.9 1.99985,2 0,1.1 -0.89993,2 -1.99985,2 C 326.89894,15.9 326,15 326,13.9 c 0,-1.1 0.89994,-2 1.99986,-2 z"
-       id="rss" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 344.5,5 c 0,0 0.0643,-0.4642977 0.3,-0.7 0.2357,-0.2357023 0.7,-0.3 0.7,-0.3 h 7.5 c 0,0 0.4643,0.064298 0.7,0.3 0.2357,0.2357023 0.3,0.7 0.3,0.7 v 2 l 4.0245,-3 -0.049,10 L 354,11 v 2 c 0,0 -0.0643,0.464298 -0.3,0.7 -0.2357,0.235702 -0.7,0.3 -0.7,0.3 h -7.5 c 0,0 -0.4643,-0.0643 -0.7,-0.3 -0.2357,-0.235702 -0.3,-0.7 -0.3,-0.7 z"
-       id="webrtc" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="bookmark-none"
-       d="m 369.20312,1 -1.9082,3.2734375 c 0,0 -0.46184,0.8030625 -0.83984,1.0390625 -0.498,0.313 -1.71875,0.3984375 -1.71875,0.3984375 H 361 l 3.00781,4.3652345 c 0,0 0.38708,0.754812 0.58008,1.132812 0.356,0.6951 -0.0841,1.844469 -0.24414,2.855469 -0.242,1.5371 -0.4668,2.935547 -0.4668,2.935547 l 3.06055,-1.466797 c 0,0 1.47663,-0.685547 2.26562,-0.685547 0.671,10e-4 1.92579,0.587891 1.92579,0.587891 l 3.05273,1.5625 c 0,0 -0.11177,-1.549244 -0.25976,-3.152344 -0.093,-1.0191 -0.38752,-2.112228 -0.10352,-2.736328 0.189,-0.417 0.56836,-1.2519531 0.56836,-1.2519531 L 377,5.6113281 h -3.76172 c 0,0 -0.91706,-0.1454375 -1.28906,-0.3984375 -0.397,-0.2701 -0.90625,-1.1210937 -0.90625,-1.1210937 z m -0.0762,3 1.15039,1.9316406 c 0,0 0.31633,0.5323647 0.56446,0.7011719 0.23249,0.1581201 0.80664,0.25 0.80664,0.25 H 374 l -1.63281,2.6542969 c 0,0 -0.23929,0.5206326 -0.35742,0.7812496 -0.17749,0.39005 0.008,1.074021 0.0664,1.710938 C 372.16866,13.031203 372.23828,14 372.23828,14 l -1.9082,-0.978516 c 0,0 -0.78376,-0.366562 -1.20313,-0.367187 -0.4931,0 -1.41601,0.429687 -1.41601,0.429687 L 365.79883,14 c 0,0 0.13977,-0.873327 0.29101,-1.833984 0.1,-0.631855 0.37484,-1.350734 0.15235,-1.785157 -0.12063,-0.236243 -0.36133,-0.708984 -0.36133,-0.708984 L 364,6.9453125 h 2.33594 c 0,0 0.76298,-0.054381 1.07422,-0.25 0.23624,-0.1474953 0.52343,-0.6484375 0.52343,-0.6484375 z" />
-    <path
-       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="bookmark-added"
-       d="m 369.202,19 -1.908,3.2732 c 0,0 -0.461,0.8031 -0.839,1.0391 -0.498,0.313 -1.718,0.399 -1.718,0.399 H 361 l 3.008,4.3643 c 0,0 0.387,0.755 0.58,1.133 0.356,0.6951 -0.084,1.8452 -0.244,2.8562 C 364.102,33.6019 363.877,35 363.877,35 l 3.06,-1.4671 c 0,0 1.477,-0.686 2.266,-0.686 0.671,0.001 1.925,0.588 1.925,0.588 l 3.053,1.5641 c 0,0 -0.112,-1.5501 -0.26,-3.1532 -0.093,-1.0191 -0.388,-2.1121 -0.104,-2.7362 0.189,-0.417 0.57,-1.252 0.57,-1.252 L 377,23.6123 h -3.763 c 0,0 -0.917,-0.146 -1.289,-0.399 -0.397,-0.2701 -0.906,-1.1221 -0.906,-1.1221 z" />
-  </g>
-</svg>
diff --git a/application/palemoon/themes/osx/Toolbar.png b/application/palemoon/themes/osx/Toolbar.png
deleted file mode 100644
index 8ec756e03dee80984e99dd30d4595be7a5982761..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16015
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
JPDHLkV1k~)c1!>O

diff --git a/application/palemoon/themes/osx/Toolbar.svg b/application/palemoon/themes/osx/Toolbar.svg
deleted file mode 100644
index 7a68c06087..0000000000
--- a/application/palemoon/themes/osx/Toolbar.svg
+++ /dev/null
@@ -1,1356 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
-   id="PaleMoonToolbarSVG"
-   x="0px"
-   y="0px"
-   width="378"
-   height="38"
-   viewBox="0 0 378 38"
-   enable-background="new 0 0 378 38">
-  <metadata
-     id="metadata146">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs144">
-    <radialGradient
-       id="globalGradient"
-       cy="0.69999999">
-      <stop
-         offset="0.05"
-         id="stop4"
-         style="stop-color:#87939b;stop-opacity:1" />
-      <stop
-         offset="1"
-         id="stop6"
-         style="stop-color:#45555f;stop-opacity:1" />
-    </radialGradient>
-    <filter
-       id="insetShadow">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood1875" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="out"
-         result="composite1"
-         id="feComposite1877" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="2"
-         result="blur"
-         id="feGaussianBlur1879" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset1881" />
-      <feComposite
-         in="offset"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite2"
-         id="feComposite1883" />
-    </filter>
-    <filter
-       style="color-interpolation-filters:sRGB;"
-       id="filter2164">
-      <feFlood
-         flood-opacity="1"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood2154" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="out"
-         result="composite1"
-         id="feComposite2156" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="0.5"
-         result="blur"
-         id="feGaussianBlur2158" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset2160" />
-      <feComposite
-         in="offset"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite2"
-         id="feComposite2162" />
-    </filter>
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       r="7.2456884"
-       fy="12.21416"
-       fx="95.643087"
-       cx="95.643087"
-       gradientTransform="matrix(1.0350983,0,0,0.96609178,0,18)"
-       id="globalGradient-8"
-       cy="12.21416">
-      <stop
-         offset="0.05"
-         id="stop4-5"
-         style="stop-color:#12d92d;stop-opacity:1" />
-      <stop
-         offset="1"
-         id="stop6-5"
-         style="stop-color:#01b222;stop-opacity:1" />
-    </radialGradient>
-    <radialGradient
-       xlink:href="#linearGradient4635"
-       id="radialGradient4669"
-       cx="10.529827"
-       cy="14.778796"
-       fx="10.529827"
-       fy="14.778796"
-       r="7.1399999"
-       gradientTransform="matrix(1,0,0,1.1087088,0,-1.2351844)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4635">
-      <stop
-         style="stop-color:#6198cb;stop-opacity:1"
-         offset="0"
-         id="stop4631" />
-      <stop
-         style="stop-color:#3a78b2;stop-opacity:1"
-         offset="1"
-         id="stop4633" />
-    </linearGradient>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4701">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood4691" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="out"
-         result="composite1"
-         id="feComposite4693" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="1"
-         result="blur"
-         id="feGaussianBlur4695" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset4697" />
-      <feComposite
-         in="offset"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite2"
-         id="feComposite4699" />
-    </filter>
-    <radialGradient
-       xlink:href="#linearGradient4635"
-       id="radialGradient4637"
-       cx="11.063469"
-       cy="38.79744"
-       fx="11.063469"
-       fy="38.79744"
-       r="8.7600002"
-       gradientTransform="matrix(1,0,0,1.0853313,0,-3.029369)"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4661">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood4651" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="out"
-         result="composite1"
-         id="feComposite4653" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="1"
-         result="blur"
-         id="feGaussianBlur4655" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset4657" />
-      <feComposite
-         in="offset"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite2"
-         id="feComposite4659" />
-    </filter>
-    <radialGradient
-       xlink:href="#linearGradient4635"
-       id="radialGradient4677"
-       cx="34.841751"
-       cy="14.552581"
-       fx="34.841751"
-       fy="14.552581"
-       r="7.1399999"
-       gradientTransform="matrix(1,0,0,1.1003056,0,-1.1335797)"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4689">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood4679" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="out"
-         result="composite1"
-         id="feComposite4681" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="1"
-         result="blur"
-         id="feGaussianBlur4683" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset4685" />
-      <feComposite
-         in="offset"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite2"
-         id="feComposite4687" />
-    </filter>
-    <radialGradient
-       xlink:href="#linearGradient4603"
-       id="radialGradient4605"
-       cx="58.062626"
-       cy="12.761739"
-       fx="58.062626"
-       fy="12.761739"
-       r="7.6799994"
-       gradientTransform="matrix(1,0,0,0.99218759,0,0.09141507)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4603">
-      <stop
-         style="stop-color:#e72b1d;stop-opacity:1"
-         offset="0"
-         id="stop4599" />
-      <stop
-         style="stop-color:#cc4338;stop-opacity:1"
-         offset="1"
-         id="stop4601" />
-    </linearGradient>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4629">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood4619" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="out"
-         result="composite1"
-         id="feComposite4621" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="1"
-         result="blur"
-         id="feGaussianBlur4623" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset4625" />
-      <feComposite
-         in="offset"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite2"
-         id="feComposite4627" />
-    </filter>
-    <radialGradient
-       xlink:href="#linearGradient4523-3"
-       id="radialGradient4525"
-       cx="79.305222"
-       cy="13.939252"
-       fx="79.305222"
-       fy="13.939252"
-       r="7.8000002"
-       gradientTransform="matrix(1,0,0,1.0769231,0,-0.86932835)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4523-3">
-      <stop
-         style="stop-color:#4fb55d;stop-opacity:1"
-         offset="0"
-         id="stop4519" />
-      <stop
-         style="stop-color:#2d8539;stop-opacity:1"
-         offset="1"
-         id="stop4521" />
-    </linearGradient>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4597">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood4587" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="out"
-         result="composite1"
-         id="feComposite4589" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="1"
-         result="blur"
-         id="feGaussianBlur4591" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset4593" />
-      <feComposite
-         in="offset"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite2"
-         id="feComposite4595" />
-    </filter>
-    <radialGradient
-       xlink:href="#linearGradient4527"
-       id="radialGradient4529"
-       cx="103.23091"
-       cy="12.664675"
-       fx="103.23091"
-       fy="12.664675"
-       r="9.5995998"
-       gradientTransform="matrix(1,0,0,0.87507716,0,1.3868386)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4527">
-      <stop
-         style="stop-color:#3f6bbd;stop-opacity:1"
-         offset="0"
-         id="stop4523" />
-      <stop
-         style="stop-color:#29467b;stop-opacity:1"
-         offset="1"
-         id="stop4525" />
-    </linearGradient>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4783">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood4773" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="out"
-         result="composite1"
-         id="feComposite4775" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="1"
-         result="blur"
-         id="feGaussianBlur4777" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset4779" />
-      <feComposite
-         in="offset"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite2"
-         id="feComposite4781" />
-    </filter>
-    <radialGradient
-       xlink:href="#linearGradient4707"
-       id="radialGradient4709"
-       cx="125.30523"
-       cy="16.659737"
-       fx="125.30523"
-       fy="16.659737"
-       r="8.3726959"
-       gradientTransform="matrix(1,0,0,1.0032611,0,-0.03620244)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4707">
-      <stop
-         style="stop-color:#8c9ba5;stop-opacity:1"
-         offset="0"
-         id="stop4703" />
-      <stop
-         style="stop-color:#607480;stop-opacity:1"
-         offset="1"
-         id="stop4705" />
-    </linearGradient>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4721">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood4711" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="out"
-         result="composite1"
-         id="feComposite4713" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="1"
-         result="blur"
-         id="feGaussianBlur4715" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset4717" />
-      <feComposite
-         in="offset"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite2"
-         id="feComposite4719" />
-    </filter>
-    <radialGradient
-       xlink:href="#linearGradient4727"
-       id="radialGradient4729"
-       cx="149.26262"
-       cy="12.784631"
-       fx="149.26262"
-       fy="12.784631"
-       r="8.6400051"
-       gradientTransform="matrix(1,0,0,0.993055,0,0.07848724)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4727">
-      <stop
-         style="stop-color:#3eb796;stop-opacity:1"
-         offset="0"
-         id="stop4723" />
-      <stop
-         style="stop-color:#31a886;stop-opacity:1"
-         offset="1"
-         id="stop4725" />
-    </linearGradient>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4741">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood4731" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="out"
-         result="composite1"
-         id="feComposite4733" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="1"
-         result="blur"
-         id="feGaussianBlur4735" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset4737" />
-      <feComposite
-         in="offset"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite2"
-         id="feComposite4739" />
-    </filter>
-    <radialGradient
-       xlink:href="#linearGradient5023"
-       id="radialGradient5017"
-       cx="466.94476"
-       cy="12.037849"
-       fx="466.94476"
-       fy="12.037849"
-       r="9.6007004"
-       gradientTransform="matrix(0.79035186,0,0,0.79508811,-0.14216924,6.9389816e-4)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient5023">
-      <stop
-         id="stop5019"
-         offset="0"
-         style="stop-color:#c6cdd2;stop-opacity:1" />
-      <stop
-         id="stop5021"
-         offset="1"
-         style="stop-color:#9cabb4;stop-opacity:1" />
-    </linearGradient>
-    <radialGradient
-       xlink:href="#linearGradient4707"
-       id="radialGradient4793"
-       cx="194.44176"
-       cy="13.746766"
-       fx="194.44176"
-       fy="13.746766"
-       r="9.5999947"
-       gradientTransform="matrix(1,0,0,0.87500048,0,1.3876528)"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4805">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood4795" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="out"
-         result="composite1"
-         id="feComposite4797" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="0.5"
-         result="blur"
-         id="feGaussianBlur4799" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset4801" />
-      <feComposite
-         in="offset"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite2"
-         id="feComposite4803" />
-    </filter>
-    <radialGradient
-       xlink:href="#linearGradient4707"
-       id="radialGradient4833"
-       cx="239.2"
-       cy="11.101265"
-       fx="239.2"
-       fy="11.101265"
-       r="9.6000004"
-       gradientTransform="matrix(1,0,0,0.87500002,0,1.3876579)"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4853">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood4843" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="out"
-         result="composite1"
-         id="feComposite4845" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="0.5"
-         result="blur"
-         id="feGaussianBlur4847" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset4849" />
-      <feComposite
-         in="offset"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite2"
-         id="feComposite4851" />
-    </filter>
-    <radialGradient
-       xlink:href="#linearGradient4707"
-       id="radialGradient4841"
-       cx="242.26164"
-       cy="12.423289"
-       fx="242.26164"
-       fy="12.423289"
-       r="3.5288758"
-       gradientTransform="matrix(0.79274531,0,0,0.78327977,-0.14435628,0.11758726)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       xlink:href="#linearGradient4707"
-       id="radialGradient4858"
-       cx="242.0894"
-       cy="12.418613"
-       fx="242.0894"
-       fy="12.418613"
-       r="3.5288758"
-       gradientTransform="matrix(1,0,0,0.9880597,0,0.14828194)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       xlink:href="#linearGradient5037"
-       id="radialGradient5031"
-       cx="466.39926"
-       cy="31.105829"
-       fx="466.39926"
-       fy="31.105829"
-       r="9.7507105"
-       gradientTransform="matrix(1,0,0,0.99992718,0,0.00247197)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient5037">
-      <stop
-         id="stop5033"
-         offset="0"
-         style="stop-color:#e8e1a1;stop-opacity:1" />
-      <stop
-         id="stop5035"
-         offset="1"
-         style="stop-color:#baad3e;stop-opacity:1" />
-    </linearGradient>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter5049">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood5039" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="out"
-         result="composite1"
-         id="feComposite5041" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="0.5"
-         result="blur"
-         id="feGaussianBlur5043" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset5045" />
-      <feComposite
-         in="offset"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite2"
-         id="feComposite5047" />
-    </filter>
-    <radialGradient
-       xlink:href="#linearGradient4707"
-       id="radialGradient4813"
-       cx="217.95329"
-       cy="16.56296"
-       fx="217.95329"
-       fy="16.56296"
-       r="10.35937"
-       gradientTransform="matrix(1,0,0,0.8160434,0,2.0506693)"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4825">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood4815" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="out"
-         result="composite1"
-         id="feComposite4817" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="0.5"
-         result="blur"
-         id="feGaussianBlur4819" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset4821" />
-      <feComposite
-         in="offset"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite2"
-         id="feComposite4823" />
-    </filter>
-    <radialGradient
-       xlink:href="#linearGradient4707"
-       id="radialGradient4861"
-       cx="262.79288"
-       cy="15.840806"
-       fx="262.79288"
-       fy="15.840806"
-       r="8.5577164"
-       gradientTransform="matrix(1,0,0,0.9969072,0,0.03528241)"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4873">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood4863" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="out"
-         result="composite1"
-         id="feComposite4865" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="0.5"
-         result="blur"
-         id="feGaussianBlur4867" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset4869" />
-      <feComposite
-         in="offset"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite2"
-         id="feComposite4871" />
-    </filter>
-    <radialGradient
-       xlink:href="#linearGradient4707"
-       id="radialGradient4881"
-       cx="286.58698"
-       cy="14.171478"
-       fx="286.58698"
-       fy="14.171478"
-       r="8.53125"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4893">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood4883" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="out"
-         result="composite1"
-         id="feComposite4885" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="0.5"
-         result="blur"
-         id="feGaussianBlur4887" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset4889" />
-      <feComposite
-         in="offset"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite2"
-         id="feComposite4891" />
-    </filter>
-    <radialGradient
-       xlink:href="#linearGradient4707"
-       id="radialGradient4901"
-       cx="308.97141"
-       cy="14.457072"
-       fx="308.97141"
-       fy="14.457072"
-       r="6.09375"
-       gradientTransform="matrix(1,0,0,1.4,0,-4.4901397)"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4913">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood4903" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="out"
-         result="composite1"
-         id="feComposite4905" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="0.5"
-         result="blur"
-         id="feGaussianBlur4907" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset4909" />
-      <feComposite
-         in="offset"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite2"
-         id="feComposite4911" />
-    </filter>
-    <radialGradient
-       xlink:href="#linearGradient4707"
-       id="radialGradient4921"
-       cx="331.15933"
-       cy="13.119289"
-       fx="331.15933"
-       fy="13.119289"
-       r="8.53125"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4933">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood4923" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="out"
-         result="composite1"
-         id="feComposite4925" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="0.5"
-         result="blur"
-         id="feGaussianBlur4927" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset4929" />
-      <feComposite
-         in="offset"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite2"
-         id="feComposite4931" />
-    </filter>
-    <radialGradient
-       xlink:href="#linearGradient4707"
-       id="radialGradient4941"
-       cx="353.15076"
-       cy="11.316628"
-       fx="353.15076"
-       fy="11.316628"
-       r="6.09375"
-       gradientTransform="matrix(0.79035186,0,0,0.15902921,-0.14216924,7.1987363)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       gradientTransform="matrix(0.79035186,0,0,0.79514603,-0.14216924,3.8580698e-5)"
-       xlink:href="#linearGradient4707"
-       id="radialGradient4949"
-       cx="375.97003"
-       cy="11.407905"
-       fx="375.97003"
-       fy="11.407905"
-       r="6.09375"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       xlink:href="#linearGradient4707"
-       id="radialGradient4957"
-       cx="400.5007"
-       cy="13.518586"
-       fx="400.5007"
-       fy="13.518586"
-       r="8.5350475"
-       gradientTransform="matrix(1,0,0,0.99701325,0,0.03407254)"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4969">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood4959" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="out"
-         result="composite1"
-         id="feComposite4961" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="0.5"
-         result="blur"
-         id="feGaussianBlur4963" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset4965" />
-      <feComposite
-         in="offset"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite2"
-         id="feComposite4967" />
-    </filter>
-    <radialGradient
-       xlink:href="#linearGradient4975"
-       id="radialGradient4977"
-       cx="417.02075"
-       cy="15.742972"
-       fx="417.02075"
-       fy="15.742972"
-       r="8.53125"
-       gradientTransform="matrix(1.357667,-0.02466618,0.02411975,1.3275908,-149.53429,5.1574131)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4975">
-      <stop
-         style="stop-color:#f79729;stop-opacity:1"
-         offset="0"
-         id="stop4971" />
-      <stop
-         style="stop-color:#d2831f;stop-opacity:1"
-         offset="1"
-         id="stop4973" />
-    </linearGradient>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4989">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood4979" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="out"
-         result="composite1"
-         id="feComposite4981" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="0.5"
-         result="blur"
-         id="feGaussianBlur4983" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset4985" />
-      <feComposite
-         in="offset"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite2"
-         id="feComposite4987" />
-    </filter>
-    <radialGradient
-       xlink:href="#linearGradient4707"
-       id="radialGradient4997"
-       cx="444.33652"
-       cy="11.316628"
-       fx="444.33652"
-       fy="11.316628"
-       r="8.53125"
-       gradientTransform="matrix(1,0,0,0.71428563,0,3.2333231)"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter5009">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood4999" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="out"
-         result="composite1"
-         id="feComposite5001" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="0.5"
-         result="blur"
-         id="feGaussianBlur5003" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset5005" />
-      <feComposite
-         in="offset"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite2"
-         id="feComposite5007" />
-    </filter>
-    <radialGradient
-       xlink:href="#linearGradient4747"
-       id="radialGradient4710"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.265625,0,0,1.1109477,-0.05703897,1.4865748)"
-       cx="134.97461"
-       cy="9"
-       fx="134.97461"
-       fy="9"
-       r="7.9746099" />
-    <linearGradient
-       id="linearGradient4747">
-      <stop
-         style="stop-color:#c5b631;stop-opacity:1"
-         offset="0"
-         id="stop4743" />
-      <stop
-         style="stop-color:#baad3e;stop-opacity:1"
-         offset="1"
-         id="stop4745" />
-    </linearGradient>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4729">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood4719" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="out"
-         result="composite1"
-         id="feComposite4721" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="1"
-         result="blur"
-         id="feGaussianBlur4723" />
-      <feOffset
-         dx="2.77556e-017"
-         dy="0"
-         result="offset"
-         id="feOffset4725" />
-      <feComposite
-         in="offset"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite2"
-         id="feComposite4727" />
-    </filter>
-    <radialGradient
-       xlink:href="#linearGradient5037"
-       id="radialGradient4712"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.265625,0,0,1.1109477,-0.05703897,1.4865748)"
-       cx="132.6468"
-       cy="9.0947113"
-       fx="132.6468"
-       fy="9.0947113"
-       r="7.9746099" />
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4774">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood4764" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="out"
-         result="composite1"
-         id="feComposite4766" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="0.5"
-         result="blur"
-         id="feGaussianBlur4768" />
-      <feOffset
-         dx="2.77556e-017"
-         dy="0"
-         result="offset"
-         id="feOffset4770" />
-      <feComposite
-         in="offset"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite2"
-         id="feComposite4772" />
-    </filter>
-    <radialGradient
-       xlink:href="#linearGradient4747"
-       id="radialGradient4714"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.265625,0,0,1.1109477,-0.05703897,1.4865748)"
-       cx="134.97461"
-       cy="9"
-       fx="134.97461"
-       fy="9"
-       r="7.9746099" />
-    <radialGradient
-       xlink:href="#linearGradient4707"
-       id="radialGradient4750"
-       cx="166.37157"
-       cy="11.485105"
-       fx="166.37157"
-       fy="11.485105"
-       r="0.31640625"
-       gradientTransform="matrix(0.99998863,-0.00473886,0.08838422,18.426509,-1.0132111,-199.35688)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       xlink:href="#linearGradient4832"
-       id="radialGradient4709-1"
-       cx="125.30523"
-       cy="16.659737"
-       fx="125.30523"
-       fy="16.659737"
-       r="8.3726959"
-       gradientTransform="matrix(1,0,0,1.0032611,0.11563445,22.233158)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4832">
-      <stop
-         id="stop5029"
-         offset="0"
-         style="stop-color:#22e23d;stop-opacity:1" />
-      <stop
-         id="stop4830"
-         offset="1"
-         style="stop-color:#38a748;stop-opacity:1" />
-    </linearGradient>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter4844">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood4834" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="out"
-         result="composite1"
-         id="feComposite4836" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="0.5"
-         result="blur"
-         id="feGaussianBlur4838" />
-      <feOffset
-         dx="2.77556e-017"
-         dy="0"
-         result="offset"
-         id="feOffset4840" />
-      <feComposite
-         in="offset"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite2"
-         id="feComposite4842" />
-    </filter>
-  </defs>
-  <g
-     id="g7757">
-    <path
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
-       style="display:inline;fill:url(#radialGradient4669);fill-opacity:1;stroke-width:1;filter:url(#filter4701)"
-       d="m 17.870749,13.841269 -6.303534,-0.0074 2.264363,2.148431 c 0.615648,0.584128 0.72,1.44 0.24,1.92 l -0.96,1.08 c -0.48,0.48 -1.32,0.36 -1.92,-0.24 0,0 -6.4200001,-6.6 -6.4800001,-6.6 -0.06,0 -0.36,-0.48 -0.48,-0.84 0,-0.359999 0.36,-0.719999 0.48,-0.839999 l 6.3600001,-6.48 c 0.6,-0.6000001 1.44,-0.7200001 1.92,-0.24 l 0.96,1.0799999 c 0.48,0.48 0.36,1.32 -0.24,1.9200001 l -2.144363,2.0610645 6.359451,0.043374 c 0.719983,0.00491 1.227959,0.50779 1.227959,1.2277905 v 2.483369 c 0,0.72 -0.563877,1.284215 -1.283876,1.28337 z"
-       id="path4" />
-    <path
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
-       style="display:inline;fill:url(#radialGradient4637);fill-opacity:1;stroke-width:1;filter:url(#filter4661)"
-       id="path4154"
-       d="m 19.187889,37.765372 -7.620674,-0.0365 3.352509,3.266174 c 0.515294,0.50108 0.829738,1.388534 0.443269,1.764345 l -1.759464,1.992905 c -0.356609,0.403923 -1.52102,-0.108922 -2.036314,-0.735274 L 3.9756591,36.471238 c 0,0 -0.7399492,-0.710192 -0.7399492,-1.211274 0,-0.501081 0.7399492,-1.303987 0.7399492,-1.303987 l 7.5915559,-7.545783 c 0.515294,-0.50108 1.613776,-1.093109 1.980397,-0.698138 l 1.815381,1.955768 c 0.386469,0.375811 0.172889,1.300401 -0.471228,1.801482 l -3.32455,3.229041 7.620674,0.02842 c 0.772936,0.0029 1.344153,0.417712 1.344153,1.169335 v 2.560987 c 0,0.751622 -0.571221,1.311987 -1.344153,1.308283 z" />
-    <path
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
-       style="display:inline;fill:url(#radialGradient4677);fill-opacity:1;stroke-width:1;filter:url(#filter4689)"
-       id="path4165"
-       d="m 26.776124,12.612425 v -2.53895 c 0,-0.7200003 0.480206,-1.3282747 1.2,-1.3111602 l 5.76,0.041051 L 31.66,6.7412646 c -0.602042,-0.5979755 -0.72,-1.4399999 -0.24,-1.92 l 0.96,-1.08 c 0.48,-0.48 1.32,-0.36 1.92,0.24 l 6.36,6.4800004 c 0.12,0.12 0.48,0.48 0.48,0.84 0,0.36 -0.36,0.84 -0.48,0.84 l -6.48,6.48 c -0.6,0.6 -1.44,0.72 -1.92,0.24 l -0.96,-1.08 c -0.48,-0.48 -0.36,-1.32 0.24,-1.92 L 33.736124,13.833888 28.06,13.868005 c -0.719987,0.0043 -1.283876,-0.53558 -1.283876,-1.25558 z" />
-    <path
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
-       style="display:inline;fill:url(#radialGradient4605);fill-opacity:1;stroke-width:1;filter:url(#filter4629)"
-       id="path4176"
-       d="m 64.708108,6.2881044 -5.061037,5.0305226 5.061037,5.030522 -2.530518,2.515261 -5.061038,-5.030522 -5.061037,5.030522 -2.530519,-2.515261 5.061037,-5.030522 -5.061037,-5.0305226 2.530519,-2.5152612 5.061037,5.0305223 5.061038,-5.0305223 z" />
-    <path
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
-       style="display:inline;fill:url(#radialGradient4525);fill-opacity:1;stroke-width:1;filter:url(#filter4597)"
-       id="path4187"
-       d="m 87.482777,11.318627 h -8.856816 l 3.13833,-3.0716727 C 81.15648,7.545735 80.363876,6.712205 79.283876,6.712205 c -2.64,0 -5.107543,1.9376803 -5.107543,4.577681 0,2.64 2.411627,5.050109 5.051627,5.050109 1.68,0 3.619039,-1.066107 4.459039,-2.506107 l 2.530518,1.25763 c -1.32,2.4 -3.961599,4.443007 -6.961599,4.443007 -4.32,0 -8.219378,-3.896849 -8.219378,-8.216849 0,-4.3200008 3.927337,-7.633261 8.247337,-7.633261 1.8,0 3.619792,0.8778997 5.059792,1.9578998 l 3.139108,-3.1271021 z" />
-    <path
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
-       style="display:inline;fill:url(#radialGradient4529);fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1;filter:url(#filter4783)"
-       d="M 102.66589,2.5152127 92.543814,11.318627 h 3.795778 v 7.545783 h 5.061038 v -5.030522 h 2.53052 v 5.030522 h 5.06104 v -7.545783 h 3.79577 z"
-       id="path4209" />
-    <path
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
-       style="display:inline;fill:url(#radialGradient4709);fill-opacity:1;stroke-width:1;filter:url(#filter4721)"
-       id="path4214"
-       d="m 133.03211,12.576257 -6.32629,6.288153 c -0.24,0.36 -0.82401,0.692435 -1.30401,0.692435 -0.48,0 -0.86651,-0.332435 -1.22651,-0.692435 l -6.3263,-6.288153 c -0.79571,-0.72 -0.93921,-1.286268 0.0208,-1.280462 l 3.77501,0.02283 -0.0107,-7.5841022 c -0.001,-0.7199993 0.50796,-1.1722101 1.22796,-1.1722101 h 5.10754 c 0.72,0 1.22426,0.4800094 1.22796,1.2 l 0.0388,7.5563123 3.80118,-0.05062 c 0.95992,-0.01278 0.71459,0.588252 -0.005,1.308252 z" />
-    <path
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
-       style="display:inline;fill:url(#radialGradient4729);fill-opacity:1;stroke-width:1;filter:url(#filter4741)"
-       id="path4225"
-       d="m 148.19571,20.103585 c -4.8,0 -8.89163,-3.97895 -8.89163,-8.77895 0,-4.6800005 4.11959,-8.7145303 8.91959,-8.7145303 4.8,0 8.80776,3.9511599 8.80776,8.7511603 0,4.68 -4.03572,8.74232 -8.83572,8.74232 z m 0.0559,-15.04801 c -3.36,0 -6.39142,2.9178996 -6.39142,6.2779 0,3.24 2.9755,6.22232 6.3355,6.22232 3.36,0 6.33551,-2.86232 6.33551,-6.22232 0,-3.3600004 -2.91959,-6.2779 -6.27959,-6.2779 z m -0.63959,7.520682 c -0.48,-0.12 -0.63716,-0.735044 -0.64429,-1.214992 l -0.0559,-3.7667402 c -0.0107,-0.7199217 0.53592,-1.28337 1.25592,-1.28337 0.72,0 1.27834,0.535601 1.28388,1.25558 l 0.0289,3.7518922 c 1.32,1.32 2.53051,3.772891 2.53051,3.772891 0,0 -3.07896,-1.195261 -4.39896,-2.515261 z" />
-    <path
-       style="display:inline;fill:url(#radialGradient5017);fill-opacity:1;stroke-width:0.79274529"
-       id="path4355"
-       d="m 369.00476,4.7878231 0.94842,1.9083504 0.47422,0.858758 0.94842,0.190835 2.18136,0.3816699 -1.61231,1.7175156 -0.6639,0.667923 0.0948,0.954175 0.37937,2.290022 -1.89685,-0.954178 -0.85358,-0.477086 -0.85358,0.477086 -1.89685,0.954178 0.37938,-2.290022 0.0948,-0.954175 -0.6639,-0.667923 -1.61232,-1.7175156 2.27622,-0.3816699 0.94842,-0.190835 0.37936,-0.858758 0.94843,-1.9083504 m 0,-3.4350309 c -0.28454,0 -0.56906,0.1908348 -0.75874,0.667922 l -1.89683,3.9121193 -4.07821,0.6679227 c -0.94842,0.190835 -1.13812,0.8587576 -0.47421,1.5266802 l 2.94011,3.1487776 -0.66391,4.389208 c -0.0948,0.572504 0.1897,0.954174 0.66391,0.954174 0.18967,0 0.37936,-0.09542 0.56905,-0.190835 l 3.69885,-2.003768 3.69884,2.003768 c 0.18969,0.09543 0.47421,0.190835 0.56906,0.190835 0.4742,0 0.75873,-0.38167 0.6639,-1.049592 l -0.6639,-4.389207 2.9401,-3.1487781 c 0.66391,-0.6679226 0.37938,-1.3358454 -0.4742,-1.5266803 L 371.66031,5.837416 369.76347,1.9252968 C 369.5738,1.543627 369.28926,1.3527922 369.00474,1.3527922 Z" />
-    <path
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
-       style="display:inline;fill:url(#radialGradient4793);fill-opacity:1;stroke-width:1;filter:url(#filter4805)"
-       id="path4366"
-       d="m 202.62125,17.648005 -2.53039,-0.04122 1.26526,2.515261 h -15.18311 l 1.26526,-2.515261 -2.51784,0.02249 c -0.71997,0.0064 -1.31817,-0.563397 -1.31184,-1.28337 l 0.0559,-6.3612693 c 0.006,-0.7199727 0.59192,-1.2112687 1.31183,-1.2000001 l 1.19667,0.018731 0.0313,-2.5298907 c 0.009,-0.7199457 0.51397,-1.243001 1.23397,-1.243001 l 0.022,-1.2403691 c 0.0127,-0.7198886 0.6198,-1.2535885 1.33979,-1.2555799 l 10.04733,-0.02779 c 0.72,-0.00199 1.21931,0.5078413 1.22796,1.22779 l 0.0156,1.295949 c 0.72,0 1.2692,0.5785813 1.26831,1.2985809 l -0.003,2.4743108 1.26513,-10e-8 c 0.71992,-0.010711 1.26205,0.5376375 1.26526,1.2576305 v 6.288153 c 0,0.729621 -0.61509,1.257631 -1.26526,1.257631 z m -15.18298,-0.04122 1.26526,-2.515262 h -1.26526 z m 0.6,-6.288153 h -0.6 -0.6 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.24,0.6 0.6,0.6 h 1.2 c 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.25348,-0.503016 -0.6,-0.6 z M 198.8256,5.0304738 c 0,-0.72 -0.54528,-1.2523398 -1.26526,-1.2576306 h -7.59155 c -0.71998,-0.00529 -1.28117,0.5378043 -1.26526,1.2576306 v 3.7728917 c 0.0159,0.7198264 0.54528,1.2629215 1.26526,1.2576305 h 7.59155 c 0.71999,-0.0053 1.24942,-0.5078188 1.25592,-1.2277899 z m -1.26526,10.0610482 h -7.59155 l -1.26526,3.772892 h 10.12207 z m 2.53052,0 h -1.26526 l 1.26526,2.515262 z" />
-    <path
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
-       style="display:inline;fill:url(#radialGradient4833);fill-opacity:1;stroke-width:1;filter:url(#filter4853)"
-       id="path4388"
-       d="m 248.17426,18.945466 -16.43876,-0.02779 c -0.96,-0.0016 -1.40468,-0.339789 -1.40858,-1.299781 l -0.0559,-13.7557998 c -0.004,-0.959992 0.47654,-1.3847678 1.43653,-1.3831504 l 16.49468,0.02779 c 0.96,0.00162 1.24473,0.3675784 1.24083,1.3275705 l -0.0559,13.7557997 c -0.004,0.959992 -0.25287,1.356983 -1.21287,1.355361 z M 239.88388,3.8178947 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.24,0.6 0.6,0.6 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.24,-0.6 -0.6,-0.6 z m 2.64346,0 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.36,0.6 0.6,0.6 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.24,-0.6 -0.6,-0.6 z m 3.72,0 h -1.2 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.24,0.6 0.6,0.6 h 1.2 c 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.24,-0.6 -0.6,-0.6 z m 0.65592,4.9945298 c 0.005,-0.7199803 -0.53592,-1.2538267 -1.25592,-1.2555798 l -11.41287,-0.02779 c -0.72,-0.00175 -1.22533,0.5077946 -1.22796,1.2277899 l -0.028,7.6724304 c -0.003,0.719994 0.50796,1.175707 1.22795,1.172209 l 11.44083,-0.05558 c 0.71999,-0.0035 1.19464,-0.507809 1.2,-1.227789 z" />
-    <g
-       aria-label="+"
-       transform="scale(0.98484984,1.0153832)"
-       style="font-style:normal;font-weight:normal;font-size:9.51294327px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#radialGradient4841);fill-opacity:1;stroke:none;stroke-width:0.79274535px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="text4409">
-      <path
-         d="m 194.95358,9.8484986 h -2.03077 v 1.9696994 h -1.01538 V 9.8484986 h -2.03077 V 8.8636487 h 2.03077 V 6.893949 h 1.01538 v 1.9696997 h 2.03077 z"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:8.55116463px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:url(#radialGradient4841);fill-opacity:1;stroke-width:0.79274535px"
-         id="path7725" />
-    </g>
-    <path
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
-       d="m 467.25784,24.196945 c -0.36562,0 -0.73125,0.24375 -0.975,0.853125 l -2.4375,4.996876 -5.24062,0.853125 c -1.21875,0.24375 -1.4625,1.096875 -0.60938,1.95 l 3.77813,4.021875 -0.85313,5.60625 c -0.12181,0.73125 0.24375,1.21875 0.85313,1.21875 0.24375,0 0.4875,-0.121875 0.73125,-0.24375 l 4.75312,-2.559375 4.75313,2.559375 c 0.24375,0.121875 0.60937,0.24375 0.73125,0.24375 0.60937,0 0.975,-0.4875 0.85312,-1.340625 l -0.85312,-5.60625 3.77812,-4.021875 c 0.85313,-0.853125 0.4875,-1.70625 -0.60937,-1.95 l -5.24063,-0.853125 -2.4375,-4.996876 c -0.24375,-0.4875 -0.60937,-0.73125 -0.975,-0.73125 z"
-       id="path6182"
-       style="display:inline;fill:url(#radialGradient5031);fill-opacity:1;stroke-width:1.21875;filter:url(#filter5049)" />
-    <path
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
-       d="m 226.66131,15.091518 -0.0388,3.707848 c -0.007,0.673061 -0.5177,1.245488 -1.19079,1.24654 l -17.77799,0.02779 c -0.6731,0.0011 -1.2416,-0.573462 -1.24671,-1.24654 l -0.028,-3.688049 c -0.005,-0.673078 0.6302,-1.305219 1.30331,-1.305219 1.26531,-1.257631 1.03718,-3.269047 1.26531,-5.0305225 0.4278,-2.8226251 0.0953,-6.2244545 3.80878,-6.2479747 l 7.52682,-0.047673 c 3.73297,-0.023644 3.4173,3.4730226 3.84751,6.2956477 0.41438,2.7153765 0,3.7728915 1.26526,5.0305225 0.70548,0 1.26526,0.515815 1.26526,1.25763 z m -7.68106,-4.410561 h -1.82811 V 8.8528316 c 0,-0.8124995 -1.21875,-0.8124995 -1.21875,0 v 1.8281254 h -1.82814 c -0.8125,0 -0.8125,1.218749 0,1.218749 h 1.82814 v 1.828125 c 0,0.812501 1.21875,0.812501 1.21875,0 v -1.828125 h 1.82811 c 0.8125,0 0.8125,-1.218749 0,-1.218749 z"
-       id="path7318"
-       style="display:inline;fill:url(#radialGradient4813);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4825)" />
-    <path
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
-       d="m 269.02823,19.939154 c -0.975,0 -1.82813,-0.24375 -2.80313,-1.584375 -0.975,-1.340625 -2.07187,-3.046875 -2.07187,-3.046875 0,0 -0.85313,-1.096875 -1.34063,-1.95 -0.60937,-0.853125 -1.34062,-0.609375 -1.34062,-0.609375 0,0 -3.53438,-5.7281239 -4.14375,-6.581249 -0.73125,-1.21875 0.73125,-3.290625 0.73125,-3.290625 l 5.3625,8.531249 c 0,0 1.70625,2.315625 2.31562,2.803125 0.60938,0.4875 1.70625,-0.4875 3.4125,1.096875 2.31563,2.19375 1.58438,4.63125 -0.12181,4.63125 z m -0.36563,-3.534375 c -1.09687,-1.21875 -2.07187,-1.096875 -2.31562,-0.73125 -0.24375,0.365625 0,1.4625 0.4875,2.071875 0.4875,0.609375 0.975,0.853125 1.70625,0.853125 0.73125,0.121875 1.34062,-0.853125 0.1218,-2.19375 z m -4.63125,-5.728124 -1.4625,-2.19375 3.53438,-5.60625 c 0,0 1.4625,2.071875 0.73125,3.290625 -0.36563,0.4875001 -1.70625,2.803125 -2.80313,4.509375 z m -5.60625,3.534374 c 0.36563,-0.365625 1.21875,-1.340625 1.70625,-2.071875 l 0.975,1.4625 c -0.4875,0.73125 -1.09687,1.70625 -1.09687,1.70625 0,0 -1.09688,1.70625 -2.07188,3.046875 -0.85312,1.340625 -1.70625,1.584375 -2.80312,1.584375 -1.70625,0 -2.55938,-2.4375 -0.12181,-4.63125 1.70625,-1.4625 2.80312,-0.609375 3.4125,-1.096875 z m -2.925,2.19375 c -1.09687,1.21875 -0.4875,2.19375 0.24375,2.19375 0.73125,0 1.21875,-0.24375 1.70625,-0.853125 0.4875,-0.609375 0.73125,-1.828125 0.4875,-2.071875 -0.36562,-0.365625 -1.34062,-0.4875 -2.4375,0.73125 z"
-       id="path7886"
-       style="display:inline;fill:url(#radialGradient4861);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4873)" />
-    <path
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
-       d="m 292.45286,20.11787 -7.56413,0 c -0.73125,0 -1.32549,-0.515308 -1.33058,-1.24654 l -0.028,-4.017519 v -3.16875 -2.9250003 c 0,-0.73125 0.4875,-1.21875 1.21875,-1.21875 l 6.44059,0.00442 2.53052,2.515261 0.0354,8.810334 c 0.003,0.731244 -0.57138,1.24654 -1.30263,1.24654 z M 289.62394,8.7600607 v 2.4375003 h 2.4375 z m -7.3125,-0.6736655 0.0213,0.7169703 v 2.5152615 3.772891 l -5.06403,0.04019 c -0.73123,0.0058 -1.21672,-0.598663 -1.21875,-1.32991 l -0.028,-10.0556901 c -0.002,-0.7312471 0.4875,-1.21875 1.21875,-1.21875 h 6.09375 l 2.79402,2.5031129 v 1.81343 h -2.53052 c -0.67317,-0.017075 -1.31624,0.241688 -1.28654,1.2424914 z m 0.0213,-4.7304016 v 2.4596813 l 2.53052,-0.02779 z"
-       id="path8454"
-       style="display:inline;fill:url(#radialGradient4881);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4893)" />
-    <path
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
-       d="m 312.76384,20.20124 -10.1808,-0.02779 c -0.75126,-0.0021 -1.21143,-0.547743 -1.21303,-1.272325 l -0.028,-12.6083588 c -0.002,-0.9749978 0.29395,-1.2762443 1.26895,-1.2723257 l 2.49639,0.010033 c 0,0 0.0587,-2.5309032 2.49616,-2.5309032 2.4375,0 2.56487,2.5309032 2.56487,2.5309032 l 2.48359,0.017757 c 0.97497,0.00697 1.35938,0.3251372 1.35283,1.3001156 l -0.0839,12.4971989 c -0.005,0.808245 -0.51762,1.35744 -1.15713,1.355695 z m -1.86968,-13.8508896 -1.34061,-0.609375 c 0,0 0,-1.8281249 -1.95,-1.8281249 -1.95,0 -1.95,1.8281249 -1.95,1.8281249 l -1.34063,0.609375 -0.47079,1.1953846 h 7.59155 z m 0.53952,2.4530151 h -6.32629 l -2.53052,2.5152615 2.53052,5.030522 7.59155,-5.030522 z"
-       id="path9022"
-       style="display:inline;fill:url(#radialGradient4901);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4913)" />
-    <path
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
-       d="M 335.47361,15.091518 V 7.545735 l 3.79578,3.772892 z m -8.85681,1.257631 h 7.59155 l -3.79578,3.772892 z m 6.32629,-1.257631 h -5.06103 c -0.73124,-0.0041 -1.26114,-0.526392 -1.26526,-1.25763 V 8.8033655 c -0.004,-0.7312386 0.53401,-1.2576305 1.26526,-1.2576305 h 5.06103 c 0.73125,0 1.26526,0.5263804 1.26526,1.2576305 v 5.0305225 c 0,0.609375 -0.53402,1.261705 -1.26526,1.25763 z m 0,-3.772891 c 0,-0.73125 -0.53401,-1.257631 -1.26526,-1.257631 h -2.53052 c -0.73125,0 -1.26525,0.526381 -1.26525,1.257631 v 1.25763 c 0,0.73125 0.534,1.257631 1.26525,1.257631 h 2.53052 c 0.73125,0 1.26526,-0.526381 1.26526,-1.257631 z m -2.53052,-8.8034143 3.79578,3.7728917 h -7.59155 z m -5.06103,5.0305223 v 7.545783 l -3.79578,-3.772891 z"
-       id="path9590"
-       style="display:inline;fill:url(#radialGradient4921);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4933)" />
-    <path
-       d="m 274,8 h 10 v 2 h -10 z"
-       id="path10158"
-       style="display:inline;fill:url(#radialGradient4941);fill-opacity:1;stroke-width:0.96615839" />
-    <path
-       d="m 302,10 h -4 v 4 h -2 v -4 h -4 V 8 h 4 V 4 h 2 v 4 h 4 z"
-       id="path10726"
-       style="display:inline;fill:url(#radialGradient4949);fill-opacity:1;stroke-width:0.96615839" />
-    <path
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
-       d="m 406.82037,12.583531 c -0.12181,0.73125 -0.24375,1.4625 -0.4875,2.071875 -0.4875,1.584375 -1.4625,3.046875 -3.04686,4.021874 0.4875,0.4875 1.58436,1.096875 1.58436,1.096875 0,0 -2.4375,0.365625 -4.99686,0.365625 l -0.12181,-0.121875 v 0.121875 c -1.21875,0 -2.4375,-0.365625 -3.65625,-0.73125 0.85311,-0.73125 1.4625,-1.584374 1.95,-2.559374 0.73125,-1.4625 0.73125,-3.65625 0.73125,-3.65625 0,0 1.09686,1.828125 1.70625,2.559375 1.4625,-0.73125 2.4375,-2.19375 2.55936,-3.65625 0.12181,-1.096875 -0.24375,-2.071875 -0.73125,-2.8031253 -0.4875,-0.8531251 -1.21875,-1.3406251 -2.07186,-1.7062501 0.24375,-0.4874999 0.60936,-1.0968749 0.975,-1.584375 0.4875,-0.73125 1.09686,-1.21875 1.58436,-1.4625 2.55939,1.340625 4.3875,4.5093751 4.02189,8.0437504 z m -8.53125,-2.4375 c 0,0 -1.34061,-1.8281254 -1.95,-2.4375004 -1.70625,0.853125 -2.68125,2.4375004 -2.68125,4.1437504 0.12181,1.828125 1.34064,3.290625 2.925,4.021875 -0.36561,0.609375 -0.73125,1.21875 -1.21875,1.70625 -0.4875,0.609375 -1.09686,0.974999 -1.4625,1.340624 -2.80311,-1.706249 -4.50936,-4.874999 -4.02186,-8.287499 0.1218,-0.8531253 0.36561,-1.7062504 0.60936,-2.4375004 0.4875,-1.3406249 1.34064,-2.4375 2.55939,-3.290625 0.1218,-0.121875 0.24375,-0.121875 0.36561,-0.24375 -0.4875,-0.4875 -1.95,-0.975 -1.95,-0.975 0,0 3.04689,-0.975 8.2875,-0.365625 -1.58436,2.315625 -1.4625,6.8250004 -1.4625,6.8250004 z"
-       id="path11294"
-       style="display:inline;fill:url(#radialGradient4957);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4969)" />
-    <path
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
-       d="m 429.73975,20.187746 -2.55504,0.05558 c -0.48738,0.0106 -0.61242,-0.769541 -0.61242,-1.378916 0,0 0.31966,-4.276424 -3.79578,-8.803414 -3.20233,-3.5225593 -8.85682,-3.7728916 -8.85682,-3.7728916 -0.60938,0 -1.26177,-0.171597 -1.25602,-0.6590635 l 0.028,-2.3732094 c 0.006,-0.4874666 0.61868,-0.7406188 1.22806,-0.7406188 0,0 7.05132,0.3003217 11.38734,5.0305223 3.72704,4.065871 5.06103,11.318675 5.06103,11.318675 0,0.4875 -0.0191,1.310083 -0.62831,1.323336 z M 413.91969,8.8033655 c 0,0 4.48239,0.7421569 7.0114,3.0905195 2.59016,2.40515 3.11068,6.970525 3.11068,6.970525 0,0.4875 -0.7448,1.278471 -1.23236,1.278471 h -1.35283 c -0.4875,0 -1.21059,-0.669096 -1.21059,-1.278471 0,0 0.4472,-2.304652 -1.91012,-4.45401 -1.78736,-1.629677 -4.41618,-1.834143 -4.41618,-1.834143 -0.60938,0 -1.23946,-0.793663 -1.22806,-1.281032 l 0.028,-1.195314 c 0.0114,-0.4873685 0.59073,-1.2965455 1.20011,-1.2965455 z m 1.20944,6.3426395 c 1.34062,0 2.54933,1.124665 2.54933,2.46529 0,1.340626 -1.09688,2.576451 -2.4375,2.576451 -1.34063,0 -2.54933,-1.208035 -2.54933,-2.548661 0,-1.340625 1.09687,-2.49308 2.4375,-2.49308 z"
-       id="path11862"
-       style="display:inline;fill:url(#radialGradient4977);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4989)" />
-    <path
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
-       d="m 448.08169,13.833888 v 2.515261 c 0,0.975 -0.41214,1.257631 -1.26525,1.257631 h -10.12208 c -0.85314,0 -1.26526,-0.282631 -1.26526,-1.257631 V 6.2881044 c 0,-0.9750001 0.41212,-1.2576306 1.26526,-1.2576306 h 10.12208 c 0.85311,0 1.26525,0.2826305 1.26525,1.2576306 v 2.5152611 l 5.06104,-2.5152611 V 16.349149 Z"
-       id="path12430"
-       style="display:inline;fill:url(#radialGradient4997);fill-opacity:1;stroke-width:1.21875;filter:url(#filter5009)" />
-    <g
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
-       style="display:inline"
-       id="g4779">
-      <path
-         id="bookmarks-star-4"
-         d="M 165.92886,2.5152127 V 20.122041 h 8.85681 1.26526 2.53052 c 1.26526,0 2.53052,-1.257631 2.53052,-2.515261 V 15.091518 7.545735 5.0304738 c 0,-1.2576306 -1.26526,-2.5152611 -2.53052,-2.5152611 h -2.53052 -1.26526 z m 7.59155,2.5152611 1.26526,2.5152612 c 0,0 0.39827,0.9972133 0.68613,1.1930622 0.26974,0.1834496 1.07417,0.064568 1.07417,0.064568 h 3.30074 l -2.53052,3.1379238 c 0,0 -0.38069,0.332603 -0.51773,0.634968 -0.20593,0.452534 -0.18971,0.518683 -0.12151,1.257631 0.10732,1.162403 0.63924,3.772892 0.63924,3.772892 l -2.53052,-1.257631 c 0,0 -0.77873,-0.42944 -1.26526,-0.430166 -0.5721,0 -1.26526,0.430166 -1.26526,0.430166 l -2.53051,1.257631 c 0,0 0.56012,-2.658345 0.73559,-3.772892 0.11606,-0.733074 0.10061,-0.753616 -0.15752,-1.257631 -0.13995,-0.274086 -0.57807,-0.782455 -0.57807,-0.782455 l -2.53052,-2.9904368 h 3.02161 c 0,0 0.91024,-0.099407 1.27135,-0.3263622 0.27408,-0.1711231 0.76807,-0.9312683 0.76807,-0.9312683 z"
-         style="fill:url(#radialGradient4710);fill-opacity:1;stroke-width:1.265625;filter:url(#filter4729)" />
-      <path
-         id="bookmarks-overlay-1"
-         d="m 163.39834,2.5152127 c -1.26526,0 -2.53052,1.2576305 -2.53052,2.5152611 v 2.5152612 7.545783 2.515262 c 0,1.25763 1.26526,2.515261 2.53052,2.515261 h 2.91839 l 0.0559,-4.840061 V 7.6882296 l 0.028,-5.1730169 z"
-         style="fill:url(#radialGradient4712);fill-opacity:1;stroke:none;stroke-width:1.265625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers stroke fill;filter:url(#filter4774)" />
-      <path
-         id="bookmarks-divider-7"
-         d="M 165.92886,2.5152127 V 20.122041"
-         style="opacity:0.66300001;fill:url(#radialGradient4714);fill-opacity:1;stroke:url(#radialGradient4750);stroke-width:1.2614392;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-    <path
-       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
-       style="display:inline;fill:url(#radialGradient4709-1);fill-opacity:1;stroke-width:1;filter:url(#filter4844)"
-       id="path4214-3"
-       d="m 133.03211,35.213608 -6.32629,6.288153 c -0.24,0.36 -0.8202,0.518975 -1.3002,0.518975 -0.48,0 -0.87032,-0.158975 -1.23032,-0.518975 l -6.3263,-6.288153 c -0.6,-0.72 -0.96335,-1.29465 -0.003,-1.287183 l 3.79916,0.02955 -0.0908,-7.535242 c -0.009,-0.719949 0.67572,-1.307177 1.39571,-1.31116 l 5.02367,-0.02779 c 0.71999,-0.004 1.25401,0.619416 1.22796,1.33895 l 0.035,7.535242 3.80499,-0.02955 c 0.95998,-0.0075 0.71078,0.567183 -0.009,1.287183 z" />
-  </g>
-</svg>
diff --git a/application/palemoon/themes/osx/aboutCertError.css b/application/palemoon/themes/osx/aboutCertError.css
deleted file mode 100644
index 100bb3d3bb..0000000000
--- a/application/palemoon/themes/osx/aboutCertError.css
+++ /dev/null
@@ -1,73 +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/. */
-
-
-html {
-  background: #833;
-}
-
-body {
-  margin: 0;
-  padding: 0 1em;
-  color: -moz-FieldText;
-  font: message-box;
-}
-
-h1 {
-  margin: 0 0 .6em 0;
-  border-bottom: 1px solid ThreeDLightShadow;
-  font-size: 160%;
-}
-
-h2 {
-  font-size: 130%;
-}
-
-#errorPageContainer {
-  position: relative;
-  min-width: 13em;
-  max-width: 52em;
-  margin: 4em auto;
-  border: 2px solid #DD0D09;
-  border-radius: 10px;
-  box-shadow: 0px 0px 8px red;
-  padding: 3em;
-  padding-inline-start: 30px;
-  background: url("chrome://global/skin/icons/sslWarning.png") left 0 no-repeat -moz-Field;
-  background-origin: content-box;
-}
-
-#errorPageContainer:-moz-dir(rtl) {
-  background-position: right 0;
-}
-
-#errorTitle {
-  margin-inline-start: 80px;
-}
-
-#errorLongContent {
-  margin-inline-start: 80px;
-}
-
-.expander > button {
-  padding-inline-start: 20px;
-  margin-inline-start: -20px;
-  background: url("chrome://browser/skin/aboutCertError_sectionExpanded.png") left center no-repeat;
-  border: none;
-  font: inherit;
-  color: inherit;
-  cursor: pointer;
-}
-
-.expander > button:-moz-dir(rtl) {
-  background-position: right center;
-}
-
-.expander[collapsed] > button {
-  background-image: url("chrome://browser/skin/aboutCertError_sectionCollapsed.png");
-}
-
-.expander[collapsed] > button:-moz-dir(rtl) {
-  background-image: url("chrome://browser/skin/aboutCertError_sectionCollapsed-rtl.png");
-}
diff --git a/application/palemoon/themes/osx/aboutCertError_sectionCollapsed-rtl.png b/application/palemoon/themes/osx/aboutCertError_sectionCollapsed-rtl.png
deleted file mode 100644
index 84ba18c0a388d48a4aa3e8782f151cb69e20936e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 791
zcmV+y1L*vTP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006eX+uL$Nkc;*
zP;zf(X>4Tx0C?K1(mQBVQ5eAS|4ooaln^i#?36*OLX?;U+C@m4hfNw|NK*2cOzusS
zXmWGC_a;7Ys30y*f{&pH4l0d^f`b(-Se#r0rJzANIO|yGA|(#jlMGT_{NTXve0-e8
zcMjOUl{Kwt16r!7XHL(03dNFVtj}I-I5>o>EF0QPI-O+K*#3+JuyMSsY0byCmv6q^
z>?LlUdwS#UhW90Z52s!zmO%0X?waKg;I3HC0q#qtW`a})+;Y9FfOHM;>bXo9q!qwf
zv-}!xRxG~<oL#wQg473ms?t!w<^ZOZsv(0d1k@EnZh>tD_}*%@6|mm{j>?*Df_)7*
zTqu@2){&Qgz?lh<f}>pE1w6>W_{CA~$SD}_!P@mvZmW+3NCzFpV!#i8v~Lym+#3wG
z@-TJ`cD@V-KUW8XohM-b3hUc)NALdbmn40Ff6c8sTXXni3hidAF97(Uw*<Km1ef6X
zI!xY&18*Q5f?Nn&ARva-L+c$Q(PYve^iAbs>A5ifH(Je(*vAFzS1YNrzy$Eo=w_qB
zi;Y-ZSSd&5g|F7bsbP&C%Ltz@C(^=Ibs;OPnX|*1su9hO*2(3C^-g9%_(FSrSg%wg
z!}F-kR8qKM#&g0%h>|3UpCCS_$P**Y9AU8jAAsu_Je)k4$YkF=di6(7%<5$mAl%lj
z=#5(4^vq~lv+DK4Rr!S1<M;Wd`2}L;u1b6y1;hXV00v@9M??Vs0RI60puMM)00009
za7bBm000XU000XU0RWnu7ytkO2XskIMF-gh6Ac+RSj-Os0001TNkl<ZILl*T7zOkJ
zzdv36|M_zA|91yu|D(&X5YqVL;RJ@y=e%&LVIfx|P6NK(@B2@TMi^j17vNGXV&vAI
z&A`l~O_Tvxy}&N&!N|bC!0_|+j{iR%PGI=^<tk;d@bmSK{~ynIV2uTm4H|~26ae(l
VH*@=`>P`Rv002ovPDHLkV1i>OZ)*Sm

diff --git a/application/palemoon/themes/osx/aboutCertError_sectionCollapsed.png b/application/palemoon/themes/osx/aboutCertError_sectionCollapsed.png
deleted file mode 100644
index c9805f654c79b22ce0d8435d030e775f3b7492ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 776
zcmV+j1NZ!iP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006&X+uL$Nkc;*
zP;zf(X>4Tx0C)kdlTT>Va1_VCZIM-!Qt%JxDF>MfRbpG%E`x6U<J#34+K#Fx+azr|
z+cYL=)!{)wym%7)a~OgL6)U3P!3ho=p1cUkK#T0)S&xHVWW@K&kF*F5FTRlcKKbUo
z_xt_c%MS>AuNp?n51_5vX7S{VaOUheVQhe%@FR!=2v=pxn3kkGxol&bU*Kb(){e1U
zk8dyCe7D}u-8%p5#@)5Zt8IcjIb_m=fG<MA-UjCc;~M8O<4d+-laIz&)~X8eRpN+Q
zE+&be5{DX`-!QIm{=m2=H(2a|Sk#rK4)}w_lZtA|#0g?evE()}%k!h%?oj@~9pWRh
zVNz^hh4>Jw3yow;KY>#RDQA47#a;priom{$Bkk}Mz4w8Y>mzMr;MU5wKWNosQ8%4$
z*D|o<p5ts(fU%>%)>p^*wd^=sPiXFM!0M*lHG8fvP3rpy{Og_XnP&$+(;mp&9{rtp
zU0g2_=wAcM2_R16i&bF!KCtI4AdyD8KNj<DUPCYorPBF)G%ik5GSVzH<-c0H)ump!
z7N+NJy;e9)BlQ5EtX?VYalM(zdaP7aa~>~h$%4mqGedpiu?y9l<gu#HmpnG?nW2wr
zrHA^WR;C{DShHK4_xM6*Zs@P5so{F`R)L)xcb!c;TlN?!q>-m9ia10}pn?n}%z_HX
z|3C6X_&M-!{6wx;djIG(6aFw;z3lci*)gt|&4y+R({%dOh>+Fg;}Ib$ij(*aV&<+&
z9Cuc%0001kNkl<ZI1yuD7zNZ1fp-UF|9`%m{Qvi-%m0Znoe^CT$N-oatFRjbhkOA8
zE1xcgI+z*^31kCcitri41XF~M{{40r!{>8e4Bzhe!CePa&jMrMqnUZM!Cqk(^}uj3
zUIS1y?!adULJkxLAJ2IF|M_|chI0|B@UY0%h{w!9E(HMplqvO5LNk{D0000<MNUMn
GLSTZQ-geIb

diff --git a/application/palemoon/themes/osx/aboutCertError_sectionExpanded.png b/application/palemoon/themes/osx/aboutCertError_sectionExpanded.png
deleted file mode 100644
index 128cef90af66bdf67d9d88d3b161fca8f6fe3788..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 767
zcmV<b0s#GqP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006&X+uL$Nkc;*
zP;zf(X>4Tx0C)kdlTT>Va1_VCZIM-!Qt%JxDF>MfRbpG%E`x6U<J#34+K#Fx+azr|
z+cYL=)!{)wym%7)a~OgL6)U3P!3ho=p1cUkK#T0)S&xHVWW@K&kF*F5FTRlcKKbUo
z_xt_c%MS>AuNp?n51_5vX7S{VaOUheVQhe%@FR!=2v=pxn3kkGxol&bU*Kb(){e1U
zk8dyCe7D}u-8%p5#@)5Zt8IcjIb_m=fG<MA-UjCc;~M8O<4d+-laIz&)~X8eRpN+Q
zE+&be5{DX`-!QIm{=m2=H(2a|Sk#rK4)}w_lZtA|#0g?evE()}%k!h%?oj@~9pWRh
zVNz^hh4>Jw3yow;KY>#RDQA47#a;priom{$Bkk}Mz4w8Y>mzMr;MU5wKWNosQ8%4$
z*D|o<p5ts(fU%>%)>p^*wd^=sPiXFM!0M*lHG8fvP3rpy{Og_XnP&$+(;mp&9{rtp
zU0g2_=wAcM2_R16i&bF!KCtI4AdyD8KNj<DUPCYorPBF)G%ik5GSVzH<-c0H)ump!
z7N+NJy;e9)BlQ5EtX?VYalM(zdaP7aa~>~h$%4mqGedpiu?y9l<gu#HmpnG?nW2wr
zrHA^WR;C{DShHK4_xM6*Zs@P5so{F`R)L)xcb!c;TlN?!q>-m9ia10}pn?n}%z_HX
z|3C6X_&M-!{6wx;djIG(6aFw;z3lci*)gt|&4y+R({%dOh>+Fg;}Ib$ij(*aV&<+&
z9Cuc%0001bNkl<ZI1yuD7zK>zLGbhSj{je;rlJeO`9cnlQS>muWuOdpQ4dCD9&L1C
zFrQV}4MQBm0FVj}`2q}uxWus<fXx*k+gbT^QJfDl6srN)Y{TU$oCYAf0+;O|i|_(a
xjJ!J_`~UZ+%m48z#3%XfejoXo@fkdf<NzN)8fS+Bze4~3002ovPDHLkV1lz8b0Yu%

diff --git a/application/palemoon/themes/osx/aboutPrivateBrowsing.css b/application/palemoon/themes/osx/aboutPrivateBrowsing.css
deleted file mode 100644
index 35843adce6..0000000000
--- a/application/palemoon/themes/osx/aboutPrivateBrowsing.css
+++ /dev/null
@@ -1,47 +0,0 @@
-%if 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/. */
-%endif
-
-body.private > #errorPageContainer {
-  background-image: url("chrome://browser/skin/Privacy-48.png");
-}
-
-body.normal > #errorPageContainer {
-  background-image: url("chrome://global/skin/icons/question-48.png");
-}
-
-#clearRecentHistoryDesc {
-  margin-top: 2em;
-}
-
-#clearRecentHistoryDesc > p {
-  font-size: 110%; /* to match the value set in chrome://global/skin/netError.css */
-}
-
-#startPrivateBrowsingDesc > button {
-  margin-inline-start: 0;
-}
-
-#footerDesc > p {
-  font-size: 110%; /* to match the value set in chrome://global/skin/netError.css */
-}
-
-#moreInfo {
-  font-size: 110%; /* to match the value set in chrome://global/skin/netError.css */
-  padding-inline-start: 25px;
-  background: url("chrome://global/skin/icons/information-16.png") no-repeat top left;
-}
-
-#moreInfo:-moz-dir(rtl) {
-  background-position: top right;
-}
-
-#moreInfoText {
-  margin-bottom: 0;
-}
-
-#moreInfoLinkContainer {
-  margin-top: 0.5em;
-}
diff --git a/application/palemoon/themes/osx/aboutSessionRestore.css b/application/palemoon/themes/osx/aboutSessionRestore.css
deleted file mode 100644
index 4fa490798d..0000000000
--- a/application/palemoon/themes/osx/aboutSessionRestore.css
+++ /dev/null
@@ -1,73 +0,0 @@
-%if 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/. */
-%endif
-
-html {
-  background: #f8ffd0;
-  height: 100%;
-}
-
-body {
-  height: 100%;
-  text-align: center;
-}
-
-#errorPageContainer {
-  background-image: url("chrome://global/skin/icons/warning-large.png");
-  display: -moz-box;
-  width: -moz-available;
-  max-width: 85%;
-  height: 75%;
-  max-height: 85%;
-  -moz-box-orient: vertical;
-  text-align: start;
-  border: 2px solid #efc;
-  box-shadow: 0px 0px 8px #aaa;
-}
-
-#errorShortDesc > p {
-  margin-top: 0.4em;
-  margin-bottom: 0;
-}
-
-#errorLongContent, #errorTrailerDesc {
-  display: -moz-box;
-  -moz-box-flex: 1;
-  -moz-box-orient: vertical;
-}
-
-#tabList {
-  margin-top: 2.5em;
-  width: 100%;
-  min-height: 12em;
-}
-
-treechildren::-moz-tree-image(icon),
-treechildren::-moz-tree-image(noicon) {
-  padding-right: 2px;
-  margin: 0px 2px;
-  width: 16px;
-  height: 16px;
-}
-
-treechildren::-moz-tree-image(noicon) {
-  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
-}
-treechildren::-moz-tree-image(container, noicon) {
-  list-style-image: url("chrome://browser/skin/aboutSessionRestore-window-icon.png");
-}
-treechildren::-moz-tree-image(checked) {
-  list-style-image: url("chrome://global/skin/checkbox/cbox-check.gif");
-}
-treechildren::-moz-tree-image(partial) {
-  list-style-image: url("chrome://global/skin/checkbox/cbox-check-dis.gif");
-}
-
-#buttons {
-  width: 100%;
-}
-#buttons > button {
-  margin-top: 2em;
-}
diff --git a/application/palemoon/themes/osx/aboutSyncTabs.css b/application/palemoon/themes/osx/aboutSyncTabs.css
deleted file mode 100644
index 1fcd8304f7..0000000000
--- a/application/palemoon/themes/osx/aboutSyncTabs.css
+++ /dev/null
@@ -1,101 +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/. */
-
-#tabs-display,
-#tabsList {
-  background-color: transparent;
-  -moz-appearance: none;
-  margin: 0;
-}
-
-#tabsList {
-  width: 100%;
-}
-
-#tabs-display {
-  background: #fff url(chrome://browser/skin/sync-bg.png) repeat-x center -80px;
-}
-
-#headers {
-  background: url(chrome://browser/skin/sync-32.png) no-repeat;
-  margin-top: 4px;
-  width: 45em;
-  height: 32px;
-  margin-inline-start: 2em;
-  margin-inline-end: 2em;
-}
-
-#tabsListHeading {
-  font-size: 140%;
-  font-weight: bold;
-  margin-inline-start: 40px;
-}
-
-richlistitem {
-  margin-inline-end: 2em;
-}
-
-richlistitem[selected="true"],
-richlistitem:focus {
-  outline-style: none;
-}
-
-richlistitem[type="tab"] {
-  min-height: 3em;
-  border: #999999 1px solid !important;
-  padding: 2px 5px;
-  margin-bottom: 4px;
-  margin-inline-start: 4em;
-  border-radius: 6px;
-  background-color: menu;
-  width: 44em;
-  opacity: 0.9;
-  box-shadow:
-    inset rgba(255, 255, 255, 0.5) 0 1px 0px,
-    inset rgba(0, 0, 0, 0.1) 0 -2px 0px,
-    rgba(0, 0, 0, 0.1) 0px 1px 0px;
-}
-
-richlistitem[type="tab"][selected="true"] {
-  background-color: -moz-MenuHover;
-}
-
-richlistitem[type="client"] {
-  min-height: 2em;
-  color: #000000;
-  margin-inline-start: 2em;
-  margin-top: 2px;
-  margin-bottom: 3px;
-  width: 42em;
-  border-radius: 6px;
-  background-color: transparent;
-  -moz-user-focus: ignore !important;
-}
-richlistitem.mobile[type="client"] {
-  list-style-image: url("chrome://browser/skin/sync-mobileIcon.png");
-}
-richlistitem.desktop[type="client"] {
-  list-style-image: url("chrome://browser/skin/sync-desktopIcon.png");
-}
-
-.title,
-.clientName {
-  color: #000000;
-  font-size: 1.1em;
-}
-
-.title[selected="true"],
-.url[selected="true"] {
-  color: inherit;
-}
-
-.url {
-  color: -moz-nativehyperlinktext;
-  font-size: 0.95em;
-}
-
-.tabIcon {
-  padding-inline-start: 2px;
-  padding-top: 2px;
-}
diff --git a/application/palemoon/themes/osx/actionicon-tab.png b/application/palemoon/themes/osx/actionicon-tab.png
deleted file mode 100644
index ced958ebbe39646e15fef004e6c1a5bb3f2f21f5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 425
zcmV;a0apHrP)<h;3K|Lk000e1NJLTq000mG000&U1^@s6$*LTD0004SNkl<ZIE|gt
zT}#4X7zW@M#E$v{=6QdiqwFZ?w{;RhK_5i1nn_}2t0sPoRf;(0&=f^5ORbO&^C%}i
zJ&&klTlLO^3+KE0zR`&c02nz8WxU51TI4)l?njggM3m|e6`*^Rq3pQF#uq|38;hpu
zpz3Y7&A-^9d(reGU{<vZ1m)sqGTQ`2YyF8b!Dz8>890**5YIeup{!-#^vVGFzRrcR
zQv+Lq;u0@)kklF%QOW~$<|YH1M~M|tG9a9&aPeanJFCNijf2?QULe&BTo>@+l(<lK
zKag%xmj;qTI5#|Wf;!Y?>$^Ad_K6BR{yRsgL*2=*Fe~PsUl_tS9wed;djCadl<`;w
z27^He58hDwAFr5|>;_tR@XV=g_Z4WM&Z%WL&_GpAji~{=aG@G{;6z#X_kkr;Mh2&n
zX`0L9|AG%6U;<xrD9b4~>iAf%X9{?sp|nF9b=gO^D~vvt?vO!UdIny!I3w>D%N<S~
T8or7A00000NkvXXu0mjf^CG#N

diff --git a/application/palemoon/themes/osx/autocomplete.css b/application/palemoon/themes/osx/autocomplete.css
deleted file mode 100644
index 7f63bef198..0000000000
--- a/application/palemoon/themes/osx/autocomplete.css
+++ /dev/null
@@ -1,198 +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/. */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
-
-/* .padded is used by autocomplete widgets that don't have an icon. Gross. -dwh */
-textbox:not(.padded) {
-  cursor: default;
-  padding: 0;
-}
-
-textbox[nomatch="true"][highlightnonmatches="true"] {
-  color: red;
-}
-
-textbox:not(.padded) .textbox-input-box {
-  margin: 0 3px;
-}
-
-.textbox-input-box {
-  -moz-box-align: center;
-}
-
-/* ::::: history button ::::: */
-
-.private-autocomplete-history-dropmarker {
-  -moz-appearance: none !important;
-  border: none !important;
-  background-color: transparent !important;
-  padding: 0px;
-  list-style-image: url("chrome://global/skin/icons/autocomplete-dropmarker.png");
-  margin: 0px;
-}
-
-/* ::::: autocomplete popups ::::: */
-
-panel[type="private-autocomplete"],
-panel[type="private-autocomplete-richlistbox"],
-.private-autocomplete-history-popup {
-  padding: 0px !important;
-  color: -moz-FieldText;
-  background-color: -moz-Field;
-  font: icon;
-  -moz-appearance: none;
-}
-
-.private-autocomplete-history-popup {
-  max-height: 180px;
-}
-
-/* ::::: tree ::::: */
-
-.private-autocomplete-tree {
-  -moz-appearance: none !important;
-  border: none !important;
-  background-color: transparent !important;
-}
-
-.private-autocomplete-treecol {
-  -moz-appearance: none !important;
-  margin: 0 !important;
-  border: none !important;
-  padding: 0 !important;
-}
-
-.private-autocomplete-treebody::-moz-tree-cell-text {
-  padding-left: 2px;
-}
-
-.private-autocomplete-treebody::-moz-tree-row {
-  border-top: none;
-}
-
-treechildren.private-autocomplete-treebody::-moz-tree-row(selected) {
- background-color: Highlight;
-}
-
-treechildren.private-autocomplete-treebody::-moz-tree-cell-text(selected) {
-  color: HighlightText !important;
-}
-
-.private-autocomplete-treebody::-moz-tree-image(treecolAutoCompleteValue) {
-  max-width: 16px;
-  height: 16px;
-}
-
-/* ::::: richlistbox autocomplete ::::: */
-
-.private-autocomplete-richlistbox {
-  -moz-appearance: none;
-  margin: 0;
-}
-
-.private-autocomplete-richlistitem[selected="true"] {
-  background-color: Highlight;
-  color: HighlightText;
-  background-image: linear-gradient(rgba(255,255,255,0.3), transparent);
-}
-
-.private-autocomplete-richlistitem {
-  padding: 5px 2px;
-}
-
-.ac-url-box {
-  /* When setting a vertical margin here, half of that needs to be added
-     .ac-title-box's translateY for when .ac-url-box is hidden (see below). */
-  margin-top: 1px;
-}
-
-.private-autocomplete-richlistitem[actiontype="keyword"] .ac-url-box,
-.private-autocomplete-richlistitem[actiontype="searchengine"] .ac-url-box,
-.private-autocomplete-richlistitem[actiontype="visiturl"] .ac-url-box,
-.private-autocomplete-richlistitem[type~="autofill"] .ac-url-box {
-  visibility: hidden;
-}
-
-.private-autocomplete-richlistitem[actiontype="keyword"] .ac-title-box,
-.private-autocomplete-richlistitem[actiontype="searchengine"] .ac-title-box,
-.private-autocomplete-richlistitem[actiontype="visiturl"] .ac-title-box,
-.private-autocomplete-richlistitem[type~="autofill"] .ac-title-box {
-  /* Center the title by moving it down by half of .ac-url-box's height,
-     including vertical margins (if any). */
-  transform: translateY(.5em);
-}
-
-.ac-site-icon {
-  width: 16px; 
-  height: 16px;
-  margin-bottom: -1px;
-  margin-inline-start: 7px;
-  margin-inline-end: 5px;
-}
-
-.ac-type-icon {
-  width: 16px;
-  height: 16px;
-  margin-inline-start: 6px;
-  margin-inline-end: 4px;
-}
-
-.ac-url-box > .ac-site-icon,
-.ac-url-box > .ac-type-icon {
-  /* Otherwise the spacer is big enough to stretch its container */
-  height: auto;
-}
-
-.ac-extra > .ac-result-type-tag {
-  margin: 0 4px;
-}
-
-.ac-extra > .ac-comment {
-  padding-right: 4px;
-}
-
-.ac-ellipsis-after {
-  margin: 0 !important;
-  padding: 0; 
-  min-width: 1.1em;
-}
-
-.ac-normal-text {
-  margin: 0 !important;
-  padding: 0;
-}
-
-.ac-normal-text > html|span {
-  margin: 0 !important;
-  padding: 0;
-}
-
-html|span.ac-emphasize-text {
-  box-shadow: inset 0 0 1px 1px rgba(208,208,208,0.4);
-  background-color: rgba(208,208,208,0.2);
-  border-radius: 2px;
-  text-shadow: 0 0 currentColor;
-}
-
-.ac-url-text > html|span.ac-emphasize-text,
-.ac-action-text > html|span.ac-emphasize-text {
-  box-shadow: inset 0 0 1px 1px rgba(183,210,226,0.4);
-  background-color: rgba(183,210,226,0.3);
-}
-
-.ac-title, .ac-url {
-  overflow: hidden;
-}
-
-/* ::::: textboxes inside toolbarpaletteitems ::::: */
-
-toolbarpaletteitem > toolbaritem > textbox > hbox > hbox > html|*.textbox-input {
-  visibility: hidden;
-}
-
-toolbarpaletteitem > toolbaritem > * > textbox > hbox > hbox > html|*.textbox-input {
-  visibility: hidden;
-}
diff --git a/application/palemoon/themes/osx/browser.css b/application/palemoon/themes/osx/browser.css
deleted file mode 100644
index 49c210df44..0000000000
--- a/application/palemoon/themes/osx/browser.css
+++ /dev/null
@@ -1,2884 +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/. */
-
-@import url("chrome://global/skin/");
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
-
-%include shared.inc
-%filter substitution
-%define toolbarShadowColor rgba(10%,10%,10%,.4)
-%define toolbarShadowOnTab linear-gradient(to top, rgba(10%,10%,10%,.4) 1px, transparent 1px)
-%define navbarTextboxCustomBorder border-color: rgba(0,0,0,.32);
-%define navbarLargeIcons #navigator-toolbox[iconsize=large][mode=icons] > #nav-bar
-%define forwardTransitionLength 150ms
-%define conditionalForwardWithUrlbar window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button"],#nav-bar:not([currentset])) > #unified-back-forward-button
-%define conditionalForwardWithUrlbarWidth 27
-
-:root {
-  --toolbox-after-color: ThreeDShadow;
-
-  --toolbar-custom-color: -moz-Dialog;
-  --toolbar-highlight-top: rgba(255,255,255,.5);
-  --toolbar-highlight-bottom: transparent;
-
-  --toolbarbutton-background-color: hsla(210,32%,93%,.3);
-  --toolbarbutton-border-radius: 2.5px;
-  --toolbarbutton-border-color: hsla(210,54%,20%,.2);
-
-  --toolbarbutton-image: url("chrome://browser/skin/Toolbar.png");
-  --toolbarbutton-inverted-image: url("chrome://browser/skin/Toolbar-inverted.png");
-
-  --tab-background: linear-gradient(transparent, hsla(0,0%,45%,.1) 1px, hsla(0,0%,32%,.2) 80%, hsla(0,0%,0%,.2));
-  --tab-background-hover: linear-gradient(hsla(0,0%,100%,.3) 1px, hsla(0,0%,75%,.2) 80%, hsla(0,0%,60%,.2));
-  --tab-border-radius: 6px;
-  --tab-box-shadow: inset 0.5px 1px 1px var(--tab-selected-highlight);
-  --tab-selected-highlight: rgba(255,255,255,.7);
-}
-
-/* Use SVG for HiDPI 133%+ */
-@media (min-resolution: 1.33dppx) {
-  :root {
-    --toolbarbutton-image: url("chrome://browser/skin/Toolbar.svg");
-    --toolbarbutton-inverted-image: url("chrome://browser/skin/Toolbar-inverted.svg");
-  }
-}
-
-:root:-moz-lwtheme-brighttext {
-  --toolbar-highlight-top: rgba(32,32,32,.8);
-  --toolbar-highlight-bottom: rgba(32,32,32,0);
-}
-
-:root:-moz-lwtheme-darktext {
-  --toolbar-highlight-top: rgba(255,255,255,.8);
-  
-  --tab-selected-highlight: rgba(255,255,255,.6);
-}
-
-#navigator-toolbox {
-  -moz-appearance: none;
-  background-color: transparent;
-  border-top: none;
-}
-
-#main-window {
-  -moz-appearance: none;
-  background-color: #eeeeee;
-}
-
-#navigator-toolbox::after {
-  content: "";
-  display: -moz-box;
-  -moz-box-ordinal-group: 101; /* tabs toolbar is 100 */
-  height: 1px;
-  background-color: var(--toolbox-after-color);
-}
-#navigator-toolbox[tabsontop=false]::after,
-#main-window[disablechrome] #navigator-toolbox::after {
-  visibility: collapse;
-}
-
-#navigator-toolbox > toolbar:not(:-moz-lwtheme) {
-  -moz-appearance: none;
-  border-style: none;
-  background-color: var(--toolbar-custom-color);
-}
-
-#nav-bar[tabsontop=true]:not(:-moz-lwtheme),
-#nav-bar[tabsontop=true][collapsed=true]:not([customizing]):not(:-moz-lwtheme) + toolbar,
-#nav-bar[tabsontop=true][collapsed=true]:not([customizing]):not(:-moz-lwtheme) + #customToolbars + #PersonalToolbar {
-  background-image: linear-gradient(var(--toolbar-highlight-top), var(--toolbar-highlight-bottom));
-}
-
-/* Blend the topmost toolbar with the titlebar */
-%ifdef MOZ_CAN_DRAW_IN_TITLEBAR
-#main-window[tabsontop=false]:not([privatebrowsingmode=temporary]) #nav-bar:not(:-moz-lwtheme),
-#main-window[tabsontop=false]:not([privatebrowsingmode=temporary]) #PersonalToolbar[collapsed=true]
- ~ #TabsToolbar:not(:-moz-lwtheme),
-#main-window[tabsontop=true]:not([privatebrowsingmode=temporary]) #TabsToolbar:not(:-moz-lwtheme) {
-  -moz-appearance: toolbar;
-}
-
-#main-window[tabsontop=false][privatebrowsingmode=temporary] #nav-bar:not(:-moz-lwtheme),
-#main-window[tabsontop=false][privatebrowsingmode=temporary] #PersonalToolbar[collapsed=true]
- ~ #TabsToolbar:not(:-moz-lwtheme),
-#main-window[tabsontop=true][privatebrowsingmode=temporary] #TabsToolbar:not(:-moz-lwtheme) {
-  background-color: transparent;
-}
-
-#main-window[tabsontop=false][privatebrowsingmode=temporary] #nav-bar:not(:-moz-lwtheme) {
-  border-bottom: 1px solid rgba(26,26,26,0.2);
-}
-%else
-#main-window[tabsontop=false] #nav-bar:not(:-moz-lwtheme),
-#main-window[tabsontop=false] #PersonalToolbar[collapsed=true]
- ~ #TabsToolbar:not(:-moz-lwtheme),
-#main-window[tabsontop=true] #TabsToolbar:not(:-moz-lwtheme) {
-  -moz-appearance: toolbar;
-}
-%endif
-
-#personal-bookmarks {
-  min-height: 24px;
-}
-
-#print-preview-toolbar:not(:-moz-lwtheme) {
-  -moz-appearance: toolbox;
-}
-
-#browser-bottombox:not(:-moz-lwtheme) {
-  background-color: var(--toolbar-custom-color);
-}
-
-
-%ifdef MOZ_CAN_DRAW_IN_TITLEBAR
-/* ::::: titlebar ::::: */
-
-#main-window[sizemode="normal"]:not([privatebrowsingmode=temporary]) > #titlebar {
-  -moz-appearance: -moz-window-titlebar;
-}
-
-#main-window[sizemode="maximized"] > #titlebar {
-  -moz-appearance: -moz-window-titlebar-maximized;
-}
-
-#titlebar-buttonbox {
-  -moz-appearance: -moz-window-button-box;
-}
-
-.titlebar-placeholder[type="appmenu-button"] {
-  margin-left: 4px;
-}
-
-.titlebar-placeholder[type="caption-buttons"] {
-  margin-left: 10px;
-}
-
-/* titlebar command buttons */
-
-#titlebar-min {
-  -moz-appearance: -moz-window-button-minimize;
-}
-
-#titlebar-max {
-  -moz-appearance: -moz-window-button-maximize;
-}
-
-#main-window[sizemode="maximized"] #titlebar-max {
-  -moz-appearance: -moz-window-button-restore;
-}
-
-#titlebar-close {
-  -moz-appearance: -moz-window-button-close;
-}
-
-/* ensure titlebar on privacy windows is of correct size */
-#titlebar {
-  height: 22px;
-}
-
-/* ensure extra titlebar doesn't appear on normal (e.g. non-privacy) windows */
-#main-window:not([privatebrowsingmode=temporary]):not(:-moz-lwtheme) > #titlebar > #titlebar-content > #titlebar-buttonbox-container,
-#main-window:not([drawintitlebar=true]):not(:-moz-lwtheme) > #titlebar {
-  display: none;
-}
-
-#titlebar-buttonbox-container {
-  margin-left: 7px;
-  margin-top: 3px;
-}
-%endif
-/* ::::: bookmark toolbar ::::: */
-
-#personal-bookmarks {
-  min-height: 17px; /* 16px button height + 1px margin-bottom */
-}
-
-toolbarbutton.chevron {
-  list-style-image: url("chrome://global/skin/icons/chevron.png");
-  margin: 1px 0 0;
-  padding: 0;
-}
-
-toolbarbutton.chevron > .toolbarbutton-text {
-  display: none;
-}
-
-toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
-  display: -moz-box; /* display chevron icon in text mode */
-}
-
-toolbarbutton.chevron:-moz-locale-dir(rtl) > .toolbarbutton-icon {
-  transform: scaleX(-1);
-}
-
-@media (min-resolution: 2dppx) {
-  toolbarbutton.chevron {
-  list-style-image: url("chrome://global/skin/icons/chevron@2x.png");
-  }
-
-  toolbarbutton.chevron > .toolbarbutton-icon {
-  width: 13px;
-  }
-}
-
-/* ::::: bookmark buttons ::::: */
-
-toolbarbutton.bookmark-item {
-  border: 0;
-  border-radius: 10000px;
-  padding: 1px 8px;
-  margin: 0 0 1px;
-}
-
-toolbarbutton.bookmark-item:not(:-moz-lwtheme) {
-  color: #222;
-}
-
-toolbarbutton.bookmark-item:-moz-lwtheme {
-  color: inherit;
-  text-shadow: inherit;
-}
-
-.bookmark-item > .toolbarbutton-menu-dropmarker {
-  list-style-image: url("chrome://browser/skin/places/folderDropArrow.png");
-  -moz-image-region: rect(0, 7px, 5px, 0);
-  margin-top: 1px;
-  margin-inline-start: 3px;
-  margin-inline-end: -2px;
-}
-
-@media (min-resolution: 2dppx) {
-  .bookmark-item > .toolbarbutton-menu-dropmarker {
-  list-style-image: url("chrome://browser/skin/places/folderDropArrow@2x.png");
-  -moz-image-region: rect(0, 14px, 10px, 0);
-  }
-
-  .bookmark-item > .toolbarbutton-menu-dropmarker > .dropmarker-icon {
-  width: 7px;
-  }
-}
-
-.bookmark-item > .toolbarbutton-text {
-  display: -moz-box !important; /* prevent [mode="icons"] from hiding the label */
-  margin: 0 !important;
-}
-
-toolbarbutton.bookmark-item:hover,
-toolbarbutton.bookmark-item[open="true"] {
-  background-color: rgba(0, 0, 0, .205);
-}
-
-toolbarbutton.bookmark-item:-moz-lwtheme-brighttext:hover,
-toolbarbutton.bookmark-item[open="true"]:-moz-lwtheme-brighttext {
-  background-color: rgba(255, 255, 255, .3);
-}
-
-toolbarbutton.bookmark-item:not(:-moz-lwtheme):hover,
-toolbarbutton.bookmark-item[open="true"]:not(:-moz-lwtheme) {
-  color: #FFF;
-  text-shadow: 0 1px rgba(0, 0, 0, .4);
-}
-
-.bookmark-item:-moz-lwtheme-brighttext > .toolbarbutton-menu-dropmarker,
-.bookmark-item:hover > .toolbarbutton-menu-dropmarker,
-.bookmark-item[open="true"] > .toolbarbutton-menu-dropmarker {
-  -moz-image-region: rect(5px, 7px, 10px, 0);
-}
-
-@media (min-resolution: 2dppx) {
-  .bookmark-item:-moz-lwtheme-brighttext > .toolbarbutton-menu-dropmarker,
-  .bookmark-item:hover > .toolbarbutton-menu-dropmarker,
-  .bookmark-item[open="true"] > .toolbarbutton-menu-dropmarker {
-  -moz-image-region: rect(10px, 14px, 20px, 0);
-  }
-}
-
-toolbarbutton.bookmark-item:active:hover,
-toolbarbutton.bookmark-item[open="true"] {
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.4), 0 1px rgba(255, 255, 255, 0.4);
-  background-color: rgba(0, 0, 0, .5);
-}
-
-toolbarbutton.bookmark-item:-moz-lwtheme-brighttext:hover,
-toolbarbutton.bookmark-item[open="true"]:-moz-lwtheme-brighttext {
-  background-color: rgba(255,255,255, .3);
-}
-
-toolbarbutton.bookmark-item > menupopup {
-  margin-top: 2px;
-  margin-inline-start: 3px;
-}
-
-.bookmark-item > .toolbarbutton-icon {
-  width: 16px;
-  min-height: 16px;
-  max-height: 16px;
-}
-
-.bookmark-item > .toolbarbutton-icon[label]:not([label=""]),
-.bookmark-item > .toolbarbutton-icon[type="menu"] {
-  margin-inline-end: 5px;
-}
-
-.bookmark-item[container] {
-  list-style-image: url("chrome://global/skin/tree/folder.png");
-}
-
-.bookmark-item[container][livemark] {
-  list-style-image: url("chrome://browser/skin/page-livemarks.png");
-}
-
-.bookmark-item[container][livemark] .bookmark-item {
-  list-style-image: url("chrome://browser/skin/places/livemark-item.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-
-.bookmark-item[container][livemark] .bookmark-item[visited] {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-
-.bookmark-item[container][query] {
-  list-style-image: url("chrome://browser/skin/places/query.png");
-}
-
-.bookmark-item[query][tagContainer] {
-  list-style-image: url("chrome://browser/skin/places/tag.png");
-}
-
-.bookmark-item[query][dayContainer] {
-  list-style-image: url("chrome://browser/skin/places/history.png");
-}
-
-.bookmark-item[query][hostContainer] {
-  list-style-image: url("chrome://global/skin/tree/folder.png");
-}
-
-.bookmark-item[query][hostContainer][open] {
-  list-style-image: url("chrome://global/skin/tree/folder.png");
-}
-
-@media (min-resolution: 2dppx) {
-  .bookmark-item[container] {
-  list-style-image: url("chrome://global/skin/tree/folder@2x.png");
-  }
-
-  .bookmark-item[container][livemark] {
-  list-style-image: url("chrome://browser/skin/page-livemarks@2x.png");
-  }
-
-  .bookmark-item[container][livemark] .bookmark-item {
-  list-style-image: url("chrome://browser/skin/places/livemark-item.png");
-  }
-
-  .bookmark-item[container][query] {
-  list-style-image: url("chrome://browser/skin/places/query@2x.png");
-  }
-
-  .bookmark-item[query][tagContainer] {
-  list-style-image: url("chrome://browser/skin/places/tag@2x.png");
-  }
-
-  .bookmark-item[query][dayContainer] {
-  list-style-image: url("chrome://browser/skin/places/history@2x.png");
-  }
-
-  .bookmark-item[query][hostContainer] {
-  list-style-image: url("chrome://global/skin/tree/folder@2x.png");
-  }
-
-  .bookmark-item[query][hostContainer][open] {
-  list-style-image: url("chrome://global/skin/tree/folder@2x.png");
-  }
-}
-
-/* Workaround for native menubar inheritance */
-.openintabs-menuitem,
-.openlivemarksite-menuitem,
-.livemarkstatus-menuitem {
-  list-style-image: none;
-}
-
-.bookmark-item[cutting] > .toolbarbutton-icon,
-.bookmark-item[cutting] > .menu-iconic-left > .menu-iconic-icon {
-  opacity: 0.5;
-}
-
-.bookmark-item[cutting] > .toolbarbutton-text,
-.bookmark-item[cutting] > .menu-iconic-left > .menu-iconic-text {
-  opacity: 0.7;
-}
-
-@media (min-resolution: 2dppx) {
-  .bookmark-item > .toolbarbutton-icon,
-  .bookmark-item > .menu-iconic-left > .menu-iconic-icon {
-  image-rendering: -moz-crisp-edges;
-  }
-}
-
-#wrapper-personal-bookmarks[place="palette"] > .toolbarpaletteitem-box {
-  background: url("chrome://browser/skin/places/bookmarksToolbar.png") no-repeat center;
-}
-
-.bookmarks-toolbar-customize {
-  max-width: 15em !important;
-  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png") !important;
-}
-
-@media (min-resolution: 2dppx) {
-  #wrapper-personal-bookmarks[place="palette"] > .toolbarpaletteitem-box {
-  background-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png");
-  background-size: 16px;
-  }
-
-  .bookmarks-toolbar-customize {
-  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png") !important;
-  }
-
-  .bookmarks-toolbar-customize > .toolbarbutton-icon {
-  width: 16px;
-  }
-}
-
-/* ::::: bookmark menus ::::: */
-
-.bookmark-item > .menu-iconic-left > .menu-iconic-icon {
-  width: 16px;
-  height: 16px;
-}
-
-/* ::::: primary toolbar buttons ::::: */
-
-.toolbarbutton-1 {
-  list-style-image: var(--toolbarbutton-image);
-}
-
-toolbar[brighttext] .toolbarbutton-1 {
-  list-style-image: var(--toolbarbutton-inverted-image);
-}
-
-.toolbarbutton-1[disabled=true] > .toolbarbutton-icon,
-.toolbarbutton-1[disabled=true] > .toolbarbutton-menu-dropmarker,
-.toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-dropmarker,
-.toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
-.toolbarbutton-1 > .toolbarbutton-menubutton-button[disabled] > .toolbarbutton-icon {
-  opacity: .4;
-}
-
-.toolbarbutton-1 > .toolbarbutton-menu-dropmarker,
-.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-  list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png");
-}
-
-toolbar[brighttext] .toolbarbutton-1 > .toolbarbutton-menu-dropmarker,
-toolbar[brighttext] .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-  list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png");
-}
-
-.toolbarbutton-1 > .toolbarbutton-icon,
-.toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
-  margin-inline-end: 0;
-}
-
-toolbar[mode=full] .toolbarbutton-1:not([type=menu-button]) {
-  -moz-box-orient: vertical;
-}
-
-toolbar[mode=full] .toolbarbutton-1,
-toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
-  min-width: 57px;
-}
-
-#nav-bar {
-  /* force iconsize="small" on this toolbar */
-  counter-reset: smallicons;
-}
-
-@navbarLargeIcons@ .toolbarbutton-1,
-@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button {
-  -moz-appearance: none;
-  border: none;
-  padding: 0;
-  background: none;
-}
-
-@navbarLargeIcons@ .toolbarbutton-1:not([type=menu-button]),
-@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button,
-@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-  padding: 5px 2px;
-  -moz-box-pack: center;
-}
-
-@navbarLargeIcons@ .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button) {
-  padding-left: 5px;
-  padding-right: 5px;
-}
-
-@navbarLargeIcons@ .toolbarbutton-1 > menupopup {
-  margin-top: -3px;
-}
-
-@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button {
-  padding-inline-end: 0;
-}
-
-@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-  padding-inline-start: 0;
-  -moz-box-align: center;
-}
-
-@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-icon,
-@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-badge-stack,
-@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
-@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
-  padding: 2px 6px;
-  background: var(--toolbarbutton-background-color) padding-box;
-  background-image: linear-gradient(hsla(0,0%,100%,.4), hsla(0,0%,100%,.1));
-  background-clip: padding-box;
-  border-radius: var(--toolbarbutton-border-radius);
-  border: 1px solid;
-  border-color: var(--toolbarbutton-border-color) var(--toolbarbutton-border-color) var(--toolbarbutton-border-color);
-  box-shadow: 0 1px hsla(0,0%,100%,.05) inset,
-              0 1px hsla(210,54%,20%,.05),
-              0 0 2px hsla(210,54%,20%,.05);
-  transition-property: background-image, background-color, border-color, box-shadow;
-  transition-duration: 150ms;
-}
-
-@navbarLargeIcons@ .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-icon,
-@navbarLargeIcons@ .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-badge-stack,
-@navbarLargeIcons@ .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
-  padding: 3px 7px;
-}
-
-@navbarLargeIcons@ .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button) > .toolbarbutton-icon,
-@navbarLargeIcons@ .toolbarbutton-1[type=menu] > .toolbarbutton-text /* hack for add-ons that forcefully display the label */ {
-  padding-inline-end: 17px;
-}
-
-@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menu-dropmarker {
-  margin-inline-start: -15px;
-}
-
-@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
-  border-inline-end: none;
-}
-
-@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
-  padding: 8px 5px 7px;
-}
-
-@navbarLargeIcons@ .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before {
-  content: "";
-  display: -moz-box;
-  width: 1px;
-  height: 18px;
-  margin-inline-end: -1px;
-  background-image: linear-gradient(var(--toolbarbutton-border-color) 0, var(--toolbarbutton-border-color) 18px);
-  background-clip: padding-box;
-  background-position: center;
-  background-repeat: no-repeat;
-  background-size: 1px 18px;
-  box-shadow: 0 0 0 1px hsla(0,0%,100%,.2);
-}
-
-@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon:-moz-locale-dir(ltr),
-@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon:-moz-locale-dir(rtl) {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-}
-
-@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon:-moz-locale-dir(rtl),
-@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon:-moz-locale-dir(ltr) {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
-
-@navbarLargeIcons@ .toolbarbutton-1:not([disabled]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
-@navbarLargeIcons@ .toolbarbutton-1:not([disabled]):hover > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
-@navbarLargeIcons@ .toolbarbutton-1:not([disabled]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-icon,
-@navbarLargeIcons@ .toolbarbutton-1:not([disabled]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-stack,
-@conditionalForwardWithUrlbar@ > .toolbarbutton-1:-moz-any([disabled],:not([open]):not([disabled]):not(:active)) > .toolbarbutton-icon {
-  background-image: linear-gradient(hsla(0,0%,100%,.8), hsla(0,0%,100%,.5));
-  border-color: hsla(210,54%,20%,.25) hsla(210,54%,20%,.3) hsla(210,54%,20%,.35);
-  box-shadow: 0 1px hsla(0,0%,100%,.3) inset,
-              0 1px hsla(210,54%,20%,.03),
-              0 0 2px hsla(210,54%,20%,.1);
-  transition-property: background-image, background-color, border-color, box-shadow;
-  transition-duration: 150ms;
-}
-
-@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):not([open]):not(:active):hover > .toolbarbutton-icon,
-@navbarLargeIcons@ .toolbarbutton-1:not([buttonover]):not([open]):not(:active):hover > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon,
-@conditionalForwardWithUrlbar@ > #forward-button:not([open]):not(:active):not([disabled]):hover > .toolbarbutton-icon {
-  border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4);
-  background-color: hsla(210,48%,96%,.75);
-  box-shadow: 0 0 1px hsla(210,54%,20%,.03),
-    0 0 2px hsla(210,54%,20%,.1);
-}
-
-@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):hover:active > .toolbarbutton-icon,
-@navbarLargeIcons@ .toolbarbutton-1[open] > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon,
-@navbarLargeIcons@ .toolbarbutton-1:not([disabled]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-icon,
-@navbarLargeIcons@ .toolbarbutton-1:not([disabled]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-stack {
-  background-image: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
-  background-color: hsla(210,54%,20%,.15);
-  border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4);
-  box-shadow: 0 1px 1px hsla(210,54%,20%,.1) inset,
-              0 0 1px var(--toolbarbutton-border-color) inset,
-              /* allows osx-keyhole-forward-clip-path to be used for non-hover as well as hover: */
-              0 1px 0 hsla(210,54%,20%,0),
-              0 0 2px hsla(210,54%,20%,0);
-  text-shadow: none;
-  transition: none;
-}
-
-@navbarLargeIcons@ .toolbarbutton-1:-moz-any(:hover,[open]) > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon {
-  border-inline-start-color: hsla(210,54%,20%,.35);
-}
-
-@navbarLargeIcons@ .toolbarbutton-1[checked]:not(:active):hover > .toolbarbutton-icon {
-  background-color: rgba(90%,90%,90%,.4);
-  transition: background-color .4s;
-}
-
-:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1,
-:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button,
-.tabbrowser-arrowscrollbox > .scrollbutton-up,
-.tabbrowser-arrowscrollbox > .scrollbutton-down {
-  -moz-appearance: none;
-  border-style: none;
-  padding: 0 3px;
-}
-
-#TabsToolbar .toolbarbutton-1:not([disabled]):hover,
-#TabsToolbar .toolbarbutton-1[open],
-#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):hover,
-.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):hover,
-.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):hover {
-  background-image: linear-gradient(var(--toolbar-highlight-bottom), var(--toolbar-highlight-top)),
-                    linear-gradient(transparent, rgba(0,0,0,.25) 30%),
-                    linear-gradient(transparent, rgba(0,0,0,.25) 30%);
-  background-position: 1px -1px, 0 -1px, 100% -1px;
-  background-size: calc(100% - 2px) 100%, 1px 100%, 1px 100%;
-  background-repeat: no-repeat;
-}
-
-#addon-bar .toolbarbutton-1:not([disabled]):hover,
-#addon-bar .toolbarbutton-1[open],
-#addon-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):hover {
-  background-image: linear-gradient(to top, transparent, rgba(0,0,0,.15)),
-                    linear-gradient(to top, transparent, rgba(0,0,0,.15) 30%),
-                    linear-gradient(to top, transparent, rgba(0,0,0,.15) 30%);
-  background-position: left, left, right;
-  background-size: auto, 1px 100%, 1px 100%;
-  background-repeat: no-repeat;
-}
-
-/* unified back/forward button */
-
-#back-button {
-  -moz-image-region: rect(0, 18px, 18px, 0);
-}
-
-#forward-button {
-  -moz-image-region: rect(0, 36px, 18px, 18px);
-}
-
-#back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
-#forward-button:-moz-locale-dir(rtl),
-#forward-button:-moz-locale-dir(rtl) > .toolbarbutton-text {
-  transform: scaleX(-1);
-}
-
-@conditionalForwardWithUrlbar@ {
-  -moz-box-align: center;
-}
-
-@conditionalForwardWithUrlbar@ > #forward-button {
-  padding: 0;
-}
-
-@conditionalForwardWithUrlbar@ > #forward-button > menupopup {
-  margin-top: 1px;
-}
-
-@conditionalForwardWithUrlbar@ > #forward-button > .toolbarbutton-icon {
-  /*mask: url(keyhole-forward-mask.svg#mask); XXX: this regresses twinopen */
-  clip-path: url(chrome://browser/content/browser.xul#osx-keyhole-forward-clip-path);
-  margin-inline-start: -9px !important;
-  border-left-style: none;
-  border-radius: 0;
-  padding-left: 7px;
-  padding-right: 3px;
-}
-
-@conditionalForwardWithUrlbar@:not([switchingtabs]) > #forward-button {
-  transition: opacity @forwardTransitionLength@ ease-out;
-}
-
-@conditionalForwardWithUrlbar@:not(:hover) > #forward-button[disabled] {
-  /*  opacity: 0; */
-}
-
-@conditionalForwardWithUrlbar@ > #back-button {
-  -moz-image-region: rect(18px, 20px, 38px, 0);
-  padding-top: 3px;
-  padding-bottom: 3px;
-  padding-inline-start: 5px;
-  padding-inline-end: 0;
-  position: relative;
-  z-index: 1;
-  border-radius: 0 10000px 10000px 0;
-}
-
-@conditionalForwardWithUrlbar@ > #back-button:-moz-locale-dir(rtl) {
-  border-radius: 10000px 0 0 10000px;
-}
-
-@conditionalForwardWithUrlbar@ > #back-button > menupopup {
-  margin-top: -1px;
-}
-
-@conditionalForwardWithUrlbar@ > #back-button > .toolbarbutton-icon {
-  border-radius: 10000px;
-  padding: 5px;
-  border: none;
-  background-image: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
-  box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset,
-              0 0 0 1px hsla(0,0%,100%,.3) inset,
-              0 0 0 1px hsla(210,54%,20%,.25),
-              0 1px 0 hsla(210,54%,20%,.35);
-  transition-property: background-color, box-shadow;
-  transition-duration: 250ms;
-}
-
-@conditionalForwardWithUrlbar@ > #back-button:not([disabled="true"]):not([open="true"]):not(:active):hover > .toolbarbutton-icon {
-  background-color: hsla(210,48%,96%,.75);
-  box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset,
-              0 0 0 1px hsla(0,0%,100%,.3) inset,
-              0 0 0 1px hsla(210,54%,20%,.3),
-              0 1px 0 hsla(210,54%,20%,.4),
-              0 0 4px var(--toolbarbutton-border-color);
-}
-
-@conditionalForwardWithUrlbar@ > #back-button:not([disabled="true"]):hover:active > .toolbarbutton-icon,
-@conditionalForwardWithUrlbar@ > #back-button[open="true"] > .toolbarbutton-icon {
-  background-color: hsla(210,54%,20%,.15);
-  box-shadow: 0 1px 1px hsla(210,54%,20%,.1) inset,
-              0 0 1px var(--toolbarbutton-border-color) inset,
-              0 0 0 1px hsla(210,54%,20%,.4),
-              0 1px 0 var(--toolbarbutton-border-color);
-  transition: none;
-}
-
-@conditionalForwardWithUrlbar@ > #back-button[disabled] > .toolbarbutton-icon {
-  box-shadow: 0 0 0 1px hsla(210,54%,20%,.55),
-              0 1px 0 hsla(210,54%,20%,.65);
-  transition: none;
-}
-
-.unified-nav-back[_moz-menuactive]:-moz-locale-dir(ltr),
-.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(rtl) {
-  list-style-image: url("chrome://browser/skin/menu-back.png") !important;
-}
-
-.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(ltr),
-.unified-nav-back[_moz-menuactive]:-moz-locale-dir(rtl) {
-  list-style-image: url("chrome://browser/skin/menu-forward.png") !important;
-}
-
-#stop-button {
-  -moz-image-region: rect(0, 54px, 18px, 36px);
-}
-
-#reload-button {
-  -moz-image-region: rect(0, 72px, 18px, 54px);
-}
-
-#home-button.bookmark-item {
-  list-style-image: var(--toolbarbutton-image);
-}
-
-toolbar[brighttext] #home-button.bookmark-item {
-  list-style-image: var(--toolbarbutton-inverted-image);
-}
-
-#home-button {
-  -moz-image-region: rect(0, 90px, 18px, 72px);
-}
-
-#downloads-button {
-  -moz-image-region: rect(0, 108px, 18px, 90px);
-}
-
-#history-button,
-#history-menu-button {
-  -moz-image-region: rect(0, 126px, 18px, 108px);
-}
-
-#bookmarks-button,
-#bookmarks-menu-button {
-  -moz-image-region: rect(0, 144px, 18px, 126px);
-}
-
-#bookmarks-menu-button.bookmark-item {
-  list-style-image: var(--toolbarbutton-image);
-}
-
-toolbar[brighttext] #bookmarks-menu-button.bookmark-item {
-  list-style-image: var(--toolbarbutton-inverted-image);
-}
-
-#print-button {
-  -moz-image-region: rect(0, 162px, 18px, 144px);
-}
-
-#new-tab-button {
-  -moz-image-region: rect(0, 180px, 18px, 162px);
-}
-
-#new-window-button {
-  -moz-image-region: rect(0, 198px, 18px, 180px);
-}
-
-#cut-button {
-  -moz-image-region: rect(0, 216px, 18px, 198px);
-}
-
-#copy-button {
-  -moz-image-region: rect(0, 234px, 18px, 216px);
-}
-
-#paste-button {
-  -moz-image-region: rect(0, 252px, 18px, 234px);
-}
-
-#fullscreen-button {
-  -moz-image-region: rect(0, 270px, 18px, 252px);
-}
-
-#zoom-out-button {
-  -moz-image-region: rect(0, 288px, 18px, 270px);
-}
-
-#zoom-in-button {
-  -moz-image-region: rect(0, 306px, 18px, 288px);
-}
-
-#sync-button {
-  -moz-image-region: rect(0, 324px, 18px, 306px);
-}
-#sync-button[status="active"] {
-  list-style-image: url("chrome://browser/skin/sync-throbber.png");
-  -moz-image-region: rect(0, 18px, 18px, 0);
-}
-
-#feed-button {
-  -moz-image-region: rect(0, 342px, 18px, 324px);
-}
-
-%ifdef MOZ_WEBRTC
-#webrtc-status-button {
-  -moz-image-region: rect(0, 360px, 18px, 342px);
-}
-%endif
-
-/* ::::: Location Bar ::::: */
-
-#urlbar,
-.searchbar-textbox {
-  -moz-appearance: none;
-  margin: 1px 3px;
-  padding: 0;
-  background-clip: padding-box;
-  border: 1px solid ThreeDShadow;
-  border-radius: 2px;
-}
-
-#urlbar {
-  width: 7em;
-  padding-inline-end: 2px;
-}
-
-@media (-moz-mac-lion-theme) {
-  #urlbar,
-  .searchbar-textbox {
-    @navbarTextboxCustomBorder@
-  }
-}
-
-#urlbar:-moz-lwtheme,
-.searchbar-textbox:-moz-lwtheme {
-  background-color: rgba(255,255,255,.8);
-  @navbarTextboxCustomBorder@
-  color: black;
-}
-
-@conditionalForwardWithUrlbar@ + #urlbar-container {
-  padding-left: @conditionalForwardWithUrlbarWidth@px;
-  margin-inline-start: -@conditionalForwardWithUrlbarWidth@px;
-  position: relative;
-  pointer-events: none;
-}
-
-@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar {
-  border-inline-start: none;
-  margin-left: 0;
-  pointer-events: all;
-}
-
-@conditionalForwardWithUrlbar@:not([switchingtabs]) + #urlbar-container > #urlbar {
-  transition: margin-left @forwardTransitionLength@ ease-out;
-}
-
-@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar:-moz-locale-dir(ltr) {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
-
-@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar:-moz-locale-dir(rtl) {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-}
-
-@conditionalForwardWithUrlbar@[forwarddisabled] + #urlbar-container {
-  clip-path: url("chrome://browser/content/browser.xul#windows-urlbar-back-button-clip-path");
-}
-
-@conditionalForwardWithUrlbar@ + #urlbar-container:-moz-locale-dir(rtl),
-@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar:-moz-locale-dir(rtl) {
-  /* let windows-urlbar-back-button-mask clip the urlbar's right side for RTL */
-  transform: scaleX(-1);
-}
-
-html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
-.searchbar-textbox:-moz-lwtheme > .autocomplete-textbox-container > .textbox-input-box > html|*.textbox-input::-moz-placeholder {
-  opacity: 1.0;
-  color: #777;
-}
-
-#urlbar:-moz-lwtheme[focused="true"],
-.searchbar-textbox:-moz-lwtheme[focused="true"] {
-  background-color: white;
-}
-
-#urlbar-container {
-  -moz-box-orient: horizontal;
-  -moz-box-align: stretch;
-}
-
-.urlbar-textbox-container {
-  -moz-box-align: stretch;
-}
-
-.urlbar-input-box {
-  margin-inline-start: 0;
-  min-width: 4em;
-}
-
-#urlbar-icons {
-  -moz-box-align: center;
-}
-
-.urlbar-icon {
-  padding: 0 3px;
-}
-
-.searchbar-engine-button,
-.search-go-container {
-  padding: 2px 2px;
-}
-
-.urlbar-icon:hover {
-  background-image: radial-gradient(circle closest-side, hsla(200,100%,70%,.3), hsla(200,100%,70%,0));
-}
-
-.urlbar-icon[open="true"],
-.urlbar-icon:hover:active {
-  background-image: radial-gradient(circle closest-side, hsla(200,100%,70%,.1), hsla(200,100%,70%,0));
-}
-
-#urlbar-search-splitter {
-  min-width: 6px;
-  margin-inline-start: -3px;
-  border: none;
-  background: transparent;
-}
-
-#urlbar-search-splitter + #urlbar-container > #urlbar ,
-#urlbar-search-splitter + #search-container > #searchbar > .searchbar-textbox {
-  margin-inline-start: 0;
-}
-
-#urlbar-display-box {
-  border-inline-end: 1px solid #AAA;
-  margin-inline-end: 3px;
-}
-
-#urlbar-display {
-  margin-top: 0;
-  margin-bottom: 0;
-  margin-inline-start: 0;
-  color: GrayText;
-}
-
-/* identity box */
-
-#identity-box {
-  padding: 2px;
-  font-size: .9em;
-}
-
-#identity-box:-moz-locale-dir(ltr) {
-  border-top-left-radius: 1.5px;
-  border-bottom-left-radius: 1.5px;
-}
-
-#identity-box:-moz-locale-dir(rtl) {
-  border-top-right-radius: 1.5px;
-  border-bottom-right-radius: 1.5px;
-}
-
-#notification-popup-box:not([hidden]) + #identity-box {
-  padding-inline-start: 10px;
-  border-radius: 0;
-}
-
-@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar > #identity-box {
-  border-radius: 0;
-}
-
-#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
-  color: hsl(92,100%,30%);
-  margin-inline-end: 4px;
-  background-image: -moz-linear-gradient(hsla(92,81%,16%,0),
-    hsla(92,81%,16%,.08) 25%,
-    hsla(92,81%,16%,.08) 75%,
-    hsla(92,81%,16%,0));
-  background-position: right;
-  background-repeat: no-repeat; 
-}
-
-#urlbar[pageproxystate="valid"] > #identity-box.verifiedDomain {
-  color: rgb(0,79,168);
-  margin-inline-end: 4px;
-  background-image: -moz-linear-gradient(rgba(0,79,168,0),
-    rgba(0,79,168,.08) 25%,
-    rgba(0,79,168,.08) 75%,
-    rgba(0,79,168,0));
-  background-position: right;
-  background-repeat: no-repeat;
-}
-
-#urlbar[pageproxystate="valid"] > #identity-box.mixedContent {
-  color: rgb(79,79,0);
-  margin-inline-end: 4px;
-  background-image: -moz-linear-gradient(rgba(79,79,0,0),
-    rgba(79,79,0,.08) 25%,
-    rgba(79,79,0,.08) 75%,
-    rgba(79,79,0,0));
-  background-position: right;
-  background-repeat: no-repeat;
-}
-
-#identity-box.verifiedIdentity:-moz-locale-dir(rtl) {
-  background-position: left;
-}
-
-#identity-box.verifiedIdentity:not(:-moz-lwtheme) {
-  background-color: #fff;
-  box-shadow: inset 0 0 2px rgb(0,168,0);
-}
-
-#identity-box.verifiedDomain:not(:-moz-lwtheme) {
-  background-color: rgb(224,234,247);
-  box-shadow: inset 0 0 2px rgb(0,79,168);
-}
-
-#identity-box:-moz-focusring {
-  outline: 1px dotted #000;
-  outline-offset: -3px;
-}
-
-#identity-icon-labels {
-  padding-inline-start: 2px;
-  padding-inline-end: 5px;
-}
-
-/* Address bar shading for SSL */
-
-#urlbar[https_color="all"][security_level="broken"],
-#urlbar[https_color="all"][security_level="low"] {
-  box-shadow: inset 0 0 4px rgb(168,0,0);
-}
-
-#urlbar[https_color="all"][security_level="mixed"],
-#urlbar[https_color="secure-mixed"][security_level="mixed"] {
-  box-shadow: inset 0 0 4px rgb(168,79,0);
-}
-
-#urlbar[https_color="all"][security_level="high"],
-#urlbar[https_color="secure-mixed"][security_level="high"],
-#urlbar[https_color="secure-only"][security_level="high"] {
-  box-shadow: inset 0 0 4px rgb(0,79,168);
-}
-
-#urlbar[https_color="all"][security_level="ev"],
-#urlbar[https_color="secure-mixed"][security_level="ev"],
-#urlbar[https_color="secure-only"][security_level="ev"] {
-  box-shadow: inset 0 0 4px rgb(0,168,0);
-}
-
-#urlbar[https_color="all"]:-moz-lwtheme-darktext,
-#urlbar[https_color="secure-mixed"]:-moz-lwtheme-darktext,
-#urlbar[https_color="secure-only"]:-moz-lwtheme-darktext {
-  box-shadow: inset 0 0 2px;
-}
-
-
-/* Location bar dropmarker */
-
-.urlbar-history-dropmarker {
-  -moz-appearance: none;
-  padding: 0 3px;
-  background-color: transparent;
-  border: none;
-  width: auto;
-  list-style-image: url("chrome://browser/skin/urlbar-history-dropmarker.png");
-  -moz-image-region: rect(0px, 11px, 14px, 0px);
-}
-
-.urlbar-history-dropmarker:hover {
-  background-image: radial-gradient(circle closest-side, hsla(205,100%,70%,.3), hsla(205,100%,70%,0));
-  -moz-image-region: rect(0px, 22px, 14px, 11px);
-}
-
-.urlbar-history-dropmarker:hover:active,
-.urlbar-history-dropmarker[open="true"] {
-  background-image: radial-gradient(circle closest-side, hsla(205,100%,70%,.1), hsla(205,100%,70%,0));
-  -moz-image-region: rect(0px, 33px, 14px, 22px);
-}
-
-/* page proxy icon */
-
-#page-proxy-favicon {
-  width: 16px;
-  height: 16px;
-  margin-top: 1px;
-  margin-bottom: 1px;
-  margin-inline-start: 3px;
-  margin-inline-end: 2px;
-  list-style-image: url(chrome://browser/skin/identity-icons-generic.png);
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar > #identity-box > #page-proxy-favicon {
-  margin-inline-end: 1px;
-}
-
-/* Since we already have a padlock, always use the generic icon until the favicon loads
-.verifiedDomain > #page-proxy-favicon[pageproxystate="valid"] {
-  list-style-image: url(chrome://browser/skin/identity-icons-https.png);
-}
-
-.verifiedIdentity > #page-proxy-favicon[pageproxystate="valid"] {
-  list-style-image: url(chrome://browser/skin/identity-icons-https-ev.png);
-}
-
-.mixedActiveContent > #page-proxy-favicon[pageproxystate="valid"] {
-  list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-active.png);
-}
-*/
-
-#identity-box:hover > #page-proxy-favicon {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-#identity-box:hover:active > #page-proxy-favicon,
-#identity-box[open=true] > #page-proxy-favicon {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
-}
-
-#page-proxy-favicon[pageproxystate="invalid"] {
-  opacity: 0.3;
-}
-
-/* autocomplete */
-
-#treecolAutoCompleteImage {
-  max-width: 36px;
-}
-
-.ac-result-type-bookmark,
-.autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) {
-  list-style-image: url("chrome://browser/skin/places/bookmark.png");
-  -moz-image-region: rect(0px 48px 16px 32px);
-  width: 16px;
-  height: 16px;
-}
-
-.ac-result-type-keyword,
-.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) {
-  list-style-image: url(chrome://global/skin/icons/search-textbox.png);
-  margin: 2px;
-  width: 12px;
-  height: 12px;
-}
-
-.ac-result-type-tag,
-.autocomplete-treebody::-moz-tree-image(tag, treecolAutoCompleteImage) {
-  list-style-image: url("chrome://browser/skin/places/tag.png");
-  width: 16px;
-  height: 16px;
-}
-
-.ac-comment {
-  font-size: 1.06em;
-}
-
-.ac-extra > .ac-comment {
-  font-size: 1em;
-}
-
-.ac-url-text,
-.ac-action-text {
-  font-size: 1em;
-  color: -moz-nativehyperlinktext;
-}
-
-@media (-moz-mac-lion-theme) {
-  .ac-url-text:not([selected="true"]),
-  .ac-action-text:not([selected="true"]) {
-    color: #008800;
-  }
-}
-
-richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-icon {
-  list-style-image: url("chrome://browser/skin/actionicon-tab.png");
-  -moz-image-region: rect(0, 16px, 11px, 0);
-  padding: 0 3px;
-}
-
-richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-box > .ac-action-icon {
-  -moz-image-region: rect(11px, 16px, 22px, 0);
-}
-
-.ac-comment[selected="true"],
-.ac-url-text[selected="true"],
-.ac-action-text[selected="true"] {
-  color: inherit !important;
-}
-
-.autocomplete-treebody::-moz-tree-cell-text(treecolAutoCompleteComment) {
-  color: GrayText;
-}
-
-.autocomplete-treebody::-moz-tree-cell-text(suggesthint, treecolAutoCompleteComment),
-.autocomplete-treebody::-moz-tree-cell-text(suggestfirst, treecolAutoCompleteComment)
-{
-  color: GrayText;
-  font-size: smaller;
-}
-
-.autocomplete-treebody::-moz-tree-cell(suggesthint) {
-  border-top: 1px solid GrayText;
-}
-
-/* combined go/reload/stop button in location bar */
-
-#go-button,
-#urlbar > toolbarbutton {
-  -moz-appearance: none;
-  padding: 0 2px;
-  background-origin: border-box;
-  border: none;
-  list-style-image: url("chrome://browser/skin/reload-stop-go.png");
-}
-
-#go-button {
-  padding: 0 3px;
-}
-
-#urlbar-reload-button {
-  -moz-image-region: rect(0, 14px, 14px, 0);
-}
-
-#urlbar-reload-button:not([disabled]):hover {
-  background-image: radial-gradient(circle closest-side, hsla(200,100%,70%,.2), hsla(200,100%,70%,0));
-  -moz-image-region: rect(14px, 14px, 28px, 0);
-}
-
-#urlbar-reload-button:not([disabled]):hover:active {
-  background-image: radial-gradient(circle closest-side, hsla(200,100%,60%,.1), hsla(200,100%,60%,0));
-  -moz-image-region: rect(28px, 14px, 42px, 0);
-}
-
-#urlbar-reload-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
-  transform: scaleX(-1);
-}
-
-#go-button,
-#urlbar-go-button {
-  -moz-image-region: rect(0, 42px, 14px, 28px);
-}
-
-#go-button:hover,
-#urlbar-go-button:hover {
-  background-image: radial-gradient(circle closest-side, hsla(110,70%,50%,.2), hsla(110,70%,50%,0));
-  -moz-image-region: rect(14px, 42px, 28px, 28px);
-}
-
-#go-button:hover:active,
-#urlbar-go-button:hover:active {
-  background-image: radial-gradient(circle closest-side, hsla(110,70%,50%,.1), hsla(110,70%,50%,0));
-  -moz-image-region: rect(28px, 42px, 42px, 28px);
-}
-
-#go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
-#urlbar-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
-  transform: scaleX(-1);
-}
-
-#urlbar-stop-button {
-  -moz-image-region: rect(0, 28px, 14px, 14px);
-}
-
-#urlbar-stop-button:not([disabled]):hover {
-  background-image: radial-gradient(circle closest-side, hsla(5,100%,75%,.3), hsla(5,100%,75%,0));
-  -moz-image-region: rect(14px, 28px, 28px, 14px);
-}
-
-#urlbar-stop-button:hover:active {
-  background-image: radial-gradient(circle closest-side, hsla(5,100%,75%,.1), hsla(5,100%,75%,0));
-  -moz-image-region: rect(28px, 28px, 42px, 14px);
-}
-
-/* popup blocker button */
-
-#page-report-button {
-  list-style-image: url("chrome://browser/skin/urlbar-popup-blocked.png");
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-#page-report-button:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-#page-report-button:hover:active,
-#page-report-button[open="true"] {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
-}
-
-
-/* star button */
-
-#star-button {
-  list-style-image: url("chrome://browser/skin/places/bookmark.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-}
-
-#star-button:hover {
-  background-image: radial-gradient(circle closest-side, hsla(45,100%,73%,.3), hsla(45,100%,73%,0));
-  -moz-image-region: rect(0px 32px 16px 16px);
-}
-
-#star-button:hover:active {
-  background-image: radial-gradient(circle closest-side, hsla(45,100%,73%,.1), hsla(45,100%,73%,0));
-  -moz-image-region: rect(0px 48px 16px 32px);
-}
-
-#star-button[starred] {
-  list-style-image: url("chrome://browser/skin/places/editBookmark.png");
-}
-
-/* bookmarking panel */
-
-#editBookmarkPanelStarIcon {
-  list-style-image: url("chrome://browser/skin/places/starred48.png");
-  width: 48px;
-  height: 48px;
-}
-
-#editBookmarkPanelStarIcon[unstarred] {
-  list-style-image: url("chrome://browser/skin/places/unstarred48.png");
-}
-
-#editBookmarkPanelTitle {
-  font-size: 130%;
-}
-
-#editBookmarkPanelHeader,
-#editBookmarkPanelContent {
-  margin-bottom: .5em;
-}
-
-/* Implements editBookmarkPanel resizing on folderTree un-collapse. */
-#editBMPanel_folderTree {
-  min-width: 27em;
-}
-
-/* BOOKMARKING PANEL */
-#editBookmarkPanelStarIcon {
-  list-style-image: url("chrome://browser/skin/places/starred48.png");
-  width: 48px;
-  height: 48px;
-}
-
-#editBookmarkPanelStarIcon[unstarred] {
-  list-style-image: url("chrome://browser/skin/places/unstarred48.png");
-}
-
-#editBookmarkPanelTitle {
-  font-size: 130%;
-  font-weight: bold;
-}
-
-#editBMPanel_rows > row {
-  margin-bottom: 8px;
-}
-
-#editBMPanel_rows > row:last-of-type {
-  margin-bottom: 0;
-}
-
-/**** Input elements ****/
-
-#editBMPanel_rows > row > textbox,
-#editBMPanel_rows > row > hbox > textbox {
-  -moz-appearance: none;
-  background: linear-gradient(#fafafa, #fff);
-  background-clip: padding-box;
-  border-radius: 3px;
-  border: 1px solid rgba(0,0,0,.3) !important;
-  box-shadow: inset 0 1px 1px 1px rgba(0,0,0,.05),
-        0 1px rgba(255,255,255,.3);
-  margin: 0;
-  padding: 3px 6px;
-}
-
-#editBMPanel_rows > row > textbox[focused="true"],
-#editBMPanel_rows > row > hbox > textbox[focused="true"] {
-  border-color: -moz-mac-focusring !important;
-  box-shadow: @focusRingShadow@;
-}
-
-/**** HUD style buttons ****/
-
-.editBookmarkPanelHeaderButton,
-.editBookmarkPanelBottomButton {
-  @hudButton@
-  margin: 0;
-  min-width: 82px;
-  min-height: 22px;
-}
-
-.editBookmarkPanelHeaderButton:hover:active,
-.editBookmarkPanelBottomButton:hover:active {
-  @hudButtonPressed@
-}
-
-.editBookmarkPanelHeaderButton:-moz-focusring,
-.editBookmarkPanelBottomButton:-moz-focusring {
-  @hudButtonFocused@
-}
-
-.editBookmarkPanelBottomButton[default="true"] {
-  background-color: #666;
-}
-
-#editBookmarkPanelHeader {
-  margin-bottom: 6px;
-}
-
-.editBookmarkPanelBottomButton:last-child {
-  margin-inline-start: 8px;
-}
-
-/* The following elements come from editBookmarkOverlay.xul. Styling that's
-   specific to the editBookmarkPanel should be in browser.css. Styling that
-   should be shared by all editBookmarkOverlay.xul consumers should be in
-   editBookmarkOverlay.css. */
-
-#editBMPanel_newFolderBox {
-  background: linear-gradient(#fff, #f2f2f2);
-  background-origin: padding-box;
-  background-clip: padding-box;
-  border-radius: 0 0 3px 3px;
-  border: 1px solid #a5a5a5;
-  box-shadow: inset 0 1px rgba(255,255,255,.8),
-        inset 0 0 1px rgba(255,255, 255,.25),
-        0 1px rgba(255,255,255,.3);
-  margin: 0;
-  padding: 0;
-  height:  20px;
-}
-
-#editBMPanel_newFolderButton {
-  -moz-appearance: none;
-  border: 0 solid #a5a5a5;
-  border-inline-end-width: 1px;
-  padding: 0 9px;
-  margin: 0;
-  min-width: 21px;
-  min-height: 20px;
-  height:  20px;
-  color: #fff;
-  list-style-image: url("chrome://browser/skin/panel-plus-sign.png");
-  position: relative;
-}
-
-#editBMPanel_newFolderButton:hover:active {
-  background: linear-gradient(rgba(40,40,40,.9), rgba(70,70,70,.9));
-  box-shadow: inset 0 0 3px rgba(0,0,0,.2), inset 0 1px 7px rgba(0,0,0,.4);
-}
-
-#editBMPanel_newFolderButton:-moz-focusring {
-  @hudButtonFocused@
-}
-
-#editBMPanel_newFolderButton .button-text {
-  display: none;
-}
-
-#editBMPanel_folderMenuList {
-  @hudButton@
-  background-clip: padding-box;
-  margin: 0;
-  min-height: 22px;
-  padding-top: 2px;
-  padding-bottom: 1px;
-  padding-inline-start: 8px;
-  padding-inline-end: 4px;
-}
-
-#editBMPanel_folderMenuList:-moz-focusring {
-  @hudButtonFocused@
-}
-
-#editBMPanel_folderMenuList[open="true"],
-#editBMPanel_folderMenuList:hover:active {
-  @hudButtonPressed@
-}
-
-#editBMPanel_folderMenuList > .menulist-dropmarker {
-  -moz-appearance: none;
-  display: -moz-box;
-  background-color: transparent;
-  border: 0;
-  margin: 0;
-  padding: 0;
-  padding-inline-end: 4px;
-  width: 7px;
-}
-
-#editBMPanel_folderMenuList > .menulist-dropmarker > .dropmarker-icon {
-  list-style-image: url("chrome://global/skin/icons/panel-dropmarker.png");
-}
-
-/**** folder tree and tag selector ****/
-
-#editBMPanel_folderTree,
-#editBMPanel_tagsSelector {
-  -moz-appearance: none;
-  background: linear-gradient(#fafafa, #fff);
-  background-clip: padding-box;
-  border-radius: 3px;
-  border: 1px solid rgba(0,0,0,.3);
-  box-shadow: inset 0 1px 1px 1px rgba(0,0,0,.05),
-        0 1px rgba(255,255,255,.3);
-  margin: 0;
-}
-
-#editBMPanel_folderTree:-moz-focusring,
-#editBMPanel_tagsSelector:-moz-focusring {
-  border-color: -moz-mac-focusring;
-  box-shadow: @focusRingShadow@;
-}
-
-#editBMPanel_folderTree {
-  border-bottom: none;
-  border-bottom-left-radius: 0;
-  border-bottom-right-radius: 0;
-  /* Implements editBookmarkPanel resizing on folderTree un-collapse. */
-  margin: 0 !important;
-  min-width: 27em;
-  position: relative;
-}
-
-/**** expanders ****/
-
-#editBookmarkPanel .expander-up,
-#editBookmarkPanel .expander-down {
-  @hudButton@
-  margin: 0;
-  margin-inline-start: 4px;
-  min-width: 27px;
-  min-height: 22px;
-}
-
-#editBookmarkPanel .expander-up:-moz-focusring,
-#editBookmarkPanel .expander-down:-moz-focusring {
-  @hudButtonFocused@
-}
-
-#editBookmarkPanel .expander-up:hover:active,
-#editBookmarkPanel .expander-down:hover:active {
-  @hudButtonPressed@
-}
-
-#editBookmarkPanel .expander-up {
-  list-style-image: url("chrome://browser/skin/panel-expander-open.png");
-}
-
-#editBookmarkPanel .expander-down {
-  list-style-image: url("chrome://browser/skin/panel-expander-closed.png");
-}
-
-#editBookmarkPanel .expander-up > .button-box > .button-icon,
-#editBookmarkPanel .expander-down > .button-box > .button-icon {
-  margin: 1px 0 0;
-}
-
-#editBookmarkPanel .expander-up > .button-box > .button-text,
-#editBookmarkPanel .expander-down > .button-box > .button-text {
-  display: none;
-}
-
-@media (min-resolution: 2dppx) {
-  #editBookmarkPanel .expander-up {
-  list-style-image: url("chrome://browser/skin/panel-expander-open@2x.png");
-  }
-
-  #editBookmarkPanel .expander-down {
-  list-style-image: url("chrome://browser/skin/panel-expander-closed@2x.png");
-  }
-
-  #editBookmarkPanel .expander-up > .button-box > .button-icon,
-  #editBookmarkPanel .expander-down > .button-box > .button-icon {
-  width: 9px;
-  }
-}
-
-#editBMPanel_tagsField > .autocomplete-textbox-container > .textbox-input-box > html|*.textbox-input::-moz-placeholder {
-  opacity: 1.0;
-  color: #bbb;
-}
-
-.editBMPanel_rowLabel {
-  text-align: end;
-}
-
-/* ::::: content area ::::: */
-
-#sidebar {
-  background-color: Window;
-}
-
-#sidebar-title {
-  padding-inline-start: 0px;
-}
-
-/* ::::: throbber ::::: */
-
-#navigator-throbber {
-  width: 16px;
-  min-height: 16px;
-  margin: 0 3px;
-}
-
-#navigator-throbber[busy="true"] {
-  list-style-image: url("chrome://global/skin/icons/loading_16.png");
-}
-
-#navigator-throbber,
-#wrapper-navigator-throbber > #navigator-throbber {
-  list-style-image: url("chrome://global/skin/icons/notloading_16.png");
-}
-
-/* Tabstrip */
-
-#TabsToolbar {
-  min-height: 0;
-  padding: 0;
-}
-
-#TabsToolbar:not(:-moz-lwtheme),
-#TabsToolbar[tabsontop=false] {
-  background-image: linear-gradient(to top, @toolbarShadowColor@ 1px, rgba(0,0,0,.05) 1px, transparent 50%);
-}
-
-/* When the tab bar is collapsed, show a 1px border in its place. */
-#TabsToolbar[tabsontop="false"][collapsed="true"]:not([customizing="true"]) {
-  visibility: visible;
-  height: 1px;
-  border-bottom-width: 1px;
-  /* !important here to override border-style: none on the toolbar */
-  border-bottom-style: solid !important;
-  border-bottom-color: ThreeDShadow;
-  overflow: hidden;
-}
-
-@media (-moz-mac-lion-theme) {
-  #main-window[sizemode=normal] #TabsToolbar {
-    padding-left: 2px;
-    padding-right: 2px;
-  }
-}
-
-/* remove 5 pixel border on left and right of browser screen */
-.tabbrowser-tabbox {
-  margin: 0;
-}
-
-.tabbrowser-tab,
-.tabs-newtab-button {
-  -moz-appearance: none;
-  background: @toolbarShadowOnTab@, var(--tab-background),
-              linear-gradient(var(--toolbar-custom-color), var(--toolbar-custom-color));
-  background-clip: padding-box;
-  padding: 3px 1px 4px;
-  /* Setting a transparent outer border allows us to have a 1px gap
-     between the tabs and the top edge of the screen, even when the
-     tabs have a top margin of 0, which is important for Fitts' law
-     compliance */
-  border: 1.6px solid;
-  border-bottom: none;
-  border-radius: var(--tab-border-radius) var(--tab-border-radius) 0px 0px;
-  -moz-border-top-colors: transparent #929292;
-  -moz-border-left-colors: transparent #929292;
-  -moz-border-right-colors: transparent #929292;
-  /* Hide the transparent top border by default */
-  margin-top: -1px;
-  /* Reduce the gap between the tabs */
-  margin-inline-start: -1px;
-  box-shadow: var(--tab-box-shadow);
-}
-
-.tabbrowser-tab {
-  padding-inline-end: 3px;
-}
-
-/* Override the default (globally-set) tab width values; increase
-   by 2px to compensate for the transparent outer border of the tabs */
-.tabbrowser-tab:not([pinned]) {
-  max-width: 252px;
-  min-width: 102px;
-}
-
-/* When the tabs are on top and the window is maximized or in full-
-   screen mode, unhide the transparent top border of the tabs so we
-   have a 1px gap between the tabs and the top edge of the screen */
-#main-window[sizemode="maximized"][tabsontop=true] .tabbrowser-tab,
-#main-window[sizemode="maximized"][tabsontop=true] .tabs-newtab-button,
-#main-window[sizemode="fullscreen"][tabsontop=true] .tabbrowser-tab,
-#main-window[sizemode="fullscreen"][tabsontop=true] .tabs-newtab-button {
-  margin-top: 0px;
-}
-
-.tabbrowser-tab:hover,
-.tabs-newtab-button:hover {
-  background-image: @toolbarShadowOnTab@, var(--tab-background-hover),
-                    linear-gradient(var(--toolbar-custom-color), var(--toolbar-custom-color));
-}
-
-.tabbrowser-tab[selected="true"] {
-  background-image: linear-gradient(var(--tab-selected-highlight), var(--toolbar-highlight-top) 50%),
-                    linear-gradient(var(--toolbar-custom-color), var(--toolbar-custom-color));
-}
-
-#main-window[tabsontop=false]:not([disablechrome]) .tabbrowser-tab[selected=true]:not(:-moz-lwtheme) {
-  background-image: @toolbarShadowOnTab@,
-                    linear-gradient(var(--tab-selected-highlight), var(--toolbar-highlight-top) 50%),
-                    linear-gradient(var(--toolbar-custom-color), var(--toolbar-custom-color));
-}
-
-.tabbrowser-tab[visuallyselected=true]:not(:-moz-lwtheme) {
-  /* overriding tabbox.css */
-  color: inherit;
-}
-
-.tabbrowser-tab[visuallyselected=true] {
-  /* overriding tabbox.css */
-  text-shadow: inherit;
-}
-
-/* Remove highlight fuzz on dark themes */
-.tabbrowser-tab:-moz-lwtheme-brighttext,
-.tabs-newtab-button:-moz-lwtheme-brighttext {
-  box-shadow:none;
-  -moz-border-top-colors: transparent #707070;
-  -moz-border-left-colors: transparent #707070;
-  -moz-border-right-colors: transparent #707070;
-}
-
-.tabbrowser-tab[selected="true"]:-moz-lwtheme {
-  background-image: linear-gradient(var(--tab-selected-highlight), var(--toolbar-highlight-top) 50%);
-}
-
-.tabbrowser-tab[selected="true"]:-moz-lwtheme-brighttext {
-  background-image: linear-gradient(rgba(128,128,128,.9), rgba(32,32,32,.9) 50%, rgba(32,32,32,.9) 80%, var(--toolbar-highlight-top) 100%);
-  -moz-border-top-colors: transparent #D0D0D0;
-  -moz-border-left-colors: transparent #D0D0D0;
-  -moz-border-right-colors: transparent #D0D0D0;
-}
-
-.tabbrowser-tab:-moz-lwtheme-brighttext:not([selected="true"]),
-.tabs-newtab-button:-moz-lwtheme-brighttext {
-  background-image: linear-gradient(hsla(0,0%,25%,.4), hsla(0,0%,15%,.6) 80%);
-}
-
-.tabbrowser-tab:-moz-lwtheme-brighttext:not([selected="true"]):hover,
-.tabs-newtab-button:-moz-lwtheme-brighttext:hover {
-  background-image: linear-gradient(hsla(0,0%,60%,.4), hsla(0,0%,10%,.8) 80%);
-}
-
-.tabbrowser-tab:-moz-lwtheme-darktext:not([selected="true"]),
-.tabs-newtab-button:-moz-lwtheme-darktext {
-  background-image: linear-gradient(hsla(0,0%,75%,.4), hsla(0,0%,85%,.6) 80%);
-}
-
-.tabbrowser-tab:-moz-lwtheme-darktext:not([selected="true"]):hover,
-.tabs-newtab-button:-moz-lwtheme-darktext:hover {
-  background-image: linear-gradient(hsla(0,0%,60%,.4), hsla(0,0%,90%,.8) 80%);
-}
-
-.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]) {
-  background-image: radial-gradient(circle farthest-corner at 50% 3px, rgba(255,255,255,1) 3%, rgba(186,221,251,.75) 40%, rgba(127,179,255,.5) 80%, rgba(127,179,255,.25));
-}
-.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]):hover {
-  background-image: linear-gradient(hsla(0,0%,100%,.4), hsla(0,0%,75%,.4) 80%),
-    radial-gradient(circle farthest-corner at 50% 3px, rgba(255,255,255,1) 3%, rgba(186,221,251,.75) 40%, rgba(127,179,255,.5) 80%, rgba(127,179,255,.25));
-}
-
-.tab-throbber,
-.tab-icon-image {
-  width: 16px;
-  height: 16px;
-  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
-  margin-inline-start: 2px;
-  margin-inline-end: 3px;
-}
-
-.tab-throbber {
-  list-style-image: url("chrome://browser/skin/tabbrowser/connecting.png");
-}
-
-.tab-throbber[progress] {
-  list-style-image: url("chrome://browser/skin/tabbrowser/loading.png");
-}
-
-.tab-throbber[pinned],
-.tab-icon-image[pinned] {
-  margin-inline-start: 5px;
-  margin-inline-end: 5px;
-}
-
-/* tabbrowser-tab focus ring */
-.tabbrowser-tab:focus > .tab-stack {
-  outline: 1px dotted;
-}
-
-/* Tab DnD indicator */
-.tab-drop-indicator {
-  list-style-image: url(chrome://browser/skin/tabbrowser/tabDragIndicator.png);
-  margin-bottom: -11px;
-}
-
-/* Tab close button */
-.tab-close-button {
-  -moz-appearance: none;
-  border: none;
-  padding: 0px;
-}
-
-.tab-close-button:-moz-lwtheme-brighttext {
-  list-style-image: url("chrome://global/skin/icons/close-inverted.png");
-}
-
-@media (min-resolution: 2dppx) {
-  .tab-close-button:-moz-lwtheme-brighttext {
-    list-style-image: url("chrome://global/skin/icons/close-inverted@2x.png");
-  }
-}
-  
-/* Tab sound indicator */
-.tab-icon-sound {
-  margin-inline-start: 4px;
-  width: 16px;
-  height: 16px;
-  padding: 0;
-}
-
-.allTabs-endimage[soundplaying],
-.tab-icon-sound[soundplaying] {
-  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio");
-}
-
-.allTabs-endimage[muted],
-.tab-icon-sound[muted] {
-  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted");
-}
-
-.allTabs-endimage[blocked],
-.tab-icon-sound[blocked] {
-  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-blocked");
-}
-
-#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-sound[soundplaying],
-#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-sound[blocked],
-#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-sound[muted] {
-  filter: invert(1);
-}
-
-.tab-icon-sound[soundplaying-scheduledremoval]:not([muted]):not(:hover),
-.tab-icon-overlay[soundplaying-scheduledremoval]:not([muted]):not(:hover) {
-  transition: opacity .3s linear var(--soundplaying-removal-delay);
-  opacity: 0;
-}
-
-/* Tab icon overlay */
-.tab-icon-overlay {
-  width: 16px;
-  height: 16px;
-  margin-top: -8px;
-  margin-inline-start: -15px;
-  margin-inline-end: -1px;
-  position: relative;
-}
-
-.tab-icon-overlay[soundplaying],
-.tab-icon-overlay[muted]:not([crashed]),
-.tab-icon-overlay[blocked]:not([crashed]) {
-  border-radius: 10px;
-}
-
-.tab-icon-overlay[soundplaying]:hover,
-.tab-icon-overlay[muted]:not([crashed]):hover,
-.tab-icon-overlay[blocked]:not([crashed]):hover {
-  background-color: white;
-}
-
-.tab-icon-overlay[soundplaying] {
-  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio");
-}
-
-.tab-icon-overlay[muted] {
-  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-muted");
-}
-
-.tab-icon-overlay[blocked] {
-  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-blocked");
-}
-
-#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-overlay[soundplaying]:not([selected]):not(:hover),
-.tab-icon-overlay[soundplaying][selected]:-moz-lwtheme-brighttext:not(:hover) {
-  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white");
-}
-
-#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-overlay[muted]:not([crashed]):not([selected]):not(:hover),
-.tab-icon-overlay[muted][selected]:-moz-lwtheme-brighttext:not(:hover) {
-  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white-muted");
-}
-
-#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-overlay[blocked]:not([crashed]):not([selected]):not(:hover),
-.tab-icon-overlay[blocked][selected]:-moz-lwtheme-brighttext:not(:hover) {
-  list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white-blocked");
-}
-
-/* Tab scrollbox arrow, tabstrip new tab and all-tabs buttons */
-
-.tabbrowser-arrowscrollbox > .scrollbutton-up,
-.tabbrowser-arrowscrollbox > .scrollbutton-down {
-  list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-left.png");
-  margin: 0;
-  padding-right: 2px;
-  border-right: 2px solid transparent;
-  background-origin: border-box;
-}
-
-toolbar[brighttext] .tabbrowser-arrowscrollbox > .scrollbutton-up,
-toolbar[brighttext] .tabbrowser-arrowscrollbox > .scrollbutton-down {
-  list-style-image: url(chrome://browser/skin/tabbrowser/tab-arrow-left-inverted.png);
-}
-
-.tabbrowser-arrowscrollbox > .scrollbutton-up[disabled],
-.tabbrowser-arrowscrollbox > .scrollbutton-down[disabled] {
-  opacity: .4;
-}
-
-.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl),
-.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(ltr) {
-  transform: scaleX(-1);
-}
-
-.tabbrowser-arrowscrollbox > .scrollbutton-down {
-  transition: 1s background-color ease-out;
-}
-
-.tabbrowser-arrowscrollbox > .scrollbutton-down[notifybgtab] {
-  background-color: Highlight;
-  transition: none;
-}
-
-.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]),
-.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]) {
-  border-width: 0 2px 0 0;
-  border-style: solid;
-  border-image: url("chrome://browser/skin/tabbrowser/tab-overflow-border.png") 0 2 0 2 fill;
-}
-
-.tabs-newtab-button > .toolbarbutton-icon {
-  margin-top: -1px;
-  margin-bottom: -1px;
-}
-
-.tabs-newtab-button,
-#TabsToolbar > #new-tab-button,
-#TabsToolbar > toolbarpaletteitem > #new-tab-button {
-  list-style-image: url(chrome://browser/skin/tabbrowser/newtab.png);
-  -moz-image-region: auto;
-}
-
-.tabs-newtab-button:-moz-lwtheme-brighttext,
-toolbar[brighttext] #TabsToolbar > #new-tab-button,
-toolbar[brighttext] #TabsToolbar > toolbarpaletteitem > #new-tab-button {
-  list-style-image: url(chrome://browser/skin/tabbrowser/newtab-inverted.png);
-}
-
-.tabs-newtab-button {
-  width: 28px;
-}
-
-#TabsToolbar > #new-tab-button {
-  width: 26px;
-}
-
-#alltabs-button {
-  list-style-image: url("chrome://browser/skin/tabbrowser/alltabs.png");
-  -moz-image-region: rect(0, 14px, 16px, 0);
-}
-
-#alltabs-button[type="menu"] {
-  list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png");
-  -moz-image-region: auto;
-}
-
-toolbar[brighttext] #alltabs-button {
-  list-style-image: url("chrome://browser/skin/tabbrowser/alltabs-inverted.png");
-}
-
-toolbar[brighttext] #alltabs-button[type="menu"] {
-  list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png");
-}
-
-#alltabs-button[type="menu"] > .toolbarbutton-icon {
-  margin: 0 2px;
-}
-
-#alltabs-button[type="menu"] > .toolbarbutton-menu-dropmarker {
-  display: none;
-}
-
-/* All tabs menupopup */
-.alltabs-item > .menu-iconic-left > .menu-iconic-icon {
-  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
-}
-
-.alltabs-item[selected="true"] {
-  font-weight: bold; 
-}
-
-.alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon {
-  list-style-image: url("chrome://global/skin/icons/loading_16.png");
-}
-
-.alltabs-item[tabIsVisible] {
-  /* box-shadow instead of background-color to work around native styling */
-  box-shadow: inset -5px 0 ThreeDShadow;
-}
-
-/* Tabstrip close button */
-.tabs-closebutton {
-  -moz-appearance: none;
-  padding: 4px 2px;
-  margin: 0px;
-  border: none;
-}
-
-toolbar[brighttext] .tabs-closebutton {
-  list-style-image: url("chrome://global/skin/icons/close-inverted.png");
-}
-
-@media (min-resolution: 2dppx) {
-  toolbar[brighttext] .tabs-closebutton {
-    list-style-image: url("chrome://global/skin/icons/close-inverted@2x.png");
-  }
-}
-  
-.tabs-closebutton > .toolbarbutton-icon {
-  margin-inline-end: 0px !important;
-  padding-inline-end: 2px !important;
-  padding-inline-start: 2px !important;
-}
-
-#sidebar-throbber[loading="true"] {
-  list-style-image: url("chrome://global/skin/icons/loading_16.png");
-  margin-inline-end: 4px;
-}
-
-/* Pale Moon: Feed icon */
-#ub-feed-button,
-#ub-feed-button > .button-box,
-#ub-feed-button:hover:active > .button-box {
-  padding: 0px;
-  margin: 0px;
-  border: 0px; 
-  background-color: transparent !important;
-}
-
-#ub-feed-button {
-  -moz-appearance: none; 
-  min-width: 0px; 
-  list-style-image: url("chrome://browser/skin/feeds/feed-icons-16.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-}
-
-#ub-feed-button:hover {
-  -moz-image-region: rect(0px 32px 16px 16px);
-}
-
-#ub-feed-button[open="true"],
-#ub-feed-button:hover:active {
-  -moz-image-region: rect(0px 48px 16px 32px);
-}
-
-
-/* Bookmarks toolbar */
-#PlacesToolbarDropIndicator {
-  list-style-image: url(chrome://browser/skin/places/toolbarDropMarker.png);
-}
-
-toolbarbutton.bookmark-item[dragover="true"][open="true"] {
-  -moz-appearance: none;
-  background: Highlight !important;
-  color: HighlightText !important;
-}
-
-/* rules for menupopup drop indicators */
-.menupopup-drop-indicator-bar {
-  position: relative;
-  /* these two margins must together compensate the indicator's height */
-  margin-top: -1px;
-  margin-bottom: -1px;
-}
-
-.menupopup-drop-indicator {
-  list-style-image: none;
-  height: 2px;
-  margin-inline-end: -4em;
-  background-color: Highlight;
-}
-
-/* ::::: Identity Indicator Styling ::::: */
-
-/* Popup Icons */
-#identity-popup-icon {
-  height: 64px;
-  width: 64px;
-  padding: 0;
-  list-style-image: url("chrome://browser/skin/identity.png");
-  -moz-image-region: rect(0px, 64px, 64px, 0px);
-}
-
-#identity-popup.verifiedDomain > #identity-popup-container > #identity-popup-icon {
-  -moz-image-region: rect(64px, 64px, 128px, 0px);
-}
-
-#identity-popup.verifiedIdentity > #identity-popup-container > #identity-popup-icon {
-  -moz-image-region: rect(128px, 64px, 192px, 0px);
-}
-
-/* Popup Body Text */
-.identity-popup-description {
-  white-space: pre-wrap;
-  padding-inline-start: 15px;
-  margin: 2px 0 4px;
-}
-
-.identity-popup-label {
-  white-space: pre-wrap;
-  padding-inline-start: 15px;
-  margin: 0;
-}
-
-#identity-popup-content-host,
-#identity-popup-content-box.verifiedIdentity > #identity-popup-content-owner {
-  font-size: 1.2em;
-}
-
-#identity-popup-content-host {
-  margin-top: 3px;
-  margin-bottom: 5px;
-  font-weight: bold;
-  max-width: 300px;
-}
-
-#identity-popup-content-owner {
-  margin-top: 4px;
-  margin-bottom: 0 !important;
-  font-weight: bold;
-  max-width: 300px;
-}
-
-.verifiedDomain > #identity-popup-content-owner {
-  font-weight: normal;
-}
-
-#identity-popup-content-verifier {
-  margin: 4px 0 2px;
-}
-
-#identity-popup-content-box.verifiedIdentity > #identity-popup-encryption ,
-#identity-popup-content-box.verifiedDomain > #identity-popup-encryption {
-  margin-top: 10px;
-  margin-inline-start: -24px;
-}
-
-#identity-popup-content-box.verifiedIdentity > #identity-popup-encryption > vbox > #identity-popup-encryption-icon ,
-#identity-popup-content-box.verifiedDomain > #identity-popup-encryption > vbox > #identity-popup-encryption-icon {
-  list-style-image: url("chrome://browser/skin/Secure24.png");
-}
-
-#identity-popup-more-info-button {
-  margin-top: 6px;
-  margin-bottom: 0;
-  margin-inline-end: 0;
-}
-
-.popup-notification-icon {
-  width: 64px;
-  height: 64px;
-  margin-inline-end: 10px;
-}
-
-.popup-notification-icon[popupid="geolocation"] {
-  list-style-image: url(chrome://browser/skin/Geolocation-64.png);
-}
-
-.popup-notification-icon[popupid="xpinstall-disabled"],
-.popup-notification-icon[popupid="addon-progress"],
-.popup-notification-icon[popupid="addon-install-cancelled"],
-.popup-notification-icon[popupid="addon-install-blocked"],
-.popup-notification-icon[popupid="addon-install-origin-blocked"],
-.popup-notification-icon[popupid="addon-install-failed"],
-.popup-notification-icon[popupid="addon-install-complete"] {
-  list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png);
-  width: 32px;
-  height: 32px;
-}
-
-.popup-notification-icon[popupid="click-to-play-plugins"] {
-  list-style-image: url(chrome://mozapps/skin/plugins/pluginBlocked-64.png);
-}
-
-.popup-notification-icon[popupid="web-notifications"] {
-  list-style-image: url(chrome://browser/skin/notification-64.png);
-}
-
-.addon-progress-description {
-  width: 350px;
-  max-width: 350px;
-}
-
-.popup-progress-label,
-.popup-progress-meter {
-  margin-inline-start: 0;
-  margin-inline-end: 0;
-}
-
-.popup-progress-cancel {
-  -moz-appearance: none;
-  background: transparent;
-  border: none;
-  padding: 0;
-  min-height: 16px;
-  min-width: 16px;
-  max-height: 16px;
-  max-width: 16px;
-  margin: 0 1px 0 1px;
-  list-style-image: url(chrome://mozapps/skin/downloads/buttons.png);
-  -moz-image-region: rect(0px, 16px, 16px, 0px);  
-}
-
-.popup-progress-cancel:hover {
-  -moz-image-region: rect(16px, 32px, 32px, 16px);
-}
-
-.popup-progress-cancel:active {
-  -moz-image-region: rect(32px, 32px, 48px, 16px);
-}
-
-.popup-notification-icon[popupid="indexedDB-permissions-prompt"],
-.popup-notification-icon[popupid="indexedDB-quota-prompt"],
-.popup-notification-icon[popupid*="offline-app-requested"],
-.popup-notification-icon[popupid="offline-app-usage"] {
-  list-style-image: url(chrome://global/skin/icons/question-64.png);
-}
-
-.popup-notification-icon[popupid="password"] {
-  list-style-image: url(chrome://mozapps/skin/passwordmgr/key-64.png);
-}
-
-.popup-notification-icon[popupid="mixed-content-blocked"] {
-  list-style-image: url(chrome://browser/skin/mixed-content-blocked-64.png);
-}
-
-%ifdef MOZ_WEBRTC
-.popup-notification-icon[popupid="webRTC-sharingDevices"],
-.popup-notification-icon[popupid="webRTC-shareDevices"] {
-  list-style-image: url(chrome://browser/skin/webRTC-shareDevice-64.png);
-}
-
-%endif
-.popup-notification-icon[popupid="pointerLock"] {
-  list-style-image: url(chrome://browser/skin/pointerLock-64.png);
-}
-
-/* Notification icon box */
-#notification-popup-box {
-  position: relative;
-  background-color: #fff;
-  background-clip: padding-box;
-  padding-left: 3px;
-  border-radius: var(--toolbarbutton-border-radius) 0 0 var(--toolbarbutton-border-radius);
-  border-width: 0 8px 0 0;
-  border-style: solid;
-  border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 fill;
-  margin-inline-end: -8px;
-}
-
-@conditionalForwardWithUrlbar@[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box {
-  padding-left: 5px;
-}
-
-#notification-popup-box:-moz-locale-dir(rtl),
-.notification-anchor-icon:-moz-locale-dir(rtl) {
-  transform: scaleX(-1);
-}
-
-.notification-anchor-icon {
-  width: 16px;
-  height: 16px;
-  margin: 0 2px;
-}
-
-.notification-anchor-icon:-moz-focusring {
-  outline: 1px dotted -moz-DialogText;
-  outline-offset: -3px;
-}
-
-.default-notification-icon,
-#default-notification-icon {
-  list-style-image: url(chrome://global/skin/icons/information-16.png);
-}
-
-.geo-notification-icon,
-#geo-notification-icon {
-  list-style-image: url(chrome://browser/skin/Geolocation-16.png);
-}
-
-#addons-notification-icon {
-  list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.png);
-}
-
-.indexedDB-notification-icon,
-#indexedDB-notification-icon {
-  list-style-image: url(chrome://global/skin/icons/question-16.png);
-}
-
-#password-notification-icon {
-  list-style-image: url(chrome://mozapps/skin/passwordmgr/key-16.png);
-}
-
-#plugins-notification-icon {
-  list-style-image: url(chrome://browser/skin/notification-pluginNormal.png);
-}
-
-#alert-plugins-notification-icon {
-  list-style-image: url(chrome://browser/skin/notification-pluginAlert.png);
-}
-
-#blocked-plugins-notification-icon {
-  list-style-image: url(chrome://browser/skin/notification-pluginBlocked.png);
-}
-
-#plugins-notification-icon,
-#alert-plugins-notification-icon,
-#blocked-plugins-notification-icon {
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-#plugins-notification-icon:hover,
-#alert-plugins-notification-icon:hover,
-#blocked-plugins-notification-icon:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-#plugins-notification-icon:active,
-#alert-plugins-notification-icon:active,
-#blocked-plugins-notification-icon:active {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
-}
-
-#notification-popup-box[hidden] {
-  /* Override display:none to make the pluginBlockedNotification animation work
-     when showing the notification repeatedly. */
-  display: -moz-box;
-  visibility: collapse;
-}
-
-#blocked-plugins-notification-icon[showing] {
-  animation: pluginBlockedNotification 500ms ease 0s 5 alternate both;
-}
-
-@keyframes pluginBlockedNotification {
-  from {
-    opacity: 0;
-  }
-  to {
-    opacity: 1;
-  }
-}
-
-.mixed-content-blocked-notification-icon,
-#mixed-content-blocked-notification-icon {
-  list-style-image: url(chrome://browser/skin/mixed-content-blocked-16.png);
-}
-
-%ifdef MOZ_WEBRTC
-.webRTC-shareDevices-notification-icon,
-#webRTC-shareDevices-notification-icon {
-  list-style-image: url(chrome://browser/skin/webRTC-shareDevice-16.png);
-}
-
-.webRTC-sharingDevices-notification-icon,
-#webRTC-sharingDevices-notification-icon {
-  list-style-image: url(chrome://browser/skin/webRTC-sharingDevice-16.png);
-}
-%endif
-
-.web-notifications-notification-icon,
-#web-notifications-notification-icon {
-  list-style-image: url(chrome://browser/skin/web-notifications-tray.svg);
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-.web-notifications-notification-icon:hover,
-#web-notifications-notification-icon:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-.web-notifications-notification-icon:hover:active,
-#web-notifications-notification-icon:hover:active {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
-}
-
-#pointerLock-notification-icon {
-  list-style-image: url(chrome://browser/skin/pointerLock-16.png);
-}
-#pointerLock-cancel {
-  margin: 0px;
-}
-
-#identity-popup-container {
-  min-width: 280px;
-}
-
-/* Bookmarks roots menu-items */
-#appmenu_subscribeToPage:not([disabled]),
-#appmenu_subscribeToPageMenu,
-#subscribeToPageMenuitem:not([disabled]),
-#subscribeToPageMenupopup,
-#BMB_subscribeToPageMenuitem:not([disabled]),
-#BMB_subscribeToPageMenupopup {
-  list-style-image: url("chrome://browser/skin/feeds/feedIcon16.png");
-}
-
-#appmenu_bookmarksToolbar,
-#bookmarksToolbarFolderMenu,
-#BMB_bookmarksToolbar {
-  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png");
-  -moz-image-region: auto;
-}
-
-@media (min-resolution: 2dppx) {
-  #bookmarksToolbarFolderMenu,
-  #BMB_bookmarksToolbar {
-  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png");
-  -moz-image-region: auto;
-  }
-}
-
-#appmenu_unsortedBookmarks,
-#BMB_unsortedBookmarks {
-  list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png");
-  -moz-image-region: auto;
-}
-
-/* ::::: Keyboard UI Panel ::::: */
-
-.KUI-panel {
-  -moz-appearance: none;
-  background: rgba(27%,27%,27%,.9) url(KUI-background.png) repeat-x;
-  color: white;
-  border-style: none;
-  border-radius: 20px;
-}
-
-.KUI-panel[level="top"] {
-  background-color: rgba(27%,27%,27%,.65);
-}
-
-.KUI-panel-closebutton {
-  list-style-image: url(KUI-close.png);
-  -moz-appearance: none;
-  border: none;
-  padding: 0;
-  width: 24px;
-  height: 24px;
-}
-
-.KUI-panel-closebutton:not(:hover) {
-  opacity: .6;
-}
-
-.KUI-panel-closebutton > .toolbarbutton-icon {
-  margin: 0;
-}
-
-/* ::::: Ctrl-Tab and All Tabs Panels ::::: */
-
-/* Ctrl-Tab */
-
-#ctrlTab-panel {
-  padding: 20px 10px 10px;
-  font-weight: bold;
-  text-shadow: 0 0 1px rgb(27%,27%,27%), 0 0 2px rgb(27%,27%,27%);
-}
-
-.ctrlTab-favicon[src] {
-  background-color: white;
-  width: 20px;
-  height: 20px;
-  padding: 2px;
-}
-
-.ctrlTab-preview-inner > .tabPreview-canvas {
-  box-shadow: 1px 1px 2px rgb(12%,12%,12%);
-}
-
-.ctrlTab-preview:not(#ctrlTab-showAll) > * > .ctrlTab-preview-inner > .tabPreview-canvas {
-  margin-bottom: 2px;
-}
-
-.ctrlTab-preview-inner {
-  padding-bottom: 10px;
-}
-
-#ctrlTab-showAll:not(:focus) > * > .ctrlTab-preview-inner {
-  padding: 10px;
-  background-color: rgba(255,255,255,.2);
-  border-radius: .5em;
-}
-
-.ctrlTab-preview:focus > * > .ctrlTab-preview-inner {
-  color: white;
-  background-color: rgba(0,0,0,.6);
-  text-shadow: none;
-  padding: 8px;
-  border: 2px solid white;
-  border-radius: .5em;
-}
-
-.ctrlTab-preview:not(#ctrlTab-showAll):focus > * > .ctrlTab-preview-inner {
-  margin: -10px -10px 0;
-}
-
-#ctrlTab-showAll {
-  margin-top: .5em;
-}
-
-/* All Tabs */
-
-#allTabs-panel {
-  padding-bottom: 10px;
-  -moz-appearance: none;
-  border: none;
-  background: -moz-dialog;
-  color: -moz-dialogText;
-}
-
-#allTabs-meta {
-  margin: 10px;
-}
-
-#allTabs-filter {
-  margin-inline-start: 24px;
-  margin-inline-end: 0;
-}
-
-#allTabs-tab-close-button > .toolbarbutton-icon {
-  margin: 0;
-}
-
-/* Make sure the allTab previews always have regular close buttons */
-#allTabs-tab-close-button:-moz-lwtheme-brighttext {
-  list-style-image: url("chrome://global/skin/icons/close.png");
-}
-
-.allTabs-favicon[src] {
-  background-color: -moz-dialog;
-  width: 22px;
-  height: 22px;
-  padding-top: 1px;
-  padding-bottom: 5px;
-  padding-inline-start: 1px;
-  padding-inline-end: 5px;
-  margin-top: -2px;
-  margin-inline-start: -2px;
-  border-bottom-right-radius: 4px;
-}
-
-.allTabs-favicon[src]:-moz-locale-dir(rtl) {
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 4px;
-}
-
-.allTabs-preview-inner > .tabPreview-canvas {
-  background-color: rgb(60%,60%,60%);
-  box-shadow: 0 0 1.5px ThreeDShadow;
-}
-
-.allTabs-preview:not(:hover):not([closebuttonhover]) > html|canvas {
-  opacity: .8;
-}
-
-.allTabs-preview:focus > * > .allTabs-preview-inner {
-  outline: 1px dotted -moz-dialogText;
-}
-
-/* Add-on bar */
-
-#addon-bar {
-  -moz-appearance: none;
-  min-height: 20px;
-  border-top-style: none;
-  border-bottom-style: none;
-  padding-top: 1px;
-  background-image: linear-gradient(rgba(0,0,0,.15) 1px, rgba(255,255,255,.15) 1px);
-  background-size: 100% 2px;
-  background-repeat: no-repeat;
-}
-
-#status-bar {
-  -moz-appearance: none;
-  background-color: transparent;
-  border: none;
-  min-height: 0;
-}
-
-#addon-bar[customizing] > #status-bar {
-  opacity: .5;
-  background-image: repeating-linear-gradient(135deg,
-    rgba(255,255,255,.3), rgba(255,255,255,.3) 5px,
-    rgba(0,0,0,.3) 5px, rgba(0,0,0,.3) 10px);
-}
-
-#status-bar > statusbarpanel {
-  border-width: 0;
-  -moz-appearance: none;
-}
-
-#addonbar-closebutton {
-  border: none;
-  padding: 0 5px;
-  -moz-appearance: none;
-}
-
-toolbar[brighttext] #addonbar-closebutton {
-  list-style-image: url("chrome://global/skin/icons/close-inverted.png");
-}
-
-@media (min-resolution: 2dppx) {
-  toolbar[brighttext] #addonbar-closebutton {
-    list-style-image: url("chrome://global/skin/icons/close-inverted@2x.png");
-  }
-}
-
-/* Status panel */
-
-.statuspanel-label {
-  margin: 0;
-  padding: 2px 4px;
-  background: linear-gradient(#fff, #ddd);
-  border: 1px none #ccc;
-  border-top-style: solid;
-  color: #333;
-  text-shadow: none;
-}
-
-.statuspanel-label:-moz-locale-dir(ltr):not([mirror]),
-.statuspanel-label:-moz-locale-dir(rtl)[mirror] {
-  border-right-style: solid;
-  /* disabled for triggering grayscale AA (bug 659213)
-  border-top-right-radius: .3em;
-  */
-  margin-right: 1em;
-}
-
-.statuspanel-label:-moz-locale-dir(rtl):not([mirror]),
-.statuspanel-label:-moz-locale-dir(ltr)[mirror] {
-  border-left-style: solid;
-  /* disabled for triggering grayscale AA (bug 659213)
-  border-top-left-radius: .3em;
-  */
-  margin-left: 1em;
-}
-
-#full-screen-warning-message {
-  background-color: hsl(0,0%,15%);
-  color: white;
-  border-radius: 8px;
-  margin-top: 30px;
-  padding: 30px 50px;
-  box-shadow: 0 0 2px white;
-}
-
-.full-screen-description {
-  font-size: 150%;
-}
-
-#full-screen-domain-text {
-  font-size: 300%;
-}
-
-%ifdef MOZ_DEVTOOLS
-%include ../../../../devtools/client/themes/responsivedesign.inc.css
-%include ../../../../devtools/client/themes/commandline.inc.css
-%endif
-%include ../shared/plugin-doorhanger.inc.css
-
-%ifdef MOZ_DEVTOOLS
-/* Error counter */
-
-#developer-toolbar-toolbox-button[error-count]:before {
-  color: #FDF3DE;
-  min-width: 16px;
-  text-shadow: none;
-  background-image: linear-gradient(#B4211B, #8A1915);
-  border-radius: 1px;
-  margin-inline-end: 5px;
-}
-%endif
-
-.toolbarbutton-badge-stack {
-  margin: 0;
-  padding: 0;
-  position: relative;
-}
-
-@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-badge-stack {
-  padding: 2px 5px;
-}
-
-.toolbarbutton-1 > .toolbarbutton-badge-stack > .toolbar-icon {
-  position: absolute;
-  top: 2px;
-  right: 2px;
-}
-
-.toolbarbutton-badge-stack > .toolbarbutton-icon[label]:not([label=""]) {
-  margin-inline-end: 0;
-}
-
-@navbarLargeIcons@ *|* > .toolbarbutton-badge[badge]:not([badge=""])::after {
-  top: 1px;
-  right: 1px;
-}
-
-.toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
-  left: 0;
-  right: auto;
-}
-
-@navbarLargeIcons@ *|* > .toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
-  left: 1px;
-  right: auto;
-}
-
-%ifdef MOZ_CAN_DRAW_IN_TITLEBAR
-#main-window[privatebrowsingmode=temporary] {
-  background-image: url("chrome://browser/skin/privatebrowsing-mask.png");
-  background-position: top right;
-  background-repeat: no-repeat;
-  background-color: moz-mac-chrome-active;
-}
-
-@media (min-resolution: 2dppx) {
-  #main-window[privatebrowsingmode=temporary] {
-  background-image: url("chrome://browser/skin/privatebrowsing-mask@2x.png");
-  background-size: 38px;
-  }
-}
-
-#main-window[privatebrowsingmode=temporary] {
-  background-position: top right 40px;
-}
-
-#main-window[privatebrowsingmode=temporary][inFullscreen] {
-  background-position: top right 10px;
-}
-
-#main-window[privatebrowsingmode=temporary]:-moz-locale-dir(rtl) {
-  background-position: top left 70px;
-}
-
-#main-window[privatebrowsingmode=temporary][inFullscreen]:-moz-locale-dir(rtl) {
-  background-position: top left 10px;
-}
-
-#main-window[privatebrowsingmode=temporary]:-moz-window-inactive {
-  background-color: -moz-mac-chrome-inactive;
-}
-
-#main-window[privatebrowsingmode=temporary][inFullscreen] #nav-bar[tabsontop=false] {
-  padding-inline-end: 50px !important;
-}
-
-@media (-moz-mac-lion-theme) {
-  #main-window[privatebrowsingmode=temporary][inFullscreen] #TabsToolbar[tabsontop=true] {
-  padding-inline-end: 50px;
-  }
-}
-
-@media not all and (-moz-mac-lion-theme) {
-  #main-window[privatebrowsingmode=temporary] {
-  background-position: top right 10px;
-  }
-
-  #main-window[privatebrowsingmode=temporary][inFullscreen][tabsontop=true] #window-controls {
-  padding-inline-end: 50px;
-  }
-}
-%else
-#main-window[privatebrowsingmode=temporary] #TabsToolbar::before {
-  display: -moz-box;
-  content: "";
-  background: url("chrome://browser/skin/privatebrowsing-dark.png") center no-repeat;
-  width: 30px;
-  color: inherit;
-}
-%endif
\ No newline at end of file
diff --git a/application/palemoon/themes/osx/click-to-play-warning-stripes.png b/application/palemoon/themes/osx/click-to-play-warning-stripes.png
deleted file mode 100644
index 29f15f7b8c20a39a79454fc8b81852daa36548a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1563
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
N002ovPDHLkV1i?V(r^F(

diff --git a/application/palemoon/themes/osx/communicator/communicator.css b/application/palemoon/themes/osx/communicator/communicator.css
deleted file mode 100644
index 0b57574fd2..0000000000
--- a/application/palemoon/themes/osx/communicator/communicator.css
+++ /dev/null
@@ -1,6 +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/. */
-
-@import url("chrome://global/skin/");
-
diff --git a/application/palemoon/themes/osx/communicator/jar.mn b/application/palemoon/themes/osx/communicator/jar.mn
deleted file mode 100644
index 612d133352..0000000000
--- a/application/palemoon/themes/osx/communicator/jar.mn
+++ /dev/null
@@ -1,7 +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/.
-
-browser.jar:
-% skin communicator classic/1.0 %skin/classic/communicator/
-  skin/classic/communicator/communicator.css
diff --git a/application/palemoon/themes/osx/communicator/moz.build b/application/palemoon/themes/osx/communicator/moz.build
deleted file mode 100644
index ecb79e730d..0000000000
--- a/application/palemoon/themes/osx/communicator/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; 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_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/application/palemoon/themes/osx/downloads/allDownloadsViewOverlay.css b/application/palemoon/themes/osx/downloads/allDownloadsViewOverlay.css
deleted file mode 100644
index 0cfc5f81be..0000000000
--- a/application/palemoon/themes/osx/downloads/allDownloadsViewOverlay.css
+++ /dev/null
@@ -1,146 +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/. */
-
-#downloadsRichListBox {
-  /** The default listbox appearance comes with an unwanted margin. **/
-  -moz-appearance: none;
-  margin: 0;
-}
-
-#downloadsRichListBox > richlistitem.download {
-  height: 6em;
-  padding: 5px 8px;
-}
-
-.downloadTypeIcon {
-  margin-inline-end: 8px;
-  /* explicitly size the icon, so size doesn't vary on hidpi systems */
-  height: 32px;
-  width: 32px;
-}
-
-.blockedIcon {
-  list-style-image: url("chrome://global/skin/icons/Error.png");
-}
-
-.downloadTarget {
-  margin-bottom: 3px;
-  cursor: inherit;
-}
-
-.downloadDetails {
-  opacity: 0.7;
-  font-size: 95%;
-  cursor: inherit;
-}
-
-.downloadButton {
-  -moz-appearance: none;
-  background: transparent;
-  min-width: 0;
-  min-height: 0;
-  margin: 3px;
-  border: none;
-  padding: 5px;
-  list-style-image: url("chrome://browser/skin/downloads/buttons.png");
-}
-
-/*** Button icons ***/
-
-.downloadButton.downloadCancel {
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-
-richlistitem.download:hover > .downloadButton.downloadCancel {
-   -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-
-richlistitem.download:hover > .downloadButton.downloadCancel:hover {
-  -moz-image-region: rect(0px, 48px, 16px, 32px);
-}
-
-richlistitem.download:hover > .downloadButton.downloadCancel:active {
-  -moz-image-region: rect(0px, 64px, 16px, 48px);
-}
-
-.downloadButton.downloadShow {
-  -moz-image-region: rect(16px, 16px, 32px, 0px);
-}
-
-richlistitem.download:hover > .downloadButton.downloadShow {
-   -moz-image-region: rect(16px, 32px, 32px, 16px);
-}
-
-richlistitem.download:hover > .downloadButton.downloadShow:hover {
-  -moz-image-region: rect(16px, 48px, 32px, 32px);
-}
-
-richlistitem.download:hover > .downloadButton.downloadShow:active {
-  -moz-image-region: rect(16px, 64px, 32px, 48px);
-}
-
-.downloadButton.downloadRetry {
-  -moz-image-region: rect(32px, 16px, 48px, 0px);
-}
-
-richlistitem.download:hover > .downloadButton.downloadRetry {
-   -moz-image-region: rect(32px, 32px, 48px, 16px);
-}
-
-richlistitem.download:hover > .downloadButton.downloadRetry:hover {
-  -moz-image-region: rect(32px, 48px, 48px, 32px);
-}
-
-richlistitem.download:hover > .downloadButton.downloadRetry:active {
-  -moz-image-region: rect(32px, 64px, 48px, 48px);
-}
-
-richlistitem.download[selected] > .downloadButton.downloadCancel {
-  -moz-image-region: rect(0px, 80px, 16px, 64px);
-}
-
-richlistitem.download[selected]:hover > .downloadButton.downloadCancel {
-  -moz-image-region: rect(0px, 96px, 16px, 80px);
-}
-
-richlistitem.download[selected]:hover > .downloadButton.downloadCancel:hover {
-  -moz-image-region: rect(0px, 112px, 16px, 96px);
-}
-
-richlistitem.download[selected]:hover > .downloadButton.downloadCancel:active {
-  -moz-image-region: rect(0px, 128px, 16px, 112px);
-}
-
-richlistitem.download[selected] > .downloadButton.downloadShow {
-  -moz-image-region: rect(16px, 80px, 32px, 64px);
-}
-
-richlistitem.download[selected]:hover > .downloadButton.downloadShow {
-  -moz-image-region: rect(16px, 96px, 32px, 80px);
-}
-
-richlistitem.download[selected]:hover > .downloadButton.downloadShow:hover {
-  -moz-image-region: rect(16px, 112px, 32px, 96px);
-}
-
-richlistitem.download[selected]:hover > .downloadButton.downloadShow:active {
-  -moz-image-region: rect(16px, 128px, 32px, 112px);
-}
-
-richlistitem.download[selected] > .downloadButton.downloadRetry {
-  -moz-image-region: rect(32px, 80px, 48px, 64px);
-}
-
-richlistitem.download[selected]:hover > .downloadButton.downloadRetry {
-  -moz-image-region: rect(32px, 96px, 48px, 80px);
-}
-
-richlistitem.download[selected]:hover > .downloadButton.downloadRetry:hover {
-  -moz-image-region: rect(32px, 112px, 48px, 96px);
-}
-
-richlistitem.download[selected]:hover > .downloadButton.downloadRetry:active {
-  -moz-image-region: rect(32px, 128px, 48px, 112px);
-}
-
diff --git a/application/palemoon/themes/osx/downloads/buttons.png b/application/palemoon/themes/osx/downloads/buttons.png
deleted file mode 100644
index ca87b401b2cc34caaa03c18740b8de899cf0cbe8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6881
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
D&=+k~

diff --git a/application/palemoon/themes/osx/downloads/contentAreaDownloadsView.css b/application/palemoon/themes/osx/downloads/contentAreaDownloadsView.css
deleted file mode 100644
index ece99eacd3..0000000000
--- a/application/palemoon/themes/osx/downloads/contentAreaDownloadsView.css
+++ /dev/null
@@ -1,22 +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/. */
-
-@import url("chrome://global/skin/inContentUI.css");
-
-.downloadButton {
-  box-shadow: none;
-}
-
-.downloadButton:not([disabled="true"]):hover:active,
-.downloadButton:not([disabled]):hover:active {
-  background: transparent;
-  border: none;
-  box-shadow: none;
-}
-
-#downloadsListEmptyDescription {
-  margin: 1em;
-  text-align: center;
-  color: GrayText;
-}
diff --git a/application/palemoon/themes/osx/downloads/download-notification-finish.png b/application/palemoon/themes/osx/downloads/download-notification-finish.png
deleted file mode 100644
index 5194f5d59a4328f984b99a8d76be18175b793345..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3755
zcmY+Hc{CJW8^>qnH^`Puh9R<zeaTotV~iQ=sF0n=7)HsKvXh2tQW0e*ktItdA&M+x
zNFj}V3!@SVjU@)tc-7nQJ?H)7-sjwVzxVrm?z!ild!Cy%R_6RXVmtr<fFEaJV!Ibf
zzuP{}y`F05*}WG;Lrk4R?1Fqk!aXk%0T}Nf0#OPV;CYs4OZ4=P41Py6008!%#F=31
zBgU8VA}^%PN_5tYE#|$?yCCQNLpFEvy$=;?AvG4^aQcPa?K&%okn`UY&7sMT-v>4G
zgeRhC=ZBQXuDz9(DveJ_5WjdM<*Il>UEQsxu0b3E5j($@46|*y-!6Y0)!k~+nht)0
ze!FIn|6#|iamPSOiN&A_p#OHMwI2*`gK(zy3Bm{|Q49HdIwtRgh#Co+<tCy~z9&~G
zDuVn36P^@8dtAf;$xr58ocggV^{7JC&!%IEg-<MnA6}uCN=Lyxh8C-m&-0!L4R`Pm
zTP$z%`SkEoP*%wN>)e&;vA0jJ!nUJpI;NW+zE%j)=?dXaPwG-Mq1~>o0du!mo4@&5
zx2^JeQp<;P*a>AH@~lzzvxuqWw?N5DZaZsz{VB6|`tGssAUuduE=)|HTX^(XL&Xit
z#<Ol##1hTlCc!)fLP33_eF3xS(4|ma;oeY*!AY%+Yr)O9E?2M2YL5_{{^?2MOtnCz
z=v2Edw}8yD6ZUn%EtkSho_o3@`jZn2x?HTzYG-W>=;c@k9i)6{>WqQ^LZqfOjmgc{
zWmra{43%~rTGDpM50Kex&nv~M_VUW7w?E4(Z5|%DYmr@q!ZerhZh{c|jI?}ZlS&7d
zMA($ev{8J<#m&fKmQ#!|@2?Y>v9d&aM`bO3E`k+4aqwn-jW8+0j$<&XKPxCpmu=E}
z*!oMraaU#&Mzs8iy^nGujE6@i^wZoEjsl%f#QTlT-FE{IUJXmnO041{=Pwck)6%;P
zVjq;|IdTzhmJzGY9svYA(K}b3`IEFoy+0|p8g~Rs?2V<ZVj`_4Ri9hq@xLWYm67L?
z0%8V34C)6Ikid(`rh6-=)-ubeKM6I8S1Avg0JR+pMM)X!W;JQyqeqay)%{x~>s2m=
z#}Xu{Cpe=wKs3X~{IH3{lRjINQX^Mo<PgUH&{@RjC|I#5V5AIS=<*c~>~bbWa5x(o
zldLlyR@+H91B6K&2~MOCZGyU(-5uOn;GY@%?;sTmtP)H+o?rb=!#-?Jh6h3fTS;a;
z7_Tk_=b!O!ktdMB!K+W+TXiP2b7(w7G*$DZ=W)z)0jvA6F7olVf~o-AyfgqX>h+(6
zKh}FWPXkb52;L;6&UqJ7ETmvUrMn8C3iz*_yTDl1rw}m<li;NZfUZd!IhCs#6aSCR
z5LkPzJ+ar;#jJZT!QYLlMl8@^F8nja)`i^F`+MGq01_%fp#IHFx(3b?03I{=7qS0;
zh<gqxSpaJzQdshzR1hJft7h5-dkjg79L#C=%f6q+4>rC0C3A`N<9m_cOvQymBa;_J
zNDD@xf}vt>cX+ip4mIJ^Ge#xIr<lqs0$-&*A5i&Z_WGX~CrO>rp8m>jo95tiYi~8}
z!z%t6G9C1l`k}GTbJUTdY+hy8p^g!1&gp$QvKTHr`(pc_joxw*a1_?bQT*84u@FDq
z8QA)1&V^>fD8I6q3IUH=*9mW|SH@qj>kHa8;V>RyUBN>HlP3wH&ku$lDf3E|iX!GB
zno8Qek<Ko5&mV7utzDf8a0!RDlr#nOoEln;Kj>R8Z1Io8(8u6=8~VA$=6kog$3`uv
zg=QW2>m*AioU?f&0}!>t>+6;Dw^Uzzurb_c?yw296k~mKY3x__9T~IH-yxaTk4b;q
zd_`0Nq~|SYzyhG2prh>x&VpJ5bH0uehXrSF!E>ti3{5|?WVd=A^&VSOJn<=QJ=*PF
zESe;4H0!F5gA%a*t$(-NBwq971Hmp#=Xu$Fe>HOVWP^k{SzSwX?{K#@z}=(jPj5|)
z6LVL)wrbX|AS4EU1YauZQfud1Optz_=m2P_4~oG#{p`4IomS_k>uDhW*j2xJ-+yVm
zTIw|#!g{)cRB~Y-9gyZDc(z;P05qMHx_+|?^qco4(O);yEIfs8;n#jGpSvO%mCxJ?
z-2+jT#`SId_rCyT38p;>5(pvVsPhJmq_Kuym5^|!p%ZfzHxFs6s3|zde<52ZCO{Fg
zVeJ}Ildbm8OYficUtux?*tAzspUiaFB;n)yOF&(PY>@ndB1>dXdeFT^o}JrW1fgBi
zkVIO>vZziC!&c)3kz$ZVGFUCpN)xO)sG_Ri<|mK(<9%?^_TVp*DyMkR_Km!}fmnK!
z&+4)F7rTR()H9?+=>xpq&LAUy;TXKzT(OcUV5k}#^R7Y3Pp8`gR9ZawL5d8I0DdzK
zK_eq25TY<<>0Lm+p8Jf8$1BUGp4D_8g}TGiagVNRodd?`&_A2Tkm<J(=qq^orgU6b
zOE)jK`lf-?E9{yOJVF$r-B=`Zfm40(O~ef2lSC))OY)g^O5BwSaHO+O+9%o0ADMw!
z4QX;PI1>rDQa-D)aQPcYu}Cn3o^J;7*K>1h2p)$lLAo<lDS)=px{ljsP3mV}XM<v=
z=xylGd?^t~#1k%+mbpp$7Z!~$h`%vr^CtEZMBv5jhGNW*wSkON&yF9NqEXOE;Cb%m
z?-Op5#V+1kSbpw7#g`4)sWxT&K#wLEL)R*rXOc}+pp5WIu$tu*rMX$Tj}O)Is^vef
z*S7)oIOggHUmp)_H102O`q``zfZ%_zUU=%X0vF3p?kxs5*&&gtzS3fkl7xuc1rfPF
zkz11Jx!i257$Nl_+ZV18dZPKI|M&II7uMK#wG{lbGNHLeEJGx_g%MDBzVM7gOjT+z
zW7h+;jrHB%O#UK1jaWevCrZ&30o8{cFd!)0X6bW`7tQayuxoRx&A6f@v(z%>Bm}R=
z3>)j#Iy|i7VrbXY4!MtrE@Jfg#V${~K{;8+IauP6tv^nK%sqFm-3B3jST6Og+e*hT
z_%I{ZlG6jqA6Ty`idoKb?GAc~5HTPm{AE?l+4onsIfkw6bC*;pBQstJgZO5XHTfL$
zyF+{DP+Z7jK5bpj+2K#BOLjPdjYk!(%IXht&O?14*w+PYduaz1KD3KTHCOXsUOtXL
zG;$_5cI!b7T1?DevIG;at!*?uB`8*bq<G-<Z@pWUr3$dirx87HZk`F1Uf$)$O}b5#
z4bSmMg37=lQS_k!wW=8MRv%T{MHo$o`7m}eT8}k6Wxd8<TKbX5U$;4Mbc`ltrQNfS
zdkDHF<z6&vmm@yFIu}9RyKS%Wt8<*W#w`ePz>kuEYv4wc&wO)>W*Y0?#8mUsma-7m
zt@XFB9v)ngoR>1@X5@wP!u1p)q_jI>buGDdo>|9@7>F<54yom*{iui}$#=-|vdbaf
zDd3`UkhBHkabna2($b>f8n_EZRV6)Zw<!&(icL(XUC!e3(9oROREyJ>!T8ND_eAYX
zbj^{o!A%V6aPm106BX$kzGOG%WecMlinH|@L*R+;%UwJZyU_GjgaN$;Pc`iy7U<p_
zX0zeU?3G`Hvk{gl@^=tQZ<0mNf+w)yJ~t%H)AW8~UkwNbnCO$E5GMlpJtw%FS9(g)
z1y06_va{u20^E<dkl64q*YbjtM_gu=;z;?2>zb^)-Cb8SSTH$7G^{~QcX7LP)y1O9
z*bGAV+e4IPOcxQ=smbo~A;pUILmuu^qB(gJ^e7Y*QjCqa*S=uO#jq=4?AlF1a*Vs(
zT)%0sm~v%2VMCMmM(FI*3tBjJAf@xmkaN%#-BHN4j^oi#P%I}k*&`k+9;L^RqP*we
zUv{z^!NzAw1K*4m^Tbx&Z8*%Bo0xit;&&asMHPj`Ua?5I+=|qpK^ubYi{{b?b#U@~
z=y52%@$OdtmW-LrXW)?bcX}2!qVxOR(G7hAsSRBq?nM9{Hcm^aol+(aBiSdTVPKE@
z-JJ|Bi+CkCWt5}D-S{_|rq1K372zd!+F`OD^rK=|4`b&Pi1-Yw|FroX5%ppu$!|4G
z(J@=DBdoC)kb>c-s}wSlHCU8Py#Lp@ejIywJYVSO*0_+0H07uTiN6TL{Z*3ZiADAI
zyr6zEbjc;5h6!U!;R-|`C)Ptp+)lH+$ABHTF!!WD(=xMz$f<%PWiq-Jk{Aa*$ePqa
ztDg}+=V*Xxh0ttjhGk~SdAkXVwuGWvGYU7sQ_G?wSsCCB#f)4|v-mU2pOque6@qV*
zJm4ASd{+|WVEo+57qmKuzLv})q1{px$LQTQ53jqcZObhKmGC7iP1YB|8E@`*J@Lql
zP?rmh1Ya~xiavK^@>yRXe95x^jS$t^kUQk9qVaLut5Uyhhv8Z1Y1;>yc@}YCC4i_C
z08P}P>!ykC4<QE<n3{J1bF&;D-G|WCPqV5{J%>T)Dx*qSO{IIkDSW@9a8a8ain84B
z-B;w^Ot*Rb+ww=1y%pWTccxZrIR~B#`HwupUt}iHgJsNln%hd8y^ndiijQ80zIibk
zkpr(JXlcYmTF|27MI~G=o!V+1*JmCmH-AnGG2rlH3dLZwR>^kHjHD4~+IOkFhspd(
zHI!g5mliAC>SOOQIzP?QxYbGXkAo}j=w;;_M{=zwJTp8ovYYkJa{k@tLz*9+!Eb5H
zv=<U^L*9ly{<SUcwX~M$`jTxyf2|K~nYw=KYJsJCiMUS2-b1lW94nefG6&NK<ap+X
zpS1_LqC2kN*0r5)Gxb;TxGw8-gfhn*uzw%6?YrT;a`S-?lWp(!Wf59-eP1L&W+a*;
zuzX)$o2N))6bI;a#`N}#T-(SIij_!#R=Z;*#>h!7?3?DlCEV{~4!*VKVS)}W?Yk4x
RzgK+%aHdu!l~{cIe*pGC@p}LO

diff --git a/application/palemoon/themes/osx/downloads/download-notification-start.png b/application/palemoon/themes/osx/downloads/download-notification-start.png
deleted file mode 100644
index bd548b18382388cfbe7672d1d0725bff0d21432c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3166
zcmaJ?3piAHAO6n}W7wLAipnuATgqIRp&2IQerv|HD2bUd#%(S;7bfd6OJ%d@qKGKe
zmefj1)DpH_%C)VntS+|8A}Y5ek-nqS_C3$ncb?~*IlupT-}iU<zvs*zFQ&^kXk9b_
z;2SqrM<4iCF?XU=;Oo^5tTq6Yj3WF3qydbLRF063V}%OYT%4RQf}aCmV=EW2I8j_F
z#OCrM1T^e$O+6Nh2&G~D$qWKR<iHJ&aE%jledCyZoVX|sB@}DB0kV-(VF5l@%7Wzl
zXn}+(r(r+nQsMi#Wjq%80Fg$~uy%6^p#X*#<RBDtAu^6&#vxb|AxjdDNFq>3ly#6f
zfk?m;&G7^)Ga`XXwxSY<(5C|nXA_5pQGFbpKjnfW8a7-i6;bi{*w|QHtOZUe=HZDH
z3I$Iv$D5m*!3Z<S4uO;<Hxoz<=M@~e5{@`RB#jUXpgBbrTPTy#uyCaxTi}a6%L*i)
z#sm)xFK3DHL>ytRrFkHO@&BQG{%5pA>cjoF-v22q@!KKd;(fRhp-jx-!f?a6R3fT_
zn9Gt1#ePCz^!yaP!i7?yBwQ$h9DK<*BE(>EA_Q|Q9~cY<)lDFgvIHEin<EViYv3Xx
zLa7ud2S-N&nPl%wu^<wi;E@yUDC^Cg>>S9>7Ebo&^IS(EN5<z0r1RX+f4StZa_7vz
z7r~hwx#EZzZm6?Z$cH{OO^x_^E#_a<`@{|XdMy@T<>KLD@N--H#a7QR!Ty=M{cKz~
z_-uWy0QS2WHa5DGXA8d+%cV{MQeR=1G?pdif{*@n<Fk11-mpS<e0QB|0|4rVo1>kd
zyyrzh!p1|JR<s0}<(#=KzOap9b*io7_SmlS)1)>E$r+3L4x5IDg#I|}m`PgNImMlT
zyo*vpNk-Gne<G<8??0ua`vJHW8~dVu+I3jrrR!OLuArt!%c1LXPQOjp<lbS&msc;>
zk54Cd?&zd+QTiADx-JUy&vv4kvce4l3E?wuMq_S!d8e=b!z9g{_?M|CQ#quv1Z!l}
zm}kk)BPYC-2BOYGCXFZAMgVc6-7U*R)_#<B&)wCvTvJPnZ``=E8)L{e2D6*O0|L5x
zJ+jxGFBqLf6Wz}S{g?~hxTKt77WC9gpZP>JrD;2(Fi=<{6OgoZb@K>Gv+<nvNj0Kj
z46^X_wQJY(v&{m-R)8OupVtD6j$Dg=Pigr^B|vm>aj9Mm7)_0h%XoF3<9!{|sUY0c
z((;bGySurMy3V?Cl;S4@{kgINU;vU1DuFALY3cJhtQ0-6Uu$gK<Z2KDKScoq1e6uP
zh6+xfKJA?Lk%LlXKYsl9Y-J_Ma96k5CrCKr?@@XBl8<-{Ff-d)d2Q<@@z4A1zs%+7
zY4tHzklFUy?y<Pb&S<y+<cCZ*kdUF_RoBIHp;TL6U--+`3$0(&u@!`dh3T%D11riz
zeGdn3pUGIl{uU^IXr*ugee>q*{n)v10G;Z1Zc9b;f0KDUy?OG>L?$zHzOo=7mPj(b
zs64ptersEsh0l)#bNv>o(-RZx=7odnt72Ykh5Ig0Zg?`NzF#Y4O>~8&HfUV+G`?w1
z^IJWIL2<E~mPzH#UAwkagms|vuvqNN_L5vQV7n|&K6GwmL=-jl^tz(VZprXcU~g|<
zT3lTGa-GDv2#rRs)>B{gXkY7ci!iX06a;p66j)C(Q+Hn{d&qUy{Bp(E48VhLK5m#|
zwXIsPlDm(vXtBP2Qjof0t$$hVYOt-P(j+S~yL{b)p^2k^AnC6H+}y6`tRK@5{+9SI
zt`!vN?>l(#Pv0$Da*sbyd;a`+{_{~eE+p5&puApG(>x-1(wsql{HU!56l#Y@M!GL8
z-g^GVeoXhh_-K!u#eoj~{{9zxO_HDXpVHOUMf>>rz6Z*0%CB6pZ*{hB^6S?mRaI5t
zoSP<wHWtpj&uwmQw)vrO7pD7G{IfUY%Iazka$t|bMtxr|?ZN%~`32e8udShmRAG1d
z54!Xs?3MV@C;miRrcInp;i43g^?KOx+4K=TgYt|iUeiqX!#>ql5fF4yKFU6szOalf
zrK40jXY%v&gMX{3>F<q7Y|vM28*(Vye%aJ8^OZ-q8s?w|tpq}8GjoISeO(TzLi!!0
zYh=%=%E}Wc<)tV)QAbx-m#tx6eQ(Z`T_6T~_ZuD5f$ts4BW{_Pg0b9VIXSB1$Mr)K
zz5JCC$#7>U($mw&2edHB4TtwW;i;q1iP`Zk?~YB`1#9j;-+v+MuBN$#g`S#SNPA9Z
z@Gnm(H>;wM2!siiV1Pi0x=c+?i%C1vPPE&aO=Xn7EB4ZGAsE=9W_Wco(^*d^f;gKO
zOhXOI3n02h)sFG7L4%!XO5?_{w(c9QW(4XiL=o)vA2|}Zw@Ga^Cga61ukq0g!@#QO
zsqJIyuXZOO22QijrV-cb9MVjlJyOrVS2b*uG`y^y=t#>>ztXL3h7hRQTgvo{k{f1V
z0|||JLhDE#25MNQV}>voxHoh2=1r{wXR23RB5QC0G<bv~PN<ib`fV3uUi8SeiAlHr
z_+E*aZ`Y-R2`Q<N4Q=*U*GBZ^96FR>cq#XBT1U~qU&X0IF{t>y;fI%}qpn{+Qr5FF
zeU(6nI&pW%w5Xj>Ut2q~_PSHa+Uis#<SRMx(IXR-*ZBFn?B2Qr7b8`zpo9$|u6AIi
zQ1!VA%CDlgBI*6?RiD>tHqhgG`l-J+piqS6za~t_xVV$2X{rlXlpHYM`$WwkR#k5>
z6ctiOnx<)MYX`e-3GQD^OrR^6i>WTIhke`qCufd2q%KUrapN<1%Cz+ZdoJ3#d)!FL
z4r$3;>FhzCu0Axy+2QK<9;u&tQghNH%fPE+_C;%JYgaPAZuHd7qSH3=kq~2uj%ASR
zOG^iR*R(BLr8OD8K(5XBHqR>y@|v6pOkJd3w$HrwiUc`<Ch9O&M`}T<ak#1rejW9)
zr`Pr?X-<c)TJr2za=IPgp8Y}t!5){}RA;WDz1`Dj)2gyVq5?_@$Gy)yNB>Ydm9)|}
zv347KWkgm!MHOr+^ezcffa56#4rm5m<ISGuw7hmtH;g`r=OGHwWX%g2YA%oY?8M1E
zTHkJ{%9_etK-Z2|*34{NWTZTJv^N3%%Iq~d`N*<8%L3uGOK*EnP>_m}3KFR?@w7sS
zRmpGW-daIf3N|(5EK#;fz#PoZR`I(WIopw!m$ztfO2+t;Xb_KSKwVlXE#9o6i45*&
z;jI}@{maIxQ<bhQ?S6Lalt<&?*L1rZZ8I_P*$+BmwLxh){?9vi1WQu{Z}gHM_8p_j
zN|znux-#!8DNIMkWinYHtXNxM9UG}OT(mpR3LIY3SEC6w4HQjGOgOQ-WkINs>e9Ym
z5CGcCw_RKWHjVUm9;MZI#|`qkqxYE1usT|L;oYlkk%0x}8tp08aA!$X@P89TqrEfF
z^lahu%;xQl8nxPfZgT9Bq#unqSVR%wLEUk_HI;fmU0vOi#aPwZ^Skcl=?6L^*0sB%
z%25lxUv{sj$4BJ+>+k=>T7kM0Q%8%Rm%pb+%2qaybQh(c^BYa5S(?~<M+U=1X0Hiv
z7Y3PtPQWS|pm}d*FgmuM-SDu2*X50}g+GzQSEB~=iWaW1Knz5^#+=#fBwWp?9EzV+
jAnBCgjYvd@=KZrth|ckYOyrOU3BZS&6VtKGJ|y`+<U0OL

diff --git a/application/palemoon/themes/osx/downloads/download-summary.png b/application/palemoon/themes/osx/downloads/download-summary.png
deleted file mode 100644
index 67003c7d7a13aa8dd2bd66095252f2658d1e9d30..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 741
zcmV<B0vi2^P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800084Nkl<ZSi{v<
zU2D@&7(V&V+F~-+6%}O{iXaRG{R3Wm;cw7wrGi&7Z@dvis33SJevIwLf8wn-`V)q8
zmbSJ{(k3V0$M>vh9TKyXHevXdP?Eek&+~qtBkn$bjm}fV9J;p^Rc))PdWqw>R0To^
zaxw0Bp7#uHzZObBQIwbU`g%i@q#%nxPzxG^e(wd4xL+s%b!FvB7C069PLiY;JhcG?
z*g`-M$rUqd<yk_Bu&yhja~6@sqM7Ao=;rVMNiJ4h)-oilv7cV7x~%Jp?5iSFhAwjz
zkmOgi?*Ej8xpFH{8KROrz&woDON-<x!-8`_5U6VLy0bETQ?1qR!iQqotPw?tsEQJ?
z`jzUgt<}GUVZf#Jh$xC;doun4x2=;h<awb{saAPaQ3I4Q?O3hi1%beN;lH|+=li^i
zokkdi(<B5&Psi5y6R!#Dbev|9SW4)AAq@GkWf}1Q<a8N!9mjqE8V8!DUo3@00&bbc
z$hPe!JURTk6?Yuleh6+pxS;8m<swPU!Ofv#Pj+VDX;sioNbCcNtA&uD;6cD!mN|g6
zx8TXqS$&|79eaz!@xG?7Zpbo_K#P({z)iCcA>M`uKT?KKstmA;w~2v1f+wyiio5`c
zIe0GtKhE2VhZy4~gkuj#T+c^h4i3rfP`7s$-47VB&)*?2+0%6W1{;YfxM`R_F?Ois
z-DPKi<$1Vi81V-naTCr586*hu{S(WN-6?pls4dypcfFQ5GTs4+O<9&>j^oq8E%V5A
z99nAqqR#~r&vRRbF?tWp>Xxj?(H{~s%Z=|4GHUstjI$vX?0ep$(Qx=y*H`bzNlpaN
z+rjcfAV|T7`8Fi^i`xyt;Bo&~Z?{sZ+yerF>*CLG9KV8hW|^ns(?Sn^Z78w!vR(Q&
XGD^%ai9&)I00000NkvXXu0mjf6GCA7

diff --git a/application/palemoon/themes/osx/downloads/downloads.css b/application/palemoon/themes/osx/downloads/downloads.css
deleted file mode 100644
index 2f9733a98e..0000000000
--- a/application/palemoon/themes/osx/downloads/downloads.css
+++ /dev/null
@@ -1,396 +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/. */
-
-/*** Panel and outer controls ***/
-
-#downloadsPanel > .panel-arrowcontainer > .panel-arrowcontent {
-  padding: 0;
-}
-
-#downloadsListBox {
-  background-color: transparent;
-  padding: 4px;
-  color: inherit;
-}
-
-#downloadsPanel:not([hasdownloads]) > #downloadsListBox {
-  display: none;
-}
-
-#downloadsPanel[hasdownloads] > #emptyDownloads {
-  display: none;
-}
-
-#emptyDownloads {
-  padding: 10px 20px;
-  max-width: 40ch;
-}
-
-#downloadsHistory {
-  background: transparent;
-  color: -moz-nativehyperlinktext;
-  cursor: pointer;
-}
-
-#downloadsPanel[keyfocus] > #downloadsFooter > #downloadsHistory:focus {
-  outline: 1px -moz-dialogtext dotted;
-  outline-offset: -1px;
-}
-
-#downloadsHistory > .button-box {
-  border: none;
-  margin: 1em;
-}
-
-@media (-moz-mac-lion-theme) {
-  #downloadsFooter {
-    background-color: hsla(216,45%,88%,.98);
-    box-shadow: 0px 1px 2px rgb(204,214,234) inset;
-    border-bottom-left-radius: 3px;
-    border-bottom-right-radius: 3px;
-  }
-}
-
-/*** Downloads Summary and List items ***/
-
-#downloadsSummary,
-richlistitem[type="download"] {
-  height: 7em;
-  padding-inline-end: 0;
-  color: inherit;
-}
-
-#downloadsSummary {
-  padding: 8px 38px 8px 12px;
-  cursor: pointer;
-  -moz-user-focus: normal;
-}
-
-#downloadsPanel[keyfocus] > #downloadsFooter > #downloadsSummary:focus {
-  outline: 1px -moz-dialogtext dotted;
-  outline-offset: -5px;
-}
-
-#downloadsSummary > .downloadTypeIcon {
-  list-style-image: url("chrome://browser/skin/downloads/download-summary.png");
-}
-
-#downloadsSummaryDescription {
-  color: -moz-nativehyperlinktext;
-}
-
-richlistitem[type="download"] {
-  margin: 0;
-  border-top: 1px solid hsla(0,0%,100%,.3);
-  border-bottom: 1px solid hsla(220,18%,51%,.25);
-  background: transparent;
-  padding: 8px;
-}
-
-richlistitem[type="download"]:first-child {
-  border-top: 1px solid transparent;
-}
-
-@media (-moz-mac-lion-theme) {
-  richlistitem[type="download"]:last-child {
-    border-bottom: 1px solid transparent;
-  }
-}
-
-#downloadsPanel[keyfocus] > #downloadsListBox:focus > richlistitem[type="download"][selected] {
-  outline: 1px -moz-dialogtext dotted;
-  outline-offset: -1px;
-}
-
-.downloadTypeIcon {
-  margin-inline-end: 8px;
-  /* Prevent flickering when changing states. */
-  height: 32px;
-  width: 32px;
-}
-
-.blockedIcon {
-  list-style-image: url("chrome://global/skin/icons/Error.png");
-}
-
-/* We hold .downloadDisplayName, .downloadProgress and .downloadDetails
-   inside of a vbox with class .downloadContainer. We set the font-size of
-   the entire container to 90% because:
-
-   1) This is the size that we want .downloadDetails to be
-   2) The container's width is set by localizers by &downloadDetails.width;,
-      which is a ch unit. Since this is the value that should control the
-      panel width, we apply it to the outer container to constrain
-      .downloadDisplayName and .downloadProgress.
-
-   Finally, since we want .downloadDisplayName's font-size to be at 100% of
-   the font-size of .downloadContainer's parent, we use calc to go from the
-   smaller font-size back to the original font-size.
- */
-#downloadsSummaryDetails,
-.downloadContainer {
-  font-size: 90%;
-}
-
-#downloadsSummaryDescription,
-.downloadDisplayName {
-  margin-bottom: 6px;
-  cursor: inherit;
-}
-
-.downloadDisplayName {
-  font-size: calc(100%/0.9);
-}
-
-#downloadsSummaryDetails,
-.downloadDetails {
-  opacity: 0.6;
-  cursor: inherit;
-}
-
-.downloadButton {
-  -moz-appearance: none;
-  min-width: 0;
-  min-height: 0;
-  margin: 3px;
-  border: none;
-  background: transparent;
-  padding: 5px;
-  list-style-image: url("chrome://browser/skin/downloads/buttons.png");
-}
-
-.downloadButton > .button-box {
-  border: 1px solid transparent;
-  padding: 0;
-}
-
-#downloadsPanel[keyfocus] .downloadButton:focus > .button-box {
-  border: 1px dotted ThreeDDarkShadow;
-}
-
-/*** Highlighted list items ***/
-
-#downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"][exists]:hover {
-  border-radius: 3px;
-  border-top: 1px solid hsla(0,0%,100%,.2);
-  border-bottom: 1px solid hsla(0,0%,0%,.2);
-  background-color: Highlight;
-  color: HighlightText;
-  cursor: pointer;
-}
-
-/*** Button icons ***/
-
-.downloadButton.downloadCancel {
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-richlistitem[type="download"]:hover > stack > .downloadButton.downloadCancel {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-richlistitem[type="download"]:hover > stack > .downloadButton.downloadCancel:hover {
-  -moz-image-region: rect(0px, 48px, 16px, 32px);
-}
-richlistitem[type="download"]:hover > stack > .downloadButton.downloadCancel:active {
-  -moz-image-region: rect(0px, 64px, 16px, 48px);
-}
-
-.downloadButton.downloadShow {
-  -moz-image-region: rect(16px, 16px, 32px, 0px);
-}
-richlistitem[type="download"]:hover > stack > .downloadButton.downloadShow {
-  -moz-image-region: rect(16px, 32px, 32px, 16px);
-}
-richlistitem[type="download"]:hover > stack > .downloadButton.downloadShow:hover {
-  -moz-image-region: rect(16px, 48px, 32px, 32px);
-}
-richlistitem[type="download"]:hover > stack > .downloadButton.downloadShow:active {
-  -moz-image-region: rect(16px, 64px, 32px, 48px);
-}
-#downloadsPanel[keyfocus] > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow {
-  -moz-image-region: rect(16px, 32px, 32px, 16px);
-}
-#downloadsPanel[keyfocus] > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow:hover {
-  -moz-image-region: rect(16px, 48px, 32px, 32px);
-}
-#downloadsPanel[keyfocus] > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow:active {
-  -moz-image-region: rect(16px, 64px, 32px, 48px);
-}
-#downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow {
-  -moz-image-region: rect(16px, 96px, 32px, 80px);
-}
-#downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow:hover {
-  -moz-image-region: rect(16px, 112px, 32px, 96px);
-}
-#downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow:active {
-  -moz-image-region: rect(16px, 128px, 32px, 112px);
-}
-
-.downloadButton.downloadRetry {
-  -moz-image-region: rect(32px, 16px, 48px, 0px);
-}
-richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry {
-  -moz-image-region: rect(32px, 32px, 48px, 16px);
-}
-richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry:hover {
-  -moz-image-region: rect(32px, 48px, 48px, 32px);
-}
-richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry:active {
-  -moz-image-region: rect(32px, 64px, 48px, 48px);
-}
-
-/*** Status and progress indicator ***/
-
-#downloads-indicator-anchor {
-  /* Makes the outermost stack element positioned, so that its contents are
-     rendered over the main browser window in the Z order.  This is required by
-     the animated event notification. */
-  position: relative;
-}
-
-/*** Main indicator icon ***/
-
-#downloads-indicator-icon {
-  background: -moz-image-rect(var(--toolbarbutton-image),
-                              0, 108, 18, 90) center no-repeat;
-  min-width: 18px;
-  min-height: 18px;
-}
-
-toolbar[brighttext] #downloads-indicator-icon {
-  background: -moz-image-rect(var(--toolbarbutton-inverted-image),
-                              0, 108, 18, 90) center no-repeat;
-}
-
-#downloads-indicator[attention] > #downloads-indicator-anchor > #downloads-indicator-icon {
-  background: -moz-image-rect(var(--toolbarbutton-image),
-                              19, 108, 36, 90) center no-repeat;
-}
-
-/* In the next few rules, we use :not([counter]) as a shortcut that is
-   equivalent to -moz-any([progress], [paused]). */
-
-#downloads-indicator:not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter {
-  background: -moz-image-rect(var(--toolbarbutton-image),
-                              0, 108, 18, 90) center no-repeat;
-  background-size: 12px;
-}
-
-toolbar[brighttext] #downloads-indicator:not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter {
-  background: -moz-image-rect(var(--toolbarbutton-inverted-image),
-                              0, 108, 18, 90) center no-repeat;
-}
-
-#downloads-indicator:not([counter])[attention] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter {
-  background: -moz-image-rect(var(--toolbarbutton-image),
-                              19, 108, 36, 90) center no-repeat;
-}
-
-/*** Download notifications ***/
-
-#downloads-indicator-notification {
-  opacity: 0;
-  background-size: 16px;
-  background-position: center;
-  background-repeat: no-repeat;
-}
-
-@keyframes downloadsIndicatorNotificationStartRight {
-  from { opacity: 0; transform: translate(-128px, 128px) scale(8); }
-  20%  { opacity: .85; animation-timing-function: ease-out; }
-  to   { opacity: 0; transform: translate(0) scale(1); }
-}
-
-@keyframes downloadsIndicatorNotificationStartLeft {
-  from { opacity: 0; transform: translate(128px, 128px) scale(8); }
-  20%  { opacity: .85; animation-timing-function: ease-out; }
-  to   { opacity: 0; transform: translate(0) scale(1); }
-}
-
-#downloads-indicator[notification="start"] > #downloads-indicator-anchor > #downloads-indicator-notification {
-  background-image: url("chrome://browser/skin/downloads/download-notification-start.png");
-  animation-name: downloadsIndicatorNotificationStartRight;
-  animation-duration: 1s;
-}
-
-#downloads-indicator[notification="start"]:-moz-locale-dir(rtl) > #downloads-indicator-anchor > #downloads-indicator-notification {
-  animation-name: downloadsIndicatorNotificationStartLeft;
-}
-
-@keyframes downloadsIndicatorNotificationFinish {
-  from { opacity: 0; transform: scale(1); }
-  20%  { opacity: .65; animation-timing-function: ease-in; }
-  to   { opacity: 0; transform: scale(8); }
-}
-
-#downloads-indicator[notification="finish"] > #downloads-indicator-anchor > #downloads-indicator-notification {
-  background-image: url("chrome://browser/skin/downloads/download-notification-finish.png");
-  animation-name: downloadsIndicatorNotificationFinish;
-  animation-duration: 1s;
-}
-
-/*** Progress bar and text ***/
-
-#downloads-indicator-counter {
-  height: 9px;
-  margin: -3px 0px 0px 0px;
-  color: hsl(0,0%,30%);
-  text-shadow: hsla(0,0%,100%,.5) 0 1px;
-  font-size: 9px;
-  line-height: 9px;
-  text-align: center;
-}
-
-toolbar[brighttext] #downloads-indicator-counter {
-  color: white;
-  text-shadow: 0 0 1px rgba(0,0,0,.7),
-               0 1px 1.5px rgba(0,0,0,.5);
-}
-
-#downloads-indicator-progress {
-  width: 16px;
-  height: 5px;
-  min-width: 0;
-  min-height: 0;
-  margin-top: 1px;
-  margin-bottom: 2px;
-  border-radius: 2px;
-  box-shadow: 0 1px 0 hsla(0,0%,100%,.4);
-}
-
-#downloads-indicator-progress > .progress-bar {
-  -moz-appearance: none;
-  min-width: 0;
-  min-height: 0;
-  /* The background-clip: border-box; and background-image: none; are there to expand the background-color behind the border */
-  background-clip: padding-box, border-box;
-  background-color: rgb(90, 201, 66);
-  background-image: linear-gradient(transparent 1px, rgba(255, 255, 255, 0.4) 1px, rgba(255, 255, 255, 0.4) 2px, transparent 2px), none;
-  border: 1px solid;
-  border-color: rgba(0,43,86,.6) rgba(0,43,86,.4) rgba(0,43,86,.4);
-  border-radius: 2px 0 0 2px;
-}
-
-#downloads-indicator-progress > .progress-remainder {
-  -moz-appearance: none;
-  min-width: 0;
-  min-height: 0;
-  background-image: linear-gradient(#505050, #575757);
-  border: 1px solid;
-  border-color: hsla(0,0%,0%,.6) hsla(0,0%,0%,.4) hsla(0,0%,0%,.4);
-  border-inline-start: none;
-  border-radius: 0 2px 2px 0;
-}
-
-#downloads-indicator[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-bar {
-  background-color: rgb(220, 230, 81);
-}
-
-#downloads-indicator[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-remainder {
-  background-image: linear-gradient(#4b5000, #515700);
-}
-
-toolbar[mode="full"] > #downloads-indicator > .toolbarbutton-text {
-  margin: 0;
-  text-align: center;
-}
diff --git a/application/palemoon/themes/osx/engineManager.css b/application/palemoon/themes/osx/engineManager.css
deleted file mode 100644
index c6d42cce29..0000000000
--- a/application/palemoon/themes/osx/engineManager.css
+++ /dev/null
@@ -1,16 +0,0 @@
-%if 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/. */
-%endif
-
-#engineList treechildren::-moz-tree-image(engineName) {
-  margin-inline-end: 4px;
-  margin-inline-start: 1px;
-  width: 16px;
-  height: 16px;
-}
-
-#engineList treechildren::-moz-tree-row {
-  height: 20px;
-}
diff --git a/application/palemoon/themes/osx/feeds/feed-icons-16.png b/application/palemoon/themes/osx/feeds/feed-icons-16.png
deleted file mode 100644
index bcca086387878dc9c572a3c037eb1885e4e43796..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2187
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
N002ovPDHLkV1mDZ8KVFI

diff --git a/application/palemoon/themes/osx/feeds/feedIcon.png b/application/palemoon/themes/osx/feeds/feedIcon.png
deleted file mode 100644
index e69bc4496139006ad20e34db308bfcc0cbc396c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1833
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
XOnJek`nEGx00000NkvXXu0mjfe*|f*

diff --git a/application/palemoon/themes/osx/feeds/feedIcon16.png b/application/palemoon/themes/osx/feeds/feedIcon16.png
deleted file mode 100644
index d778807532bc0a1d47ac82370255600d503d66eb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 791
zcmV+y1L*vTP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0008sNkl<ZIE{^x
zO=w(Y6o#Mg&izX!oup&U%%qK_MzpnBt*sU;EiT*%#Z93r7b*n7#UN@nE?nA`n=YhO
zs4iUT(qF`d6)DB0O-mxNR0xDjVrtS%Iy3j)?>padF(Yy5S-o)J;f41x^XDoDjWN?{
zW2_k@A^+!mX6dcmKacm9Lu1Tz?d<E#xHburqf&qrsLN5wP@AE)3ob`p549PRJs=uQ
zXW9#`BupD)&3Jqt<zsK6wu`ivaepsjm#^VA{sbvN1yoTlpdJ$_adn8aUTKCw5`ybN
z7!xGB2u5l|6URuOI76{~mENr{aO=PSr@w%A7(AuO5CW*=w7-8J6Q+dKDWbhE5H+45
zdGuwXiQ{yyUm{!h3RL<nMDX6>z25=I#vOcblVa&-nERagky8vm`x@cHhZs5eE<wDD
z&h<+m4iyLDzze13sp^MAlT)OJ&k{cL7?fhP^B1ytmtyG(CaDnad7P+m6zy(cTQ^bf
zP_fvpe5XNr@C^N2U{_}8&3%S#-Q>ZQ^WcT_(5noec#C5BH;R>6a1O-x8zl7!2m;i0
z3CiPyWBZ9GU&L>>aO;b>)j6WZQNpqPn7B-~_$?|qcB>!&P}`&P>&I+;{Wk6I-odWj
zCK#$xKKUL|?I~n?jn1`CP_ZNjULqVnj5>#k9{^l7*xKXPZnOQv47PQHU}!hP&rf4a
zNPg!>Z0iOl86i1v8WoFr`4`Y*<n#yZdE*x<uUtU0`*f~eKwVBWahy{92x>F(yFURC
z?R~Dlf(!t-oM_((2ueh?r}3^wu`-KYy@e@7MD-)6ci7c=0K)22e+l&jKC}2dCtLUu
z-&rU7;~UgDuo>>&B5HdC>2B0nWOE6%T})iYJCEcZGk>n~(dd))nYda;QSg0HR4ghM
zoJHLr4<zzdC^n_Ny`&dIR4=y|T1i?TZJH<m?@=$P>}abZeftJK$voLTy+{yz`VSF1
Vvb%YmlVSh>002ovPDHLkV1o4WaVh`+

diff --git a/application/palemoon/themes/osx/feeds/subscribe-ui.css b/application/palemoon/themes/osx/feeds/subscribe-ui.css
deleted file mode 100644
index f21c037e67..0000000000
--- a/application/palemoon/themes/osx/feeds/subscribe-ui.css
+++ /dev/null
@@ -1,29 +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/. */
-
-.alwaysUse {
-  padding: 5px;
-}
-
-.handlersMenuPopup > menuitem {
-  padding-inline-start: 23px;
-}
-
-.handlersMenuPopup > menuitem.menuitem-iconic {
-  padding-inline-start: 2px;
-}
-
-.handlersMenuPopup > .menuitem-iconic  > .menu-iconic-left {
-  display: -moz-box;
-  min-width: 16px;
-  padding-inline-end: 2px;
-}
-
-.chooseApplicationMenuItem {
-  list-style-image: url("chrome://browser/skin/preferences/application.png");
-}
-
-#feedHeader[dir="rtl"] .handlersMenuList > menupopup {
-  direction: rtl;
-}
diff --git a/application/palemoon/themes/osx/feeds/subscribe.css b/application/palemoon/themes/osx/feeds/subscribe.css
deleted file mode 100644
index 3a93c64563..0000000000
--- a/application/palemoon/themes/osx/feeds/subscribe.css
+++ /dev/null
@@ -1,159 +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/. */
-
-html {
-  background: -moz-Dialog;
-  font: 3mm tahoma,arial,helvetica,sans-serif;
-}
-
-#feedBody {
-  border: 1px solid THreeDShadow;
-  padding: 3em;
-  padding-inline-start: 30px;
-  margin: 2em auto;
-  background: -moz-Field;
-}
-
-#feedHeaderContainer {
-  border: 1px solid ThreeDShadow;
-  border-radius: 10px;
-  margin: -4em auto 0 auto;
-  background-color: InfoBackground;
-}
-
-#feedHeader {  
-  margin-top: 4.9em;
-  margin-bottom: 1em;
-  margin-inline-start: 1.4em;
-  margin-inline-end: 1em;
-  padding-inline-start: 2.9em;
-  font-size: 110%;
-  color: InfoText;
-}
-
-#feedIntroText {
-  display: none;
-}
-
-.feedBackground {
-  background: url("chrome://browser/skin/feeds/feedIcon.png") 0% 10% no-repeat InfoBackground;
-}
-
-.videoPodcastBackground {
-  background: url("chrome://browser/skin/feeds/videoFeedIcon.png") 0% 10% no-repeat InfoBackground;
-}
-
-.audioPodcastBackground {
-  background: url("chrome://browser/skin/feeds/audioFeedIcon.png") 0% 10% no-repeat InfoBackground;
-}
-
-#feedHeader[dir="rtl"] {
-  background-position: 100% 10%;
-}
-
-#feedHeader[firstrun="true"] #feedIntroText {
-  padding-top: 0.1em;
-  padding-inline-start: 0.6em;
-  display: block;
-}
-
-#feedHeader[firstrun="true"] > #feedSubscribeLine {
-  padding-inline-start: 1.8em;
-}
-
-#feedSubscribeLine {
-  padding-top: 0.2em;
-}
-
-/* Don't print subscription UI */
-@media print {
-  #feedHeaderContainer {
-    display: none;
-  }
-}
-
-body {
-  margin: 0;
-  padding: 0 3em;
-  color: -moz-fieldText;
-  font: message-box;
-}
-
-h1 {
-  font-size: 160%;
-  border-bottom: 2px solid ThreeDLightShadow;
-  margin: 0 0 .2em 0;
-}
-
-h2 {
-  color: ThreeDDarkShadow;
-  font-size: 110%;
-  font-weight: normal;
-  margin: 0 0 .6em 0;
-}
-
-#feedTitleLink {
-  float: right;
-  margin-inline-start: .6em;
-  margin-inline-end: 0;
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-a[href] img {
-  border: none;
-}
-
-#feedTitleContainer {
-  margin-inline-start: 0;
-  margin-inline-end: .6em;
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-#feedTitleImage {
-  margin-inline-start: .6em;
-  margin-inline-end: 0;
-  margin-top: 0;
-  margin-bottom: 0;
-  max-width: 300px;
-  max-height: 150px;
-}
-
-.feedEntryContent {
-  font-size: 110%;
-}
- 
-.link {
-  color: #0000FF;
-  text-decoration: underline;
-  cursor: pointer;
-}
-
-.link:hover:active {
-  color: #FF0000;
-}
-
-.lastUpdated {
-  font-size: 85%;
-  font-weight: normal;
-}
-
-.type-icon {
-  vertical-align: bottom;
-  height: 16px;
-  width: 16px;
-}
-
-.enclosures {
-  border: 1px solid THreeDShadow;
-  padding: 1em;
-  margin: 1em auto;
-  background: -moz-Dialog;
-}
-
-.enclosure {
-  vertical-align: middle;
-  margin-left: 2px;
-}
diff --git a/application/palemoon/themes/osx/icon.png b/application/palemoon/themes/osx/icon.png
deleted file mode 100644
index ff4f21f9a6115db4829bb0ac6094ee1cd78c603d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2185
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
LNkvXXu0mjf;i4xR

diff --git a/application/palemoon/themes/osx/identity-icons-generic.png b/application/palemoon/themes/osx/identity-icons-generic.png
deleted file mode 100644
index a39e493c1eb1eaacc6b40c32fb6eebe683021b3f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 965
zcmV;$13LVPP)<h;3K|Lk000e1NJLTq001xm000mO1ONa4`lmEH0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#XGugsR5;6()JurfWf;ft&;QKDGv}PS
zo|!R^V`}OcNl_L-yKvDWrOV2}Y$49HC{U=NpcV>6Ar%z3$&p%kgOCbJp+JHn5Nu_X
z_e-8^@;Eo0IWx|g^S&)+yo@V*S1&y8_xbU>JbV-PbS|f4v}@CV2}7<b7s9=e$<52R
zi@a)`WjO15JD<OFNBesBmDgO~e4{(Gks6wJs&RMbh=Ib??Khv?#lL=OPQW+olieNJ
zw6saheiz5}zHs1H`z3>KU3<B?u3o(<Sr@1@?a6=W!p(?}*C)FdXR~s~boxmg*ZanS
zTLEA9r1w3ZG&rLu%DbXgHO37u9^i6H*WkADrj_O?Dv6qms8QAOMSh!NA@EU8cHgr}
zqhn487P_cjCB_YJ9w5cRuDI*Tq)pl~Eh+{CwU#EK|6ms~<uxNOJ*ZKgf}E;hQH_F;
zjpa2m?C6TSo=XaHR-13ic|pC$lF+}Sixgo?Ypzjn&5s5IK`<sE8@8f-xGz_q6_x#F
zXtq8f5$cBfbP%@`a_xdaU%DWQqER(c*|>EkU|o}c{plCevv?5vW3{jr`N{6AAr~E2
zoyDVQP`Al$ZG?60&iU0>DtGW_JR_{7mat;LB@=U&D{Hw%p&JcTZG*13F{hrkP{veV
z198O#r(B;?Z}x<|*gZ2rWyH83NC_Hb1P_?6B2+*aHz|rzqO`QApjDMBgi6V%AgC2I
zX%;+ci7BBnGr>8lSgKjhNiB+k8Y4==Sxh9u)eaWO%J@r8Nl;_Vh-BErP5xmWS{>Et
zl%UoXmxQx30f($Act{G5IBp!rbQ<6=2GggmcjPUW!ZPPf;)GU18c!P}9<pkgr_|tS
zKf8_}EOws5Ghg&s7%M6Yg0xO)L1I)G51-;{TYsD?DG7o)E$Rh~iIuipuFmkMomN$q
zalf1(r8LW@*i;OCA^stVqJ^f-*KQ()-c3c6n~vo7Mi*!6?W)?en3CVqbVQl$#n>0)
z(b*kaZrT!ylw<7OUc9A>T|N5SvkO!WNJ*5&_4Vz)t%~B?rHxH>dBLER#Au~sZ`TL6
zRq<|*{)O44rkz(K@%OmC_x8_`-RFzEc1u>@+4;&{vKw7f+FV{a-Ae6n=48k2=DTF~
n&RzWbb7gnWy3U~de{}sH<r$SwqU;WP00000NkvXXu0mjfm%Y@7

diff --git a/application/palemoon/themes/osx/identity-icons-https-ev.png b/application/palemoon/themes/osx/identity-icons-https-ev.png
deleted file mode 100644
index d49be13cb61bf85af510c3c70e9179013859a9ab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 708
zcmV;#0z3VQP)<h;3K|Lk000e1NJLTq001xm000mO1^@s6P_F#30007uNkl<Zc-pO&
zPe_w-7{}9g7-TyL{n<anSiRe16AKUJrGtmDp|!L;WamnXl7gC`RGPI(B^jaJIz$9X
z&_PJeUYzA@gyE$wUb}{jd3}1m@Z;s>*ZX_l7q-I(o;}a^v+c{+*d8LPnb&^?%``F|
z#>?yjV)o!>%GJfMcY(d)#hRHg69JgT&Wnu5*6OPZ++Nj=GV{z1z>J+kfkyEHhhF~f
zPCfZ?LZABHUIm!3!wngcRr(`KU8zg2j_3n3;VQt4ot6Lpo7Xjs`OA<5cA8BA57YeO
zS9dzU(O$`KB*_eRe9IssvX*{s@l^W4Ot^CXd5Fwlms{*Id}V=KE809m%mU*FVkX>d
z3V4}tp?q9_TuM-(+)<j_?#Tko*x`nZ$Xfb?v#omnbdWC2wwChcR2E>y4mZPB6&POD
zb{Jy(rk!8xDvAOPjE{*;t|zOL>j|3M?(O5p9RM?SeA`6^SvXdH|FclF?`e?ujT=5@
z?D!`676op8(g?WS1M!g_U^*XuO%UMuG;<PQHtjo^gK(_;b5lVAvM=_MFBQ145G^v~
zK+&RrmuZ>!mfU)<)<$+9gDf1`ADC|0$`%4-2Qr2)7r6d0N^Y<y(8L_OzuHD_Ko*Yd
zpM4Y{HyFNL;M#{MIb&JC$Hd3<IJp5?II`b65g<1hzFc7FeUzM07a08#Cuh_Jdd36f
zj7@>7@1o?4y1>Zi7`Z@MAal=8E>IV^@-{{;P<;m?cb8-224vyLerC*1ZZLegz~wiw
zB0~<WDSm|lxs~|loh6Oz;LJ~C;mH1(@z7>^^f1}M8N;vVpE(b+Up#Syi7SX8gDjj{
q{dyK?F#QE?Vtfj4^CAnU9{xYs{QECRKia<l0000<MNUMnLSTXdG*`<2

diff --git a/application/palemoon/themes/osx/identity-icons-https-mixed-active.png b/application/palemoon/themes/osx/identity-icons-https-mixed-active.png
deleted file mode 100644
index 3c77bc84dbd1912d7dd5a654db126bb49f669c0e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 984
zcmV;}11J26P)<h;3K|Lk000e1NJLTq001xm000mO1^@s6P_F#3000A@Nkl<Zc-pPj
z+e;Kt90%|-yXkJOV>`PdsZr5oBhpIop`h%=9-^e4lF-*)dg_1ZLS+^~MQP;))5_Fz
zt<<!OL|A`7k3mFqfgWbk-R-#UukR0!G&?)hNIiVucYYT*zcY#oBKjxtMbwQ30Wg?~
zHMd@RRpv&602oZgnp^L0FJ=vIFNL>C`4Sh%lT*<uc&F5GZV3zIrQ&*(*`>W>h-)~v
zv;~H?-2zfNmau>Z1`Giyah20NETDm5b^C|R4nYiYoO7UgTEH6I8iP3?rs7Q=7s!{-
zBX#mwBn_mbk=x5P4-4cc2Sat{O_2st(#Y-Qnzse|D|&$77#vq|uZIORh{(yvD3E*_
zIRh;m!x+~bU%~D5BUZbA)NB(p)17~2raP~NW8}uT2HGDNu==)afq6))vmZ$1D*v)T
zJ}$gZP8jnH=k*XnOngRdzxst1O78355A8Fri+P6g`pneI7-Hgcvaeu2a)CcDaCh^4
zASDcj?cDF^&wc$T;Ym3jCWZ@FK;`0@Yv_sEzC!NnxB4c{tAdyuF)HLpxN`B#HS|P5
zb6vpdja5MgNLd4`ftadQyDxy3ePSGxqbo8%z^}d=c5$p^&~u1;T^0x=dJ7JkmqiAM
zrTX>Vu#00QgPud&>%PG44RIiwt+2t7d+4%&22nX$G$kJwk-{%tFDJrv_8fX%+P;GQ
z^`q7m-;{Yt(4u5ds6KVCu+E-C&rADP_;vZNbvu9@YN664ztgcmK#qkE%ZEjjWjuTo
zOEft1=xxAE5PrRW*Yd;W1wnR+?t-JKyLv-TzH@m4W`fxZbgUf*@@T@gfDel0h(0aj
zI(dQK*E|D0T!Ix_7k$%avmh_f`<iFKw{ZDet80NAK0pjM!h4tc9<@MFJ}PRGLxtq<
z1utC>2M~X9)_I0!`6UxKgH7gHL0Ou$FR43vJsd#%$yuMh5p3ewg#~V`ngnua=bEaw
zy41(j0tPPhMm`8pmf^x-)XEs*0cRaE(>zQ3SNELnjd@y-oz>zWMy-r}Z}AW0)SG?N
zJiBng)^ZET;WN}gHGFib&!`28<v?f_$l)7axluk^aRl*KmwJL{`A5M#C1%Z&g0h^_
zz9l<Cjmgf?5yW3}>mtFk3kzH?Jpn&}Jd$u)EuiB?ugU%b3FOfnX4-fbm(ahTUv|wr
zAtaDTbC_x4+5hqHv>$XRfl`l3)QlgOU^<jQsYfMh#{Uz42otVIyrNV90000<MNUMn
GLSTaaO3}9f

diff --git a/application/palemoon/themes/osx/identity-icons-https.png b/application/palemoon/themes/osx/identity-icons-https.png
deleted file mode 100644
index ffd6694269b3be4859e5ba1dfbcd612a10673c37..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 672
zcmV;R0$=@!P)<h;3K|Lk000e1NJLTq001xm000mO1^@s6P_F#30007KNkl<Zc-pO&
zOKVzD6oqSqN}7SRP>KTs4U|BjqyB;rLjQ;kB!fUe#0TOFQNch!Q4xG0MhK!KaiC6Y
zW=Zo?LaZI{?gg8RoZh1cbntPvd#|M~x94)-5z)>(Jw2`CV4Tc*<`78jl$oX7hkxGz
z4j32XX1*|9Ahla&2cq58uMbeG)xI$U=1mx&w<Ul>KH$@2GC6;Ec$oJ4{S`os9%j&p
zR_pI{I_J4uZkkS~R{%Bl6u%}wrBXR%UKvt&#Y`7KR_q>+#}~a`Z^@9t5;JH-YwK^d
zS{KP=a+ydZXdU!0v;4XMrBZ3Y5Hn^xKx)ElLjV_6eSd#H?RLAw*T?yMehE-ZZwifQ
zZT*={W*U#jiLZ~N(dZJOmY(I;2DrPsdt-?4to1z7`=bfqV2+rtyy{iE-KN=W_LE<q
z0@Ua+f1wer!_FUz#a7X1l!n8h<wuPk&lJB+fZN+!0;YW+EB(lvHJeQWT>oIc1JrB%
zGtoNj{NZqzfa;gN;#UF`3WWtjTUe+8WTl=)qw!L&*J%^bKnsuRk3=Fb!C;U!0gdHX
z17x#VGQlRmA#+@<R>=ft;ZglJH#cO0<yQlwQYkXv{{Zs;Etkt=0<`d`{_E>&GQskz
z0dUd{&;>ZbK{o+fcvSz@)fJflt!)6DbOW>-C>D!kfOZ3cK!6O;Zy*#3kpa3h;LYdr
zWCFDCsD8iSPbOG?H2|OT1w&i-rMU}z<}dfW?FPV_-_XLN`uW#=_W69Y3D#KteLl=N
znGf>DURm*p0(xF(MC;tuzsCU9Bd|;U4o4a=bBWfm5C1>T64|&I!TwYL0000<MNUMn
GLSTYPi#t33

diff --git a/application/palemoon/themes/osx/identity.png b/application/palemoon/themes/osx/identity.png
deleted file mode 100644
index 60d5261ff0afecba3823ab7c2153bb3adbc42c31..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10508
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
O0000<MNUMnLSTZxUt3E6

diff --git a/application/palemoon/themes/osx/imagedocument.png b/application/palemoon/themes/osx/imagedocument.png
deleted file mode 100644
index ff4f21f9a6115db4829bb0ac6094ee1cd78c603d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2185
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
LNkvXXu0mjf;i4xR

diff --git a/application/palemoon/themes/osx/jar.mn b/application/palemoon/themes/osx/jar.mn
deleted file mode 100644
index 9b48763549..0000000000
--- a/application/palemoon/themes/osx/jar.mn
+++ /dev/null
@@ -1,181 +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/.
-
-browser.jar:
-% skin browser classic/1.0 %skin/classic/browser/
-  skin/classic/browser/sanitizeDialog.css
-* skin/classic/browser/aboutPrivateBrowsing.css
-* skin/classic/browser/aboutSessionRestore.css
-  skin/classic/browser/aboutSessionRestore-window-icon.png     (preferences/application.png)
-  skin/classic/browser/aboutCertError.css
-  skin/classic/browser/aboutCertError_sectionCollapsed.png
-  skin/classic/browser/aboutCertError_sectionCollapsed-rtl.png
-  skin/classic/browser/aboutCertError_sectionExpanded.png
-#ifdef MOZ_SERVICES_SYNC
-  skin/classic/browser/aboutSyncTabs.css
-#endif
-* skin/classic/browser/autocomplete.css
-  skin/classic/browser/actionicon-tab.png
-* skin/classic/browser/browser.css
-  skin/classic/browser/click-to-play-warning-stripes.png
-* skin/classic/browser/engineManager.css
-  skin/classic/browser/Geolocation-16.png
-  skin/classic/browser/Geolocation-64.png
-  skin/classic/browser/Info.png
-  skin/classic/browser/identity.png
-  skin/classic/browser/imagedocument.png 
-  skin/classic/browser/identity-icons-generic.png
-  skin/classic/browser/identity-icons-https.png
-  skin/classic/browser/identity-icons-https-ev.png
-  skin/classic/browser/identity-icons-https-mixed-active.png
-  skin/classic/browser/keyhole-forward-mask.svg
-  skin/classic/browser/KUI-background.png
-  skin/classic/browser/KUI-close.png
-  skin/classic/browser/livemark-folder.png
-  skin/classic/browser/menu-back.png
-  skin/classic/browser/menu-forward.png
-  skin/classic/browser/mixed-content-blocked-16.png
-  skin/classic/browser/mixed-content-blocked-64.png
-  skin/classic/browser/monitor.png
-  skin/classic/browser/monitor_16-10.png
-  skin/classic/browser/panel-expander-closed.png
-  skin/classic/browser/panel-expander-closed@2x.png
-  skin/classic/browser/panel-expander-open.png
-  skin/classic/browser/panel-expander-open@2x.png
-  skin/classic/browser/panel-plus-sign.png
-  skin/classic/browser/pageInfo.css
-  skin/classic/browser/pageInfo.png
-  skin/classic/browser/page-livemarks.png
-  skin/classic/browser/page-livemarks@2x.png
-  skin/classic/browser/pointerLock-16.png
-  skin/classic/browser/pointerLock-64.png
-  skin/classic/browser/Privacy-16.png
-  skin/classic/browser/Privacy-32.png
-  skin/classic/browser/Privacy-48.png
-  skin/classic/browser/privatebrowsing-mask.png
-  skin/classic/browser/privatebrowsing-mask@2x.png
-  skin/classic/browser/privatebrowsing-light.png
-  skin/classic/browser/privatebrowsing-dark.png
-  skin/classic/browser/reload-stop-go.png
-  skin/classic/browser/Search.png
-  skin/classic/browser/searchbar.css
-  skin/classic/browser/searchbar-dropdown-arrow.png
-  skin/classic/browser/Secure24.png
-  skin/classic/browser/setDesktopBackground.css
-  skin/classic/browser/slowStartup-16.png
-  skin/classic/browser/Toolbar.png
-  skin/classic/browser/Toolbar-inverted.png
-  skin/classic/browser/Toolbar.svg
-  skin/classic/browser/Toolbar-inverted.svg
-  skin/classic/browser/toolbarbutton-dropdown-arrow.png
-  skin/classic/browser/toolbarbutton-dropdown-arrow-inverted.png
-  skin/classic/browser/urlbar-arrow.png
-  skin/classic/browser/urlbar-popup-blocked.png
-  skin/classic/browser/urlbar-history-dropmarker.png
-  skin/classic/browser/web-notifications-icon.svg
-  skin/classic/browser/web-notifications-tray.svg
-  skin/classic/browser/notification-pluginNormal.png                  (../shared/plugins/notification-pluginNormal.png)
-  skin/classic/browser/notification-pluginAlert.png                   (../shared/plugins/notification-pluginAlert.png)
-  skin/classic/browser/notification-pluginBlocked.png                 (../shared/plugins/notification-pluginBlocked.png)
-#ifdef MOZ_WEBRTC
-  skin/classic/browser/webRTC-shareDevice-16.png
-  skin/classic/browser/webRTC-shareDevice-64.png
-  skin/classic/browser/webRTC-sharingDevice-16.png
-#endif
-  skin/classic/browser/downloads/buttons.png                          (downloads/buttons.png)
-  skin/classic/browser/downloads/download-notification-finish.png     (downloads/download-notification-finish.png)
-  skin/classic/browser/downloads/download-notification-start.png      (downloads/download-notification-start.png)
-  skin/classic/browser/downloads/download-summary.png                 (downloads/download-summary.png)
-* skin/classic/browser/downloads/downloads.css                        (downloads/downloads.css)
-* skin/classic/browser/downloads/allDownloadsViewOverlay.css          (downloads/allDownloadsViewOverlay.css)
-  skin/classic/browser/downloads/contentAreaDownloadsView.css         (downloads/contentAreaDownloadsView.css)
-  skin/classic/browser/feeds/feedIcon.png                             (feeds/feedIcon.png)
-  skin/classic/browser/feeds/feedIcon16.png                           (feeds/feedIcon16.png)
-  skin/classic/browser/feeds/feed-icons-16.png                        (feeds/feed-icons-16.png)
-  skin/classic/browser/feeds/audioFeedIcon.png                        (feeds/feedIcon.png)
-  skin/classic/browser/feeds/audioFeedIcon16.png                      (feeds/feedIcon16.png)
-  skin/classic/browser/feeds/videoFeedIcon.png                        (feeds/feedIcon.png)
-  skin/classic/browser/feeds/videoFeedIcon16.png                      (feeds/feedIcon16.png)
-  skin/classic/browser/feeds/subscribe.css                            (feeds/subscribe.css)
-  skin/classic/browser/feeds/subscribe-ui.css                         (feeds/subscribe-ui.css)
-* skin/classic/browser/newtab/newTab.css                              (newtab/newTab.css)
-  skin/classic/browser/newtab/controls.png                            (../shared/newtab/controls.png)
-  skin/classic/browser/newtab/noise.png                               (../shared/newtab/noise.png)
-  skin/classic/browser/newtab/pinned.png                              (../shared/newtab/pinned.png)
-  skin/classic/browser/places/places.css                              (places/places.css)
-* skin/classic/browser/places/organizer.css                           (places/organizer.css)
-  skin/classic/browser/places/editBookmark.png                        (places/editBookmark.png)
-  skin/classic/browser/places/bookmark.png                            (places/bookmark.png)
-  skin/classic/browser/places/query.png                               (places/query.png)
-  skin/classic/browser/places/query@2x.png                            (places/query@2x.png)
-  skin/classic/browser/places/bookmarksMenu.png                       (places/bookmarksMenu.png)
-  skin/classic/browser/places/bookmarksToolbar.png                    (places/bookmarksToolbar.png)
-  skin/classic/browser/places/bookmarksToolbar@2x.png                 (places/bookmarksToolbar@2x.png)
-  skin/classic/browser/places/calendar.png                            (places/calendar.png)
-  skin/classic/browser/places/folderDropArrow.png                     (places/folderDropArrow.png)
-  skin/classic/browser/places/folderDropArrow@2x.png                  (places/folderDropArrow@2x.png)
-  skin/classic/browser/places/toolbarDropMarker.png                   (places/toolbarDropMarker.png)
-  skin/classic/browser/places/editBookmarkOverlay.css                 (places/editBookmarkOverlay.css)
-  skin/classic/browser/places/libraryToolbar.png                      (places/libraryToolbar.png)
-  skin/classic/browser/places/libraryToolbar.svg                      (places/libraryToolbar.svg)
-  skin/classic/browser/places/starred48.png                           (places/starred48.png)
-  skin/classic/browser/places/unstarred48.png                         (places/unstarred48.png)
-  skin/classic/browser/places/unfiledBookmarks.png                    (places/unfiledBookmarks.png)
-  skin/classic/browser/places/unfiledBookmarks@2x.png                 (places/unfiledBookmarks@2x.png)
-  skin/classic/browser/places/tag.png                                 (places/tag.png)
-  skin/classic/browser/places/tag@2x.png                              (places/tag@2x.png)
-  skin/classic/browser/places/history.png                             (places/history.png)
-  skin/classic/browser/places/history@2x.png                          (places/history@2x.png)
-  skin/classic/browser/places/allBookmarks.png                        (places/allBookmarks.png)
-  skin/classic/browser/places/unsortedBookmarks.png                   (places/unsortedBookmarks.png)
-  skin/classic/browser/places/downloads.png                           (places/downloads.png)
-  skin/classic/browser/places/expander-closed-active.png              (places/expander-closed-active.png)
-  skin/classic/browser/places/expander-open-active.png                (places/expander-open-active.png)
-  skin/classic/browser/places/livemark-item.png                       (places/livemark-item.png)
-  skin/classic/browser/places/expander-closed.png                     (places/expander-closed.png)
-  skin/classic/browser/places/expander-open.png                       (places/expander-open.png)
-  skin/classic/browser/permissions/aboutPermissions.css               (permissions/aboutPermissions.css)
-  skin/classic/browser/preferences/alwaysAsk.png                      (preferences/alwaysAsk.png)
-  skin/classic/browser/preferences/application.png                    (preferences/application.png)
-  skin/classic/browser/preferences/mail.png                           (preferences/mail.png)
-  skin/classic/browser/preferences/Options.png                        (preferences/Options.png)
-#ifdef MOZ_SERVICES_SYNC
-  skin/classic/browser/preferences/Options-sync.png                   (preferences/Options-sync.png)
-#endif
-  skin/classic/browser/preferences/saveFile.png                       (preferences/saveFile.png)
-* skin/classic/browser/preferences/preferences.css                    (preferences/preferences.css)
-  skin/classic/browser/preferences/applications.css                   (preferences/applications.css)
-  skin/classic/browser/statusbar/dynamic.css                          (../shared/statusbar/dynamic.css)
-* skin/classic/browser/statusbar/overlay.css                          (statusbar/overlay.css)
-* skin/classic/browser/statusbar/prefs.css                            (statusbar/prefs.css)
-  skin/classic/browser/statusbar/pulse.png                            (../shared/statusbar/pulse.png)
-  skin/classic/browser/statusbar/pms16.png                            (../shared/statusbar/pms16.png)
-  skin/classic/browser/statusbar/pms24.png                            (../shared/statusbar/pms24.png)
-  skin/classic/browser/statusbar/throbber-idle.png                    (../shared/statusbar/throbber-idle.png)
-  skin/classic/browser/statusbar/throbberStatic.png                   (../shared/statusbar/throbberStatic.png)
-  skin/classic/browser/tabbrowser/alltabs.png                         (tabbrowser/alltabs.png)
-  skin/classic/browser/tabbrowser/alltabs-inverted.png                (tabbrowser/alltabs-inverted.png)
-  skin/classic/browser/tabbrowser/newtab.png                          (tabbrowser/newtab.png)
-  skin/classic/browser/tabbrowser/newtab-inverted.png                 (tabbrowser/newtab-inverted.png)
-  skin/classic/browser/tabbrowser/connecting.png                      (tabbrowser/connecting.png)
-  skin/classic/browser/tabbrowser/loading.png                         (tabbrowser/loading.png)
-  skin/classic/browser/tabbrowser/tab-arrow-left.png                  (tabbrowser/tab-arrow-left.png)
-  skin/classic/browser/tabbrowser/tab-arrow-left-inverted.png         (tabbrowser/tab-arrow-left-inverted.png)
-  skin/classic/browser/tabbrowser/tab-overflow-border.png             (tabbrowser/tab-overflow-border.png)
-  skin/classic/browser/tabbrowser/tabDragIndicator.png                (tabbrowser/tabDragIndicator.png)
-  skin/classic/browser/tabbrowser/tab-audio.svg                       (../shared/tabbrowser/tab-audio.svg)
-  skin/classic/browser/tabbrowser/tab-audio-small.svg                 (../shared/tabbrowser/tab-audio-small.svg)
-#ifdef MOZ_SERVICES_SYNC
-  skin/classic/browser/sync-throbber.png
-  skin/classic/browser/sync-16.png
-  skin/classic/browser/sync-32.png
-  skin/classic/browser/sync-128.png
-  skin/classic/browser/sync-bg.png
-  skin/classic/browser/sync-desktopIcon.png
-  skin/classic/browser/sync-mobileIcon.png
-  skin/classic/browser/syncSetup.css
-  skin/classic/browser/syncCommon.css
-  skin/classic/browser/syncQuota.css
-  skin/classic/browser/syncProgress.css
-#endif
diff --git a/application/palemoon/themes/osx/keyhole-forward-mask.svg b/application/palemoon/themes/osx/keyhole-forward-mask.svg
deleted file mode 100644
index 83554471c2..0000000000
--- a/application/palemoon/themes/osx/keyhole-forward-mask.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.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/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg">
-  <mask id="mask" maskContentUnits="objectBoundingBox">
-    <rect x="0" y="0" width="1" height="1" fill="white"/>
-    <circle cx="-0.46" cy="0.5" r="0.63"/>
-  </mask>
-  <mask id="mask-hover" maskContentUnits="objectBoundingBox">
-    <rect x="0" y="0" width="1" height="1" fill="white"/>
-    <circle cx="-0.35" cy="0.5" r="0.58"/>
-  </mask>
-</svg>
diff --git a/application/palemoon/themes/osx/livemark-folder.png b/application/palemoon/themes/osx/livemark-folder.png
deleted file mode 100644
index 38a4f105587f772957310c2538f4af2d4e4bc79a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 680
zcmV;Z0$2TsP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007SNkl<ZILoDy
zUue!@6vsc$@BOjaYa6o-^KX-F5~3mHPnmL|Hbt2zg<QDBjiks8x#7ZvBwP>|NQsm}
z%EctoG_hqV%ihiQZhN=)eV^a+oa5s6=1-L3Tc`8X`JVH9&*^JamH$E5exsG?GfNI;
zMx)ar8va}~#>nK-38zwD#*Z#-s`{<Dxc(BR`_cBA^icle;^w^*jSQf!|2sj0YC4|W
zjiy!>)y{9e+50C2rswI7ciu_kzsOI7!TT^f?i%YioFGV4pa>wKg+M@kobjLz6fla~
z6kX3RG=$CyCQ*h&A3!}1j%}oD#sVtpmM~|<W|EaPKL)A*3dRs5s<2iGto0zSK(K7y
z(@N9oYLdhEczyW*AD`U>p9RT*WKqeYK8I>VWIcg%5=)ajDwd3^C9K`a+-<j6yLAh;
z^9nDnp2SCEsN_NN;K#s?;UXmz0mP!32eI_rKTCQTg3>uO?K;fDmRbg%o#Dg7>ojiK
z25M0^f_M;B0&#+BE}krT7VW>rntexDwqTt0^M}a#B-0kRP}28^(cTUu8bAvnUJ2r3
zkAu%5K0_we$xwfaqV>mFw{|-3Ze7Gyucodhr2oy!_#^eG=1{K$BA{*vi3TA`^Y+R)
zdhT4J_tj(UycX)qK9l~`i7#!SWVoxat^>&;0--A4(uFHqRyHqZ!q*N)XU&H4a>|Qg
zWT20+u!1Q;7f2L)LoDKzP`n~hADBt8HJ7*H%x;S97Z8hUy~qsLkCMQwYD03}7)_v(
zL)Bo~uWjkgj6^dF?gvca85`!89GI9=K(aJU86XK10TX|8{}l>YApZ@v-C_moQfBu6
O0000<MNUMnLSTZ1@JT=b

diff --git a/application/palemoon/themes/osx/menu-back.png b/application/palemoon/themes/osx/menu-back.png
deleted file mode 100644
index ecb8ccd1a48561a91b7886d5ec05f37ca12e681a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 341
zcmV-b0jmCqP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0001%P)t-s|Ns9?
zO;AoxP>6_#jEsy-O;1iwP*PJ?YHM$8Zg7#3m3Vo3s;jJ#k&}~?m5YmumY0~BnVFlM
zot>SYm6esCp`oOtrI(qV#>U3BxV^c$zrVr9#Kz3W$<EKv)z;YC+1c6I+T7aQ-rL*T
z-QM5d-{9cj;o;-x;^N}t<?Q6<?dj_6>Fe_E@bd8S_VV)d^!4`k_V*xtO^W~k02y>r
zPE!C>RBCLyyT8A`zskzY%+1Zs&(F}%()s&8tq}hJ0031<L_t&-(_>)32}D>>`C`fv
z%*cFE4MPQfB)*WUftoN9UqDG;MG%S4E3d1_hs5WW)6?cbHjrIfN1Y4BN)8z<Sxz!U
nG^N;3MI^<UP(8!Sh~3iwQRfBTVncG700000NkvXXu0mjf@)fbz

diff --git a/application/palemoon/themes/osx/menu-forward.png b/application/palemoon/themes/osx/menu-forward.png
deleted file mode 100644
index 20834927a393556ef5bf506298b0c88abe51c596..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 343
zcmV-d0jU0oP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0001%P)t-s|Ns9?
zO;AoxP>6_#jEsy-O;1iwP*PJ?YHM$8Zg7#3m3Vo3s;jJ#k&}~?m5YmumY0~BnVFlM
zot>SYm6esCp`oOtrI(qV#>U3BxV^c$zrVr9#Kz3W$<EKv)z;YC+1c6I+T7aQ-rL*T
z-QM5d-{9cj;o;-x;^N}t<?Q6<?dj_6>Fe_E@bd8S_VV)d^!4`k_V*xtO^W~k02y>r
zPE!C>RBCLyyT8A`zskzY%+1Zs&(F}%()s&8tq}hJ0037>L_t&-(_>)33Rpx?`OFf^
zVkiRq3Wge@C?djY2C70RB7!RVN&+Y%e2TjAyeJ|(+In)_$O2sII@0V&d`?*{84eQo
pY*Lyid<G_QNe)!cFtRe>1OQJ|1>RKTfKLDb002ovPDHLkV1lCYuCf3C

diff --git a/application/palemoon/themes/osx/mixed-content-blocked-16.png b/application/palemoon/themes/osx/mixed-content-blocked-16.png
deleted file mode 100644
index 7cf33ec4c5acc81330208f5f5ac45fa5435c3d1a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 346
zcmV-g0j2(lP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003YNkl<Zc-p1Y
zu}Z^G6o6rI6kNJ=3;GC7f|I3C+AcnXu6+Wh#1KLVgcuT%!P(7@(kBqi0~nvcC=S}m
z2K4w3XK1+54jn!?xhMQta(6^zE1ic$QCM(L;Ynv}V<6A-9#S+AeBwjrMt8l=K$c|_
zyg;zP7<<^&c>zI<i4jQC^c5?d;}Ey_TK}5vR;Z0Yk|ZVWaEc`aqI&@PPH6<<IG*DX
z7Z7CxI4dzX0#Ovjs4<2pBcShG8-XwkXAm4gR4c&qJ_Iu(5Cp*xf)gxtZUuNghG1v}
zeBbXwaEU9OTLIk(`t5-7Jg>q#MmWRs+HRz~>d!yXb=?8p@Piv1z|#3!cZ2SLavaCP
sJp_#sJ+n4nCS}|96c1|p-)-E=FZ@fcYF)+4`v3p{07*qoM6N<$f<M=eoB#j-

diff --git a/application/palemoon/themes/osx/mixed-content-blocked-64.png b/application/palemoon/themes/osx/mixed-content-blocked-64.png
deleted file mode 100644
index cac4415140767c17f9132e79e68805a959f14591..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2063
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

diff --git a/application/palemoon/themes/osx/monitor.png b/application/palemoon/themes/osx/monitor.png
deleted file mode 100644
index 35e7b20562de3a2c66a4cc4c56ea964cda2033bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6217
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
G?Ee8lkvz@-

diff --git a/application/palemoon/themes/osx/monitor_16-10.png b/application/palemoon/themes/osx/monitor_16-10.png
deleted file mode 100644
index 41950340e8e2b37626384e7c458ed87d3ebc20c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6787
zcmb`MWmFXLyT|DcDHlb0rAq|qMY>bEk#+@1m+l7X?j=Md1y*9|k}eUX1tk|)dVwV_
zde6D{zPvB~FJ^vozUP_q`#j(8nK{pyiP6?nA|-lEgn@xUs-i5fd%up}9|Z(>_vb*{
z4YK<M-%~|H0e=qf5gE34B<ASly@cZ+qalNV@g<S?+8P%F<1xF6yo{dr!oIm$;vYqK
z%@q9~Qr}OeJrpU!f7loXc8UMQx3RX;3MIcK1)<kdF$+og>wZ?gyJfv4_7kugnN$d_
ziwvjXablilNZg!H<VqRm53{tleF$%z|4~xl(vR;tsLGal8O_fkC^-L0Y|9s-psoL7
z;axzQ(@XQY-PXr}bMx)LhaGbU$_z6uwKLK<QM(sar7c-n#|B?`{_LYcB&3?|yj{Xb
z3Ul_$>vU<z(W6qZvI(Ft6QRep%4&C7<1CRLdA;u#SRrSamTZX-H?to-oIoQxkz{0K
znxj>?f`B4%qL7X#PqEAi?U#)Yge@?@<#r5MabZ2mYjU8EL(g{>q-nl;=dX-Ge#kAG
zJ@D<2+turrOkprB8~(Ae{l3{KAuwU5m4BQrt=B9G?X5-Z!#87YK!(F8Pf@=aI_~+0
z`O&NFd=?EB`je2i%@YvE&?715#R0VX+}V`Z)TOR@tBjB5GsaahMOPhzG}st+LsQch
z=<*L0Gs$3mXJ^oQk#?Qhy7r{!f-eIRBknY*EcecXrH{}<edCsm6P9K#T3X5HxnpLU
zKtN5d{icNJoK~t#U`f~|9EnhN-|=^L<`Ri_sG`EdxY3z=LhU0mAd3o#PbEnC3f#hV
zj^L1Yq}pZeN##lZDxmV|N`2BNaYsxgTvWvfzLw3UhApG}$Q&5+(CC4@X^UQy<_{IB
z)QPW;T4o8CDmte25oS(n7jW^7BAgyc-&4o29&IL7h;96X2j|yiENKr+1btqBiz|~G
zJ$BA#z$STCAkL<tl_4;tiYbA{i+sc3Y&)Or6enW&6zFZ40!8T8FXObdv(PG$)x?9z
zSv5R$>OrSyC~iVPHZfhbOm1>$lp}acRSjCLvskm_-ZG3MNoWa(Fpr*$6r3OU@rDLB
z%~sWbiT%lUqt)s92UQJAR82|pGhVXvrF-v_U|u3$_R4`1UO<|fvUsjdxu9sFi`Bi;
zil2SMUYTrCB`Q6VEQ7Ck<<%fuyvDHlrH|S8%ywIQdwV1c!Y!uFQGzcYP~7^+urNc7
zKI<vH=bHw^<->dulN?9aXOpw`44n+qVT?V+%f@6OGsfZ3z`3xoIkyC6`Mp^jO>*zn
zTHFEB&;|QH3JX(H)(<FKlNVw`v<F#BRooj)RE*sZWZ|xOG0GoHN=mi^+1H<r6q$2;
zeFrm%bO1VUs5Zsff&05a){F^b<(kBj4RAPJJdxsAX1TD^tHBa{HR9~q*sCIKM+gQz
zpRKDVc;uAKgcGnV$l00jkax^OciFZM?uct_sG&P0G?ZRK^HN;+v-(w~=+vx1>;W{X
zH6b(@F)fwORz|c7vI&?kZ$;`BqK<sBxlfObE7Zz_c*FTnXy&)nyED?xJQ6LU`VTCe
zm$k>;Tg+Is4iaXulMSGtlS>{G>T?O6D7LtoxKh-Y!U}D*r#izlBL%8yZSR%^Tr@t7
za6Sq7O(?i2zO%XzTDM;IW6DKWu)nzdRTR9ct+av)DnQ#jV5QxlGqTZ5=p%icP9d;V
zQpw!IZx9oTyB6%Vu)G`-%9m3eXK!kT)$(v8WAh~m-}bp9_+>SRN0MrC<uDEpp)n(&
zIi3l|DYMY=+L~Z<sJG(o52Z1FEF-^>HoAq6h)7T<i!5Wbu!;SR0<-$T7qU7>thl&F
zBOY15QZkpUJK<*-rOR`AiQ+SAOVuxil|a0oiXla4-8pBvZSk>jljwrgco`~rQ#z?A
zD56-xQmH}of`_{>aVCs^k>(_1MW<%c@O26Ts@?{FL=e$dtN@7ft+q+kNA$idA9_xp
z(~p@3VOLWWNdjHHN#{|kv2|z6*`K_T=`<e9AlKi0MZrXIy_8Np_bJh!8M*de_tUPU
z$~IPP1^{6HB?}*=g5nO(#h4cbbW0sQSh8w2*^q7BCdx<_0ae;X>wGD-S`sh-a?+^g
z^s-2s3sx7w%4Q9&fZztV&u#`ir3sRtn`Qt)r68doIzt7EHD^UZW+s`lh8Sq5bRefJ
z8oakhJw|zFidU!uliW=eZ+Xn(z}L(id~vR3hbbDg!-~0`Lm<Xc^&>jFc9uH209<$1
z2sh$lR!kV^`JrC&tIR76#7esuTyGu2bXdW7A`E=g@aJ(!fTvV)!tp%6PS-AVzq)D&
zpF2ysH&K9|q!UBtrn667xIuu}DEN3Vt6(l2H6HpC<>2F;YR9S5O6d<WF7U5uu+Vvv
z1x$NjrT83JJf)x!)4e8dNnqGtgt5giv*P`9w4H(Hy(Yt0YDiCC5U4N;VqHY(W-oUL
z9g@wdf;(Pvz0o65tuQ|G`}R;3R-Eh!;59ed-g_;**1oY`G6Qqt6ym>$5uE&*pC3Ww
zqL=+^id3_kp!JQ4A0p;OwUO^voj<Col=5*ppFR&$1BSZ&<YH4;>Dx!8vb~HYB#LwW
zGNQC>riTaRE3CbKb0#?j00}8d^zxqn0SRr<OvnFWnL_2$EYu{-#)MN=k4zr%cwjp&
zbDX*w>o!X=>V09;H-aZ$>Xpb&saK}OrNKX&EH><4brftp4N(q|5!7vFz9z{lvb1`p
z8lsk5%Z10by`Y_)9PETSZ$}hclhMe22IHV298ivK)jyky%TW2`WbHHd$yAJe7Qyud
zJijsNpsJ(<Xi|uOUtlQ1UY4&^rX~9*`+FZfl_n`Y(Po34qY)e@{?kqjyGoVZ?E34?
zfD(AQ+3AK~ieIJyw1q*3k7QREa8oe-lyi<Xfv!?x$B@RRzGNfPMm$|$!pY{_rPW&+
zRP&9xG)@R<CZ3MyKpPV;zp2I*X=G*eGsNRL7+<S9UT<8&+qhW;!vQPrsl%mNYm!Jt
z;<scr0_rd0Gt4~|NFqmqn;TuHXr9qp0G~8byUlvhhOMdg{w<8DyT7(3{wW^cU5EMg
z{+_plxxKU`R8|N9yk4BYvH+H8)H7PPuK#CsXzHwWyZ~NUj~hZDoMOOA6!W3M3)&Z5
zJ;Qjt8Fh8_-2(pvwtoV_TffeG;cNS<RTjbG$~%F#n145W@ozI;Yma+0the+7R#_N-
zWySvkMe&dIKUsaZ9C43wzG_ZOV%qbU7SG6N-s&giU;O{3#rZ4HhBzZd?uD-?Iua`D
zMKoz7?>{WOe-=LdXM1q<|5!-yzxZrDe=Yp)YMh^d%zJ;cBK|gOaGxfxwT|H5X3OrK
zz%bnrxo?*H=5GS3_XbgXo&L{S<2o%Kf1i!Es0)3hKo2bm`@b~);|;(5E*@`8+ne59
zd!=PfIq<sYMp`duT8lSvu!@XGu7|dggx!Y6o{^Qyf?MbLGg1eJX7)K{B~Yn;@AG!>
zV&GsVoN!^{K->(%H>4unrZybG4GnN#D)EDwlP;6-5|8!@fh;%Yfzs09ZzBTbgI-LR
zLytZIb{F2W&wjaXO}QC8?SH*SMo!+;B=C(;-58SyA9*4Yp~`q=Y&K!vpg!q&c@_9w
zNcANm36v}R#iDstr~!J?x)#Xg=is0OQyO-@#(2r$6_7n}jA$ivYVI_F9htk=l6e_d
z8+-|Dz3~n9Tx3qW0v*7d>F_(KtthTRf4a~7L5a4qIWv{yUJ8$os|=c(Vv#HqLdmX*
z3~4fy3{RefuU1hlM!pxU<#T8;i||a~L~!`X?k@PbeGrG3!(U`3y+2#CKn(rjUT^L2
z8e2*%L!J=b?2#wgZAAEcx&9GP6P`gd9#_>G*FLAP-!pX}eZi2g4CRkW|7ps}%NDvI
zWFjXL*40|%Wc&iTHd=2x$@SE8Tbp79814+j!802ERP0)B!{o|=hb_yS*cM!xZqgDf
zpEm(uCdIax`(z3rEL-glWExW7Fb8I^;YRQvgLWG96j>-&G}ihgWL7rZA1(52)K!5R
zRnlar3X)sv65g!UXuqMQOJm>CH_$2#QJ+3wGwJ!f8&yJNm)h7`T}(iC*G5-B*Yw`y
zQ&2+|y#EaB@;+eBa$*Tq*s)n~dv4m~{{nJ$-9;}opSeYZ5Y^wD5ZaL*YIAa|t}WCe
zHT=Mc8N<?7tdNaw4G2-e<~2!u{7OgyPXot{2YX03>cwX!qY>rU>Bk>^V--Q-;v}+B
z5JKo@s6WB5JMFe_^#QQ;G^|m9s+hWOI`*)&u^329gPV?lCPY5fNfoHUlU0WQEabp;
zmXMU>T51Q)YFx2$%BDpWS0rU+qI5dgq^YxvT2x_BV%r|?x_I60daYMMoN?HK(0r!R
zF~k8(I$&|R8I^+`>AZ_r^t+*fY$dLc$YaI)s>!F>sweZvODePtIqd>VTjDh6=i`L{
zK4?DYmt9b-E`vQkh$A*oaMt*c;Gq4`Oz=&g)p$OEevTG!ECySeSsP=w&B(EMvX5Qx
zmA8V`XBi39BjzaPXe8@1Sls8BV#23h2tCGUt5+B&%N2WUCe)yBFN*f^^L^?LDi{@@
zI=v%VPmiGi(@_D9U3-8~1I6Q+u(-@N!W~E^C$Cw<I8d_MtX|$LtKp^F*vkws++}OP
z3$>zzj64RR=W4NJR_?Z?nhtlE^vbSWxxTJc`%`ib;B}lX@7&dUoW6X;`m{P7eO*j%
zK8rb1KePM9mKi7Fl``i-Q;f%xeTbSdU&{IRHb*PN`hdPpL!7qP)YdFtOtUO!kc;p!
zXr>RKwh=l@Gcx}za5}u`S6#;j&|*`Y`h}ZLSssXpm$#u2_Q<S!rOC&bgMusHEXzrl
z>gY3cB3H(z+4|Z(woXN{k7Y9>!zO=FVcnf%79ofV|B0SQ91OtyR(jfY3j)3(U6um+
z+pnVd;pYatCplN1-PIaC0_&YijS?PQAp-;o#oMcPxK6WT%BK}#O#Z;2g3=_yR>zNl
zuAQD3T`l!7d4s9S;W(IYgq5ku@GusvU3Bq7(tHh{UA$!O5$1iwOQ}-2{M8Fp68ktk
zRt~PvN}hscY$!-AszU^;*J}~BEy6g+3QXvufvP{u-zaZuWP;j%32Z?FvB>(vJUOsh
zTig$Rw}g+%8LEEllZ|w6E7EX<x$Z#@LMHC;gU&MGXaIjpuJpWD;q6FJYuE(ih1h6=
zz$H>kEQ+%vlErfWz4gY2#iGP#K|Z3w6fvRfScr8iHIr#|yB3Y-jGJuJ6w#hB6IJXJ
z%S=lR+YJa;{sKUEj-6L2BJBRX$X+Qo{c9|z>wBVu13Sy+nyuT1T}M(eoYPCO%Z)sy
zme(nX3x-O=o{dgYtuy_B>*#Rm>d%!%#M!mgX^WW)DVs7rGch{6Vi2f#p5gF~J`-t4
zEYMz;WN4!p%$DKzh_?`jASE}tiB){_+K9(xzlA<%v}V6KA7bH-wp@bXCo;f$qqKTk
zq)t!NS3g$NCtSnfaAt8@#r@5(+%+Z6pC+jvoVtOH8Zu1uf%|EbbJ_jS7ER=*Ikt+N
zU=!Li2_N2x&9yfgs`(-<gyNlnH4Hcnx_>^|NL_-)Lq0hhN7b*iN|nKqZpFvC%D_^I
zoFz&sOzt1FnEyycI-a!25+o_WgP$JBPr_*z>=w6=cY+DSaPz3#5_%fXv^@&jbG<VB
zobz%c>ZbtP_|2UK96!`$M_}waTZ_SU$5RafbM%+sM#3|LQuSjqrRm`%F>(jX&W^1P
z^nocM_iC#bw|ar5EXZxfDVMM;A_FVBFy1!V)3v%exO{}Suv|NqrlJ@vhnX>`LC=0s
z5vZ?7=JRoAFohs<P7AJEp-CdCXS_I&rmhPdYUfGs8M-N~p`$sHkxs+JG%=p)8?viJ
zNQ$diYkDXVhS)$8cEnmzy1=^8i$6GZVR8W}8<Rk$o#wox)Q(qP)1_Mt&LlkH?sAPJ
z-Sv;9o;>72xX`dT2HLjcF1R@hLvAFK6}Usb$M>Eg=BTW#Tr@?jewR+VM06;v{kHMN
zGA6PzxmH7tYzd@O9;YepkAwT3rKEo@u_~iE<7!}Xs%g-iTq-jopUQX`^^o%nm%SoK
zy?paqMfdT%g9?FT2$xdmHkw+q#xDkAchJy+?|XmFCT6}6yGoy0Mt{FbtC^Ywhqwlj
z29~qag+(#a!MNj)tnvF%0Of;SUrPshv8|4=1`sQ;R3Q+Yi*Nt#-NY9WK2NRDBj6~^
zvt<m}e_S~#?kE^LQa+T86qw8i4K2jN+_+iNw-Jhd*fgppW3h^t%Hr%}>LKFdpDP9n
z=#UM}<4!eA<jVy(hA@1;6%W=Xs^K&2l&D_)Q)ATPQRK-u()QFT!8CLFr!D8W2YB3L
z5+eOr4|TANW=FPOo9`ex2ZIgnjz{=|*7@%c#R&ID_jBL`nLL1>{FS@etgof${Q%sH
zLwi5%5eoFY4f*lr$6L$ch%V3*N!F_03HVqn61UC!i4yPH&t~(%b2ZByZodbdrH49W
z8u7^)uCMC@yrU-f@frOOMed&o%Nehm?V(im#B&siG4NzeWEH(A%5e32(%kj*RG~jn
zST&N|U?p(w_iVN4yNNB2C+|k>8~h3|AUExE*GR+b(%X;H_BPBGd7Zac;H?N=mx>mW
zu7m{0iVr(aAEq7cY7=-P@!QD8afj9|W8ryqQ|apE``eZBpquTflG?znHDtg>Vo99K
z1o;O>Z0k*AJ8GrS@AdWi`Tk<irtn@=T>m;fKLPxe&CO%)S+E1@a;vb`ncFwn4Y?w<
zRc-gv1M(!nm>hAIlY-0*yZ;8me}mKtK;QMEdf&D6--txj4%P_N2w8)!4|_WUet!_T
zodS;--c0$`U$`AqT4Z#{EuyLXKYu}Md@mwFT^!j|Iq6LlNO>Gwqur}4e4&>@NK@|L
z_pW$CkSnBci3HPYI=^x5=s+eNOLFc(Gj+uvl0v^b)D0RHbawQO@$N(n)lVEY@>?wr
z(?THd=5*)#V(<7C5xS&#f@pC*3bXcfYX$={Crfbc)xX>oyrK|~T|;_&^2$s$NFGLt
z=Ug)+Q=I6cyRkW)WxR3ZQCHWGebXiWCT{p9e7iE4=0x>9Qxx)o`$kH70<`b-t|f5)
z<gqm$Yg;FM72y*3lfWJZ96Wp>o@pk@B~0Gc1|c`@j)!c4JrYSArM)yK$Y{PtD#e{C
zf8LFHC6NdD;B*>i+@>`CT%devfUL9kX+5BRKSS)0W?n&R?^%*`H=Zw%EP&B@^37un
zp>Xyn6mK`?s+UwDml5Po%fnM+ZT-c0RoXH?v)Eh5t&9*m3F84}9w+tEA};2JR6hAH
z2-+V{cGy2p2+Yh4lc>&K0e?i<4>d9DEK<JNoz|aT?Q@igOu{<88J;=>m}DFw)HPnV
z=Nbo9_WEC`>CDEVF5I#Y7*BBr6Q4_y*qGM{-Y3a4N^8~3LThA1b3KqPzmD&4$q3#q
zK394iu4MX<p!!x;rySFS=?rp<^ZgQE*mbsaDtygDnSTVTk9pB;dbyQ-`cY{%PFCvu
zY-p`Cgza*^@R~N>YfEDMYV6vsJDqKGf3d08$|h+ivRg1oxl#0V`D_+)Tg^+vH6(Y~
zl<;xK=Yd-u#+pw`Qbx^^v-<XBL=Eef?nXJm2IIs_hVh0*nm)9O38iXK*1(lc2$O~>
z&8d?Zxp?BlvZbw=Q_ltF4MZy^QBtQzGBN|NN8~&T2Zokqwil0Ze#<R+vLm@+**0^z
zQ&1-Doovcz4pJGchfRVjn+SnrY#vvY;zOU`ppsRw0?KIcl(FiWKB#W*d@o<4&l<UC
zS$N0iyHv<t^HtpSAVK<;e811(XPu~M=jpVX^>G{%Mquymug75%Rv24c7aD3f%*<;{
zdY=0im<6|JoSEY~+cM#4KKd=5g?>Wp=SH|~mC;t!8pD@7E7-(cE!tPCzA<gU$OMvl
z&8(T<T^=O5Rw;=?QpzFE18sWlesyD`ZcwY=JR_vfzc~P;4kw5W7kWftALzqONcMak
zsHuWXSSayr*OsE>r-O6}9;$<bq>O8$I-zAS7+chBU2JGg@8al43k@=agDHj#xyuyH
zM!~){$Qsm$6tJMvjH=YkvH?65n=1DT_UqmTgkg&NehkCT!Pz0d^U|?`ZE6O!)r?ie
zBxon|c-~AGig4ZXeD*Ly4)R2kJ)F$v4gwn{ITxMT+|VZ2Z=*|>$)pv{ym}<hzFDGw
zZ{1#0NUt1!tGxA|Cms@xv}OiQb}->xyP8lsD>QG)5SQL@krK*Q$`TjLjcu&j)3JsY
z5SMkn%Zqwr%&^?!PS$r!Xd<Z5QEz6#5Lux`$ODo({C0Qs8+Cip!^nvK4FO1PPf!^K
zkTnn*Df`S1x%{EKZ8pxU^|6L;;yTS0LfYXp;}(ZjDVqiA#6eOhr?tI^_iGW}2e`fm
zK_bC`!ECK}{sjY>-@S{++72V7zrIK!+M$8alNc0D;T+A;pSxA~+Qex|5CkC$ou#@D
z;b(SL-sjtqAJPt&yTUhIpU`xY&wQ~olYW%&Z8v^-Gz$P~-^OesxR%~xbby+_fo|Ua
PLc&l{(3G!{wF><&GjAEQ

diff --git a/application/palemoon/themes/osx/moz.build b/application/palemoon/themes/osx/moz.build
deleted file mode 100644
index de50366273..0000000000
--- a/application/palemoon/themes/osx/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; 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/.
-
-DIRS += ['communicator']
-
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/application/palemoon/themes/osx/newtab/newTab.css b/application/palemoon/themes/osx/newtab/newTab.css
deleted file mode 100644
index 9a5327594e..0000000000
--- a/application/palemoon/themes/osx/newtab/newTab.css
+++ /dev/null
@@ -1,36 +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 ../../shared/newtab/newTab.css.inc
-
-.newtab-undo-button {
-  -moz-appearance: none;
-  color: -moz-nativehyperlinktext;
-  color: rgb(0,102,204);
-  cursor: pointer;
-  padding: 0;
-  margin: 0 4px;
-  border: 0;
-  background: transparent;
-  text-decoration: none;
-  min-width: 0;
-}
-
-.newtab-undo-button > .button-box {
-  padding: 0;
-}
-
-#newtab-undo-close-button {
-  background-image: -moz-image-rect(url("chrome://global/skin/icons/close.png"), 0, 16, 16, 0);
-  background-position: center center;
-  background-repeat: no-repeat;
-}
-
-#newtab-undo-close-button:hover {
-  background-image: -moz-image-rect(url("chrome://global/skin/icons/close.png"), 0, 32, 16, 16);
-}
-
-#newtab-undo-close-button:hover:active {
-  background-image: -moz-image-rect(url("chrome://global/skin/icons/close.png"), 0, 48, 16, 32);
-}
diff --git a/application/palemoon/themes/osx/page-livemarks.png b/application/palemoon/themes/osx/page-livemarks.png
deleted file mode 100644
index e52645846226d13a526ca862c6d2b0248fb35aa4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 683
zcmV;c0#yBpP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!O-V#SRCwB?Q%y)zQ562(&rCY%7?K5|
z4HHN~QuKp?QB1fBaZ!sRvPFS}i^7Gqa@Wp4A_x~jQJWA-DBBe|1{n=RLW@MkiJ=(^
zZOF-afA_t2Z|B~!nuLmaa2}6$zVAEVIrm&m2!a23O!?{^n7YA3|MbrZ-H6<r96NO8
zuLLAHl}c45(&@Am{Ifvsz>^oAvy4JMTa{o=8Qpz%e%oKHVN=HBVbFQ%#E~`0-8<Xy
zD_eYv)x^E~Q=MiQ3KW(&K3f7|z%X(yj^d(^g+hSL8;(+02Q+O>f!cK%B-acAvg-+W
zt^ji#OlKJ4^*XwCtf$cM@TrCAS&cOGDgljLNUj+$4%d|-lu$NrVSeEwMwe_H?@8il
zcPrXAyBNFcfeZ6TJ6wb0nm!Y798Mu1zx$6RD4jsQXyfwrIn3wE80z1So-T&*M?N_*
zlt4(;C0=KwQmJs*mW&W52VddR)z_$t8MrdM3v*cq<CAZ3_&@_1YdnRKSc^E4O9BFx
z%~iObi4ULZ@OZ{S-}&cw_uj^Zv)gccq5wY-IJn24VoYIIlmI#Kr2|>rmTdqd7uzs8
z+<|2)j%&BF*t(@2iIzrWW=q)H5hDRtVJ+fFt{(V8*>U7gO1h3m17%=-EuOt(s^4T=
z3^^KZb5j&{#Zy=*BDq>}--Kvx*-!Qbt+a)}TT~<?x`8ImXwoG$I3Yr4&|%hWgki=N
zW~DR(wMfO>gVnPkp#SxpwFoU7r;FlOZ;&4SeiBBc33A0+<y!yaZMMG%FaV|uOQtQ?
RDD40M002ovPDHLkV1j9hFkJuu

diff --git a/application/palemoon/themes/osx/page-livemarks@2x.png b/application/palemoon/themes/osx/page-livemarks@2x.png
deleted file mode 100644
index 7b170897cc04d914e4163b915d155b804a45625c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1167
zcmV;A1aSL_P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000D5Nkl<Zc-qa=
zT~L%&9LMo<>2%pNW8+0#b5&TDO1^<_WF<x*pddIVY9Oo#h`^vCiZG^_%49?~jOCz!
zNCJ%$HN{{_q_Cmw0ug}=EV~OVJi8C<%dc||oHI2K1yW!aAC~98=bZ0>*(Dox);>}H
zs|y5DCJHlPq?Y_A7g!%tBbX>Wh9Sy_BL4<iA6+AWNjm44R_K8yOs;RGo}$QXk#+RP
zf~VhPuV8d%9n(rYqaY~m4kq_pX8UJj9lyYi>Oji0Ea+3L2`fWH^3O98n%IQpTS`Fp
z%?fL>Hd#x5p|G09gX0<zo}`~Cww~`>N)LQotjXFWAgUV7#qu$f)Q-;w-V$9B5P1vK
ze8nZvCH~uQfyuw3;`n71X@yRtT$mH=Y}Vi{(IsoPeE}x>6O~Io@6@mid7(JH=y>Eo
zU6Tui6=VEBxn|~MM|9-{j(+T9ru^Q!J<zZYdr?(Cj>Cm)&5X&8yuj*+DlkWioZNu|
zhsJk5T3{MbG429f?!Owedr@39Ce}_zc0`w~3a<i_b;-#ko^fdG%rqi0^*(lGG~v`o
zMtpPE0*BL!v2jSZ@4BGV?A4GR(IqRxZi31D(829Lt!N}nzQ*U<u_vbw(HREBA8$sZ
zeh?1TE7dfNvvvPOc0`w~*m@I8`b7s9m#1hvGJDW#@t~o_h2lyTy7v|AJ2`}?)K*k|
z-G@<!S1PF<6Z@tjJEBWggjRw%bY9{1=8kF%k9z-%U*<}UihcCGs5B$KtRIl?nQb1V
zejv`#kR8z_uZ2{CNhwgc*ql*~YqcgcJs3g1)eW27D}DQu3wuw{OB^yl-=@fUO@k`-
zYKV^L62EtDfH`<}l-rd(q7j~KL`Xt2!gP(uFKS1}?<y>V9`5s6CtYJla-IPLwuxEq
zfE(|fn({2!5nZx8xB`ss^e7i|WaMu}XAL7FwHq;MEiiPd^grT3Prn;+G!~g|#_a|x
zn{fr7DN~&xJEBXLy<Gt&A#a4+k!jb+DN>+sccHbzjoe}dk%z6wI@bo%fQP$Orto#g
zE_BJ+jk+n%k{!_{OShDRiO(J3wx`=Q9(1_qU+Uo={_5hht;s#O|BHjqzWQF_vzQDM
zy89;9{h)VDb(ZXiE_pSm9L%0<JH-wj*3cWB=rXyv)^=6SORLR%X6PJ87<~>+vZ2K=
zv9`0vh456(S+XO#<dw~3py=&~xy|u|8c8P%Xf~+0_t1%hCk=9*S7bs*H@kof!HE;I
zsyZ8=>5VFabvDgeq9eLw$y?XKY)cv9Htx1*tc~uXpV&KGK=f~N?jPAkKS=cqeYW!1
z%CLLvnXYZXhIcKRvqVR9$;)qC2NRMw$oWTG=aTG*E_rFwH87iEtq9(4!>UNjTw)F0
z5?!)5@M{0!*Gusv(6*WQ_#NBryYZ^oH?S1*i8gzE{Eo(wXBIAcj(U;uoo6pl&$A0G
hpq`}`&9jB9{RcDB(eT=9a9;ob002ovPDHLkV1f)$HIe`T

diff --git a/application/palemoon/themes/osx/pageInfo.css b/application/palemoon/themes/osx/pageInfo.css
deleted file mode 100644
index f958d9ce2f..0000000000
--- a/application/palemoon/themes/osx/pageInfo.css
+++ /dev/null
@@ -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/. */
-
-@import "chrome://global/skin/";
-
-/* View buttons */
-#viewGroup {
-  padding-inline-start: 10px;
-}
-
-#viewGroup > radio {
-  list-style-image: url("chrome://browser/skin/pageInfo.png");
-  -moz-box-orient: vertical;
-  -moz-box-align: center;
-  -moz-appearance: none;
-  padding: 5px 3px 1px 3px;
-  margin: 0 1px;
-  min-width: 4.5em;
-}
-
-#viewGroup > radio:hover {
-  background-color: #E0E8F6;
-  color: black;
-}
-
-#viewGroup > radio[selected="true"] {
-  background-color: #C1D2EE;
-  color: black;
-}
-
-#topBar {
-  border-bottom: 2px groove ThreeDFace;
-  padding-inline-start: 10px;
-  background-color: -moz-Field;
-  color: -moz-FieldText;
-}
-
-#generalTab {
-  -moz-image-region: rect(0px, 32px, 32px, 0px)
-}
-
-#generalTab:hover, #generalTab[selected="true"] {
-  -moz-image-region: rect(32px, 32px, 64px, 0px)
-}
-
-#mediaTab {
-  -moz-image-region: rect(0px, 64px, 32px, 32px)
-}
-
-#mediaTab:hover, #mediaTab[selected="true"] {
-  -moz-image-region: rect(32px, 64px, 64px, 32px)
-}
-
-#feedTab {
-  -moz-image-region: rect(0px, 96px, 32px, 64px)
-}
-
-#feedTab:hover, #feedTab[selected="true"] {
-  -moz-image-region: rect(32px, 96px, 64px, 64px)
-}
-
-#permTab {
-  -moz-image-region: rect(0px, 128px, 32px, 96px)
-}
-
-#permTab:hover, #permTab[selected="true"] {
-  -moz-image-region: rect(32px, 128px, 64px, 96px)
-}
-
-#securityTab {
-  -moz-image-region: rect(0px, 160px, 32px, 128px)
-}
-
-#securityTab:hover, #securityTab[selected="true"] {
-  -moz-image-region: rect(32px, 160px, 64px, 128px)
-}
-
-deck {
-  padding: 10px 10px 10px 10px;
-}
-
-/* Misc */
-tree {
-  margin: .5em;
-}
-
-.gridSeparator {
-  width: .5em;
-}
-
-textbox {
-  background: transparent !important;
-  border: none;
-  padding: 0px;
-  margin-top: 1px;
-  -moz-appearance: none;
-}
-
-textbox.header {
-  margin-inline-start: 0;
-}
-
-.iframe {
-  margin: .5em;
-  background: white;
-  overflow: auto;
-}
-
-.fixedsize {
-  height: 8.5em;
-}
-
-textbox[disabled] {
-  font-style: italic;
-}
-
-/* General Tab */
-groupbox.collapsable caption .caption-icon { 
-  width: 9px;
-  height: 9px;
-  background-repeat: no-repeat;
-  background-position: center;
-  margin-inline-start: 2px;
-  margin-inline-end: 2px;
-  background-image: url("chrome://global/skin/tree/twisty-open.png");
-}
-
-groupbox.collapsable[closed="true"] {
-  border: none;
-  margin-bottom: 9px;
-  -moz-appearance: none;
-}
-
-groupbox.collapsable[closed="true"] caption .caption-icon { 
-  background-image: url("chrome://global/skin/tree/twisty-clsd.png");
-}
-
-groupbox tree { 
-  margin: 0 3px;
-  border: none;
-}
-
-#securityBox description { 
-  margin-inline-start: 10px;
-}
-
-#general-security-identity {
-  white-space: pre-wrap;
-  line-height: 2em;
-}
-
-/* Media Tab */
-#imagetree {
-  min-height: 10em;
-  margin-bottom: 0;
-}
-
-#mediaSplitter {
-  border-style: none;
-  background: none;
-  height: .8em;
-}
-
-#mediaGrid {
-  min-height: 9em;
-}
-
-#mediaLabelColumn {
-  min-width: 10em;
-}
-
-#thepreviewimage {
-  margin: 1em;
-}
-
-treechildren::-moz-tree-cell-text(broken) {
-  font-style: italic;
-  color: graytext;
-}
-
-/* Feeds Tab */
-#feedtree {
-  margin-bottom: 0px;
-}
-
-#feedListbox richlistitem {
-  padding-top: 6px;
-  padding-bottom: 6px;
-  padding-inline-start: 7px;
-  padding-inline-end: 7px;
-  min-height: 25px;
-  border-bottom: 1px dotted #C0C0C0;
-}
-
-#feedListbox richlistitem[selected="true"] {
-  background-color: -moz-Dialog;
-  color: -moz-DialogText;
-}
-
-#feedListbox {
-  border: 2px solid;
-  -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
-  -moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
-  -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
-  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
-}
-
-.feedTitle { 
-  font-weight: bold;
-}
-
-/* Permissions Tab */
-#permList {
-  margin-top: .5em;
-  overflow: auto;
-  border: 2px solid;
-  -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
-  -moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
-  -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
-  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
-  background-color: -moz-field;
-}
-
-.permission {
-  padding-top: 6px;
-  padding-bottom: 6px;
-  padding-inline-start: 7px;
-  padding-inline-end: 7px;
-  min-height: 25px;
-  border-bottom: 1px dotted #C0C0C0;
-}
-
-.permissionLabel {
-  font-weight: bold;
-}
-
-.permission:hover {
-  background-color: -moz-dialog;
-}
-
-/* Security Tab */
-#securityPanel .caption-icon {
-  display: none;
-}
-
-#securityPanel .header {
-  font-size: 120%;
-}
- 
-#securityPanel .fieldLabel {
-  margin: 2px 10px 3px 10px;
-}
-
-#securityPanel .fieldValue {
-  font-weight: bold;
-  margin: 2px 10px 0px 10px;
-}
diff --git a/application/palemoon/themes/osx/pageInfo.png b/application/palemoon/themes/osx/pageInfo.png
deleted file mode 100644
index 237381b4a769fd9a9e82a6b03c7043b5d6e023da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8118
zcma)BWl$VEw_e<fyHi|>l|pfM>*7$H7MJ4g6n8HU1>VJ7itOTUr4)z7%2H(U#ksuS
z_xH}+n|V&2<V=!tl1b*wnZ#;qD&b*MVFLgFJQZbm;0qVOh%_epOI;8jSpPy;Zpua;
zFRc6@Q5<uW{8#DiCS&`;#V;Zacxd0*ercdvsVT|7@JqRs>k0t?=!sS2WpsU4j`IUN
zX?!yGrNC8xqc^ggjN0}pkCu`y_%!n|m{SlQvdRKjk$AX_lsQ5;C|yU>Ta&q#{YFdc
z9-n6bg3W4VOSq`Wr~)d=vP9PBOs@uGiN(BW*n&rsoW|O0jDTv7RaKkt6MDS`({+b2
zfrfm+ea`}&zjaFOKdO4c_dSRJIJ}DfC}pm$#pUv&c?-P6l$@}SBH~)SWuIw<f$63&
z8q46=4>NRb*Tba=?)Jy>n9TM5&vVC=8}`KA)nSxWf0NgtzR*HryKqhKic3L|!N5aj
zHtRR4t_E%b6rzv9iV^%Vc6?O)RPwJyeTOIpefK>2AFb5gK03w`M?Ixl@66yQbV~Ky
z9vrb2von1Sv7We&-dJ1`3c2k}JeHt8T5bJuRTwmK>D#xtxSSeXS6h3#NWR(Wysg_i
zlUp!5R;}4gY=OifU8PSdnQ$r*9#foHjAy}-L^E-Uzv+KKHUYy3O@5Lj&zaa;>iNTa
zbNW?l2KIod#~FA5^XVOE5<V$!Y-~IiFaI1nYR7XbR4cwyWUOCjX5ZdY;w0ALGS}yo
z9l9S4z396sH%N%K<MkDiw39+DOSTh6Emm5&`jPjieSPbQTKt)sJhwh*tNfu%6?7J&
z#;|sE5pN(Y^!B0Fc`cbt@fviUr1`s6!vnf5<Bj<IbWx>y2MVHg?XVpZ(&`ql1~|;1
z9Nm;9^dx&Pr+X7pVXdOiG#h?-vQJ3((H`=7z=tZa$)yJovUxmpsnmVF;z$SS+%L=n
zbo`mt;?FAD;8P6Msd|Xd4Ci`2npu7x3UCZ|tsQbX?x^<L`<oe?)Y%99`R2vv4}kvB
zZOaD^2*oiMn0$^gr4Q2(OTk_Lo8N?(rinju0LCe{n>NSZhR<furZ>%g-9ep!{O9hV
zCInMB{2t-F)UY*A^e~(LrvCY|U(eclM~aeex}J2SPZqCY9uz#$M6j6$cNB!j+P*UN
zxzNjBJ^wlK&eQaAAlepP`Zy{}YYLNF5t5zqNw(X+w<O1FtgtmH_US0Gwr4d2eeJCd
zAWm68bL91Ws1^vKUp8LcoFU7|Uf%HQ*QSZ1eU2~!SlNk2pw1sLhWGl!7qfpBn~8;t
zz<Qiapx4|JLPTg1qbN^+I}SVT=yOnS@RXVF<eS68MHWf&SR9dhIy;BId5m?Awn#Ep
zeh}v{^?11BlA_;y+CuaOke?bcgf#6p-=7_Rdv%!@_&BvL=Qv}$z!~2q7W|HX8bN+l
zv*fTG*W(KA@$Oq2EU1T5J^E;gi}Cq9btkzpZ$9L$AKM0dAyklHU4rj)k#5u*6v<)K
zr>%VxcL}6W$V&VH!M$8j&po~HA2*k7_;YZDZ&gJwvv6)EHyU;nkO-ieSzGi8t+<67
z1c0h%$?I5WH}MSeTDZ%#nBL<hh$W5TSr22(S_j<>1e`^CTQ@1ON~|rF)%*WNW@1Oh
zdQ=&-Se;$@>j|KhruxSh030^Pb<2dN!w$KoGr!%l(c&PetpP-WNYKF>Sf<#fr2qPI
zwW!GR8Yw=m?Ijp|nPl5MclODk!G3Y3KJY`?Na1Fn)4=az3^LRCg-0x?8XFpeUPa)}
zFl}qCE~Yeb7no3eScw%z+v>Z;KqK)^aoTtYP5*hp_8=?-%|&EEnpqRflEM+ygiD64
zhBb~X))L$%z^;b2`kMn?Bnz7^#aup)*kal6z~}|DjosomO%cA2CSUNu39ASq-_G<L
zFF*tZ60$i_c(EdyQ#v{g1iMe$z7e(eHhB{YVk_GHaagzC9CCZB>Xbd59e1o+j3(BC
zwZs@K{!sK=9sQt0ZbYiPSa2v{v1rbO;A->t#)EI$UA~~?Wwq?Pkf&#HPrHY|sdL-s
zJ4&xM#cf#uZ?_V$9v~oidDb{JN!SOY;xrYq+sC!;XF}|i5-3V@o<+ymIVk`6AP{n9
zm2XzINZ^UtMtaoD6XlH6hHQdb3wh@-4zCURg3gT1x(52P@;3X|_@PQ|Hy!+xEUpJ!
z+7Uv$P42kCkEEO5ODG?WFjmDkSCGtA7D~j{lDZ;M<tPlk<9Hg_mo&FumJN;7g;$GL
zw4SbP$V{6q>orOtKdNVin}~-j{Co#Y<muWszuDoiZ_N=_GT?#xezAGm92n@-;-M&6
ze8$Of^UZO(Fw1*KvN(*7=&R!|<0ikU4wWtAxYS_Z?XF~$7C>3$HVWB8sA}zOzfo#y
ze7L(VK$dug2&d*J1+a1#1sxchffAcLd)<!{-g+O1?JD(ExS`d(Bd%Ch8|_1jOw?x;
z=B2t<3{@Nks2M=g409|92fM-ei1_B|WpxmZ$Tv$7o!xN{GCdOrC68$V$f$Pem2tql
zDz_RL!q=HcNy&W~>%4CB-D|*IotSkIZ!b><;+}4oCCm`(+c5!wJ$w2kh^GzPrI$xi
zu1K{sgHs~mCSbKq?Y<@@AQO1nXi6&I@e+DMQ#p-Td6<Tp>c|a2#G7EEe8rlqH~DSl
zOU(u;IRWU?Yl3W#)4$HE-Tu@tfe&p-yd`wEC1q5@l(7;R3HZM{w2x2_Uo4M56_Q@C
zX-2s#K<2-)nFnQWgz^7WiT2PutPw%z0y@426z(=ro_B89&m69UscVJCY>;OJ1xtOD
z<T>T)+~$Z3+Z|312m)86+h7-e3oX6rXe>8VaZv`0hMVYW6S4kGIg}RX51y|+-`)vI
zfzL)<gD<{Kss~B0VwW1NB0`y&WE%~c3pBI8M?xx7e>y${q0ZjiQ>k(Bk)UG!_<kRI
zO@I(#6^;x!no0?wO~c`3?%cIXQ{%;Y7=X36@l@RQ^I8Z^vVtFj2MgFEcrTxs6Jj!9
zd<>~nWNrd@T5X{^Iwz1=tRJ6+kQi^;Xm%lUxS+@>4RRh^eGjVFU}^w$-bzl+D3pBN
zenyPHkj0XVX0?BG@*F2AvW(ZNE|J>j*DH~JA<?!+<)i{79NcA%mNz+C4rk&&vcx9a
z!(~o7>0Feu1uJ`YHqLge+w;#lE9sZ6v=%p{i0NnB!WYgTiDJ@tpJRqilVw*p>Opp`
zjP?=M7=Hw*7z@!2<UYvF*;;LRy)}Q>XF*ZS8H;@@UO|ySLEr8w=(72lsAne4%#RjC
zx;RWDpEvB~Q+kBDYyie%#8e~W&2TQAR2D)T;jy6kNJ{2LHNNiQ8)*)wu{c=Me<SLF
z1YUAai5L-Jrj5_zHPcj5`!Q}j&Vi)O5k--BR{5+hU}?$0_cWPqQbJ(*1j#fgGHvo~
zwL`#^!-||GN1I2^Cnb;7f8@>Y#`9$nv$}tElI&1jZBh~P{Ml3*f4SCIJ+iqTvOrlB
z^j8AYeDexiC-$}gKc@j1Jkz8%w%zI!fJsG!1UZ_OY2k6J0r<vJV4|JM1qr$91}R*G
zu@&P&fCNm8cr(l#TUX$4pIxtql6IA%FVx<SK1Mp?_pb)IQr6FBke1Y$!KlCa05(oG
zBLIr90Ynhp^X&kIb;slN>YQ;|>mMbl4*Xgn`re)Nr8XUzP98iJl7{<J%z)$s{z4Cx
z_hcb=VWgfdZ`IL@LVx=YGt3$9I7YZuJSV`ZozxgHhbL!|sb;v0ATi!oBrO4+-yw+L
z)@0{gR8!l+utO{qrNCjf$Z&j>i3}@ybCa0*u}=`ymicbq0@bUYGkTodqZ%RV!iTQ*
zUa!Xzj*tw~VFQ&h1O7duOr{J023j1^-;jQMna^C8QU=$I+|_|k-x=g1&cc-qBa^h8
z`ggz1Sx3(f1e_)v4~m_OZhz+DwtAYvm?KuQH@yEs<T1lOzwkqhf0^;zRh$5whVUjl
z|4WK#E^?@}q<OJ6yW0d$yF~&=t+8Y9X#~CYD7l@J!yBD8Y1@F;2DRq>uk#S;93(Q(
zEJTrFfSO#ccXjD;x)H>-*XwSR$4neS7aDmC^$#bMY(kJ{2ijE4)EIT9SVxS!m&{i}
zy?)vzIyj_8?bwgQ>jDeZq9ugKX@J-GS&k)p*yLQB(ytZP6B6tdwQf4-d=*pOaKt?;
z2hRPRoz}{3tJy9X!rn#i^Ph11T;DHt=M4hJ`IFpe>D-2%s6ES0uoTG~eKLRJMo5y5
zDyvJGap4mBb+7NfjF-TmI)1>9n~?Q@pQ!v7vXu5R$59sA5)Y2W7TR0DMyfLjzIc4s
zvq6sR`(j=?U%GDbnrD(&cI8GVs_7^8jWdakATUpuR&GqVh6Z*LWH&%^*(vMn><e}j
zaxXmlw>oPC`45(b{`2l@R!QG20Xn}g^x5_1lSjY5o}YoDU?7MOmYWvh8^BS?M@qR7
zmZ~l+@Z91!P?JP`(>9D|DlKpQz+GldnLxt+Lz1?6|0jP}`thpw`o(0sX2{daIhp4;
zAq9cu>sKIq289x_-mPJY_4udyz0!+KX!#V^BEf6Cc)O+4>{Zp|Gf3QZVko_ro^*=~
z%+93cNgRK0V-@z(LJp&5ik?7hZSbdQJVdl4v}6|JBWf|-ts^Vl?ICnHs7A_dn2V<P
zW<BHF?)_69AfwC#a+Mk$9pIKR>G){#DgnrCr}^yp$%4r^8wcwj4eHq2L*+^H=q{)@
zb{GAyL^m2AJLLEt&k(By5scL3Y)OzaX)HTH84|bnOjX+a4}oWSLJYqSuz?{VIXQjI
zhJv1c<U%}f^QB^CW#z0f6l#5wGe2p*)<LEQQpqsEgQRPpmdBIN@Hn^lcw4_uY-wxN
zqUu&vR}lq{TV3aC0%LVK40xF)9rO}D?*c6Z0F2t>8tVRMRi*2(r89!77%;=%1HQwy
zzO!f?t7W>{%mWoZ;&sNE+shIPgI6l-QE`D`r#2eM0h-AyuOEGCdJoT(@*?OvMO?5R
zwasEnS4E(&T;5MYR|l4`f%eh5D-|U|3LaV*pp#&y3u}t8vSiyYBc^c*i6)m^M3tnm
zfgI$dZbbBaotG#}%~=-C;G&1Z5jk^B_G`)bg*AnXq33c>7ypGKDBYU6%Sgnh6`o8l
z6=xh}z`r-C7tsSp>&=E|KS<YlK~(jAs?iv#f+(OiO}ekcCH+VOXZo8@hV3P2<<sp<
z)Y9$b$srvvUkD2@bmTpe$}TLhW2Waiixc0Q`VG!lCg7lx@tRD*sJq}uy}*d@N2ugi
zNoaGPw{8-J#bP7!y#QJBe!0k85sI^{IND`JLdqG5xi8;rth`Y%M1PB%3k#_l(jihX
zF-EuS(Yo{2Oz-foiOVA=ZT4oA9u05euPJ<R1l%E^Ql*@xrX`W0&#rGKVE6jf4k8gM
z;!V&^(TBh@rfzwaZ)J^I>s9`?tc<9N0h6-#+2N?-&Cz=<mB|47u_$s2q0HJa2}i8N
zeP`)GZQuJd;P<@EGwb~K)hhK*7Dj9zy(Dhi=>|F|b<rNjnc0d6xZ951R+XL;Vq>v-
zuQS0M1sCPuM@|h5jXi)3wnKpn_$ANQ#D<(i#gF2Hr(q{W>S7H0+_!)L^N^gt5`s0?
z+5t=x)q2Iqp?Krmg{lgIQk?gJgbC;~(Fjv-@2J@$$ECaY^%l=oKL73*^Vv`Ftl_*e
zxU=69I&FypWuOB?Y9ilt2djY2&@OoW9?Ep*b{)j0Wx{x4b_*AjAt&IBL0-XvnjHnl
z$tsr#n+tE!&G{;DQ`m>lz*Gc%C?!E>{1BU2G$PfA|2!xe7f{GN=S2p}43YJ}N@Njq
z5t=Ibvd+f0EVJfgF3U%;`5JuxAx-T~zXJ>t&~f?r-T%#N@L{SUfmKCfc>2LxkNxSg
zo`K5p@^a7V(jm15=V%*FQ(~Lk?g>XYu0Z~nwft#I31hB>^UOyw&v(%l3>1-UvEkG}
zy9Y*-`{jeOosaaLAK&15GV4#Xk@`7m-{>fdBoT<el}bbUUSlOMy(Y!?^_y7q+3TTD
zpq>)}wc$JJ!kdXGQuFTXiJ%zkMRo=~_T#OV=>c3?@ye{1_}te>0&^#@YAH_av*Q9}
z=`Zz0xgG+M!ugAx^@zS}*rB~9aM)BQt4w@_qw07cy3ttRJK|j`7;XRY{)=vvP)nqm
zN_{8kGfdO-1a%zqq%WKOXkC71c~6>u!2|17__>vNVpJuZVAWgogNvM;TrR1x?U3D%
zG~;HpqWw1didz1$AzQEcpE;#4`@*2w<iz?*_uIR2?ws}T)Z&<>{6S>0c!dKyqcLvR
zJK0>_``r8hOQt{LzA<mCJduvOZi1oUcdfjy14?~3DTjHZ{`NxDW{&@f2}XKFLs#B2
z(0}6(<ohPy7$DtoO^@!o>v3VHY}oC^JqoJ&sW4n-AY<P^y)w(h1=>PkJ?2}aZVo+!
zn-Ry%Z#gK9s~U!XGP0NvqdjxaA&%xVq-dPAvP_Vrj&iLTi^~6iWWS5@TlX|-?fSlt
z;@g`CrvrbWMD`Zl9nbBtlsqPL*7lPvCm`peKfnGe@@1@#+TQ)bvz()8x-8dAYyo-M
z!U>YfJ7AM1Kc5~StrOHqV0MnsA=>E9tF(o%CxfO)9h3(6EdS3bUJs|@kUNqB2WV}<
zYAm^~{HCM21)u!ObHJdaqx$r;*9w3Ilp~`cO+QQLhQC(J2{|X2QjnpH0G{2G$0Tv6
z@vT(;g9nP#%T-TW90$2)f(w+xDn1X%|NJ15#Sr{H&B1JilB@t-$eWCHDd}2hX7~g)
zXw;IleLccYT*g3#O+Bb+X&Ec=9+Ur!0kvlM{da>+WryXxl3(ZCQSEe!TDYmJPeDh&
zU4A;caF~RV8l-Ms@$HU4DB|vm2B>`t2E#p&)s_W{cDucHlM(vA(DY5D<)CGRD2o}n
zDVz=0^hMCg!s#@|<;N2~-V^c3PjI9D{5JHH&7045x1ax@yn!E7bb3j;1m6LtM~C9>
zzZ2dt>x;4wHE22G!0urLJzrL$nvz!6Qi?^)Fcn=5DU6Z0UmFtLnV!*8fR#x<v&h;{
zlYEr7!Gu*^BN4x2c8U_gw#HTEh)a7F%2t6KgDn%w*aH&>?r$o(Tp&19v1h)^aoLqM
zqBzD#+z!WM+2rt9r<w)5PTXHJCCgfcqx0{YJxaw8z9fQ*?q>>yQ>J|u2a?IV;a4Qr
z&YVHni{|JIq4TZi-jb0N#CIb?afDT+%YSu0@^G*;iTW*8^5;sUdee$e<G9jnHzBw!
zKNxVKEk=$-jh-t==YI{yK}(yeoI6R>!hv|+8|6Q57&V$4Fa^_<p*#YkN!FHnV}5`2
zsW?T-?2pOt1oMD5KAcxFak{ix+K9&sX#N9Nj%xod5BVoe9#9+zP76{S=KBY<NIYO+
zgFmZxj8buAQKyojPe}MN{Z$w_vNjWdDuZZEI7H483ZNB!Bu#|CCX&;o+yTe_B!ZN<
zWX4A-lEpd20LE`lq(;5i=9T-{P4$5|@@^PyAC3ZIzvhsta~mpI&I}U``Hy((ZS20U
z%v5dq{uNiJ6lxC;G0iwMB$F$9ugHom4n8KxE@+M{zpyRAqoJQj<+}TXLlM@14$$+p
z4nDggt?GOf#x0Bt7sL4`(dA>H{CN(}^@FZ(f9LjFdA#?RZB*_aGli>UU|VP%wV~)Z
z$x&3+ERIaapU5GcF2xU^<?^{|CP}?wb$~3-r$oJ5QEsieX)DZecQ>Wv(gZ(R-;h@P
z95)gy9Q8>IT}PMVj>GIvP>=u`+c(>}4jVjufuW^CaH-`Om3k@Vym<0an1tO=ibgw;
zi*prx@JFoII@oi48iF4vu{O49NdcasTJ_4Uej^B7<c1)7n4_wOlptN?pp1SsO?6g7
zx6>2%JFp)`If+40d&WtpGfQ>5--xB?D%Bk0W7Zyp4o=`ZXpLEGPQ`D9mZI->EN&y;
zGX~!LkaWQmZ--@`d~VE<c4XrOoMi$<kxQ%-WT<6o#$k)eAT%y=pN4}yAA7r;_!}3M
z)pWzo7K-Xpb+C=1-og=OIfVW4hF!CCO96V39t2^)ChMX>tNi^@#$k$d?;ChliE{yK
z<y|CYXg5&Awm<`C*5CdU&z242N@Vj=IARE8W_HQUs6l(Jo#WlsC=|a}533>R6T8l|
zCoHvh{BAhQj}eBO{+Ucc(t_iZOXrLkyHM89tjFdZMpD8TJH7$!iWpacgaq=XHUtIn
z`{X=cBfZZpDRDap2Gk<7x5&*Gx5%bbTy}`cN{h<!Xhd5ZgJ?7i+4%m`*&5<ZoW3^5
zSnLm<z*|(@NsO;yHNf$h7?DBs%KEJZb2#QWd}nW~(DFmxRO%Tq^UtZiME%Ctd_}%q
zENpV-6O_N_4`X&k1s0_t_-*s2YJ|(WY8dKK9~wk5g*;mSK5To1vhi@lEf8h(F5=?=
z^%%^^H~dNDm9IWxVMYbzje>8R)4sA<ohrT3&ph-&KUd8;;9DN=*T^i?)9j1wgMn;v
zR2>RPBGnnWxjuba@RR7ip8n8w{C<2%J~h&Leto%Lh`gq_labV>jS0JsHc~{Iy20T&
z%(}|@Bp#P8w=kSK4`aF8&v7BNuCN7dBAd>}cM#bSts9L5NtmFt)jaiH;v&d4o7<cu
z(k?9at7PvzRG;WVE16XwBZy*VcG)Ra)p&1)ECLuZ!Z9PLuUc}U5GRL`m}%!<jF?Nd
z`Cb2fKPFmS=0=jDe4bkb4igiNAteJDSBX=O0mDf(6oGvYBsfF7&-dgi<-p79>sKh3
zmzR?#$HzT5F&PUoP}I;ou500r;P%W0q=>OsX{&e6P4#Qk)fP#g_!EX<SV@nMO$445
z8CI{W5Ep@W;5FloHwsbcJAH;(b4~ASs$!DDj=FI+Mt&OvPuyK>ntV{_<Wn(3ANrAb
zVc2D52F2FXaj~&1=NzJ>R+1*>3%RO_sw(lKJRUkIvv9_&t2K7w(sPN9FjL(#!U^@+
zNiU&co^=$*>5h>lWdYCPxAThF^7lk5`km~V8F%^jFPlLfEH&D<t+QJMME;g|0g8Dy
z-sZVV`Q_JeEfKmW3@wG#8fwl92hcx`J~qyomZP9A=(VL=ZNv%1n1z*%M^%NP{}b*}
zBmK&a$-?;5N=}Y>yBDJv1UevSK#QqrijPFPADuhf&-<}@qTD7_+K(mA1pGEt!ITmO
z<qFf@hRl;jp%dN3v4HtYT~S0`mxLGs!el)ICIr-3M(ZA-wSlJ<t8PJz`>J|xvN<g~
zIma^{#uMj6ej!`P4`?=OGtadoypxbXGl}(fc}$5z0$R7ojBxq}N)<y(!h$VkW3`5n
z-MFifqFIT8Dbyp&w4)t&2kfD8^oC*CKFi(C^gIO<+F4AX$N{<2g`#}ORZ{jFmdpk>
ziHJm54(iRTvF>}SxIr*`YQ2_^CHSen=zGBW(2^>ete~zT#NDq5dml&V8%MkAL_9MQ
zR@xXdle-A&JBW1cvL6a1yfQXuWCs2>H|X1ZzP!=dvb&xhH@^i3v1Vt&)D^piW<9`0
zgm6q4R^!&7g<kl6JZl!2oE43cKV{c+bjYp~IFkO~9jlHf>WEaaqUEKKHDlbPFXa2p
z@OctpYkmhhZFF<#-x8s-?sXag^4pF85d+v3Ob_(sAt#sgv_5dKPx?-$0>~{+<Gp>I
z7p#jyZd{2+V_6?wQs6B&Vnt=V4|T*}te)ig)7sbM%ss&<=9#m0D)W+UZld<~J~yu7
zYY4LqigqNv#%Mpge<PSn9(Xaotg+cK8tA+X8KhPFkvHS)sN!icw9hP0#shO_DF5j4
zzMfk9%Udi7^zqT3b^|cfGS^q58@9<!drHy1bTABeX{Pis@yk};kh9-oet%b-g&b(5
zGOYp2PS+(>M%JRJ%A0LI=gIxkd76?Yby4d21~(xeN|_{GpIZyQJz4sZz)*%`$A&m}
z_v&<lIxcvh&hf_DSQd@E?|MKL-f4-)A|OR>v9L4KHQB7~!7pn^SlnWdYS6Ha5tpL3
zY&N&&d&sk^t6i0qm9{J)5SFKco}QlLR_<cpI8%=34*;xUtr4<~-<31FU4YpqOdy#+
zGE0dLco&kdfMVVEoqKHLL{9X9wpli0_H%`VNrf5nLx@rML8rAeqr>=j`C!C}orJK&
zQrxH>CR_>Rf$82=03m3=@TK)7T>5ptbezjkI=^WTcz87-#*~(~Ei7N#N5$d8tsMe=
z<}H~qz~nLiAfEsnM^8g_7O0UT0^rH05ePeIlBn`?c6;yRqxL!wC|X9zixyWQFlrDO
z;+f?e^bLwIvV&D^IR4GE2k1quilR_|^%VNQf>ilsqBsZO@Db?+T5Z4XQGWji`mT%r
zVa;*zh5s~Ud!#J>1L&k6<A2v;tNr*70^|FO#s3Q_{vnY6KM4NywS4ElM$TsbYyV%j
zTK@M<{C6N24us>6W~{#SQX`Dv_=YbB(Dmk}SNXv3_YtZ34&_OTk^uLutWGf9%P%>T
zzpkODj_YSnA4~U70D$j`hx(Y7s^00OhPoD>s)jlU6~LR1_NxvTr19^kx{89Pe4VUC
G`2PUm4c<%u

diff --git a/application/palemoon/themes/osx/panel-expander-closed.png b/application/palemoon/themes/osx/panel-expander-closed.png
deleted file mode 100644
index f0e97b22e161028728a92d5032d7ecd6cfc343f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 155
zcmeAS@N?(olHy`uVBq!ia0vp^oIuRR!2%?ApR4f$Qc0dJjv*Y;$rsjK+_`?{IR>^_
znhs^WhwGmnaJ@Et>t6|pEq~YOvFrU>&oiZZ<?HRI9xka|_1E+NQ~lC|r~VtqZu}7Y
zeDnSMtI3c5`v@pY{M#&3^fA8blAInx*vWtQAJ}WVurjcyE8g{&{{97M8-u5-pUXO@
GgeCwu-9MiI

diff --git a/application/palemoon/themes/osx/panel-expander-closed@2x.png b/application/palemoon/themes/osx/panel-expander-closed@2x.png
deleted file mode 100644
index 0e7ded50f4143b22ec7ecbd831f33b07f8d3a339..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 362
zcmV-w0hRuVP)<h;3K|Lk000e1NJLTq000sI000aK1ONa4#Tz9z0003oNkl<Z7#VfJ
zJxc-s00!Xq?ou(&Lmf^X1kq|Rlc=UFAqomAGa`iW6O;%EH4wThhiq)n22*TvkQS$Q
z|3O=8bEAv<TTxI_Jr8K5N;g%?l<)&3%2es5N-MlY^wC9c`IL5w_(GBPl>&O`qVFwY
z<n-6jL>--2k_tt<qevx|L<e;={k4%3bPXf3mnc9J+u1$J6ev*6?}%+^C<HHt5xN1;
z^Rn*Ik%KPXl{RRhrMhZpLPvf|dtIXkA1KiGwB@QG1<llGg<E0sEp((^mFG?RDBu$%
z&J3cq65=?Quazt4IC2yRQBG6DHyRjtI5Zt2hBC@HkWU`>8Q=uQ(a2CEA*Hd6T|@Rh
z&LEBWjgwrcW{{LpHwn(ujK5LgQa*E*;38%Gj}C@7M;pex0osjr2JJ-x4*&oF07*qo
IM6N<$g0z^D<NyEw

diff --git a/application/palemoon/themes/osx/panel-expander-open.png b/application/palemoon/themes/osx/panel-expander-open.png
deleted file mode 100644
index e3febf4ffb85360ef5245b5563c3799f4b7da59f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 155
zcmeAS@N?(olHy`uVBq!ia0vp^oIuRR!2%?ApR4f$Qc0dJjv*Yf$q5Y1yqsq%r49+0
z&A9T!^yZs_gB87M>>&Z&S5x+#-uOsu`D3@sTOtlN9h3EQm*)C++FZm!&iEAz*URUT
zb57*{&_8$JL%hxYgO6J3<PO&_{m=LRsY2SH>CBs^GU%GfIbJqe_5f%bgQu&X%Q~lo
FCICvgI_dxb

diff --git a/application/palemoon/themes/osx/panel-expander-open@2x.png b/application/palemoon/themes/osx/panel-expander-open@2x.png
deleted file mode 100644
index 391337030cd9eef9b0deb9509653bc3d5d8e2c20..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 356
zcmV-q0h|7bP)<h;3K|Lk000e1NJLTq000sI000aK1ONa4#Tz9z0003iNkl<Z7*}=A
zze@rE0LAg=o#&}}bvNWt1`UZ|77Ev3(%2Fjh{74B`Ge4NDnjnEYzZ4ADi9;0S_9XX
zX8(cy0RIgCfY($g<#+xJ?*UU$q=#;bm>mUbF>|{_mBMVYuz!SC;Voxy{$EB1m3&rs
zhJ}{!beyD*j=#ivwktm39ET|2QtG#N=$&G8(0#ilKfpr4-&i(LL~HK;PN#c<Q67Yq
zE^HX;$uKj_sHZr<h0+~_DgO}H=bCl{3u(Fbo@IpVA8DV7EbPVWuT@F_=o|%>u3#f2
zmHK&Z(nS|HUUE_yDcCFRQGia2{h=l-?7`?18KV~f=wY-|gn=aNP;=}@u#6sRs5Gk7
zsr;_=QEyaHK^?td8B`cyf^kNvO&kU_Mj2;<5h~v@1#mNpUWG>h0000<MNUMnLSTYb
CPnNU*

diff --git a/application/palemoon/themes/osx/panel-plus-sign.png b/application/palemoon/themes/osx/panel-plus-sign.png
deleted file mode 100644
index 375601e680c3d68bafc38496fa22fdc7eab9c77c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 212
zcmeAS@N?(olHy`uVBq!ia0vp^96-#;!3HGxgLCzO)ND@|#}J9|<RAb4+cWdLe);n5
z)oa)G_3IpKI8s<pSZJA_nOVuZys4p~VKE;c-}3+w2}#M=(y}r;Q6Zrs1x3Zg^n`>5
zj_&TqFJHTM?RjZwX}-aY+qdVlaJ}p9>$^8`=FFX%s;a5n0Uzc3{m&n6YipZ+(Cu(R
zP0gQaD^{$?^+;Ng$HC2g`_;pT8~K+jH|E{U&&sOeTFx|M;|U1{<1d?wx7MfI0iDU<
M>FVdQ&MBb@0KbA%&;S4c

diff --git a/application/palemoon/themes/osx/permissions/aboutPermissions.css b/application/palemoon/themes/osx/permissions/aboutPermissions.css
deleted file mode 100644
index 4886da2be9..0000000000
--- a/application/palemoon/themes/osx/permissions/aboutPermissions.css
+++ /dev/null
@@ -1,153 +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/. */
-
-@import url("chrome://global/skin/inContentUI.css");
-
-/* header */
-
-#permissions-pagetitle {
-  font-size: 200%;
-  font-weight: bold;
-  padding-bottom: 0.5em;
-}
-
-/* content box */
-#permissions-content {
-  height: 100%;
-}
-
-/* sites box */
-
-#sites-box {
-  padding: 10px;
-  width: 25em;
-}
-
-#sites-filter {
-  margin: 0;
-}
-
-#sites-list {
-  -moz-appearance: none;
-  border: 1px solid rgba(0, 0, 0, 0.32);
-  background-color: rgba(255, 255, 255, 0.4);
-  margin: 5px 0 0 0;
-}
-
-.site {
-  padding: 4px;
-  border-bottom: 1px solid ThreeDLightShadow;
-}
-
-.site-favicon {
-  height: 16px;
-  width: 16px;
-  margin-inline-end: 4px;
-  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
-}
-
-#all-sites-item > .site-container > .site-favicon {
-  list-style-image: none;
-}
-
-/* permissions box */
-
-#permissions-box {
-  padding-top: 10px;
-  overflow-y: auto;
-}
-
-#site-description {
-  font-size: 125%;
-  margin-inline-start: 6px; /* to match button margin */
-}
-
-#site-label {
-  font-weight: bold;
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-#defaults-description {
-  font-size: 125%;
-  font-weight: bold;
-  margin-inline-start: 6px;
-}
-
-.pref-item {
-  margin-bottom: 10px;
-}
-
-.pref-icon {
-  width: 36px;
-  height: 36px;
-  margin-inline-end: 10px;
-}
-
-.pref-icon[type="password"] {
-  list-style-image: url(chrome://mozapps/skin/passwordmgr/key-64.png);
-}
-.pref-icon[type="image"] {
-  list-style-image: url(chrome://global/skin/icons/question-64.png);
-}
-.pref-icon[type="popup"] {
-  list-style-image: url(chrome://global/skin/icons/question-64.png);
-}
-.pref-icon[type="cookie"] {
-  list-style-image: url(chrome://global/skin/icons/question-64.png);
-}
-.pref-icon[type="desktop-notification"] {
-  list-style-image: url(chrome://browser/skin/web-notifications-icon.svg);
-}
-.pref-icon[type="install"] {
-  list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png);
-}
-.pref-icon[type="geo"] {
-  list-style-image: url(chrome://browser/skin/Geolocation-64.png);
-}
-.pref-icon[type="plugins"] {
-  list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric.png);
-}
-
-.pref-title {
-  font-size: 125%;
-  margin-bottom: 0;
-  font-weight: bold;
-  margin-right: 0;
-  padding-right: 0;
-}
-
-.pref-default {
-  margin-left: 0.5em;
-  padding-left: 0;
-}
-
-.pref-set-default {
-  visibility: collapse;
-}
-
-.pref-menulist {
-  margin-left: 6px;
-  margin-right: 6px;
-  min-width: 10em; /* native menulists ellipsize their longest entries by default on many themes */
-}
-
-.plugins-label {
-  margin-right: 0;
-  padding-right: 0;
-}
-
-.plugins-vulnerable {
-  margin-left: 0;
-  padding-left: 0;
-  margin-right: 0;
-  padding-right: 0;
-}
-
-.plugins-default {
-  margin-left: 0.5em;
-  padding-left: 0;
-  margin-right: 1em;
-  padding-right: 0;
-}
diff --git a/application/palemoon/themes/osx/places/allBookmarks.png b/application/palemoon/themes/osx/places/allBookmarks.png
deleted file mode 100644
index d1abe8192be1066773089d07df18a18cf402ce9f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 673
zcmV;S0$%-zP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!LrFwIRCwBqQ%h?TQ5632nAFhJNDPfu
z!4#v2_=<w~SSfYuLO~FBiVOdMRjLc2Ygg{XjT_yFi{e7iA{a#!6|13$TH|9vOhRLV
z$;{k)XU22xG%bnG1844?x#xSFdy<gv`^aTSvjEOh4pZX5xmX(i3Lo#To_TvRO5hy5
z-ncY5x#8g0SQ7scrfK3<aeRdLQOawnR4RXAVj^-j{S=>S#lM0R(G2!xPNQ5eDNSI+
zjCE^sBav7N*t2stHrcD-dTwvJE*vHF{^g6;<Q{OPuL+}4NC-iPiVG!_t9~WWB>Y{$
z?nq7Os(>KO4=E+3f}|ozN{WaqOXBjyh+dggb;(KDV?x<SprlI$0zx@x%nRI`ilh8>
zJs#XipxK~v6{JVXis~0z&;)`HSzY4QGY{9VWHB(9MSLiQ!gLz<r%E_->J3IWTN)^Y
z>~$a{+14!xY|F=R?8Is;OJrfhgZ1d~47O}HbbH*pW7~hY16muM3RYykAQUnXjtuBE
zIb6bgyR03uvSnMnEwCl+fD{~IqgrnwzvCnJ?f;HPg(RxA7DiSEV^jpR9jEUOv;%j6
zz`@pCH4MfcqyFPF4jo>DmQ};IrUU-jGtjY}#TKGVQ&4mlQah-KIV%1Dj{x;nna1X6
zbq;pGB7H3cm&hZuiGcqpti}Wk<~<Mqc#Q8$GaVwB?Q22lX|MwZ_zNWc(Qdchsy)52
zaI<W72_6m^%OOKv`1xJapP8LQDEu4bQWT%uu9)4Ip8^a3>A1gJ(rvx(00000NkvXX
Hu0mjf_?#~P

diff --git a/application/palemoon/themes/osx/places/bookmark.png b/application/palemoon/themes/osx/places/bookmark.png
deleted file mode 100644
index 2e9a206347873920ddd70fac6c74b9786fc1c6cd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1779
zcmV<P1`PR$P)<h;3K|Lk000e1NJLTq001xm000mO1^@s6P_F#3000KMNkl<Zc-oa#
zX-t%75dPfH+IXjJys9x?wKX=1Qo*B5T8~<7YdmUfTB}rAE7qtejfx1Xpx^-%H7W>N
z0Z}YMp&;UNxyoS?SdN8d*%OdsVefAbFlIWlB4Gn~{CJYtnP-ycdH0=nKIZi4)BPee
zG?WPs55I|s#&|$p`Cg_kym?Gb&^V?cZt+cZ?4szJV`C`Shv)V2OEHN5J-eO1iQP)^
zK)ilMojG%ciHL}B%gM<Bfj|HlyI}6M4OAW+$|$4ex#<f%L07O16p?dXF!x3V{5P;O
zZiKj}#s$t#!Fb9W83+ptV-gY)1S*vZlu9LBzkWS!fPbOi)2}@-foV-&o5{(-!7L4f
zmb5j=wa3R(?R5?C0yeTf@)EvOTI?smcn{@X%K)A9*|TTeii(QBWHN!#XoSMTLZ^RW
zAOoU(Jf`aKNJbg$>ZUIX0<QJ01G>^<pu9ZarRwkq;=Iy;|2lSN!g05Buq6W__UOE{
zBWu}duQEX5S-kVEX=!P>4Gj%ox7!_{I3*?J9@U7`yN5*81de4SCnquW;WJp(m4&XF
z{Jr-~>VJXLRXJc%rGh4JPbSr*VbfVj$Rz6NBZmJS%L`b~P7Bz;9+Lg%FMDC2uJEuF
za|ftK947-P%Iosw%c+TpiS_B}=}=Hm05X}(ar&K|odk+0=co|}xss@;s8sCrR7SaY
zwWfWO+L5=VUiauA7^=^Mxe-rZTML}AiGXnpm>V)3HR5#SZkDv9ew`}6H0KxoI(7wr
zJ?n!AKelm5LR`T7OliSk8E{Dex<CMZ5Kv4xsu2gdq11!DUobH-F)iig<<QjB1nuqZ
zU@#cKVzJQ4_ZXm<a#Yi3G>(6ytgH;sxUxBEMH5%C2W*X3!PcG&R(&N{j4H60G{Bj4
z1dQ7#M>XOgHwHM-ZfLr-v>ruVl;r;*GpjF}!FU6Dpb0?uJx4nqde=;<3#QsUAL@-@
zP{@|z;$o9lt924R5Qx*!(E&IkdhGo{acPc=PPkQTZMX(DeF<1iD3ogl3ui>r9D!oW
zIchfDBe1Hkg6{rLn(FXbF1{;yv-xY;zv^=LD?l3y&~)&nAdV!*TaG<f4z1wLW&mJ>
zNF>^ZVmLhESBlr`^-xk$VydX9@W9^T)qbNG98gzX;XZ?<ISZ^tB?{Jci?<LccI2!E
zIar=#g6`p7Ek3g@-7m|~L(6&d_-ojBS)R8VG|>PGpMF8LI>Bxwa^nsy<5B-GngKE~
zvb3~xhgdAOavV3H0jgD1RdHmPj8m@&pT_DVqZ##8_eJ{hQ)ZjC9BiBhtX2!c+6@kK
zZD8vt1$|ktK^3#Wm5g@}B1=Mim-F2C-?E8M)e%oY?gt>*;|v8Kx>SF5A?F4eCgapg
zFV71Tqwe3opMuw8Km#-*`T6-b$uRa%Z_o2737N=f1luoITXMn9wSdjWA*|0~HDj(B
ztjz+@WNizT1iw$lNqlb;!~IvY-r|3LR)Hb}pkk*pl&7KM@6B@mRqQS@+}*?Ue*2k>
zj0_<T>3{~>+S&l0*lgrdkJBEYMWwmtk!fqmf=*5ac58<dC}(?e2iop#POS|Z*WVs^
zD_}Jn+?caV17cr*lI;MMJ}7?Q^SH(j)PkL@$O$BFpFMz!ipkE-Zl=XWVr@1XT^Rz!
zlyltwtgI{<ah(_0Ag1orWJV|aP2H)<fKFotbQ-F`u6+!4-D8R|Cjxt08ff!9#dWwd
z`ZK^^#l~}`2W?Qx2apDVw!qtDDE2W^3^hl9V&p_4cW@sA=gyrQLED!E(=aO(3c$Ij
z$Kh7d=LF@<W-~l|_^=DPLwXyaD<q5fV1)6J7d&l?2m6y-V6MS8zsR>-SL`P?*Iod7
zb0R!#jRRxRubuVb(}y@+A;f{tc%wts4bLI*E!jJC8G-JV0V~;P#MP{jCDrZuyA037
z{?GVdv3K^l4;n^2PFE;0GIIWd2M<6lm(#*hq0plM@CjmpP$&#Ra}8t)=LC>Di+Xwt
z_zY&`=RR`LKiCQu+zHy8AH|Kai#MTAhR_(l#6yeAi)wn|7LY~E{7|%iu+x|4k!9?x
zD_&C{Wd$!02Ykt1^IOVWgZXy}e#_X6n2Qsf{In+0b7CRZraKv+4>jDdGjHF%EhMod
z8Zq|#`ST0`<MCZxT?<kCsidSNA<oKVCj<Lg1_yIuW8C88hS)_O(lb-&n+X3I)={Gu
zM;bbn#hND?OO~9NFa~Q*27Eu~O+=9)Bo=?aLqm;tn?UjJbD8(h<R;=EcP#Z#@Bdo(
V<;Y<h_VWM$002ovPDHLkV1imlQndg8

diff --git a/application/palemoon/themes/osx/places/bookmarksMenu.png b/application/palemoon/themes/osx/places/bookmarksMenu.png
deleted file mode 100644
index c27bd6a6fe58d4e8c492fb4973bed581b10e4442..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 353
zcmV-n0iOPeP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz14%?dRCwBA{Qv(y10{e3#&A!2jn$-`
zvqTvQ8o<cN=wuoG7^?!HTqF*?FM+P##|ZKQNYVH2-<Of%bWTprD4^cuEXaaURdX5Y
zGyE8~u35|=E-uahGF(VVhyiFgm=+ZkWl&aD25CmP5ZMJFg+$tp>4Gm`zA(Ig{hBBP
zKrX?E1s)zA24-evqFsPt00<;EFJoxU31Ha1VI_lrfB=J_pdeT=$ZOA@Jp=pS+}s>B
zmWE*%bmj*!?Ao#p#sBZ$zX$U{bW~Ins%g;76#3-IlZQaX|B1mMwIDs<@Ph`T15iMc
z#EkeHsP_OPEIR`Y;ROW+k($2%^?e3000ImEJ=v_smI=eu00000NkvXXu0mjfF<y-n

diff --git a/application/palemoon/themes/osx/places/bookmarksToolbar.png b/application/palemoon/themes/osx/places/bookmarksToolbar.png
deleted file mode 100644
index 2047bffe5464843e5d6ad56768a83f6b6d601f8d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 524
zcmV+n0`vWeP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005gNkl<ZILoC|
z&r2IY6#iyrH!De$LPZd)0ozNHv;`3_){`fXN)bf#572W@z4hLsKR`TtvzHvi(z8E6
zrJw<o929%2nq3XaCfTI(O`M3gRv&!qW9Pl^eeb;)kw|vpIVSN;b2NrE(i*Y<%&ltV
zNs!GSA1z5KJs|{$X0zFnC#CTT>o*z=6QjT3+jM501YWIHBOV1a=;wX`uA?yeKGja<
z8O_ti4+$g>qbO=uW}s3IR)3r#<_L^rU$xKb^|~QvJab8)DwPVtFl<Q^3fDmir@xE1
z>`FuEyxi^?GX33nk@OIcDcDw->)1`ODs6r-heD|XPR{_m)S&tI?cf(`o7;Gks9<?v
z+*DUeJt$!RR6v<)pQrG3>l}L+fQ%<w!*sJ4eI3V_u|Aai8&lnNU86u+0`^7~x5X=b
zN+$rJTk?bf{i#gSBr~R3ty;x~KvEJ(2p(+g9HSW)@zOsrp#Ob44_k=eM?<uXToD5<
z?;^~k0!+T^HNCDMT;Q<K+LYZ^xm<1!G1C2nx-ZY(ftA^hrb-YLxo=E==*8SnKYZUe
z^6xKM$XuZx(*$qh6W#@fa72Q*cDgn6<RJbrnYXH>@rMMsyA7WF8vg>qJ@<%!#0gpe
O0000<MNUMnLSTYHl<f5Y

diff --git a/application/palemoon/themes/osx/places/bookmarksToolbar@2x.png b/application/palemoon/themes/osx/places/bookmarksToolbar@2x.png
deleted file mode 100644
index dd458981e276b8144fd2db789f8e637857f51990..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1179
zcmbW#`CHNl90zb7oQ3D(nVg1Bw;}qhr|VgVr3<H&nIKtDZA&l=o1__e7FrWYpAJY(
zw5XxzuoNOu1QZ2Dl*1E5Xj&?*ty*SlT2Hy{yZ(f|p3m{i=cmu}u1HRb_i~53gFqlJ
zd;*RLZ1jH(aRDYySUCtR7$fd5BPBb7kx$O0f?|(nQ>bV>oqU2yq>_&po*t&|1cAWr
z$%&*m;Ml{{>;IL0XvknN@OX86KHra2?N6%mC*Srb{}e!J45W7lo{|NgQm>;3g7SKU
z^7?`b^g)HgK};)@E{0}HpiC>QKnW{U!AeG97slcHa^dF{@DdfA{RqKSAy~bLaub3*
zf?(Sam!=UFGl<IzNTw3W(jd$Gkn92E)p^tv1L}$q#TiF&oG8u{6!$TTJBQ-_8qA#t
zzVX}o`e*1{^JxA8`p%1x#>G%VerVH6OjaW{tMSX6s!h4o(Jb+9Rx6=^M=Y#6RCM!5
zUe)(ZKDqctPQ`7;Wx?61ru>@bqFT{8UQ3yv^O8`0rMZhEkZ>C$+$JfvMR~osv%0Oj
zM$}$=SHZil7IqCZD|D@Lbz57TSS*%EB=-S|Ua3_2;K76T_I8;}*3r??+1V+V%ew%*
zdWAxv1Zam;DphxPcMm{2s0Qc^YMrqcFfi2D*Qe2Fv|4R{fB(S1fKI0y930f^fyWOG
z4-W&+HyVv5lgVs0kBp3r0wyNM#>U106CX`}WU*Q-7OT}dH8o|k*`}wb?RLAv;h343
znVXxNpPye?Sa3R>HD|s$0i*%SASR`NAa2Ouu<(e;s118?1S08lF2BL)Tw20Vk$ymO
zT=2M95)`J>L|;oJL)Sch|BiPiBX7Ef17TH)Qo|5BKVQD#+St3e2m*E$47cM*q6FOU
zJ9gwP-`ckLe%EN!o1>M_!GG`eJ*&Y_Ppq0gb?5kiNPFEw3;_{KIpIb<ChcTpSyeI-
z{YfV1j|<p6UzlVvpD@V&&s-12-i^SsV^U}^FfAO?6z2MjW{&Tm-G%d_CyTfJ)nrT*
z%7eYlZU;}y2>qS?9`+uzmwx*`8!krb=4;q&!HoATuI}GTvT3)w!UM+OsTvq#dFcs-
z`O1!M_{Ng8<uNTQH1osj%t-1k{rElc(QjwT($de76F$!b2TJO*`GIfNm(z+@;=x(o
z@jjfi*&_9%3QD<0Ppt*}RX68Ygu;Z`*0m4U#0VZO&K{;haPG*kh(xE2sg7pv_Fl>U
z2eQ>>DFd_WBKsM#^~;CypZ<VxDNXgfy746c=c_Guh_CcZ5C05T`Z{V$T|{(G8f9nO
z*%!YY@H%oXVRCOwh;R9ZYNm7UwZp1Axv8~{LPn(in4X5uP|}?rbUhv4m8{mSIvmO>
zKNlp%+~?_dx%`$MWyGo`gUro@gC5AJ^BcEJtxM1J^STbBL>)a=o0CCoJT^M<oQtI<
zv)76^7r9%D^Ji|#6$-0&hFzuI+#~QWCJG-CHTa=)0^co3TmN>2>5}y{$<?%2x*doN
N2p^Y(6Mvm{@n4|`IR*d#

diff --git a/application/palemoon/themes/osx/places/calendar.png b/application/palemoon/themes/osx/places/calendar.png
deleted file mode 100644
index 1855c9f507f4794b9fc392c1700ca07f963c0ece..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 614
zcmV-s0-61ZP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!2uVaiRCwB?Q$1)DQ4pRx4k2Q#MmP~I
z5-mK)j}Vh0212gUQc|U{v#_uc1d}2th+Ltd!KAy+CMhIEPKY^3Asz-Ih?U5(f*=xO
z?l#`OeeaF)^EM`63UOfeeY~A-=9}5s+=sb`2!|LVJF0s<{XX1(`(CcVffoio!M|GL
z^(i?e0ep!8QVUZrk3e;F3!syz|LOoFMzJw4wKWXYqpL!3XKu)um#1f~9;&yx2zz?V
z?g9>{5ATCHj$vC_|BQ#3b%=>Yj1A&;2l0E1__dAL{E7H<evLyQ@3;cl<~Mb=+M5WH
z+3Vm)*jgiku9-4eD){bw1Sjs7!4M@)m6vzc|8+?9@e0`ReO_H#5E55hE<Xc9l+>g;
zL~Auu>3HakNTY*AsmMk8OGP0w>0Iw=C9?u!Re=qFW#iql%rBG8fsKtOoP418ZG98Y
zSF#qe1VKS2HS4H$bzbmp+<_NEkEC*IJBBC4J92Ns3<{iSzijrtl47oOaj*wc##FFx
z;<C2JaiMVDB<VrfjO!owrd?ZHhu(_b|7b?giXvdHvsnwIK&nxqr7Mqx)ZU5VdC#=q
z)=nE{kKL36drO3W7O7xJ8^0X7bXJE$cw~G)hQ@u5O=@-aLU&P@6nQZ*d`3#JFt-A{
z51f@3%ZJlZkf(c3YtDD_H~ND=Z;mhj$9@Yi0O3ZMSR`QizW@LL07*qoM6N<$f>u`&
AQ~&?~

diff --git a/application/palemoon/themes/osx/places/downloads.png b/application/palemoon/themes/osx/places/downloads.png
deleted file mode 100644
index 0756cb6806dd77f905f97344937c7bebe8fbbfba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 678
zcmV;X0$KfuP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!NJ&INRCwB?Q%z_SQ4pTDyUE711>2-5
zLbZY(1gk_MrFsy(2_jPbgHn&;!6<m`K|B<1B1Ev~N)aoT-t<%rQfgOivDlNM#Rgk7
zsbHJU?!G_Yyza&{)RP0V`{sKy-^`nNk4P!uf5gI1zIYi(9XNb%awfLd%#hf+Eg1m)
z%s=$!j&((Tm^arkyiTA&1zb}A%E<nGnR6%3!}jD3ZGU%{Vf5wbfuX^P_W1|JpZ75#
zsjEQ8*OkC+0Zs8O@YVaM?Y8(f;0Xa>{^JNTsv;C7I8=oTOmc1OwZbT4a#I3mfVmJ5
zsDOYoZ3l#FY@?7m0)3#rER3scf+`ZKZCoQ3_`K#ML;tXe66&W(Ev$gm2yjg;zDa&X
zKveeKed#Zx6FToE+X1!$7&|TSm=9H@C~*itv=~6Td1=ob<x^1=EWl!JgzVB4cow~B
zri@2@CokHm<}{eZf(7>zc%14~gs;NYgI9oeaaj7j3{MJAeNhxQYL(;{`{DNB_^I@v
z)L75qY{HLKLCB3wGl&6pkbtS#cV6jzx%bw<*=M<qhhRiQC=IPXUvhq&E=*5Xq-TQ9
zm^wnBHBb#itl&5m^g&<Q&<hf(*>u4^-qzhZmOYYb@vW-fj8PkA-p;vYXQkJD>`&mN
z!@M%OTSllBo#)>?@TSVvuQRDsI)Q_jeKWUKda-iJ8xLO9rr2<SNkpL3R@!W4jUM}G
zB9FNL+PlsjF{##T*mJxpN=3s9sFC0sOd?76M{&bo{L?5HH~t7P0D^rIGn}>e`v3p{
M07*qoM6N<$f^%9tk^lez

diff --git a/application/palemoon/themes/osx/places/editBookmark.png b/application/palemoon/themes/osx/places/editBookmark.png
deleted file mode 100644
index fbca0523df169b6892d2b5050035152fb6b92606..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1642
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

diff --git a/application/palemoon/themes/osx/places/editBookmarkOverlay.css b/application/palemoon/themes/osx/places/editBookmarkOverlay.css
deleted file mode 100644
index cc749c1152..0000000000
--- a/application/palemoon/themes/osx/places/editBookmarkOverlay.css
+++ /dev/null
@@ -1,105 +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/. */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
-
-/**** folder menulist ****/
-.folder-icon > .menulist-label-box > .menulist-icon,
-.folder-icon > .menu-iconic-left > .menu-iconic-icon {
-  width: 16px;
-  height: 16px;
-}
-
-.folder-icon > .menu-iconic-left {
-  display: -moz-box;
-}
-
-.folder-icon {
-  list-style-image: url("chrome://global/skin/tree/folder.png") !important;
-}
-
-@media (min-resolution: 2dppx) {
-  .folder-icon {
-    list-style-image: url("chrome://global/skin/tree/folder@2x.png") !important;
-  }
-}
-
-.menulist-icon {
-  margin: 0 !important;
-}
-
-/**** expanders ****/
-
-.expander-up,
-.expander-down {
-  -moz-appearance: none;
-  margin: 0;
-  margin-left: 8px;
-  padding: 0;
-  min-width: 0;
-}
-
-.expander-up {
-  list-style-image: url("chrome://browser/skin/places/expander-open.png");
-}
-
-.expander-down {
-  list-style-image: url("chrome://browser/skin/places/expander-closed.png");
-}
-
-.expander-down:hover:active {
-  list-style-image: url("chrome://browser/skin/places/expander-closed-active.png");
-}
-
-.expander-up:hover:active {
-  list-style-image: url("chrome://browser/skin/places/expander-open-active.png");
-}
-
-#editBookmarkPanelContent {
-  min-width: 23em;
-}
-
-#editBMPanel_folderTree {
-  margin: 6px 4px 0 4px;
-}
-
-/* Hide the value column of the tag autocomplete popup
- * leaving only the comment column visible. This is
- * so that only the tag being edited is shown in the
- * popup.
- */
-#editBMPanel_tagsField #treecolAutoCompleteValue {
-  visibility: collapse;
-}
-
-
-/* ----- BOOKMARK PANEL DROPDOWN MENU ITEMS ----- */
-
-#editBMPanel_folderMenuList[selectedIndex="0"],
-#editBMPanel_toolbarFolderItem {
-  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png") !important;  
-}
-
-#editBMPanel_folderMenuList[selectedIndex="1"],
-#editBMPanel_bmRootItem {
-  list-style-image: url("chrome://browser/skin/places/bookmarksMenu.png") !important;  
-}
-
-#editBMPanel_folderMenuList[selectedIndex="2"],
-#editBMPanel_unfiledRootItem {
-  list-style-image: url("chrome://browser/skin/places/unfiledBookmarks.png") !important;  
-}
-
-@media (min-resolution: 2dppx) {
-  #editBMPanel_folderMenuList[selectedIndex="0"],
-  #editBMPanel_toolbarFolderItem {
-    list-style-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png") !important;
-  }
-
-  #editBMPanel_folderMenuList[selectedIndex="2"],
-  #editBMPanel_unfiledRootItem {
-    list-style-image: url("chrome://browser/skin/places/unfiledBookmarks@2x.png") !important;
-  }
-}
diff --git a/application/palemoon/themes/osx/places/expander-closed-active.png b/application/palemoon/themes/osx/places/expander-closed-active.png
deleted file mode 100644
index 7ef5f04f9ea9aec76eb9bee7af5aaa2c74a3fb01..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1329
zcmV-11<v}3P)<h;3K|Lk000e1NJLTq000;O000*V1^@s65h0H)00004XF*Lt007q5
z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$!%0LzRCwBA
zWB>w}q%Qvd{}~Q`d;d)L|NnnX3`l^H0YCVU#AasU_{k+CyLtEQ+;AZG-+!Q?009Kj
z&+L-izfW6N*UrPqih-St1;b!QMu<U-$Oit$wCK&dPYhdj9{lt8;k{Y=7nJ4#E%*lz
zKp@jNzJGjf>FJWq@E2&~g(rU*K7IdB&<DuoGXWKe@Gvo`iSskqSQ@h|yn4nPC|m@@
zKLG*=WC8o1-#=K{SQ!~ELJenx>SBc2zz88woc|vt075|g>hnJakmp4Nxf%Zc`^^KC
zWCK|M5I~^tW&x@C3uJu!4l<YtVmL5d7@2_><UD4GFe8WtV@5C=EDywBF97k2&;J=%
z5HZLMA^-vi9^hbC0!;xM05lw|jtLP=|DihmqX*qTARDCaKO@+YXi>ue5I`(2#Y{jK
zFad)J<QPU6h6W82vVn|{Ac2|<<U=?hF^~foncx8m1^@vBw%|WV5hKLwNIqsbvUW1V
zqid&tmNR3-_P@V>8D!Lr80^Cffr$fX#y^OKjEtyC0Rjl>ga6<#X9oEK5(QvyE9zS@
zTs^W8XC6@0vt(dm0qO>Z%|B37{exJ*z=*H|Ab^-)sRCpmNHH@Iv#>#EMO{+{+t5rz
zkRf3U-*^UP11p9<fBrN428PeKAHWp&^Do2C-~SkX{QC6|W&uC|K_VIGKak5=SRko|
znF$gnpfI)Y3S)S7`#i(FOD7oqfr8=Re+FS0O$G_0Fowr3z5|ma16UlChd@E~o%;{N
z&u>5BaSaea5Far82PZdXRtN_9gq4+n;SbQT_n-bS==$U{FtZDQUCYGE!C)Ct0+eTB
zU;$z_C}v@0W?%)TQD!F8NB{^Rco2caK|TN_nQuS-F+6+oi{a(F-(WU3pAdt6bQ#!J
z=KkpnLK3nJY-|vNS=k_tVg+FqMo4NziUWWEVu2?(purzL{bl(2^)EOt038H0gb^Ix
zpp+%AW5S^C9KxVw;|Vqdl;A-@^6wu=&3|wN|Ai$`MnrA^2q3TpfByVq`10i+!`JWs
zz%F57W<<mVG>?E1flX)z+&!R@k_ni(fJG()Gf@3+P_+L24^QGS01!Z63w{EF0VKx8
z0?GOygIRz+V1X46j1WIFLbLQgpbJ5zIy0z<`O657Xof$KOa{tJ|B-?SAb_An#Xqn?
zps-{C<p-cBE64}1G6<xQ1>r1E&@lXi1`iX=aG)MgNHhKi=PMWh2q1V-0SXpTZYGA0
ze;|glLJbF5!ieT=W>C;DgK{%a{2xUBA0S%{REGX$L@BBO0tjpY3oFMTpf_1mg%}y`
ze+H)IKM;dKK4F5CfuJH6QDOu6e}QWLGC>RmdYnO!6PUC485pkJ{0#Ih>ra>k009Kj
z_lKQZ;>w2Y+YN%e-57L4SRgKk8jS3ECTKwi3xL1>AbfBJ1kx|xeqcCs?BpL-R<7e9
zX^<L#00L>{7L-)clvFd>_T%$&k-xuxFd|A*c-g{$Tv7jnRcZg>6xbp*PX2$KJW|&$
z?p@#q6nY9wX+Hr1h!I-M3jnbc5DPLOLW5KQvIi72Z-DqY5Pt#H$p8Vwh!j+upz4zW
n)v=@kV9YT5fMRf~0wBNu(gkh+k|I`<00000NkvXXu0mjf(9$K;

diff --git a/application/palemoon/themes/osx/places/expander-closed.png b/application/palemoon/themes/osx/places/expander-closed.png
deleted file mode 100644
index 7850c9e9510b196e7b34398d2c028a457c901418..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 837
zcmV-L1G@Z)P)<h;3K|Lk000e1NJLTq000;O000*V1^@s65h0H)00004XF*Lt007q5
z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!*GWV{RCwBA
zWB`Jmo*n@{KE5Mw-n`NL_wOGQ1DSx0jqR7HsOYxD#Kd4A_uv2j{}})R2qextXU?3X
z$B!TX|NHmv|CE5wpFjWKzJ2?jsZ*!U0Gi7LvH&1}Sbz+Uw{PE?nwy)0UGe?<cLtzE
zB)guSot=S)hljzyz<~Mk<;&hcAyy#%2@pUa3)p}C`o+q~$Vj%~An^0&PX>?~TwGiX
zK=ZgjAqEl#2q2IJEHFiX{`>(eA{PJ+2I~jLBRJ?m1V8|R4TlOaz#@fQfTSPJ00<x!
zWC==Kk8H``zklI;fB<5_=kn>(r!$;BeVT!pnHfV4WQd`mAwzC%E<T?y00a<<1x!q+
zS-`@=f?>;+EjV2Zl1JAAibrG%00M{!J&2I8iHQkAYHBK0!((D%7|hJfz^M*|zkT}#
z#?Ykx2c`}nfS8aY85;-=4rVYlH3d5Yqz)7`ii(O1&d$yZuU@@kc=zrd7y~mI7=zS&
z`SJyx)&T+t#R6p4gS-y%E>JN;e0)4O6M+l|76%NOnVH~t0jWX9PykOY00D#&fFOfG
zF8%T22iR2~K70VP1q1{bva_?n^0Be83{p~3SPchZ^ppq?KrFBn0RmsYeg)@dxa~+0
z2rL2^e0_bvL4zK#=qU&}k^uq;ZUIOTl-==Z1_c$7c>(SXfB<5Fl_S`aDK!8<0KxMC
zEMh4EApOuFg8Kj<fKW0Ts3ZhMD!G80n;V`NU;rS1SfDol1X{ulQUJ0HR4S4RI5;>M
zI5{~PUcP(@;=)}C5I`Uc{s1jFyL0DGD;F0R23}rXvVHLB(<cUC&G;LbXbytX4oD0j
zfIwlzEh8hNVQg%?5tu}!fDul1kqQjr-$0*SSigRK1d#g_7#cqT0*Db>F$e&$6c7tS
zeMOEXpojz|$2UOy9EiUFE%*lzK#WL1#R;lD(Q`M6;14wXf52K5009O7Gh2ejfzj5Q
P00000NkvXXu0mjfLdQsv

diff --git a/application/palemoon/themes/osx/places/expander-open-active.png b/application/palemoon/themes/osx/places/expander-open-active.png
deleted file mode 100644
index 673ead568d21bf9fb2d3ff1d729d8326541740e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1329
zcmV-11<v}3P)<h;3K|Lk000e1NJLTq000;O000*V1^@s65h0H)00004XF*Lt007q5
z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$!%0LzRCwBA
zWB>w}q%Qvd{}~Q`d;d)L|NnnX3`l^H0YCVU#AasU_{k+CyLtEQ+;AZG-+!Q?009Kj
z&+L-izfW6N*UrPqih-St1;b!QMu<U-$Oit$wCK&dPYhdj9{lt8;k{Y=7nJ4#E%*lz
zKp@jNzJGjf>FJWq@E2&~g(rU*K7IdB&<DuoGXWKe@Gvo`iSskqSQ@h|yn4nPC|m@@
zKLG*=WC8o1-#=K{SQ!~ELJenx>SBc2zz88woc|vt075|g>hnJakmp4Nxf%Zc`^^KC
zWCK|M5I~^tW&x@C3uJu!4l<YtVmL5d7@2_><UD4GFe8WtV@5C=EDywBF97k2&;J=%
z5HZLMA^-vi9^hbC0!;xM05lw|jtLP=|DihmqX*qTARDCaKO@+YXi>ue5I{^Y#Y{jK
zFad*!3F<0F79bmJArk{L5VHdDsjYK>V*kN>7G{VXNIgssGt|e7NcIB+5ZHqMjQ_zx
zOi)EEFbwn`D-eU|XLrvsTspX#;nwNx3@ogmBncD;dWi+-C}tLjKCnfMs0jlgfS^A3
z4-Ru?CPsvdKt5oBuz!4i&#-q%CpZ9(Z<xvO`Q1|nW~jknHB3++FhVR~U_{sf5I{_@
zQ~?S{kYbP~7B;A>Kp1Gy{-r$(-#@<tYySP~JHy_^oj?~ueEjFne}><{Wc2L^Fa`en
z%kcB}KZYN_e*J@401!ZsNdEs1oJv4J0iv0iAaMeU)N^}RF+99_3heKH|3LUZ!^4|b
z8MZE&%b?>F4NQ^{aZn!m3k>P++<zE;e)|cJYk&ZP_y8DjU@x*lFvusYz;M2M<rKr-
zWz)f~`t|ES*tP$lZo9UBDZ|S<rx@5+nZTHZl^GacOyFQfjs$=JVu1w_NF3w?kp6Gq
z|1o_1{)gex@gode0utcV!ibiO{{d}!aqAR=ysjm~A87jg_ZONPk>UU#fLP#(8R(Y}
zpZ+p@{rVT27l008unErvhdVPPYJPy(0tyn4j~IcekQo$AumsA8$PEAi1h(MMpMMNr
zzJOf)4;VC%BnpoUXdYoiE@S_JiU**tftd?fWP+3EZ;;pj{)c61H~<JBumwMV`~zFe
z#sW=lOwcqAD;^jjerAMv;UCb2pi-R~RK)yc1V=Q(9|mwH1EsA0NI?V;K+vM%AJ`yJ
z1hath11N)md;lwhKnht9&ieZw;){R(pg#KpDK1z+A<g(7oUdR2Ab?n4VG9ZtQEn!N
zkAEPBvqB9AS;C0sZDvr=Fhe8tA4ESWqQyXE=x;`pq6#2@z!tEua{K{$lSNgCk>UPl
zU|RkIF&N|%CP*0wDsmB#4CMa>s`<+VF&OA^20=~+21R~g^1b;P=v&sGFbe<z2&C^1
zJGaD@4coUH1bMqL=!mdDTn;rD+4Ug$|9?bE`uh*U2WLPa{qpSxhC|0r{$XY1Iu4Qs
zsR0NekXCL%Nfk{=HIr>WK0g=v`}+qYxWIy?I7r#TfR>0Lw)}@vV2ju|`Tue9NL|0U
zcYz;J=qWIz{R9XgMrbiF0K`&2EXaTe4N?Kf9#GJ{0pjOC`~_4e0|XEwQc!V%s!s+~
n$C3(wF~jf!iovZ4fB*vk{nvi;!|I_m00000NkvXXu0mjfixE5#

diff --git a/application/palemoon/themes/osx/places/expander-open.png b/application/palemoon/themes/osx/places/expander-open.png
deleted file mode 100644
index 76553571d9744faf08b3ca6548eb1ee429fa9cc8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 818
zcmV-21I_%2P)<h;3K|Lk000e1NJLTq000;O000*V1^@s65h0H)00004XF*Lt007q5
z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!#7RU!RCwBA
zWB`Jmo*n@{KE5Mw-n`NL_wOGQ1DSx0jqR7HsOYxD#Kd4A_uv2j{}})R2qextXU?3X
z$B!TX|NHmv|CE5wpFjWKzJ2?jsZ*!U0Gi7LvH&1}Sbz+Uw{PE?nwy)0UGe?<cLtzE
zB)guSot=S)hljzyz<~Mk<;&hcAyy#%2@pUa3)p}C`o+q~$Vj%~An^0&PX>?~TwGiX
zK=ZgjAqEl#2q2IJEHFiX{`>(eA{PJ+2I~jLBRJ?m1V8|R4TlOaz#@fQfTSPJ00<x^
zWC@V%`0%`W^T3Y5rv?Q6{{0KL6d-_@h;{k-^XD1XuV2rwYu7GPe8K<_KqwY4F)?Aq
zA3uI%=<V$VtD8G_F2nQZ&vB{+sX?{?Ab^MpqW=DVhWGE^!;>+{GMGM4ssrI~-@bt{
zRLvil1pooWgdEA(z}mHI8BU)*4K@s<4ivt?bj~ns+BAk&uU;{{d-o2Eftd`9L2ABy
z`2tVt00D$z0kW$>-aU2d6vK=eGr%qcC1H@^AhjUN)~#Cyju-SGf&zG22M8b*WY@yd
zFeuZ2g5tn|0}Q~j1z95;fYe>MaDl<p)RY0;3}gThKrG0~>g(69V1r>GB_)Ndynr0Z
z009KI03--<IX2glVF}zD00G1TD@S0-l-d9wfLLJOf<-JP04X29eE<+ZEXer)R1*I9
z@q=s&xVgFEc>x9h0*D1_^G~29>>vdo%Rr?fseprngMpKili}sdmmn_Ol>h+*vfvNU
zg0nk!?zD1oabe))<t5t(pFVwJ0M?AZfr;iIDD8m600IaUR@^c&G8)Fl#v6f2R0<g3
zWLF5lApQ;X$pv7c7y;xy1%}2?fB<5IRty3_ECs}ZP+yT_2`C~#$?**kKL_G3Knwl>
w1P~)qP;r8)PgwCmCinvl{~xec1weoS0A>@TalLnur2qf`07*qoM6N<$f)Wy5t^fc4

diff --git a/application/palemoon/themes/osx/places/folderDropArrow.png b/application/palemoon/themes/osx/places/folderDropArrow.png
deleted file mode 100644
index 8d722ccd5e6e62e89c00097c32d17ace829e4d0a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 201
zcmeAS@N?(olHy`uVBq!ia0vp^>_E)L!2%>N9qnlYQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>Jin2Xj978ywlP}Cluetqd*HzQiua9lt`podp^{;oN_Sq+v
zKdC#v_J66Qgv7tu$IkTK6Wa7>za}%wpX+CHT8j@bc^Mp=_Mc-zYvaMkS9|}<JAAmx
z%f>&UX+pO3|NC`?J&G*Lt|mW@VPR)Eqaebd7jIs8fITn~Xf1=MtDnm{r-UW|hfGh?

diff --git a/application/palemoon/themes/osx/places/folderDropArrow@2x.png b/application/palemoon/themes/osx/places/folderDropArrow@2x.png
deleted file mode 100644
index 9efb6d95d8b33ac99aa364126b568b954fe01960..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 443
zcmV;s0Yv_ZP)<h;3K|Lk000e1NJLTq000gE000yS1ONa47YxLw0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzT}ebiR47wz&^s(-0ThSv?{aZnuj>&r
z))>VQf{etYu$6*@*xW?ICJe^JBxqHLLZLyY(+Gux(8**wg<7K!ugFBaLZR70vdQ`@
zgqgwj>&~gpL8kKMQQ0RR705)EZ<<{;SWmLSj(7e#8<}V2-ep!;OtRu#y70*a<h$(f
z&k!ZVAcKS$^UR)issaER3hcYi6a)0q%YZYr?<ydJx0J5ht^TZWT-=O_&3@I%B#|-|
zTnIDD=t5YH$|N<}YKcao5w*zXYjPA+P=(*D092%+)QL@iHrhY=Ni{i8eDp`(bb63m
z3i&x*hiCei>iDw6r2s4%{4?=e{Y|*Oub86|3rx!Bsb77#(c_z^yVf;+@dFbe13!IT
z+s|=b>FPP&y~A%R`FMmy6~iNY|4&{{BQe5MV<pZpu&HBwF}4(Al6q_mk}}Ani4a3H
llb5;zNW-Cq8XVHzN3Xn=u=mUC%ohLv002ovPDHLkV1hHG%8&p6

diff --git a/application/palemoon/themes/osx/places/history.png b/application/palemoon/themes/osx/places/history.png
deleted file mode 100644
index e5a00b56d38ca5af9b9d912e6ee2121ebfc90bbf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 843
zcmV-R1GM~!P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0009LNkl<Zc-mc)
zTTGH+7{^)KrI)qUeO<P-uG?yJ^FrBjMV?QnXh15NXU%4%PF)ADa<g375=BtK6CjFb
zO)^D1;|ULlf`XvH_Zd&m`^~xZ+kShWJ@5bdzt8s`SO9Q=%>38akRU{e6rLeC%U!#y
zKM!8y75gE<rB&4xQ+k8e;W#p%o}N+!5|bR6Lk%0bdci=HTjYntDY{gRG)=pGJ|FB`
zZLnlqfrTX_n0GDU_ITm=_{1acR5qeEp46NhWaJdGyVM$~4?nx(2viy^G|5__t-XUl
zV$Ah{*|G-?r^|;XEm#x67^G$8UoR=Is-kdZhtml%xdN1G4One9aJgLI^?I3ZR6QDK
zk+(A@yL<bdqLQ+Yq?RSj%nQ*?P7VIWwtEMLNHG>sK+&gQn4Kddfyt@Vz0f~20()rK
z-P1e97v->70#VM(gM&l!q1_H*X$!7q1viR46b%xojEn@5Bb_jsy?ra_XXh-*{EPzD
zvy7~AilW?$%SMp4%E4}TfCt5dx9>{NV}#71Mgi+46D+T+dg4<A)vT1X%nD+lH_SnE
ziyYl;xZ@N<a0nX`xQUQoPzVj;CfG4s7|q&-iJXo%HYxQJD_JPYwb~AL=N1;>r$k1a
z!FhZFCm!zwNY1#r#%Oje7Wk$6ZHr3ay<sKs(?dtcCq@^SmZ4MG1B#Ar*xoUN({&6d
zZV!RPB*)D44~}3bX86(2G#MVljbm|BpWnzXDE_>@Ve*bo=s<#JE^qIIMZ7?!&20jS
zG1mpsHU(^MZNcpPJk1lPe}BY@xW!zgc%I;?SRzx7P3U|>W8>tApuV9A#LY5>di;NN
zpBC0|^NcI2zRC~P+9#2*ygPUAU11F3lKK8fTFsX_rAFKD9T*;g=@|pe;5{(R&%^5a
zI<f(O^m@9q@_ipCGVay=hk*eX9#d>$sy`B*Cd&R+Q(HIPrszD-^!3vNL&J2pN^^)g
zJvT)lejFane-IcHaQQW!6T?lp8J)lj!wo76i;Dk>tJQKMVk@yQi5<$hP1^on{|{sR
V@W4oA(0l*@002ovPDHLkV1m;SkPrX>

diff --git a/application/palemoon/themes/osx/places/history@2x.png b/application/palemoon/themes/osx/places/history@2x.png
deleted file mode 100644
index 684b374ff5732cfa75ec8d81201874eaaef679a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1872
zcmV-W2e0^vP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000LUNkl<Zc-p0x
zSxl5y6vs!~m-ewQP1C2QX`7}#^{EfGPfgRr+Eh^s2+9oGFbuMY$SR;{T+$R|7X$&>
zQITbaeHjKAMNniB6l6d^0Rd&$Mg~vM|E8Zx1O=JoA3p9q=l8$M`R?425z%`U5FGY3
zYd6b>by(7gQ)m34H`@?{SmdmS{T}1cFIe_0-(%qse#NDl_`d#!I+MvXvb?;!ME`&A
zj5hQk2C>LNE*KjgfPc`jEv)S<-_YYH{cqoCFE*RaGqlbRVv&PfFu($HJp+LGN31_t
zM{@ECqUPr2#wGBQ#X<{<W}2Owr{|{G6+#>O5F>q%n^$l(8Z0oue&+y=28L{5{l)UD
z*EM8G%M9?d=QA`p{fzGQ-lv+ndb(D4ow9RsDK{^lii%6nhCaj~7CF-PSik}kY<R3a
zfPmm%SpJ-l^O8SHOBR}X_M9drr>OmI2W4jGP<%onB_&^^Y<|9S^%`Bda+NZ(veAY<
z#2^+qB6n#?%;6=NV8dh80dUoP$@0(4&W*vS7Zw+3Y~m>mk3OctqGF1RPXJuZl=qkJ
z_x005;~@1t9H5^256~w1vN#5@$U*Md_ymCkCfM+R*INVNO>ztgJ$`I<c5Y&Rex61+
zdFatFmRZcKs;Zj0@Ac5|$S6%tO_OPMmc|)w;{C@n+R%p>#3Bc|V1NZC*zkbYiUIf@
z4g7``)N-p;Yc{{2q2Uo4<iu;&iv&ooZ=`|2A)4a-T{N398=;n#7P{BdBmIv)#2^+q
z$OQu|!36tOYnv8c@O(W0zW|${;Lxyzg@qXe_751TvDrW|v2j$(%Zgc`uq+mfFp`wV
z1z1>ExS|a)h(!+XI~ZUICfMv@f){(*iUAxx;{ORNxKvY?H8nj=y$|}to?c8zrTl^`
z*ke)IT#yW3UZJS-(G(pM`&K(*k%Qa<E>y6<1REaOvhpnU41u@I$M@*>tgr`t{jCV-
z;yu*y@|};4p&K__L=i16E@EbH>G+8g6c!e~Y9Dft%iD@Uf+^VWfEPUBE%WyE`;`?w
zJUlvnx1)=oYlTH()V=&(PfbnZRa#YEUf!hkIJ9Oza__TY>ZLTnl=$$1C%k1|hmTmX
zP7DkVF17Ki1YJr?r$R0s?BmRgiC(-|T2*p|BiZh^TeBazU|cUM7EFl`FL=UR=IP^W
z9}pCBx}&R`Zt`+L7m|{xvbu&wpN!FrX%?p%Yf)%^Vd0hb?A=E@{@5x0THDx?!qJI5
zc~!!~!zm&00##I2iQ=oStrJX%4=;GaTjuF~_+UU_@L2=zcaz};B$BIm0FQY9;}cKU
zl$W=U7{IRGR<!SLYjTh)Nae03-y?n$aq^Tnru(@N@g{*O@!<tec*_oX`Rw!X@;P0n
z(_3`<CW4ZA|FLY3hDT6Hn-UHujYcb&62GpY(E?9+%RD^2e^+~YpDEFnP1e@y2+Auc
z5PQbo@APDBd{e>-q-R_fOo<OKc*0wzKIFBHbuJ?-x2vkAmY_;LN+YA9=}vnGjXoaZ
ztr-6xA-DZ*C(aAOl=$$1C%k3u9-g1F&Yt@>T3gOV1L+#{;vCSFmE%}NF@BJct1Yhp
zOE4uqyx<9MaTKf6hg_Uhp7BMcnz^!yN(6}_jEsz;*0$TI1)j~54GDYScKZ&m<aw|J
z6YOI4fEPSpeHXa7d;H*}bdQdXPr6xNSxu0>$v~I0vhn)x;n695tF22Ia7SmCD7?#=
zS%M{T;Q=r9-1d3^D)knnO6{j`Ri_r0YG*2|Yl+1(Xs6_hsg#_YB4#sS9K_7lG)5m{
za5qRvO`{~_@w3EZwn^@yPK6gdSKJ4bZth>no!nxBLnBIRYU`J4>QJ!_Jd<v|@#Ii!
zTs*!+aN7~bt8s7$s{-K}=ey`DE3e?#1mxhr5e%@v3=WGZQ8>HB!E4nknTt}j(@yS^
z92pbe+|bxakiMyjdU|_F&(GKn94NSGU|*Y>4cy*D6}-1NbP_KlAqKG`r?I)2Bo3Hh
z!(+`mp{vqutE010Y3tye5)+qbXg1tfHr%*L5b9vSXrwkSN{zORa(ECpE7H?5C_ldd
zZ75j8h*&AF$zXU17MRR-g~vOu<u0zuj}IzbR5k~k(!wLol=BSd0G8Cr%ZlYT8V7m#
zAJNdzBN`YmqD}O@8H?QGr_NS_1t!?*`eEYiqTFid;B3W-mkv0oGBb1Y@9|a2j6GhD
z5Q`k-f&mto8~$mw|De;i*7lAktq(Y++bLW#{)vj!6>GFZhL)B&e$AG<y1NO&GuqIH
z7{nq6xi$wJzx&|dhS1MDY_?k2%75CsUmj>}uSjEMNRqp#vY|KI5QA9cAa@f#PT$sV
zyX-#OW$mziw~d268+h-rl?Ot2MjQGNvk|83^B;F^Mq8lGF#ZE_Rn=mqA|HqV0000<
KMNUMnLSTa2xs%oa

diff --git a/application/palemoon/themes/osx/places/libraryToolbar.png b/application/palemoon/themes/osx/places/libraryToolbar.png
deleted file mode 100644
index 2ed627acbf65df90372ff855fb2d4f680893d9b1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2217
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

diff --git a/application/palemoon/themes/osx/places/libraryToolbar.svg b/application/palemoon/themes/osx/places/libraryToolbar.svg
deleted file mode 100644
index 5fcf42ae3a..0000000000
--- a/application/palemoon/themes/osx/places/libraryToolbar.svg
+++ /dev/null
@@ -1,41 +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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="16" viewBox="0 0 48 16">
-  <defs>
-    <linearGradient id="starGradient" x1="24.5" x2="24.5" y1="1081" y2="1121" gradientTransform="matrix(.318 0 0 .317 30.2 -342)" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#f9f3ac"/>
-      <stop offset="1" stop-color="#ffdc46"/>
-    </linearGradient>
-    <linearGradient id="fileGradient" x1="5" x2="5" y1=".842" y2="9.16" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#fff"/>
-      <stop offset="1" stop-color="#e3f1fc"/>
-    </linearGradient>
-  </defs>
-  <g id="file">
-    <use width="100%" height="100%" transform="translate(6 6)" xlink:href="#file-individual"/>
-    <use width="100%" height="100%" transform="translate(4 4)" xlink:href="#file-individual"/>
-    <use width="100%" height="100%" transform="translate(2 2)" xlink:href="#file-individual"/>
-    <g id="file-individual">
-      <path fill="url(#fileGradient)" d="M1 0h8v10H1z"/>
-      <path fill="#9c9c9c" d="M1 0v10h8V0zm1 1h6v8H2z"/>
-    </g>
-  </g>
-  <g id="view">
-    <path fill="#a7dd8c" d="M17 2v1h2V2z"/>
-    <path fill="#eaedf4" d="M20 2v1h7V2zm8 0v1h3V2zm-8 2v1h7V4zm8 0v1h3V4zm-8 2v1h7V6zm8 0v1h3V6zm-8 3v1h7V9zm8 0v1h3V9zm-8 2v1h7v-1zm8 0v1h3v-1zm-8 2v1h7v-1zm8 0v1h3v-1z"/>
-    <path fill-opacity=".3" d="M17 3v1h2V3zm3 0v1h7V3zm8 0v1h3V3zM17 5v1h2V5zm3 0v1h7V5zm8 0v1h3V5zM17 7v1h2V7zm3 0v1h7V7zm8 0v1h3V7zm-11 3v1h2v-1zm3 0v1h7v-1zm8 0v1h3v-1zm-11 2v1h2v-1zm3 0v1h7v-1zm8 0v1h3v-1zm-11 2v1h2v-1zm3 0v1h7v-1zm8 0v1h3v-1z"/>
-    <path fill="#c5a2ec" d="M17 4v1h2V4z"/>
-    <path fill="#ec8e8e" d="M17 6v1h2V6z"/>
-    <path fill="#8ebbec" d="M17 9v1h2V9z"/>
-    <path fill="#a7dd8c" d="M17 11v1h2v-1z"/>
-    <path fill="#fac090" d="M17 13v1h2v-1z"/>
-  </g>
-  <g id="bk-restore">
-    <g id="star">
-      <path fill="url(#starGradient)" d="M34.2 9.73c.213-2.14.213-2.14-.921-3.23-1.66-1.6-1.52-2.14.636-2.41 1.76-.22 1.78-.23 2.61-1.93.488-.992 1.05-1.7 1.34-1.7.293 0 .856.717 1.35 1.72.841 1.71.854 1.72 2.61 1.94 2.15.268 2.28.789.629 2.38-1.13 1.09-1.13 1.09-.921 3.23.251 2.52.023 2.65-2.26 1.32-1.41-.823-1.41-.823-2.81 0-2.28 1.33-2.51 1.2-2.26-1.32z"/>
-      <path fill="#cd9a34" d="M38 0c-.299 0-.462.127-.608.245a2.635 2.635 0 0 0-.405.427 7.3 7.3 0 0 0-.769 1.26c-.396.805-.589 1.13-.738 1.24-.15.111-.468.179-1.3.283-.535.067-.96.148-1.32.287-.357.139-.715.384-.825.8-.11.417.055.788.274 1.12.219.328.53.662.939 1.06.539.519.706.698.767.911.06.213.04.683-.062 1.7-.06.607-.095 1.08-.07 1.47.012.198.037.381.107.566a.995.995 0 0 0 .411.502c.408.238.81.117 1.19-.035.38-.152.808-.391 1.36-.712.67-.391.938-.508 1.05-.508.114 0 .383.117 1.05.508.55.32.981.56 1.36.712.38.152.78.274 1.19.035a.995.995 0 0 0 .411-.502c.071-.185.096-.367.108-.566.025-.397-.01-.867-.07-1.47-.103-1.02-.124-1.49-.062-1.7.06-.213.228-.392.767-.911.407-.392.717-.723.935-1.05.218-.325.386-.693.276-1.11-.11-.416-.467-.657-.822-.794-.355-.137-.78-.217-1.31-.283-.833-.104-1.15-.169-1.3-.281-.15-.111-.343-.437-.743-1.25a7.138 7.138 0 0 0-.776-1.27 2.608 2.608 0 0 0-.405-.429C38.464.136 38.3.007 38 .007zm0 1.24c.042.044.073.07.126.137.192.245.428.627.648 1.07.4.814.612 1.31 1.09 1.66.473.351.997.391 1.83.495.488.06.849.14 1.04.214.194.075.154.1.135.029-.019-.071.014-.014-.122.188s-.401.5-.78.866c-.539.519-.912.86-1.07 1.41-.158.555-.077 1.1.024 2.12.06.589.083 1.03.067 1.29-.004.072-.012.088-.02.128.008-.01.047-.001-.137-.075-.264-.106-.672-.326-1.21-.64-.67-.39-1.07-.662-1.62-.662-.555 0-.954.272-1.62.663-.535.313-.945.533-1.21.639-.184.073-.145.065-.137.075-.008-.04-.016-.056-.02-.128-.017-.26.01-.704.068-1.29.102-1.02.182-1.56.025-2.12-.158-.555-.533-.896-1.07-1.41-.381-.367-.646-.67-.783-.873-.136-.204-.104-.263-.122-.197-.018.066-.054.04.14-.036.197-.076.556-.158 1.05-.219.839-.105 1.36-.146 1.84-.495.475-.349.685-.84 1.08-1.65.218-.442.453-.82.644-1.06.051-.065.082-.089.124-.133z"/>
-    </g>
-    <path fill="#169103" d="M43 6.7c-2.37 0-4.34 1.65-4.85 3.87h2.03c.458-1.13 1.54-1.94 2.82-1.94.692 0 1.23.154 1.77.541l-1.39 2.17H48v-4.65l-1.85 1.08c-.923-.698-2-1.08-3.15-1.08zm-5 4.65V16l1.85-1.08c.923.698 2 1.08 3.15 1.08 2.37 0 4.34-1.65 4.85-3.87h-2.03c-.458 1.13-1.54 1.94-2.82 1.94-.692 0-1.23-.154-1.77-.541l1.39-2.17z"/>
-  </g>
-</svg>
diff --git a/application/palemoon/themes/osx/places/livemark-item.png b/application/palemoon/themes/osx/places/livemark-item.png
deleted file mode 100644
index 9184b95187e8b951069a209a9051a9eceba6e461..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 863
zcmV-l1EBngP)<h;3K|Lk000e1NJLTq001BW000mO1^@s6cL04^0009fNkl<Zc-pO1
zTS!z<6b(rP5kVx2TOx!RN`X?J5<=il^cO@Q{RGxe^;ut0R9a-Iqo#?^G#}+7(-2A!
z60-**q=Z2bzEYbzPtUyWj5@2e2Z?GXHS}Y#&)#>fIcx88II{zTM|Kjsh{HrKk+%WJ
zAy+h_1$Jx&Vju+r2d|+o^($UzYEvLrG@{)O13Bp3yBM15T3%i8U^5V|Xhgdm29BXy
zQ$a(AVfYZRkHZKquM6RdMzp{GSVdEJERpfQ2J+CUDZ{sjfMpcu*TPsGJ&oW@5B!D!
ze_;6!2v;<s{mVc$VP3;SBA<xa*g%J-eBK54+&Y4j#aQ`xo+b_eJv8zv7k=vmyhiXB
zgiB2{1BpZdQB>a8HC*1%X*M-<b~C20Z=h9EUiUma9uIuhFYx#R@G2XEW4C~I4WXVa
z_$(7r4@0=rL^BXeq{+Ih?rB14ZO6ru+IBPJ5cBkZ8)(*)+x;Eh`H^tfq34GX_;3U6
zB?tTy^}u6JqUUHhS6&0cr6%eTnAmk`UB}>qnzqZukDkOASGSyEG&6t6dVF*Pjha$w
z4ol8O_&?pp%D@Srft$AHvZf<2cqyFw$E)G;_#s?sA`EcsiR|<oH*2_8)oi|7+0=cf
zqA`K-y5y{%iEf}yQ!dvm9Lfi$(*cKT37*fLK!pb5^;NhmGYHk~$4c+<Fh{u5L>Lfo
z+;QwUmYe1mn(EEB%WAJMCNqD_dRue@HJWldXW`VR5bDapYDW$nb{hhH1qfAS!R~S+
z(0^9CCT9l1r6$4v$DhJ8AL7^t*m*oRFS=P$GsGCfyo7Z#zb8i;sM3_(F$24mqkWc!
zP-{AD)*o<>wE!j!j=4#AM~cFC!8P>;!lfp{0B?H|C-9D)4zuF~c7BqZn;BD?UtnD>
zWOn33RH-SeeHs?02Ug20tonR-t?P@he|rzzW@CLG_Gzv;8R1eB@er-u{v@7tqO8RP
zJI`c{;~hw3J(J(#BA?>QeG9Jf)@9u`h0Q>?qS>yecsE)z3Sr{gUaF~0fn3pub~_Bj
p5__Z@8R^D<$K;SJ8qsdmz)uUW$2a}EvC#kk002ovPDHLkV1k%7iwOV#

diff --git a/application/palemoon/themes/osx/places/organizer.css b/application/palemoon/themes/osx/places/organizer.css
deleted file mode 100644
index ffcd6c5237..0000000000
--- a/application/palemoon/themes/osx/places/organizer.css
+++ /dev/null
@@ -1,136 +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/. */
-
-:root {
-  --toolbarbutton-image: url("chrome://browser/skin/Toolbar.png");
-  --library-toolbar-image: url("chrome://browser/skin/places/libraryToolbar.png");
-}
-
-
-/* Use SVG for HiDPI 133%+ */
-@media (min-resolution: 1.33dppx) {
-  :root {
-    --toolbarbutton-image: url("chrome://browser/skin/Toolbar.svg");
-    --library-toolbar-image: url("chrome://browser/skin/places/libraryToolbar.svg");
-  }
-}
-
-/* Toolbar */
-#placesToolbar {
-  padding: 3px;
-  padding-inline-end: 6px;
-}
-
-#placesToolbar > toolbarbutton[disabled] > .toolbarbutton-icon {
-  opacity: .4;
-}
-
-#back-button,
-#forward-button {
-  list-style-image: var(--toolbarbutton-image);
-}
-
-#back-button {
-  -moz-image-region: rect(0, 18px, 18px, 0);
-}
-
-#forward-button {
-  -moz-image-region: rect(0, 36px, 18px, 18px);
-}
-
-#back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
-#forward-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
-  transform: scaleX(-1);
-}
-
-/* organize, view and maintenance buttons icons */
-#organizeButton, 
-#viewMenu, 
-#maintenanceButton {
-  list-style-image: var(--library-toolbar-image);
-}
-
-/* organize button */
-#organizeButton {
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-
-/* view button */
-#viewMenu {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-
-/* maintenance button */
-#maintenanceButton {
-  -moz-image-region: rect(0px, 48px, 16px, 32px);
-}
-
-/* Root View */
-#placesView {
-  border-top: 1px solid ThreeDDarkShadow;
-}
-
-/* Info box */
-#detailsDeck {
-  border-top: 1px solid ThreeDShadow;
-  padding: 5px;
-}
-
-#infoBoxExpanderLabel {
-  padding-inline-start: 2px;
-}
-
-#searchFilter {
-  margin: 0;
-}
-
-/**
- * Downloads pane
- */
-
-#clearDownloadsButton > .toolbarbutton-icon {
-  display: none;
-}
-
-#clearDownloadsButton {
-  padding-inline-start: 9px;
-  padding-inline-end: 9px;
-}
-
-/* hover-over/open button highlighting */
-
-#organizeButton,
-#viewMenu, 
-#maintenanceButton,
-#organizeButton,
-#clearDownloadsButton {
-    color: #222;
-    border: 0;
-    border-radius: 10000px;
-    padding: 1px 8px;
-    margin: 0 0 1px;
-}
-
-#back-button,
-#forward-button {
-    color: #222;
-    border: 0;
-    border-radius: 10000px;
-    padding: 1px 1px;
-    margin: 0 0 1px;
-}
-
-#organizeButton:hover,
-#organizeButton[open="true"], 
-#viewMenu:hover,
-#viewMenu[open="true"],
-#maintenanceButton:hover,
-#maintenanceButton[open="true"],
-#organizeButton:hover,
-#organizeButton[open="true"],
-#clearDownloadsButton:hover,
-#back-button:not([disabled]):hover,
-#forward-button:not([disabled]):hover {
-    background-color: rgba(0, 0, 0, .205);
-}
diff --git a/application/palemoon/themes/osx/places/places.css b/application/palemoon/themes/osx/places/places.css
deleted file mode 100644
index b30c56bd85..0000000000
--- a/application/palemoon/themes/osx/places/places.css
+++ /dev/null
@@ -1,146 +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/. */
-
-/* Sidebars */
-.sidebar-placesTree {
-  -moz-appearance: none;
-  border: 0;
-  margin: 0;
-  border-top: 1px solid ThreeDShadow;
-}
-
-.sidebar-placesTreechildren::-moz-tree-cell(leaf) ,
-.sidebar-placesTreechildren::-moz-tree-image(leaf) {
-  cursor: pointer;
-}
-
-.sidebar-placesTreechildren::-moz-tree-cell-text(leaf, hover) {
-  cursor: pointer;
-  text-decoration: underline;
-}
-
-.sidebar-placesTreechildren::-moz-tree-cell(separator) {
-  cursor: default;
-}
-
-/* Trees */
-treechildren::-moz-tree-image(title) {
-  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
-  padding-right: 2px;
-  margin: 0px 2px;
-  width: 16px;
-  height: 16px;
-}
-
-treechildren::-moz-tree-image(title, livemarkItem) {
-  list-style-image: url("chrome://browser/skin/places/livemark-item.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-
-treechildren::-moz-tree-image(title, livemarkItem, visited) {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-
-treechildren::-moz-tree-image(title, separator) {
-  list-style-image: none;
-  width: 0;
-  height: 0;
-}
-
-treechildren::-moz-tree-image(title, container),
-treechildren::-moz-tree-image(title, open) {
-  list-style-image: url("chrome://global/skin/tree/folder.png");
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-treechildren::-moz-tree-image(title, container, livemark) {
-  list-style-image: url("chrome://browser/skin/livemark-folder.png");
-  -moz-image-region: auto;
-}
-
-treechildren::-moz-tree-image(container, OrganizerQuery_AllBookmarks) {
-  list-style-image: url("chrome://browser/skin/places/allBookmarks.png");
-  -moz-image-region: auto;
-}
-
-treechildren::-moz-tree-image(container, OrganizerQuery_BookmarksToolbar) {
-  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png");
-  -moz-image-region: auto;
-}
-
-treechildren::-moz-tree-image(container, OrganizerQuery_BookmarksMenu) {
-  list-style-image: url("chrome://browser/skin/places/bookmarksMenu.png");
-  -moz-image-region: auto;
-}
-
-treechildren::-moz-tree-image(container, OrganizerQuery_UnfiledBookmarks) {
-  list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png");
-  -moz-image-region: auto;
-}
-
-/* query-nodes should be styled even if they're not expandable */
-treechildren::-moz-tree-image(title, query) {
-  list-style-image: url("chrome://browser/skin/places/query.png");
-  -moz-image-region: auto;
-}
-
-treechildren::-moz-tree-image(title, query, tagContainer),
-treechildren::-moz-tree-image(query, OrganizerQuery_Tags) {
-  list-style-image: url("chrome://browser/skin/places/tag.png");
-  -moz-image-region: auto;
-}
-
-treechildren::-moz-tree-image(query, OrganizerQuery_Downloads) {
-  list-style-image: url("chrome://browser/skin/places/downloads.png");
-  -moz-image-region: auto;
-}
-
-/* calendar icon for folders grouping items by date */
-treechildren::-moz-tree-image(title, query, dayContainer) {
-  list-style-image: url("chrome://browser/skin/places/calendar.png");
-  -moz-image-region: auto;
-}
-
-treechildren::-moz-tree-image(title, query, hostContainer) {
-  list-style-image: url("chrome://global/skin/tree/folder.png");
-}
-
-treechildren::-moz-tree-image(title, query, hostContainer, open) {
-  list-style-image: url("chrome://global/skin/tree/folder.png");
-}
-
-treechildren::-moz-tree-image(title, query, OrganizerQuery_History) {
-  list-style-image: url("chrome://browser/skin/places/history.png");
-}
-
-/* We want some queries to look like ordinary folders. This must come
-   after the (title, query) selector, or it would get overridden. */
-
-treechildren::-moz-tree-image(title, query, folder),
-treechildren::-moz-tree-image(title, query, folder, open) {
-  list-style-image: url("chrome://global/skin/tree/folder.png");
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-treechildren::-moz-tree-image(cutting) {
-  opacity: 0.5;
-}
-
-treechildren::-moz-tree-cell-text(cutting) {
-  opacity: 0.7;
-}
-
-/* Browser Sidebars */
-
-/* Default button vert. margins are 1px/2px, and this can cause misalignment */
-#viewButton {
-  margin-top: 2px;
-  margin-bottom: 2px;
-}
-
-#viewButton > .button-box > .button-menu-dropmarker {
-  height: auto;
-  width: auto;
-  margin-inline-end: -3px;
-}
diff --git a/application/palemoon/themes/osx/places/query.png b/application/palemoon/themes/osx/places/query.png
deleted file mode 100644
index 0ccb8470256d32b201cfb508c7276310b7d7e46b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 549
zcmV+=0^0qFP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz$4Nv%RCwB?Q_C*{K^*>VcTu7QO&a2r
zxOmhfk~VRXN+c4FPENw1{tE{O4*miT#LY!qaB}EPQ0m|&LDNW6>bcs^?#}F*N4r~T
zQ^F>*nfbooe81;NmSw?zK85|l^BY@);DusBmX+<zou$QJ39!qdQ0N;GiA0#-&jQr@
zDbiGUeS7>yAng<8W>+ib=c#WwQ>gdg@=CaboSGR1D07`d`MRyI?FM-Y>BlT+8nKN`
z(*l=Eg7cFkKL^HIZOjh6%H`C+&`mHj6GS~MI6k@uNs^$W%fqq5y<1@2nw;*Y#T6o!
zSyV)w3TV0$K~HZJAcR4#7GB!A>cQ<+027lgVM9!j2Di|tabX?o-$42)1K1!iIO64t
z?HR_nf*r~kP6W9e1BG;ZX9Hl}f{cM7aj$YLqhgywIg+0f$q_)v5$N}OAr?(hLkw3J
zDLXB9tpY=SAH2RG5xT2bfU4^GE<7Yucur?&&Q-Q(ja%jz<78RXMUsk&$Z}$xC=lZl
zoxBT|=OTj9fRA?}mCOLaq;!;-cf&AkFcJUYv(h)v%+K+=cP?D+-Eo0v?6~}_URQnx
nb+wJaGHGY~KfdPdmjD9*$A{ukNh|z>00000NkvXXu0mjfQMC8L

diff --git a/application/palemoon/themes/osx/places/query@2x.png b/application/palemoon/themes/osx/places/query@2x.png
deleted file mode 100644
index 20b458aaca5ec3f06510c9d12ea1ffb70a48fe67..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1055
zcmV+)1mOFLP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000B#Nkl<Zc-qaD
z-%p!W7{_~Qyf&HPLa)72W7HV0jFQ<b=yZmamX@{yx_01fVMrLX9l?PcTf3DN${1}a
zY_wFml!3rNSmuu@kxUTSU>j^kjC$jL@b!64@}7{iFDr9^7oWG!d(Ly7&$ov(L1Q(v
z?JEDP09s<5Kn^SuuRqlQQl2~i5HCH=0AQk>^N*$0nNUJ35YPU{00B*2-fR2`CK8%|
zEa8qhI2|$WXCi$5Nnp3eVhCu7^#dPxQBu^3CeKh#G}I>X$^J&rxhI01?ABQHfpr2V
zT`P_si=)Y%&Kd6Ka|a5%TZWzN<^W)R`hFdY^MCIM>{7fk0B!6f8v~pNbL+d`@$K|)
zn7aNDlVfY!0?%d#yA-bsaC7RBU}AJNXWo9Rh}p^+>B$IiWAc$;d}LLX6YdxSzG3;U
zEA%q*z4gmMxa-54&5#}$z)TNjdg7sA?An8@G<tfmH~$C<_Bm1QY=^$kjY>zCK(BMd
zb+nE4T+r^VfVZJXZI1K^uLw|d4$L>>Yl5%S_p{Q`HV&iyB<!{h9J2VuXYH|sz+nra
z)N&4v!yy<AEx6P<r8Y-;6t4_0Il3kozIrb!W5W+{vN3_GqkX8Uio^A3FDmR^4A;CS
z_L`dp_?xQDk)DhI*GE<bLxU@-SWGQ&k;F;D&#NOC8Cqhv<~6Zrrk+h^NY91<elVky
znz=f#oWYxK9K=3t6%LsLsCFe#X1#z^avtfgRv4~%P3&3C=ed{9WSb>DidR!Y4`w8N
zUoaTIn?e4&4w#D1&~-=Ys*@-w_Mta2EBE`TrZwK<9`5Bc*=9+P;*|lerS1s^F5k&u
zVsuSlFAvgH_oLL>4zsZt;fpiq4*keAuhHHW>S>q#S!OAo4FPn1FzMuqARb#%rLHE1
zO1l7h-6{IXxfrg+TE*cWG}QHNHbZ(8F9q;{NhR(IE=Lx!;;D<{;}1P>lt*yH7KOd6
z8@AFehHIA7UYL5^_`;h~n<G7nR|ZI4xg&^O`ZX(`Rfg~p1uz+W@YD~W%yNOQJ1Qu%
z2H`%QfU(Gj{RM8+xFTwEq(=rY(SzylSrT-&&t;`Qx=4S5UIhKqh*MuGz6?X5pW#|u
zumAKoy!CPVri*HGq(|{mfU_Xv|9e5-tSS-Ozu0zLzQ6a5lacRT!Cw##&22VAdK9n5
zbdU<7GjLnrYo5uOzVHIGl{3<#cx8a#*;&D<6SuY#>DdtA3>bgQ3<9TrMzi~eZG|1|
zQoNet!qz{HRO|-i{!63HuPo<c7vz7upI>RyJhvzB1>zOr)g9(#;zbVd4DmdXx5MmV
Z_rJhNzO~NC{we?f002ovPDHLkV1l@m15*G1

diff --git a/application/palemoon/themes/osx/places/starred48.png b/application/palemoon/themes/osx/places/starred48.png
deleted file mode 100644
index bfa14599a1975cfff55b9e3eee899221bb5605c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1785
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
b?D6Zr)k%``@Jo#x00000NkvXXu0mjfJ5FJn

diff --git a/application/palemoon/themes/osx/places/tag.png b/application/palemoon/themes/osx/places/tag.png
deleted file mode 100644
index a4038bb4fa7c7cba67550edc3e0f05a237c03cb6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 789
zcmV+w1M2*VP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt007q5
z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!r%6OXRCwBS
zQ*B67VH7_5au~u!5)rFFqRbyNNGD22KZKE85ES&6AwfSXi9Rs;fCwrOBB)<OioiaI
zVBuOz8?(0LvQ~c*_d}aDi;``P-Ff%n=B{gR=e%l2xdYF=?|bh#&w0-C-m8KE89@5d
z0EKivBxZ`>Ir{=uBaes>7-M-T8{IE!pih)9Kby%E3I(=~<>h4-2n1#^qX|)oB(NFO
z@VjvQreM^4RZLa34+^ZTtN;=K5`fuk-s|)Eo+E)-rBYRHuHf(u2X%ZE%rfELY!2FP
zFF0SnNoBKHwz#;+(&;qwdcAYylmHy)drJhFOor81gdu3R4VfA`KIQXymP{s@BuOll
zO0n_r@z7=@YRLZLLTK|~@Vphiy))dscB-~mEb?bGilQiBu~_!G-R{T#kF)F0BQi{u
zWk#~8GpV7@kw}Eu?RFLlg;+cu=Oc}cjZJS<qK2i!XV1h(MXS|v1CfAtER{--%jKZH
zz8-?XAmBLM+~(%yI+x2eysktI$&jz(($l#K(JyN>n!mFV$>iiD7m23<Q&Urb3OGqi
zOG}-{<FVnZYBgTIgWlj3E<OqR{r)&9A%cpE3f`RxX}`WERcoO|Xox_8#Iyr;w?cdG
zxnWThV>+FV7a5I4-knC!>-Ess*a!xL0WfFYYPDX)TA7$Mh@Buj9E79y?YKVUbUGt+
zgt1tRBODHMLlcPvb2uDf%;`XEL!f{GPO=sD9BG1M@BOg9rw8{ZG4UsnM5EEN#j79E
zD!~?n33|OY=yqMl^+Cjmk&%%fR9LQ<pyhU4NVK94wNP2z29nsn_7^6*y1Jy%(a~F!
z(%IR01#ba_goUMzP9mRnJ5=p3L0&oy^KKDUDR9R~1}_PM(7Tqq@NY529{~mcbqUj#
T^G%&`00000NkvXXu0mjf=$L0;

diff --git a/application/palemoon/themes/osx/places/tag@2x.png b/application/palemoon/themes/osx/places/tag@2x.png
deleted file mode 100644
index 673814bb5c3ce861368b9bfce05176ee9c3144be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1593
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
Jcy8_y`agOR`||(*

diff --git a/application/palemoon/themes/osx/places/toolbarDropMarker.png b/application/palemoon/themes/osx/places/toolbarDropMarker.png
deleted file mode 100644
index a217b0ed88a4b3a661f1a54d97506807a6efde27..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 302
zcmeAS@N?(olHy`uVBq!ia0vp^>_9BY!3HAlZVLrcEa{HEjtmSN`)Ym%P6qNh3p^r=
z85p>QL70(Y)*K0--~~??#}J9jQzzQ;H3bN?#AjGGii&KxajS@3KS4Wv!NNyMWm!5t
zf3$r#ymU-9ZdPz`_V#bL)=&P#H1+6{)92o8(r*s(id2f<BJ|dC{=QAFuT?zDd@tKL
ztla+Ps!PebRj;mX%jNQ_UASK6qG8vfHLrIGcg)&1kHgjfVmnX$>>uBJO4h#q#k%R5
z`A4n(@}NtX>+XM-C`c4@{g`(7>b{#MX2;K7RLf^;K6}6?L-_bd#`Uc3oKsUP-JKr9
wbLzTU3ZH7{d?<d_mAfcQEv5L9VqkQ9YjKgIm(0m*px+ogUHx3vIVCg!0JJG|l>h($

diff --git a/application/palemoon/themes/osx/places/unfiledBookmarks.png b/application/palemoon/themes/osx/places/unfiledBookmarks.png
deleted file mode 100644
index 69495dac0f98c528bc1f12514de6f61ec41ed2d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 586
zcmV-Q0=4~#P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006JNkl<Zc-p1T
z-Ahw(90u^;eSe8vL?C$8g?15%F)fxT7VB*0nlg)CXlu4Lo#q>83)^DrB1SJ-v=V}}
z=)EOz%EC7=a9PtacaHA$xaIWed<Pp1Mj>8&;NkiHp2J}+?KgLX{S*>8R2XFZe;EGW
z<U_O7S#s6&Xjabn7kVSV-JSoyFENpI%5uXr_HjD=bYdF&8%;%dKTKit{kO2zJY>%8
zSYS2Dnl2CRYVCAQ`d6Zx&7Dq^R;!EB*&LV+h?}i8*CcId%a+%YtkHB`dHczmMLDCa
znnOwX;iAeE92Qn$xaEDdsJUc6N?R6+N{lmJyEo$xN~3Q-V{c^xxb8b>8h8ku{V}0T
zUH0aE&Ew1WfONtzI80lnx;U`M=6o<0j-{YB_F`Y19`$AyR9zlu`tB3T)Mam+p$GD>
zqr)*WM_YF6e81)8rx`(rr%+mT92J}qH5Ue<G&xXbaTCha(JlKX7?ChOF(ovd>$9@@
zv%Sy7`1)2PnL^IpXFgQwdr)<zpHQZbZh1mX+LE^~SncU<J|?B{BNV~>l9=`G>paTU
zZK%+g31#Z&R)Drlsqf+w>uLByYk3Pn5hLS1aBcRi;V~a|bSpqxcBI9|OX&?Puf_}b
z<-w8=C6sf00ot+}UAsGykTOCniR}oA(TqZS#lsX@>p_`Y#&5@=lNQebm9dun-pK68
YALCNB{B;sWHvj+t07*qoM6N<$g5rr8=>Px#

diff --git a/application/palemoon/themes/osx/places/unfiledBookmarks@2x.png b/application/palemoon/themes/osx/places/unfiledBookmarks@2x.png
deleted file mode 100644
index 44efd6aba3ac683c3fe49b32bd4665489d652cd4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1289
zcmV+k1@`)hP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000EgNkl<Zc-qaC
z>r<3v7>A!e<{wZqP5(g6G&Pz{Q<IuBBxeypP)@tTF2_L52Ze`&vVfdc5OEk$5>m6s
z#=>!$aZ+pgkcZ0YpaBWUvMjso!Y)uc+}*!-dYO%OkwZowu9;`<!}YuO#Ti9vdE1)u
zzdqm@M$5=mqJ_)r0V!q2yphPre~HAwai{QvxA2#-Xzc23;~`oN>^Ke=oE{HImaU$M
zX5{tn`fjZD065@+)8he2rAHU?EF*JkPFD4s9l!r#veSjH@6fwxmCFJ<*o6ZwIN=_$
zI)ytzUvhLI{*3Ioa`R%pd6Mp$9F$StNt-qK%K|&tg##`)nSddyOSmI+2U-@A%*Y=H
z$42jsItch^^Xc`7)MeqrN2vQh4O&LwgnQWL67Gn^{mt&IXJm6%Z#({eeYpPWEm|KO
zzap>;2VBkFz3p%#V`Rc5R767Y5qDx3`OTgFTfbSRsDEsdbfrdm$v1LEU>6R!;Dj3)
ze>*^1WK?;Mky(ZlhC%Dp!vS6buLW!9g)N~gVk3VA)dOdCb%y~N$THcd1rVCTCY2yY
zUc7p<ci85n`{Ps8^X0dS=oP<ciZ^u8-rBRIt3OZr#*Zo4_z5K+xuB55Z`9Dk3}&%|
zT{z%^6K-T6%j}pIK*Sd`f~S~NM)r-^#s;lU0(*-NE0WF8SrmJ)leE>{lu&n$bPXR-
zQd19(0C=N@9%e9$9c5QrR7<Ll-4<jpX~;BB&Il2g-vBl;vZcHC#Hf9muXQQB8W^ic
z{8K7uw``}_%2T9KzQh?ytosnZ7~qW>dYDmW{ZlKj3&*?<?v@WObs!6wmdRNmVsh(1
zEF*9HeE)ls-9`M5gFgN1^S`(?jCSN2DWa&AqDtB+y8I;n!uR<zcax_248R*T^e}^2
z>|hrTxD+Sc$Uqh{$EWy!=$ymPGjd;5d(D_*`jLsR1eyYavb-T!OCj0y6q?&aI}2NA
z*MT;Q;$OI@yn~`EP6518Lk}~U#SV5AhbG@Zsuvl^LMF1s?(AAWM)qF6eVIQAnH@6<
z8v<gK<u@ZUC?LI>wrAI~w1GnNj1<Np;l;-&Vt*UJ8#VMW!?ShR!7dzd&3lo7EMy{E
zL}k_J898jRTPIwzWcR{=$x43d1`5cmrJ#Lv6wE;(IgJ2s)X>8WX1#il!C5wBGD#vb
zvpR>7cIWJzgPWePJ7;LnY@>Jd<>Z^p|JkG-qHSqaw2i|6-l(C68O&nGn-5vYM7D^?
zFi2o=xae1tjqX0M{)2lXRvNO{$yZ-SZzq(})<nsak&jLRZ`9Dk3}&(8(S;0TsktKj
zy($U%%@b&P<$-mQPJecd-ij-vO>srEDZbbp)Rf-o&#z&2Q5Uk*T(L9#kOTu<T#O-$
zgGN|<{QMWRCBBH>*pufDYUp7`nSGp3%@tv32PMGL<A5Ce&^Ju2XD?AfLnpu+wfX*1
zTxzb^ky<Iih;53N00I_esU9^~gr-zTV75DHshB(*g4%K%YOdIxT%N<o@k!SlL(9Pe
z@LoQ1$V9dXNh%9x<mIn!U$ITi%rW$YnL`#bnFtZAFI&fCGV(tr6WJn2FTuKi#FD5$
zU1=V_<&%Unaye@kzn}i&;Uggeb#g6P`vd+29PtP&ubU;^00000NkvXXu0mjfMw)Hk

diff --git a/application/palemoon/themes/osx/places/unsortedBookmarks.png b/application/palemoon/themes/osx/places/unsortedBookmarks.png
deleted file mode 100644
index 893e75a79a26c6c55329b225834c36d8630d2343..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 780
zcmV+n1M~ceP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!u1Q2eRCwB)Q%g@1VH7<x(+5norL71p
zZPO=Ec?Kd7NsNin;6f9%hJ?fo#3g^hB|8&$ZqSWO61T)CBuG#mCcKK8SgaN(P;BkH
zL#H$2H)E(Bm)_)Na=&}enRCB0LrIc^vsio94oQ$8Q96K}>sZ6Iz@JKdx$uaQ2WUNv
zt|7GFo~~kO)J8>1fEtJ*4}s@f9sMKYuE84<5SV~S8KKd#pec<Cq9V9FxosMl+-VjH
zh4UI+-ITR`m@>EeC|awZDszIdQZ67Bol_A|XDhsX@w_W&3U67=W%3pZ#ug7OUOymw
zLNdIJ>~RSaOxR1Xh>2IbAC6CK%eY!ScMUoY_TC=USvm<Y29&md;vuX~4Xj=U++GU#
zVm)G6gvk81Y6Xg>9|T68;On~;<bTWn`E>%00;h43Ipn?<u^aUwF!EF$52@}zmhW`g
zJB5k>z2`nQ=RcAQB?|ZxKrE060b6S&Xx(?9)w8hKFJ6){wF*LRj~j)25@Lk|dybsw
zN~mxg1Wp8qhXz(4y;Ee<NALywGG<goV6`?PmrdXxx&xP+MJAHN!W$Y3^E5Ki5}Xb#
z%IPSwnFN|`j_MkW&*khgH5eXuboXI%V-Y9uZ-_?@a9rpG<G2Z!yRi}G5Z}+>FmFH^
zdU(8@NF?GHJ}fT1l3f_J*&0F946a=t14ync%_0){48Osk$P<l0*!=e}IDD&Wnb+$@
z;wU*L6NLPJFE&=+BANW9G<|JBFj_rUR^Kaif8PL_n(UaHol)wB1`~X(9g6ibK^sNu
z;PwSc{$W4ZkHP8mpsQy{sne-rq<$Wuf8a`0fhd&aN1LXmsD{~M#o^vAzJ%A6nq}+J
z;_|8g0Y-=FmniZ@RZ~a2akSW!{2M&6HI08mA((x=jQ@?_0t^6FD*o)gLhe8S0000<
KMNUMnLSTXfJykXU

diff --git a/application/palemoon/themes/osx/places/unstarred48.png b/application/palemoon/themes/osx/places/unstarred48.png
deleted file mode 100644
index 8b82aab4b1f563853960436d1ee9b9cb446839a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 818
zcmV-21I_%2P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!)Ja4^RCwC#Su1nnFc6MC1_lNN1_l8J
z1_1^E0sUjg3d{Pp4ippw6ciK$7#IWu7zB7Gx7*p=?CeRhtVgGwvxpKuR{O2KeaXq~
zcH1m@q??706~GGMe+Q81ZX`+KE&TcUrJyygPfx$DzVcKNGtq@nUjU%|4yKA->Hx%N
zXaG?t1j=uP@;J6|y;_P7a78cdclqN1fR%HY3i^xOKf*jN27plVEM^2){&WDGKD`7G
zdKc2j^cnC6%;#7%3cUjl3i`<ZSx6eC5&7SXdr_iM8jwC2Q|vE&G&>Ruz+@(-<da*-
zDwtx*tP8SQ_6!0VEaVR4L&{8?O<1*cv{rApUb0;%EqAvE5FfKBM3#3^{zE~Z4U0yd
zOK7ITaMliR+H{JjqTBA#^Z-%|l<6#KS+TrQswigyFbYAJI~RQimDbk@+DHZrbE8nt
zKp@Z-gf_7o6pUu%dpl;}L1#Q;6r#+!6A5ZC@jO5S)Czi?X}!_8p#i})OtqlbCkX8W
zDz94O1Z#9bIx<+`fp$Y_9nS>V+U&A-OG%6E6wY;Y0YQ}6i(t}`<wu*AGMgDaQ0P0g
zj5WPq&~KN1w`MwwWc68*E_DopXr-elBYaOq-dw`8PcfHkaz^kYo>%}%L+x)nyerhj
z18_RnqK>M)D*@bnH$)kv#;8kt@XUev(5vYL&pQg)T3;30;hHXIU@~l&-0nLlr0soa
zcOJzvcjXS05Op-FqWb{RB4_j&*}aA=&trSXq7=Tjr?Np+nHE%kMcsi)S`R@Hm$#yc
zf1}p&D9Yg)p5HTNot=5M6XU{+9=~b9M)(t!0w=}0jR5(TeQ5^{ci?m!Y30PerxLPm
zzfxUv(sg54ipV~LIq|pTfs4VJkusNwG6bJ{osbiiLb4+Lr*8M?0gN9(f_|YP2h67|
wZrKkM8;j3Svj8k*te;s|04sonk3Rwo0Qa<O>o75n&j0`b07*qoM6N<$g7_?CFaQ7m

diff --git a/application/palemoon/themes/osx/pointerLock-16.png b/application/palemoon/themes/osx/pointerLock-16.png
deleted file mode 100644
index 862cd11c6a2156d74505f977b822ad99616fb96a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 249
zcmV<V00#ewP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002MNkl<Zc-p1V
zu?m7v6vpv_aBA-XTH1Snw&vy@qxQIph{y#IQ4}0|3F#Hu8he4}rXuj`8}1;c-m48i
z&OK-N4|f9KFF%Jo&m~Pq2eK>!oyi&%NYfNbN%O&hBuP+nrNy8?9LH$5)6zH)MG;y&
zXl)b-!w?;wwABWrl<4uMeQzKL0%%lp><sw6kD8B~FIpM>f#-Qp1RZL7X%ui>7bMhs
zMmK`8(*_*J5siIA6@e~o0WI6M3p$ad2@LlI1gFnNmTo(O00000NkvXXu0mjfra@r8

diff --git a/application/palemoon/themes/osx/pointerLock-64.png b/application/palemoon/themes/osx/pointerLock-64.png
deleted file mode 100644
index a35ce040c87d03153ab1bef60fa4fefdb0e3a0b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1119
zcmV-l1fctgP)<h;3K|Lk000e1NJLTq002M$002M;1ONa40ARUQ000CgNkl<ZcwX(9
zYitx%6vzMb*x83$%Wij<q!k}AAx48Gf&%qXYh!%@CZfiOAAAI2sf)B)6JsN3Y$~zZ
z0!<TRP#TJ&f__kp5(*)-RzRuMKE$wA3rcIdvuOimc6a8^bw6yF%mlJVXXk!l&bLW!
z&dKlm^S|fJa1?AG9*m#M1&Fy0H2%*78*L!a0g-77T<Zcq_(RNEKp}xI<%dG|PYp04
zz`+G+ZmKW*I71&0;q|6=g_;=p01q#(y%zielH(f4M79-fq*oOFh|1{+Mn=Rzf_Nhx
z4By6pfN_8eDTl*rCwDNjVgWvPva{$NhIauEA4lo}``~fB1xC1`Ru%rlS0?^+o`509
z`Q+!w9eE}ID*>}01ImF&bn-oB^MC-aq`VvI0QX-B<eUi`;HUl^gi_!RsmssJUhI5R
zUI|=qNbYWNFmP=?jVMRBpk0?92tP7;kl9Qq!d;l$7l|?;V06<hDqD&c#@9e+G!^sk
za^%@y&lLp>2pDQm%f#V8W#Xi5Mg(gCxdk~d-5+^u@*8H0i3qn}*&D8B(E>w|Lh`NP
z&GOSAj8-!q9+0O3M>Yjm5HQrRm=3j8)eSpNz}P5+;`7H^A7(^A&jbba#XoP^Sl{GG
z0Tg;Rtqu^6?2`-RBDpwzjUTt-`%4h8CkRv!D$RIhe<B!<$XCf%&+sbbOe7#94%z03
z$jV7bEdTU+*`s0xayDTC)Ah6^mk-z_Hzjyh@w7v(*BIS~0**ekwC!chp?QEp2elM1
zJ^$E~4oyTlRJ~;2%q@}y=F!z}cfRy@-U}d5)$-ltzrGRH<_RX4Q#TDfN;~r00s=Mp
zz|M*h{^PR^n$`FCzGqs4c_lzVW>@W8@CSC)j$u@57E5@O4ki|!SV=qcMnHo;z50U%
zF?43q1KMn}YGEJ>hu5@SX}qy@B2pntJ=axy8eO$=_WgFPQ4E<GoL)S7A9mYLfI@}z
zSM~Pd-|&8|VX8{9RkJdX4n5!IvsnW=RQN{MeNr%r4>u^LrnIZC3I)8Wr@xntSJ1C)
zB%njZoL@G4RB!@2%;^D~OKv3=q`arQX0zKy0x6XASML>u@!5;yBEsC9t`oeRNe8hz
z<G0g;wh<sLHD3zHvByYnig<dPW?`WFyKA<%Y$JeIxO>sP{*pIRdXuYK5IGapk$cWB
zqDO4=f%W@M>8)`_>mpVLbH09IEAQB1l4@3o8ITJ@Rq0Y&zL5O8ecQ9gyGk?{g(cfo
zu8q=mXI8Uhqe`j8l8!%!8=Tt>2lf5rf@}$rkS3OVOYd^51pt=$``lUE@}FAPQxW6F
z(TfpKM}|@W-;us_nT|lLyl3etjG-5?C<WT#Q~^+4pZn&D{?ZAYL~nG=c<)#NIMDC}
l7G;u;+wh^%xw!oA_#fI%r+B^f!^i*t002ovPDHLkV1jl_2hIQh

diff --git a/application/palemoon/themes/osx/preferences/Options-sync.png b/application/palemoon/themes/osx/preferences/Options-sync.png
deleted file mode 100644
index 89901fb698c4a06792d6ae974489cb6b93ed3994..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3585
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
Y01PhCHfGXp_3)=m4`YNb)^rN}7tY2;i~s-t

diff --git a/application/palemoon/themes/osx/preferences/Options.png b/application/palemoon/themes/osx/preferences/Options.png
deleted file mode 100644
index 448eca6e1bd0f1fbeac68cc3174c99e79cad0149..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9077
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

diff --git a/application/palemoon/themes/osx/preferences/alwaysAsk.png b/application/palemoon/themes/osx/preferences/alwaysAsk.png
deleted file mode 100644
index ddd4cb2130b28944644838a11f4050da251dfbc6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 446
zcmV;v0YUzWP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUyu~1A@MgRZ*hL56~sJ^Sd%>if34{y&l
zhSxWT*ie?;VW8lAujYQS=7x`=iM7?2!0emC?w-T$r^xZI&hWL-@VC#{yw>r()%U>H
z_rcip!`S!3+4siV_s84!%H8+M-T2Pm_|D+?&fxja;r7zw`P1Y1*X8-w<@(p=`rGLG
z-01q?>iXd7`{3*P;OqP3?fc~J`{nNY>G1pM@cilV{Oa=h?eqNb_5Jbn{q*<!_xb($
z`~7INcsKw600eYWPE!DXzu%b;G{pb_0Fy~XK~xwS1;If|!%!3ez)5)sF@dTp1;HD5
z|GShfnvI~F7Ji^j``>dW3=;s>3ez{XldmWKep;aFaN#_@_X~lleSIEpx84!RdY!Wj
zJrSr!*73f3$&Ns;N8WcIm4!fVS@V#YiNKaUo2jx8oPXacr@R7TU7(FuScPhH_GN5<
ofWC|kAmH@e00dSIfItDjKePZ;0q=p3p#T5?07*qoM6N<$f+EuPmH+?%

diff --git a/application/palemoon/themes/osx/preferences/application.png b/application/palemoon/themes/osx/preferences/application.png
deleted file mode 100644
index ff2ecc2f351ef37d250264aa2bb273de08518165..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 441
zcmV;q0Y?6bP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzTS-JgRCwB?ld(?2Fc5~%sR=_DiXuQr
zNPrju-B_6ciT401BwmD_0WtFiz|O#o)PaGGN^Gbt0~Kw2clhi$NfARKmYh2~ci;VI
z%Zizy&QR;ey_2Xhx{9L7%t<C&06jMpd#bk1x~yY_)m?&qZ|zUjhp%6tTKo6hOcs9)
zNZOmw-q7%H`!eNs8W(Uld4hw%r3Z}Ppa0eWe6j;N9=*Zi%@K6_<Czmb^a?D+44v~k
z(6W)H+mKo-H-ZF!_F}{mF&J5+x5lm!!TFg4*r5YeZWCF7jj@RYOeKW4gql#q&ZZf7
zfKQT5_JQaV4EkWHEWSYnS%|aiPu=nWk?tT|fly^FKvK?kh4MCv7Rde-*_cBdF!b!s
zB*-o;<$y>&SW!TEe?_(G{GqG>6oFW&%xWr`oGNxUKuQ2`E?;>y0meZ|I80TxlmpcA
j-gT|#sOmoFZvh4XI{Y{EXY5e800000NkvXXu0mjfIC{Zy

diff --git a/application/palemoon/themes/osx/preferences/applications.css b/application/palemoon/themes/osx/preferences/applications.css
deleted file mode 100644
index fdf5614772..0000000000
--- a/application/palemoon/themes/osx/preferences/applications.css
+++ /dev/null
@@ -1,64 +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/. */
-
-/**
- * Line up the actions menu with action labels above and below it.
- * Equalize the distance from the left side of the action box to the left side
- * of the icon for both the menu and the non-menu versions of the action box.
- * Also make sure the labels are the same distance away from the icons.
- */
-.actionsMenu {
-  margin-top: 0;
-  margin-bottom: 0;
-  margin-inline-start: -2px;
-  margin-inline-end: 0;
-}
-
-.typeIcon,
-.actionIcon {
-  margin-inline-start: 3px;
-  margin-inline-end: 3px;
-}
-
-richlistitem label {
-  margin-inline-start: 1px;
-  margin-top: 2px;
-}
-
-richlistitem {
-  min-height: 22px;
-}
-
-richlistitem[appHandlerIcon="ask"],
-menuitem[appHandlerIcon="ask"] {
-  list-style-image: url("chrome://browser/skin/preferences/alwaysAsk.png");
-}
-
-richlistitem[appHandlerIcon="save"],
-menuitem[appHandlerIcon="save"] {
-  list-style-image: url("chrome://browser/skin/preferences/application.png");
-}
-
-richlistitem[appHandlerIcon="feed"],
-menuitem[appHandlerIcon="feed"] {
-  list-style-image: url("chrome://browser/skin/page-livemarks.png");
-}
-
-richlistitem[appHandlerIcon="plugin"],
-menuitem[appHandlerIcon="plugin"] {
-  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png");
-}
-
-.actionsMenu .menulist-icon {
-  margin-inline-end: 3px;
-}
-
-.actionsMenu > menupopup > menuitem > .menu-iconic-left {
-  padding-inline-start: 0px;
-  padding-inline-end: 2px;
-}
-
-.actionsMenu > menupopup > menuitem {
-  padding-inline-start: 4px;
-}
diff --git a/application/palemoon/themes/osx/preferences/mail.png b/application/palemoon/themes/osx/preferences/mail.png
deleted file mode 100644
index c40d15991dc6c959266353c06afff2ac93e918ed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 630
zcmV-+0*U>JP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!7)eAyRCwBylh1F`U>L{0Kxy}@0f9MS
zD)Yw(ZVu37%jQKqd-m)+?CyV{f5N<O2mKd3c-e_%i96^Bj3pYjFqs>=&W2`XLZR*J
z(^?&YY4AzDY2K&r=hOE|-ntlL=&se(T*~inEDsJ2XRLLtre&K=@3W<)dxh@3u5JOr
zPZEif<+-^dzrY)IPiuLwu@O`D_b)Ay<jr3N1V6tMKYp<=dw`2-^ZhmKl*X)+yzCJW
z{OUofycmyt$G@sn31Pi(<26a1+JcppEuX-(vyW0A(?RhE`YBl*!rQ{_yrz3IoCjKV
z;YvBpYYnKHt1khM1~Rcv>9yU-Jm(!2(`@`9<fC;=41940a|0f}mo!=cGx5236^-yb
zgl}gPoYjv`MZw*CjN*0~!Ri{Kf=u1B9=@stQ4iloC_N1(3P5oOw!oU42^?<C#-Xb*
zY`yz{*2y85FJgnjX$9g~7$eDf1fn9oQcriJwxCHdoo~9y%wJC+G?T<AZMJU0aaDz@
zWuO)j(WH$A#WcGF%#p}N2{Z8kbUIPp8k;geB3{!`*_LS3%QkEn9RkgP>m}KSRf0_i
z{+(0mO(g=z?<z2Ye)|-E1PvOfUQv*Yj6kN1?M|3Ep@qUYOpfx%9VpO!{&PWXPr)?3
zkZAr^2cTQg&(o$T#t`m~)3x5K{SugPL&_aOLjSetJT2CB(eL~}^;3WW0Pb<@C7l3D
Q3IG5A07*qoM6N<$g1aRmi2wiq

diff --git a/application/palemoon/themes/osx/preferences/preferences.css b/application/palemoon/themes/osx/preferences/preferences.css
deleted file mode 100644
index 4075b1e593..0000000000
--- a/application/palemoon/themes/osx/preferences/preferences.css
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 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/.
-*/
-
-/* Global Styles */
-#BrowserPreferences radio[pane] {
-  list-style-image: url("chrome://browser/skin/preferences/Options.png"); 
-  padding: 5px 3px 1px;
-}
-
-radio[pane=paneMain] {
-  -moz-image-region: rect(0, 32px,  32px, 0);
-}
-
-radio[pane=paneTabs] {
-  -moz-image-region: rect(0, 64px, 32px, 32px);
-}
-
-radio[pane=paneContent] {
-  -moz-image-region: rect(0, 96px,  32px, 64px);
-}
-
-radio[pane=paneApplications] {
-  -moz-image-region: rect(0, 128px,  32px, 96px);
-}
-
-radio[pane=panePrivacy] {
-  -moz-image-region: rect(0, 160px,  32px, 128px);
-}
-
-radio[pane=paneSecurity] {
-  -moz-image-region: rect(0, 192px,  32px, 160px);
-}
-
-radio[pane=paneAdvanced] {
-  -moz-image-region: rect(0, 224px, 32px, 192px);
-}
-
-%ifdef MOZ_SERVICES_SYNC
-radio[pane=paneSync] {
-  list-style-image: url("chrome://browser/skin/preferences/Options-sync.png") !important;
-}
-%endif
-
-/* Applications Pane */
-#BrowserPreferences[animated="true"] #handlersView {
-  height: 25em;
-}
-
-#BrowserPreferences[animated="false"] #handlersView {
-  -moz-box-flex: 1;
-}
-
-/* Privacy Pane */
-
-/* styles for the link elements copied from .text-link in global.css */
-.inline-link {
-  color: -moz-nativehyperlinktext;
-  text-decoration: none;
-}
-
-.inline-link:hover {
-  text-decoration: underline;
-}
-
-/* Modeless Window Dialogs */
-.windowDialog,
-.windowDialog prefpane {
-  padding: 0;
-}
-
-#browserHomePage:-moz-locale-dir(rtl) input {
-  unicode-bidi: plaintext;
-  direction: rtl;
-}
-
-.contentPane {
-  margin: 9px 8px 5px;
-}
-
-.actionButtons {
-  margin: 0 3px 6px !important;
-}
-
-/* Cookies Manager */
-#cookiesChildren::-moz-tree-image(domainCol) {
-  width: 16px;
-  height: 16px;
-  margin: 0 2px;
-  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png") !important;
-}
-
-#cookiesChildren::-moz-tree-image(domainCol, container),
-#cookiesChildren::-moz-tree-image(domainCol, container, open) {
-  list-style-image: url("chrome://global/skin/tree/folder.png") !important;
-}
-
-#cookieInfoBox {
-  border: 1px solid ThreeDShadow;
-  border-radius: 0;
-  margin: 4px;
-  padding: 0;
-}
-
-/* Advanced Pane */
-
-/* Adding padding-bottom prevents the bottom of the tabpanel from being cutoff
-   when browser.preferences.animateFadeIn = true */
-#advancedPrefs {
-  padding-bottom: 8px;
-}
-
-/* bottom-most box containing a groupbox in a prefpane. Prevents the bottom
-   of the groupbox from being cutoff */
-.bottomBox {
-  padding-bottom: 4px;
-}
-
-%ifdef MOZ_SERVICES_SYNC
-/* Sync Pane */
-
-#syncDesc {
-  padding: 0 8em;
-}
-
-.syncGroupBox {
-  padding: 10px;
-}
-
-#accountCaptionImage {
-  list-style-image: url("chrome://mozapps/skin/profile/profileicon.png");
-}
-
-#syncAddDeviceLabel {
-  margin-top: 1em;
-  margin-bottom: 1em;
-}
-
-%endif
diff --git a/application/palemoon/themes/osx/preferences/saveFile.png b/application/palemoon/themes/osx/preferences/saveFile.png
deleted file mode 100644
index c210e8473f4c7ee9958a80b94965d522a15e4584..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 791
zcmV+y1L*vTP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!xk*GpRCwBqQ%^_~Q5gTt%-fxvo!LKb
z?rOAaD+Y>x@L-W5v_-X*SQwRo7G!}+*r7v4b;+W_n?%u`Hav9c804u_P+mF)ff1Ry
z>bSe1uDdfkyF1gH5w<Lae(=3FZ@z!O?|a{448y>7Xq_a6w&H-U5KByaeUf7Swj<a9
zy2j$f>1g@<CiY=lJ1fBO@bKNnrnX1A;RMUF@K?IZ26OUE`FrB&E2CH}LdmTnvG8Rq
z7K`1t0tBk|9_r~igYR=J1VKPstAxk#f3ro7oX6tgB67JkC`#rqP0X-#5vr?$^)5+5
zq|=Xq_W?AGyHUz)txj8z(0#8NgU_R27y_@is*e74vUCah{ej&a;ZZ06H;;`W5b`40
zb+YW7p_FU-WY`0F^mSdMWpWT*z5rE)%`^=jPX%8r5&T#H`s!|>s2X_r?ip%YcUjI^
zWfe<reK^-Xh)Adx*=!aLUbIu+CX+#<%k84H0FH*6`KIA`<tVzVujA8XdeeEzhu(uD
zI2yhTP1C3?1Djni$?YSO%h#afotRG)5vU~KD(uK9z}e<eY^)o2J@o<?4vgSb;}xi?
zx>-^t1Kw_fDEXR+$Lnvg*&N8{^DvCf#t9CfRAO;8a);it0~gzGSbFn{&FnnS({mP*
zRMA2h5T7is!0j#|l}cGge@e9e64L234OoIX0|m3w6snr1CG!#~m2^W8oQTKcG>9AF
za2U0<wbmXAdhp=k#Fp#q@9#%4nM5LyFxlv=0YfAlM+ZZ(6lQ%UU0v6~(H0Xzwn%V~
zAE8hP(;ug)o)d|hTU$=0mZ~~CJ0Qz4bu>qHg9ciIoD?96LOHuAikO>U!tCrU+B^2+
zXY%thGc+_bz&pIRiA{8y143yTW}{58Kwqm)#rQ3ZsViui^}M<|&g}G@{};am7y$KC
V4iS|FcUu4e002ovPDHLkV1njJbGZNj

diff --git a/application/palemoon/themes/osx/privatebrowsing-dark.png b/application/palemoon/themes/osx/privatebrowsing-dark.png
deleted file mode 100644
index 9eaf3aec7e71bd4d7f3e3d91b47fa3717a17a947..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1355
zcmV-R1+@B!P)<h;3K|Lk000e1NJLTq000^Q000;W1^@s6<bv(R000FNNkl<Zc-rlj
zTTGK@7{{4{4#uo&DJ{nyILX06!KoAmmV#165Tu17P?*ReD!2i22WQxbY|5M*i+BQ5
zP$^K<Q3rycPDG{`o7ogWG+WH>+)Q@0E&lhs&DR^3-7d?ri(lUFd;b6D`R9G}w)q?Y
z{3HAagBC9FTtF;jYgu581A}{aCSD`l2_dnBaD2hzO1Lo(=XK`hG2K4fk*(~-WwWeI
z&zX6wK`aQDr%Ja~=lfSr6bJ74m3Wrpx2t!VC@z@v#l#|!K;f&G?`SIuc>f90nKxBh
zR3+qx$+%D+AtFyc%V0rnh5ql%<oi|L$&{5HGsw#?6a~EZtbTnL21;&V@`FdjJdR{r
zK)!joaCL-$9}-~ntGZ*-_hI7Q8K&F3_1aEQ?^BvFpp$LyDDbcT?oI#Q^K26=$b*E*
zi`7#&th3-$-UzN$&*FN;V~iEdVOT$dVciU_md>L!-HdE``8B<4`%qKbSzO=w2qW1K
zFq}1mvBEigMLiQ$574z`7)SJju<o8lj=bVFW!TP9lrAZ@c4S*IUOI=dqFG$tdLO4U
zM{#)Ld7RE1$E7Xb!>YfBk=*+@Z5Ts`&Wg*%2e_1V&!%<jCT!l5)HAx3LbuK0O35rb
z4VRE1Eg7K<F$;1}@hv#lvdN6TtSRi*bRkdv*6$gT;@edJGE-Xm4ZZ)-lx)U@&3A2F
z)UowjG;907H1gbKUh4Up_3qbn!mPiEwhRk4`W6n_kIpUGC%3yXtp{6V<<He#x>FLj
z6$Yv+iBKZaPZ+&bCoTQKq_v=T?KI92>{%}@`^jIZ+D4uz&a3owi_+7KPByD)(-~-e
z^3Jdf7PORv<~r?B99Y+dB=79AR10Gw;mYBw5NRsQm9^+uJBgm8Nw8<CRg)$mUL{^3
z1Vo6&JFENCqz-(t{x}l6^d@!-9hf0XysmWD>RJpKZ=y!iO4~Kwit$X_5#k=N@)U#z
z3HhO6UIJxSrlk0Jr+NZi>Z>pYy$v5hWR8fxJWR}21O~guMYEn1ALEUh#8&j>-#}$d
z9bOk}cd`r?<mAkggr<5MpPn|1Vjy=K#|#%xsoID9;9bzmOQ4sPAUCiadsZ}~ebq37
zo?DO?RAJZ2TVd-tntdJ?n$eRpjx?WwUtE{U6)b}Vy+pW2i#N3IO>D$T?Kn<oMsYUd
zI{NdbFjzPZi}4oBhDn%K4WU_i(S~W|5UVkbd6?JM(?Pvm$ycyf(+HI~<v6?5EQ19x
zoSk{n@FY*&T#dQ~Z826H3?0CMATtgGno+;34-FB6wt9VRH$IE)fk`!lLkbJin1?|<
z{b-~5#|dp%>#2L}!jna^*(`&F*mouH;)kb`;pdu!R<y6Nq9M|P&lUY>UU?o3nqE4Z
zIwW|c&n9?eJgkha!{Nj)&=@s{gUkDINNKV4e3W2fA<ra&sBG?XEU*XJaU{e(d}WSW
zyy?fvxP924d;-lWy<j&o(IfM>2%);2JSxW}UT>^)UuW5&`Vb9iXVA31m%JUQimwCp
zK9L9_^T_8(IB~PNAP!Ctx$vaX3SoS6v`Bk1PLwjI5@~PA1S`r&3m}$qf11G|Zn3qo
zq78S+^N>7K;led7t~_}RX<}j#H}kJSYH_N4XFS4}2qhxeP_Fr9?wA*FzZ-APqhu@B
z!{cT+{B2OYD8&Xh%!wQ9Oe`iAvib`iN6zEItxjCs;YI%cX8899{RvW$k=wCC>_q?o
N002ovPDHLkV1hb=mlFU0

diff --git a/application/palemoon/themes/osx/privatebrowsing-light.png b/application/palemoon/themes/osx/privatebrowsing-light.png
deleted file mode 100644
index c12f50779858230c939f5f96582437fd60e82610..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 696
zcmV;p0!RIcP)<h;3K|Lk000e1NJLTq000yK000mO1^@s678qX}0007iNkl<Zc-pO$
zTWC^o9LN28J09(5Ii+wms<qTLm{t!hXk8z+K@f{otjj|eHwZ@cu*}%r>LrM%aF_Pf
zOZC)(Vz6XeTWPL2%xlwRT}XRLk0F>L+V2PFfJi<BK78Q(F5eI5|39LjR4UaJL4!(2
zID~)*kN^}Q=b*TrxJqAyaCsuYf*Ue`8dwkLfi1vhpdQcy8bF6V4n6L2871csp-@`S
z2-SX{_eyu?{yp}qmrl6fydGiM^irWvSY3&Pp0@8W?lm`VX!CjBPyET}<2Z9I%sB=J
z`g%@xckK)LeKs8<)SwH6GOdC%rcysWa0iKh5sQADiiCsDtIZ+12#zLj(I}MH(Zn2!
zuFUfb#bWV$KA-<uO#riR<uzm%(19)#(pdPGy)!tR7$2Q%Z8qFgNQwPy?@32Gm5T8}
zc>dIX@%%VLiEdb0Ot&76jZ9)c;QuhEriq1rLkf!K*%{|EZa9DJNXKQ3oE%>(Bj@hk
zx&4S2jymo?#vaa&b{!sA_Abq0AG7E{7YfBtY#O?LZK(VhzjL{0Cc_4Dx!h{mQNR4k
zWP&&=-yOEwhS7m86bj+Ub&Ql82nPHvT=*X%;gAQihtPp86cYGCl!_uvZM!ViWFir+
z47puz-HV=gp344@WHPdQr@2o_k!|SUf7l3tyJ6NyiMhqF)jIX^#dL;c;~<aNZG&TS
z3Aq4R9S`n3Vbke&Hk<wId^PQC-EQp13}*4|(1kJ{p-M)S5H!+a(jgO*Q$P>Y?GQ2m
zCR#!cLa!G%13R5CGhv38RSFRT3o=;LLO>4!9f(wL;S%Ue6%w)zdK-ZT++ip}W2W3u
e>wlZt3;zO0QFaOylzPno0000<MNUMnLSTZXFgdXR

diff --git a/application/palemoon/themes/osx/privatebrowsing-mask.png b/application/palemoon/themes/osx/privatebrowsing-mask.png
deleted file mode 100644
index 92f60e29f9fd71ed62101b7f7f22ea37423387a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1074
zcmV-21kL-2P)<h;3K|Lk000e1NJLTq001Tc000yS1^@s6;g3%U000B|Nkl<Zc-qB}
z-%pcw7{xVNvLAoIl4%444X~-(j2g@wIAl{|7I(FnESb1nnPFTI#snP{iYY%Tr4)+3
zv;u9BQY}zdX$!=}mSPLCAVtJ>RX~^&5MjMEIr~0u;<9Y-7q12vAKq`z^E~GqHq3?R
zv&}MRd(&~pOIy}39Nz`j1zXlV=#O{5q%MDiBH0@Nyv<0_pYAjZ2VJln9$FWKG$)#K
zY)0xrov0Y`Mrdd{Q+=QV<}du~0%eB=r;bn;>h!AEMn;TszXjJa?n+`h<b@&K&G3j{
z-N8OIq;^C5=`A#-^@_UjP(SIU(Tv`I-?Xr=iOqTbluaF|%fE|ls@T^C<7fSn2&p}=
z7y3|>ZbidaHr!Hp5pvI9{^2s*x)Ic-b&CIWk7^KeV@u-9&UUoNx}eUm!cja(9$bIQ
zrVf(D6nk3Hoa&ZDonphda|#QOqF8wNC*}exc=p>1%-&nV+~_jAEdktN1tWoF%nmQn
zjCRD`g^4J}U6bU&^`~rZv5UJ6(0_7UlBzux^f!%S+PjG9fkiyMyND;A2z^Cu#{Zn4
zx2R3B*^KWw?TT7|^C)?6{VAJUtn|ZX2r0diRPHvTx7LsF?Fe+)o%ngL8o9~UD9gNp
z`yFBY-t$c4erFhpV|tu@zZ&QEso8Fac+*!mL>^p!%H|d;-l>CjuS1f`kIcA!p$`-G
z8MstFl%zJ|mmLD~l53#(_8P`*Perufw<9;HTAaxa2<TQ0&<(roB@eDYWpj&NNEV>^
z*e*%suIs2gYCzz|B*qv)=PUwUPcUo_V#E^0Nb6&am>y%)%Cz>NI19OEF=m|-Z>o;A
zkO$YFvbn_y617n6>XJmc(~82x%jhb(gCTtozAF>(H$K9kj={cuLLiu~6MxeVn+I`I
z?x9=q;QCWGw^;r*4U`{PIov>5k`ehk)Nm+#@M<2wqYA)N6Tm?I1GMIJqb<(`Z=I;a
z&7d7;xu0(6mOQxrl+7)cyR{Y-Nfs{UNo^?Fu18Ly5_KoqVJq_BrpyER5do)T%aI+c
zK=s!~*h{_QtUk-ab}!Kl-LC3Q+5BR$Dk!$Mt;)r1CKSi(@l#wa&csyU$CxUd+gcA<
z!d0eUMSh%ybdkI`HSN;PYkeu3TkOo1O2`uoC`&M{2HP>BB)$c*_$HB3_AX-@@k%dd
z(3^H&?`HsIOBEwFor;x5&&LRm#kHU$&afs>7G<7_kw>Wmb@@-R!puvKAKp_Se{&rQ
zwlpv<|IajtS(I7yWzDa=VsE{eU-`V?aFy%i=ECU7ch6%jpe)K<imYS+cvGqv@eU)M
s@eSj|8bMj<l>N^x^oPgBwSbrZ7l%*`5<vo2aR2}S07*qoM6N<$f`P3K_W%F@

diff --git a/application/palemoon/themes/osx/privatebrowsing-mask@2x.png b/application/palemoon/themes/osx/privatebrowsing-mask@2x.png
deleted file mode 100644
index ec1cf7452ef6e0251dad9113e8119793bfed4b6f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2639
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

diff --git a/application/palemoon/themes/osx/reload-stop-go.png b/application/palemoon/themes/osx/reload-stop-go.png
deleted file mode 100644
index 1017be9032a298c8aa1f4a5cd4576087d8bb6f0d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1945
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

diff --git a/application/palemoon/themes/osx/sanitizeDialog.css b/application/palemoon/themes/osx/sanitizeDialog.css
deleted file mode 100644
index 2fbedeb76a..0000000000
--- a/application/palemoon/themes/osx/sanitizeDialog.css
+++ /dev/null
@@ -1,93 +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/. */
-
-#sanitizeDurationChoice {
-  margin-inline-end: 0;
-}
-
-/* Align the duration label with the warning box and item list */
-#sanitizeDurationLabel {
-  margin-inline-start: 3px;
-}
-
-
-/* Hide the duration dropdown suffix label if it's empty.  Otherwise it
-   takes up a little space, causing the end of the dropdown to not be aligned
-   with the warning box. */
-#sanitizeDurationSuffixLabel[value=""] {
-  display: none;
-}
-
-
-/* Places tree */
-#placesTreechildren::-moz-tree-row(selected),
-#placesTreechildren::-moz-tree-row(grippyRow) {
-  background: #999;
-}
-
-#placesTreechildren::-moz-tree-cell-text(selected) {
-  color: #111;
-}
-
-
-/* Sanitize everything warning box */
-#sanitizeEverythingWarningBox {
-  background-color: Window;
-  border: 1px solid ThreeDDarkShadow;
-  border-radius: 5px;
-  padding: 16px;
-}
-
-#sanitizeEverythingWarningIcon {
-  list-style-image: url("chrome://global/skin/icons/warning-large.png");
-  padding: 0;
-  margin: 0;
-}
-
-#sanitizeEverythingWarningDescBox {
-  padding: 0 16px;
-  margin: 0;
-}
-
-
-/* Progressive disclosure button */
-#detailsExpanderWrapper {
-  padding: 0;
-  margin: 6px 0;
-}
-
-.expander-up,
-.expander-down {
-  min-width: 0;
-  margin: 0;
-}
-
-.expander-up > .button-box,
-.expander-down > .button-box {
-  padding: 0;
-}
-
-.expander-up {
-  list-style-image: url("chrome://browser/skin/places/expander-open.png");
-}
-
-.expander-down {
-  list-style-image: url("chrome://browser/skin/places/expander-closed.png");
-}
-
-
-/* Make the item list the same width as the warning box */
-#itemList {
-  margin-inline-start: 0;
-  margin-inline-end: 0;
-}
-
-
-/* Align the last dialog button with the end of the warning box */
-.prefWindow-dlgbuttons {
-  margin-inline-end: 0;
-}
-.dialog-button[dlgtype="cancel"] {
-  margin-inline-end: 0;
-}
diff --git a/application/palemoon/themes/osx/searchbar-dropdown-arrow.png b/application/palemoon/themes/osx/searchbar-dropdown-arrow.png
deleted file mode 100644
index 7f5f55ef2b3ccc210bc66fec70c61405024819c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 509
zcmV<Z0RsMsP)<h;3K|Lk000e1NJLTq000^Q000XJ1^@s6VZfd60000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzpGibPRCwB?Q%y?(Q53y8+Vm_aF(#;p
z5)4WVS`{sFCA0`y=&p6U7WD^;wypXhxog+T7J)4@3zCeAghnT=h2xC#(R;&vG!81H
z7Y_Hn`8bDr?|A{+w&A~VcI6~Lg%2~Yc`#B7;nV>bEPRLnVuV6KK}K#;=oALRH;j-U
zMMfzIh3FE}ux|0L1{LC?3!>0CMF_iM-86AzCU#_Y2&L2M8A8ZMI2;B+5WqA|sMqVD
zs_JYuo2_)~=%HMizbil9h!azEK0&aJHfY~9SdA`ku0&%czP}D3N~RPFg-kA&yO1Oa
zWLbt}GMPyv5{joAn`3t)rXOt2<xj6)*F%#LXf_l$*;~uMH;7)6|Gx8k2sBE1nM$QH
z)oK-3W@ntaH=LzYGWoeij*hn$Zd=M5u*}ZvIgZY9M$p6FVzF4<iO1tzMX0^G<3uz<
zXfXoQOOks2B$LAz1wL_4D*kWuGK1Dj#M4n5_hnIXeM}_#G=HJBb$su1)X#POMEHd?
zFf&r&z5+ikw^{B>JB+>Ex8H}NUbFBTegzl+yP~i4FIHUT00000NkvXXu0mjf#iQ8)

diff --git a/application/palemoon/themes/osx/searchbar.css b/application/palemoon/themes/osx/searchbar.css
deleted file mode 100644
index e21101ba4f..0000000000
--- a/application/palemoon/themes/osx/searchbar.css
+++ /dev/null
@@ -1,79 +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/. */
-
-.searchbar-textbox {
-  width: 6em;
-  min-width: 6em;
-}
-
-.autocomplete-textbox-container {
-  -moz-box-align: stretch;
-}
-
-.textbox-input-box {
-  margin: 0;
-}
-
-/* ::::: searchbar-engine-button ::::: */
-
-.searchbar-engine-image {
-  height: 16px;
-  width: 16px;
-  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
-}
-
-.searchbar-engine-button {
-  -moz-appearance: none;
-  min-width: 0;
-  margin: 0;
-  padding: 0;
-  padding-inline-end: 2px;
-  -moz-box-align: center;
-  background: none;
-  border: none;
-}
-
-.searchbar-engine-button > .button-box {
-  -moz-appearance: none;
-  padding: 0;
-  border: 0;
-}
-
-.searchbar-dropmarker-image {
-  list-style-image: url("chrome://browser/skin/searchbar-dropdown-arrow.png");
-  -moz-image-region: rect(0, 13px, 11px, 0);
-}
-
-.searchbar-engine-button[open="true"] > .searchbar-dropmarker-image {
-  -moz-image-region: rect(0, 26px, 11px, 13px);
-}
-
-
-/* ::::: search-go-button ::::: */
-
-.search-go-container {
-  -moz-box-align: center;
-}
-
-.search-go-button {
-  padding: 2px 1px;
-  opacity: .4;
-  list-style-image: url("chrome://browser/skin/Search.png");
-}
-
-.search-go-button:-moz-locale-dir(rtl) {
-  transform: scaleX(-1);
-}
-
-.search-go-button:hover {
-  opacity: .6;
-}
-
-.search-go-button:hover:active {
-  opacity: .8;
-}
-
-.searchbar-engine-menuitem[selected="true"] > .menu-iconic-text {
-  font-weight: bold;
-}
diff --git a/application/palemoon/themes/osx/setDesktopBackground.css b/application/palemoon/themes/osx/setDesktopBackground.css
deleted file mode 100644
index 585284c7b4..0000000000
--- a/application/palemoon/themes/osx/setDesktopBackground.css
+++ /dev/null
@@ -1,18 +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/. */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
-
-html|canvas#screen {
-  margin: 12px 11px 32px;
-}
-
-#monitor {
-  list-style-image: url("chrome://browser/skin/monitor.png");
-}
-
-#monitor[aspectratio="16:10"] {
-  list-style-image: url("chrome://browser/skin/monitor_16-10.png");
-}
diff --git a/application/palemoon/themes/osx/shared.inc b/application/palemoon/themes/osx/shared.inc
deleted file mode 100644
index 49be77d313..0000000000
--- a/application/palemoon/themes/osx/shared.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-%include ../../../../toolkit/themes/osx/global/shared.inc
-%include ../shared/browser.inc
-
-%define hudButton -moz-appearance: none; color: #434343; border-radius: 4px; border: 1px solid #b5b5b5; background: linear-gradient(#fff, #f2f2f2); box-shadow: inset 0 1px rgba(255,255,255,.8), inset 0 0 1px rgba(255,255, 255,.25), 0 1px rgba(255,255,255,.3); background-clip: padding-box; background-origin: padding-box; padding: 2px 6px;
-%define hudButtonPressed box-shadow: inset 0 1px 4px -3px #000, 0 1px rgba(255,255,255,.3);
-%define hudButtonFocused box-shadow: 0 0 1px -moz-mac-focusring inset, 0 0 4px 1px -moz-mac-focusring, 0 0 2px 1px -moz-mac-focusring;
diff --git a/application/palemoon/themes/osx/slowStartup-16.png b/application/palemoon/themes/osx/slowStartup-16.png
deleted file mode 100644
index 5551ef054e0a018cf465ca1fd3a4cb333a910236..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 512
zcmV+b0{{JqP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005UNkl<Zc-p1Y
zJx|+E6b9e}OC_WZRCMZqSUa^{kzlJ-b?m}|DoXQ7?AVE8J0FfQNlZdWN`S(I)Q(k$
z{(!1OCJ+M)Li~bGEr<aj5K2$qV-bm3>6GD-&%O7(C+7|!W*!RZ_Hx)$=$KBeYnA<d
z)O#=mGze*yd!JIOG;b?wo9wqf2Bb!#pE!FA6h`Ts)Ayp_HF~x6ZC-8f{KKnnFv4xg
zg^^;E0&33Lbp19<gRp9Ii;F9bYvg8t?xUqlK9DVVCtm#nM(zxRGd!jC2iZNKK1%Ag
zcxJnPPeT9W`Yma2qgmxQ8QVR}<d=K6w@WcKC%S0B<=Xl{PPHkQIc++sZoA(KUY$#o
zHCf+KR52#t6%H;WghP3+1mqhqohmCv@#~Uqzch*~K}NEe;Dp{M^(q{|bW*dvXr^-v
zzu{81%I5<6hd6%(r%JZKs!_a(DaH@1pVPa9HVb1g6-i~SxSF$2&jG=FJZ(l7lX~<n
z^AN^i6iCoQOzqo|?)WuE9RY&vR3^_DUH0NYVe~eV67rN^7@HGmld+xzg4eh#BTIv>
z?1lA<5%|2A&?NK;9st1;_>TP}e7AtYhW$4V-{3Ejw;CJtWvjLT0000<MNUMnLSTXy
C1?k-Y

diff --git a/application/palemoon/themes/osx/statusbar/overlay.css b/application/palemoon/themes/osx/statusbar/overlay.css
deleted file mode 100644
index d54334206b..0000000000
--- a/application/palemoon/themes/osx/statusbar/overlay.css
+++ /dev/null
@@ -1,108 +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/. */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-%include ../../shared/statusbar/overlay.css
-
-/*
- * General
- */
-
-#status4evar-status-text,
-#status4evar-progress-bar
-{
-	margin: 0px 4px;
-}
-
-/*
- * Download status
- */
-
-#status4evar-download-progress-bar
-{
-	height: 5px;
-}
-
-#status4evar-download-button[attention] #status4evar-download-icon
-{
-	background-image: url("chrome://browser/skin/downloads/download-glow.png");
-}
-
-#status-bar
-{
-	padding-right: 0px;
-}
-
-#browser-bottombox > #addon-bar:last-child
-{
-	padding-right: 16px;
-}
-
-#status4evar-download-button #status4evar-download-icon
-{
-	background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"), 0, 108, 18, 90) center no-repeat;
-  min-width: 18px;
-  min-height: 18px;
-}
-
-#status4evar-download-button:-moz-lwtheme-brighttext #status4evar-download-icon
-{
-	background: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted.png"), 0, 108, 18, 90) center no-repeat;
-}
-
-#status4evar-download-button[attention] #status4evar-download-icon
-{
-	background-image: url("chrome://browser/skin/downloads/download-glow.png");
-}
-
-toolbar[mode="icons"] #status4evar-download-button[forcelabel="true"] > label
-{
-	margin: 0px 2px !important;
-	margin-inline-start: 3px !important;
-}
-
-/*
- * Splitter
- */
-
-splitter.status4evar-status-splitter
-{
-	width: 8px;
-	margin: 0px -4px;
-}
-
-/*
- * Location bar
- */
-
-#urlbar-progress-alt
-{
-       margin-right: -1px;
-}
-
-/*
- * Toolbar progress
- */
-
-#status4evar-progress-bar[s4estyle="true"]
-{
-	-moz-appearance: none;
-	border: 1px solid gray;
-}
-
-#status4evar-progress-bar[s4estyle="true"] > .progress-remainder
-{
-	background-color: white;
-}
-
-/*
- * Gripper
- */
-
-#status4evar-window-gripper
-{
-	display: none;
-}
-
diff --git a/application/palemoon/themes/osx/statusbar/prefs.css b/application/palemoon/themes/osx/statusbar/prefs.css
deleted file mode 100644
index 798a62d74b..0000000000
--- a/application/palemoon/themes/osx/statusbar/prefs.css
+++ /dev/null
@@ -1,13 +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/. */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-%include ../../shared/statusbar/prefs.css
-
-#status4evar-addonbar-windowGripper-check
-{
-	display: none;
-}
-
diff --git a/application/palemoon/themes/osx/sync-128.png b/application/palemoon/themes/osx/sync-128.png
deleted file mode 100644
index 1ea34818ceb9cf9b4ea607fc62884c575e71b893..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20229
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%0D*u=8R#wpg@}XS
z>G9Y-FI0^F=Z4Rh=pDt~FN6@FmVGC`3?A$MnfLu&(f4<%&w9{%nZTl&aGOd0H4Aqe
zIBNaKMgcT*nU*q;*7k4upb6jMs#a2z$;n9*gfz+thlId`y9ivxp%g^)xs(3C6~XVk
z&jRQ^1<;3h%mji9egC0^tNI=@!Sh2)gUQKBLx(54rs336`ZwC97UF;-S`ZSZEJ^Fa
z;mzUB-EgaBv)M$oT1B(j^x$TCdfGT`HvvY_eWX!nA^0JL%=&&0aYktN4<5)L9G>7*
zn!rlvJ{O?_<xqW!qYj}w{xwHNMhpqF-EQ~HJfZ`VB#9qvMc269ZlhYQ`a|~%Q4vHR
zni4>?(3xn<aAjMTWqzs`g)`(TI-QQMC776)Fhx-qAw&omf$kWzvQMb|aTJC91fl;V
z1$aDVIFwNPO}RdV0-2ea8AIQba1w1w4L6Yx!%9gt3aJT8g|mu}xB`S#s$}vjm5QI!
zPrfT${T^=Tpf4RRX`<(lWtf<lFmW6kV+>ZTSP=?MJ%N+W4<YC$+EiyA$1)tsLYO`U
z^*)^hNK`l>dP?$;+YCp=Q;h-v=_E-!mqO9N;V23Fe**xr)XG-fW#!%g0000<MNUMn
GLSTYJ`!e_d

diff --git a/application/palemoon/themes/osx/sync-16.png b/application/palemoon/themes/osx/sync-16.png
deleted file mode 100644
index 0afb1c719256e26e7cd12f75858f09580800f1d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1847
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
R*N?LN%B12T(NRHk=6~^}<g@?)

diff --git a/application/palemoon/themes/osx/sync-32.png b/application/palemoon/themes/osx/sync-32.png
deleted file mode 100644
index 7a762cb9865b06e848e00ae7bdea64a766c3694e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3384
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

diff --git a/application/palemoon/themes/osx/sync-bg.png b/application/palemoon/themes/osx/sync-bg.png
deleted file mode 100644
index 893a27d76ed0ba02cb06d0bc12b0e8ecd77a7abb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21309
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
Ikc9>OA0mFDkN^Mx

diff --git a/application/palemoon/themes/osx/sync-desktopIcon.png b/application/palemoon/themes/osx/sync-desktopIcon.png
deleted file mode 100644
index d3d1e27c32c3794e4263e23440867f5812299faf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 291
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5Xj(WN{hE&{2`t$$4J+o>9tIL+JenkvHzdf(KjtHGo-oSe5
zW`5R!(+awpepAjZKOb*2XJ3J2ilXuv1~yJZ!L~PVau)H-Fv%2JCGPOx`}_Mm_H}<0
zPBBb~;$i;x=jY)MPfv?4;$c{M)ZoGO_3=FXayDSeHE{~pSWm<y98&WLXMPY@@%y3h
z;Wl3B4kLyoVs{yitLw+TuXjrFa`|>hOyQru(!HiPOnJu4vXj=>mp<e&-^6I%z+|M7
krnaG9QuFLN21Yi9=@V18dfeK|3G@(yr>mdKI;Vst0PLS{2><{9

diff --git a/application/palemoon/themes/osx/sync-mobileIcon.png b/application/palemoon/themes/osx/sync-mobileIcon.png
deleted file mode 100644
index a3bda5751570e4a3180cc6857eb2b0f2e89b9b08..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 352
zcmV-m0iXVfP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz0!c(cRCwBA`2YVu12){+Gx0wzIb_TT
zBHDT<IWRCV>}Nm%igGdx_a8lhaUH9Q^A0dz0W45@zlnhkgS3P=ilm;FI>XZ!FB#5U
zxB@bq5uX7J5~3muIXO8P3MNjR$bb(p!5IJk{bTs`>lX$FiKBx_Gw1#X;xrT&{Q2{T
z;m4037>YsS$QprEdR}@mBa}T0?t;I6|1y00_6-Ar#9;uW5lGF%8U`SnZrr$m*9CaP
z0NEyFfJ+?109-a<3j>^9AY=eE3{VVWA;$|agD?!(ym>SEVE|INefxH-G*Je8`1FOr
y+1VMa0htDg;{z}+I6i&#c0V3<j<_TM0t^7eHQQ8J3E+wV0000<MNUMnLSTX^v4tT3

diff --git a/application/palemoon/themes/osx/sync-throbber.png b/application/palemoon/themes/osx/sync-throbber.png
deleted file mode 100644
index d25490b4faa7d215db750a20d2f4b17b1954f1b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10362
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

diff --git a/application/palemoon/themes/osx/syncCommon.css b/application/palemoon/themes/osx/syncCommon.css
deleted file mode 100644
index 838788cd52..0000000000
--- a/application/palemoon/themes/osx/syncCommon.css
+++ /dev/null
@@ -1,49 +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/. */
-
-/* The following are used by both sync/setup.xul and sync/genericChange.xul */
-.status {
-  color: -moz-dialogtext;
-}
-
-.statusIcon {
-  margin-inline-start: 4px;
-  max-height: 16px;
-  max-width: 16px;
-}
-
-.statusIcon[status="active"] {
-  list-style-image: url("chrome://global/skin/icons/loading_16.png");
-}
-
-.statusIcon[status="error"] {
-  list-style-image: url("chrome://global/skin/icons/error-16.png");
-}
-
-.statusIcon[status="success"] {
-  list-style-image: url("chrome://global/skin/icons/information-16.png");
-}
-
-/* .data is only used by sync/genericChange.xul, but it seems unnecessary to have
-   a separate stylesheet for it. */
-.data {
-  font-size: 90%;
-  font-weight: bold;
-}
-
-dialog#change-dialog {
-  width: 40em;
-}
-
-image#syncIcon {
-  list-style-image: url("chrome://browser/skin/sync-32.png");
-}
-
-#introText {
-  margin-top: 2px;
-}
-
-#feedback {
-  height: 2em;
-}
diff --git a/application/palemoon/themes/osx/syncProgress.css b/application/palemoon/themes/osx/syncProgress.css
deleted file mode 100644
index d7aa599761..0000000000
--- a/application/palemoon/themes/osx/syncProgress.css
+++ /dev/null
@@ -1,46 +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/. */
-@import url(chrome://global/skin/inContentUI.css);
-
-:root {
-  height: 100%;
-  width: 100%;
-  padding: 0;
-}
-
-body {
-  margin: 0;
-  padding: 0 2em;
-}
-
-#floatingBox {
-  margin: 4em auto;
-  max-width: 40em;
-  min-width: 23em;
-  padding: 1em 1.5em;
-  position: relative;
-  text-align: center;
-}
-
-#successLogo {
-  margin: 1em 2em;
-}
-
-#loadingText {
-  margin: 2em 6em;
-}
-
-#progressBar {
-  margin: 2em 10em;
-}
-
-#uploadProgressBar{
-  width: 100%;
-}
-
-#bottomRow {
-  margin-top: 2em;
-  padding: 0;
-  text-align: end;
-}
diff --git a/application/palemoon/themes/osx/syncQuota.css b/application/palemoon/themes/osx/syncQuota.css
deleted file mode 100644
index 1577de8a3b..0000000000
--- a/application/palemoon/themes/osx/syncQuota.css
+++ /dev/null
@@ -1,26 +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/. */
-
-#quotaDialog {
-  width: 33em;
-  height: 25em;
-}
-
-treechildren::-moz-tree-checkbox {
-  list-style-image: none;
-}
-treechildren::-moz-tree-checkbox(checked) {
-  list-style-image: url("chrome://global/skin/checkbox/cbox-check.gif");
-}
-treechildren::-moz-tree-checkbox(disabled) {
-  list-style-image: url("chrome://global/skin/checkbox/cbox-check-dis.gif");
-}
-
-#treeCaption {
-  height: 4em;
-}
-
-.captionWarning {
-  font-weight: bold;
-}
diff --git a/application/palemoon/themes/osx/syncSetup.css b/application/palemoon/themes/osx/syncSetup.css
deleted file mode 100644
index 8898951ebd..0000000000
--- a/application/palemoon/themes/osx/syncSetup.css
+++ /dev/null
@@ -1,132 +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/. */
-
-wizard {
-  -moz-appearance: none;
-  width: 55em;
-  height: 45em;
-  padding: 0;
-  background-color: Window;
-}
-
-.wizard-page-box {
-  -moz-appearance: none;
-  padding-left: 0;
-  padding-right: 0;
-  margin: 0;
-}
-
-wizardpage {
-  -moz-box-pack: center;
-  -moz-box-align: center;
-  margin: 0;
-  padding: 0 6em;
-  background-color: Window;
-}
-
-.wizard-header {
-  -moz-appearance: none;
-  border: none;
-  padding: 2em 0 1em 0;
-  text-align: center;
-}
-.wizard-header-label {
-  font-size: 24pt;
-  font-weight: normal;
-}
-
-.wizard-buttons {
-  background-color: rgba(0,0,0,0.1);
-  padding: 1em;
-}
-
-.wizard-buttons-separator {
-  visibility: collapse;
-}
-
-.wizard-header-icon {
-  visibility: collapse;
-}
-
-.accountChoiceButton {
-  font: menu;
-}
-
-.confirm {
-  border: 1px solid black;
-  padding: 1em;
-  border-radius: 5px;
-}
-
-/* Override the text-link style from global.css */
-description > .text-link,
-description > .text-link:focus {
-  margin: 0px;
-  padding: 0px;
-  border: 0px;
-}
-
-
-.success,
-.error {
-  padding: 2px;
-  border-radius: 2px;
-}
-
-.error {
-  background-color: #FF0000 !important;
-  color: #FFFFFF !important;
-}
-
-.success {
-  background-color: #00FF00 !important;
-}
-
-.warning {
-  font-weight: bold;
-  font-size: 100%;
-  color: red;
-}
-
-.mainDesc {
-  font-weight: bold;
-  font-size: 100%;
-}
-
-.normal {
-  font-size: 100%;
-}
-
-.inputColumn {
-  margin-inline-end: 2px
-}
-
-.pin {
-  font-size: 18pt;
-  width: 4em;
-  text-align: center; 
-}
-
-#passphraseHelpSpacer {
-  width: 0.5em;
-}
-
-#pairDeviceThrobber > image,
-#login-throbber > image {
-  list-style-image: url("chrome://global/skin/icons/loading_16.png");
-}
-
-#captchaFeedback {
-  visibility: hidden;
-}
-
-#successPageIcon {
-  /* TODO replace this with a 128px version (bug 591122) */
-  list-style-image: url("chrome://browser/skin/sync-32.png");
-}
-
-#tosDesc {
-  margin-left: -7px;
-  margin-bottom: 3px;
-}
\ No newline at end of file
diff --git a/application/palemoon/themes/osx/tabbrowser/alltabs-inverted.png b/application/palemoon/themes/osx/tabbrowser/alltabs-inverted.png
deleted file mode 100644
index 002bdd47fd66766ebc6c1eed08a94a556233acb1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 469
zcmV;`0V@89P)<h;3K|Lk000e1NJLTq000~S000mO1^@s61<xPv00007bV*G`2i^-2
z04FwX>hb6R000SaNLh0L01EH`01EH{Laa2H0004WNkl<Zc-rMu&1!={5S|+IS9%g6
zLQXZg^x~;6;49=MdhUxU_yW1*)Ix7wEIG7?qKAN#NQ{-v$c_vf(+cgW9r&`7Z)fIn
z^<x44dR)-YVzDrBxkOA62BJnBRn1Uv1!C`cUM2Rf6b6V7#6j(i1@}$}!|-UTO%l6C
znDBLw&=!%a|0HyS7=6=MB4Wgj1?XgEk|YmYv0N^1Y3<;qn&2o1f_0W<Fq_R_wOaYK
z(ZNye&QOiKLZ0U*kEd~l$mx|q9LEqvQL}P%a0A&~Gdr0~P6Rcs7CC(%a2$tx(5xIC
zTvN-hv@wWfS$DjPIh^5+La;H2@B8;mxULIlxPuhrfsgv>x;Q;>;8Pz?3X;8{r)h?w
zpR5l(O*59?ur<PFvw<{C+liDDC*nt@;S;t-n9t{6+jiSXc~KNn@K;Pj6RRGksZ=co
z-5_NT)0C>V72G4XIPeX$s|~qV(5^O3Fvfu|pj~aqJ%e_&!M})4hkdJK%LY^100000
LNkvXXu0mjf6>`h0

diff --git a/application/palemoon/themes/osx/tabbrowser/alltabs.png b/application/palemoon/themes/osx/tabbrowser/alltabs.png
deleted file mode 100644
index 172d425f803abf31a0760b741dc67026690d8148..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 584
zcmV-O0=NB%P)<h;3K|Lk000e1NJLTq000~S000mO1^@s61<xPv00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ-&PhZ;RCwClmCa5XQ5c3F{>6?&tFfs8TBxytAyPq&b=8aMqIW>ApqJ1^FTsoG
zN|PE)T!}SRG!Vo|DM}~cFb>nrIe64brwhZPUvd`nyx%$Rmosl>e2(KV%JMVf3IZHA
zFN4515EVlV088|Q6xIW}Tm8u!MbpFz05)I>Eut_3FiJ_Rpb*D_lpNqMbpup^j(FC9
z3=sC%*9R&<TN*@x;Cv!p)}GB_Tr~Jms}})WSoEG@_~VE7Ut^g(oytC+K7V-!;KDT3
z&<~K#=7_&cQ#(5uj+R==k$91&etP2e-U9%yRyRnjY*5ppL&1dwP_A$QV4FQ0vrAxL
z-JUqGaLg{Y*+cCWWdqoaDpu?XcB6VLJY+V2&v6`%o0m_4)RZ<>kZRkw-UD!9)vf;I
zFM(!(Y+-`D?AiOxK7b25C?(PFghZNnvHK-WyqJ2WA%Ml#3+08yEUlk9+uJ)ufX&Uf
z<>{GOjt&nv{C-rFy-M`?$IwJnLq9-nIZwW@%6YvuJn_v+k>~LQkx2OQLt`2p+Io|#
zmOk8g)zTRYhcJ!KqlP9XLbL7>nr|XB(tQfZ6ed{n2+b}~DJ5x3!;yX3eE<F5;?DrN
WGymvyx-HNE0000<MNUMnLSTXq3;NRl

diff --git a/application/palemoon/themes/osx/tabbrowser/connecting.png b/application/palemoon/themes/osx/tabbrowser/connecting.png
deleted file mode 100644
index e564fb5708f3d9da4c623bb3bdfccb960566e327..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8540
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
C(O-rD

diff --git a/application/palemoon/themes/osx/tabbrowser/loading.png b/application/palemoon/themes/osx/tabbrowser/loading.png
deleted file mode 100644
index ba54836e9834f2c495bcfb05738b56481b2dbed0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10727
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

diff --git a/application/palemoon/themes/osx/tabbrowser/newtab-inverted.png b/application/palemoon/themes/osx/tabbrowser/newtab-inverted.png
deleted file mode 100644
index 4ac1ebaaf0d7c9d8d1efe4b7b6545b07ed3f121d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 247
zcmeAS@N?(olHy`uVBq!ia0vp^0zfRp!3HFQtmCqPlw^r(L`iUdT1k0gQ7VIDN`6wR
zf@f}GdTLN=VoGJ<$y6JlqM4p9jv*DdlK%YvZ_ljSQ20UOz=;zbdgA;?!UDb-D#Uf@
zaBi14a^PXt%>N4+j<`*4d6}HFKp-H8ft$}h`KyqSw4j<tBExrMMTSuCxdsm34rzW_
z!E$Q?TkoUDj9-3<F6;sZ%!c9upPdY=Ob#7!%$kw-YeMV?@s9lu3*V;Ca#yx;;F}!$
u<OyrQj1A5=?H9%!Il;|5e=Z{v4};&~ZU?t*muCVU$>8bg=d#Wzp$Pz4=2^`E

diff --git a/application/palemoon/themes/osx/tabbrowser/newtab.png b/application/palemoon/themes/osx/tabbrowser/newtab.png
deleted file mode 100644
index 7cea7bdd8f7f073156e7fe505fa842ded15195c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 237
zcmV<J022R+P)<h;3K|Lk000e1NJLTq000mG000sQ1^@s6QafI10002ANkl<Zc-qC&
zzYBsu7{>AL-*^ccYiLxWu^aj^bq(TDs8CCYtwDeMQ;)>Up$?uQ4Iem8`EvK7697LM
zJz!{PKzyMA^C8nk4EhF4aA0K}C?sG!V%-I#0o5Ilrd?8ix}IskKk{t3#yr~8VtYhV
zRK&IJ^Bp}=GZ0yaLwc>btVCYDh-=-CyqR=eVedQNpCGOqq}LEn`2*B%i0zQLtO5=G
n4z}qH6dq{LME>$KsZj%O*eX1Hw;$xg00000NkvXXu0mjfUa(*y

diff --git a/application/palemoon/themes/osx/tabbrowser/tab-arrow-left-inverted.png b/application/palemoon/themes/osx/tabbrowser/tab-arrow-left-inverted.png
deleted file mode 100644
index 16cd7a2775ae1f56274035fcde4ed5e8c211a52c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 250
zcmeAS@N?(olHy`uVBq!ia0vp^{6H+o!3HFmxV|j}Qj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>JispE_IEGZ*O8WEvzdiHLhR#N&15IZVQ&NsBJI2|O+xWvk
z;JtI1rsC|sjW?bjY-YD~xFwk-z|`Q=l&B;1``+H_@1h#t<ueXsE9{qZwdFgjA?0Y&
z!M|zdgtQo`zlJeg%OuykInAoRVDe2l+vU2C#+IE85e&<9?9%_YbDUGTc2k5^;%K02
wp^~E^!>Wy<chlTbe3zv0xOsgtc4%N^kb38u%%>m}4Rj}ir>mdKI;Vst0OD<0yZ`_I

diff --git a/application/palemoon/themes/osx/tabbrowser/tab-arrow-left.png b/application/palemoon/themes/osx/tabbrowser/tab-arrow-left.png
deleted file mode 100644
index e0fb348d66f4001a50ca9488b9daddcf37bbc3ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 368
zcmeAS@N?(olHy`uVBq!ia0vp^{6H+o!3-o#udq!9QjEnx?oJHr&dIz4a+U`8gt*>$
z{+>wm^265`@4u*NXsXrEQfr!{)-q4q*h1gJ)_wl=!0;GTD?8Kv<(3mySWQ}K<Lu_-
z>Ejm?5ioyqP()17{LLZD_l7Rq8kvw1o0J}#oSu-Lm6Vmw*|v;ZNL-+Eg<#)0A!#`=
zIYqIVdn6`qkW<rES#Utd#7f`X#=y$n$ja_^()*tv*OvtO1v5B2yO9RsBze2LFm$lW
zdH^|`1s;*b3=G`DAk4@xYmNj^kiEpy*OmP?2Me2lnY^DX6Hv(9)5S4F;&O7r0wDnb
zho@Pd3kph~2JEQf(ui>u6*+5^_Gm@h>RBC&xK_+w#F-({y?|@Q$w^On88&`r?tb+}
Q0%R(Kr>mdKI;Vst0Co0^sQ>@~

diff --git a/application/palemoon/themes/osx/tabbrowser/tab-overflow-border.png b/application/palemoon/themes/osx/tabbrowser/tab-overflow-border.png
deleted file mode 100644
index 77f2462e5bfda652074261e2e160fcbc99c3e04e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 193
zcmeAS@N?(olHy`uVBq!ia0vp^EI=&7!3HGVO5{3#lw^r(L`iUdT1k0gQ7VIDN`6wR
zf@f}GdTLN=VoGJ<$y6JlqGV4O$B>F!Z!R9>YB1nozHp6KvcvDF|A*Uu>OUwQn$h{}
z$=ThF7d}ety>eFPY83Oboz;bBSTAt-9pdt6Qcg<SvR&Oe(M8=+f#-#eM&SL;5AGdo
qovUE_?G%4}<IMt%<e&RkBp4jK#SYh8RpkX*$KdJe=d#Wzp$P!<tVhZK

diff --git a/application/palemoon/themes/osx/tabbrowser/tabDragIndicator.png b/application/palemoon/themes/osx/tabbrowser/tabDragIndicator.png
deleted file mode 100644
index c67c2337d2816edea7288e16719b0191be6a900a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3117
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
Hu0mjfYMRIW

diff --git a/application/palemoon/themes/osx/toolbarbutton-dropdown-arrow-inverted.png b/application/palemoon/themes/osx/toolbarbutton-dropdown-arrow-inverted.png
deleted file mode 100644
index f3261f1da05abdf5fdabdfa17083243deb74b78d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 221
zcmeAS@N?(olHy`uVBq!ia0vp^oIuRZ!3HF6%}!4MQjEnx?oJHr&dIz4a@dl*-CY>|
zgW!U_%O?XxI14-?iy0WWg+Z8+Vb&Z8pdfpRr>`sf9VSj*Vcwl-N0NX-v7RoDArhBM
z&l++y2MDlS5Z75V+52h9wPl}@c5m3aAnxIE!vvS*b1Dt^_k1jx&)c?Y)@|2SS;rV`
zkDZC>Q!p0q`MvJ2aInjowOhpmwU_OEU$?*h1J|5~&-r8$>)GNDi#bnoI~IEoXc2>_
LtDnm{r-UW|A0$f;

diff --git a/application/palemoon/themes/osx/toolbarbutton-dropdown-arrow.png b/application/palemoon/themes/osx/toolbarbutton-dropdown-arrow.png
deleted file mode 100644
index a7abe739634da367dd3af96dacbe8c4c1327f071..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 287
zcmeAS@N?(olHy`uVBq!ia0vp^oIuRZ!3HF6%}!4MQjEnx?oJHr&dIz4a@dl*-CY>|
zgW!U_%O?XxI14-?iy0WWg+Z8+Vb&Z8pdfpRr>`sf9VSj*K`D-AWp$v?d`}n05Q)pB
zr`B>EN?>SxSpN97x>|GngAKR0&RT008D}(ekBt6-(-LgmjvF}K3N?%~q;4Nbo~g8m
z{a(R?LY1$Kr~f}?%dqI%zQ*M5taNYf6Q8I2sj~BQ&1je#;#1xHaM8W2@ZOCgk#0qu
zlbws^Fk6dvG-m9NY`qqG>+9`^?}hd`*NqjJl2rD-^5AlNe9|{4pibpu=e-ZYf1GNV
bJ#84JuGGCh&gAP1bSi_VtDnm{r-UW|eK=^G

diff --git a/application/palemoon/themes/osx/urlbar-arrow.png b/application/palemoon/themes/osx/urlbar-arrow.png
deleted file mode 100644
index fcab253bb301ddfb14e5cabfaa441a6fffff81ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 305
zcmV-10nYx3P)<h;3K|Lk000e1NJLTq000O8000&U1^@s6{nOoG0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy(@8`@RCwBAU|?X-0b&sbT;SWcZ)bs&
z84xpLRq!7OZrr%B2FO&yso>wgfB*OF*|QzU<;SW31U`QJcn-)l0b(Ys3ZPb90tzYM
zRPguj-~SyQ9YsK4F02Yb;Khp<D}cg=I2C}vqD6}`fKpO875w`33luh{K+KL+0SG*M
z_Ur;El$jU^0c^T||NadNes<Cw3H7D{5Hm8M2P-g67=XG@0-3i#dNEA6aN)vwoI(Bh
z^XGF=zhjTAzP`SEoY9Rp!9bH7$Y>T^VTCu*0t6TU2HhI)hrNZJ00000NkvXXu0mjf
DzTkRv

diff --git a/application/palemoon/themes/osx/urlbar-history-dropmarker.png b/application/palemoon/themes/osx/urlbar-history-dropmarker.png
deleted file mode 100644
index fc8b0be983652ea7a0bd19553b894aadc23fda6b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 480
zcmV<60U!Q}P)<h;3K|Lk000e1NJLTq001EX000gM1^@s6p&oUN0004}Nkl<Zc-rmM
z%}N4M6bJCkC`8hT%1DT!fmZVX?rYt;N9YZFfXEg_K@r(DDkut~qOcE5YZSi{Q%iF+
zOCc!=GO8ir^q)W(N=I82)Z)iw?i}u%x%Zq~LqtFBKZ)O!#QgHQVQFnEzjJU*yLQ(X
z+xthfxVkAIj%BQm2FL@+5P;RqUK$_|BtrmJ%tW($$SwFzV|1QKQ#6?=5}!T6DDByu
zX2hwXrpIz`0+L}Y{Go1!Hv!2o7LVgG_tb0UyuA3)WahT$j8Bv8*c*Cz6}k%xcWq?r
zAqZ3g2g*Wh>r|{Bf<Ps3pp@1`Z6wMMy8Pj{_|?rv0^;cOho7VI%K^MsNYAiy<(dTn
zNFoQ!=ksovjIba8N#uYjRhViU=P?H&JQB##N%(>sF5fujRi%naKOZ*&Neq=Myymf>
z5lCXFY<Gy;ZawmZ{Gk{fINTo0b(CAUeJ-p74hSrA)!#JgQvwGBmP#$E5VwEBV#_8{
z>HbQs)ixbqAO-qLv6>M#11Zo~b5E%5?jQOvHdNE&EfZd?I98)^*s1-_WmWg*Zp?S&
W?K3g#I)Y;W0000<MNUMnLSTXx!PWEt

diff --git a/application/palemoon/themes/osx/urlbar-popup-blocked.png b/application/palemoon/themes/osx/urlbar-popup-blocked.png
deleted file mode 100644
index e6fd29f7d3866263660d1f7e537ae96a4858a051..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 745
zcmeAS@N?(olHy`uVBq!ia0vp^20$#p!3HD)*8SPYz`(S@)5S5Q;?~uxzS+WoB5VnY
z0VfWvTDth)sSH#5#R@D;v8=zOcg@YMb12RD`)0fD+G{~tT3U4vloV2~wl4bEJaOW|
zD=!aqyBY>fkCeTy{eJE}O~u4%u{L|Z@A*Dwg0r}#l2ZGv|MsW9$MraJFA@J1`i5Wg
z+W$T<d+9TO-S<%8Aa0#pyKn_bjo;ic6<^&OQx*V4YJ(LdS6pH0miAZG{>?pS{oiS8
z-u#^0eS1=9R^!jF>Q3UNcR7E1ExUg1{N6vBS4!pHt6t82e(q5C!gZf3^f&77J#goi
zGGp7_h50gdH*eldw`Zw3x4B#<=yUVui4Ny0zx6Rc-+AE7+xA5_d(Zq%U~>A_vZnow
z-S>~>7b9+0%KJE+m^Yy`tFGW%cgC8xd-&B9Qv6TM`W*A%*{Rx#60>ypc_%c_c<%dt
zCcE{bjb@Q@QVQ&b{?FK#*>@kil~S3}AalfKzD_}HWv~g~>@(^2S_BIm8YkpewVQ2s
zP0lr%Un%T%fRWYd<evk*4kp*sKF>5yWRVF_c%sf7vv;eaRJ*U3v3?^nWA;&Fv%SmT
zyMe4YvxkL`WsT_hlz&II_9F{eL?&b<#%73YJ$dU)o8kjors?0ez0_UP=CnBMTACRT
z<9op!d(=N4U%y9OYU?Jm&50Zp{Rf`zovUMDxqTaVQlTQ-#(PQ{4l_&l{P&i6(-aZY
z;kafy2UkGa+%xjCtF|Ml`1-H@!2G?zZE75q0b5_$YB;fqY<~5R|Kf5Z6UP(Ht3uy9
z3TiEwq5Apn<oweYSQPnJh3#c`UD1#fX3AYsQkiDTUOIs<Yr^Yai;cf4g4q{J_ua3b
z+-&8+ZhB%S>#kiUdmkMX+fq?=t=hlYn3sRsf}_Tl{{;Tu${u~;(ac%TpMLnoe){dd
V^yd#$U4coM!PC{xWt~$(69CWeSx^7~

diff --git a/application/palemoon/themes/osx/web-notifications-icon.svg b/application/palemoon/themes/osx/web-notifications-icon.svg
deleted file mode 100644
index f7186c7275..0000000000
--- a/application/palemoon/themes/osx/web-notifications-icon.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid" width="64" height="64" viewBox="0 0 64 64">
-  <defs>
-    <style>
-      .icon {
-        fill: #a6a6a6;
-        fill-rule: evenodd;
-      }
-    </style>
-  </defs>
-  <path d="M57,48 L46,48 L46,60.016 L32.482,48 L7,48 C5.343,48 4,46.657 4,45 L4,11.031 C4,9.374 5.343,8.031 7,8.031 L57,8.031 C58.657,8.031 60,9.374 60,11.031 L60,45 C60,46.657 58.657,48 57,48 ZM36,16.031 C36,14.927 35.105,14.031 34,14.031 L30,14.031 C28.895,14.031 28,14.927 28,16.031 L28,30.031 C28,31.136 28.895,32.031 30,32.031 L34,32.031 C35.105,32.031 36,31.136 36,30.031 L36,16.031 ZM36,37.5 C36,36.672 35.328,36 34.5,36 L29.5,36 C28.672,36 28,36.672 28,37.5 L28,40.5 C28,41.328 28.672,42 29.5,42 L34.5,42 C35.328,42 36,41.328 36,40.5 L36,37.5 Z" class="icon"/>
-</svg>
diff --git a/application/palemoon/themes/osx/web-notifications-tray.svg b/application/palemoon/themes/osx/web-notifications-tray.svg
deleted file mode 100644
index 314026a106..0000000000
--- a/application/palemoon/themes/osx/web-notifications-tray.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="16" viewBox="0 0 96 32">
-  <defs>
-    <style>
-      .style-icon-notification {
-        fill: #666666;
-      }
-      .style-icon-notification.hover {
-        fill: #808080;
-      }
-      .style-icon-notification.active {
-        fill: #4d4d4d;
-      }
-    </style>
-    <path id="shape-notifcations-push" d="M27,23.969 L24,23.969 L24,29.977 L17.241,23.969 L5,23.969 C3.343,23.969 2,22.626 2,20.969 L2,6.969 C2,5.312 3.343,3.969 5,3.969 L27,3.969 C28.657,3.969 30,5.312 30,6.969 L30,20.969 C30,22.626 28.657,23.969 27,23.969 ZM18,8.969 C18,7.864 17.105,6.969 16,6.969 C14.895,6.969 14,7.864 14,8.969 L14,13.969 C14,15.073 14.895,15.969 16,15.969 C17.105,15.969 18,15.073 18,13.969 L18,8.969 ZM16.5,17.969 L15.5,17.969 C14.672,17.969 14,18.640 14,19.469 C14,20.297 14.672,20.969 15.5,20.969 L16.5,20.969 C17.328,20.969 18,20.297 18,19.469 C18,18.640 17.328,17.969 16.5,17.969 Z"/>
-  </defs>
-  <use xlink:href="#shape-notifcations-push" class="style-icon-notification"/>
-  <use xlink:href="#shape-notifcations-push" transform="translate(32)" class="style-icon-notification hover"/>
-  <use xlink:href="#shape-notifcations-push" transform="translate(64)" class="style-icon-notification active"/>
-</svg>
diff --git a/application/palemoon/themes/osx/webRTC-shareDevice-16.png b/application/palemoon/themes/osx/webRTC-shareDevice-16.png
deleted file mode 100644
index df01b33515889863c9ef99d0daf650b13a104f2d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 233
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`8$4YcLn>~qy=={OC_#YbK_-i|
zw6}Ku3r-yoN0#|586As$FgXh7>e@C=-8;42<B%11bc=(>hwVSQBHLbyDLrE8K797*
ze>NvCk0O<8jVps@Gt}3I8hSRK*i~9}gZINWaaC2*ms3w2$f*qrx}-k2@#Lo^Puvd}
zSZMteH26^N<yDn#bm6<1msi#W<Ef4JN|q{3VwzZ*U9w&Jf^2)1pP^^p4J!lDEWrzs
gtbQ^3FV;Tbo^!wTieY|G3()Nhp00i_>zopr0MXD}761SM

diff --git a/application/palemoon/themes/osx/webRTC-shareDevice-64.png b/application/palemoon/themes/osx/webRTC-shareDevice-64.png
deleted file mode 100644
index d125789fbce71eff4c4d5af890dd5ed6a862c50e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1097
zcmV-P1h)H$P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000CKNkl<Zc-rln
zO-NKx7>2J<M35Cx;G$Iv>1WX@+|)K&xHF<fD~V{Kjzl>A>p1?8qvQBHo1st`+_Vs4
zCZR<Vf(#^5x-<g8n83)A%;|P}-<W|*I-WB_I>*~tJZR&5_rBkA&pr3tLxyEp|20~G
z7N7-a0a}0-pap0FT0pL}wzlRIEnvR{@Zcrw?d`GN-rjG0eSMbS?>|s@PMrIz*Xw<b
zEY}WF01tc*0g@vlBi8u%xD^V8@&eDz49tQ|cXJfL@0|p<K&enbOH0cYnBN{99c2I|
zU>0QBLbhUH*bp_(@053UcW?Cf_gftu9hOi)S65eLXlRHhRtjWd1Cx>h__qS!VdJTb
z$&n-$fG>UGup1j2QwnDC`Fx4y=4QjjZq4)aqZsbtfq?-w&w9dou>cG;Q?cgl4VVG}
z{H(C8t?fl15U@8dFQBKVhlNVQY)wr~h7Egm{<{cIt~Y3&BW6cEF0RxFP*wo4WfH*O
zFJb=rFgQ54SH08-pgkpFw#LRr!v-_+=XEr{j^;)6VgYz$Si{4^N`h=V1b{MpzJ=yx
z>K!M*g{x`?gF)GPsdWIKxk|!p4Gj$jC_wXm-qX19+0=^#bar-HFsdZHhwJO>k72@_
zN;RKVJ$gIb0<fy%Fn)#Sxv2Tv1z@?!gDVN1?`d+WmwOk$LV_o7B<M{}0M^h>L<^7-
zfE^f4HjV_ni3Q+Iid#~S1igs`csw3%95@p6CKSN^Grl)F67;48$ZU%8z1fkVH=zJ-
zDRIs1NYI;50C!fn-c}L5&2c@?pE=c|x5F)f&+%|L9LK#(3Hu^|n+!a-ilm2d>BPju
zOWe<Vxyh;?y$J<yvw_1*Ntms=x|%s}Oixcg!xjCBQISo(lmMDllC*%7gsZc&vriyl
z3oAUCdglnRNw~1MxERFkuz^+HzY%~fC%!c)3A4FeF2e>h7p<(UcrgkR5W$IZuX?e7
zy1F_ZL`j&fs;bJck<NW8kw`qoME9OEJ!E967YnGZtyNY4vSkuLj&E*m-p6b2JIwZ!
zkh1`j#R|d(%*x72!^YqFkC>);Clm_JVYqYcZ?C67sfEzzRH0HJ6W0Oj0s*7|+>Asb
zQAqfOy6gmC>u8Qc2(zkEFcY%9uBfOmY%p^sN}|!|6q-&#+@E8(-EOgfcs%|9McbHB
zm1&+?km<+5!a{i#0?6h0`S}p)Ki1UL@DVB$K+eQsu}KspX&v?$ATRLT$iOR?oSB(<
zifpH|6hO{{hihwVzSY%Lzl;EKacOBOh;5{|SUh~e<nuir@Z8L>yu2JhreZdnQGl2e
zpiou-IR|coN5GvYc<wTAmd);h{=dRnfEJ(yXaQP)7N7-a0a}0-kQ=`NqXz$3vl*3;
P00000NkvXXu0mjfSQP=H

diff --git a/application/palemoon/themes/osx/webRTC-sharingDevice-16.png b/application/palemoon/themes/osx/webRTC-sharingDevice-16.png
deleted file mode 100644
index a670676a01b7b46e4b2556c4e98542e821d3f047..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 404
zcmV;F0c-w=P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00047Nkl<Zc-p0s
zy-tH*6o!d`l%b|YTT1z9aHyk`cjDrWm>4j%3f5M!;^1|dcmoc`A8KQTHfrPVY9gC%
zt)J%*DhrY{3{S$xdEbXG<WR?iN(EK#@~J=z1Iz&mp#FmrW*97m9TuP|92oui)7^pe
z)4G>Q95};FC}Hg{rV8gHc+OL3Z}i3S;j2pQw}n`6))<H*$S$`1%(Ch6uF(?+oMjZK
zARz4*HIXLV<iKZFO|SI6Kdcb!U^fu#cx7TeRT9}7Dx~=!`mIMfI725A7<U2&rUE*V
zVC$BLD@s!Vok&pc7U3tA6EQu37;f>ybW6b*I+38(DG<{Y64``;^~tPkINURSz2+4D
z1hRg`jqv4mFCLs>2C`Mlr<b(r+|BxV9t9E#IL*nPXcydAzvM_9IKxc1NE!QkM%6o6
y6P|OEwd4RfVU^`D!>panVuwc2WR+8qTJQ@#3j%MMTlFOX0000<MNUMnLSTXuc(MHe