Chromium Code Reviews| Index: third_party/polymer/v1_0/chromium.patch |
| diff --git a/third_party/polymer/v1_0/chromium.patch b/third_party/polymer/v1_0/chromium.patch |
| index abea3534fe32cb8ef469aeda22264184d2589a27..9de17adf4442269b0b572939ed648fb6b932f48b 100644 |
| --- a/third_party/polymer/v1_0/chromium.patch |
| +++ b/third_party/polymer/v1_0/chromium.patch |
| @@ -24,26 +24,15 @@ index baf9ab3..985fe6c 100644 |
| removeCustomPropAssignment: function (cssText) { |
| return cssText.replace(this._rx.customProp, '').replace(this._rx.mixinProp, ''); |
| diff --git a/components-chromium/polymer/polymer-extracted.js b/components-chromium/polymer/polymer-extracted.js |
| -index 8446e8a..3f679f6 100644 |
| +index 627bdd3..7ba497c 100644 |
| --- a/components-chromium/polymer/polymer-extracted.js |
| +++ b/components-chromium/polymer/polymer-extracted.js |
| -@@ -2475,7 +2475,7 @@ AT_START: '@' |
| - }(); |
| - Polymer.StyleUtil = function () { |
| +@@ -2521,7 +2521,7 @@ AT_START: '@' |
| + var settings = Polymer.Settings; |
| return { |
| + NATIVE_VARIABLES: Polymer.Settings.useNativeCSSProperties, |
| -MODULE_STYLES_SELECTOR: 'style, link[rel=import][type~=css], template', |
| +MODULE_STYLES_SELECTOR: 'style:not([no-process]), link[rel=import][type~=css], template', |
|
michaelpg
2016/07/21 23:12:27
do we still need this?
Dan Beam
2016/07/21 23:16:11
yeah, for now, really just because we actually hav
|
| INCLUDE_ATTR: 'include', |
| - toCssText: function (rules, callback, preserveProperties) { |
| + toCssText: function (rules, callback) { |
| if (typeof rules === 'string') { |
| ---- a/components-chromium/iron-collapse/iron-collapse-extracted.js |
| -+++ b/components-chromium/iron-collapse/iron-collapse-extracted.js |
| -@@ -96,7 +96,7 @@ Polymer({ |
| - |
| - /** |
| - * Updates the size of the element. |
| -- * @param {!String} size The new value for `maxWidth`/`maxHeight` as css property value, usually `auto` or `0px`. |
| -+ * @param {string} size The new value for `maxWidth`/`maxHeight` as css property value, usually `auto` or `0px`. |
| - * @param {boolean=} animated if `true` updates the size with an animation, otherwise without. |
| - */ |
| - updateSize: function(size, animated) { |