From e0fbfbe688e00293117dbc8c6a811668d3c1ea1f Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Mon, 2 Nov 2015 17:26:58 -0800
Subject: [PATCH] avoid configuration work when unnecessary

---
 polymer-micro.html                |  2 --
 polymer-mini.html                 | 21 +++++++++---------
 polymer.html                      | 33 ++++++++++++++-------------
 src/lib/template/templatizer.html |  8 ++++---
 src/mini/ready.html               | 37 +++++++++++++++++--------------
 src/standard/configure.html       |  4 +++-
 6 files changed, 57 insertions(+), 48 deletions(-)

diff --git a/polymer-micro.html b/polymer-micro.html
index f443f8658e..3914a91e5b 100644
--- a/polymer-micro.html
+++ b/polymer-micro.html
@@ -27,8 +27,6 @@
     _registerFeatures: function() {
       // identity
       this._prepIs();
-      // attributes
-      this._prepAttributes();
       // shared behaviors
       this._prepBehaviors();
       // factory
diff --git a/polymer-mini.html b/polymer-mini.html
index 668fb54502..cfd2b47c98 100644
--- a/polymer-mini.html
+++ b/polymer-mini.html
@@ -24,8 +24,6 @@
     _registerFeatures: function() {
       // identity
       this._prepIs();
-      // attributes
-      this._prepAttributes();
       // shared behaviors
       this._prepBehaviors();
       // factory
@@ -43,14 +41,17 @@
     },
 
     _initFeatures: function() {
-      // manage local dom
-      this._poolContent();
-      // host stack
-      this._pushHost();
-      // instantiate template
-      this._stampTemplate();
-      // host stack
-      this._popHost();
+      this._calcHost();
+      if (this._template) {
+        // manage local dom
+        this._poolContent();
+        // host stack
+        this._beginHost();
+        // instantiate template
+        this._stampTemplate();
+        // host stack
+        this._popHost();
+      }
       // install host attributes
       this._marshalHostAttributes();
       // setup debouncers
diff --git a/polymer.html b/polymer.html
index 823d890650..46b62ff91e 100644
--- a/polymer.html
+++ b/polymer.html
@@ -28,8 +28,6 @@
     _registerFeatures: function() {
       // identity
       this._prepIs();
-      // attributes
-      this._prepAttributes();
       // factory
       this._prepConstructor();
       // template
@@ -59,37 +57,42 @@
     },
 
     _initFeatures: function() {
-      // manage local dom
-      this._poolContent();
       // manage configuration
       this._setupConfigure();
       // setup style properties
       this._setupStyleProperties();
-      // host stack
-      this._pushHost();
-      // instantiate template
-      this._stampTemplate();
-      // host stack
-      this._popHost();
-      // concretize template references
-      this._marshalAnnotationReferences();
       // setup debouncers
       this._setupDebouncers();
+      this._calcHost();
+      if (this._template) {
+        // manage local dom
+        this._poolContent();
+        // host stack
+        this._beginHost();
+        // instantiate template
+        this._stampTemplate();
+        // host stack
+        this._popHost();
+        // concretize template references
+        this._marshalAnnotationReferences();
+      }
       // concretize effects on instance
       this._marshalInstanceEffects();
       // acquire instance behaviors
       this._marshalBehaviors();
-      // install host attributes
-      this._marshalHostAttributes();
       // acquire initial instance attribute values
       this._marshalAttributes();
+      // install host attributes
+      this._marshalHostAttributes();
       // top-down initial distribution, configuration, & ready callback
       this._tryReady();
     },
 
     _marshalBehavior: function(b) {
       // establish listeners on instance
-      this._listenListeners(b.listeners);
+      if (b.listeners) {
+        this._listenListeners(b.listeners);
+      }
     }
 
   });
