Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resources: Don't become ready for layout if already scheduled #29389

Merged
merged 3 commits into from
Jul 21, 2020
Merged

Resources: Don't become ready for layout if already scheduled #29389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2018d49
Only go to READY_FOR_LAYOUT if already LAYOUT_COMPLETE
jridgewell Jul 20, 2020
26ba326
Make cases more clear
jridgewell Jul 20, 2020
e7ecfb6
Add test case
jridgewell Jul 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions src/service/resource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {Layout} from '../layout';
import {Services} from '../services';
import {computedStyle, toggle} from '../style';
import {dev, devAssert} from '../log';
import {isBlockedByConsent} from '../error';
import {isBlockedByConsent, reportError} from '../error';
import {
layoutRectLtwh,
layoutRectSizeEquals,
Expand Down Expand Up @@ -498,13 +498,19 @@ export class Resource {
oldBox.top != newBox.top ||
sizeChanges
) {
if (
this.element.isUpgraded() &&
this.state_ != ResourceState.NOT_BUILT &&
(this.state_ == ResourceState.NOT_LAID_OUT ||
this.element.isRelayoutNeeded())
) {
this.state_ = ResourceState.READY_FOR_LAYOUT;
if (this.element.isUpgraded()) {
if (this.state_ == ResourceState.NOT_LAID_OUT) {
// If the element isn't laid out yet, then we're now ready for layout.
this.state_ = ResourceState.READY_FOR_LAYOUT;
} else if (
(this.state_ == ResourceState.LAYOUT_COMPLETE ||
this.state_ == ResourceState.LAYOUT_FAILED) &&
this.element.isRelayoutNeeded()
) {
// If the element was already laid out and we need to relayout, then
// go back to ready for layout.
this.state_ = ResourceState.READY_FOR_LAYOUT;
}
}
}

Expand Down Expand Up @@ -902,6 +908,7 @@ export class Resource {
this.state_
);
err.associatedElement = this.element;
reportError(err);
return Promise.reject(err);
}

Expand Down
16 changes: 16 additions & 0 deletions test/unit/test-resource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,22 @@ describes.realWin('Resource', {amp: true}, (env) => {
expect(resource.getLayoutBox().width).to.equal(111 + 10);
});

it('should not relayout if element has not completed layout', () => {
elementMock.expects('isUpgraded').returns(true).atLeast(1);
resource.state_ = ResourceState.LAYOUT_SCHEDULED;
resource.layoutBox_ = {left: 11, top: 12, width: 111, height: 222};

// Width changed.
elementMock
.expects('getBoundingClientRect')
.returns({left: 11, top: 12, width: 111 + 10, height: 222})
.once();
elementMock.expects('isRelayoutNeeded').returns(true).atLeast(0);
resource.measure();
expect(resource.getState()).to.equal(ResourceState.LAYOUT_SCHEDULED);
expect(resource.getLayoutBox().width).to.equal(111 + 10);
});

it('should calculate NOT fixed for non-displayed elements', () => {
elementMock.expects('isUpgraded').returns(true).atLeast(1);
elementMock
Expand Down