From fecb209d4beaffe0f0438ac2e9ba34a66211f77e Mon Sep 17 00:00:00 2001
From: Emmanuel Garcia <egarciad@google.com>
Date: Sun, 12 Feb 2017 15:07:37 -0800
Subject: [PATCH 01/14] Reset the `active` state once the callback runs

---
 src/utils/debounce.html |  2 +-
 test/unit/debounce.html | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/utils/debounce.html b/src/utils/debounce.html
index dec1366a..744a5dfe 100644
--- a/src/utils/debounce.html
+++ b/src/utils/debounce.html
@@ -36,7 +36,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     setConfig(asyncModule, cb) {
       this._asyncModule = asyncModule;
       this._callback = cb;
-      this._timer = this._asyncModule.run(this._callback);
+      this._timer = this._asyncModule.run(this.flush);
     },
 
     /**
diff --git a/test/unit/debounce.html b/test/unit/debounce.html
index 25fa255a..1a8aa83d 100644
--- a/test/unit/debounce.html
+++ b/test/unit/debounce.html
@@ -113,6 +113,17 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         });
       });
 
+      test('flush debouncer', function(done) {
+        var callback = sinon.spy();
+        var job = Polymer.Debouncer.debounce(null, Polymer.Async.microTask, callback);
+
+        setTimeout(function() {
+          job.flush();
+          assert.isTrue(callback.calledOnce, 'callback should be called once');
+          done();
+        });
+      });
+
       test('different debouncers and multiple micro tasks', function(done) {
         var callback = sinon.spy();
         var job1 = Polymer.Debouncer.debounce(null, Polymer.Async.microTask, callback);

From 956c0a8c86959e7358530155dd5927234d64e301 Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Mon, 13 Feb 2017 14:22:09 -0800
Subject: [PATCH 02/14] Fold Polymer.Attributes into Polymer.PropertyAccessors
 * rename _de/serializeAttribute to _de/serializeValue * ad
 attributeChangedCallback * add `createPropertiesForAttributes

---
 src/attributes/attributes.html         | 207 -------------------------
 src/data-elements/dom-bind.html        |   3 -
 src/data-elements/templatize.html      |   5 +-
 src/legacy/legacy-element.html         |   4 +-
 src/properties/property-accessors.html | 192 ++++++++++++++++++++++-
 src/properties/property-effects.html   |   9 +-
 6 files changed, 197 insertions(+), 223 deletions(-)
 delete mode 100644 src/attributes/attributes.html

diff --git a/src/attributes/attributes.html b/src/attributes/attributes.html
deleted file mode 100644
index 1814c4af..00000000
--- a/src/attributes/attributes.html
+++ /dev/null
@@ -1,207 +0,0 @@
-<!--
-@license
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
--->
-
-<link rel="import" href="../utils/boot.html">
-<link rel="import" href="../utils/utils.html">
-<link rel="import" href="../utils/case-map.html">
-<script>
-(function() {
-
-  'use strict';
-
-  var caseMap = Polymer.CaseMap;
-
-  Polymer.Attributes = Polymer.Utils.dedupingMixin(function(superClass) {
-
-    /**
-     * @unrestricted
-     */
-    class Attributes extends superClass {
-
-      constructor() {
-        super();
-        this.__serializing = false;
-      }
-
-      /**
-       * Ensures the element has the given attribute. If it does not,
-       * assigns the given value to the attribute.
-       *
-       *
-       * @method _ensureAttribute
-       * @param {string} attribute Name of attribute to ensure is set.
-       * @param {string} value of the attribute.
-       */
-      _ensureAttribute(attribute, value) {
-        if (!this.hasAttribute(attribute)) {
-          this._valueToNodeAttribute(this, value, attribute);
-        }
-      }
-
-      /**
-       * Deserializes an attribute to its associated property.
-       *
-       * This method calls the `_deserializeAttribute` method to convert the string to
-       * a typed value.
-       *
-       * @method _attributeToProperty
-       * @param {string} attribute Name of attribute to deserialize.
-       * @param {string} value of the attribute.
-       * @param {*} type type to deserialize to.
-       */
-      _attributeToProperty(attribute, value, type) {
-        // Don't deserialize back to property if currently reflecting
-        if (!this.__serializing) {
-          var property = caseMap.dashToCamelCase(attribute);
-          this[property] = this._deserializeAttribute(value, type);
-        }
-      }
-
-      /**
-       * Serializes a property to its associated attribute.
-       *
-       * @method _propertyToAttribute
-       * @param {string} property Property name to reflect.
-       * @param {string=} attribute Attribute name to reflect.
-       * @param {*=} value Property value to refect.
-       */
-      _propertyToAttribute(property, attribute, value) {
-        this.__serializing = true;
-        value = (arguments.length < 3) ? this[property] : value;
-        this._valueToNodeAttribute(this, value,
-          attribute || caseMap.camelToDashCase(property));
-        this.__serializing = false;
-      }
-
-      /**
-       * Sets a typed value to an HTML attribute on a node.
-       *
-       * This method calls the `_serializeAttribute` method to convert the typed
-       * value to a string.  If the `_serializeAttribute` method returns `undefined`,
-       * the attribute will be removed (this is the default for boolean
-       * type `false`).
-       *
-       * @method _valueToNodeAttribute
-       * @param {Element} node Element to set attribute to.
-       * @param {*} value Value to serialize.
-       * @param {string} attribute Attribute name to serialize to.
-       */
-      _valueToNodeAttribute(node, value, attribute) {
-        var str = this._serializeAttribute(value);
-        if (str === undefined) {
-          node.removeAttribute(attribute);
-        } else {
-          node.setAttribute(attribute, str);
-        }
-      }
-
-      /**
-       * Converts a typed value to a string.
-       *
-       * This method is called by Polymer when setting JS property values to
-       * HTML attributes.  Users may override this method on Polymer element
-       * prototypes to provide serialization for custom types.
-       *
-       * @method _serializeAttribute
-       * @param {*} value Property value to serialize.
-       * @return {string | undefined} String serialized from the provided property value.
-       */
-      _serializeAttribute(value) {
-        /* eslint-disable no-fallthrough */
-        switch (typeof value) {
-          case 'boolean':
-            return value ? '' : undefined;
-
-          case 'object':
-            if (value instanceof Date) {
-              return value.toString();
-            } else if (value) {
-              try {
-                return JSON.stringify(value);
-              } catch(x) {
-                return '';
-              }
-            }
-
-          default:
-            return value != null ? value.toString() : undefined;
-        }
-      }
-
-      /**
-       * Converts a string to a typed value.
-       *
-       * This method is called by Polymer when reading HTML attribute values to
-       * JS properties.  Users may override this method on Polymer element
-       * prototypes to provide deserialization for custom `type`s.  Note,
-       * the `type` argument is the value of the `type` field provided in the
-       * `properties` configuration object for a given property, and is
-       * by convention the constructor for the type to deserialize.
-       *
-       * Note: The return value of `undefined` is used as a sentinel value to
-       * indicate the attribute should be removed.
-       *
-       * @method _deserializeAttribute
-       * @param {string} value Attribute value to deserialize.
-       * @param {*} type Type to deserialize the string to.
-       * @return {*} Typed value deserialized from the provided string.
-       */
-      _deserializeAttribute(value, type) {
-        /**
-         * @type {*}
-         */
-        let outValue;
-        switch (type) {
-          case Number:
-            outValue = Number(value);
-            break;
-
-          case Boolean:
-            outValue = (value !== null);
-            break;
-
-          case Object:
-            try {
-              outValue = JSON.parse(value);
-            } catch(x) {
-              // allow non-JSON literals like Strings and Numbers
-            }
-            break;
-
-          case Array:
-            try {
-              outValue = JSON.parse(value);
-            } catch(x) {
-              outValue = null;
-              console.warn('Polymer::Attributes: couldn`t decode Array as JSON');
-            }
-            break;
-
-          case Date:
-            outValue = new Date(value);
-            break;
-
-          case String:
-          default:
-            outValue = value;
-            break;
-        }
-
-        return outValue;
-      }
-      /* eslint-enable no-fallthrough */
-    }
-
-    return Attributes;
-  });
-
-
-})();
-</script>
diff --git a/src/data-elements/dom-bind.html b/src/data-elements/dom-bind.html
index 67b08d86..d0b5a72e 100644
--- a/src/data-elements/dom-bind.html
+++ b/src/data-elements/dom-bind.html
@@ -10,9 +10,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 
 <link rel="import" href="../utils/boot.html">
 <link rel="import" href="../../src/properties/property-effects.html">
-<link rel="import" href="../../src/attributes/attributes.html">
-<link rel="import" href="../../src/template/template-stamp.html">
-<link rel="import" href="../../src/events/gesture-event-listeners.html">
 
 <script>
 
diff --git a/src/data-elements/templatize.html b/src/data-elements/templatize.html
index cd1086af..bfbd6bd6 100644
--- a/src/data-elements/templatize.html
+++ b/src/data-elements/templatize.html
@@ -10,9 +10,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 
 <link rel="import" href="../utils/boot.html">
 <link rel="import" href="../../src/properties/property-effects.html">
