PropertyDetails cleanup: NORMAL property type merged with FIELD.

src/mirror-debugger.js

 // Copyright 2006-2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Handle id counters.
 var next_handle_ = 0;
 var next_transient_handle_ = -1;
 
 // Mirror cache.
 var mirror_cache_ = [];
@@ skipping 161 matching lines @@
 var kMaxProtocolStringLength = 80;
 
 // Different kind of properties.
 var PropertyKind = {};
 PropertyKind.Named   = 1;
 PropertyKind.Indexed = 2;
 
 
 // A copy of the PropertyType enum from property-details.h
 var PropertyType = {};
-PropertyType.Normal                  = 0;
-PropertyType.Field                   = 1;
-PropertyType.Constant                = 2;
-PropertyType.Callbacks               = 3;
+PropertyType.Field                   = 0;
+PropertyType.Constant                = 1;
+PropertyType.Callbacks               = 2;
 
 
 // Different attributes for a property.
 var PropertyAttribute = {};
 PropertyAttribute.None       = NONE;
 PropertyAttribute.ReadOnly   = READ_ONLY;
 PropertyAttribute.DontEnum   = DONT_ENUM;
 PropertyAttribute.DontDelete = DONT_DELETE;
 
 
@@ skipping 2699 matching lines @@
 /**
  * Serialize property information to the following JSON format for building the
  * array of properties.
  *
  *   {"name":"<property name>",
  *    "attributes":<number>,
  *    "propertyType":<number>,
  *    "ref":<number>}
  *
  * If the attribute for the property is PropertyAttribute.None it is not added.
- * If the propertyType for the property is PropertyType.Normal it is not added.
  * Here are a couple of examples.
  *
- *   {"name":"hello","ref":1}
+ *   {"name":"hello","propertyType":0,"ref":1}
  *   {"name":"length","attributes":7,"propertyType":3,"ref":2}
  *
  * @param {PropertyMirror} propertyMirror The property to serialize.
  * @returns {Object} Protocol object representing the property.
  */
 JSONProtocolSerializer.prototype.serializeProperty_ = function(propertyMirror) {
   var result = {};
 
   result.name = propertyMirror.name();
   var propertyValue = propertyMirror.value();
   if (this.inlineRefs_() && propertyValue.isValue()) {
     result.value = this.serializeReferenceWithDisplayData_(propertyValue);
   } else {
     if (propertyMirror.attributes() != PropertyAttribute.None) {
       result.attributes = propertyMirror.attributes();
     }
-    if (propertyMirror.propertyType() != PropertyType.Normal) {
-      result.propertyType = propertyMirror.propertyType();
-    }
+    result.propertyType = propertyMirror.propertyType();
     result.ref = propertyValue.handle();
   }
   return result;
 };
 
 
 /**
  * Serialize internal property information to the following JSON format for
  * building the array of properties.
  *
@@ skipping 96 matching lines @@
   }
   if (!NUMBER_IS_FINITE(value)) {
     if (value > 0) {
       return 'Infinity';
     } else {
       return '-Infinity';
     }
   }
   return value;
 }