From fb522f63a251cf162a911d1991dfa3147fae640e Mon Sep 17 00:00:00 2001
From: Kevin Schaaf <kschaaf@google.com>
Date: Thu, 4 Jan 2018 17:38:11 -0800
Subject: [PATCH 1/3] Allow adding type="custom" to avoid deprecation warning.
 Fixes #5017

---
 lib/elements/custom-style.html     | 14 ++++++++++----
 test/unit/custom-style-import.html |  4 ++--
 test/unit/custom-style.html        |  6 ++++++
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/lib/elements/custom-style.html b/lib/elements/custom-style.html
index 651fe94bbf..1229bcf07a 100644
--- a/lib/elements/custom-style.html
+++ b/lib/elements/custom-style.html
@@ -13,8 +13,9 @@
 (function() {
   'use strict';
 
-  const attr = 'include';
-
+  const INCLUDE = 'include';
+  const TYPE = 'type';
+  
   const CustomStyleInterface = window.ShadyCSS.CustomStyleInterface;
 
   /**
@@ -86,9 +87,9 @@
         return null;
       }
       this._style = style;
-      const include = style.getAttribute(attr);
+      const include = style.getAttribute(INCLUDE);
       if (include) {
-        style.removeAttribute(attr);
+        style.removeAttribute(INCLUDE);
         style.textContent = Polymer.StyleGather.cssFromModules(include) + style.textContent;
       }
       /*
@@ -102,6 +103,11 @@
       cases of ordering w.r.t the main document styles.
       */
       if (this.ownerDocument !== window.document) {
+        // Allow users to add `type="custom"` to <style> tags to avoid deprecation warning
+        const type = style.getAttribute(TYPE);
+        if (type == 'custom') {
+          style.removeAttribute(TYPE);
+        }
         window.document.head.appendChild(this);
       }
       return this._style;
diff --git a/test/unit/custom-style-import.html b/test/unit/custom-style-import.html
index eb8503cce7..ac3a637e03 100644
--- a/test/unit/custom-style-import.html
+++ b/test/unit/custom-style-import.html
@@ -29,9 +29,9 @@
 
 <link rel="import" href="sub/style-import.html">
 
-<custom-style>
+<custom-style id="type-was-custom">
 <style is="custom-style" include="shared-style style-import
-  style-import2">
+  style-import2" type="custom">
   html {
 
     --import-mixin: {
diff --git a/test/unit/custom-style.html b/test/unit/custom-style.html
index 82a117c1b0..17c9eaf4cd 100644
--- a/test/unit/custom-style.html
+++ b/test/unit/custom-style.html
@@ -365,6 +365,12 @@
         assertComputed(m, '4px');
       });
 
+      test('imported custom-style style with type="custom" has type removed', function() {
+        const customStyle = document.head.querySelector('custom-style#type-was-custom');
+        const style = customStyle.querySelector('style');
+        assert.isFalse(style.hasAttribute('type'));
+      });
+
       test('dynamic custom-styles apply', function() {
         var dynamic = document.querySelector('.dynamic');
         assertComputed(dynamic, '0px');

From d26bb055d6a5c744634ff88cd56e7eb25ea73158 Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Mon, 29 Jan 2018 16:37:02 -0800
Subject: [PATCH 2/3] Add accomodation for HTMLImports polyfill.

---
 externs/closure-types.js       | 62 +++++++++++++++++-----------------
 lib/elements/custom-style.html |  6 ++--
 2 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/externs/closure-types.js b/externs/closure-types.js
index 6fc6e3466a..e7ae2c1e23 100644
--- a/externs/closure-types.js
+++ b/externs/closure-types.js
@@ -119,7 +119,7 @@ Polymer_PropertiesChanged.prototype._propertyToAttribute = function(property, at
 Polymer_PropertiesChanged.prototype._valueToNodeAttribute = function(node, value, attribute){};
 /**
 * @param {*} value Property value to serialize.
-* @return {(string | undefined)}
+* @return {(string|undefined)}
 */
 Polymer_PropertiesChanged.prototype._serializeValue = function(value){};
 /**
@@ -166,7 +166,7 @@ Polymer_PropertyAccessors.prototype._definePropertyAccessor = function(property,
 Polymer_PropertyAccessors.prototype._initializeProperties = function(){};
 /**
 * @param {*} value Property value to serialize.
-* @return {(string | undefined)}
+* @return {(string|undefined)}
 */
 Polymer_PropertyAccessors.prototype._serializeValue = function(value){};
 /**
@@ -459,7 +459,7 @@ Polymer_PropertyEffects.prototype._hasReflectEffect = function(property){};
 */
 Polymer_PropertyEffects.prototype._hasComputedEffect = function(property){};
 /**
-* @param {(string | !Array.<(number | string)>)} path Path to set
+* @param {(string|!Array.<(number|string)>)} path Path to set
 * @param {*} value Value to set
 * @param {boolean=} shouldNotify Set to true if this change should
  cause a property notification event dispatch
@@ -508,13 +508,13 @@ Polymer_PropertyEffects.prototype.setProperties = function(props, setReadOnly){}
 */
 Polymer_PropertyEffects.prototype._propagatePropertyChanges = function(changedProps, oldProps, hasPaths){};
 /**
-* @param {(string | !Array.<(string | number)>)} to Target path to link.
-* @param {(string | !Array.<(string | number)>)} from Source path to link.
+* @param {(string|!Array.<(string|number)>)} to Target path to link.
+* @param {(string|!Array.<(string|number)>)} from Source path to link.
 * @return {void}
 */
 Polymer_PropertyEffects.prototype.linkPaths = function(to, from){};
 /**
-* @param {(string | !Array.<(string | number)>)} path Target path to unlink.
+* @param {(string|!Array.<(string|number)>)} path Target path to unlink.
 * @return {void}
 */
 Polymer_PropertyEffects.prototype.unlinkPaths = function(path){};
@@ -536,7 +536,7 @@ Polymer_PropertyEffects.prototype.unlinkPaths = function(path){};
 */
 Polymer_PropertyEffects.prototype.notifySplices = function(path, splices){};
 /**
-* @param {(string | !Array.<(string | number)>)} path Path to the value
+* @param {(string|!Array.<(string|number)>)} path Path to the value
   to read.  The path may be specified as a string (e.g. `foo.bar.baz`)
   or an array of path parts (e.g. `['foo.bar', 'baz']`).  Note that
   bracketed expressions are not supported; string-based path parts
@@ -548,7 +548,7 @@ Polymer_PropertyEffects.prototype.notifySplices = function(path, splices){};
 */
 Polymer_PropertyEffects.prototype.get = function(path, root){};
 /**
-* @param {(string | !Array.<(string | number)>)} path Path to the value
+* @param {(string|!Array.<(string|number)>)} path Path to the value
   to write.  The path may be specified as a string (e.g. `'foo.bar.baz'`)
   or an array of path parts (e.g. `['foo.bar', 'baz']`).  Note that
   bracketed expressions are not supported; string-based path parts
@@ -562,32 +562,32 @@ Polymer_PropertyEffects.prototype.get = function(path, root){};
 */
 Polymer_PropertyEffects.prototype.set = function(path, value, root){};
 /**
-* @param {(string | !Array.<(string | number)>)} path Path to array.
-* @param {...*} items Items to push onto array
+* @param {(string|!Array.<(string|number)>)} path Path to array.
+* @param {...*} items 
 * @return {number}
 */
 Polymer_PropertyEffects.prototype.push = function(path, items){};
 /**
-* @param {(string | !Array.<(string | number)>)} path Path to array.
+* @param {(string|!Array.<(string|number)>)} path Path to array.
 * @return {*}
 */
 Polymer_PropertyEffects.prototype.pop = function(path){};
 /**
-* @param {(string | !Array.<(string | number)>)} path Path to array.
+* @param {(string|!Array.<(string|number)>)} path Path to array.
 * @param {number} start Index from which to start removing/inserting.
 * @param {number} deleteCount Number of items to remove.
-* @param {...*} items Items to insert into array.
+* @param {...*} items 
 * @return {Array}
 */
 Polymer_PropertyEffects.prototype.splice = function(path, start, deleteCount, items){};
 /**
-* @param {(string | !Array.<(string | number)>)} path Path to array.
+* @param {(string|!Array.<(string|number)>)} path Path to array.
 * @return {*}
 */
 Polymer_PropertyEffects.prototype.shift = function(path){};
 /**
-* @param {(string | !Array.<(string | number)>)} path Path to array.
-* @param {...*} items Items to insert info array
+* @param {(string|!Array.<(string|number)>)} path Path to array.
+* @param {...*} items 
 * @return {number}
 */
 Polymer_PropertyEffects.prototype.unshift = function(path, items){};
@@ -606,7 +606,7 @@ Polymer_PropertyEffects.prototype.notifyPath = function(path, value){};
 Polymer_PropertyEffects.prototype._createReadOnlyProperty = function(property, protectedSetter){};
 /**
 * @param {string} property Property name
-* @param {(string | function (*, *))} method Function or name of observer method to call
+* @param {(string|function (*, *))} method Function or name of observer method to call
 * @param {boolean=} dynamicFn Whether the method name should be included as
   a dependency to the effect.
 * @return {void}
@@ -614,7 +614,7 @@ Polymer_PropertyEffects.prototype._createReadOnlyProperty = function(property, p
 Polymer_PropertyEffects.prototype._createPropertyObserver = function(property, method, dynamicFn){};
 /**
 * @param {string} expression Method expression
-* @param {(boolean | Object)=} dynamicFn Boolean or object map indicating
+* @param {(boolean|Object)=} dynamicFn Boolean or object map indicating
   whether method names should be included as a dependency to the effect.
 * @return {void}
 */
@@ -632,7 +632,7 @@ Polymer_PropertyEffects.prototype._createReflectedProperty = function(property){
 /**
 * @param {string} property Name of computed property to set
 * @param {string} expression Method expression
-* @param {(boolean | Object)=} dynamicFn Boolean or object map indicating
+* @param {(boolean|Object)=} dynamicFn Boolean or object map indicating
   whether method names should be included as a dependency to the effect.
 * @return {void}
 */
@@ -689,7 +689,7 @@ Polymer_PropertyEffects._parseTemplateNodeAttribute = function(node, templateInf
 Polymer_PropertyEffects.addPropertyEffect = function(property, type, effect){};
 /**
 * @param {string} property Property name
-* @param {(string | function (*, *))} method Function or name of observer method to call
+* @param {(string|function (*, *))} method Function or name of observer method to call
 * @param {boolean=} dynamicFn Whether the method name should be included as
   a dependency to the effect.
 * @return {void}
@@ -697,7 +697,7 @@ Polymer_PropertyEffects.addPropertyEffect = function(property, type, effect){};
 Polymer_PropertyEffects.createPropertyObserver = function(property, method, dynamicFn){};
 /**
 * @param {string} expression Method expression
-* @param {(boolean | Object)=} dynamicFn Boolean or object map indicating
+* @param {(boolean|Object)=} dynamicFn Boolean or object map indicating
 * @return {void}
 */
 Polymer_PropertyEffects.createMethodObserver = function(expression, dynamicFn){};
@@ -721,7 +721,7 @@ Polymer_PropertyEffects.createReflectedProperty = function(property){};
 /**
 * @param {string} property Name of computed property to set
 * @param {string} expression Method expression
-* @param {(boolean | Object)=} dynamicFn Boolean or object map indicating whether
+* @param {(boolean|Object)=} dynamicFn Boolean or object map indicating whether
   method names should be included as a dependency to the effect.
 * @return {void}
 */
@@ -805,7 +805,7 @@ Polymer_ElementMixin.prototype.rootPath;
 /** @type {string} */
 Polymer_ElementMixin.prototype.importPath;
 
-/** @type {(StampedTemplate | HTMLElement | ShadowRoot)} */
+/** @type {(StampedTemplate|HTMLElement|ShadowRoot)} */
 Polymer_ElementMixin.prototype.root;
 
 /** @type {!Object.<string, !Element>} */
@@ -1005,7 +1005,7 @@ Polymer_LegacyElementMixin.prototype._ensureAttributes = function(){};
 Polymer_LegacyElementMixin.prototype._applyListeners = function(){};
 /**
 * @param {*} value Value to deserialize
-* @return {(string | undefined)}
+* @return {(string|undefined)}
 */
 Polymer_LegacyElementMixin.prototype.serialize = function(value){};
 /**
@@ -1056,7 +1056,7 @@ Polymer_LegacyElementMixin.prototype.instanceTemplate = function(template){};
 * @param {string} type Name of event type.
 * @param {*=} detail Detail value containing event-specific
   payload.
-* @param {{bubbles: (boolean | undefined), cancelable: (boolean | undefined), composed: (boolean | undefined)}=} options Object specifying options.  These may include:
+* @param {{bubbles: (boolean|undefined), cancelable: (boolean|undefined), composed: (boolean|undefined)}=} options Object specifying options.  These may include:
  `bubbles` (boolean, defaults to `true`),
  `cancelable` (boolean, defaults to false), and
  `node` on which to fire the event (HTMLElement, defaults to `this`).
@@ -1250,7 +1250,7 @@ Defaults to `this`.
 */
 Polymer_LegacyElementMixin.prototype.translate3d = function(x, y, z, node){};
 /**
-* @param {(string | !Array.<(number | string)>)} arrayOrPath Path to array from which to remove the item
+* @param {(string|!Array.<(number|string)>)} arrayOrPath Path to array from which to remove the item
   (or the array itself).
 * @param {*} item Item to remove.
 * @return {Array}
@@ -1263,23 +1263,23 @@ Polymer_LegacyElementMixin.prototype.arrayDelete = function(arrayOrPath, item){}
 */
 Polymer_LegacyElementMixin.prototype._logger = function(level, args){};
 /**
-* @param {...*} args Array of strings or objects to log
+* @param {...*} args 
 * @return {void}
 */
 Polymer_LegacyElementMixin.prototype._log = function(args){};
 /**
-* @param {...*} args Array of strings or objects to log
+* @param {...*} args 
 * @return {void}
 */
 Polymer_LegacyElementMixin.prototype._warn = function(args){};
 /**
-* @param {...*} args Array of strings or objects to log
+* @param {...*} args 
 * @return {void}
 */
 Polymer_LegacyElementMixin.prototype._error = function(args){};
 /**
 * @param {string} methodName Method name to associate with message
-* @param {...*} args Array of strings or objects to log
+* @param {...*} args 
 * @return {Array}
 */
 Polymer_LegacyElementMixin.prototype._logf = function(methodName, args){};
@@ -1319,7 +1319,7 @@ Polymer_ArraySelectorMixin.prototype.items;
 /** @type {boolean} */
 Polymer_ArraySelectorMixin.prototype.multi;
 
-/** @type {?(Object | Array.<!Object>)} */
+/** @type {?(Object|Array.<!Object>)} */
 Polymer_ArraySelectorMixin.prototype.selected;
 
 /** @type {?Object} */
diff --git a/lib/elements/custom-style.html b/lib/elements/custom-style.html
index 1229bcf07a..3dd0cfb498 100644
--- a/lib/elements/custom-style.html
+++ b/lib/elements/custom-style.html
@@ -15,7 +15,7 @@
 
   const INCLUDE = 'include';
   const TYPE = 'type';
-  
+
   const CustomStyleInterface = window.ShadyCSS.CustomStyleInterface;
 
   /**
@@ -102,7 +102,9 @@
       The ordering of `<custom-style>` should stay the same as when loaded by HTML Imports, but there may be odd
       cases of ordering w.r.t the main document styles.
       */
-      if (this.ownerDocument !== window.document) {
+      const owner = window.HTMLImports && HTMLImports.importForElement ?
+        HTMLImports.importForElement(this) || document : this.ownerDocument;
+      if (owner !== window.document) {
         // Allow users to add `type="custom"` to <style> tags to avoid deprecation warning
         const type = style.getAttribute(TYPE);
         if (type == 'custom') {

From c10629f72a92d233e7c6a3951c49ba9d56b05e46 Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Mon, 29 Jan 2018 17:51:40 -0800
Subject: [PATCH 3/3] Update types

---
 externs/closure-types.js | 62 ++++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/externs/closure-types.js b/externs/closure-types.js
index e7ae2c1e23..6fc6e3466a 100644
--- a/externs/closure-types.js
+++ b/externs/closure-types.js
@@ -119,7 +119,7 @@ Polymer_PropertiesChanged.prototype._propertyToAttribute = function(property, at
 Polymer_PropertiesChanged.prototype._valueToNodeAttribute = function(node, value, attribute){};
 /**
 * @param {*} value Property value to serialize.
-* @return {(string|undefined)}
+* @return {(string | undefined)}
 */
 Polymer_PropertiesChanged.prototype._serializeValue = function(value){};
 /**
@@ -166,7 +166,7 @@ Polymer_PropertyAccessors.prototype._definePropertyAccessor = function(property,
 Polymer_PropertyAccessors.prototype._initializeProperties = function(){};
 /**
 * @param {*} value Property value to serialize.
-* @return {(string|undefined)}
+* @return {(string | undefined)}
 */
 Polymer_PropertyAccessors.prototype._serializeValue = function(value){};
 /**
@@ -459,7 +459,7 @@ Polymer_PropertyEffects.prototype._hasReflectEffect = function(property){};
 */
 Polymer_PropertyEffects.prototype._hasComputedEffect = function(property){};
 /**
-* @param {(string|!Array.<(number|string)>)} path Path to set
+* @param {(string | !Array.<(number | string)>)} path Path to set
 * @param {*} value Value to set
 * @param {boolean=} shouldNotify Set to true if this change should
  cause a property notification event dispatch
@@ -508,13 +508,13 @@ Polymer_PropertyEffects.prototype.setProperties = function(props, setReadOnly){}
 */
 Polymer_PropertyEffects.prototype._propagatePropertyChanges = function(changedProps, oldProps, hasPaths){};
 /**
-* @param {(string|!Array.<(string|number)>)} to Target path to link.
-* @param {(string|!Array.<(string|number)>)} from Source path to link.
+* @param {(string | !Array.<(string | number)>)} to Target path to link.
+* @param {(string | !Array.<(string | number)>)} from Source path to link.
 * @return {void}
 */
 Polymer_PropertyEffects.prototype.linkPaths = function(to, from){};
 /**
-* @param {(string|!Array.<(string|number)>)} path Target path to unlink.
+* @param {(string | !Array.<(string | number)>)} path Target path to unlink.
 * @return {void}
 */
 Polymer_PropertyEffects.prototype.unlinkPaths = function(path){};
@@ -536,7 +536,7 @@ Polymer_PropertyEffects.prototype.unlinkPaths = function(path){};
 */
 Polymer_PropertyEffects.prototype.notifySplices = function(path, splices){};
 /**
-* @param {(string|!Array.<(string|number)>)} path Path to the value
+* @param {(string | !Array.<(string | number)>)} path Path to the value
   to read.  The path may be specified as a string (e.g. `foo.bar.baz`)
   or an array of path parts (e.g. `['foo.bar', 'baz']`).  Note that
   bracketed expressions are not supported; string-based path parts
@@ -548,7 +548,7 @@ Polymer_PropertyEffects.prototype.notifySplices = function(path, splices){};
 */
 Polymer_PropertyEffects.prototype.get = function(path, root){};
 /**
-* @param {(string|!Array.<(string|number)>)} path Path to the value
+* @param {(string | !Array.<(string | number)>)} path Path to the value
   to write.  The path may be specified as a string (e.g. `'foo.bar.baz'`)
   or an array of path parts (e.g. `['foo.bar', 'baz']`).  Note that
   bracketed expressions are not supported; string-based path parts
@@ -562,32 +562,32 @@ Polymer_PropertyEffects.prototype.get = function(path, root){};
 */
 Polymer_PropertyEffects.prototype.set = function(path, value, root){};
 /**
-* @param {(string|!Array.<(string|number)>)} path Path to array.
-* @param {...*} items 
+* @param {(string | !Array.<(string | number)>)} path Path to array.
+* @param {...*} items Items to push onto array
 * @return {number}
 */
 Polymer_PropertyEffects.prototype.push = function(path, items){};
 /**
-* @param {(string|!Array.<(string|number)>)} path Path to array.
+* @param {(string | !Array.<(string | number)>)} path Path to array.
 * @return {*}
 */
 Polymer_PropertyEffects.prototype.pop = function(path){};
 /**
-* @param {(string|!Array.<(string|number)>)} path Path to array.
+* @param {(string | !Array.<(string | number)>)} path Path to array.
 * @param {number} start Index from which to start removing/inserting.
 * @param {number} deleteCount Number of items to remove.
-* @param {...*} items 
+* @param {...*} items Items to insert into array.
 * @return {Array}
 */
 Polymer_PropertyEffects.prototype.splice = function(path, start, deleteCount, items){};
 /**
-* @param {(string|!Array.<(string|number)>)} path Path to array.
+* @param {(string | !Array.<(string | number)>)} path Path to array.
 * @return {*}
 */
 Polymer_PropertyEffects.prototype.shift = function(path){};
 /**
-* @param {(string|!Array.<(string|number)>)} path Path to array.
-* @param {...*} items 
+* @param {(string | !Array.<(string | number)>)} path Path to array.
+* @param {...*} items Items to insert info array
 * @return {number}
 */
 Polymer_PropertyEffects.prototype.unshift = function(path, items){};
@@ -606,7 +606,7 @@ Polymer_PropertyEffects.prototype.notifyPath = function(path, value){};
 Polymer_PropertyEffects.prototype._createReadOnlyProperty = function(property, protectedSetter){};
 /**
 * @param {string} property Property name
-* @param {(string|function (*, *))} method Function or name of observer method to call
+* @param {(string | function (*, *))} method Function or name of observer method to call
 * @param {boolean=} dynamicFn Whether the method name should be included as
   a dependency to the effect.
 * @return {void}
@@ -614,7 +614,7 @@ Polymer_PropertyEffects.prototype._createReadOnlyProperty = function(property, p
 Polymer_PropertyEffects.prototype._createPropertyObserver = function(property, method, dynamicFn){};
 /**
 * @param {string} expression Method expression
-* @param {(boolean|Object)=} dynamicFn Boolean or object map indicating
+* @param {(boolean | Object)=} dynamicFn Boolean or object map indicating
   whether method names should be included as a dependency to the effect.
 * @return {void}
 */
@@ -632,7 +632,7 @@ Polymer_PropertyEffects.prototype._createReflectedProperty = function(property){
 /**
 * @param {string} property Name of computed property to set
 * @param {string} expression Method expression
-* @param {(boolean|Object)=} dynamicFn Boolean or object map indicating
+* @param {(boolean | Object)=} dynamicFn Boolean or object map indicating
   whether method names should be included as a dependency to the effect.
 * @return {void}
 */
@@ -689,7 +689,7 @@ Polymer_PropertyEffects._parseTemplateNodeAttribute = function(node, templateInf
 Polymer_PropertyEffects.addPropertyEffect = function(property, type, effect){};
 /**
 * @param {string} property Property name
-* @param {(string|function (*, *))} method Function or name of observer method to call
+* @param {(string | function (*, *))} method Function or name of observer method to call
 * @param {boolean=} dynamicFn Whether the method name should be included as
   a dependency to the effect.
 * @return {void}
@@ -697,7 +697,7 @@ Polymer_PropertyEffects.addPropertyEffect = function(property, type, effect){};
 Polymer_PropertyEffects.createPropertyObserver = function(property, method, dynamicFn){};
 /**
 * @param {string} expression Method expression
-* @param {(boolean|Object)=} dynamicFn Boolean or object map indicating
+* @param {(boolean | Object)=} dynamicFn Boolean or object map indicating
 * @return {void}
 */
 Polymer_PropertyEffects.createMethodObserver = function(expression, dynamicFn){};
@@ -721,7 +721,7 @@ Polymer_PropertyEffects.createReflectedProperty = function(property){};
 /**
 * @param {string} property Name of computed property to set
 * @param {string} expression Method expression
-* @param {(boolean|Object)=} dynamicFn Boolean or object map indicating whether
+* @param {(boolean | Object)=} dynamicFn Boolean or object map indicating whether
   method names should be included as a dependency to the effect.
 * @return {void}
 */
@@ -805,7 +805,7 @@ Polymer_ElementMixin.prototype.rootPath;
 /** @type {string} */
 Polymer_ElementMixin.prototype.importPath;
 
-/** @type {(StampedTemplate|HTMLElement|ShadowRoot)} */
+/** @type {(StampedTemplate | HTMLElement | ShadowRoot)} */
 Polymer_ElementMixin.prototype.root;
 
 /** @type {!Object.<string, !Element>} */
@@ -1005,7 +1005,7 @@ Polymer_LegacyElementMixin.prototype._ensureAttributes = function(){};
 Polymer_LegacyElementMixin.prototype._applyListeners = function(){};
 /**
 * @param {*} value Value to deserialize
-* @return {(string|undefined)}
+* @return {(string | undefined)}
 */
 Polymer_LegacyElementMixin.prototype.serialize = function(value){};
 /**
@@ -1056,7 +1056,7 @@ Polymer_LegacyElementMixin.prototype.instanceTemplate = function(template){};
 * @param {string} type Name of event type.
 * @param {*=} detail Detail value containing event-specific
   payload.
-* @param {{bubbles: (boolean|undefined), cancelable: (boolean|undefined), composed: (boolean|undefined)}=} options Object specifying options.  These may include:
+* @param {{bubbles: (boolean | undefined), cancelable: (boolean | undefined), composed: (boolean | undefined)}=} options Object specifying options.  These may include:
  `bubbles` (boolean, defaults to `true`),
  `cancelable` (boolean, defaults to false), and
  `node` on which to fire the event (HTMLElement, defaults to `this`).
@@ -1250,7 +1250,7 @@ Defaults to `this`.
 */
 Polymer_LegacyElementMixin.prototype.translate3d = function(x, y, z, node){};
 /**
-* @param {(string|!Array.<(number|string)>)} arrayOrPath Path to array from which to remove the item
+* @param {(string | !Array.<(number | string)>)} arrayOrPath Path to array from which to remove the item
   (or the array itself).
 * @param {*} item Item to remove.
 * @return {Array}
@@ -1263,23 +1263,23 @@ Polymer_LegacyElementMixin.prototype.arrayDelete = function(arrayOrPath, item){}
 */
 Polymer_LegacyElementMixin.prototype._logger = function(level, args){};
 /**
-* @param {...*} args 
+* @param {...*} args Array of strings or objects to log
 * @return {void}
 */
 Polymer_LegacyElementMixin.prototype._log = function(args){};
 /**
-* @param {...*} args 
+* @param {...*} args Array of strings or objects to log
 * @return {void}
 */
 Polymer_LegacyElementMixin.prototype._warn = function(args){};
 /**
-* @param {...*} args 
+* @param {...*} args Array of strings or objects to log
 * @return {void}
 */
 Polymer_LegacyElementMixin.prototype._error = function(args){};
 /**
 * @param {string} methodName Method name to associate with message
-* @param {...*} args 
+* @param {...*} args Array of strings or objects to log
 * @return {Array}
 */
 Polymer_LegacyElementMixin.prototype._logf = function(methodName, args){};
@@ -1319,7 +1319,7 @@ Polymer_ArraySelectorMixin.prototype.items;
 /** @type {boolean} */
 Polymer_ArraySelectorMixin.prototype.multi;
 
-/** @type {?(Object|Array.<!Object>)} */
+/** @type {?(Object | Array.<!Object>)} */
 Polymer_ArraySelectorMixin.prototype.selected;
 
 /** @type {?Object} */