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

Unified Diff: third_party/polymer/v1_0/components-chromium/iron-fit-behavior/iron-fit-behavior-extracted.js

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/components-chromium/iron-fit-behavior/iron-fit-behavior-extracted.js
diff --git a/third_party/polymer/v1_0/components-chromium/iron-fit-behavior/iron-fit-behavior-extracted.js b/third_party/polymer/v1_0/components-chromium/iron-fit-behavior/iron-fit-behavior-extracted.js
index 693534a045709a47c914489e8f8cdd807796b4a0..33c6681216a7023d668cdc2490a2710e08a858fc 100644
--- a/third_party/polymer/v1_0/components-chromium/iron-fit-behavior/iron-fit-behavior-extracted.js
+++ b/third_party/polymer/v1_0/components-chromium/iron-fit-behavior/iron-fit-behavior-extracted.js
@@ -222,7 +222,6 @@ Use `noOverlap` to position the element around another element without overlappi
* Positions and fits the element into the `fitInto` element.
*/
fit: function() {
- this._discoverInfo();
this.position();
this.constrain();
this.center();
@@ -324,6 +323,7 @@ Use `noOverlap` to position the element around another element without overlappi
// needs to be centered, and it is done after constrain.
return;
}
+ this._discoverInfo();
this.style.position = 'fixed';
// Need border-box for margin/padding.
@@ -384,6 +384,8 @@ Use `noOverlap` to position the element around another element without overlappi
if (this.horizontalAlign || this.verticalAlign) {
return;
}
+ this._discoverInfo();
+
var info = this._fitInfo;
// position at (0px, 0px) if not already positioned, so we can measure the natural size.
if (!info.positionedBy.vertically) {
@@ -438,6 +440,8 @@ Use `noOverlap` to position the element around another element without overlappi
if (this.horizontalAlign || this.verticalAlign) {
return;
}
+ this._discoverInfo();
+
var positionedBy = this._fitInfo.positionedBy;
if (positionedBy.vertically && positionedBy.horizontally) {
// Already positioned.

Powered by Google App Engine
This is Rietveld 408576698