Add an optional set_hook argument to defineProperty.

chrome/browser/resources/shared/js/cr.js

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 const cr = (function() {
 
   /**
    * Whether we are using a Mac or not.
    * @type {boolean}
    */
@@ skipping 112 matching lines @@
      * element has the attribute then the value is true.
      */
     BOOL_ATTR: 'boolAttr'
   };
 
   /**
    * Helper function for defineProperty that returns the getter to use for the
    * property.
    * @param {string} name
    * @param {cr.PropertyKind} kind
-   * @param {*} defaultValue The default value. This is only used for the ATTR
-   *    kind.
    * @return {function():*} The getter for the property.
    */
-  function getGetter(name, kind, defaultValue) {
+  function getGetter(name, kind) {
     switch (kind) {
       case PropertyKind.JS:
         var privateName = name + '_';
         return function() {
           return this[privateName];
         };
       case PropertyKind.ATTR:
-        // For attr with default value we return the default value if the
-        // element is missing the attribute.
-        if (defaultValue == undefined) {
-          return function() {
-            return this.getAttribute(name);
-          };
-        } else {
-          return function() {
-            // WebKit uses null for non existant attributes.
-            var value = this.getAttribute(name);
-            return value !== null ? value : defaultValue;
-          };
-        }
+        return function() {
+          return this.getAttribute(name);
+        };
       case PropertyKind.BOOL_ATTR:
-        // Boolean attributes don't support default values.
         return function() {
           return this.hasAttribute(name);
         };
     }
   }
 
   /**
    * Helper function for defineProperty that returns the setter of the right
    * kind.
    * @param {string} name The name of the property we are defining the setter
    *     for.
    * @param {cr.PropertyKind} kind The kind of property we are getting the
    *     setter for.
+   * @param {function(*):void} opt_setHook A function to run after the property
+   *     is set, but before the propertyChange event is fired.
    * @return {function(*):void} The function to use as a setter.
    */
-  function getSetter(name, kind) {
+  function getSetter(name, kind, opt_setHook) {
     switch (kind) {
       case PropertyKind.JS:
         var privateName = name + '_';
         return function(value) {
           var oldValue = this[privateName];
           if (value !== oldValue) {
             this[privateName] = value;
+            if (opt_setHook)
+              opt_setHook.call(this, value, oldValue);
             dispatchPropertyChange(this, name, value, oldValue);
           }
         };
 
       case PropertyKind.ATTR:
         return function(value) {
           var oldValue = this[name];
           if (value !== oldValue) {
             this.setAttribute(name, value);
+            if (opt_setHook)
+              opt_setHook.call(this, value, oldValue);
             dispatchPropertyChange(this, name, value, oldValue);
           }
         };
 
       case PropertyKind.BOOL_ATTR:
         return function(value) {
           var oldValue = this[name];
           if (value !== oldValue) {
             if (value)
               this.setAttribute(name, name);
             else
               this.removeAttribute(name);
+            if (opt_setHook)
+              opt_setHook.call(this, value, oldValue);
             dispatchPropertyChange(this, name, value, oldValue);
           }
         };
     }
   }
 
   /**
    * Defines a property on an object. When the setter changes the value a
    * property change event with the type {@code name + 'Change'} is fired.
    * @param {!Object} obj The object to define the property for.
    * @param {string} name The name of the property.
    * @param {cr.PropertyKind=} opt_kind What kind of underlying storage to use.
-   * @param {*} opt_default The default value.
+   * @param {function(*):void} opt_setHook A function to run after the
+   *     property is set, but before the propertyChange event is fired.
    */
-  function defineProperty(obj, name, opt_kind, opt_default) {
+  function defineProperty(obj, name, opt_kind, opt_setHook) {
     if (typeof obj == 'function')
       obj = obj.prototype;
 
     var kind = opt_kind || PropertyKind.JS;
 
     if (!obj.__lookupGetter__(name)) {
-      // For js properties we set the default value on the prototype.
-      if (kind == PropertyKind.JS && arguments.length > 3)  {
-        var privateName = name + '_';
-        obj[privateName] = opt_default;
-      }
-      obj.__defineGetter__(name, getGetter(name, kind, opt_default));
+      obj.__defineGetter__(name, getGetter(name, kind));
     }
 
     if (!obj.__lookupSetter__(name)) {
-      obj.__defineSetter__(name, getSetter(name, kind));
+      obj.__defineSetter__(name, getSetter(name, kind, opt_setHook));
     }
   }
 
   /**
    * Counter for use with createUid
    */
   var uidCounter = 1;
 
   /**
    * @return {number} A new unique ID.
@@ skipping 100 matching lines @@
      * The document that we are currently using.
      * @type {!Document}
      */
     get doc() {
       return doc;
     },
     withDoc: withDoc,
     Event: CrEvent
   };
 })();