Fix renames

ampproject · Jan 30, 2018 · b6e82df · b6e82df
1 parent fb46356
commit b6e82df
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/src/service/resources-impl.js b/src/service/resources-impl.js
@@ -1690,7 +1690,7 @@ export class Resources {
 
     const score = currentScore || 0;
     const depthPenalty = 1 + (depth / 10);
-    const nonActivePenalty = layout.isActive() ? 1 : 2;
+    const nonActivePenalty = layout.isActiveUnsafe() ? 1 : 2;
     const distance = layout.getHorizontalDistanceFromParent() +
         layout.getVerticalDistanceFromParent();
     return cache[id] = score + nonActivePenalty * depthPenalty * distance;

diff --git a/test/functional/test-layers.js b/test/functional/test-layers.js
@@ -45,7 +45,7 @@ describes.realWin('Layers', {amp: false}, env => {
     element.scrollTop = top;
     element.scrollLeft = left;
     const layout = LayoutElement.for(element);
-    layout.requestScrollRemeasure();
+    layout.dirtyScrollMeasurements();
   }
 
   describe('LayoutElement', () => {
@@ -123,14 +123,14 @@ describes.realWin('Layers', {amp: false}, env => {
         });
 
         div.style.top = '10px';
-        rootLayout.requestRemeasure();
+        rootLayout.dirtyMeasurements();
         expect(layout.getScrolledPosition()).to.deep.equal({
           left: 0,
           top: 10,
         });
 
         div.style.left = '10px';
-        rootLayout.requestRemeasure();
+        rootLayout.dirtyMeasurements();
         expect(layout.getScrolledPosition()).to.deep.equal({
           left: 10,
           top: 10,
@@ -144,14 +144,14 @@ describes.realWin('Layers', {amp: false}, env => {
         });
 
         parent.style.top = '10px';
-        rootLayout.requestRemeasure();
+        rootLayout.dirtyMeasurements();
         expect(layout.getScrolledPosition()).to.deep.equal({
           left: 0,
           top: 10,
         });
 
         parent.style.left = '10px';
-        rootLayout.requestRemeasure();
+        rootLayout.dirtyMeasurements();
         expect(layout.getScrolledPosition()).to.deep.equal({
           left: 10,
           top: 10,
@@ -166,15 +166,15 @@ describes.realWin('Layers', {amp: false}, env => {
 
         parent.style.top = '10px';
         div.style.left = '10px';
-        rootLayout.requestRemeasure();
+        rootLayout.dirtyMeasurements();
         expect(layout.getScrolledPosition()).to.deep.equal({
           left: 10,
           top: 10,
         });
 
         parent.style.left = '10px';
         div.style.top = '10px';
-        rootLayout.requestRemeasure();
+        rootLayout.dirtyMeasurements();
         expect(layout.getScrolledPosition()).to.deep.equal({
           left: 20,
           top: 20,
@@ -188,7 +188,7 @@ describes.realWin('Layers', {amp: false}, env => {
           left: 0,
           top: 0,
         });
-        rootLayout.requestRemeasure();
+        rootLayout.dirtyMeasurements();
         expect(parentLayout.getScrolledPosition()).to.deep.equal({
           left: 0,
           top: 0,
@@ -200,7 +200,7 @@ describes.realWin('Layers', {amp: false}, env => {
           left: 0,
           top: 0,
         });
-        rootLayout.requestRemeasure();
+        rootLayout.dirtyMeasurements();
         expect(rootLayout.getScrolledPosition()).to.deep.equal({
           left: 0,
           top: 0,
@@ -214,7 +214,7 @@ describes.realWin('Layers', {amp: false}, env => {
           left: -5,
           top: -10,
         });
-        rootLayout.requestRemeasure();
+        rootLayout.dirtyMeasurements();
         expect(layout.getScrolledPosition()).to.deep.equal({
           left: -5,
           top: -10,
@@ -226,7 +226,7 @@ describes.realWin('Layers', {amp: false}, env => {
           left: -10,
           top: -20,
         });
-        rootLayout.requestRemeasure();
+        rootLayout.dirtyMeasurements();
         expect(layout.getScrolledPosition()).to.deep.equal({
           left: -10,
           top: -20,
@@ -274,14 +274,14 @@ describes.realWin('Layers', {amp: false}, env => {
         });
 
         div.style.top = '10px';
-        rootLayout.requestRemeasure();
+        rootLayout.dirtyMeasurements();
         expect(layout.getOffsetPosition()).to.deep.equal({
           left: 0,
           top: 10,
         });
 
         div.style.left = '10px';
-        rootLayout.requestRemeasure();
+        rootLayout.dirtyMeasurements();
         expect(layout.getOffsetPosition()).to.deep.equal({
           left: 10,
           top: 10,
@@ -295,14 +295,14 @@ describes.realWin('Layers', {amp: false}, env => {
         });
 
         parent.style.top = '10px';
-        rootLayout.requestRemeasure();
+        rootLayout.dirtyMeasurements();
         expect(layout.getOffsetPosition()).to.deep.equal({
           left: 0,
           top: 10,
         });
 
         parent.style.left = '10px';
-        rootLayout.requestRemeasure();
+        rootLayout.dirtyMeasurements();
         expect(layout.getOffsetPosition()).to.deep.equal({
           left: 10,
           top: 10,
@@ -317,15 +317,15 @@ describes.realWin('Layers', {amp: false}, env => {
 
         parent.style.top = '10px';
         div.style.left = '10px';
-        rootLayout.requestRemeasure();
+        rootLayout.dirtyMeasurements();
         expect(layout.getOffsetPosition()).to.deep.equal({
           left: 10,
           top: 10,
         });
 
         parent.style.left = '10px';
         div.style.top = '10px';
-        rootLayout.requestRemeasure();
+        rootLayout.dirtyMeasurements();
         expect(layout.getOffsetPosition()).to.deep.equal({
           left: 20,
           top: 20,
@@ -339,7 +339,7 @@ describes.realWin('Layers', {amp: false}, env => {
           left: 0,
           top: 0,
         });
-        rootLayout.requestRemeasure();
+        rootLayout.dirtyMeasurements();
         expect(parentLayout.getOffsetPosition()).to.deep.equal({
           left: 0,
           top: 0,
@@ -351,7 +351,7 @@ describes.realWin('Layers', {amp: false}, env => {
           left: 0,
           top: 0,
         });
-        rootLayout.requestRemeasure();
+        rootLayout.dirtyMeasurements();
         expect(rootLayout.getOffsetPosition()).to.deep.equal({
           left: 0,
           top: 0,
@@ -365,7 +365,7 @@ describes.realWin('Layers', {amp: false}, env => {
           left: 0,
           top: 0,
         });
-        rootLayout.requestRemeasure();
+        rootLayout.dirtyMeasurements();
         expect(layout.getOffsetPosition()).to.deep.equal({
           left: 0,
           top: 0,
@@ -377,7 +377,7 @@ describes.realWin('Layers', {amp: false}, env => {
           left: 0,
           top: 0,
         });
-        rootLayout.requestRemeasure();
+        rootLayout.dirtyMeasurements();
         expect(layout.getOffsetPosition()).to.deep.equal({
           left: 0,
           top: 0,