Bug 1361332 - replace sdk/util/object by Object.assign in devtools;r=zer0

MozReview-Commit-ID: 3IREzyuAjAF

--HG--
extra : rebase_source : 758d431d809f0ac7bf70a1a39c2f38c83361e8f6

devtools/client/performance/modules/logic/waterfall-utils.js

@@ -7,7 +7,6 @@
  * Utility functions for collapsing markers into a waterfall.
  */
 
-const { extend } = require("sdk/util/object");
 const { MarkerBlueprintUtils } = require("devtools/client/performance/modules/marker-blueprint-utils");
 
 /**
@@ -19,7 +18,7 @@ const { MarkerBlueprintUtils } = require("devtools/client/performance/modules/ma
  * @return object
  */
 function createParentNode(marker) {
-  return extend(marker, { submarkers: [] });
+  return Object.assign({}, marker, { submarkers: [] });
 }
 
 /**
@@ -56,7 +55,7 @@ function collapseMarkersIntoNode({ rootNode, markersList, filter }) {
     if (collapsible) {
       extendedProps.submarkers = [];
     }
-    curr = extend(curr, extendedProps);
+    Object.assign(curr, extendedProps);
 
     // If not nestible, just push it inside the root node. Additionally,
     // markers originating outside the main thread are considered to be

devtools/server/actors/performance-recording.js

@@ -7,7 +7,6 @@
 const { Actor, ActorClassWithSpec } = require("devtools/shared/protocol");
 const { performanceRecordingSpec } = require("devtools/shared/specs/performance-recording");
 
-loader.lazyRequireGetter(this, "merge", "sdk/util/object", true);
 loader.lazyRequireGetter(this, "RecordingUtils",
   "devtools/shared/performance/recording-utils");
 loader.lazyRequireGetter(this, "PerformanceRecordingCommon",
@@ -19,7 +18,8 @@ loader.lazyRequireGetter(this, "PerformanceRecordingCommon",
  *
  * @see devtools/shared/shared/performance.js for documentation.
  */
