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

Side by Side Diff: third_party/polymer/v1_0/chromium.patch

Issue 1400813008: Fix closure compile after Polymer update (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@roll-polymer
Patch Set: Created 5 years, 2 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 unified diff | Download patch
« no previous file with comments | « no previous file | third_party/polymer/v1_0/components-chromium/paper-behaviors/paper-ripple-behavior-extracted.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 diff --git a/components-chromium/font-roboto/roboto.html b/components-chromium/f ont-roboto/roboto.html 1 diff --git a/components-chromium/font-roboto/roboto.html b/components-chromium/f ont-roboto/roboto.html
2 index 7a24999..4eefcba 100644 2 index 7a24999..4eefcba 100644
3 --- a/components-chromium/font-roboto/roboto.html 3 --- a/components-chromium/font-roboto/roboto.html
4 +++ b/components-chromium/font-roboto/roboto.html 4 +++ b/components-chromium/font-roboto/roboto.html
5 @@ -7,5 +7,4 @@ The complete set of contributors may be found at http://polymer. github.io/CONTRI 5 @@ -7,5 +7,4 @@ The complete set of contributors may be found at http://polymer. github.io/CONTRI
6 Code distributed by Google as part of the polymer project is also 6 Code distributed by Google as part of the polymer project is also
7 subject to an additional IP rights grant found at http://polymer.github.io/PATE NTS.txt 7 subject to an additional IP rights grant found at http://polymer.github.io/PATE NTS.txt
8 --> 8 -->
9 -<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:400 ,300,300italic,400italic,500,500italic,700,700italic"> 9 -<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:400 ,300,300italic,400italic,500,500italic,700,700italic">
10 -<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto+Mon o:400,700"> 10 -<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto+Mon o:400,700">
11 +<link rel="stylesheet" href="chrome://resources/css/roboto.css"> 11 +<link rel="stylesheet" href="chrome://resources/css/roboto.css">
12 diff --git a/components-chromium/polymer/polymer-extracted.js b/components-chrom ium/polymer/polymer-extracted.js 12 diff --git a/components-chromium/polymer/polymer-extracted.js b/components-chrom ium/polymer/polymer-extracted.js
13 index baf9ab3..985fe6c 100644 13 index baf9ab3..985fe6c 100644
14 --- a/components-chromium/polymer/polymer-extracted.js 14 --- a/components-chromium/polymer/polymer-extracted.js
15 +++ b/components-chromium/polymer/polymer-extracted.js 15 +++ b/components-chromium/polymer/polymer-extracted.js
16 @@ -2157,8 +2157,7 @@ _hasMixinRules: function (rules) { 16 @@ -2157,8 +2157,7 @@ _hasMixinRules: function (rules) {
17 return rules[0].selector.indexOf(this.VAR_START) >= 0; 17 return rules[0].selector.indexOf(this.VAR_START) >= 0;
18 }, 18 },
19 removeCustomProps: function (cssText) { 19 removeCustomProps: function (cssText) {
20 -cssText = this.removeCustomPropAssignment(cssText); 20 -cssText = this.removeCustomPropAssignment(cssText);
21 -return this.removeCustomPropApply(cssText); 21 -return this.removeCustomPropApply(cssText);
22 +return cssText; 22 +return cssText;
23 }, 23 },
24 removeCustomPropAssignment: function (cssText) { 24 removeCustomPropAssignment: function (cssText) {
25 return cssText.replace(this._rx.customProp, '').replace(this._rx.mixinProp, '') ; 25 return cssText.replace(this._rx.customProp, '').replace(this._rx.mixinProp, '') ;
26 diff --git a/components-chromium/polymer-externs/polymer.externs.js b/components -chromium/polymer-externs/polymer.externs.js
27 index e7d685d..0e950f9 100644
28 --- a/components-chromium/polymer-externs/polymer.externs.js
29 +++ b/components-chromium/polymer-externs/polymer.externs.js
30 @@ -464,6 +464,9 @@ PolymerElement.prototype.updateStyles = function(properties) {};
31 */
32 PolymerElement.prototype.customStyle;
33
34 +/** @type {Node|undefined} */
35 +PolymerElement.prototype.shadyRoot;
36 +
37 /**
38 * Logs a message to the console.
39 *
40
OLDNEW
« no previous file with comments | « no previous file | third_party/polymer/v1_0/components-chromium/paper-behaviors/paper-ripple-behavior-extracted.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698