155031 2016-03-04 12:16:09 -0800 Unify determination of page timer alignment 2016-03-04 12:58:46 -0800 1 1 1 Unclassified WebKit WebKit Misc. Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough barraclough oldest_to_newest 1170974 0 barraclough 2016-03-04 12:16:09 -0800 Currently this is scattered throughout Page - sites that call setDOMTimerAlignmentInterval have to determine the correct alignment interval. Instead, replace setDOMTimerAlignmentInterval with updateDOMTimerAlignmentInterval, and unify the policy decision here. 1170976 1 273024 barraclough 2016-03-04 12:22:04 -0800 Created attachment 273024 Fix 1170981 2 273024 cdumez 2016-03-04 12:44:12 -0800 Comment on attachment 273024 Fix View in context: https://bugs.webkit.org/attachment.cgi?id=273024&action=review r=me > Source/WebCore/page/Page.cpp:1260 > + else if (!m_timerAlignmentIntervalIncreaseTimer.isActive()) This is not new but is it possible for m_timerAlignmentInterval to change and for the timer to be active? If so, we currently fail to update the timer. I am guessing we may be working around this by disabling and then re-enabling throttling but if so, it is not very nice. 1170987 3 barraclough 2016-03-04 12:56:31 -0800 (In reply to comment #2) > Comment on attachment 273024 [details] > > This is not new but is it possible for m_timerAlignmentInterval to change > and for the timer to be active? If so, we currently fail to update the > timer. I am guessing we may be working around this by disabling and then > re-enabling throttling but if so, it is not very nice. Per conversation with Chris, this is a deliberate part of the policy, as a simple solution to prevent timers from being pushed out infinitely. 1170988 4 barraclough 2016-03-04 12:58:46 -0800 Transmitting file data ... Committed revision 197581. 273024 2016-03-04 12:22:04 -0800 2016-03-04 12:44:12 -0800 Fix 155031.1.patch text/plain 7514 barraclough SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NzU3OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE2LTAzLTA0ICBHYXZpbiBC YXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBVbmlmeSBkZXRl cm1pbmF0aW9uIG9mIHBhZ2UgdGltZXIgYWxpZ25tZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTUwMzEKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDdXJyZW50bHkgdGhpcyBpcyBzY2F0dGVyZWQgdGhy b3VnaG91dCBQYWdlIC0gc2l0ZXMgdGhhdCBjYWxsIHNldERPTVRpbWVyQWxpZ25tZW50SW50ZXJ2 YWwgaGF2ZQorICAgICAgICB0byBkZXRlcm1pbmUgdGhlIGNvcnJlY3QgYWxpZ25tZW50IGludGVy dmFsLiBJbnN0ZWFkLCByZXBsYWNlIHNldERPTVRpbWVyQWxpZ25tZW50SW50ZXJ2YWwgd2l0aAor ICAgICAgICB1cGRhdGVET01UaW1lckFsaWdubWVudEludGVydmFsLCBhbmQgdW5pZnkgdGhlIHBv bGljeSBkZWNpc2lvbiBoZXJlLgorCisgICAgICAgICogcGFnZS9QYWdlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlBhZ2U6OnNldFRpbWVyVGhyb3R0bGluZ1N0YXRlKToKKyAgICAgICAgICAgIC0g c2V0RE9NVGltZXJBbGlnbm1lbnRJbnRlcnZhbCAtPiB1cGRhdGVET01UaW1lckFsaWdubWVudElu dGVydmFsCisgICAgICAgICAgICAgIEFsc28sIHRvIHNpbXBsaWZ5IGFsd2F5cyByZWNvcmQgdGhl IHRpbWVzdGFtcCB3aGVuIHRoZSBzdGF0ZSBjaGFuZ2VzLgorICAgICAgICAoV2ViQ29yZTo6UGFn ZTo6c2V0VGltZXJBbGlnbm1lbnRJbnRlcnZhbEluY3JlYXNlTGltaXQpOgorICAgICAgICAgICAg LSBzZXRET01UaW1lckFsaWdubWVudEludGVydmFsIC0+IHVwZGF0ZURPTVRpbWVyQWxpZ25tZW50 SW50ZXJ2YWwKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OnVwZGF0ZURPTVRpbWVyQWxpZ25tZW50 SW50ZXJ2YWwpOgorICAgICAgICAgICAgLSBXYXMgc2V0RE9NVGltZXJBbGlnbm1lbnRJbnRlcnZh bCwgbm93IGRldGVybWluZXMgdGhlIG5ldyBhbGlnbm1lbnQgdmFsdWUuCisgICAgICAgIChXZWJD b3JlOjpQYWdlOjp0aW1lckFsaWdubWVudEludGVydmFsSW5jcmVhc2VUaW1lckZpcmVkKToKKyAg ICAgICAgICAgIC0gc2V0RE9NVGltZXJBbGlnbm1lbnRJbnRlcnZhbCAtPiB1cGRhdGVET01UaW1l ckFsaWdubWVudEludGVydmFsCisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpzZXRET01UaW1lckFs aWdubWVudEludGVydmFsKTogRGVsZXRlZC4KKyAgICAgICAgICAgIC0gUmVtb3ZlZCwgYmVjYW1l IHVwZGF0ZURPTVRpbWVyQWxpZ25tZW50SW50ZXJ2YWwuCisgICAgICAgICogcGFnZS9QYWdlLmg6 CisgICAgICAgICAgICAtIHNldERPTVRpbWVyQWxpZ25tZW50SW50ZXJ2YWwgLT4gdXBkYXRlRE9N VGltZXJBbGlnbm1lbnRJbnRlcnZhbAorICAgICAgICAgICAgICBtX3RpbWVyVGhyb3R0bGluZ0Vu YWJsZWRUaW1lIC0+IG1fdGltZXJUaHJvdHRsaW5nU3RhdGVMYXN0Q2hhbmdlZFRpbWUKKwogMjAx Ni0wMy0wNCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAg ICAgICAgIFJlbW92ZSB2Y3hwcm9qIGJ1aWxkIHN5c3RlbQpJbmRleDogU291cmNlL1dlYkNvcmUv cGFnZS9QYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3Bw CShyZXZpc2lvbiAxOTc1MTkpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMjA0LDIxICsxMjA0LDE4IEBAIHZvaWQgUGFnZTo6c2V0VGltZXJUaHJv dHRsaW5nU3RhdGUoVGltZXIKIHsKICAgICBpZiAoc3RhdGUgPT0gbV90aW1lclRocm90dGxpbmdT dGF0ZSkKICAgICAgICAgcmV0dXJuOwotICAgIG1fdGltZXJUaHJvdHRsaW5nU3RhdGUgPSBzdGF0 ZTsKIAotICAgIGlmIChzdGF0ZSAhPSBUaW1lclRocm90dGxpbmdTdGF0ZTo6RGlzYWJsZWQpIHsK LSAgICAgICAgbV90aW1lclRocm90dGxpbmdFbmFibGVkVGltZSA9IG1vbm90b25pY2FsbHlJbmNy ZWFzaW5nVGltZSgpOwotICAgICAgICBzZXRET01UaW1lckFsaWdubWVudEludGVydmFsKERPTVRp bWVyOjpoaWRkZW5QYWdlQWxpZ25tZW50SW50ZXJ2YWwoKSk7Ci0gICAgICAgIHJldHVybjsKLSAg ICB9CisgICAgbV90aW1lclRocm90dGxpbmdTdGF0ZSA9IHN0YXRlOworICAgIG1fdGltZXJUaHJv dHRsaW5nU3RhdGVMYXN0Q2hhbmdlZFRpbWUgPSBtb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUo KTsKIAotICAgIG1fdGltZXJUaHJvdHRsaW5nRW5hYmxlZFRpbWUgPSAwOwotICAgIHNldERPTVRp bWVyQWxpZ25tZW50SW50ZXJ2YWwoRE9NVGltZXI6OmRlZmF1bHRBbGlnbm1lbnRJbnRlcnZhbCgp KTsKKyAgICB1cGRhdGVET01UaW1lckFsaWdubWVudEludGVydmFsKCk7CiAKICAgICAvLyBXaGVu IHRocm90dGxpbmcgaXMgZGlzYWJsZWQsIHJlbGVhc2UgYWxsIHRocm90dGxlZCB0aW1lcnMuCi0g ICAgZm9yIChGcmFtZSogZnJhbWUgPSAmbWFpbkZyYW1lKCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1l LT50cmVlKCkudHJhdmVyc2VOZXh0KCkpIHsKLSAgICAgICAgaWYgKGF1dG8qIGRvY3VtZW50ID0g ZnJhbWUtPmRvY3VtZW50KCkpCi0gICAgICAgICAgICBkb2N1bWVudC0+ZGlkQ2hhbmdlVGltZXJB bGlnbm1lbnRJbnRlcnZhbCgpOworICAgIGlmIChzdGF0ZSA9PSBUaW1lclRocm90dGxpbmdTdGF0 ZTo6RGlzYWJsZWQpIHsKKyAgICAgICAgZm9yIChGcmFtZSogZnJhbWUgPSAmbWFpbkZyYW1lKCk7 IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVlKCkudHJhdmVyc2VOZXh0KCkpIHsKKyAgICAgICAg ICAgIGlmIChhdXRvKiBkb2N1bWVudCA9IGZyYW1lLT5kb2N1bWVudCgpKQorICAgICAgICAgICAg ICAgIGRvY3VtZW50LT5kaWRDaGFuZ2VUaW1lckFsaWdubWVudEludGVydmFsKCk7CisgICAgICAg IH0KICAgICB9CiB9CiAKQEAgLTEyMzAsMjIgKzEyMjcsMzggQEAgdm9pZCBQYWdlOjpzZXRUaW1l ckFsaWdubWVudEludGVydmFsSW5jcgogICAgIC8vIElmIChtX3RpbWVyQWxpZ25tZW50SW50ZXJ2 YWxJbmNyZWFzZUxpbWl0IDwgbV90aW1lckFsaWdubWVudEludGVydmFsKSB0aGVuIHdlIG5lZWQK ICAgICAvLyB0byB1cGRhdGUgbV90aW1lckFsaWdubWVudEludGVydmFsLCBpZiBncmVhdGVyIHRo ZW4gbmVlZCB0byByZXN0YXJ0IHRoZSBpbmNyZWFzZSB0aW1lci4KICAgICBpZiAobV90aW1lclRo cm90dGxpbmdTdGF0ZSA9PSBUaW1lclRocm90dGxpbmdTdGF0ZTo6RW5hYmxlZEluY3JlYXNpbmcp Ci0gICAgICAgIHNldERPTVRpbWVyQWxpZ25tZW50SW50ZXJ2YWwoc3RkOjptaW4obV90aW1lckFs aWdubWVudEludGVydmFsSW5jcmVhc2VMaW1pdCwgbV90aW1lckFsaWdubWVudEludGVydmFsKSk7 CisgICAgICAgIHVwZGF0ZURPTVRpbWVyQWxpZ25tZW50SW50ZXJ2YWwoKTsKIH0KIAotdm9pZCBQ YWdlOjpzZXRET01UaW1lckFsaWdubWVudEludGVydmFsKGRvdWJsZSBhbGlnbm1lbnRJbnRlcnZh bCkKK3ZvaWQgUGFnZTo6dXBkYXRlRE9NVGltZXJBbGlnbm1lbnRJbnRlcnZhbCgpCiB7Ci0gICAg bV90aW1lckFsaWdubWVudEludGVydmFsID0gYWxpZ25tZW50SW50ZXJ2YWw7CisgICAgYm9vbCBu ZWVkc0luY3JlYXNlVGltZXIgPSBmYWxzZTsKKworICAgIHN3aXRjaCAobV90aW1lclRocm90dGxp bmdTdGF0ZSkgeworICAgIGNhc2UgVGltZXJUaHJvdHRsaW5nU3RhdGU6OkRpc2FibGVkOgorICAg ICAgICBtX3RpbWVyQWxpZ25tZW50SW50ZXJ2YWwgPSBET01UaW1lcjo6ZGVmYXVsdEFsaWdubWVu dEludGVydmFsKCk7CisgICAgICAgIGJyZWFrOworCisgICAgY2FzZSBUaW1lclRocm90dGxpbmdT dGF0ZTo6RW5hYmxlZDoKKyAgICAgICAgbV90aW1lckFsaWdubWVudEludGVydmFsID0gRE9NVGlt ZXI6OmhpZGRlblBhZ2VBbGlnbm1lbnRJbnRlcnZhbCgpOworICAgICAgICBicmVhazsKKworICAg IGNhc2UgVGltZXJUaHJvdHRsaW5nU3RhdGU6OkVuYWJsZWRJbmNyZWFzaW5nOgorICAgICAgICBB U1NFUlQobV90aW1lclRocm90dGxpbmdTdGF0ZUxhc3RDaGFuZ2VkVGltZSk7CisgICAgICAgIGRv dWJsZSB0aHJvdHRsZWREdXJhdGlvbiA9IG1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGltZSgpIC0g bV90aW1lclRocm90dGxpbmdTdGF0ZUxhc3RDaGFuZ2VkVGltZTsKKyAgICAgICAgZG91YmxlIG1p bmltdW1BbGlnbm1lbnRJbnRlcnZhbCA9IHN0ZDo6bWF4KERPTVRpbWVyOjpoaWRkZW5QYWdlQWxp Z25tZW50SW50ZXJ2YWwoKSwgdGhyb3R0bGVkRHVyYXRpb24pOworICAgICAgICBtX3RpbWVyQWxp Z25tZW50SW50ZXJ2YWwgPSBzdGQ6Om1pbihtaW5pbXVtQWxpZ25tZW50SW50ZXJ2YWwsIG1fdGlt ZXJBbGlnbm1lbnRJbnRlcnZhbEluY3JlYXNlTGltaXQpOworICAgICAgICBuZWVkc0luY3JlYXNl VGltZXIgPSBtX3RpbWVyQWxpZ25tZW50SW50ZXJ2YWwgPCBtX3RpbWVyQWxpZ25tZW50SW50ZXJ2 YWxJbmNyZWFzZUxpbWl0OworICAgIH0KIAogICAgIC8vIElmIHRocm90dGxpbmcgaXMgZW5hYmxl ZCwgYXV0by1pbmNyZWFzaW5nIG9mIHRocm90dGxpbmcgaXMgZW5hYmxlZCwgYW5kIHRoZSBhdXRv LWluY3JlYXNlCiAgICAgLy8gbGltaXQgaGFzIG5vdCB5ZXQgYmVlbiByZWFjaGVkLCBhbmQgdGhl biBhcm0gdGhlIHRpbWVyIHRvIGNvbnNpZGVyIGFuIGluY3JlYXNlLiBUaW1lIHRvIHdhaXQKICAg ICAvLyBiZXR3ZWVuIGluY3JlYXNlcyBpcyBlcXVhbCB0byB0aGUgY3VycmVudCB0aHJvdHRsZSB0 aW1lLiBTaW5jZSBhbGlubWVudCBpbnRlcnZhbCBpbmNyZWFzZXMKICAgICAvLyBleHBvbmVudGlh bGx5LCB0aW1lIGJldHdlZW4gc3RlcHMgaXMgZXhwb25lbnRpYWwgdG9vLgotICAgIGlmIChtX3Rp bWVyVGhyb3R0bGluZ1N0YXRlID09IFRpbWVyVGhyb3R0bGluZ1N0YXRlOjpFbmFibGVkSW5jcmVh c2luZyAmJiBtX3RpbWVyQWxpZ25tZW50SW50ZXJ2YWwgPCBtX3RpbWVyQWxpZ25tZW50SW50ZXJ2 YWxJbmNyZWFzZUxpbWl0KSB7Ci0gICAgICAgIGlmICghbV90aW1lckFsaWdubWVudEludGVydmFs SW5jcmVhc2VUaW1lci5pc0FjdGl2ZSgpKQotICAgICAgICAgICAgbV90aW1lckFsaWdubWVudElu dGVydmFsSW5jcmVhc2VUaW1lci5zdGFydE9uZVNob3QobV90aW1lckFsaWdubWVudEludGVydmFs KTsKLSAgICB9IGVsc2UKKyAgICBpZiAoIW5lZWRzSW5jcmVhc2VUaW1lcikKICAgICAgICAgbV90 aW1lckFsaWdubWVudEludGVydmFsSW5jcmVhc2VUaW1lci5zdG9wKCk7CisgICAgZWxzZSBpZiAo IW1fdGltZXJBbGlnbm1lbnRJbnRlcnZhbEluY3JlYXNlVGltZXIuaXNBY3RpdmUoKSkKKyAgICAg ICAgbV90aW1lckFsaWdubWVudEludGVydmFsSW5jcmVhc2VUaW1lci5zdGFydE9uZVNob3QobV90 aW1lckFsaWdubWVudEludGVydmFsKTsKIH0KIAogdm9pZCBQYWdlOjp0aW1lckFsaWdubWVudElu dGVydmFsSW5jcmVhc2VUaW1lckZpcmVkKCkKQEAgLTEyNTMsMTIgKzEyNjYsOSBAQCB2b2lkIFBh Z2U6OnRpbWVyQWxpZ25tZW50SW50ZXJ2YWxJbmNyZWFzCiAgICAgQVNTRVJUKG1fc2V0dGluZ3Mt PmhpZGRlblBhZ2VET01UaW1lclRocm90dGxpbmdBdXRvSW5jcmVhc2VzKCkpOwogICAgIEFTU0VS VChtX3RpbWVyVGhyb3R0bGluZ1N0YXRlID09IFRpbWVyVGhyb3R0bGluZ1N0YXRlOjpFbmFibGVk SW5jcmVhc2luZyk7CiAgICAgQVNTRVJUKG1fdGltZXJBbGlnbm1lbnRJbnRlcnZhbCA8IG1fdGlt ZXJBbGlnbm1lbnRJbnRlcnZhbEluY3JlYXNlTGltaXQpOwotICAgIEFTU0VSVChtX3RpbWVyVGhy b3R0bGluZ0VuYWJsZWRUaW1lKTsKICAgICAKICAgICAvLyBBbGlnbm1lbnQgaW50ZXJ2YWwgaXMg aW5jcmVhc2VkIHRvIGVxdWFsIHRoZSB0aW1lIHRoZSBwYWdlIGhhcyBiZWVuIHRocm90dGxlZCwg dG8gYSBsaW1pdC4KLSAgICBkb3VibGUgdGhyb3R0bGVkRHVyYXRpb24gPSBtb25vdG9uaWNhbGx5 SW5jcmVhc2luZ1RpbWUoKSAtIG1fdGltZXJUaHJvdHRsaW5nRW5hYmxlZFRpbWU7Ci0gICAgZG91 YmxlIGFsaWdubWVudEludGVydmFsID0gc3RkOjptYXgobV90aW1lckFsaWdubWVudEludGVydmFs LCB0aHJvdHRsZWREdXJhdGlvbik7Ci0gICAgc2V0RE9NVGltZXJBbGlnbm1lbnRJbnRlcnZhbChz dGQ6Om1pbihhbGlnbm1lbnRJbnRlcnZhbCwgbV90aW1lckFsaWdubWVudEludGVydmFsSW5jcmVh c2VMaW1pdCkpOworICAgIHVwZGF0ZURPTVRpbWVyQWxpZ25tZW50SW50ZXJ2YWwoKTsKIH0KIAog dm9pZCBQYWdlOjpkbnNQcmVmZXRjaGluZ1N0YXRlQ2hhbmdlZCgpCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wYWdlL1BhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2Uu aAkocmV2aXNpb24gMTk3NTE5KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgJKHdvcmtp bmcgY29weSkKQEAgLTUzMCw3ICs1MzAsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgaGlkZGVuUGFn ZURPTVRpbWVyVGhyb3R0bGluZ1N0YXRlQ2hhbmdlZCgpOwogICAgIHZvaWQgc2V0VGltZXJUaHJv dHRsaW5nU3RhdGUoVGltZXJUaHJvdHRsaW5nU3RhdGUpOwogICAgIHZvaWQgdXBkYXRlVGltZXJU aHJvdHRsaW5nU3RhdGUoKTsKLSAgICB2b2lkIHNldERPTVRpbWVyQWxpZ25tZW50SW50ZXJ2YWwo ZG91YmxlKTsKKyAgICB2b2lkIHVwZGF0ZURPTVRpbWVyQWxpZ25tZW50SW50ZXJ2YWwoKTsKICAg ICB2b2lkIHRpbWVyQWxpZ25tZW50SW50ZXJ2YWxJbmNyZWFzZVRpbWVyRmlyZWQoKTsKIAogICAg IGNvbnN0IHN0ZDo6dW5pcXVlX3B0cjxDaHJvbWU+IG1fY2hyb21lOwpAQCAtNjE4LDcgKzYxOCw3 IEBAIHByaXZhdGU6CiAjZW5kaWYgLy8gRU5BQkxFKFZJRVdfTU9ERV9DU1NfTUVESUEpCiAKICAg ICBUaW1lclRocm90dGxpbmdTdGF0ZSBtX3RpbWVyVGhyb3R0bGluZ1N0YXRlIHsgVGltZXJUaHJv dHRsaW5nU3RhdGU6OkRpc2FibGVkIH07Ci0gICAgZG91YmxlIG1fdGltZXJUaHJvdHRsaW5nRW5h YmxlZFRpbWUgeyAwIH07CisgICAgZG91YmxlIG1fdGltZXJUaHJvdHRsaW5nU3RhdGVMYXN0Q2hh bmdlZFRpbWUgeyAwIH07CiAgICAgZG91YmxlIG1fdGltZXJBbGlnbm1lbnRJbnRlcnZhbDsKICAg ICBUaW1lciBtX3RpbWVyQWxpZ25tZW50SW50ZXJ2YWxJbmNyZWFzZVRpbWVyOwogICAgIGRvdWJs ZSBtX3RpbWVyQWxpZ25tZW50SW50ZXJ2YWxJbmNyZWFzZUxpbWl0IHsgMCB9Owo=