141688 2015-02-16 18:41:01 -0800 FrameView::layoutTimerFired() should update style if needed before doing layout 2015-03-06 17:38:31 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified REOPENED P2 Normal --- 142368 1 simon.fraser simon.fraser commit-queue kling simon.fraser zalan oldest_to_newest 1069722 0 simon.fraser 2015-02-16 18:41:01 -0800 It's possible for the style recalc timer to get scheduled after the layout timer (both delay 0). The layout timer fires first, so we do layout, but then the style recalc timer fires and we do style recalc and layout again. This happens in fast/canvas/webgl/arraybuffer-transfer-of-control.html and likely other content. 1069980 1 simon.fraser 2015-02-17 16:31:42 -0800 Fixing this does reduce the number of layouts slightly, but not the total time spent in layout. 1073082 2 247613 simon.fraser 2015-02-28 14:04:34 -0800 Created attachment 247613 Patch 1073096 3 247613 kling 2015-02-28 14:52:03 -0800 Comment on attachment 247613 Patch r=me This does indeed seem totally reasonable. 1073114 4 247613 commit-queue 2015-02-28 17:04:27 -0800 Comment on attachment 247613 Patch Clearing flags on attachment: 247613 Committed r180846: <http://trac.webkit.org/changeset/180846> 1073115 5 commit-queue 2015-02-28 17:04:40 -0800 All reviewed patches have been landed. Closing bug. 1074724 6 commit-queue 2015-03-05 15:54:56 -0800 Re-opened since this is blocked by bug 142368 1075171 7 simon.fraser 2015-03-06 17:38:31 -0800 Fix for the regression: diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp index 229c8a910a042486c9991e4785d8a8dd8058d711..484d90ca1f002b43c55abdb76ea17d65b9f395a2 100644 --- a/Source/WebCore/page/FrameView.cpp +++ b/Source/WebCore/page/FrameView.cpp @@ -2440,6 +2440,12 @@ void FrameView::layoutTimerFired() if (!frame().document()->ownerElement()) printf("Layout timer fired at %lld\n", frame().document()->elapsedTime().count()); #endif + + { + TemporaryChange<bool> layoutSchedulingDisabler(m_layoutSchedulingEnabled, false); + frame().document()->updateStyleIfNeeded(); + } + layout(); } Needs testcase. 247613 2015-02-28 14:04:34 -0800 2015-02-28 17:04:27 -0800 Patch bug-141688-20150228140419.patch text/plain 1733 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwODM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGNiMGVmZmQyM2Q5Nzlj Y2UzMzJmMDhhMzZmMmY2OTg5YTYxOTk3OS4uM2Y2ZmI3NzQ1NGRkZmUyZDIwYWNhYTI3NDM5N2Mw NmM1NTc4MjJkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE1LTAyLTI4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIEZyYW1lVmlldzo6 bGF5b3V0VGltZXJGaXJlZCgpIHNob3VsZCB1cGRhdGUgc3R5bGUgaWYgbmVlZGVkIGJlZm9yZSBk b2luZyBsYXlvdXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE0MTY4OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIElmIHRoZSBzdHlsZSByZWNhbGMgdGltZXIgaGFzIGJlZW4gc2NoZWR1bGVkIHRvIGZpcmUg YWZ0ZXIgdGhlIGxheW91dCB0aW1lciwKKyAgICAgICAgd2hlbiB0aGUgbGF5b3V0IHRpbWVyIGZp cmVzLCB3ZSBtaWdodCBhcyB3ZWxsIGp1c3QgZG8gdGhlIHN0eWxlIHJlY2FsYworICAgICAgICB0 b28uIFRoZSBjYWxsIHRvIHVwZGF0ZVN0eWxlSWZOZWVkZWQoKSB3aWxsIGNhbmNlbCB0aGUgcGVu ZGluZyBzdHlsZQorICAgICAgICByZWNhbGMgdGltZXIuCisgICAgICAgIAorICAgICAgICBUaGlz IGRvZXNuJ3QgaGF2ZSBtdWNoIGltcGFjdCBvbiB0aGUgbnVtYmVyIG9mIGxheW91dHMgKG1lYXN1 cmVkIHZpYSBQTFQpCisgICAgICAgIGJ1dCBzZWVtcyBsaWtlIGEgcmVhc29uYWJsZSB0aGluZyB0 byBkby4KKworICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkZyYW1lVmlldzo6bGF5b3V0VGltZXJGaXJlZCk6CisKKzIwMTUtMDItMjggIFNpbW9uIEZyYXNl ciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKICAgICAgICAgRnVsbHNjcmVlbiB2aWRlbyBs YXllcnMgYXJlIG9mZiBieSBvbmUgc29tZXRpbWVzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDIxMjIKICAgICAgICAgcmRhcjovL3Byb2JsZW0vMTk4 Nzg4MjEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCA0MzMzOTI1YzJlNDA1MTAzZDgx YjJkNDJlNjZjYjE0YWVkNDE3YzcwLi5iZTI0N2ViZjIxMDY1YTYzMTA3YzM4NjdiN2NlMTRjNmU3 M2I3ZjkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC0yNDM5LDYgKzI0MzksNyBA QCB2b2lkIEZyYW1lVmlldzo6bGF5b3V0VGltZXJGaXJlZCgpCiAgICAgaWYgKCFmcmFtZSgpLmRv Y3VtZW50KCktPm93bmVyRWxlbWVudCgpKQogICAgICAgICBwcmludGYoIkxheW91dCB0aW1lciBm aXJlZCBhdCAlbGxkXG4iLCBmcmFtZSgpLmRvY3VtZW50KCktPmVsYXBzZWRUaW1lKCkuY291bnQo KSk7CiAjZW5kaWYKKyAgICBmcmFtZSgpLmRvY3VtZW50KCktPnVwZGF0ZVN0eWxlSWZOZWVkZWQo KTsKICAgICBsYXlvdXQoKTsKIH0KIAo=