Bug 1400854 - Fix Watch Expressions + WASM feature flag. r=nchevobbe draft
authorjason laster <jlaster@mozilla.com>
Mon, 18 Sep 2017 09:32:33 -0400
changeset 666972 96cb056f130fdb0f5cde18f83c36e44dfe98f5c6
parent 666598 30a386ff1192cba08a2f899343f81f6946bc6148
child 732258 95513a7bc77e5707de2bb15ad3604b455ae7d4a6
push id80572
push userbmo:nchevobbe@mozilla.com
push dateTue, 19 Sep 2017 14:09:55 +0000
reviewersnchevobbe
bugs1400854
milestone57.0a1
Bug 1400854 - Fix Watch Expressions + WASM feature flag. r=nchevobbe MozReview-Commit-ID: 7oldAu5R87C
devtools/client/debugger/new/debugger.js
--- a/devtools/client/debugger/new/debugger.js
+++ b/devtools/client/debugger/new/debugger.js
@@ -7211,17 +7211,17 @@ module.exports = {
       }
       return ii;
     };
 
     ArraySeq.prototype.__iterator = function(type, reverse) {
       var array = this._array;
       var maxIndex = array.length - 1;
       var ii = 0;
-      return new Iterator(function() 
+      return new Iterator(function()
         {return ii > maxIndex ?
           iteratorDone() :
           iteratorValue(type, ii, array[reverse ? maxIndex - ii++ : ii++])}
       );
     };
 
 
 
@@ -7682,17 +7682,17 @@ module.exports = {
           return ii + 1;
         }
       }
       return ii;
     };
 
     Repeat.prototype.__iterator = function(type, reverse) {var this$0 = this;
       var ii = 0;
-      return new Iterator(function() 
+      return new Iterator(function()
         {return ii < this$0.size ? iteratorValue(type, ii++, this$0._value) : iteratorDone()}
       );
     };
 
     Repeat.prototype.equals = function(other) {
       return other instanceof Repeat ?
         is(this._value, other._value) :
         deepEqual(other);
@@ -9880,17 +9880,17 @@ module.exports = {
     reversedSequence.reverse = function()  {return iterable};
     if (iterable.flip) {
       reversedSequence.flip = function () {
         var flipSequence = flipFactory(iterable);
         flipSequence.reverse = function()  {return iterable.flip()};
         return flipSequence;
       };
     }
-    reversedSequence.get = function(key, notSetValue) 
+    reversedSequence.get = function(key, notSetValue)
       {return iterable.get(useKeys ? key : -1 - key, notSetValue)};
     reversedSequence.has = function(key )
       {return iterable.has(useKeys ? key : -1 - key)};
     reversedSequence.includes = function(value ) {return iterable.includes(value)};
     reversedSequence.cacheResult = cacheResultThrough;
     reversedSequence.__iterate = function (fn, reverse) {var this$0 = this;
       return iterable.__iterate(function(v, k)  {return fn(v, k, this$0)}, !reverse);
     };
@@ -10079,17 +10079,17 @@ module.exports = {
 
   function takeWhileFactory(iterable, predicate, context) {
     var takeSequence = makeSequence(iterable);
     takeSequence.__iterateUncached = function(fn, reverse) {var this$0 = this;
       if (reverse) {
         return this.cacheResult().__iterate(fn, reverse);
       }
       var iterations = 0;
-      iterable.__iterate(function(v, k, c) 
+      iterable.__iterate(function(v, k, c)
         {return predicate.call(context, v, k, c) && ++iterations && fn(v, k, this$0)}
       );
       return iterations;
     };
     takeSequence.__iteratorUncached = function(type, reverse) {var this$0 = this;
       if (reverse) {
         return this.cacheResult().__iterator(type, reverse);
       }
@@ -10270,17 +10270,17 @@ module.exports = {
   }
 
 
   function interposeFactory(iterable, separator) {
     var interposedSequence = makeSequence(iterable);
     interposedSequence.size = iterable.size && iterable.size * 2 -1;
     interposedSequence.__iterateUncached = function(fn, reverse) {var this$0 = this;
       var iterations = 0;
-      iterable.__iterate(function(v, k) 
+      iterable.__iterate(function(v, k)
         {return (!iterations || fn(separator, iterations++, this$0) !== false) &&
         fn(v, iterations++, this$0) !== false},
         reverse
       );
       return iterations;
     };
     interposedSequence.__iteratorUncached = function(type, reverse) {
       var iterator = iterable.__iterator(ITERATE_VALUES, reverse);
@@ -14736,17 +14736,17 @@ module.exports = function() {
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
  *
- * 
+ *
  */
 
 function makeEmptyFunction(arg) {
   return function () {
     return arg;
   };
 }
 
@@ -15975,17 +15975,18 @@ const prefs = new PrefsHelper("devtools"
   fileSearchRegexMatch: ["Bool", "debugger.file-search-regex-match"],
   debuggerPrefsSchemaVersion: ["Char", "debugger.prefs-schema-version"]
 });
 /* harmony export (immutable) */ __webpack_exports__["prefs"] = prefs;
 
 
 const features = new PrefsHelper("devtools.debugger.features", {
   asyncStepping: ["Bool", "async-stepping", false],
-  projectTextSearch: ["Bool", "debugger.project-text-search-enabled", true]
+  projectTextSearch: ["Bool", "project-text-search-enabled", true],
+  wasm: ["Bool", "wasm", true]
 });
 /* harmony export (immutable) */ __webpack_exports__["features"] = features;
 
 
 if (prefs.debuggerPrefsSchemaVersion !== prefsSchemaVersion) {
   // clear pending Breakpoints
   prefs.pendingBreakpoints = {};
   prefs.debuggerPrefsSchemaVersion = prefsSchemaVersion;
@@ -21615,17 +21616,17 @@ function selectFrame(frame) {
 function loadObjectProperties(object) {
   return (_ref16) => {
     var dispatch = _ref16.dispatch,
         client = _ref16.client,
         getState = _ref16.getState;
 
     var objectId = object.actor || object.objectId;
 
-    if (!(0, _selectors.getPause)(getState()) || (0, _selectors.getLoadedObject)(getState(), objectId)) {
+    if ((0, _selectors.getLoadedObject)(getState(), objectId)) {
       return;
     }
 
     dispatch({
       type: "LOAD_OBJECT_PROPERTIES",
       objectId,
       [_promise.PROMISE]: client.getProperties(object)
     });
@@ -46738,9 +46739,9 @@ exports.default = (0, _reactRedux.connec
 /* 1173 */,
 /* 1174 */
 /***/ (function(module, exports) {
 
 module.exports = "<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\" viewBox=\"0 0 400 400\" xml:space=\"preserve\" id=\"svg2\" version=\"1.1\"><metadata id=\"metadata8\"><rdf:RDF><cc:Work rdf:about><dc:format>image/svg+xml</dc:format><dc:type rdf:resource=\"http://purl.org/dc/dcmitype/StillImage\"></dc></cc:Work></rdf:RDF></metadata><defs id=\"defs6\"></defs><g transform=\"matrix(1.3333333,0,0,-1.3333333,0,400)\" id=\"g10\"><g transform=\"translate(178.0626,235.0086)\" id=\"g12\"><path id=\"path14\" style=\"fill:#41b883;fill-opacity:1;fill-rule:nonzero;stroke:none\" d=\"M 0,0 -22.669,-39.264 -45.338,0 h -75.491 L -22.669,-170.017 75.491,0 Z\"></path></g><g transform=\"translate(178.0626,235.0086)\" id=\"g16\"><path id=\"path18\" style=\"fill:#34495e;fill-opacity:1;fill-rule:nonzero;stroke:none\" d=\"M 0,0 -22.669,-39.264 -45.338,0 H -81.565 L -22.669,-102.01 36.227,0 Z\"></path></g></g></svg>"
 
 /***/ })
 /******/ ]);
-});
\ No newline at end of file
+});