Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Unified Diff: third_party/polymer/v1_0/chromium.patch

Issue 2158913007: Roll Polymer from 1.5.0 -> 1.6.0 to pick up native CSS custom props (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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',
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) {

Powered by Google App Engine
This is Rietveld 408576698