78425 2012-02-11 14:56:12 -0800 Implement more ScrollElasticityControllerClient member functions 2014-02-05 10:31:12 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 128258 1 andersca andersca oldest_to_newest 554705 0 andersca 2012-02-11 14:56:12 -0800 Implement more ScrollElasticityControllerClient member functions 554706 1 126650 andersca 2012-02-11 14:57:22 -0800 Created attachment 126650 Patch 554707 2 andersca 2012-02-11 15:05:00 -0800 Committed r107488: <http://trac.webkit.org/changeset/107488> 976782 3 126650 bfulgham 2014-02-05 09:51:07 -0800 Comment on attachment 126650 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=126650&action=review > Source/WebCore/page/scrolling/mac/ScrollingTreeNodeMac.mm:134 > + limitDelta.setHeight(scrollPosition().x() - minimumScrollPosition().x()); Should this really have been setHeight? It seems like other cases of this logic would use "setWidth". I don't think it changes anything, but might be clearer. 126650 2012-02-11 14:57:22 -0800 2014-02-05 09:51:07 -0800 Patch bug-78425-20120211145800.patch text/plain 9474 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTA3NDg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2ZiODc5ZWQ2YmFkMjFl YzZkZDRiMTYwMmI1ZWI1NTdlZDdhMTNmNC4uOWQ4Zjc0Yjk1MDU2YTVkZGEwYzI3MDlmNzJiNGQ0 YWE1MzUwMDIyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM1IEBACiAyMDEyLTAyLTExICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgSW1wbGVtZW50IG1v cmUgU2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXJDbGllbnQgbWVtYmVyIGZ1bmN0aW9ucworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzg0MjUKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBhZ2Uvc2Nyb2xs aW5nL1Njcm9sbGluZ1RyZWVOb2RlLmg6CisgICAgICAgIChTY3JvbGxpbmdUcmVlTm9kZSk6Cisg ICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlTm9kZTo6aG9yaXpvbnRhbFNjcm9sbEVsYXN0 aWNpdHkpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZU5vZGU6OnZlcnRpY2FsU2Ny b2xsRWxhc3RpY2l0eSk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlTm9kZTo6aGFz RW5hYmxlZEhvcml6b250YWxTY3JvbGxiYXIpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5n VHJlZU5vZGU6Omhhc0VuYWJsZWRWZXJ0aWNhbFNjcm9sbGJhcik6CisgICAgICAgIEFkZCBuZXcg Z2V0dGVycy4KKworICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlTm9k ZU1hYy5oOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlTm9kZU1h Yy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVOb2RlTWFjOjphbGxvd3NIb3Jp em9udGFsU3RyZXRjaGluZyk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlTm9kZU1h Yzo6YWxsb3dzVmVydGljYWxTdHJldGNoaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGlu Z1RyZWVOb2RlTWFjOjpzdHJldGNoQW1vdW50KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGlu Z1RyZWVOb2RlTWFjOjpwaW5uZWRJbkRpcmVjdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpTY3Jv bGxpbmdUcmVlTm9kZU1hYzo6Y2FuU2Nyb2xsSG9yaXpvbnRhbGx5KToKKyAgICAgICAgKFdlYkNv cmU6OlNjcm9sbGluZ1RyZWVOb2RlTWFjOjpjYW5TY3JvbGxWZXJ0aWNhbGx5KToKKyAgICAgICAg KFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVOb2RlTWFjOjphYnNvbHV0ZVNjcm9sbFBvc2l0aW9uKToK KyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVOb2RlTWFjOjppbW1lZGlhdGVTY3JvbGxC eVdpdGhvdXRDb250ZW50RWRnZUNvbnN0cmFpbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9s bGluZ1RyZWVOb2RlTWFjOjpzdGFydFNuYXBSdWJiZXJiYW5kVGltZXIpOgorICAgICAgICAoV2Vi Q29yZTo6U2Nyb2xsaW5nVHJlZU5vZGVNYWM6OnN0b3BTbmFwUnViYmVyYmFuZFRpbWVyKToKKyAg ICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVOb2RlTWFjOjpzY3JvbGxCeVdpdGhvdXRDb250 ZW50RWRnZUNvbnN0cmFpbnRzKToKKyAgICAgICAgSW1wbGVtZW50IFNjcm9sbEVsYXN0aWNpdHlD b250cm9sbGVyQ2xpZW50IG1lbWJlciBmdW5jdGlvbnMuCisKKzIwMTItMDItMTEgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBQYXNzIHdoZWVsIGV2ZW50 cyB0byBhIHNjcm9sbCBlbGFzdGljaXR5IGNvbnRyb2xsZXIgb24gdGhlIHNjcm9sbGluZyB0aHJl YWQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc4NDIx CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1Ry ZWVOb2RlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlTm9k ZS5oCmluZGV4IDk0NzUzMDdhNDdmZmIwYzIwZjQwNzg1Y2YxMDZmYTkyMzQwODg5YTIuLjI1ODc4 M2U3ZDJlZjU2MTBiZWNlNjUyZTI1NzAxNWRjNjIzNTYyMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVOb2RlLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZU5vZGUuaApAQCAtNTEsMTAgKzUxLDE4 IEBAIHByb3RlY3RlZDoKICAgICBleHBsaWNpdCBTY3JvbGxpbmdUcmVlTm9kZShTY3JvbGxpbmdU cmVlKik7CiAKICAgICBTY3JvbGxpbmdUcmVlKiBzY3JvbGxpbmdUcmVlKCkgY29uc3QgeyByZXR1 cm4gbV9zY3JvbGxpbmdUcmVlOyB9CisKICAgICBjb25zdCBJbnRSZWN0JiB2aWV3cG9ydFJlY3Qo KSBjb25zdCB7IHJldHVybiBtX3ZpZXdwb3J0UmVjdDsgfQogICAgIGNvbnN0IEludFNpemUmIGNv bnRlbnRzU2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVudHNTaXplOyB9CisKICAgICBib29s IHNob3VsZFVwZGF0ZVNjcm9sbExheWVyUG9zaXRpb25Pbk1haW5UaHJlYWQoKSBjb25zdCB7IHJl dHVybiBtX3Nob3VsZFVwZGF0ZVNjcm9sbExheWVyUG9zaXRpb25Pbk1haW5UaHJlYWQ7IH0KIAor ICAgIFNjcm9sbEVsYXN0aWNpdHkgaG9yaXpvbnRhbFNjcm9sbEVsYXN0aWNpdHkoKSBjb25zdCB7 IHJldHVybiBtX2hvcml6b250YWxTY3JvbGxFbGFzdGljaXR5OyB9CisgICAgU2Nyb2xsRWxhc3Rp Y2l0eSB2ZXJ0aWNhbFNjcm9sbEVsYXN0aWNpdHkoKSBjb25zdCB7IHJldHVybiBtX3ZlcnRpY2Fs U2Nyb2xsRWxhc3RpY2l0eTsgfQorCisgICAgYm9vbCBoYXNFbmFibGVkSG9yaXpvbnRhbFNjcm9s bGJhcigpIGNvbnN0IHsgcmV0dXJuIG1faGFzRW5hYmxlZEhvcml6b250YWxTY3JvbGxiYXI7IH0K KyAgICBib29sIGhhc0VuYWJsZWRWZXJ0aWNhbFNjcm9sbGJhcigpIGNvbnN0IHsgcmV0dXJuIG1f aGFzRW5hYmxlZFZlcnRpY2FsU2Nyb2xsYmFyOyB9CisKIHByaXZhdGU6CiAgICAgU2Nyb2xsaW5n VHJlZSogbV9zY3JvbGxpbmdUcmVlOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZU5vZGVNYWMuaCBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlTm9kZU1hYy5oCmluZGV4IDVhYTA4MWMxNTg3 ZjQyMjFmODc3ZmU2ZTRmOGQ0NDlhMzlhNGM2NmUuLjI5ZGY1ZWJkYjNkZThkNjc4NDI5MDNhZTlk YzcxYWNiNDYxMWRiZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5n L21hYy9TY3JvbGxpbmdUcmVlTm9kZU1hYy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlTm9kZU1hYy5oCkBAIC02NSw5ICs2NSwxMyBAQCBwcml2 YXRlOgogCiAgICAgSW50UG9pbnQgbWluaW11bVNjcm9sbFBvc2l0aW9uKCkgY29uc3Q7CiAgICAg SW50UG9pbnQgbWF4aW11bVNjcm9sbFBvc2l0aW9uKCkgY29uc3Q7CisKICAgICB2b2lkIHNjcm9s bEJ5KGNvbnN0IEludFNpemUmKTsKKyAgICB2b2lkIHNjcm9sbEJ5V2l0aG91dENvbnRlbnRFZGdl Q29uc3RyYWludHMoY29uc3QgSW50U2l6ZSYpOwogCiAgICAgU2Nyb2xsRWxhc3RpY2l0eUNvbnRy b2xsZXIgbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlcjsKKyAgICBSZXRhaW5QdHI8Q0ZSdW5M b29wVGltZXJSZWY+IG1fc25hcFJ1YmJlcmJhbmRUaW1lcjsKKwogICAgIFJldGFpblB0cjxDQUxh eWVyPiBtX3Njcm9sbExheWVyOwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFn ZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVOb2RlTWFjLm1tIGIvU291cmNlL1dlYkNvcmUv cGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVOb2RlTWFjLm1tCmluZGV4IDFkNDJiYmQ0 NjgxMjgxNmU4ODY3ZmIwYjU5M2E0NDIzZjU4MmFhOWYuLjY0N2Q0ZTNlMmVkODQ4ZDZiOGJlMjg1 NGQxOTNkNGJmNzlkN2QwNjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xs aW5nL21hYy9TY3JvbGxpbmdUcmVlTm9kZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZU5vZGVNYWMubW0KQEAgLTcxLDM4ICs3MSw4NyBA QCB2b2lkIFNjcm9sbGluZ1RyZWVOb2RlTWFjOjpzZXRTY3JvbGxQb3NpdGlvbihjb25zdCBJbnRQ b2ludCYgc2Nyb2xsUG9zaXRpb24pCiAKIGJvb2wgU2Nyb2xsaW5nVHJlZU5vZGVNYWM6OmFsbG93 c0hvcml6b250YWxTdHJldGNoaW5nKCkKIHsKLSAgICAvLyBGSVhNRTogSW1wbGVtZW50LgorICAg IHN3aXRjaCAoaG9yaXpvbnRhbFNjcm9sbEVsYXN0aWNpdHkoKSkgeworICAgIGNhc2UgU2Nyb2xs RWxhc3RpY2l0eUF1dG9tYXRpYzoKKyAgICAgICAgcmV0dXJuIGhhc0VuYWJsZWRIb3Jpem9udGFs U2Nyb2xsYmFyKCkgfHwgIWhhc0VuYWJsZWRWZXJ0aWNhbFNjcm9sbGJhcigpOworICAgIGNhc2Ug U2Nyb2xsRWxhc3RpY2l0eU5vbmU6CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBjYXNlIFNj cm9sbEVsYXN0aWNpdHlBbGxvd2VkOgorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisKKyAg ICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKIGJvb2wgU2Ny b2xsaW5nVHJlZU5vZGVNYWM6OmFsbG93c1ZlcnRpY2FsU3RyZXRjaGluZygpCiB7Ci0gICAgLy8g RklYTUU6IEltcGxlbWVudC4KKyAgICBzd2l0Y2ggKHZlcnRpY2FsU2Nyb2xsRWxhc3RpY2l0eSgp KSB7CisgICAgY2FzZSBTY3JvbGxFbGFzdGljaXR5QXV0b21hdGljOgorICAgICAgICByZXR1cm4g aGFzRW5hYmxlZFZlcnRpY2FsU2Nyb2xsYmFyKCkgfHwgIWhhc0VuYWJsZWRIb3Jpem9udGFsU2Ny b2xsYmFyKCk7CisgICAgY2FzZSBTY3JvbGxFbGFzdGljaXR5Tm9uZToKKyAgICAgICAgcmV0dXJu IGZhbHNlOworICAgIGNhc2UgU2Nyb2xsRWxhc3RpY2l0eUFsbG93ZWQ6CisgICAgICAgIHJldHVy biB0cnVlOworICAgIH0KKworICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIHJldHVybiBm YWxzZTsKIH0KIAogSW50U2l6ZSBTY3JvbGxpbmdUcmVlTm9kZU1hYzo6c3RyZXRjaEFtb3VudCgp CiB7Ci0gICAgLy8gRklYTUU6IEltcGxlbWVudC4KLSAgICByZXR1cm4gSW50U2l6ZSgpOwotfQor ICAgIEludFNpemUgc3RyZXRjaDsKKworICAgIGlmIChzY3JvbGxQb3NpdGlvbigpLnkoKSA8IG1p bmltdW1TY3JvbGxQb3NpdGlvbigpLnkoKSkKKyAgICAgICAgc3RyZXRjaC5zZXRIZWlnaHQoc2Ny b2xsUG9zaXRpb24oKS55KCkgLSBtaW5pbXVtU2Nyb2xsUG9zaXRpb24oKS55KCkpOworICAgIGVs c2UgaWYgKHNjcm9sbFBvc2l0aW9uKCkueSgpID4gbWF4aW11bVNjcm9sbFBvc2l0aW9uKCkueSgp KQorICAgICAgICBzdHJldGNoLnNldEhlaWdodChzY3JvbGxQb3NpdGlvbigpLnkoKSAtIG1heGlt dW1TY3JvbGxQb3NpdGlvbigpLnkoKSk7CisKKyAgICBpZiAoc2Nyb2xsUG9zaXRpb24oKS54KCkg PCBtaW5pbXVtU2Nyb2xsUG9zaXRpb24oKS54KCkpCisgICAgICAgIHN0cmV0Y2guc2V0V2lkdGgo c2Nyb2xsUG9zaXRpb24oKS54KCkgLSBtaW5pbXVtU2Nyb2xsUG9zaXRpb24oKS54KCkpOworICAg IGVsc2UgaWYgKHNjcm9sbFBvc2l0aW9uKCkueCgpID4gbWF4aW11bVNjcm9sbFBvc2l0aW9uKCku eCgpKQorICAgICAgICBzdHJldGNoLnNldFdpZHRoKHNjcm9sbFBvc2l0aW9uKCkueCgpIC0gbWF4 aW11bVNjcm9sbFBvc2l0aW9uKCkueCgpKTsKKworICAgIHJldHVybiBzdHJldGNoOworfQorCiti b29sIFNjcm9sbGluZ1RyZWVOb2RlTWFjOjpwaW5uZWRJbkRpcmVjdGlvbihjb25zdCBGbG9hdFNp emUmIGRlbHRhKQoreworICAgIEZsb2F0U2l6ZSBsaW1pdERlbHRhOworCisgICAgaWYgKGZhYnNm KGRlbHRhLmhlaWdodCgpKSA+PSBmYWJzZihkZWx0YS53aWR0aCgpKSkgeworICAgICAgICBpZiAo ZGVsdGEuaGVpZ2h0KCkgPCAwKSB7CisgICAgICAgICAgICAvLyBXZSBhcmUgdHJ5aW5nIHRvIHNj cm9sbCB1cC4gIE1ha2Ugc3VyZSB3ZSBhcmUgbm90IHBpbm5lZCB0byB0aGUgdG9wCisgICAgICAg ICAgICBsaW1pdERlbHRhLnNldEhlaWdodChzY3JvbGxQb3NpdGlvbigpLnkoKSAtIG1pbmltdW1T Y3JvbGxQb3NpdGlvbigpLnkoKSk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAvLyBX ZSBhcmUgdHJ5aW5nIHRvIHNjcm9sbCBkb3duLiAgTWFrZSBzdXJlIHdlIGFyZSBub3QgcGlubmVk IHRvIHRoZSBib3R0b20KKyAgICAgICAgICAgIGxpbWl0RGVsdGEuc2V0SGVpZ2h0KG1heGltdW1T Y3JvbGxQb3NpdGlvbigpLnkoKSAtIHNjcm9sbFBvc2l0aW9uKCkueSgpKTsKKyAgICAgICAgfQor ICAgIH0gZWxzZSBpZiAoZGVsdGEud2lkdGgoKSkgeworICAgICAgICBpZiAoZGVsdGEud2lkdGgo KSA8IDApIHsKKyAgICAgICAgICAgIC8vIFdlIGFyZSB0cnlpbmcgdG8gc2Nyb2xsIGxlZnQuICBN YWtlIHN1cmUgd2UgYXJlIG5vdCBwaW5uZWQgdG8gdGhlIGxlZnQKKyAgICAgICAgICAgIGxpbWl0 RGVsdGEuc2V0SGVpZ2h0KHNjcm9sbFBvc2l0aW9uKCkueCgpIC0gbWluaW11bVNjcm9sbFBvc2l0 aW9uKCkueCgpKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIC8vIFdlIGFyZSB0cnlp bmcgdG8gc2Nyb2xsIHJpZ2h0LiAgTWFrZSBzdXJlIHdlIGFyZSBub3QgcGlubmVkIHRvIHRoZSBy aWdodAorICAgICAgICAgICAgbGltaXREZWx0YS5zZXRIZWlnaHQobWF4aW11bVNjcm9sbFBvc2l0 aW9uKCkueCgpIC0gc2Nyb2xsUG9zaXRpb24oKS54KCkpOworICAgICAgICB9CisgICAgfQorCisg ICAgaWYgKChkZWx0YS53aWR0aCgpIHx8IGRlbHRhLmhlaWdodCgpKSAmJiAobGltaXREZWx0YS53 aWR0aCgpIDwgMSAmJiBsaW1pdERlbHRhLmhlaWdodCgpIDwgMSkpICAgICAgICAKKyAgICAgICAg cmV0dXJuIHRydWU7CiAKLWJvb2wgU2Nyb2xsaW5nVHJlZU5vZGVNYWM6OnBpbm5lZEluRGlyZWN0 aW9uKGNvbnN0IEZsb2F0U2l6ZSYpCi17Ci0gICAgLy8gRklYTUU6IEltcGxlbWVudC4KICAgICBy ZXR1cm4gZmFsc2U7CiB9CiAKIGJvb2wgU2Nyb2xsaW5nVHJlZU5vZGVNYWM6OmNhblNjcm9sbEhv cml6b250YWxseSgpCiB7Ci0gICAgLy8gRklYTUU6IEltcGxlbWVudC4KLSAgICByZXR1cm4gZmFs c2U7CisgICAgcmV0dXJuIGhhc0VuYWJsZWRIb3Jpem9udGFsU2Nyb2xsYmFyKCk7CiB9CiAKIGJv b2wgU2Nyb2xsaW5nVHJlZU5vZGVNYWM6OmNhblNjcm9sbFZlcnRpY2FsbHkoKQogewotICAgIC8v IEZJWE1FOiBJbXBsZW1lbnQuCi0gICAgcmV0dXJuIGZhbHNlOworICAgIHJldHVybiBoYXNFbmFi bGVkVmVydGljYWxTY3JvbGxiYXIoKTsKIH0KIAogYm9vbCBTY3JvbGxpbmdUcmVlTm9kZU1hYzo6 c2hvdWxkUnViYmVyQmFuZEluRGlyZWN0aW9uKFNjcm9sbERpcmVjdGlvbikKQEAgLTExMyw4ICsx NjIsNyBAQCBib29sIFNjcm9sbGluZ1RyZWVOb2RlTWFjOjpzaG91bGRSdWJiZXJCYW5kSW5EaXJl Y3Rpb24oU2Nyb2xsRGlyZWN0aW9uKQogCiBJbnRQb2ludCBTY3JvbGxpbmdUcmVlTm9kZU1hYzo6 YWJzb2x1dGVTY3JvbGxQb3NpdGlvbigpCiB7Ci0gICAgLy8gRklYTUU6IEltcGxlbWVudC4KLSAg ICByZXR1cm4gSW50UG9pbnQoKTsKKyAgICByZXR1cm4gc2Nyb2xsUG9zaXRpb24oKTsKIH0KIAog dm9pZCBTY3JvbGxpbmdUcmVlTm9kZU1hYzo6aW1tZWRpYXRlU2Nyb2xsQnkoY29uc3QgRmxvYXRT aXplJiBvZmZzZXQpCkBAIC0xMjIsMTkgKzE3MCwzMCBAQCB2b2lkIFNjcm9sbGluZ1RyZWVOb2Rl TWFjOjppbW1lZGlhdGVTY3JvbGxCeShjb25zdCBGbG9hdFNpemUmIG9mZnNldCkKICAgICBzY3Jv bGxCeShyb3VuZGVkSW50U2l6ZShvZmZzZXQpKTsKIH0KIAotdm9pZCBTY3JvbGxpbmdUcmVlTm9k ZU1hYzo6aW1tZWRpYXRlU2Nyb2xsQnlXaXRob3V0Q29udGVudEVkZ2VDb25zdHJhaW50cyhjb25z dCBGbG9hdFNpemUmKQordm9pZCBTY3JvbGxpbmdUcmVlTm9kZU1hYzo6aW1tZWRpYXRlU2Nyb2xs QnlXaXRob3V0Q29udGVudEVkZ2VDb25zdHJhaW50cyhjb25zdCBGbG9hdFNpemUmIG9mZnNldCkK IHsKLSAgICAvLyBGSVhNRTogSW1wbGVtZW50LgorICAgIHNjcm9sbEJ5V2l0aG91dENvbnRlbnRF ZGdlQ29uc3RyYWludHMocm91bmRlZEludFNpemUob2Zmc2V0KSk7CiB9CiAKIHZvaWQgU2Nyb2xs aW5nVHJlZU5vZGVNYWM6OnN0YXJ0U25hcFJ1YmJlcmJhbmRUaW1lcigpCiB7Ci0gICAgLy8gRklY TUU6IEltcGxlbWVudC4KKyAgICBBU1NFUlQoIW1fc25hcFJ1YmJlcmJhbmRUaW1lcik7CisKKyAg ICBDRlRpbWVJbnRlcnZhbCB0aW1lckludGVydmFsID0gMS4wIC8gNjAuMDsKKworICAgIG1fc25h cFJ1YmJlcmJhbmRUaW1lciA9IGFkb3B0Q0YoQ0ZSdW5Mb29wVGltZXJDcmVhdGVXaXRoSGFuZGxl cihrQ0ZBbGxvY2F0b3JEZWZhdWx0LCBDRkFic29sdXRlVGltZUdldEN1cnJlbnQoKSArIHRpbWVy SW50ZXJ2YWwsIHRpbWVySW50ZXJ2YWwsIDAsIDAsIF4oQ0ZSdW5Mb29wVGltZXJSZWYpIHsKKyAg ICAgICAgbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5zbmFwUnViYmVyQmFuZFRpbWVyRmly ZWQoKTsKKyAgICB9KSk7CisgICAgQ0ZSdW5Mb29wQWRkVGltZXIoQ0ZSdW5Mb29wR2V0Q3VycmVu dCgpLCBtX3NuYXBSdWJiZXJiYW5kVGltZXIuZ2V0KCksIGtDRlJ1bkxvb3BEZWZhdWx0TW9kZSk7 CiB9CiAKIHZvaWQgU2Nyb2xsaW5nVHJlZU5vZGVNYWM6OnN0b3BTbmFwUnViYmVyYmFuZFRpbWVy KCkKIHsKLSAgICAvLyBGSVhNRTogSW1wbGVtZW50LgorICAgIGlmICghbV9zbmFwUnViYmVyYmFu ZFRpbWVyKQorICAgICAgICByZXR1cm47CisKKyAgICBDRlJ1bkxvb3BUaW1lckludmFsaWRhdGUo bV9zbmFwUnViYmVyYmFuZFRpbWVyLmdldCgpKTsKKyAgICBtX3NuYXBSdWJiZXJiYW5kVGltZXIg PSBudWxscHRyOwogfQogCiBJbnRQb2ludCBTY3JvbGxpbmdUcmVlTm9kZU1hYzo6c2Nyb2xsUG9z aXRpb24oKSBjb25zdApAQCAtMTc1LDYgKzIzNCwxMSBAQCB2b2lkIFNjcm9sbGluZ1RyZWVOb2Rl TWFjOjpzY3JvbGxCeShjb25zdCBJbnRTaXplJiBvZmZzZXQpCiAgICAgc2V0U2Nyb2xsUG9zaXRp b24obmV3U2Nyb2xsUG9zaXRpb24pOwogfQogCit2b2lkIFNjcm9sbGluZ1RyZWVOb2RlTWFjOjpz Y3JvbGxCeVdpdGhvdXRDb250ZW50RWRnZUNvbnN0cmFpbnRzKGNvbnN0IEludFNpemUmIG9mZnNl dCkKK3sKKyAgICBzZXRTY3JvbGxQb3NpdGlvbihzY3JvbGxQb3NpdGlvbigpICsgb2Zmc2V0KTsK K30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYgLy8gRU5BQkxFKFRIUkVBREVE X1NDUk9MTElORykK