115124 2013-04-24 14:07:42 -0700 Vertical overlay scrollbar in iframes fades in and out rapidly when you scroll in a circle 2013-04-24 14:37:01 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bdakin bdakin andersca bdakin sam simon.fraser thorton oldest_to_newest 880780 0 bdakin 2013-04-24 14:07:42 -0700 Overlay scrollbars in iframes fade in and out a lot (more than the main frame's scrollbars) if you scroll in a circle or diagonally. <rdar://problem/13168957> 880781 1 199513 bdakin 2013-04-24 14:08:20 -0700 Created attachment 199513 Test case that shows the bug 880786 2 199514 bdakin 2013-04-24 14:20:02 -0700 Created attachment 199514 Patch 880795 3 199514 andersca 2013-04-24 14:27:57 -0700 Comment on attachment 199514 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=199514&action=review > Source/WebCore/platform/mac/ScrollAnimatorMac.mm:1288 > +void ScrollAnimatorMac::sendContentAreaScrolledNow(const FloatSize& delta) I don’t think Now is needed here. 880801 4 bdakin 2013-04-24 14:37:01 -0700 Thank you! I fixed the name. http://trac.webkit.org/changeset/149066 199513 2013-04-24 14:08:20 -0700 2013-04-24 14:08:20 -0700 Test case that shows the bug circle.html text/html 148 bdakin PGlmcmFtZSBzdHlsZT0iaGVpZ2h0OiA1MDBweDsgd2lkdGg6IDUwMHB4OyIgc3JjPSJkYXRhOnRl eHQvaHRtbCw8ZGl2IHN0eWxlPSdoZWlnaHQ6IDEwMDBweDsgd2lkdGg6IDEwMDBweDsnPnNjcm9s bCBtZSBpbiBhIGNpcmNsZTwvZGl2PiI+CjwvaWZyYW1lPg== 199514 2013-04-24 14:20:02 -0700 2013-04-24 14:27:57 -0700 Patch for-review.txt text/plain 13468 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0OTA2MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDY0IEBACisyMDEzLTA0LTI0ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBWZXJ0aWNhbCBvdmVybGF5IHNjcm9s bGJhciBpbiBpZnJhbWVzIGZhZGVzIGluIGFuZCBvdXQgcmFwaWRseSB3aGVuIHlvdSBzY3JvbGwg aW4gCisgICAgICAgIGEgY2lyY2xlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMTUxMjQKKyAgICAgICAgLWFuZCBjb3JyZXNwb25kaW5nLQorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vMTMxNjg5NTc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2l0aCBodHRwOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNl dC8xMTk4MzQgd2Ugc3RhcnRlZCBjYWxsaW5nIAorICAgICAgICBTY3JvbGxiYXJQYWludGVyQ29u dHJvbGxlcidzIGNvbnRlbnRBcmVhU2Nyb2xsZWQvY29udGVudEFyZWFTY3JvbGxlZEluRGlyZWN0 aW9uIAorICAgICAgICBBUEkgb24gYSB6ZXJvLWRlbGF5IHRpbWVyIGluc3RlYWQgb2YgY2FsbGlu ZyBpdCByaWdodCBhd2F5LiBUaGlzIHByZXZlbnRlZCBzb21lIAorICAgICAgICBjcmFzaGVzIHRo YXQgd2Ugc2F3IHdoZW5ldmVyIHRoaXMgd2FzIGNhbGxlZCBkdXJpbmcgYSBsYXlvdXQuIEhvd2V2 ZXIsIHRoYXQgZGVsYXksIAorICAgICAgICBjb21iaW5lZCB3aXRoIHRoZSBwYXJ0aWN1bGFycyBv ZiBjb250ZW50QXJlYVNjcm9sbGVkSW5EaXJlY3Rpb24gY2F1c2UgdGhpcyBidWcgCisgICAgICAg IHdoZXJlIHNvbWV0aW1lcyB0aGUgc2Nyb2xsYmFycyBpbiBhbiBpZnJhbWUgd2lsbCBmYWRlIG91 dCB2ZXJ5IG5vdGljZWFibHkgd2hlbiAKKyAgICAgICAgc2Nyb2xsaW5nIGluIGEgY2lyY2xlLgor CisgICAgICAgIFRoaXMgY2hhbmdlIG1ha2VzIGl0IHNvIHdlIHdpbGwgb25seSB1c2UgdGhlIHpl cm8tZGVsYXkgdGltZXIgaWYgdGhlIAorICAgICAgICBTY3JvbGxhYmxlQXJlYSBpcyBub3QgY3Vy cmVudGx5IGhhbmRsaW5nIGEgd2hlZWwgZXZlbnQuIElmIGl0IElTIGhhbmRsaW5nIGEgd2hlZWwg CisgICAgICAgIGV2ZW50LCB0aGVuIHdlIHdpbGwgc2VuZCB0aGUgbm90aWZpY2F0aW9ucyB0byBB cHBLaXQgcmlnaHQgYXdheS4gSSBjb25maXJtZWQgdGhhdCAKKyAgICAgICAgdGhpcyBjaGFuZ2Ug ZGlkIG5vdCByZWludHJvZHVjZSB0aGUgb2xkIGNyYXNoZXMuIAorCisgICAgICAgIEtlZXAgdHJh Y2sgb2Ygd2hldGhlciB3ZSBhcmUgY3VycmVudGx5IGhhbmRsaW5nIGEgd2hlZWwgZXZlbnQgd2l0 aCB0aGUgbmV3IG1lbWJlciAKKyAgICAgICAgdmFyaWFibGUgbV9pc0hhbmRsaW5nV2hlZWxFdmVu dC4KKyAgICAgICAgKiBwYWdlL0V2ZW50SGFuZGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpF dmVudEhhbmRsZXI6OkV2ZW50SGFuZGxlcik6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRs ZXI6OmhhbmRsZVdoZWVsRXZlbnQpOgorICAgICAgICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmg6Cisg ICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmlzSGFuZGxpbmdXaGVlbEV2ZW50KToKKyAg ICAgICAgKEV2ZW50SGFuZGxlcik6CisKKyAgICAgICAgVG8gcHJldmVudCBsYXllcmluZyB2aW9s YXRpb25zLCB0aGUgU2Nyb2xsYWJsZUFyZWEgc3ViLWNsYXNzZXMgd2lsbCBoYXZlIHRvIGFjY2Vz cyAKKyAgICAgICAgdGhpcyBpbmZvcm1hdGlvbiBmcm9tIHRoZSBFdmVudEhhbmRsZXIuCisgICAg ICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojpp c0hhbmRsaW5nV2hlZWxFdmVudCk6CisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuaDoKKyAgICAg ICAgKiBwbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs YWJsZUFyZWE6OmlzSGFuZGxpbmdXaGVlbEV2ZW50KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmlzSGFuZGxpbmdX aGVlbEV2ZW50KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaDoKKyAgICAgICAg KFJlbmRlckxheWVyKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJMaXN0Qm94Ojppc0hhbmRsaW5nV2hlZWxFdmVudCk6Cisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guaDoKKworICAgICAgICBzZW5kQ29udGVu dEFyZWFTY3JvbGxlZFNvb24oKSBjYW4gYmUgcHJpdmF0ZS4gQWxzbyBhZGQgbmV3IGZ1bmN0aW9u IAorICAgICAgICBzZW5kQ29udGVudEFyZWFTY3JvbGxlZE5vdygpLgorICAgICAgICAqIHBsYXRm b3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5oOgorICAgICAgICAoU2Nyb2xsQW5pbWF0b3JNYWMp OgorCisgICAgICAgIElmIHRoZSBTY3JvbGxhYmxlQXJlYSBpcyBoYW5kbGluZyBhIHdoZWVsIGV2 ZW50LCBjYWxsIAorICAgICAgICBzZW5kQ29udGVudEFyZWFTY3JvbGxlZE5vdygpLCBvdGhlcndp c2UgY2FsbCBzZW5kQ29udGVudEFyZWFTY3JvbGxlZFNvb24oKQorICAgICAgICAqIHBsYXRmb3Jt L21hYy9TY3JvbGxBbmltYXRvck1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFuaW1h dG9yTWFjOjpub3RpZnlDb250ZW50QXJlYVNjcm9sbGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlNj cm9sbEFuaW1hdG9yTWFjOjpzZW5kQ29udGVudEFyZWFTY3JvbGxlZE5vdyk6CisKKyAgICAgICAg UmUtZmFjdG9yZWQgdG8gdXNlIHNlbmRDb250ZW50QXJlYVNjcm9sbGVkTm93KCkKKyAgICAgICAg KFdlYkNvcmU6OlNjcm9sbEFuaW1hdG9yTWFjOjpzZW5kQ29udGVudEFyZWFTY3JvbGxlZFRpbWVy RmlyZWQpOgorCiAyMDEzLTA0LTI0ICBPdHRvIERlcmVrIENoZXVuZyAgPG90Y2hldW5nQHJpbS5j b20+CiAKICAgICAgICAgQmF0dGVyeSBBUEkgd29uJ3QgcmV0dXJuIHVwZGF0ZWQgYmF0dGVyeSBz dGF0dXMgdW50aWwgY2xpZW50IGNhbGxzIGRpZENoYW5nZUJhdHRlcnlTdGF0dXMKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAJKHJldmlzaW9uIDE0OTA0NikKKysrIFNvdXJj ZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzQ4LDYg KzM0OCw3IEBAIEV2ZW50SGFuZGxlcjo6RXZlbnRIYW5kbGVyKEZyYW1lKiBmcmFtZSkKICAgICAs IG1fYmFzZUV2ZW50VHlwZShQbGF0Zm9ybUV2ZW50OjpOb1R5cGUpCiAgICAgLCBtX2RpZFN0YXJ0 RHJhZyhmYWxzZSkKICAgICAsIG1fZGlkTG9uZ1ByZXNzSW52b2tlQ29udGV4dE1lbnUoZmFsc2Up CisgICAgLCBtX2lzSGFuZGxpbmdXaGVlbEV2ZW50KGZhbHNlKQogI2lmIEVOQUJMRShDVVJTT1Jf VklTSUJJTElUWSkKICAgICAsIG1fYXV0b0hpZGVDdXJzb3JUaW1lcih0aGlzLCAmRXZlbnRIYW5k bGVyOjphdXRvSGlkZUN1cnNvclRpbWVyRmlyZWQpCiAjZW5kaWYKQEAgLTI0MDIsNiArMjQwMyw4 IEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpoYW5kbGVXaGVlbEV2ZW50KGNvbnMKICAgICBGcmFtZVZp ZXcqIHZpZXcgPSBtX2ZyYW1lLT52aWV3KCk7CiAgICAgaWYgKCF2aWV3KQogICAgICAgICByZXR1 cm4gZmFsc2U7CisKKyAgICBtX2lzSGFuZGxpbmdXaGVlbEV2ZW50ID0gdHJ1ZTsKICAgICBzZXRG cmFtZVdhc1Njcm9sbGVkQnlVc2VyKCk7CiAgICAgTGF5b3V0UG9pbnQgdlBvaW50ID0gdmlldy0+ d2luZG93VG9Db250ZW50cyhlLnBvc2l0aW9uKCkpOwogCkBAIC0yNDQ3LDIxICsyNDUwLDI0IEBA IGJvb2wgRXZlbnRIYW5kbGVyOjpoYW5kbGVXaGVlbEV2ZW50KGNvbnMKICAgICAgICAgCiAgICAg ICAgIGlmIChpc092ZXJXaWRnZXQgJiYgdGFyZ2V0ICYmIHRhcmdldC0+aXNXaWRnZXQoKSkgewog ICAgICAgICAgICAgV2lkZ2V0KiB3aWRnZXQgPSB0b1JlbmRlcldpZGdldCh0YXJnZXQpLT53aWRn ZXQoKTsKLSAgICAgICAgICAgIGlmICh3aWRnZXQgJiYgcGFzc1doZWVsRXZlbnRUb1dpZGdldChl LCB3aWRnZXQpKQorICAgICAgICAgICAgaWYgKHdpZGdldCAmJiBwYXNzV2hlZWxFdmVudFRvV2lk Z2V0KGUsIHdpZGdldCkpIHsKKyAgICAgICAgICAgICAgICBtX2lzSGFuZGxpbmdXaGVlbEV2ZW50 ID0gZmFsc2U7CiAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICB9CiAg ICAgICAgIH0KIAotICAgICAgICBpZiAobm9kZSAmJiAhbm9kZS0+ZGlzcGF0Y2hXaGVlbEV2ZW50 KGV2ZW50KSkKKyAgICAgICAgaWYgKG5vZGUgJiYgIW5vZGUtPmRpc3BhdGNoV2hlZWxFdmVudChl dmVudCkpIHsKKyAgICAgICAgICAgIG1faXNIYW5kbGluZ1doZWVsRXZlbnQgPSBmYWxzZTsKICAg ICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9CiAgICAgfQogCiAKICAgICAvLyBXZSBk byBhbm90aGVyIGNoZWNrIG9uIHRoZSBmcmFtZSB2aWV3IGJlY2F1c2UgdGhlIGV2ZW50IGhhbmRs ZXIgY2FuIHJ1biBKUyB3aGljaCByZXN1bHRzIGluIHRoZSBmcmFtZSBnZXR0aW5nIGRlc3Ryb3ll ZC4KICAgICB2aWV3ID0gbV9mcmFtZS0+dmlldygpOwotICAgIGlmICghdmlldykKLSAgICAgICAg cmV0dXJuIGZhbHNlOwotICAgIAotICAgIHJldHVybiB2aWV3LT53aGVlbEV2ZW50KGV2ZW50KTsK KyAgICBib29sIGRpZEhhbmRsZUV2ZW50ID0gdmlldyA/IHZpZXctPndoZWVsRXZlbnQoZXZlbnQp IDogZmFsc2U7CisgICAgbV9pc0hhbmRsaW5nV2hlZWxFdmVudCA9IGZhbHNlOworICAgIHJldHVy biBkaWRIYW5kbGVFdmVudDsKIH0KIAogdm9pZCBFdmVudEhhbmRsZXI6OmRlZmF1bHRXaGVlbEV2 ZW50SGFuZGxlcihOb2RlKiBzdGFydE5vZGUsIFdoZWVsRXZlbnQqIHdoZWVsRXZlbnQpCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmgJKHJldmlzaW9uIDE0OTA0NikKKysrIFNvdXJj ZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTI1Nyw2ICsy NTcsOCBAQCBwdWJsaWM6CiAgICAgYm9vbCB1c2VIYW5kQ3Vyc29yKE5vZGUqLCBib29sIGlzT3Zl ckxpbmssIGJvb2wgc2hpZnRLZXkpOwogICAgIHZvaWQgdXBkYXRlQ3Vyc29yKCk7CiAKKyAgICBi b29sIGlzSGFuZGxpbmdXaGVlbEV2ZW50KCkgY29uc3QgeyByZXR1cm4gbV9pc0hhbmRsaW5nV2hl ZWxFdmVudDsgfQorCiBwcml2YXRlOgogI2lmIEVOQUJMRShEUkFHX1NVUFBPUlQpCiAgICAgc3Rh dGljIERyYWdTdGF0ZSYgZHJhZ1N0YXRlKCk7CkBAIC00OTQsNiArNDk2LDcgQEAgcHJpdmF0ZToK ICAgICBQbGF0Zm9ybUV2ZW50OjpUeXBlIG1fYmFzZUV2ZW50VHlwZTsKICAgICBib29sIG1fZGlk U3RhcnREcmFnOwogICAgIGJvb2wgbV9kaWRMb25nUHJlc3NJbnZva2VDb250ZXh0TWVudTsKKyAg ICBib29sIG1faXNIYW5kbGluZ1doZWVsRXZlbnQ7CiAKICNpZiBFTkFCTEUoQ1VSU09SX1ZJU0lC SUxJVFkpCiAgICAgVGltZXI8RXZlbnRIYW5kbGVyPiBtX2F1dG9IaWRlQ3Vyc29yVGltZXI7Cklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCShyZXZpc2lvbiAxNDkwNDYpCisrKyBTb3Vy Y2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2MjksNiAr MTYyOSwxMSBAQCBJbnRQb2ludCBGcmFtZVZpZXc6Omxhc3RLbm93bk1vdXNlUG9zaXRpCiAgICAg cmV0dXJuIG1fZnJhbWUgPyBtX2ZyYW1lLT5ldmVudEhhbmRsZXIoKS0+bGFzdEtub3duTW91c2VQ b3NpdGlvbigpIDogSW50UG9pbnQoKTsKIH0KIAorYm9vbCBGcmFtZVZpZXc6OmlzSGFuZGxpbmdX aGVlbEV2ZW50KCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9mcmFtZSA/IG1fZnJhbWUtPmV2ZW50 SGFuZGxlcigpLT5pc0hhbmRsaW5nV2hlZWxFdmVudCgpIDogZmFsc2U7Cit9CisKIGJvb2wgRnJh bWVWaWV3OjpzaG91bGRTZXRDdXJzb3IoKSBjb25zdAogewogICAgIFBhZ2UqIHBhZ2UgPSBmcmFt ZSgpLT5wYWdlKCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgJKHJldmlzaW9uIDE0OTA0 NikKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgJKHdvcmtpbmcgY29weSkKQEAg LTM0NSw2ICszNDUsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQgc2V0UmVwYWludFRocm90 dGxpbmdEZWZlcnJlZFJlcGFpbnREZWxheUluY3JlbWVudER1cmluZ0xvYWRpbmcoZG91YmxlIHAp OwogCiAgICAgdmlydHVhbCBJbnRQb2ludCBsYXN0S25vd25Nb3VzZVBvc2l0aW9uKCkgY29uc3Q7 CisgICAgdmlydHVhbCBib29sIGlzSGFuZGxpbmdXaGVlbEV2ZW50KCkgY29uc3QgT1ZFUlJJREU7 CiAgICAgYm9vbCBzaG91bGRTZXRDdXJzb3IoKSBjb25zdDsKIAogICAgIHZpcnR1YWwgYm9vbCBz Y3JvbGxiYXJzQ2FuQmVBY3RpdmUoKSBjb25zdCBPVkVSUklERTsKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuaAkocmV2aXNpb24gMTQ5MDQ2KQorKysgU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuaAkod29ya2luZyBjb3B5KQpAQCAtMTQ0 LDYgKzE0NCw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIEludFNpemUgY29udGVudHNTaXplKCkg Y29uc3QgPSAwOwogICAgIHZpcnR1YWwgSW50U2l6ZSBvdmVyaGFuZ0Ftb3VudCgpIGNvbnN0IHsg cmV0dXJuIEludFNpemUoKTsgfQogICAgIHZpcnR1YWwgSW50UG9pbnQgbGFzdEtub3duTW91c2VQ b3NpdGlvbigpIGNvbnN0IHsgcmV0dXJuIEludFBvaW50KCk7IH0KKyAgICB2aXJ0dWFsIGJvb2wg aXNIYW5kbGluZ1doZWVsRXZlbnQoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQogCiAgICAgdmly dHVhbCBpbnQgaGVhZGVySGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gMDsgfQogICAgIHZpcnR1YWwg aW50IGZvb3RlckhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIDA7IH0KSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5oCShyZXZpc2lvbiAxNDkw NDYpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMuaAko d29ya2luZyBjb3B5KQpAQCAtNjUsOCArNjUsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCBzdGFydFNj cm9sbGJhclBhaW50VGltZXIoKTsKICAgICB2b2lkIHN0b3BTY3JvbGxiYXJQYWludFRpbWVyKCk7 CiAKLSAgICB2b2lkIHNlbmRDb250ZW50QXJlYVNjcm9sbGVkU29vbihjb25zdCBGbG9hdFNpemUm IHNjcm9sbERlbHRhKTsKLQogICAgIHZvaWQgc2V0VmlzaWJsZVNjcm9sbGVyVGh1bWJSZWN0KGNv bnN0IEludFJlY3QmKTsKIAogcHJpdmF0ZToKQEAgLTEyNCw2ICsxMjIsMTIgQEAgcHJpdmF0ZToK IAogICAgIHZpcnR1YWwgdm9pZCBub3RpZnlDb250ZW50QXJlYVNjcm9sbGVkKGNvbnN0IEZsb2F0 U2l6ZSYgZGVsdGEpIE9WRVJSSURFOwogCisgICAgLy8gc2VuZENvbnRlbnRBcmVhU2Nyb2xsZWRT b29uKCkgd2lsbCBkbyB0aGUgc2FtZSB3b3JrIHRoYXQgc2VuZENvbnRlbnRBcmVhU2Nyb2xsZWRO b3coKSBkb2VzIGV4Y2VwdCAKKyAgICAvLyBpdCBkb2VzIGl0IGFmdGVyIGEgemVyby1kZWxheSB0 aW1lciBmaXJlcy4gVGhpcyB3aWxsIHByZXZlbnQgdXMgZnJvbSB1cGRhdGluZyBvdmVybGF5IHNj cm9sbGJhciAKKyAgICAvLyBpbmZvcm1hdGlvbiBkdXJpbmcgbGF5b3V0LgorICAgIHZvaWQgc2Vu ZENvbnRlbnRBcmVhU2Nyb2xsZWROb3coY29uc3QgRmxvYXRTaXplJiBzY3JvbGxEZWx0YSk7Cisg ICAgdm9pZCBzZW5kQ29udGVudEFyZWFTY3JvbGxlZFNvb24oY29uc3QgRmxvYXRTaXplJiBzY3Jv bGxEZWx0YSk7CisKICAgICBGbG9hdFBvaW50IGFkanVzdFNjcm9sbFBvc2l0aW9uSWZOZWNlc3Nh cnkoY29uc3QgRmxvYXRQb2ludCYpIGNvbnN0OwogCiAgICAgdm9pZCBpbW1lZGlhdGVTY3JvbGxU byhjb25zdCBGbG9hdFBvaW50Jik7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMv U2Nyb2xsQW5pbWF0b3JNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1tCShyZXZpc2lvbiAxNDkwNDYpCisrKyBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMubW0JKHdvcmtpbmcgY29weSkK QEAgLTk4Myw3ICs5ODMsMTIgQEAgdm9pZCBTY3JvbGxBbmltYXRvck1hYzo6bm90aWZ5Q29udGVu dEFyZQogICAgIC8vIFRoaXMgZnVuY3Rpb24gaXMgY2FsbGVkIHdoZW4gYSBwYWdlIGlzIGdvaW5n IGludG8gdGhlIHBhZ2UgY2FjaGUsIGJ1dCB0aGUgcGFnZSAKICAgICAvLyBpc24ndCByZWFsbHkg c2Nyb2xsaW5nIGluIHRoYXQgY2FzZS4gV2Ugc2hvdWxkIG9ubHkgcGFzcyB0aGUgbWVzc2FnZSBv biB0byB0aGUKICAgICAvLyBTY3JvbGxiYXJQYWludGVyQ29udHJvbGxlciB3aGVuIHdlJ3JlIHJl YWxseSBzY3JvbGxpbmcgb24gYW4gYWN0aXZlIHBhZ2UuCi0gICAgaWYgKHNjcm9sbGFibGVBcmVh KCktPnNjcm9sbGJhcnNDYW5CZUFjdGl2ZSgpKQorICAgIGlmICghc2Nyb2xsYWJsZUFyZWEoKS0+ c2Nyb2xsYmFyc0NhbkJlQWN0aXZlKCkpCisgICAgICAgIHJldHVybjsKKworICAgIGlmIChtX3Nj cm9sbGFibGVBcmVhLT5pc0hhbmRsaW5nV2hlZWxFdmVudCgpKQorICAgICAgICBzZW5kQ29udGVu dEFyZWFTY3JvbGxlZE5vdyhkZWx0YSk7CisgICAgZWxzZQogICAgICAgICBzZW5kQ29udGVudEFy ZWFTY3JvbGxlZFNvb24oZGVsdGEpOwogfQogCkBAIC0xMjgwLDE1ICsxMjg1LDIwIEBAIHZvaWQg U2Nyb2xsQW5pbWF0b3JNYWM6OnNlbmRDb250ZW50QXJlYVMKICAgICAgICAgbV9zZW5kQ29udGVu dEFyZWFTY3JvbGxlZFRpbWVyLnN0YXJ0T25lU2hvdCgwKTsKIH0KIAotdm9pZCBTY3JvbGxBbmlt YXRvck1hYzo6c2VuZENvbnRlbnRBcmVhU2Nyb2xsZWRUaW1lckZpcmVkKFRpbWVyPFNjcm9sbEFu aW1hdG9yTWFjPiopCit2b2lkIFNjcm9sbEFuaW1hdG9yTWFjOjpzZW5kQ29udGVudEFyZWFTY3Jv bGxlZE5vdyhjb25zdCBGbG9hdFNpemUmIGRlbHRhKQogewotICAgIGlmIChzdXBwb3J0c0NvbnRl bnRBcmVhU2Nyb2xsZWRJbkRpcmVjdGlvbigpKSB7Ci0gICAgICAgIFttX3Njcm9sbGJhclBhaW50 ZXJDb250cm9sbGVyLmdldCgpIGNvbnRlbnRBcmVhU2Nyb2xsZWRJbkRpcmVjdGlvbjpOU01ha2VQ b2ludChtX2NvbnRlbnRBcmVhU2Nyb2xsZWRUaW1lclNjcm9sbERlbHRhLndpZHRoKCksIG1fY29u dGVudEFyZWFTY3JvbGxlZFRpbWVyU2Nyb2xsRGVsdGEuaGVpZ2h0KCkpXTsKLSAgICAgICAgbV9j b250ZW50QXJlYVNjcm9sbGVkVGltZXJTY3JvbGxEZWx0YSA9IEZsb2F0U2l6ZSgpOwotICAgIH0g ZWxzZQorICAgIGlmIChzdXBwb3J0c0NvbnRlbnRBcmVhU2Nyb2xsZWRJbkRpcmVjdGlvbigpKQor ICAgICAgICBbbV9zY3JvbGxiYXJQYWludGVyQ29udHJvbGxlci5nZXQoKSBjb250ZW50QXJlYVNj cm9sbGVkSW5EaXJlY3Rpb246TlNNYWtlUG9pbnQoZGVsdGEud2lkdGgoKSwgZGVsdGEuaGVpZ2h0 KCkpXTsKKyAgICBlbHNlCiAgICAgICAgIFttX3Njcm9sbGJhclBhaW50ZXJDb250cm9sbGVyLmdl dCgpIGNvbnRlbnRBcmVhU2Nyb2xsZWRdOwogfQogCit2b2lkIFNjcm9sbEFuaW1hdG9yTWFjOjpz ZW5kQ29udGVudEFyZWFTY3JvbGxlZFRpbWVyRmlyZWQoVGltZXI8U2Nyb2xsQW5pbWF0b3JNYWM+ KikKK3sKKyAgICBzZW5kQ29udGVudEFyZWFTY3JvbGxlZE5vdyhtX2NvbnRlbnRBcmVhU2Nyb2xs ZWRUaW1lclNjcm9sbERlbHRhKTsKKyAgICBtX2NvbnRlbnRBcmVhU2Nyb2xsZWRUaW1lclNjcm9s bERlbHRhID0gRmxvYXRTaXplKCk7Cit9CisKIHZvaWQgU2Nyb2xsQW5pbWF0b3JNYWM6OnNldFZp c2libGVTY3JvbGxlclRodW1iUmVjdChjb25zdCBJbnRSZWN0JiBzY3JvbGxlclRodW1iKQogewog ICAgIEludFJlY3QgcmVjdEluVmlld0Nvb3JkaW5hdGVzID0gc2Nyb2xsZXJUaHVtYjsKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAkocmV2aXNpb24gMTQ5MDQ2 KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMjc1MSw2ICsyNzUxLDExIEBAIEludFBvaW50IFJlbmRlckxheWVyOjpsYXN0S25v d25Nb3VzZVBvc2kKICAgICByZXR1cm4gcmVuZGVyZXIoKS0+ZnJhbWUoKSA/IHJlbmRlcmVyKCkt PmZyYW1lKCktPmV2ZW50SGFuZGxlcigpLT5sYXN0S25vd25Nb3VzZVBvc2l0aW9uKCkgOiBJbnRQ b2ludCgpOwogfQogCitib29sIFJlbmRlckxheWVyOjppc0hhbmRsaW5nV2hlZWxFdmVudCgpIGNv bnN0Cit7CisgICAgcmV0dXJuIHJlbmRlcmVyKCktPmZyYW1lKCkgPyByZW5kZXJlcigpLT5mcmFt ZSgpLT5ldmVudEhhbmRsZXIoKS0+aXNIYW5kbGluZ1doZWVsRXZlbnQoKSA6IGZhbHNlOworfQor CiBJbnRSZWN0IFJlbmRlckxheWVyOjpyZWN0Rm9ySG9yaXpvbnRhbFNjcm9sbGJhcihjb25zdCBJ bnRSZWN0JiBib3JkZXJCb3hSZWN0KSBjb25zdAogewogICAgIGlmICghbV9oQmFyKQpJbmRleDog U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgJKHJldmlzaW9uIDE0OTA0NikKKysr IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCSh3b3JraW5nIGNvcHkpCkBA IC0xMDIyLDYgKzEwMjIsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgSW50U2l6ZSBjb250ZW50 c1NpemUoKSBjb25zdDsKICAgICB2aXJ0dWFsIEludFNpemUgb3ZlcmhhbmdBbW91bnQoKSBjb25z dDsKICAgICB2aXJ0dWFsIEludFBvaW50IGxhc3RLbm93bk1vdXNlUG9zaXRpb24oKSBjb25zdDsK KyAgICB2aXJ0dWFsIGJvb2wgaXNIYW5kbGluZ1doZWVsRXZlbnQoKSBjb25zdCBPVkVSUklERTsK ICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkU3VzcGVuZFNjcm9sbEFuaW1hdGlvbnMoKSBjb25zdDsK ICAgICB2aXJ0dWFsIGJvb2wgc2Nyb2xsYmFyc0NhbkJlQWN0aXZlKCkgY29uc3Q7CiAgICAgdmly dHVhbCBJbnRSZWN0IHNjcm9sbGFibGVBcmVhQm91bmRpbmdCb3goKSBjb25zdCBPVkVSUklERTsK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHAJKHJldmlz aW9uIDE0OTA0NikKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNw cAkod29ya2luZyBjb3B5KQpAQCAtODE1LDYgKzgxNSwxNCBAQCBJbnRQb2ludCBSZW5kZXJMaXN0 Qm94OjpsYXN0S25vd25Nb3VzZVBvCiAgICAgcmV0dXJuIHZpZXctPmZyYW1lVmlldygpLT5sYXN0 S25vd25Nb3VzZVBvc2l0aW9uKCk7CiB9CiAKK2Jvb2wgUmVuZGVyTGlzdEJveDo6aXNIYW5kbGlu Z1doZWVsRXZlbnQoKSBjb25zdAoreworICAgIFJlbmRlclZpZXcqIHZpZXcgPSB0aGlzLT52aWV3 KCk7CisgICAgaWYgKCF2aWV3KQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgcmV0dXJuIHZp ZXctPmZyYW1lVmlldygpLT5pc0hhbmRsaW5nV2hlZWxFdmVudCgpOworfQorCiBib29sIFJlbmRl ckxpc3RCb3g6OnNob3VsZFN1c3BlbmRTY3JvbGxBbmltYXRpb25zKCkgY29uc3QKIHsKICAgICBS ZW5kZXJWaWV3KiB2aWV3ID0gdGhpcy0+dmlldygpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxpc3RCb3guaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGlzdEJveC5oCShyZXZpc2lvbiAxNDkwNDYpCisrKyBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMTksNiArMTE5 LDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIGludCB2aXNpYmxlSGVpZ2h0KCkgY29uc3QgT1ZF UlJJREU7CiAgICAgdmlydHVhbCBpbnQgdmlzaWJsZVdpZHRoKCkgY29uc3QgT1ZFUlJJREU7CiAg ICAgdmlydHVhbCBJbnRQb2ludCBsYXN0S25vd25Nb3VzZVBvc2l0aW9uKCkgY29uc3QgT1ZFUlJJ REU7CisgICAgdmlydHVhbCBib29sIGlzSGFuZGxpbmdXaGVlbEV2ZW50KCkgY29uc3QgT1ZFUlJJ REU7CiAgICAgdmlydHVhbCBib29sIHNob3VsZFN1c3BlbmRTY3JvbGxBbmltYXRpb25zKCkgY29u c3QgT1ZFUlJJREU7CiAgICAgdmlydHVhbCBib29sIHNjcm9sbGJhcnNDYW5CZUFjdGl2ZSgpIGNv bnN0IE9WRVJSSURFOwogCg==