Commit 5a9f0908 authored by Carsten "Tomcat" Book's avatar Carsten "Tomcat" Book
Browse files

merge mozilla-inbound to mozilla-central a=merge

parents 4939dfc1 d180cd4a

.hgignore

+3 −0
Original line number Diff line number Diff line
@@ -104,6 +104,9 @@ GPATH 
^testing/mozharness/logs/

^testing/mozharness/build/



# Ignore tox generated dir

.tox/



# Ignore node_modules from eslint-plugin-mozilla

^testing/eslint-plugin-mozilla/node_modules/

accessible/mac/mozAccessible.mm

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ ConvertToNSArray(nsTArray<ProxyAccessible*>& aArray) 
  NSScreen* mainView = [[NSScreen screens] objectAtIndex:0];

  NSPoint tmpPoint = NSMakePoint(point.x,

                                 [mainView frame].size.height - point.y);

  nsIntPoint geckoPoint = nsCocoaUtils::

  LayoutDeviceIntPoint geckoPoint = nsCocoaUtils::

    CocoaPointsToDevPixels(tmpPoint, nsCocoaUtils::GetBackingScaleFactor(mainView));



  mozAccessible* nativeChild = nil;

browser/components/migration/nsEdgeReadingListExtractor.cpp

+9 −5
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include "nsNetUtil.h"

#include "nsServiceManagerUtils.h"

#include "nsWindowsMigrationUtils.h"

#include "nsStringGlue.h"



#define NS_HANDLE_JET_ERROR(err) { \

  if (err < JET_errSuccess) {	\
@@ -199,12 +200,15 @@ nsEdgeReadingListExtractor::ConvertJETError(const JET_ERR &aError) 
      return NS_ERROR_FILE_NOT_FOUND;

    case JET_errDatabaseDirtyShutdown:

      return NS_ERROR_FILE_CORRUPTED;

    default:

      nsCOMPtr<nsIConsoleService> consoleService = do_GetService(NS_CONSOLESERVICE_CONTRACTID);

      wchar_t* msg = new wchar_t[80];

      swprintf(msg, 80, MOZ_UTF16("Unexpected JET error from ESE database: %ld"), aError);

      consoleService->LogStringMessage(msg);

    default: {

      nsCOMPtr<nsIConsoleService>

        consoleService = do_GetService(NS_CONSOLESERVICE_CONTRACTID);

      nsAutoString msg;

      msg.AppendLiteral("Unexpected JET error from ESE database: ");

      msg.AppendInt(aError);

      consoleService->LogStringMessage(msg.get());

      return NS_ERROR_FAILURE;

    }

  }

}

build/sanitizers/lsan_suppressions.txt

+4 −0
Original line number Diff line number Diff line
@@ -89,6 +89,10 @@ leak:MessageLoop::MessageLoop 
leak:base::WaitableEvent::TimedWait

leak:MessageLoop::PostTask_Helper



# Bug 1189430 - DNS leaks in mochitest-chrome.

leak:nsDNSService::AsyncResolveExtended

leak:_GetAddrInfo_Portable



# Bug 1189568 - Indirect leaks of IMContextWrapper and nsIntRect.

leak:nsWindow::Create

leak:nsBaseWidget::StoreWindowClipRegion

devtools/server/actors/root.js

+33 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ function RootActor(aConnection, aParameters) { 
  this._onTabListChanged = this.onTabListChanged.bind(this);

  this._onAddonListChanged = this.onAddonListChanged.bind(this);

  this._onWorkerListChanged = this.onWorkerListChanged.bind(this);

  this._onServiceWorkerRegistrationListChanged = this.onServiceWorkerRegistrationListChanged.bind(this);

  this._extraActors = {};



  this._globalActorPool = new ActorPool(this.conn);
@@ -386,6 +387,37 @@ RootActor.prototype = { 
    this._parameters.workerList.onListChanged = null;

  },



  onListServiceWorkerRegistrations: function () {

    let registrationList = this._parameters.serviceWorkerRegistrationList;

    if (!registrationList) {

      return { from: this.actorID, error: "noServiceWorkerRegistrations",

               message: "This root actor has no service worker registrations." };

    }



    return registrationList.getList().then(actors => {

      let pool = new ActorPool(this.conn);

      for (let actor of actors) {

        pool.addActor(actor);

      }



      this.conn.removeActorPool(this._serviceWorkerRegistrationActorPool);

      this._serviceWorkerRegistrationActorPool = pool;

      this.conn.addActorPool(this._serviceWorkerRegistrationActorPool);



      registrationList.onListChanged = this._onServiceWorkerRegistrationListChanged;



      return {

        "from": this.actorID,

        "registrations": actors.map(actor => actor.form())

      };

    });

  },



  onServiceWorkerRegistrationListChanged: function () {

    this.conn.send({ from: this.actorID, type: "serviceWorkerRegistrationListChanged" });

    this._parameters.serviceWorkerRegistrationList.onListChanged = null;

  },



  onListProcesses: function () {

    let processes = [];

    for (let i = 0; i < ppmm.childCount; i++) {
@@ -473,6 +505,7 @@ RootActor.prototype.requestTypes = { 
  "getTab": RootActor.prototype.onGetTab,

  "listAddons": RootActor.prototype.onListAddons,

  "listWorkers": RootActor.prototype.onListWorkers,

  "listServiceWorkerRegistrations": RootActor.prototype.onListServiceWorkerRegistrations,

  "listProcesses": RootActor.prototype.onListProcesses,

  "getProcess": RootActor.prototype.onGetProcess,

  "echo": RootActor.prototype.onEcho,