-<link rel="import" href="../../src/attributes/attributes.html">
-<link rel="import" href="../../src/template/template-stamp.html">
-<link rel="import" href="../../src/events/gesture-event-listeners.html">
 
 <script>
   (function() {
@@ -130,7 +127,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
        * @override
        */
       _setUnmanagedPropertyToNode(node, prop, value) {
-        if (node.__hideTemplateChildren__ && 
+        if (node.__hideTemplateChildren__ &&
             node.nodeType == Node.TEXT_NODE && prop == 'textContent') {
           node.__polymerTextContent__ = value;
         } else {
diff --git a/src/legacy/legacy-element.html b/src/legacy/legacy-element.html
index af147298..ab7ef106 100644
--- a/src/legacy/legacy-element.html
+++ b/src/legacy/legacy-element.html
@@ -83,11 +83,11 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
       _applyListeners() {}
 
       serialize(value) {
-        return this._serializeAttribute(value);
+        return this._serializeValue(value);
       }
 
       deserialize(value, type) {
-        return this._deserializeAttribute(value, type);
+        return this._deserializeValue(value, type);
       }
 
       reflectPropertyToAttribute(property, attribute, value) {
diff --git a/src/properties/property-accessors.html b/src/properties/property-accessors.html
index c15d7ee0..e1c1c730 100644
--- a/src/properties/property-accessors.html
+++ b/src/properties/property-accessors.html
@@ -10,12 +10,18 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 
 <link rel="import" href="../utils/boot.html">
 <link rel="import" href="../utils/utils.html">
+<link rel="import" href="../utils/case-map.html">
+<link rel="import" href="../utils/async.html">
 
 <script>
 (function() {
 
   'use strict';
 
+  var caseMap = Polymer.CaseMap;
+
+  var microtask = Polymer.Async.microTask;
+
   // Save map of native properties; this forms a blacklist or properties
   // that won't have their values "saved" by `saveAccessorValue`, since
   // reading from an HTMLElement accessor from the context of a prototype throws
@@ -68,11 +74,24 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 
     return class PropertyAccessors extends superClass {
 
+      static createPropertiesForAttributes() {
+        let a$ = this.observedAttributes;
+        for (let i=0; i < a$.length; i++) {
+          this._createPropertyAccessor(caseMap.dashToCamelCase(a$[i]));
+        }
+      }
+
       constructor() {
         super();
         this._initializeProperties();
       }
 
+      attributeChangedCallback(name, old, value) {
+        if (old !== value) {
+          this._attributeToProperty(name, value);
+        }
+      }
+
       /**
        * Initializes the local storage for property accessors.
        *
@@ -82,13 +101,182 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
        * @protected
        */
       _initializeProperties() {
-        this.__data = {};
+        this.__serializing = false;
+        this.__data = Object.create(null);
         this.__dataCounter = 0;
         this.__dataPending = null;
         this.__dataOld = null;
         this.__dataInvalid = false;
       }
 
+      /**
+       * Ensures the element has the given attribute. If it does not,
+       * assigns the given value to the attribute.
+       *
+       *
+       * @method _ensureAttribute
+       * @param {string} attribute Name of attribute to ensure is set.
+       * @param {string} value of the attribute.
+       */
+      _ensureAttribute(attribute, value) {
+        if (!this.hasAttribute(attribute)) {
+          this._valueToNodeAttribute(this, value, attribute);
+        }
+      }
+
+      /**
+       * Deserializes an attribute to its associated property.
+       *
+       * This method calls the `_deserializeValue` method to convert the string to
+       * a typed value.
+       *
+       * @method _attributeToProperty
+       * @param {string} attribute Name of attribute to deserialize.
+       * @param {string} value of the attribute.
+       * @param {*} type type to deserialize to.
+       */
+      _attributeToProperty(attribute, value, type) {
+        // Don't deserialize back to property if currently reflecting
+        if (!this.__serializing) {
+          var property = caseMap.dashToCamelCase(attribute);
+          this[property] = this._deserializeValue(value, type);
+        }
+      }
+
+      /**
+       * Serializes a property to its associated attribute.
+       *
+       * @method _propertyToAttribute
+       * @param {string} property Property name to reflect.
+       * @param {string=} attribute Attribute name to reflect.
+       * @param {*=} value Property value to refect.
+       */
+      _propertyToAttribute(property, attribute, value) {
+        this.__serializing = true;
+        value = (arguments.length < 3) ? this[property] : value;
+        this._valueToNodeAttribute(this, value,
+          attribute || caseMap.camelToDashCase(property));
+        this.__serializing = false;
+      }
+
+      /**
+       * Sets a typed value to an HTML attribute on a node.
+       *
+       * This method calls the `_serializeValue` method to convert the typed
+       * value to a string.  If the `_serializeValue` method returns `undefined`,
+       * the attribute will be removed (this is the default for boolean
+       * type `false`).
+       *
+       * @method _valueToNodeAttribute
+       * @param {Element} node Element to set attribute to.
+       * @param {*} value Value to serialize.
+       * @param {string} attribute Attribute name to serialize to.
+       */
+      _valueToNodeAttribute(node, value, attribute) {
+        var str = this._serializeValue(value);
+        if (str === undefined) {
+          node.removeAttribute(attribute);
+        } else {
+          node.setAttribute(attribute, str);
+        }
+      }
+
+      /**
+       * Converts a typed value to a string.
+       *
+       * This method is called by Polymer when setting JS property values to
+       * HTML attributes.  Users may override this method on Polymer element
+       * prototypes to provide serialization for custom types.
+       *
+       * @method _serializeValue
+       * @param {*} value Property value to serialize.
+       * @return {string | undefined} String serialized from the provided property value.
+       */
+      _serializeValue(value) {
+        /* eslint-disable no-fallthrough */
+        switch (typeof value) {
+          case 'boolean':
+            return value ? '' : undefined;
+
+          case 'object':
+            if (value instanceof Date) {
+              return value.toString();
+            } else if (value) {
+              try {
+                return JSON.stringify(value);
+              } catch(x) {
+                return '';
+              }
+            }
+
+          default:
+            return value != null ? value.toString() : undefined;
+        }
+      }
+
+      /**
+       * Converts a string to a typed value.
+       *
+       * This method is called by Polymer when reading HTML attribute values to
+       * JS properties.  Users may override this method on Polymer element
+       * prototypes to provide deserialization for custom `type`s.  Note,
+       * the `type` argument is the value of the `type` field provided in the
+       * `properties` configuration object for a given property, and is
+       * by convention the constructor for the type to deserialize.
+       *
+       * Note: The return value of `undefined` is used as a sentinel value to
+       * indicate the attribute should be removed.
+       *
+       * @method _deserializeValue
+       * @param {string} value Attribute value to deserialize.
+       * @param {*} type Type to deserialize the string to.
+       * @return {*} Typed value deserialized from the provided string.
+       */
+      _deserializeValue(value, type) {
+        /**
+         * @type {*}
+         */
+        let outValue;
+        switch (type) {
+          case Number:
+            outValue = Number(value);
+            break;
+
+          case Boolean:
+            outValue = (value !== null);
+            break;
+
+          case Object:
+            try {
+              outValue = JSON.parse(value);
+            } catch(x) {
+              // allow non-JSON literals like Strings and Numbers
+            }
+            break;
+
+          case Array:
+            try {
+              outValue = JSON.parse(value);
+            } catch(x) {
+              outValue = null;
+              console.warn('Polymer::Attributes: couldn`t decode Array as JSON');
+            }
+            break;
+
+          case Date:
+            outValue = new Date(value);
+            break;
+
+          case String:
+          default:
+            outValue = value;
+            break;
+        }
+
+        return outValue;
+      }
+      /* eslint-enable no-fallthrough */
+
       /**
        * Creates a setter/getter pair for the named property with its own
        * local storage.  The getter returns the value in the local storage,
@@ -183,7 +371,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
       _invalidateProperties() {
         if (!this.__dataInvalid) {
           this.__dataInvalid = true;
-          Promise.resolve().then(() => {
+          microtask.run(() => {
             if (this.__dataInvalid) {
               this.__dataInvalid = false;
               this._flushProperties();
diff --git a/src/properties/property-effects.html b/src/properties/property-effects.html
index e836161b..17b76b46 100644
--- a/src/properties/property-effects.html
+++ b/src/properties/property-effects.html
@@ -13,7 +13,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <link rel="import" href="../utils/utils.html">
 <link rel="import" href="../utils/path.html">
 <link rel="import" href="property-accessors.html">
-<link rel="import" href="../attributes/attributes.html">
 <!-- for notify, reflect -->
 <link rel="import" href="../utils/case-map.html">
 <!-- for annotated effects -->
@@ -151,7 +150,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
    * If no trigger is given, the path is deemed to match.
    *
    * @param {string} path Path or property that changed
-   * @param {Object} trigger Descriptor 
+   * @param {Object} trigger Descriptor
    * @return {boolean} Whether the path matched the trigger
    */
   function pathMatchesTrigger(path, trigger) {
@@ -1186,7 +1185,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   Polymer.PropertyEffects = Polymer.Utils.dedupingMixin(function(superClass) {
 
     const mixin = Polymer.TemplateStamp(
-      Polymer.Attributes(Polymer.PropertyAccessors(superClass)));
+      Polymer.PropertyAccessors(superClass));
 
     /**
      * @unrestricted
@@ -1418,7 +1417,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 
       /**
        * Applies a value to a non-Polymer element/node's property.
-       * 
+       *
        * The implementation makes a best-effort at binding interop:
        * Some native element properties have side-effects when
        * re-setting the same value (e.g. setting <input>.value resets the
@@ -1427,7 +1426,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
        * accept objects, we explicitly re-set object changes coming from the
        * Polymer world (which may include deep object changes without the
        * top reference changing), erring on the side of providing more
-       * information. 
+       * information.
        *
        * Users may override this method to provide alternate approaches.
        *

From 4153d28d06f1828101c38706206772ac0ee150d4 Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Tue, 14 Feb 2017 10:25:44 -0800
Subject: [PATCH 03/14] Reorganization! lib: previously utils mixins: all
 mixins moved here elements: all elements moved here legacy: all legacy code
 moved here.

---
 polymer-element.html                          |  2 +-
 polymer-legacy.html                           |  4 --
 polymer.html                                  | 14 ++++---
 .../array-selector.html                       |  8 ++--
 src/{styling => elements}/custom-style.html   |  2 +-
 src/{data-elements => elements}/dom-bind.html |  4 +-
 src/{data-elements => elements}/dom-if.html   |  8 ++--
 src/{legacy => elements}/dom-module.html      |  2 +-
 .../dom-repeat.html                           |  8 ++--
 src/legacy/class.html                         |  2 +-
 src/legacy/legacy-element.html                | 14 +++----
 src/legacy/logging.html                       |  2 +-
 src/{utils => legacy}/polymer.dom.html        | 10 ++---
 src/legacy/templatizer-behavior.html          |  4 +-
 src/{utils => lib}/array-splice.html          |  0
 src/{utils => lib}/async-render.html          |  0
 src/{utils => lib}/async.html                 |  0
 src/{utils => lib}/boot.html                  |  0
 src/{utils => lib}/case-map.html              |  0
 src/{utils => lib}/debounce.html              |  4 +-
 src/{utils => lib}/flush.html                 |  0
 src/{utils => lib}/path.html                  |  0
 src/{template => lib}/resolve-url.html        |  2 +
 src/{styling => lib}/style-gather.html        |  2 +-
 src/{data-elements => lib}/templatize.html    |  4 +-
 src/{utils => lib}/unresolved.html            |  0
 src/{utils => lib}/utils.html                 |  0
 src/{template => mixins}/annotations.html     |  8 ++--
 src/{elements => mixins}/element.html         | 15 ++++----
 src/{events => mixins}/event-listeners.html   |  4 +-
 .../gesture-event-listeners.html              |  8 ++--
 .../property-accessors.html                   |  8 ++--
 .../property-effects.html                     | 10 ++---
 src/{template => mixins}/template-stamp.html  |  6 +--
 src/styling/style-util.html                   | 37 -------------------
 test/unit/async.html                          |  2 +-
 test/unit/case-map.html                       |  2 +-
 test/unit/custom-style.html                   |  2 +-
 test/unit/dom-repeat.html                     |  1 -
 test/unit/importHref.html                     |  2 +-
 test/unit/path.html                           |  2 +-
 test/unit/polymer.legacyelement.html          |  2 +-
 test/unit/styling-cross-scope-apply.html      |  2 +-
 43 files changed, 84 insertions(+), 123 deletions(-)
 delete mode 100644 polymer-legacy.html
 rename src/{data-elements => elements}/array-selector.html (98%)
 rename src/{styling => elements}/custom-style.html (95%)
 rename src/{data-elements => elements}/dom-bind.html (95%)
 rename src/{data-elements => elements}/dom-if.html (97%)
 rename src/{legacy => elements}/dom-module.html (98%)
 rename src/{data-elements => elements}/dom-repeat.html (99%)
 rename src/{utils => legacy}/polymer.dom.html (97%)
 rename src/{utils => lib}/array-splice.html (100%)
 rename src/{utils => lib}/async-render.html (100%)
 rename src/{utils => lib}/async.html (100%)
 rename src/{utils => lib}/boot.html (100%)
 rename src/{utils => lib}/case-map.html (100%)
 rename src/{utils => lib}/debounce.html (96%)
 rename src/{utils => lib}/flush.html (100%)
 rename src/{utils => lib}/path.html (100%)
 rename src/{template => lib}/resolve-url.html (98%)
 rename src/{styling => lib}/style-gather.html (98%)
 rename src/{data-elements => lib}/templatize.html (99%)
 rename src/{utils => lib}/unresolved.html (100%)
 rename src/{utils => lib}/utils.html (100%)
 rename src/{template => mixins}/annotations.html (98%)
 rename src/{elements => mixins}/element.html (97%)
 rename src/{events => mixins}/event-listeners.html (94%)
 rename src/{events => mixins}/gesture-event-listeners.html (99%)
 rename src/{properties => mixins}/property-accessors.html (98%)
 rename src/{properties => mixins}/property-effects.html (99%)
 rename src/{template => mixins}/template-stamp.html (97%)
 delete mode 100644 src/styling/style-util.html

diff --git a/polymer-element.html b/polymer-element.html
index 955541ac..a94d2289 100644
--- a/polymer-element.html
+++ b/polymer-element.html
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<link rel="import" href="src/elements/element.html">
\ No newline at end of file
+<link rel="import" href="src/mixins/element.html">
\ No newline at end of file
diff --git a/polymer-legacy.html b/polymer-legacy.html
deleted file mode 100644
index 66386b62..00000000
--- a/polymer-legacy.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<link rel="import" href="src/legacy/legacy-element.html">
-<link rel="import" href="src/legacy/polymer-fn.html">
-<link rel="import" href="src/legacy/class.html">
\ No newline at end of file
diff --git a/polymer.html b/polymer.html
index f78821f7..343e6f03 100644
--- a/polymer.html
+++ b/polymer.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<link rel="import" href="polymer-legacy.html">
+<link rel="import" href="src/legacy/legacy-element.html">
+<link rel="import" href="src/legacy/polymer-fn.html">
+<link rel="import" href="src/legacy/class.html">
 <!-- template elements -->
 <link rel="import" href="src/legacy/templatizer-behavior.html">
-<link rel="import" href="src/data-elements/dom-bind.html">
-<link rel="import" href="src/data-elements/dom-repeat.html">
-<link rel="import" href="src/data-elements/dom-if.html">
-<link rel="import" href="src/data-elements/array-selector.html">
+<link rel="import" href="src/elements/dom-bind.html">
+<link rel="import" href="src/elements/dom-repeat.html">
+<link rel="import" href="src/elements/dom-if.html">
+<link rel="import" href="src/elements/array-selector.html">
 <!-- custom-style -->
-<link rel="import" href="src/styling/custom-style.html">
+<link rel="import" href="src/elements/custom-style.html">
diff --git a/src/data-elements/array-selector.html b/src/elements/array-selector.html
similarity index 98%
rename from src/data-elements/array-selector.html
rename to src/elements/array-selector.html
index 74b01ec1..bb435fef 100644
--- a/src/data-elements/array-selector.html
+++ b/src/elements/array-selector.html
@@ -62,9 +62,9 @@ is false, `selected` is a property representing the last selected item.  When
 ```
 -->
 
-<link rel="import" href="../../polymer-element.html">
-<link rel="import" href="../utils/utils.html">
-<link rel="import" href="../utils/array-splice.html">
+<link rel="import" href="../mixins/element.html">
+<link rel="import" href="../lib/utils.html">
+<link rel="import" href="../lib/array-splice.html">
 
 <script>
 (function() {
@@ -283,7 +283,7 @@ is false, `selected` is a property representing the last selected item.  When
       _selectedIndexForItemIndex(idx) {
         let selected = this.__dataLinkedPaths['items.' + idx];
         if (selected) {
-          return parseInt(selected.slice('selected.'.length), 10);          
+          return parseInt(selected.slice('selected.'.length), 10);
         }
       }
 
diff --git a/src/styling/custom-style.html b/src/elements/custom-style.html
similarity index 95%
rename from src/styling/custom-style.html
rename to src/elements/custom-style.html
index 425d15ab..acad2ed3 100644
--- a/src/styling/custom-style.html
+++ b/src/elements/custom-style.html
@@ -8,7 +8,7 @@ The complete set of contributors may be found at http://polymer.github.io/CONTRI
 Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<link rel="import" href="style-gather.html">
+<link rel="import" href="../lib/style-gather.html">
 <script>
 (function() {
   'use strict';
diff --git a/src/data-elements/dom-bind.html b/src/elements/dom-bind.html
similarity index 95%
rename from src/data-elements/dom-bind.html
rename to src/elements/dom-bind.html
index d0b5a72e..5150ed4e 100644
--- a/src/data-elements/dom-bind.html
+++ b/src/elements/dom-bind.html
@@ -8,8 +8,8 @@ Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 
-<link rel="import" href="../utils/boot.html">
-<link rel="import" href="../../src/properties/property-effects.html">
+<link rel="import" href="../lib/boot.html">
+<link rel="import" href="../mixins/property-effects.html">
 
 <script>
 
diff --git a/src/data-elements/dom-if.html b/src/elements/dom-if.html
similarity index 97%
rename from src/data-elements/dom-if.html
rename to src/elements/dom-if.html
index 8312c1e6..a34fb5a4 100644
--- a/src/data-elements/dom-if.html
+++ b/src/elements/dom-if.html
@@ -8,10 +8,10 @@ Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 
-<link rel="import" href="../../polymer-element.html">
-<link rel="import" href="templatize.html">
-<link rel="import" href="../utils/debounce.html">
-<link rel="import" href="../utils/flush.html">
+<link rel="import" href="../mixins/element.html">
+<link rel="import" href="../lib/templatize.html">
+<link rel="import" href="../lib/debounce.html">
+<link rel="import" href="../lib/flush.html">
 
 <script>
 
diff --git a/src/legacy/dom-module.html b/src/elements/dom-module.html
similarity index 98%
rename from src/legacy/dom-module.html
rename to src/elements/dom-module.html
index ffb10a36..731aa6f3 100644
--- a/src/legacy/dom-module.html
+++ b/src/elements/dom-module.html
@@ -1,4 +1,4 @@
-<link rel="import" href="../utils/boot.html">
+<link rel="import" href="../lib/boot.html">
 <script>
 
 (function() {
diff --git a/src/data-elements/dom-repeat.html b/src/elements/dom-repeat.html
similarity index 99%
rename from src/data-elements/dom-repeat.html
rename to src/elements/dom-repeat.html
index da17196d..3a9ba00e 100644
--- a/src/data-elements/dom-repeat.html
+++ b/src/elements/dom-repeat.html
@@ -98,10 +98,10 @@ Then the `observe` property should be configured as follows:
 
 -->
 
-<link rel="import" href="../../polymer-element.html">
-<link rel="import" href="templatize.html">
-<link rel="import" href="../utils/debounce.html">
-<link rel="import" href="../utils/flush.html">
+<link rel="import" href="../mixins/element.html">
+<link rel="import" href="../lib/templatize.html">
+<link rel="import" href="../lib/debounce.html">
+<link rel="import" href="../lib/flush.html">
 
 <script>
 (function() {
diff --git a/src/legacy/class.html b/src/legacy/class.html
index 877b5212..27ae6c15 100644
--- a/src/legacy/class.html
+++ b/src/legacy/class.html
@@ -8,7 +8,7 @@ Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <link rel="import" href="legacy-element.html">
-<link rel="import" href="../utils/utils.html">
+<link rel="import" href="../lib/utils.html">
 <script>
 
   (function() {
diff --git a/src/legacy/legacy-element.html b/src/legacy/legacy-element.html
index ab7ef106..504ab865 100644
--- a/src/legacy/legacy-element.html
+++ b/src/legacy/legacy-element.html
@@ -8,13 +8,13 @@ Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 
-<link rel="import" href="../elements/element.html">
-<link rel="import" href="../events/gesture-event-listeners.html">
-<link rel="import" href="../utils/utils.html">
-<link rel="import" href="../utils/async-render.html">
-<link rel="import" href="../utils/polymer.dom.html">
-<link rel="import" href="../utils/unresolved.html">
-<link rel="import" href="../legacy/logging.html">
+<link rel="import" href="../mixins/element.html">
+<link rel="import" href="../mixins/gesture-event-listeners.html">
+<link rel="import" href="../lib/utils.html">
+<link rel="import" href="../lib/async-render.html">
+<link rel="import" href="../lib/unresolved.html">
+<link rel="import" href="polymer.dom.html">
+<link rel="import" href="logging.html">
 
 <script>
 (function() {
diff --git a/src/legacy/logging.html b/src/legacy/logging.html
index 5973525d..0e7ad8fc 100644
--- a/src/legacy/logging.html
+++ b/src/legacy/logging.html
@@ -7,7 +7,7 @@ The complete set of contributors may be found at http://polymer.github.io/CONTRI
 Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<link rel="import" href="../utils/utils.html">
+<link rel="import" href="../lib/utils.html">
 <script>
 (function() {
   'use strict';
diff --git a/src/utils/polymer.dom.html b/src/legacy/polymer.dom.html
similarity index 97%
rename from src/utils/polymer.dom.html
rename to src/legacy/polymer.dom.html
index f318105a..f4c0a5d4 100644
--- a/src/utils/polymer.dom.html
+++ b/src/legacy/polymer.dom.html
@@ -7,11 +7,11 @@ The complete set of contributors may be found at http://polymer.github.io/CONTRI
 Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<link rel="import" href="boot.html">
-<link rel="import" href="utils.html">
-<link rel="import" href="array-splice.html">
-<link rel="import" href="async.html">
-<link rel="import" href="flush.html">
+<link rel="import" href="../lib/boot.html">
+<link rel="import" href="../lib/utils.html">
+<link rel="import" href="../lib/array-splice.html">
+<link rel="import" href="../lib/async.html">
+<link rel="import" href="../lib/flush.html">
 <script>
 (function() {
 
diff --git a/src/legacy/templatizer-behavior.html b/src/legacy/templatizer-behavior.html
index aea54eb5..164a7bdd 100644
--- a/src/legacy/templatizer-behavior.html
+++ b/src/legacy/templatizer-behavior.html
@@ -8,7 +8,7 @@ Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 
-<link rel="import" href="../data-elements/templatize.html">
+<link rel="import" href="../lib/templatize.html">
 
 <script>
   (function() {
@@ -30,7 +30,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         return Polymer.Templatize.modelForElement(this._templatizerTemplate, el);
       }
     };
-    
+
     Polymer.Templatizer = Templatizer;
 
   })();
diff --git a/src/utils/array-splice.html b/src/lib/array-splice.html
similarity index 100%
rename from src/utils/array-splice.html
rename to src/lib/array-splice.html
diff --git a/src/utils/async-render.html b/src/lib/async-render.html
similarity index 100%
rename from src/utils/async-render.html
rename to src/lib/async-render.html
diff --git a/src/utils/async.html b/src/lib/async.html
similarity index 100%
rename from src/utils/async.html
rename to src/lib/async.html
diff --git a/src/utils/boot.html b/src/lib/boot.html
similarity index 100%
rename from src/utils/boot.html
rename to src/lib/boot.html
diff --git a/src/utils/case-map.html b/src/lib/case-map.html
similarity index 100%
rename from src/utils/case-map.html
rename to src/lib/case-map.html
diff --git a/src/utils/debounce.html b/src/lib/debounce.html
similarity index 96%
rename from src/utils/debounce.html
rename to src/lib/debounce.html
index 744a5dfe..49948912 100644
--- a/src/utils/debounce.html
+++ b/src/lib/debounce.html
@@ -7,8 +7,8 @@ The complete set of contributors may be found at http://polymer.github.io/CONTRI
 Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<link rel="import" href="../utils/boot.html">
-<link rel="import" href="../utils/utils.html">
+<link rel="import" href="boot.html">
+<link rel="import" href="utils.html">
 <link rel="import" href="async.html">
 
 <script>
diff --git a/src/utils/flush.html b/src/lib/flush.html
similarity index 100%
rename from src/utils/flush.html
rename to src/lib/flush.html
diff --git a/src/utils/path.html b/src/lib/path.html
similarity index 100%
rename from src/utils/path.html
rename to src/lib/path.html
diff --git a/src/template/resolve-url.html b/src/lib/resolve-url.html
similarity index 98%
rename from src/template/resolve-url.html
rename to src/lib/resolve-url.html
index ec3f69f8..c3fb11d5 100644
--- a/src/template/resolve-url.html
+++ b/src/lib/resolve-url.html
@@ -7,6 +7,8 @@ The complete set of contributors may be found at http://polymer.github.io/CONTRI
 Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
+<link rel="import" href="boot.html">
+
 <script>
 
   (function() {
diff --git a/src/styling/style-gather.html b/src/lib/style-gather.html
similarity index 98%
rename from src/styling/style-gather.html
rename to src/lib/style-gather.html
index abbba805..334654f6 100644
--- a/src/styling/style-gather.html
+++ b/src/lib/style-gather.html
@@ -8,7 +8,7 @@ The complete set of contributors may be found at http://polymer.github.io/CONTRI
 Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<link rel="import" href="../template/resolve-url.html">
+<link rel="import" href="resolve-url.html">
 <script>
 (function() {
   'use strict';
diff --git a/src/data-elements/templatize.html b/src/lib/templatize.html
similarity index 99%
rename from src/data-elements/templatize.html
rename to src/lib/templatize.html
index bfbd6bd6..6e6a8ca1 100644
--- a/src/data-elements/templatize.html
+++ b/src/lib/templatize.html
@@ -8,8 +8,8 @@ Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 
-<link rel="import" href="../utils/boot.html">
-<link rel="import" href="../../src/properties/property-effects.html">
+<link rel="import" href="boot.html">
+<link rel="import" href="../mixins/property-effects.html">
 
 <script>
   (function() {
diff --git a/src/utils/unresolved.html b/src/lib/unresolved.html
similarity index 100%
rename from src/utils/unresolved.html
rename to src/lib/unresolved.html
diff --git a/src/utils/utils.html b/src/lib/utils.html
similarity index 100%
rename from src/utils/utils.html
rename to src/lib/utils.html
diff --git a/src/template/annotations.html b/src/mixins/annotations.html
similarity index 98%
rename from src/template/annotations.html
rename to src/mixins/annotations.html
index e31b1f0a..500cbd79 100644
--- a/src/template/annotations.html
+++ b/src/mixins/annotations.html
@@ -7,10 +7,10 @@ The complete set of contributors may be found at http://polymer.github.io/CONTRI
 Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<link rel="import" href="../utils/boot.html">
-<link rel="import" href="../utils/utils.html">
-<link rel="import" href="../utils/case-map.html">
-<link rel="import" href="resolve-url.html">
+<link rel="import" href="../lib/boot.html">
+<link rel="import" href="../lib/utils.html">
+<link rel="import" href="../lib/case-map.html">
+<link rel="import" href="../lib/resolve-url.html">
 
 <script>
 /**
diff --git a/src/elements/element.html b/src/mixins/element.html
similarity index 97%
rename from src/elements/element.html
rename to src/mixins/element.html
index af8cecef..d58827e6 100644
--- a/src/elements/element.html
+++ b/src/mixins/element.html
@@ -8,14 +8,13 @@ Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 
-<link rel="import" href="../utils/boot.html">
-<link rel="import" href="../legacy/dom-module.html">
-<link rel="import" href="../utils/case-map.html">
-<link rel="import" href="../events/event-listeners.html">
-<link rel="import" href="../template/template-stamp.html">
-<link rel="import" href="../properties/property-effects.html">
-<link rel="import" href="../styling/style-gather.html">
-<link rel="import" href="../styling/style-util.html">
+<link rel="import" href="../lib/boot.html">
+<link rel="import" href="../lib/case-map.html">
+<link rel="import" href="../lib/style-gather.html">
+<link rel="import" href="../elements/dom-module.html">
+<link rel="import" href="event-listeners.html">
+<link rel="import" href="template-stamp.html">
+<link rel="import" href="property-effects.html">
 
 <script>
 (function() {
diff --git a/src/events/event-listeners.html b/src/mixins/event-listeners.html
similarity index 94%
rename from src/events/event-listeners.html
rename to src/mixins/event-listeners.html
index 7ee54db8..6cbb4109 100644
--- a/src/events/event-listeners.html
+++ b/src/mixins/event-listeners.html
@@ -7,8 +7,8 @@ The complete set of contributors may be found at http://polymer.github.io/CONTRI
 Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<link rel="import" href="../utils/boot.html">
-<link rel="import" href="../utils/utils.html">
+<link rel="import" href="../lib/boot.html">
+<link rel="import" href="../lib/utils.html">
 <script>
 (function() {
 
diff --git a/src/events/gesture-event-listeners.html b/src/mixins/gesture-event-listeners.html
similarity index 99%
rename from src/events/gesture-event-listeners.html
rename to src/mixins/gesture-event-listeners.html
index d9e25387..6c18cd2b 100644
--- a/src/events/gesture-event-listeners.html
+++ b/src/mixins/gesture-event-listeners.html
@@ -7,10 +7,10 @@ The complete set of contributors may be found at http://polymer.github.io/CONTRI
 Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<link rel="import" href="../utils/async.html">
-<link rel="import" href="../utils/boot.html">
-<link rel="import" href="../utils/utils.html">
-<link rel="import" href="../utils/debounce.html">
+<link rel="import" href="../lib/async.html">
+<link rel="import" href="../lib/boot.html">
+<link rel="import" href="../lib/utils.html">
+<link rel="import" href="../lib/debounce.html">
 <link rel="import" href="event-listeners.html">
 
 <script>
diff --git a/src/properties/property-accessors.html b/src/mixins/property-accessors.html
similarity index 98%
rename from src/properties/property-accessors.html
rename to src/mixins/property-accessors.html
index e1c1c730..50983e9d 100644
--- a/src/properties/property-accessors.html
+++ b/src/mixins/property-accessors.html
@@ -8,10 +8,10 @@ Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 
-<link rel="import" href="../utils/boot.html">
-<link rel="import" href="../utils/utils.html">
-<link rel="import" href="../utils/case-map.html">
-<link rel="import" href="../utils/async.html">
+<link rel="import" href="../lib/boot.html">
+<link rel="import" href="../lib/utils.html">
+<link rel="import" href="../lib/case-map.html">
+<link rel="import" href="../lib/async.html">
 
 <script>
 (function() {
diff --git a/src/properties/property-effects.html b/src/mixins/property-effects.html
similarity index 99%
rename from src/properties/property-effects.html
rename to src/mixins/property-effects.html
index 17b76b46..84a1f8e8 100644
--- a/src/properties/property-effects.html
+++ b/src/mixins/property-effects.html
@@ -9,14 +9,14 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 -->
 
 
-<link rel="import" href="../utils/boot.html">
-<link rel="import" href="../utils/utils.html">
-<link rel="import" href="../utils/path.html">
+<link rel="import" href="../lib/boot.html">
+<link rel="import" href="../lib/utils.html">
+<link rel="import" href="../lib/path.html">
 <link rel="import" href="property-accessors.html">
 <!-- for notify, reflect -->
-<link rel="import" href="../utils/case-map.html">
+<link rel="import" href="../lib/case-map.html">
 <!-- for annotated effects -->
-<link rel="import" href="../template/template-stamp.html">
+<link rel="import" href="template-stamp.html">
 
 
 <script>
diff --git a/src/template/template-stamp.html b/src/mixins/template-stamp.html
similarity index 97%
rename from src/template/template-stamp.html
rename to src/mixins/template-stamp.html
index d93feffc..8106d735 100644
--- a/src/template/template-stamp.html
+++ b/src/mixins/template-stamp.html
@@ -8,9 +8,9 @@ Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 
-<link rel="import" href="../utils/boot.html">
-<link rel="import" href="../utils/utils.html">
-<link rel="import" href="../events/event-listeners.html">
+<link rel="import" href="../lib/boot.html">
+<link rel="import" href="../lib/utils.html">
+<link rel="import" href="event-listeners.html">
 <link rel="import" href="annotations.html">
 <script>
 (function() {
diff --git a/src/styling/style-util.html b/src/styling/style-util.html
deleted file mode 100644
index 82795b36..00000000
--- a/src/styling/style-util.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-@license
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
--->
-<script>
-  (function() {
-    'use strict';
-
-    var StyleUtil = {
-
-      isTargetedBuild: function(buildType) {
-        return (!window.ShadyDOM || !ShadyDOM.inUse) ?
-          buildType === 'shadow' : buildType === 'shady';
-      },
-
-      cssBuildTypeForModule: function (module) {
-        var dm = Polymer.DomModule.import(module);
-        if (dm) {
-          return this.getCssBuildType(dm);
-        }
-      },
-
-      getCssBuildType: function(element) {
-        return element.getAttribute('css-build');
-      }
-
-    };
-
-    Polymer.StyleUtil = StyleUtil;
-
-  })();
-</script>
diff --git a/test/unit/async.html b/test/unit/async.html
index 54dde6cb..7406ce17 100644
--- a/test/unit/async.html
+++ b/test/unit/async.html
@@ -13,7 +13,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   <meta charset="utf-8">
   <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
   <script src="../../../web-component-tester/browser.js"></script>
-  <link rel="import" href="../../src/utils/async.html">
+  <link rel="import" href="../../src/lib/async.html">
 </head>
 <body>
 
diff --git a/test/unit/case-map.html b/test/unit/case-map.html
index 6b373855..a409409f 100644
--- a/test/unit/case-map.html
+++ b/test/unit/case-map.html
@@ -13,7 +13,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   <meta charset="utf-8">
   <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
   <script src="../../../web-component-tester/browser.js"></script>
-  <link rel="import" href="../../src/utils/case-map.html">
+  <link rel="import" href="../../src/lib/case-map.html">
 </head>
 <body>
 
diff --git a/test/unit/custom-style.html b/test/unit/custom-style.html
index 0ca5cd9d..c52b14a2 100644
--- a/test/unit/custom-style.html
+++ b/test/unit/custom-style.html
@@ -300,7 +300,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 
       suiteSetup(function() {
         var customStyle = document.querySelector('style[is="custom-style"]');
-        stylesBuilt = Polymer.StyleUtil.getCssBuildType(customStyle);
+        stylesBuilt = false;
 
         xBar = document.querySelector('x-bar');
         xFoo = document.querySelector('x-foo');
diff --git a/test/unit/dom-repeat.html b/test/unit/dom-repeat.html
index 984161f1..dbe51229 100644
--- a/test/unit/dom-repeat.html
+++ b/test/unit/dom-repeat.html
@@ -15,7 +15,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   <script src="../../../web-component-tester/browser.js"></script>
   <link rel="import" href="../../polymer.html">
   <link rel="import" href="dom-repeat-elements.html">
-  <link rel="import" href="../../src/utils/array-splice.html">
   <style>
     /* makes painting faster when testing on IOS simulator */
     x-repeat-chunked {
diff --git a/test/unit/importHref.html b/test/unit/importHref.html
index 5f55f24c..6963bcca 100644
--- a/test/unit/importHref.html
+++ b/test/unit/importHref.html
@@ -13,7 +13,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   <meta charset="utf-8">
   <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
   <script src="../../../web-component-tester/browser.js"></script>
-  <link rel="import" href="../../src/utils/utils.html">
+  <link rel="import" href="../../src/lib/utils.html">
 <body>
 
 <x-test></x-test>
diff --git a/test/unit/path.html b/test/unit/path.html
index 1df84b18..520b60ea 100644
--- a/test/unit/path.html
+++ b/test/unit/path.html
@@ -13,7 +13,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   <meta charset="utf-8">
   <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
   <script src="../../../web-component-tester/browser.js"></script>
-  <link rel="import" href="../../src/utils/path.html">
+  <link rel="import" href="../../src/lib/path.html">
 </head>
 <body>
 
diff --git a/test/unit/polymer.legacyelement.html b/test/unit/polymer.legacyelement.html
index 449327b1..aeb43f78 100644
--- a/test/unit/polymer.legacyelement.html
+++ b/test/unit/polymer.legacyelement.html
@@ -13,7 +13,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   <meta charset="utf-8">
   <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
   <script src="../../../web-component-tester/browser.js"></script>
-  <link rel="import" href="../../polymer-legacy.html">
+  <link rel="import" href="../../polymer.html">
 <body>
 
   <dom-module id="my-element">
diff --git a/test/unit/styling-cross-scope-apply.html b/test/unit/styling-cross-scope-apply.html
index 3ff357f7..8ba6e256 100644
--- a/test/unit/styling-cross-scope-apply.html
+++ b/test/unit/styling-cross-scope-apply.html
@@ -458,7 +458,7 @@ suite('scoped-styling-apply', function() {
   var stylesBuilt;
 
   suiteSetup(function() {
-    stylesBuilt = Polymer.StyleUtil.cssBuildTypeForModule('x-scope');
+    stylesBuilt = false;
   });
 
   test('variable mixins calculated correctly and inherit', function() {

From 12dd377f29810f3264b74693059700ecacaa2b15 Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Tue, 14 Feb 2017 10:45:13 -0800
Subject: [PATCH 04/14] collapse mixins: remove logging; folded into
 legacy-element remove event-listeners and annotations; folded into element.

---
 src/legacy/legacy-element.html          |  37 +-
 src/legacy/logging.html                 |  46 ---
 src/mixins/annotations.html             | 433 ------------------------
 src/mixins/element.html                 |   2 -
 src/mixins/event-listeners.html         |  55 ---
 src/mixins/gesture-event-listeners.html |  10 +-
 src/mixins/property-effects.html        |   5 +-
 src/mixins/template-stamp.html          | 388 ++++++++++++++++++++-
 8 files changed, 425 insertions(+), 551 deletions(-)
 delete mode 100644 src/legacy/logging.html
 delete mode 100644 src/mixins/annotations.html
 delete mode 100644 src/mixins/event-listeners.html

diff --git a/src/legacy/legacy-element.html b/src/legacy/legacy-element.html
index 504ab865..5b681f4e 100644
--- a/src/legacy/legacy-element.html
+++ b/src/legacy/legacy-element.html
@@ -14,7 +14,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <link rel="import" href="../lib/async-render.html">
 <link rel="import" href="../lib/unresolved.html">
 <link rel="import" href="polymer.dom.html">
-<link rel="import" href="logging.html">
 
 <script>
 (function() {
@@ -23,10 +22,12 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 
   var utils = Polymer.Utils;
 
+  const hasColor = (window.chrome && !(/edge/i.test(navigator.userAgent))) || (/firefox/i.test(navigator.userAgent));
+  const prefix = hasColor ? ['%c[%s::%s]:', 'font-weight: bold; background-color:#EEEE00;'] : ['[%s::%s]:'];
+
   Polymer.LegacyElementMixin = Polymer.Utils.dedupingMixin(function(base) {
 
-    const mixin = Polymer.Logging(
-      Polymer.GestureEventListeners(Polymer.ElementMixin(base)));
+    const mixin = Polymer.GestureEventListeners(Polymer.ElementMixin(base));
 
     return class LegacyElement extends mixin {
 
@@ -711,6 +712,36 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         return null;
       }
 
+      // logging
+      _logger(level, args) {
+        // accept ['foo', 'bar'] and [['foo', 'bar']]
+        if (Array.isArray(args) && args.length === 1) {
+          args = args[0];
+        }
+        switch(level) {
+          case 'log':
+          case 'warn':
+          case 'error':
+            console[level](...args);
+        }
+      }
+
+      _log(...args) {
+        this._logger('log', args);
+      }
+
+      _warn(...args) {
+        this._logger('warn', args);
+      }
+
+      _error(...args) {
+        this._logger('error', args)
+      }
+
+      _logf(...args) {
+        return prefix.concat(this.is).concat(args);
+      }
+
     }
 
   });
diff --git a/src/legacy/logging.html b/src/legacy/logging.html
deleted file mode 100644
index 0e7ad8fc..00000000
--- a/src/legacy/logging.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
-@license
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
--->
-<link rel="import" href="../lib/utils.html">
-<script>
-(function() {
-  'use strict';
-  Polymer.Logging = Polymer.Utils.dedupingMixin(function(superClass) {
-    const hasColor = (window.chrome && !(/edge/i.test(navigator.userAgent))) || (/firefox/i.test(navigator.userAgent));
-    const prefix = hasColor ? ['%c[%s::%s]:', 'font-weight: bold; background-color:#EEEE00;'] : ['[%s::%s]:']
-
-    return class Logging extends superClass {
-      _logger(level, args) {
-        // accept ['foo', 'bar'] and [['foo', 'bar']]
-        if (Array.isArray(args) && args.length === 1) {
-          args = args[0];
-        }
-        switch(level) {
-          case 'log':
-          case 'warn':
-          case 'error':
-            console[level](...args);
-        }
-      }
-      _log(...args) {
-        this._logger('log', args);
-      }
-      _warn(...args) {
-        this._logger('warn', args);
-      }
-      _error(...args) {
-        this._logger('error', args)
-      }
-      _logf(...args) {
-        return prefix.concat(this.is).concat(args);
-      }
-    };
-  });
-})();
-</script>
\ No newline at end of file
diff --git a/src/mixins/annotations.html b/src/mixins/annotations.html
deleted file mode 100644
index 500cbd79..00000000
--- a/src/mixins/annotations.html
+++ /dev/null
@@ -1,433 +0,0 @@
-<!--
-@license
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
--->
-<link rel="import" href="../lib/boot.html">
-<link rel="import" href="../lib/utils.html">
-<link rel="import" href="../lib/case-map.html">
-<link rel="import" href="../lib/resolve-url.html">
-
-<script>
-/**
- * Scans a template to produce an annotation list that that associates
- * metadata culled from markup with tree locations
- * metadata and information to associate the metadata with nodes in an instance.
- *
- * Supported expressions include:
- *
- * Double-mustache annotations in text content. The annotation must be the only
- * content in the tag, compound expressions are not supported.
- *
- *     <[tag]>{{annotation}}<[tag]>
- *
- * Double-escaped annotations in an attribute, either {{}} or [[]].
- *
- *     <[tag] someAttribute="{{annotation}}" another="[[annotation]]"><[tag]>
- *
- * `on-` style event declarations.
- *
- *     <[tag] on-<event-name>="annotation"><[tag]>
- *
- * Note that the `annotations` feature does not implement any behaviors
- * associated with these expressions, it only captures the data.
- *
- * Generated data-structure:
- *
- *     [
- *       {
- *         id: '<id>',
- *         events: [
- *           {
- *             name: '<name>'
- *             value: '<annotation>'
- *           }, ...
- *         ],
- *         bindings: [
- *           {
- *             kind: ['text'|'attribute'],
- *             mode: ['{'|'['],
- *             name: '<name>'
- *             value: '<annotation>'
- *           }, ...
- *         ],
- *         // TODO(sjmiles): this is annotation-parent, not node-parent
- *         parent: <reference to parent annotation object>,
- *         index: <integer index in parent's childNodes collection>
- *       },
- *       ...
- *     ]
- *
- * @class Annotations feature
- */
-(function() {
-
-  'use strict';
-
-  // null-array (shared empty array to avoid null-checks)
-  const emptyArray = [];
-
-  let bindingRegex = (function() {
-    let IDENT  = '(?:' + '[a-zA-Z_$][\\w.:$\\-*]*' + ')';
-    let NUMBER = '(?:' + '[-+]?[0-9]*\\.?[0-9]+(?:[eE][-+]?[0-9]+)?' + ')';
-    let SQUOTE_STRING = '(?:' + '\'(?:[^\'\\\\]|\\\\.)*\'' + ')';
-    let DQUOTE_STRING = '(?:' + '"(?:[^"\\\\]|\\\\.)*"' + ')';
-    let STRING = '(?:' + SQUOTE_STRING + '|' + DQUOTE_STRING + ')';
-    let ARGUMENT = '(?:' + IDENT + '|' + NUMBER + '|' +  STRING + '\\s*' + ')';
-    let ARGUMENTS = '(?:' + ARGUMENT + '(?:,\\s*' + ARGUMENT + ')*' + ')';
-    let ARGUMENT_LIST = '(?:' + '\\(\\s*' +
-                                  '(?:' + ARGUMENTS + '?' + ')' +
-                                '\\)\\s*' + ')';
-    let BINDING = '(' + IDENT + '\\s*' + ARGUMENT_LIST + '?' + ')'; // Group 3
-    let OPEN_BRACKET = '(\\[\\[|{{)' + '\\s*';
-    let CLOSE_BRACKET = '(?:]]|}})';
-    let NEGATE = '(?:(!)\\s*)?'; // Group 2
-    let EXPRESSION = OPEN_BRACKET + NEGATE + BINDING + CLOSE_BRACKET;
-    return new RegExp(EXPRESSION, "g");
-  })();
-
-  let insertionPointTag = 'slot';
-  let currentTemplate;
-
-  /**
-   * @param {HTMLTemplateElement} template
-   * @param {boolean=} stripWhiteSpace
-   * @return {Array<Object>}
-   */
-  function parseTemplateAnnotations(template, stripWhiteSpace) {
-    // TODO(kschaaf): File issue and/or remove when fixed
-    // hold a reference to content as _content to prevent odd Chrome gc issue
-    // nested templates also may receive their content as _content
-    let content = (template._content = template._content || template.content);
-    // since a template may be re-used, memo-ize notes.
-    if (!content._notes) {
-      content._notes = [];
-      // TODO(sorvell): whitespace and processAnnotations need to be factored
-      // into plugins
-      // TODO(kschaaf): template should be threaded through rather than implied state
-      currentTemplate = currentTemplate || template;
-      parseNodeAnnotations(content, content._notes,
-        stripWhiteSpace || template.hasAttribute('strip-whitespace'));
-    }
-    return content._notes;
-  }
-
-  // add annotations gleaned from subtree at `node` to `list`
-  function parseNodeAnnotations(node, list, stripWhiteSpace) {
-    return node.nodeType === Node.TEXT_NODE ?
-      parseTextNodeAnnotation(node, list) :
-        parseElementAnnotations(node, list, stripWhiteSpace);
-  }
-
-  // TODO(kschaaf): We could modify this to allow an escape mechanism by
-  // looking for the escape sequence in each of the matches and converting
-  // the part back to a literal type, and then bailing if only literals
-  // were found
-  function parseBindings(text) {
-    let parts = [];
-    let lastIndex = 0;
-    let m;
-    // Example: "literal1{{prop}}literal2[[!compute(foo,bar)]]final"
-    // Regex matches:
-    //        Iteration 1:  Iteration 2:
-    // m[1]: '{{'          '[['
-    // m[2]: ''            '!'
-    // m[3]: 'prop'        'compute(foo,bar)'
-    while ((m = bindingRegex.exec(text)) !== null) {
-      // Add literal part
-      if (m.index > lastIndex) {
-        parts.push({literal: text.slice(lastIndex, m.index)});
-      }
-      // Add binding part
-      // Mode (one-way or two)
-      let mode = m[1][0];
-      let negate = Boolean(m[2]);
-      let value = m[3].trim();
-      let customEvent, notifyEvent, colon;
-      if (mode == '{' && (colon = value.indexOf('::')) > 0) {
-        notifyEvent = value.substring(colon + 2);
-        value = value.substring(0, colon);
-        customEvent = true;
-      }
-      parts.push({
-        compoundIndex: parts.length,
-        value: value,
-        mode: mode,
-        negate: negate,
-        event: notifyEvent,
-        customEvent: customEvent
-      });
-      lastIndex = bindingRegex.lastIndex;
-    }
-    // Add a final literal part
-    if (lastIndex && lastIndex < text.length) {
-      let literal = text.substring(lastIndex);
-      if (literal) {
-        parts.push({
-          literal: literal
-        });
-      }
-    }
-    if (parts.length) {
-      return parts;
-    }
-  }
-
-  function literalFromParts(parts) {
-    let s = '';
-    for (let i=0; i<parts.length; i++) {
-      let literal = parts[i].literal;
-      s += literal || '';
-    }
-    return s;
-  }
-
-  // add annotations gleaned from TextNode `node` to `list`
-  function parseTextNodeAnnotation(node, list) {
-    let parts = parseBindings(node.textContent);
-    if (parts) {
-      // Initialize the textContent with any literal parts
-      // NOTE: default to a space here so the textNode remains; some browsers
-      // (IE) evacipate an empty textNode following cloneNode/importNode.
-      node.textContent = literalFromParts(parts) || ' ';
-      let note = {
-        bindings: [{
-          kind: 'text',
-          name: 'textContent',
-          parts: parts,
-          isCompound: parts.length !== 1
-        }]
-      };
-      list.push(note);
-      return note;
-    }
-  }
-
-  // add annotations gleaned from Element `node` to `list`
-  function parseElementAnnotations(element, list, stripWhiteSpace) {
-    let note = {
-      bindings: [],
-      events: []
-    };
-    if (element.localName === insertionPointTag) {
-      list._hasInsertionPoint = true;
-    }
-    parseChildNodesAnnotations(element, note, list, stripWhiteSpace);
-    if (element.attributes) {
-      parseNodeAttributeAnnotations(element, note);
-      prepElement(element);
-    }
-    if (note.bindings.length || note.events.length || note.id) {
-      list.push(note);
-    }
-    return note;
-  }
-
-  // add annotations gleaned from children of `root` to `list`, `root`'s
-  // `note` is supplied as it is the note.parent of added annotations
-  function parseChildNodesAnnotations(root, note, list, stripWhiteSpace) {
-    if (root.firstChild) {
-      let node = root.firstChild;
-      let i = 0;
-      while (node) {
-        // BREAKME(kschaaf): pseudo-bc auto-wrapper for template type extensions
-        if (node.localName === 'template') {
-          let t = node;
-          let is = t.getAttribute('is');
-          // stamp `<dom-*>` elements
-          if (is && is.indexOf('dom-') === 0) {
-            t.removeAttribute('is');
-            node = t.ownerDocument.createElement(is);
-            root.replaceChild(node, t);
-            node.appendChild(t);
-            while(t.attributes.length) {
-              node.setAttribute(t.attributes[0].name, t.attributes[0].value);
-              t.removeAttribute(t.attributes[0].name);
-            }
-          }
-        }
-        if (node.localName === 'template' &&
-          !node.hasAttribute('preserve-content')) {
-          parseTemplate(node, i, list, note, stripWhiteSpace);
-        }
-        // collapse adjacent textNodes: fixes an IE issue that can cause
-        // text nodes to be inexplicably split =(
-        // note that root.normalize() should work but does not so we do this
-        // manually.
-        let next = node.nextSibling;
-        if (node.nodeType === Node.TEXT_NODE) {
-          let n = next;
-          while (n && (n.nodeType === Node.TEXT_NODE)) {
-            node.textContent += n.textContent;
-            next = n.nextSibling;
-            root.removeChild(n);
-            n = next;
-          }
-          // optionally strip whitespace
-          if (stripWhiteSpace && !node.textContent.trim()) {
-            root.removeChild(node);
-            // decrement index since node is removed
-            i--;
-          }
-        }
-        // if this node didn't get evacipated, parse it.
-        if (node.parentNode) {
-          let childAnnotation = parseNodeAnnotations(node, list,
-            stripWhiteSpace);
-          if (childAnnotation) {
-            childAnnotation.parent = note;
-            childAnnotation.index = i;
-          }
-        }
-        node = next;
-        i++;
-      }
-    }
-  }
-
-  // 1. Parse annotations from the template and memoize them on
-  //    content._notes (recurses into nested templates)
-  // 2. Remove template.content and store it in annotation list, where it
-  //    will be the responsibility of the host to set it back to the template
-  //    (this is both an optimization to avoid re-stamping nested template
-  //    children and avoids a bug in Chrome where nested template children
-  //    upgrade)
-  function parseTemplate(node, index, list, parent, stripWhiteSpace) {
-    let content = node.content.ownerDocument.createDocumentFragment();
-    content._notes = parseTemplateAnnotations(node, stripWhiteSpace);
-    content.appendChild(node.content);
-    list.push({
-      bindings: emptyArray,
-      events: emptyArray,
-      templateContent: content,
-      parent: parent,
-      index: index
-    });
-  }
-
-  // add annotation data from attributes to the `annotation` for node `node`
-  // TODO(sjmiles): the distinction between an `annotation` and
-  // `annotation data` is not as clear as it could be
-  function parseNodeAttributeAnnotations(node, annotation) {
-    // Make copy of original attribute list, since the order may change
-    // as attributes are added and removed
-    let attrs = Array.prototype.slice.call(node.attributes);
-    for (let i=attrs.length-1, a; (a=attrs[i]); i--) {
-      let n = a.name;
-      let v = a.value;
-      let b;
-      // events (on-*)
-      if (n.slice(0, 3) === 'on-') {
-        node.removeAttribute(n);
-        annotation.events.push({
-          name: n.slice(3),
-          value: v
-        });
-      }
-      // bindings (other attributes)
-      else if ((b = parseNodeAttributeAnnotation(node, n, v))) {
-        annotation.bindings.push(b);
-      }
-      // static id
-      else if (n === 'id') {
-        annotation.id = v;
-      }
-    }
-  }
-
-  // construct annotation data from a generic attribute, or undefined
-  function parseNodeAttributeAnnotation(node, name, value) {
-    let parts = parseBindings(value);
-    if (parts) {
-      // Attribute or property
-      let origName = name;
-      let kind = 'property';
-      if (name[name.length-1] == '$') {
-        name = name.slice(0, -1);
-        kind = 'attribute';
-      }
-      // Initialize attribute bindings with any literal parts
-      let literal = literalFromParts(parts);
-      if (literal && kind == 'attribute') {
-        node.setAttribute(name, literal);
-      }
-      // Clear attribute before removing, since IE won't allow removing
-      // `value` attribute if it previously had a value (can't
-      // unconditionally set '' before removing since attributes with `$`
-      // can't be set using setAttribute)
-      if (node.localName === 'input' && origName === 'value') {
-        node.setAttribute(origName, '');
-      }
-      // Remove annotation
-      node.removeAttribute(origName);
-      // Case hackery: attributes are lower-case, but bind targets
-      // (properties) are case sensitive. Gambit is to map dash-case to
-      // camel-case: `foo-bar` becomes `fooBar`.
-      // Attribute bindings are excepted.
-      let propertyName = Polymer.CaseMap.dashToCamelCase(name);
-      if (kind === 'property') {
-        name = propertyName;
-      }
-      return {
-        kind: kind,
-        name: name,
-        propertyName: propertyName,
-        parts: parts,
-        literal: literal,
-        isCompound: parts.length !== 1
-      };
-    }
-  }
-
-  // TODO(sorvell): this should be factored into a plugin
-  function prepElement(element) {
-    Polymer.ResolveUrl.resolveAttrs(element, currentTemplate.ownerDocument);
-  }
-
-  Polymer.Annotations = Polymer.Utils.dedupingMixin(function(superClass) {
-
-    return class Annotations extends superClass {
-
-      // preprocess-time
-
-      // construct and return a list of annotation records
-      // by scanning `template`'s content
-      //
-      // TODO(sorvell): This should just crawl over a template and call
-      // a supplied list of callbacks.
-      _parseTemplateAnnotations(template) {
-        return parseTemplateAnnotations(template);
-      }
-
-      // instance-time
-      // TODO(sorvell): consider trying to use QS instead of this proprietary
-      // search. This would require some unique way to identify a node, a guid.
-      // Is this faster? simpler? Is that worth polluting the node?
-      _findTemplateAnnotatedNode(root, note) {
-        // recursively ascend tree until we hit root
-        let parent = note.parent && this._findTemplateAnnotatedNode(root,
-          note.parent);
-        // unwind the stack, returning the indexed node at each level
-        if (parent) {
-          // note: marginally faster than indexing via childNodes
-          // (http://jsperf.com/childnodes-lookup)
-          for (let n=parent.firstChild, i=0; n; n=n.nextSibling) {
-            if (note.index === i++) {
-              return n;
-            }
-          }
-        } else {
-          return root;
-        }
-      }
-
-    }
-
-  });
-
-})();
-</script>
diff --git a/src/mixins/element.html b/src/mixins/element.html
index d58827e6..681f977d 100644
--- a/src/mixins/element.html
+++ b/src/mixins/element.html
@@ -12,8 +12,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <link rel="import" href="../lib/case-map.html">
 <link rel="import" href="../lib/style-gather.html">
 <link rel="import" href="../elements/dom-module.html">
-<link rel="import" href="event-listeners.html">
-<link rel="import" href="template-stamp.html">
 <link rel="import" href="property-effects.html">
 
 <script>
diff --git a/src/mixins/event-listeners.html b/src/mixins/event-listeners.html
deleted file mode 100644
index 6cbb4109..00000000
--- a/src/mixins/event-listeners.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--
-@license
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
--->
-<link rel="import" href="../lib/boot.html">
-<link rel="import" href="../lib/utils.html">
-<script>
-(function() {
-
-  'use strict';
-
-  function createNodeEventHandler(context, eventName, methodName) {
-    // Instances can optionally have a _methodHost which allows redirecting where
-    // to find methods. Currently used by `templatize`.
-    context = context._methodHost || context;
-    var handler = function(e) {
-      if (context[methodName]) {
-        context[methodName](e, e.detail);
-      } else {
-        console.warn('listener method `' + methodName + '` not defined');
-      }
-    };
-    return handler;
-  }
-
-  Polymer.EventListeners = Polymer.Utils.dedupingMixin(function(superClass) {
-
-    return class EventListeners extends superClass {
-
-      _addMethodEventListenerToNode(node, eventName, methodName, context) {
-        context = context || node;
-        var handler = createNodeEventHandler(context, eventName, methodName);
-        this._addEventListenerToNode(node, eventName, handler);
-        return handler;
-      }
-
-      _addEventListenerToNode(node, eventName, handler) {
-        node.addEventListener(eventName, handler);
-      }
-
-      _removeEventListenerFromNode(node, eventName, handler) {
-        node.removeEventListener(eventName, handler);
-      }
-
-    }
-
-  });
-
-})();
-</script>
diff --git a/src/mixins/gesture-event-listeners.html b/src/mixins/gesture-event-listeners.html
index 6c18cd2b..c66a2f2f 100644
--- a/src/mixins/gesture-event-listeners.html
+++ b/src/mixins/gesture-event-listeners.html
@@ -11,7 +11,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <link rel="import" href="../lib/boot.html">
 <link rel="import" href="../lib/utils.html">
 <link rel="import" href="../lib/debounce.html">
-<link rel="import" href="event-listeners.html">
 
 <script>
 (function() {
@@ -732,17 +731,18 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 
   Polymer.GestureEventListeners = Polymer.Utils.dedupingMixin(function(superClass) {
 
-    const mixin = Polymer.EventListeners(superClass);
-    return class GestureEventListeners extends mixin {
+    return class GestureEventListeners extends superClass {
 
       _addEventListenerToNode(node, eventName, handler) {
-        if (!gestures.addListener(node, eventName, handler)) {
+        if (!gestures.addListener(node, eventName, handler) &&
+          super._addEventListenerToNode) {
           super._addEventListenerToNode(node, eventName, handler);
         }
       }
 
       _removeEventListenerFromNode(node, eventName, handler) {
-        if (!gestures.removeListener(node, eventName, handler)) {
+        if (!gestures.removeListener(node, eventName, handler) &&
+          super._removeEventListenerFromNode) {
           super._removeEventListenerFromNode(node, eventName, handler);
         }
       }
diff --git a/src/mixins/property-effects.html b/src/mixins/property-effects.html
index 84a1f8e8..ebd23c08 100644
--- a/src/mixins/property-effects.html
+++ b/src/mixins/property-effects.html
@@ -12,9 +12,9 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <link rel="import" href="../lib/boot.html">
 <link rel="import" href="../lib/utils.html">
 <link rel="import" href="../lib/path.html">
-<link rel="import" href="property-accessors.html">
 <!-- for notify, reflect -->
 <link rel="import" href="../lib/case-map.html">
+<link rel="import" href="property-accessors.html">
 <!-- for annotated effects -->
 <link rel="import" href="template-stamp.html">
 
@@ -1184,8 +1184,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 
   Polymer.PropertyEffects = Polymer.Utils.dedupingMixin(function(superClass) {
 
-    const mixin = Polymer.TemplateStamp(
-      Polymer.PropertyAccessors(superClass));
+    const mixin = Polymer.TemplateStamp(Polymer.PropertyAccessors(superClass));
 
     /**
      * @unrestricted
diff --git a/src/mixins/template-stamp.html b/src/mixins/template-stamp.html
index 8106d735..272c2f7b 100644
--- a/src/mixins/template-stamp.html
+++ b/src/mixins/template-stamp.html
@@ -10,8 +10,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 
 <link rel="import" href="../lib/boot.html">
 <link rel="import" href="../lib/utils.html">
-<link rel="import" href="event-listeners.html">
-<link rel="import" href="annotations.html">
+
 <script>
 (function() {
 
@@ -116,6 +115,326 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 
   */
 
+  // null-array (shared empty array to avoid null-checks)
+  const emptyArray = [];
+
+  let bindingRegex = (function() {
+    let IDENT  = '(?:' + '[a-zA-Z_$][\\w.:$\\-*]*' + ')';
+    let NUMBER = '(?:' + '[-+]?[0-9]*\\.?[0-9]+(?:[eE][-+]?[0-9]+)?' + ')';
+    let SQUOTE_STRING = '(?:' + '\'(?:[^\'\\\\]|\\\\.)*\'' + ')';
+    let DQUOTE_STRING = '(?:' + '"(?:[^"\\\\]|\\\\.)*"' + ')';
+    let STRING = '(?:' + SQUOTE_STRING + '|' + DQUOTE_STRING + ')';
+    let ARGUMENT = '(?:' + IDENT + '|' + NUMBER + '|' +  STRING + '\\s*' + ')';
+    let ARGUMENTS = '(?:' + ARGUMENT + '(?:,\\s*' + ARGUMENT + ')*' + ')';
+    let ARGUMENT_LIST = '(?:' + '\\(\\s*' +
+                                  '(?:' + ARGUMENTS + '?' + ')' +
+                                '\\)\\s*' + ')';
+    let BINDING = '(' + IDENT + '\\s*' + ARGUMENT_LIST + '?' + ')'; // Group 3
+    let OPEN_BRACKET = '(\\[\\[|{{)' + '\\s*';
+    let CLOSE_BRACKET = '(?:]]|}})';
+    let NEGATE = '(?:(!)\\s*)?'; // Group 2
+    let EXPRESSION = OPEN_BRACKET + NEGATE + BINDING + CLOSE_BRACKET;
+    return new RegExp(EXPRESSION, "g");
+  })();
+
+  let insertionPointTag = 'slot';
+  let currentTemplate;
+
+  /**
+   * @param {HTMLTemplateElement} template
+   * @param {boolean=} stripWhiteSpace
+   * @return {Array<Object>}
+   */
+  function parseTemplateAnnotations(template, stripWhiteSpace) {
+    // TODO(kschaaf): File issue and/or remove when fixed
+    // hold a reference to content as _content to prevent odd Chrome gc issue
+    // nested templates also may receive their content as _content
+    let content = (template._content = template._content || template.content);
+    // since a template may be re-used, memo-ize notes.
+    if (!content._notes) {
+      content._notes = [];
+      // TODO(sorvell): whitespace and processAnnotations need to be factored
+      // into plugins
+      // TODO(kschaaf): template should be threaded through rather than implied state
+      currentTemplate = currentTemplate || template;
+      parseNodeAnnotations(content, content._notes,
+        stripWhiteSpace || template.hasAttribute('strip-whitespace'));
+    }
+    return content._notes;
+  }
+
+  // add annotations gleaned from subtree at `node` to `list`
+  function parseNodeAnnotations(node, list, stripWhiteSpace) {
+    return node.nodeType === Node.TEXT_NODE ?
+      parseTextNodeAnnotation(node, list) :
+        parseElementAnnotations(node, list, stripWhiteSpace);
+  }
+
+  // TODO(kschaaf): We could modify this to allow an escape mechanism by
+  // looking for the escape sequence in each of the matches and converting
+  // the part back to a literal type, and then bailing if only literals
+  // were found
+  function parseBindings(text) {
+    let parts = [];
+    let lastIndex = 0;
+    let m;
+    // Example: "literal1{{prop}}literal2[[!compute(foo,bar)]]final"
+    // Regex matches:
+    //        Iteration 1:  Iteration 2:
+    // m[1]: '{{'          '[['
+    // m[2]: ''            '!'
+    // m[3]: 'prop'        'compute(foo,bar)'
+    while ((m = bindingRegex.exec(text)) !== null) {
+      // Add literal part
+      if (m.index > lastIndex) {
+        parts.push({literal: text.slice(lastIndex, m.index)});
+      }
+      // Add binding part
+      // Mode (one-way or two)
+      let mode = m[1][0];
+      let negate = Boolean(m[2]);
+      let value = m[3].trim();
+      let customEvent, notifyEvent, colon;
+      if (mode == '{' && (colon = value.indexOf('::')) > 0) {
+        notifyEvent = value.substring(colon + 2);
+        value = value.substring(0, colon);
+        customEvent = true;
+      }
+      parts.push({
+        compoundIndex: parts.length,
+        value: value,
+        mode: mode,
+        negate: negate,
+        event: notifyEvent,
+        customEvent: customEvent
+      });
+      lastIndex = bindingRegex.lastIndex;
+    }
+    // Add a final literal part
+    if (lastIndex && lastIndex < text.length) {
+      let literal = text.substring(lastIndex);
+      if (literal) {
+        parts.push({
+          literal: literal
+        });
+      }
+    }
+    if (parts.length) {
+      return parts;
+    }
+  }
+
+  function literalFromParts(parts) {
+    let s = '';
+    for (let i=0; i<parts.length; i++) {
+      let literal = parts[i].literal;
+      s += literal || '';
+    }
+    return s;
+  }
+
+  // add annotations gleaned from TextNode `node` to `list`
+  function parseTextNodeAnnotation(node, list) {
+    let parts = parseBindings(node.textContent);
+    if (parts) {
+      // Initialize the textContent with any literal parts
+      // NOTE: default to a space here so the textNode remains; some browsers
+      // (IE) evacipate an empty textNode following cloneNode/importNode.
+      node.textContent = literalFromParts(parts) || ' ';
+      let note = {
+        bindings: [{
+          kind: 'text',
+          name: 'textContent',
+          parts: parts,
+          isCompound: parts.length !== 1
+        }]
+      };
+      list.push(note);
+      return note;
+    }
+  }
+
+  // add annotations gleaned from Element `node` to `list`
+  function parseElementAnnotations(element, list, stripWhiteSpace) {
+    let note = {
+      bindings: [],
+      events: []
+    };
+    if (element.localName === insertionPointTag) {
+      list._hasInsertionPoint = true;
+    }
+    parseChildNodesAnnotations(element, note, list, stripWhiteSpace);
+    if (element.attributes) {
+      parseNodeAttributeAnnotations(element, note);
+      prepElement(element);
+    }
+    if (note.bindings.length || note.events.length || note.id) {
+      list.push(note);
+    }
+    return note;
+  }
+
+  // add annotations gleaned from children of `root` to `list`, `root`'s
+  // `note` is supplied as it is the note.parent of added annotations
+  function parseChildNodesAnnotations(root, note, list, stripWhiteSpace) {
+    if (root.firstChild) {
+      let node = root.firstChild;
+      let i = 0;
+      while (node) {
+        // BREAKME(kschaaf): pseudo-bc auto-wrapper for template type extensions
+        if (node.localName === 'template') {
+          let t = node;
+          let is = t.getAttribute('is');
+          // stamp `<dom-*>` elements
+          if (is && is.indexOf('dom-') === 0) {
+            t.removeAttribute('is');
+            node = t.ownerDocument.createElement(is);
+            root.replaceChild(node, t);
+            node.appendChild(t);
+            while(t.attributes.length) {
+              node.setAttribute(t.attributes[0].name, t.attributes[0].value);
+              t.removeAttribute(t.attributes[0].name);
+            }
+          }
+        }
+        if (node.localName === 'template' &&
+          !node.hasAttribute('preserve-content')) {
+          parseTemplate(node, i, list, note, stripWhiteSpace);
+        }
+        // collapse adjacent textNodes: fixes an IE issue that can cause
+        // text nodes to be inexplicably split =(
+        // note that root.normalize() should work but does not so we do this
+        // manually.
+        let next = node.nextSibling;
+        if (node.nodeType === Node.TEXT_NODE) {
+          let n = next;
+          while (n && (n.nodeType === Node.TEXT_NODE)) {
+            node.textContent += n.textContent;
+            next = n.nextSibling;
+            root.removeChild(n);
+            n = next;
+          }
+          // optionally strip whitespace
+          if (stripWhiteSpace && !node.textContent.trim()) {
+            root.removeChild(node);
+            // decrement index since node is removed
+            i--;
+          }
+        }
+        // if this node didn't get evacipated, parse it.
+        if (node.parentNode) {
+          let childAnnotation = parseNodeAnnotations(node, list,
+            stripWhiteSpace);
+          if (childAnnotation) {
+            childAnnotation.parent = note;
+            childAnnotation.index = i;
+          }
+        }
+        node = next;
+        i++;
+      }
+    }
+  }
+
+  // 1. Parse annotations from the template and memoize them on
+  //    content._notes (recurses into nested templates)
+  // 2. Remove template.content and store it in annotation list, where it
+  //    will be the responsibility of the host to set it back to the template
+  //    (this is both an optimization to avoid re-stamping nested template
+  //    children and avoids a bug in Chrome where nested template children
+  //    upgrade)
+  function parseTemplate(node, index, list, parent, stripWhiteSpace) {
+    let content = node.content.ownerDocument.createDocumentFragment();
+    content._notes = parseTemplateAnnotations(node, stripWhiteSpace);
+    content.appendChild(node.content);
+    list.push({
+      bindings: emptyArray,
+      events: emptyArray,
+      templateContent: content,
+      parent: parent,
+      index: index
+    });
+  }
+
+  // add annotation data from attributes to the `annotation` for node `node`
+  // TODO(sjmiles): the distinction between an `annotation` and
+  // `annotation data` is not as clear as it could be
+  function parseNodeAttributeAnnotations(node, annotation) {
+    // Make copy of original attribute list, since the order may change
+    // as attributes are added and removed
+    let attrs = Array.prototype.slice.call(node.attributes);
+    for (let i=attrs.length-1, a; (a=attrs[i]); i--) {
+      let n = a.name;
+      let v = a.value;
+      let b;
+      // events (on-*)
+      if (n.slice(0, 3) === 'on-') {
+        node.removeAttribute(n);
+        annotation.events.push({
+          name: n.slice(3),
+          value: v
+        });
+      }
+      // bindings (other attributes)
+      else if ((b = parseNodeAttributeAnnotation(node, n, v))) {
+        annotation.bindings.push(b);
+      }
+      // static id
+      else if (n === 'id') {
+        annotation.id = v;
+      }
+    }
+  }
+
+  // construct annotation data from a generic attribute, or undefined
+  function parseNodeAttributeAnnotation(node, name, value) {
+    let parts = parseBindings(value);
+    if (parts) {
+      // Attribute or property
+      let origName = name;
+      let kind = 'property';
+      if (name[name.length-1] == '$') {
+        name = name.slice(0, -1);
+        kind = 'attribute';
+      }
+      // Initialize attribute bindings with any literal parts
+      let literal = literalFromParts(parts);
+      if (literal && kind == 'attribute') {
+        node.setAttribute(name, literal);
+      }
+      // Clear attribute before removing, since IE won't allow removing
+      // `value` attribute if it previously had a value (can't
+      // unconditionally set '' before removing since attributes with `$`
+      // can't be set using setAttribute)
+      if (node.localName === 'input' && origName === 'value') {
+        node.setAttribute(origName, '');
+      }
+      // Remove annotation
+      node.removeAttribute(origName);
+      // Case hackery: attributes are lower-case, but bind targets
+      // (properties) are case sensitive. Gambit is to map dash-case to
+      // camel-case: `foo-bar` becomes `fooBar`.
+      // Attribute bindings are excepted.
+      let propertyName = Polymer.CaseMap.dashToCamelCase(name);
+      if (kind === 'property') {
+        name = propertyName;
+      }
+      return {
+        kind: kind,
+        name: name,
+        propertyName: propertyName,
+        parts: parts,
+        literal: literal,
+        isCompound: parts.length !== 1
+      };
+    }
+  }
+
+  // TODO(sorvell): this should be factored into a plugin
+  function prepElement(element) {
+    Polymer.ResolveUrl.resolveAttrs(element, currentTemplate.ownerDocument);
+  }
+
   // construct `$` map (from id annotations)
   function applyIdToMap(inst, map, dom, note) {
     if (note.id) {
@@ -141,10 +460,23 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     }
   }
 
+  function createNodeEventHandler(context, eventName, methodName) {
+    // Instances can optionally have a _methodHost which allows redirecting where
+    // to find methods. Currently used by `templatize`.
+    context = context._methodHost || context;
+    var handler = function(e) {
+      if (context[methodName]) {
+        context[methodName](e, e.detail);
+      } else {
+        console.warn('listener method `' + methodName + '` not defined');
+      }
+    };
+    return handler;
+  }
+
   Polymer.TemplateStamp = Polymer.Utils.dedupingMixin(function(superClass) {
 
-    const mixin = Polymer.Annotations(Polymer.EventListeners(superClass));
-    return class TemplateStamp extends mixin {
+    return class TemplateStamp extends superClass {
 
       constructor() {
         super();
@@ -170,6 +502,54 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         return dom;
       }
 
+      // preprocess-time
+
+      // construct and return a list of annotation records
+      // by scanning `template`'s content
+      //
+      // TODO(sorvell): This should just crawl over a template and call
+      // a supplied list of callbacks.
+      _parseTemplateAnnotations(template) {
+        return parseTemplateAnnotations(template);
+      }
+
+      // instance-time
+      // TODO(sorvell): consider trying to use QS instead of this proprietary
+      // search. This would require some unique way to identify a node, a guid.
+      // Is this faster? simpler? Is that worth polluting the node?
+      _findTemplateAnnotatedNode(root, note) {
+        // recursively ascend tree until we hit root
+        let parent = note.parent && this._findTemplateAnnotatedNode(root,
+          note.parent);
+        // unwind the stack, returning the indexed node at each level
+        if (parent) {
+          // note: marginally faster than indexing via childNodes
+          // (http://jsperf.com/childnodes-lookup)
+          for (let n=parent.firstChild, i=0; n; n=n.nextSibling) {
+            if (note.index === i++) {
+              return n;
+            }
+          }
+        } else {
+          return root;
+        }
+      }
+
+      _addMethodEventListenerToNode(node, eventName, methodName, context) {
+        context = context || node;
+        var handler = createNodeEventHandler(context, eventName, methodName);
+        this._addEventListenerToNode(node, eventName, handler);
+        return handler;
+      }
+
+      _addEventListenerToNode(node, eventName, handler) {
+        node.addEventListener(eventName, handler);
+      }
+
+      _removeEventListenerFromNode(node, eventName, handler) {
+        node.removeEventListener(eventName, handler);
+      }
+
     }
 
   });

From 77f4e9c4323d451e2cbb582bd908ba8e9e3333bd Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Tue, 14 Feb 2017 10:45:32 -0800
Subject: [PATCH 05/14] Fix logging test.

---
 test/unit/logging.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/logging.html b/test/unit/logging.html
index 34e863d2..77c109ea 100644
--- a/test/unit/logging.html
+++ b/test/unit/logging.html
@@ -36,7 +36,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   </dom-module>
   <script>
   HTMLImports.whenReady(() => {
-    class XMixin extends Polymer.Logging(Polymer.Element) {
+    class XMixin extends Polymer.LegacyElement {
       static get is() { return 'x-mixin' }
       static get config() {
         return {

From cb2d6a80ef9a4e62e3e35ea6d815516b548db14b Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Tue, 14 Feb 2017 10:49:13 -0800
Subject: [PATCH 06/14] remove superfluous doctype's

---
 polymer-element.html           | 1 -
 polymer.html                   | 1 -
 src/elements/custom-style.html | 1 -
 src/lib/style-gather.html      | 1 -
 4 files changed, 4 deletions(-)

diff --git a/polymer-element.html b/polymer-element.html
index a94d2289..c74a351b 100644
--- a/polymer-element.html
+++ b/polymer-element.html
@@ -1,2 +1 @@
-<!DOCTYPE html>
 <link rel="import" href="src/mixins/element.html">
\ No newline at end of file
diff --git a/polymer.html b/polymer.html
index 343e6f03..0342ac28 100644
--- a/polymer.html
+++ b/polymer.html
@@ -1,4 +1,3 @@
-<!DOCTYPE html>
 <link rel="import" href="src/legacy/legacy-element.html">
 <link rel="import" href="src/legacy/polymer-fn.html">
 <link rel="import" href="src/legacy/class.html">
diff --git a/src/elements/custom-style.html b/src/elements/custom-style.html
index acad2ed3..054e1065 100644
--- a/src/elements/custom-style.html
+++ b/src/elements/custom-style.html
@@ -1,4 +1,3 @@
-<!doctype html>
 <!--
 @license
 Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
diff --git a/src/lib/style-gather.html b/src/lib/style-gather.html
index 334654f6..7dea325d 100644
--- a/src/lib/style-gather.html
+++ b/src/lib/style-gather.html
@@ -1,4 +1,3 @@
-<!doctype html>
 <!--
 @license
 Copyright (c) 2016 The Polymer Project Authors. All rights reserved.

From 11c090073d675799bccc8895d6989eca37dc4a78 Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Tue, 14 Feb 2017 11:05:11 -0800
Subject: [PATCH 07/14] rename: * mixins/element.html ->
 mixins/element-mixin.html * legacy/legacy-element.html ->
 legacy/legacy-element-mixin.html

---
 polymer-element.html                                          | 2 +-
 polymer.html                                                  | 2 +-
 src/elements/array-selector.html                              | 2 +-
 src/elements/dom-if.html                                      | 2 +-
 src/elements/dom-repeat.html                                  | 2 +-
 src/legacy/class.html                                         | 2 +-
 src/legacy/{legacy-element.html => legacy-element-mixin.html} | 2 +-
 src/mixins/{element.html => element-mixin.html}               | 0
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename src/legacy/{legacy-element.html => legacy-element-mixin.html} (99%)
 rename src/mixins/{element.html => element-mixin.html} (100%)

diff --git a/polymer-element.html b/polymer-element.html
index c74a351b..5264e0d3 100644
--- a/polymer-element.html
+++ b/polymer-element.html
@@ -1 +1 @@
-<link rel="import" href="src/mixins/element.html">
\ No newline at end of file
+<link rel="import" href="src/mixins/element-mixin.html">
\ No newline at end of file
diff --git a/polymer.html b/polymer.html
index 0342ac28..c464ef77 100644
--- a/polymer.html
+++ b/polymer.html
@@ -1,4 +1,4 @@
-<link rel="import" href="src/legacy/legacy-element.html">
+<link rel="import" href="src/legacy/legacy-element-mixin.html">
 <link rel="import" href="src/legacy/polymer-fn.html">
 <link rel="import" href="src/legacy/class.html">
 <!-- template elements -->
diff --git a/src/elements/array-selector.html b/src/elements/array-selector.html
index bb435fef..66afb69b 100644
--- a/src/elements/array-selector.html
+++ b/src/elements/array-selector.html
@@ -62,7 +62,7 @@ is false, `selected` is a property representing the last selected item.  When
 ```
 -->
 
-<link rel="import" href="../mixins/element.html">
+<link rel="import" href="../mixins/element-mixin.html">
 <link rel="import" href="../lib/utils.html">
 <link rel="import" href="../lib/array-splice.html">
 
diff --git a/src/elements/dom-if.html b/src/elements/dom-if.html
index a34fb5a4..f05df461 100644
--- a/src/elements/dom-if.html
+++ b/src/elements/dom-if.html
@@ -8,7 +8,7 @@ Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 
-<link rel="import" href="../mixins/element.html">
+<link rel="import" href="../mixins/element-mixin.html">
 <link rel="import" href="../lib/templatize.html">
 <link rel="import" href="../lib/debounce.html">
 <link rel="import" href="../lib/flush.html">
diff --git a/src/elements/dom-repeat.html b/src/elements/dom-repeat.html
index 3a9ba00e..7262b67e 100644
--- a/src/elements/dom-repeat.html
+++ b/src/elements/dom-repeat.html
@@ -98,7 +98,7 @@ Then the `observe` property should be configured as follows:
 
 -->
 
-<link rel="import" href="../mixins/element.html">
+<link rel="import" href="../mixins/element-mixin.html">
 <link rel="import" href="../lib/templatize.html">
 <link rel="import" href="../lib/debounce.html">
 <link rel="import" href="../lib/flush.html">
diff --git a/src/legacy/class.html b/src/legacy/class.html
index 27ae6c15..f40573f4 100644
--- a/src/legacy/class.html
+++ b/src/legacy/class.html
@@ -7,7 +7,7 @@ The complete set of contributors may be found at http://polymer.github.io/CONTRI
 Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<link rel="import" href="legacy-element.html">
+<link rel="import" href="legacy-element-mixin.html">
 <link rel="import" href="../lib/utils.html">
 <script>
 
diff --git a/src/legacy/legacy-element.html b/src/legacy/legacy-element-mixin.html
similarity index 99%
rename from src/legacy/legacy-element.html
rename to src/legacy/legacy-element-mixin.html
index 5b681f4e..6c4f5802 100644
--- a/src/legacy/legacy-element.html
+++ b/src/legacy/legacy-element-mixin.html
@@ -8,7 +8,7 @@ Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 
-<link rel="import" href="../mixins/element.html">
+<link rel="import" href="../mixins/element-mixin.html">
 <link rel="import" href="../mixins/gesture-event-listeners.html">
 <link rel="import" href="../lib/utils.html">
 <link rel="import" href="../lib/async-render.html">
diff --git a/src/mixins/element.html b/src/mixins/element-mixin.html
similarity index 100%
rename from src/mixins/element.html
rename to src/mixins/element-mixin.html

From 5d7363abf6df85d219932f4a52ad7c95223df26d Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Tue, 14 Feb 2017 11:22:29 -0800
Subject: [PATCH 08/14] Avoid defining elements inside mixins.

---
 polymer-element.html                 | 5 ++++-
 polymer.html                         | 5 +++++
 src/elements/dom-if.html             | 2 +-
 src/elements/dom-repeat.html         | 2 +-
 src/legacy/legacy-element-mixin.html | 4 ----
 src/mixins/element-mixin.html        | 2 --
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/polymer-element.html b/polymer-element.html
index 5264e0d3..29db3564 100644
--- a/polymer-element.html
+++ b/polymer-element.html
@@ -1 +1,4 @@
-<link rel="import" href="src/mixins/element-mixin.html">
\ No newline at end of file
+<link rel="import" href="src/mixins/element-mixin.html">
+<script>
+  Polymer.Element = Polymer.ElementMixin(HTMLElement);
+</script>
\ No newline at end of file
diff --git a/polymer.html b/polymer.html
index c464ef77..cff38c5d 100644
--- a/polymer.html
+++ b/polymer.html
@@ -9,3 +9,8 @@
 <link rel="import" href="src/elements/array-selector.html">
 <!-- custom-style -->
 <link rel="import" href="src/elements/custom-style.html">
+<script>
+  Polymer.LegacyElement = Polymer.LegacyElementMixin(HTMLElement);
+  // bc
+  Polymer.Base = Polymer.LegacyElement.prototype;
+</script>
\ No newline at end of file
diff --git a/src/elements/dom-if.html b/src/elements/dom-if.html
index f05df461..3b716f94 100644
--- a/src/elements/dom-if.html
+++ b/src/elements/dom-if.html
@@ -8,7 +8,7 @@ Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 
-<link rel="import" href="../mixins/element-mixin.html">
+<link rel="import" href="../../polymer-element.html">
 <link rel="import" href="../lib/templatize.html">
 <link rel="import" href="../lib/debounce.html">
 <link rel="import" href="../lib/flush.html">
diff --git a/src/elements/dom-repeat.html b/src/elements/dom-repeat.html
index 7262b67e..9b370abb 100644
--- a/src/elements/dom-repeat.html
+++ b/src/elements/dom-repeat.html
@@ -98,7 +98,7 @@ Then the `observe` property should be configured as follows:
 
 -->
 
-<link rel="import" href="../mixins/element-mixin.html">
+<link rel="import" href="../../polymer-element.html">
 <link rel="import" href="../lib/templatize.html">
 <link rel="import" href="../lib/debounce.html">
 <link rel="import" href="../lib/flush.html">
diff --git a/src/legacy/legacy-element-mixin.html b/src/legacy/legacy-element-mixin.html
index 6c4f5802..0c9d55ac 100644
--- a/src/legacy/legacy-element-mixin.html
+++ b/src/legacy/legacy-element-mixin.html
@@ -746,9 +746,5 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 
   });
 
-  // bc
-  Polymer.LegacyElement = Polymer.LegacyElementMixin(HTMLElement);
-  Polymer.Base = Polymer.LegacyElement.prototype;
-
 })();
 </script>
diff --git a/src/mixins/element-mixin.html b/src/mixins/element-mixin.html
index 681f977d..7d3f515a 100644
--- a/src/mixins/element-mixin.html
+++ b/src/mixins/element-mixin.html
@@ -460,8 +460,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     }
   };
 
-  Polymer.Element = Polymer.ElementMixin(HTMLElement);
-
   Polymer.updateStyles = function(props) {
     if (window.ShadyCSS) {
       ShadyCSS.updateStyles(props);

From 532ae1d1d81e86f91756c26927b3616e8b3a282a Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Tue, 14 Feb 2017 12:02:48 -0800
Subject: [PATCH 09/14] rename tests: * bind -> property-effects * notify-path
 -> path-effects

---
 test/runner.html                                              | 4 ++--
 .../{notify-path-elements.html => path-effects-elements.html} | 0
 test/unit/{notify-path.html => path-effects.html}             | 4 ++--
 .../{bind-elements.html => property-effects-elements.html}    | 0
 test/unit/{bind.html => property-effects.html}                | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename test/unit/{notify-path-elements.html => path-effects-elements.html} (100%)
 rename test/unit/{notify-path.html => path-effects.html} (99%)
 rename test/unit/{bind-elements.html => property-effects-elements.html} (100%)
 rename test/unit/{bind.html => property-effects.html} (99%)

diff --git a/test/runner.html b/test/runner.html
index d3880f61..f2db9a95 100644
--- a/test/runner.html
+++ b/test/runner.html
@@ -24,8 +24,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   <script>
 
     var suites = [
-      'unit/bind.html',
-      'unit/notify-path.html',
+      'unit/property-effects.html',
+      'unit/path-effects.html',
       'unit/shady.html',
       'unit/shady-events.html',
       'unit/shady-content.html',
diff --git a/test/unit/notify-path-elements.html b/test/unit/path-effects-elements.html
similarity index 100%
rename from test/unit/notify-path-elements.html
rename to test/unit/path-effects-elements.html
diff --git a/test/unit/notify-path.html b/test/unit/path-effects.html
similarity index 99%
rename from test/unit/notify-path.html
rename to test/unit/path-effects.html
index 56a1305b..1853d27c 100644
--- a/test/unit/notify-path.html
+++ b/test/unit/path-effects.html
@@ -14,7 +14,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
   <script src="../../../web-component-tester/browser.js"></script>
   <link rel="import" href="../../polymer.html">
-  <link rel="import" href="notify-path-elements.html">
+  <link rel="import" href="path-effects-elements.html">
 <body>
 
 <script>
@@ -957,7 +957,7 @@ suite('path API', function() {
 });
 
 suite('corner cases', function() {
-  
+
   test('malformed observer has nice message on failure', function() {
     var thrown = false;
     var verifyError = function(e) {
diff --git a/test/unit/bind-elements.html b/test/unit/property-effects-elements.html
similarity index 100%
rename from test/unit/bind-elements.html
rename to test/unit/property-effects-elements.html
diff --git a/test/unit/bind.html b/test/unit/property-effects.html
similarity index 99%
rename from test/unit/bind.html
rename to test/unit/property-effects.html
index 51535b78..23a351a1 100644
--- a/test/unit/bind.html
+++ b/test/unit/property-effects.html
@@ -14,7 +14,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
   <script src="../../../web-component-tester/browser.js"></script>
   <link rel="import" href="../../polymer.html">
-  <link rel="import" href="bind-elements.html">
+  <link rel="import" href="property-effects-elements.html">
 <body>
 <dom-repeat id="class-repeat" items='["class1", "class2"]'>
   <template>

From d8d3949ed3ee0cec1def13bc57999a2810869f8c Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Tue, 14 Feb 2017 12:25:58 -0800
Subject: [PATCH 10/14] property-effects: move initialization from constructor
 to _initializeProperties.

---
 src/mixins/property-accessors.html | 21 ++++++++++++++++-----
 src/mixins/property-effects.html   | 26 ++------------------------
 2 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/src/mixins/property-accessors.html b/src/mixins/property-accessors.html
index 50983e9d..626b0545 100644
--- a/src/mixins/property-accessors.html
+++ b/src/mixins/property-accessors.html
@@ -95,18 +95,29 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
       /**
        * Initializes the local storage for property accessors.
        *
-       * Override to initialize with e.g. default values by setting values into
-       * accessors.
+       * Default initialization via initializing
+       * local property & pending data storage with any accessor values saved
+       * in `__dataProto`.  If instance properties had been set before the
+       * element upgraded and gained accessors on its prototype, these values
+       * are set into the prototype's accessors after being deleted from the
+       * instance.
        *
        * @protected
        */
       _initializeProperties() {
         this.__serializing = false;
-        this.__data = Object.create(null);
         this.__dataCounter = 0;
-        this.__dataPending = null;
-        this.__dataOld = null;
         this.__dataInvalid = false;
+        // initialize data with prototype values saved when creating accessors
+        if (this.__dataProto) {
+          this.__data = Object.create(this.__dataProto);
+          this.__dataPending = Object.create(this.__dataProto);
+          this.__dataOld = {};
+        } else {
+          this.__data = {};
+          this.__dataPending = null;
+          this.__dataOld = null;
+        }
       }
 
       /**
diff --git a/src/mixins/property-effects.html b/src/mixins/property-effects.html
index ebd23c08..abea2d16 100644
--- a/src/mixins/property-effects.html
+++ b/src/mixins/property-effects.html
@@ -1195,8 +1195,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         return TYPES;
       }
 
-      constructor() {
-        super();
+      _initializeProperties() {
+        super._initializeProperties();
         this._asyncEffects = false;
         this.__dataInitialized = false;
         this.__dataPendingClients = null;
@@ -1207,29 +1207,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         // May be set on instance prior to upgrade
         this.__dataCompoundStorage = this.__dataCompoundStorage || null;
         this.__dataHost = this.__dataHost || null;
-      }
-
-      /**
-       * Adds to default initialization in `PropertyAccessors` by initializing
-       * local property & pending data storage with any accessor values saved
-       * in `__dataProto`.  If instance properties had been set before the
-       * element upgraded and gained accessors on its prototype, these values
-       * are set into the prototype's accessors after being deleted from the
-       * instance.
-       *
-       * @override
-       */
-      _initializeProperties() {
-        super._initializeProperties();
         this.__dataTemp = {};
-        // initialize data with prototype values saved when creating accessors
-        if (this.__dataProto) {
-          this.__data = Object.create(this.__dataProto);
-          this.__dataPending = Object.create(this.__dataProto);
-          this.__dataOld = {};
-        } else {
-          this.__dataPending = null;
-        }
         // update instance properties
         for (let p in this.__propertyEffects) {
           if (this.hasOwnProperty(p)) {

From da2ee6659ad6c1a2db89f921cc126f3621116dcb Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Tue, 14 Feb 2017 13:00:45 -0800
Subject: [PATCH 11/14] array-selector: depend on `polymer-element` not
 `element-mixin`

---
 src/elements/array-selector.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/elements/array-selector.html b/src/elements/array-selector.html
index 66afb69b..82be2a2d 100644
--- a/src/elements/array-selector.html
+++ b/src/elements/array-selector.html
@@ -62,7 +62,7 @@ is false, `selected` is a property representing the last selected item.  When
 ```
 -->
 
-<link rel="import" href="../mixins/element-mixin.html">
+<link rel="import" href="../../polymer-element.html">
 <link rel="import" href="../lib/utils.html">
 <link rel="import" href="../lib/array-splice.html">
 

From 8f8ad6987f46d186318786deeadc079e4c423e14 Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Tue, 14 Feb 2017 14:04:26 -0800
Subject: [PATCH 12/14] lint fix.

---
 test/unit/custom-style.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test/unit/custom-style.html b/test/unit/custom-style.html
index c52b14a2..3a6ca908 100644
--- a/test/unit/custom-style.html
+++ b/test/unit/custom-style.html
@@ -299,12 +299,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
       var xBar, xFoo, stylesBuilt;
 
       suiteSetup(function() {
-        var customStyle = document.querySelector('style[is="custom-style"]');
-        stylesBuilt = false;
-
         xBar = document.querySelector('x-bar');
         xFoo = document.querySelector('x-foo');
-
       });
 
       test('root styles applied', function() {

From c7dc0fefb65a3b3adaffa38144aa786858c95515 Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Tue, 14 Feb 2017 16:05:08 -0800
Subject: [PATCH 13/14] Fix DomModule.assetpath so that it's always relative to
 the dom-module's document/import location.

---
 src/elements/dom-module.html  | 20 +++++++++-----------
 src/mixins/element-mixin.html |  9 +++------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/elements/dom-module.html b/src/elements/dom-module.html
index 731aa6f3..3fa868c5 100644
--- a/src/elements/dom-module.html
+++ b/src/elements/dom-module.html
@@ -1,4 +1,5 @@
 <link rel="import" href="../lib/boot.html">
+<link rel="import" href="../lib/resolve-url.html">
 <script>
 
 (function() {
@@ -41,18 +42,15 @@
     }
 
     get assetpath() {
-      let assetpath = this.__assetpath || this.getAttribute('assetpath');
+      let assetpath = this.__assetpath;
       // Don't override existing assetpath.
-      if (assetpath) {}
-      // Polyfilled import.
-      else if (window.HTMLImports && !HTMLImports.useNative &&
-        HTMLImports.importForElement) {
-        const imp = HTMLImports.importForElement(this);
-        assetpath = imp ? imp.href : '';
-      }
-      // Native import.
-      else if (this.ownerDocument !== document && this.baseURI) {
-        assetpath = this.baseURI;
+      if (!assetpath) {
+        // note: assetpath set via an attribute must be relative to this
+        // element's location.
+        assetpath = this.getAttribute('assetpath') || '';
+        const root = window.HTMLImports && HTMLImports.importForElement ?
+          HTMLImports.importForElement(this) || document : this.ownerDocument;
+        assetpath = Polymer.ResolveUrl.resolveUrl(assetpath, root.baseURI);
       }
       // Memoize.
       this.__assetpath = assetpath;
diff --git a/src/mixins/element-mixin.html b/src/mixins/element-mixin.html
index 7d3f515a..04514a1a 100644
--- a/src/mixins/element-mixin.html
+++ b/src/mixins/element-mixin.html
@@ -11,6 +11,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <link rel="import" href="../lib/boot.html">
 <link rel="import" href="../lib/case-map.html">
 <link rel="import" href="../lib/style-gather.html">
+<link rel="import" href="../lib/resolve-url.html">
 <link rel="import" href="../elements/dom-module.html">
 <link rel="import" href="property-effects.html">
 
@@ -402,12 +403,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
        * @return {string} Rewritten URL relative to the import
        */
       resolveUrl(url) {
-        var module = Polymer.DomModule.import(this.constructor.is);
-        var root = '';
-        if (module) {
-          root = Polymer.ResolveUrl.resolveUrl(
-            module.assetpath, module.ownerDocument.baseURI);
-        }
+        const module = Polymer.DomModule.import(this.constructor.is);
+        const root = module ? module.assetpath : document.baseURI;
         return Polymer.ResolveUrl.resolveUrl(url, root);
       }
 

From eb3f26c15ec506484ab491f510e0b13b2737e37e Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Tue, 14 Feb 2017 16:59:19 -0800
Subject: [PATCH 14/14] Add `_initializeProtoProperties` as an override in
 PropertyAccessrs, overridden in PropertyEffects.

---
 src/mixins/property-accessors.html | 19 +++++++++++--------
 src/mixins/property-effects.html   |  6 ++++++
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/mixins/property-accessors.html b/src/mixins/property-accessors.html
index 626b0545..387c301e 100644
--- a/src/mixins/property-accessors.html
+++ b/src/mixins/property-accessors.html
@@ -77,7 +77,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
       static createPropertiesForAttributes() {
         let a$ = this.observedAttributes;
         for (let i=0; i < a$.length; i++) {
-          this._createPropertyAccessor(caseMap.dashToCamelCase(a$[i]));
+          this.prototype._createPropertyAccessor(caseMap.dashToCamelCase(a$[i]));
         }
       }
 
@@ -109,14 +109,17 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         this.__dataCounter = 0;
         this.__dataInvalid = false;
         // initialize data with prototype values saved when creating accessors
+        this.__data = {};
+        this.__dataPending = null;
+        this.__dataOld = null;
         if (this.__dataProto) {
-          this.__data = Object.create(this.__dataProto);
-          this.__dataPending = Object.create(this.__dataProto);
-          this.__dataOld = {};
-        } else {
-          this.__data = {};
-          this.__dataPending = null;
-          this.__dataOld = null;
+          this._initializeProtoProperties(this.__dataProto);
+        }
+      }
+
+      _initializeProtoProperties(props) {
+        for (let p in props) {
+          this._setProperty(p, props[p]);
         }
       }
 
diff --git a/src/mixins/property-effects.html b/src/mixins/property-effects.html
index abea2d16..bf5505af 100644
--- a/src/mixins/property-effects.html
+++ b/src/mixins/property-effects.html
@@ -1218,6 +1218,12 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         }
       }
 
+      _initializeProtoProperties(props) {
+        this.__data = Object.create(props);
+        this.__dataPending = Object.create(props);
+        this.__dataOld = {};
+      }
+
       // Prototype setup ----------------------------------------
 
       /**