-const PerformanceRecordingActor = ActorClassWithSpec(performanceRecordingSpec, merge({
+const PerformanceRecordingActor = ActorClassWithSpec(performanceRecordingSpec,
+Object.assign({
   form: function (detail) {
     if (detail === "actorid") {
       return this.actorID;
@@ -142,7 +142,6 @@ const PerformanceRecordingActor = ActorClassWithSpec(performanceRecordingSpec, m
       }
     }
   },
-
 }, PerformanceRecordingCommon));
 
 exports.PerformanceRecordingActor = PerformanceRecordingActor;

devtools/server/actors/performance.js

@@ -10,7 +10,6 @@ const { actorBridgeWithSpec } = require("devtools/server/actors/common");
 const { performanceSpec } = require("devtools/shared/specs/performance");
 
 loader.lazyRequireGetter(this, "events", "sdk/event/core");
-loader.lazyRequireGetter(this, "extend", "sdk/util/object", true);
 
 loader.lazyRequireGetter(this, "PerformanceRecorder",
   "devtools/server/performance/recorder", true);

devtools/server/actors/script.js

@@ -17,7 +17,6 @@ const { assert, dumpn } = DevToolsUtils;
 const promise = require("promise");
 const xpcInspector = require("xpcInspector");
 const { DevToolsWorker } = require("devtools/shared/worker/worker");
-const object = require("sdk/util/object");
 const { threadSpec } = require("devtools/shared/specs/script");
 
 const { resolve, reject, all } = promise;
@@ -2040,7 +2039,7 @@ const ThreadActor = ActorClassWithSpec(threadSpec, {
   }
 });
 
-ThreadActor.prototype.requestTypes = object.merge(ThreadActor.prototype.requestTypes, {
+Object.assign(ThreadActor.prototype.requestTypes, {
   "attach": ThreadActor.prototype.onAttach,
   "detach": ThreadActor.prototype.onDetach,
   "reconfigure": ThreadActor.prototype.onReconfigure,

devtools/server/performance/recorder.js

@@ -8,8 +8,6 @@ const { Task } = require("devtools/shared/task");
 
 loader.lazyRequireGetter(this, "Services");
 loader.lazyRequireGetter(this, "promise");
-loader.lazyRequireGetter(this, "extend",
-  "sdk/util/object", true);
 loader.lazyRequireGetter(this, "Class",
   "sdk/core/heritage", true);
 loader.lazyRequireGetter(this, "EventTarget",
@@ -183,7 +181,7 @@ exports.PerformanceRecorder = Class({
     // expecting a recording very soon.
     events.emit(this, "console-profile-start");
 
-    yield this.startRecording(extend({}, getPerformanceRecordingPrefs(), {
+    yield this.startRecording(Object.assign({}, getPerformanceRecordingPrefs(), {
       console: true,
       label: profileLabel
     }));
@@ -349,7 +347,7 @@ exports.PerformanceRecorder = Class({
       if (this._memory.getState() === "detached") {
         this._memory.attach();
       }
-      let recordingOptions = extend(mapRecordingOptions("memory", options), {
+      let recordingOptions = Object.assign(mapRecordingOptions("memory", options), {
         drainAllocationsTimeout: DRAIN_ALLOCATIONS_TIMEOUT
       });
       memoryStart = this._memory.startRecordingAllocations(recordingOptions);
@@ -480,7 +478,7 @@ exports.PerformanceRecorder = Class({
       allocationSettings = this._memory.getAllocationsSettings();
     }
 
-    return extend({}, allocationSettings, this._profiler.getStartOptions());
+    return Object.assign({}, allocationSettings, this._profiler.getStartOptions());
   },
 
   toString: () => "[object PerformanceRecorder]"

devtools/shared/fronts/inspector.js

@@ -24,7 +24,6 @@ const promise = require("promise");
 const defer = require("devtools/shared/defer");
 const { Task } = require("devtools/shared/task");
 const events = require("sdk/event/core");
-const object = require("sdk/util/object");
 const nodeConstants = require("devtools/shared/dom-node-constants.js");
 loader.lazyRequireGetter(this, "CommandUtils",
   "devtools/client/shared/developer-toolbar", true);
@@ -124,7 +123,7 @@ const NodeFront = FrontClassWithSpec(nodeSpec, {
 
     // Shallow copy of the form.  We could just store a reference, but
     // eventually we'll want to update some of the data.
-    this._form = object.merge(form);
+    this._form = Object.assign({}, form);
     this._form.attrs = this._form.attrs ? this._form.attrs.slice() : [];
 
     if (form.parent) {
@@ -772,7 +771,7 @@ const WalkerFront = FrontClassWithSpec(walkerSpec, {
           continue;
         }
 
-        let emittedMutation = object.merge(change, { target: targetFront });
+        let emittedMutation = Object.assign(change, { target: targetFront });
 
         if (change.type === "childList" ||
             change.type === "nativeAnonymousChildList") {

devtools/shared/fronts/performance-recording.js

@@ -12,13 +12,13 @@ loader.lazyRequireGetter(this, "PerformanceRecordingCommon",
   "devtools/shared/performance/recording-common", true);
 loader.lazyRequireGetter(this, "RecordingUtils",
   "devtools/shared/performance/recording-utils");
-loader.lazyRequireGetter(this, "merge", "sdk/util/object", true);
 
 /**
  * This can be used on older Profiler implementations, but the methods cannot
  * be changed -- you must introduce a new method, and detect the server.
  */
-const PerformanceRecordingFront = FrontClassWithSpec(performanceRecordingSpec, merge({
+const PerformanceRecordingFront = FrontClassWithSpec(performanceRecordingSpec,
+Object.assign({
   form: function (form, detail) {
     if (detail === "actorid") {
       this.actorID = form;

devtools/shared/fronts/profiler.js

@@ -12,7 +12,6 @@ const {
 const { profilerSpec } = require("devtools/shared/specs/profiler");
 
 loader.lazyRequireGetter(this, "events", "sdk/event/core");
-loader.lazyRequireGetter(this, "extend", "sdk/util/object", true);
 
 /**
  * This can be used on older Profiler implementations, but the methods cannot
@@ -40,7 +39,7 @@ exports.ProfilerFront = FrontClassWithSpec(profilerSpec, {
    * have unchanged behaviour.
    */
   getProfile: custom(function (options) {
-    return this._getProfile(extend({ stringify: true }, options));
+    return this._getProfile(Object.assign({ stringify: true }, options));
   }, {
     impl: "_getProfile"
   }),

devtools/shared/performance/recording-utils.js

@@ -3,9 +3,6 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-loader.lazyRequireGetter(this, "extend",
-  "sdk/util/object", true);
-
 /**
  * Utility functions for managing recording models and their internal data,
  * such as filtering profile samples or offsetting timestamps.

devtools/shared/protocol.js

@@ -9,7 +9,6 @@ var defer = require("devtools/shared/defer");
 var {Class} = require("sdk/core/heritage");
 var {EventTarget} = require("sdk/event/target");
 var events = require("sdk/event/core");
-var object = require("sdk/util/object");
 var {getStack, callFunctionWithAsyncStack} = require("devtools/shared/platform/stack");
 var {settleAll} = require("devtools/shared/DevToolsUtils");
 
@@ -147,7 +146,7 @@ types.addType = function (name, typeObject = {}, options = {}) {
     throw Error("Type '" + name + "' already exists.");
   }
 
-  let type = object.merge({
+  let type = Object.assign({
     toString() {
       return "[protocol type:" + name + "]";
     },
@@ -1009,7 +1008,7 @@ var generateActorSpec = function (actorDesc) {
       let methodSpec = desc.value._methodSpec;
       let spec = {};
       spec.name = methodSpec.name || name;
-      spec.request = Request(object.merge({type: spec.name},
+      spec.request = Request(Object.assign({type: spec.name},
                                           methodSpec.request || undefined));
       spec.response = Response(methodSpec.response || undefined);
       spec.release = methodSpec.release;
@@ -1026,7 +1025,7 @@ var generateActorSpec = function (actorDesc) {
       let spec = {};
 
       spec.name = methodSpec.name || name;
-      spec.request = Request(object.merge({type: spec.name},
+      spec.request = Request(Object.assign({type: spec.name},
                                           methodSpec.request || undefined));
       spec.response = Response(methodSpec.response || undefined);
       spec.release = methodSpec.release;
@@ -1042,7 +1041,7 @@ var generateActorSpec = function (actorDesc) {
     for (let name in actorDesc.events) {
       let eventRequest = actorDesc.events[name];
       Object.freeze(eventRequest);
-      actorSpec.events.set(name, Request(object.merge({type: name}, eventRequest)));
+      actorSpec.events.set(name, Request(Object.assign({type: name}, eventRequest)));
     }
   }