diff --git a/src/lib/template/templatizer.html b/src/lib/template/templatizer.html
index dd35ccfa23..b8bf0c7bb7 100644
--- a/src/lib/template/templatizer.html
+++ b/src/lib/template/templatizer.html
@@ -288,14 +288,15 @@
     // Similar to Polymer.Base.extend, but retains any previously set instance
     // values (_propertySetter back on instance once accessor is installed)
     _extendTemplate: function(template, proto) {
-      Object.getOwnPropertyNames(proto).forEach(function(n) {
+      var n$ = Object.getOwnPropertyNames(proto);
+      for (var i=0, n; (i<n$.length) && (n=n$[i]); i++) {
         var val = template[n];
         var pd = Object.getOwnPropertyDescriptor(proto, n);
         Object.defineProperty(template, n, pd);
         if (val !== undefined) {
           template._propertySetter(n, val);
         }
-      });
+      }
     },
 
     // Extension points for Templatizer sub-classes
@@ -331,7 +332,8 @@
     _constructorImpl: function(model, host) {
       this._rootDataHost = host._getRootDataHost();
       this._setupConfigure(model);
-      this._pushHost(host);
+      this._calcHost(host);
+      this._beginHost();
       this.root = this.instanceTemplate(this._template);
       this.root.__noContent = !this._notes._hasContent;
       this.root.__styleScoped = true;
diff --git a/src/mini/ready.html b/src/mini/ready.html
index df7c9f9ba1..5aa67ab55e 100644
--- a/src/mini/ready.html
+++ b/src/mini/ready.html
@@ -56,24 +56,23 @@
     // In order not to over-emphaisize this technical difference, we expose
     // one concept to the user and it maps to the dom-related meaning of host.
     //
-    // 1. set this element's `host` and push this element onto the `host`'s
+    // set this element's `host` and push this element onto the `host`'s
     // list of `client` elements
-    // 2. establish this element as the current hosting element (allows
-    // any elements we stamp to easily set host to us).
-    _pushHost: function(host) {
+    // this.dataHost reflects the parent element who manages
+    // any bindings for the element.  Only elements originally
+    // stamped from Polymer templates have a dataHost, and this
+    // never changes
+    _calcHost: function(host) {
       // NOTE: The `dataHost` of an element never changes.
-      this.dataHost = host = host ||
+      this.dataHost = host = host || 
         Polymer.Base._hostStack[Polymer.Base._hostStack.length-1];
-      // this.dataHost reflects the parent element who manages
-      // any bindings for the element.  Only elements originally
-      // stamped from Polymer templates have a dataHost, and this
-      // never changes
       if (host && host._clients) {
         host._clients.push(this);
       }
-      this._beginHost();
     },
 
+    // establish this element as the current hosting element (allows
+    // any elements we stamp to easily set host to us).
     _beginHost: function() {
       Polymer.Base._hostStack.push(this);
       if (!this._clients) {
@@ -99,9 +98,13 @@
     _ready: function() {
       // extension point
       this._beforeClientsReady();
-      // prepare root
-      this._setupRoot();
-      this._readyClients();
+      if (this._template) {
+        // prepare root
+        this._setupRoot();
+        this._readyClients();
+      }
+      this._clientsReadied = true;
+      this._clients = null;
       // extension point
       this._afterClientsReady();
       this._readySelf();
@@ -112,8 +115,10 @@
       this._beginDistribute();
       // now fully prepare localChildren
       var c$ = this._clients;
-      for (var i=0, l= c$.length, c; (i<l) && (c=c$[i]); i++) {
-        c._ready();
+      if (c$) {
+        for (var i=0, l= c$.length, c; (i<l) && (c=c$[i]); i++) {
+          c._ready();
+        }
       }
       // perform actual dom composition
       this._finishDistribute();
@@ -123,8 +128,6 @@
       // if (!Polymer.Settings.useNativeCustomElements) {
       //   CustomElements.takeRecords();
       // }
-      this._clientsReadied = true;
-      this._clients = null;
     },
 
     // mark readied and call `ready`
diff --git a/src/standard/configure.html b/src/standard/configure.html
index 9a547958e5..2818abd3fd 100644
--- a/src/standard/configure.html
+++ b/src/standard/configure.html
@@ -102,7 +102,9 @@
       // this is the new _config, which are the final values to be applied
       this._config = config;
       // pass configuration data to bindings
-      this._distributeConfig(this._config);
+      if (this._clients && this._clients.length) {
+        this._distributeConfig(this._config);
+      }
     },
 
     _configureProperties: function(properties, config) {