76196 2012-01-12 11:57:22 -0800 Move snapRubberBandTimerFired to ScrollElasticityController 2012-01-12 12:04:40 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 535023 0 andersca 2012-01-12 11:57:22 -0800 Move snapRubberBandTimerFired to ScrollElasticityController 535025 1 122279 andersca 2012-01-12 11:57:52 -0800 Created attachment 122279 Patch 535031 2 122279 kling 2012-01-12 12:02:12 -0800 Comment on attachment 122279 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=122279&action=review > Source/WebCore/ChangeLog:8 > + No new tests. (OOPS!) OOPS! > Source/WebCore/platform/mac/ScrollElasticityController.mm:95 > + if (!m_momentumScrollInProgress || m_ignoreMomentumScrolls) { We could reverse this condition and do an early return to reduce nesting. 535033 3 andersca 2012-01-12 12:04:40 -0800 Committed r104842: <http://trac.webkit.org/changeset/104842> 122279 2012-01-12 11:57:52 -0800 2012-01-12 12:02:12 -0800 Patch bug-76196-20120112115751.patch text/plain 12140 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0ODM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDI5ODgyNmE0YTVmMDg4 Mzg4ODVmN2IzN2JlNDA2NGJjYWFiZDU0Yi4uODU4NTEwMWQ2YjIzZTBjZjM0NTljODk4YzYzOGI3 ZDNkOTQ0MGEzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDEyLTAxLTEyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgTW92ZSBzbmFwUnVi YmVyQmFuZFRpbWVyRmlyZWQgdG8gU2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc2MTk2CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiAoT09Q UyEpCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMubW06CisgICAg ICAgIChXZWJDb3JlOjpTY3JvbGxBbmltYXRvck1hYzo6c25hcFJ1YmJlckJhbmRUaW1lckZpcmVk KToKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvU2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIuaDoK KyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvU2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubW06Cisg ICAgICAgIChXZWJDb3JlOjplbGFzdGljRGVsdGFGb3JUaW1lRGVsdGEpOgorICAgICAgICAoV2Vi Q29yZTo6cm91bmRUb3dhcmRaZXJvKToKKyAgICAgICAgKFdlYkNvcmU6OnJvdW5kVG9EZXZpY2VQ aXhlbFRvd2FyZFplcm8pOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsRWxhc3RpY2l0eUNvbnRy b2xsZXI6OnNuYXBSdWJiZXJCYW5kVGltZXJGaXJlZCk6CisKKzIwMTItMDEtMTIgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBSZW1vdmUgdGhlIGxhc3Qg bm9uLVNjcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyIGNhbGwgZnJvbSBTY3JvbGxBbmltYXRvck1h Yzo6c25hcFJ1YmJlckJhbmRUaW1lckZpcmVkCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD03NjE5MwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMubW0KaW5kZXggMWJhM2UzNWU3Nzk5MzhjMGE2YjYxMWIy Mzg3ZDg4ZDgwZWZiZThlMC4uZjEzM2FiOWY2ZjEzMzdhNzQ4ODc4OWUzZjNhOGMzNGUxOWM4YTk5 MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9y TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1h Yy5tbQpAQCAtOTE3LDI2ICs5MTcsMTIgQEAgc3RhdGljIGNvbnN0IGZsb2F0IHJ1YmJlcmJhbmRN aW5pbXVtUmVxdWlyZWREZWx0YUJlZm9yZVN0cmV0Y2ggPSAxMDsKIHN0YXRpYyBjb25zdCBmbG9h dCBydWJiZXJiYW5kQW1wbGl0dWRlID0gMC4zMWY7CiBzdGF0aWMgY29uc3QgZmxvYXQgcnViYmVy YmFuZFBlcmlvZCA9IDEuNmY7CiAKLXN0YXRpYyBmbG9hdCBlbGFzdGljRGVsdGFGb3JUaW1lRGVs dGEoZmxvYXQgaW5pdGlhbFBvc2l0aW9uLCBmbG9hdCBpbml0aWFsVmVsb2NpdHksIGZsb2F0IGVs YXBzZWRUaW1lKQotewotICAgIGZsb2F0IGFtcGxpdHVkZSA9IHJ1YmJlcmJhbmRBbXBsaXR1ZGU7 Ci0gICAgZmxvYXQgcGVyaW9kID0gcnViYmVyYmFuZFBlcmlvZDsKLSAgICBmbG9hdCBjcml0aWNh bERhbXBlbmluZ0ZhY3RvciA9IGV4cGYoKC1lbGFwc2VkVGltZSAqIHJ1YmJlcmJhbmRTdGlmZm5l c3MpIC8gcGVyaW9kKTsKLSAgICAgICAgICAgICAKLSAgICByZXR1cm4gKGluaXRpYWxQb3NpdGlv biArICgtaW5pdGlhbFZlbG9jaXR5ICogZWxhcHNlZFRpbWUgKiBhbXBsaXR1ZGUpKSAqIGNyaXRp Y2FsRGFtcGVuaW5nRmFjdG9yOwotfQotCiBzdGF0aWMgZmxvYXQgZWxhc3RpY0RlbHRhRm9yUmVi b3VuZERlbHRhKGZsb2F0IGRlbHRhKQogewogICAgIGZsb2F0IHN0aWZmbmVzcyA9IHN0ZDo6bWF4 KHJ1YmJlcmJhbmRTdGlmZm5lc3MsIDEuMGYpOwogICAgIHJldHVybiBkZWx0YSAvIHN0aWZmbmVz czsKIH0KIAotc3RhdGljIGZsb2F0IHJlYm91bmREZWx0YUZvckVsYXN0aWNEZWx0YShmbG9hdCBk ZWx0YSkKLXsKLSAgICByZXR1cm4gZGVsdGEgKiBydWJiZXJiYW5kU3RpZmZuZXNzOwotfQotCiBz dGF0aWMgZmxvYXQgc2Nyb2xsV2hlZWxNdWx0aXBsaWVyKCkKIHsKICAgICBzdGF0aWMgZmxvYXQg bXVsdGlwbGllciA9IC0xOwpAQCAtMTMzMiw4MyArMTMxOCw5IEBAIHZvaWQgU2Nyb2xsQW5pbWF0 b3JNYWM6OnNuYXBSdWJiZXJCYW5kKCkKICAgICBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVy Lm1fc25hcFJ1YmJlcmJhbmRUaW1lcklzQWN0aXZlID0gdHJ1ZTsKIH0KIAotc3RhdGljIGlubGlu ZSBmbG9hdCByb3VuZFRvd2FyZFplcm8oZmxvYXQgbnVtKQotewotICAgIHJldHVybiBudW0gPiAw ID8gY2VpbGYobnVtIC0gMC41ZikgOiBmbG9vcmYobnVtICsgMC41Zik7Ci19Ci0KLXN0YXRpYyBp bmxpbmUgZmxvYXQgcm91bmRUb0RldmljZVBpeGVsVG93YXJkWmVybyhmbG9hdCBudW0pCi17Ci0g ICAgZmxvYXQgcm91bmRlZE51bSA9IHJvdW5kZihudW0pOwotICAgIGlmIChmYWJzKG51bSAtIHJv dW5kZWROdW0pIDwgMC4xMjUpCi0gICAgICAgIG51bSA9IHJvdW5kZWROdW07Ci0KLSAgICByZXR1 cm4gcm91bmRUb3dhcmRaZXJvKG51bSk7Ci19Ci0KIHZvaWQgU2Nyb2xsQW5pbWF0b3JNYWM6OnNu YXBSdWJiZXJCYW5kVGltZXJGaXJlZChUaW1lcjxTY3JvbGxBbmltYXRvck1hYz4qKQogewotICAg IGlmICghbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tX21vbWVudHVtU2Nyb2xsSW5Qcm9n cmVzcyB8fCBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1faWdub3JlTW9tZW50dW1TY3Jv bGxzKSB7Ci0gICAgICAgIENGVGltZUludGVydmFsIHRpbWVEZWx0YSA9IFtOU0RhdGUgdGltZUlu dGVydmFsU2luY2VSZWZlcmVuY2VEYXRlXSAtIG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIu bV9zdGFydFRpbWU7Ci0KLSAgICAgICAgaWYgKG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIu bV9zdGFydFN0cmV0Y2ggPT0gRmxvYXRTaXplKCkpIHsKLSAgICAgICAgICAgIG1fc2Nyb2xsRWxh c3RpY2l0eUNvbnRyb2xsZXIubV9zdGFydFN0cmV0Y2ggPSBtX3Njcm9sbEVsYXN0aWNpdHlDb250 cm9sbGVyLm1fY2xpZW50LT5zdHJldGNoQW1vdW50KCk7Ci0gICAgICAgICAgICBpZiAobV9zY3Jv bGxFbGFzdGljaXR5Q29udHJvbGxlci5tX3N0YXJ0U3RyZXRjaCA9PSBGbG9hdFNpemUoKSkgewot ICAgICAgICAgICAgICAgIG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9jbGllbnQtPnN0 b3BTbmFwUnViYmVyYmFuZFRpbWVyKCk7Ci0KLSAgICAgICAgICAgICAgICBtX3Njcm9sbEVsYXN0 aWNpdHlDb250cm9sbGVyLm1fc3RyZXRjaFNjcm9sbEZvcmNlID0gRmxvYXRTaXplKCk7Ci0gICAg ICAgICAgICAgICAgbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tX3N0YXJ0VGltZSA9IDA7 Ci0gICAgICAgICAgICAgICAgbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tX3N0YXJ0U3Ry ZXRjaCA9IEZsb2F0U2l6ZSgpOwotICAgICAgICAgICAgICAgIG1fc2Nyb2xsRWxhc3RpY2l0eUNv bnRyb2xsZXIubV9vcmlnT3JpZ2luID0gRmxvYXRQb2ludCgpOwotICAgICAgICAgICAgICAgIG1f c2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9vcmlnVmVsb2NpdHkgPSBGbG9hdFNpemUoKTsK LSAgICAgICAgICAgICAgICBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fc25hcFJ1YmJl cmJhbmRUaW1lcklzQWN0aXZlID0gZmFsc2U7Ci0KLSAgICAgICAgICAgICAgICByZXR1cm47Ci0g ICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIu bV9vcmlnT3JpZ2luID0gbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tX2NsaWVudC0+YWJz b2x1dGVTY3JvbGxQb3NpdGlvbigpIC0gbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tX3N0 YXJ0U3RyZXRjaDsKLSAgICAgICAgICAgIG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9v cmlnVmVsb2NpdHkgPSBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fbW9tZW50dW1WZWxv Y2l0eTsKLQotICAgICAgICAgICAgLy8gSnVzdCBsaWtlIG5vcm1hbCBzY3JvbGxpbmcsIHByZWZl ciB2ZXJ0aWNhbCBydWJiZXJiYW5kaW5nCi0gICAgICAgICAgICBpZiAoZmFic2YobV9zY3JvbGxF bGFzdGljaXR5Q29udHJvbGxlci5tX29yaWdWZWxvY2l0eS5oZWlnaHQoKSkgPj0gZmFic2YobV9z Y3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tX29yaWdWZWxvY2l0eS53aWR0aCgpKSkKLSAgICAg ICAgICAgICAgICBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fb3JpZ1ZlbG9jaXR5LnNl dFdpZHRoKDApOwotICAgICAgICAgICAgCi0gICAgICAgICAgICAvLyBEb24ndCBydWJiZXItYmFu ZCBob3Jpem9udGFsbHkgaWYgaXQncyBub3QgcG9zc2libGUgdG8gc2Nyb2xsIGhvcml6b250YWxs eQotICAgICAgICAgICAgaWYgKCFtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fY2xpZW50 LT5jYW5TY3JvbGxIb3Jpem9udGFsbHkoKSkKLSAgICAgICAgICAgICAgICBtX3Njcm9sbEVsYXN0 aWNpdHlDb250cm9sbGVyLm1fb3JpZ1ZlbG9jaXR5LnNldFdpZHRoKDApOwotICAgICAgICAgICAg Ci0gICAgICAgICAgICAvLyBEb24ndCBydWJiZXItYmFuZCB2ZXJ0aWNhbGx5IGlmIGl0J3Mgbm90 IHBvc3NpYmxlIHRvIHNjcm9sbCB2ZXJ0aWNhbGx5Ci0gICAgICAgICAgICBpZiAoIW1fc2Nyb2xs RWxhc3RpY2l0eUNvbnRyb2xsZXIubV9jbGllbnQtPmNhblNjcm9sbFZlcnRpY2FsbHkoKSkKLSAg ICAgICAgICAgICAgICBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fb3JpZ1ZlbG9jaXR5 LnNldEhlaWdodCgwKTsKLSAgICAgICAgfQotCi0gICAgICAgIEZsb2F0UG9pbnQgZGVsdGEocm91 bmRUb0RldmljZVBpeGVsVG93YXJkWmVybyhlbGFzdGljRGVsdGFGb3JUaW1lRGVsdGEobV9zY3Jv bGxFbGFzdGljaXR5Q29udHJvbGxlci5tX3N0YXJ0U3RyZXRjaC53aWR0aCgpLCAtbV9zY3JvbGxF bGFzdGljaXR5Q29udHJvbGxlci5tX29yaWdWZWxvY2l0eS53aWR0aCgpLCAoZmxvYXQpdGltZURl bHRhKSksCi0gICAgICAgICAgICAgICAgICAgICAgICAgcm91bmRUb0RldmljZVBpeGVsVG93YXJk WmVybyhlbGFzdGljRGVsdGFGb3JUaW1lRGVsdGEobV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxl ci5tX3N0YXJ0U3RyZXRjaC5oZWlnaHQoKSwgLW1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIu bV9vcmlnVmVsb2NpdHkuaGVpZ2h0KCksIChmbG9hdCl0aW1lRGVsdGEpKSk7Ci0KLSAgICAgICAg aWYgKGZhYnMoZGVsdGEueCgpKSA+PSAxIHx8IGZhYnMoZGVsdGEueSgpKSA+PSAxKSB7Ci0gICAg ICAgICAgICBGbG9hdFBvaW50IG5ld09yaWdpbiA9IG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xs ZXIubV9vcmlnT3JpZ2luICsgZGVsdGE7Ci0KLSAgICAgICAgICAgIG1fc2Nyb2xsRWxhc3RpY2l0 eUNvbnRyb2xsZXIubV9jbGllbnQtPmltbWVkaWF0ZVNjcm9sbEJ5V2l0aG91dENvbnRlbnRFZGdl Q29uc3RyYWludHMoRmxvYXRTaXplKGRlbHRhLngoKSwgZGVsdGEueSgpKSAtIG1fc2Nyb2xsRWxh c3RpY2l0eUNvbnRyb2xsZXIubV9jbGllbnQtPnN0cmV0Y2hBbW91bnQoKSk7Ci0KLSAgICAgICAg ICAgIEZsb2F0U2l6ZSBuZXdTdHJldGNoID0gbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5t X2NsaWVudC0+c3RyZXRjaEFtb3VudCgpOwotICAgICAgICAgICAgCi0gICAgICAgICAgICBtX3Nj cm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fc3RyZXRjaFNjcm9sbEZvcmNlLnNldFdpZHRoKHJl Ym91bmREZWx0YUZvckVsYXN0aWNEZWx0YShuZXdTdHJldGNoLndpZHRoKCkpKTsKLSAgICAgICAg ICAgIG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9zdHJldGNoU2Nyb2xsRm9yY2Uuc2V0 SGVpZ2h0KHJlYm91bmREZWx0YUZvckVsYXN0aWNEZWx0YShuZXdTdHJldGNoLmhlaWdodCgpKSk7 Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9s bGVyLm1fY2xpZW50LT5pbW1lZGlhdGVTY3JvbGxCeShtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9s bGVyLm1fb3JpZ09yaWdpbiAtIG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9jbGllbnQt PmFic29sdXRlU2Nyb2xsUG9zaXRpb24oKSk7Ci0gICAgICAgICAgICBtX3Njcm9sbEVsYXN0aWNp dHlDb250cm9sbGVyLm1fY2xpZW50LT5zdG9wU25hcFJ1YmJlcmJhbmRUaW1lcigpOwotCi0gICAg ICAgICAgICBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fc3RyZXRjaFNjcm9sbEZvcmNl ID0gRmxvYXRTaXplKCk7Ci0gICAgICAgICAgICBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVy Lm1fc3RhcnRUaW1lID0gMDsKLSAgICAgICAgICAgIG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xs ZXIubV9zdGFydFN0cmV0Y2ggPSBGbG9hdFNpemUoKTsKLSAgICAgICAgICAgIG1fc2Nyb2xsRWxh c3RpY2l0eUNvbnRyb2xsZXIubV9vcmlnT3JpZ2luID0gRmxvYXRQb2ludCgpOwotICAgICAgICAg ICAgbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tX29yaWdWZWxvY2l0eSA9IEZsb2F0U2l6 ZSgpOwotICAgICAgICAgICAgbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tX3NuYXBSdWJi ZXJiYW5kVGltZXJJc0FjdGl2ZSA9IGZhbHNlOwotICAgICAgICB9Ci0gICAgfSBlbHNlIHsKLSAg ICAgICAgbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tX3N0YXJ0VGltZSA9IFtOU0RhdGUg dGltZUludGVydmFsU2luY2VSZWZlcmVuY2VEYXRlXTsKLSAgICAgICAgbV9zY3JvbGxFbGFzdGlj aXR5Q29udHJvbGxlci5tX3N0YXJ0U3RyZXRjaCA9IEZsb2F0U2l6ZSgpOwotICAgIH0KKyAgICBt X3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLnNuYXBSdWJiZXJCYW5kVGltZXJGaXJlZCgpOwog fQogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3Jv bGxFbGFzdGljaXR5Q29udHJvbGxlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Nj cm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLmgKaW5kZXggMDY2MTg0NDczMTA3MGZlODdlMzYzYjlm ZmE5OGQxZDQ5YWYyZWU0NS4uMmQzMTQ2ODc0YTM1ZmI2YWU0MzA5NGE1YTk4ODE5NGUzYjkyNmQw ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEVsYXN0aWNp dHlDb250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEVs YXN0aWNpdHlDb250cm9sbGVyLmgKQEAgLTYxLDYgKzYxLDggQEAgcHVibGljOgogCiAgICAgdm9p ZCBiZWdpblNjcm9sbEdlc3R1cmUoKTsKIAorICAgIHZvaWQgc25hcFJ1YmJlckJhbmRUaW1lckZp cmVkKCk7CisKIHByaXZhdGU6CiAgICAgdm9pZCBzdG9wU25hcFJ1YmJlcmJhbmRUaW1lcigpOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsRWxhc3RpY2l0 eUNvbnRyb2xsZXIubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsRWxhc3Rp Y2l0eUNvbnRyb2xsZXIubW0KaW5kZXggZmE4NDEzMzdlMDZkNGZiMDZhZDRkMDY3YmM4ZjJiNmMy MjI0N2VmNi4uMDNlNWFjODhhYzc4MmU3YjFmZTlhNDI5NmQ4OTFkZmM5MjBhYTNjOCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEVsYXN0aWNpdHlDb250cm9s bGVyLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxFbGFzdGljaXR5 Q29udHJvbGxlci5tbQpAQCAtMzEsNiArMzEsMTcgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAog c3RhdGljIGNvbnN0IGZsb2F0IHJ1YmJlcmJhbmRTdGlmZm5lc3MgPSAyMDsKK3N0YXRpYyBjb25z dCBmbG9hdCBydWJiZXJiYW5kQW1wbGl0dWRlID0gMC4zMWY7CitzdGF0aWMgY29uc3QgZmxvYXQg cnViYmVyYmFuZFBlcmlvZCA9IDEuNmY7CisKK3N0YXRpYyBmbG9hdCBlbGFzdGljRGVsdGFGb3JU aW1lRGVsdGEoZmxvYXQgaW5pdGlhbFBvc2l0aW9uLCBmbG9hdCBpbml0aWFsVmVsb2NpdHksIGZs b2F0IGVsYXBzZWRUaW1lKQoreworICAgIGZsb2F0IGFtcGxpdHVkZSA9IHJ1YmJlcmJhbmRBbXBs aXR1ZGU7CisgICAgZmxvYXQgcGVyaW9kID0gcnViYmVyYmFuZFBlcmlvZDsKKyAgICBmbG9hdCBj cml0aWNhbERhbXBlbmluZ0ZhY3RvciA9IGV4cGYoKC1lbGFwc2VkVGltZSAqIHJ1YmJlcmJhbmRT dGlmZm5lc3MpIC8gcGVyaW9kKTsKKworICAgIHJldHVybiAoaW5pdGlhbFBvc2l0aW9uICsgKC1p bml0aWFsVmVsb2NpdHkgKiBlbGFwc2VkVGltZSAqIGFtcGxpdHVkZSkpICogY3JpdGljYWxEYW1w ZW5pbmdGYWN0b3I7Cit9CiAKIHN0YXRpYyBmbG9hdCByZWJvdW5kRGVsdGFGb3JFbGFzdGljRGVs dGEoZmxvYXQgZGVsdGEpCiB7CkBAIC02NSw2ICs3Niw4NSBAQCB2b2lkIFNjcm9sbEVsYXN0aWNp dHlDb250cm9sbGVyOjpiZWdpblNjcm9sbEdlc3R1cmUoKQogICAgIHN0b3BTbmFwUnViYmVyYmFu ZFRpbWVyKCk7CiB9CiAKK3N0YXRpYyBpbmxpbmUgZmxvYXQgcm91bmRUb3dhcmRaZXJvKGZsb2F0 IG51bSkKK3sKKyAgICByZXR1cm4gbnVtID4gMCA/IGNlaWxmKG51bSAtIDAuNWYpIDogZmxvb3Jm KG51bSArIDAuNWYpOworfQorCitzdGF0aWMgaW5saW5lIGZsb2F0IHJvdW5kVG9EZXZpY2VQaXhl bFRvd2FyZFplcm8oZmxvYXQgbnVtKQoreworICAgIGZsb2F0IHJvdW5kZWROdW0gPSByb3VuZGYo bnVtKTsKKyAgICBpZiAoZmFicyhudW0gLSByb3VuZGVkTnVtKSA8IDAuMTI1KQorICAgICAgICBu dW0gPSByb3VuZGVkTnVtOworCisgICAgcmV0dXJuIHJvdW5kVG93YXJkWmVybyhudW0pOworfQor Cit2b2lkIFNjcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyOjpzbmFwUnViYmVyQmFuZFRpbWVyRmly ZWQoKQoreworICAgIGlmICghbV9tb21lbnR1bVNjcm9sbEluUHJvZ3Jlc3MgfHwgbV9pZ25vcmVN b21lbnR1bVNjcm9sbHMpIHsKKyAgICAgICAgQ0ZUaW1lSW50ZXJ2YWwgdGltZURlbHRhID0gW05T RGF0ZSB0aW1lSW50ZXJ2YWxTaW5jZVJlZmVyZW5jZURhdGVdIC0gbV9zdGFydFRpbWU7CisKKyAg ICAgICAgaWYgKG1fc3RhcnRTdHJldGNoID09IEZsb2F0U2l6ZSgpKSB7CisgICAgICAgICAgICBt X3N0YXJ0U3RyZXRjaCA9IG1fY2xpZW50LT5zdHJldGNoQW1vdW50KCk7CisgICAgICAgICAgICBp ZiAobV9zdGFydFN0cmV0Y2ggPT0gRmxvYXRTaXplKCkpIHsKKyAgICAgICAgICAgICAgICBtX2Ns aWVudC0+c3RvcFNuYXBSdWJiZXJiYW5kVGltZXIoKTsKKworICAgICAgICAgICAgICAgIG1fc3Ry ZXRjaFNjcm9sbEZvcmNlID0gRmxvYXRTaXplKCk7CisgICAgICAgICAgICAgICAgbV9zdGFydFRp bWUgPSAwOworICAgICAgICAgICAgICAgIG1fc3RhcnRTdHJldGNoID0gRmxvYXRTaXplKCk7Cisg ICAgICAgICAgICAgICAgbV9vcmlnT3JpZ2luID0gRmxvYXRQb2ludCgpOworICAgICAgICAgICAg ICAgIG1fb3JpZ1ZlbG9jaXR5ID0gRmxvYXRTaXplKCk7CisgICAgICAgICAgICAgICAgbV9zbmFw UnViYmVyYmFuZFRpbWVySXNBY3RpdmUgPSBmYWxzZTsKKworICAgICAgICAgICAgICAgIHJldHVy bjsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgbV9vcmlnT3JpZ2luID0gbV9jbGllbnQt PmFic29sdXRlU2Nyb2xsUG9zaXRpb24oKSAtIG1fc3RhcnRTdHJldGNoOworICAgICAgICAgICAg bV9vcmlnVmVsb2NpdHkgPSBtX21vbWVudHVtVmVsb2NpdHk7CisKKyAgICAgICAgICAgIC8vIEp1 c3QgbGlrZSBub3JtYWwgc2Nyb2xsaW5nLCBwcmVmZXIgdmVydGljYWwgcnViYmVyYmFuZGluZwor ICAgICAgICAgICAgaWYgKGZhYnNmKG1fb3JpZ1ZlbG9jaXR5LmhlaWdodCgpKSA+PSBmYWJzZiht X29yaWdWZWxvY2l0eS53aWR0aCgpKSkKKyAgICAgICAgICAgICAgICBtX29yaWdWZWxvY2l0eS5z ZXRXaWR0aCgwKTsKKworICAgICAgICAgICAgLy8gRG9uJ3QgcnViYmVyLWJhbmQgaG9yaXpvbnRh bGx5IGlmIGl0J3Mgbm90IHBvc3NpYmxlIHRvIHNjcm9sbCBob3Jpem9udGFsbHkKKyAgICAgICAg ICAgIGlmICghbV9jbGllbnQtPmNhblNjcm9sbEhvcml6b250YWxseSgpKQorICAgICAgICAgICAg ICAgIG1fb3JpZ1ZlbG9jaXR5LnNldFdpZHRoKDApOworCisgICAgICAgICAgICAvLyBEb24ndCBy dWJiZXItYmFuZCB2ZXJ0aWNhbGx5IGlmIGl0J3Mgbm90IHBvc3NpYmxlIHRvIHNjcm9sbCB2ZXJ0 aWNhbGx5CisgICAgICAgICAgICBpZiAoIW1fY2xpZW50LT5jYW5TY3JvbGxWZXJ0aWNhbGx5KCkp CisgICAgICAgICAgICAgICAgbV9vcmlnVmVsb2NpdHkuc2V0SGVpZ2h0KDApOworICAgICAgICB9 CisKKyAgICAgICAgRmxvYXRQb2ludCBkZWx0YShyb3VuZFRvRGV2aWNlUGl4ZWxUb3dhcmRaZXJv KGVsYXN0aWNEZWx0YUZvclRpbWVEZWx0YShtX3N0YXJ0U3RyZXRjaC53aWR0aCgpLCAtbV9vcmln VmVsb2NpdHkud2lkdGgoKSwgKGZsb2F0KXRpbWVEZWx0YSkpLAorICAgICAgICAgICAgICAgICAg ICAgICAgIHJvdW5kVG9EZXZpY2VQaXhlbFRvd2FyZFplcm8oZWxhc3RpY0RlbHRhRm9yVGltZURl bHRhKG1fc3RhcnRTdHJldGNoLmhlaWdodCgpLCAtbV9vcmlnVmVsb2NpdHkuaGVpZ2h0KCksIChm bG9hdCl0aW1lRGVsdGEpKSk7CisKKyAgICAgICAgaWYgKGZhYnMoZGVsdGEueCgpKSA+PSAxIHx8 IGZhYnMoZGVsdGEueSgpKSA+PSAxKSB7CisgICAgICAgICAgICBGbG9hdFBvaW50IG5ld09yaWdp biA9IG1fb3JpZ09yaWdpbiArIGRlbHRhOworCisgICAgICAgICAgICBtX2NsaWVudC0+aW1tZWRp YXRlU2Nyb2xsQnlXaXRob3V0Q29udGVudEVkZ2VDb25zdHJhaW50cyhGbG9hdFNpemUoZGVsdGEu eCgpLCBkZWx0YS55KCkpIC0gbV9jbGllbnQtPnN0cmV0Y2hBbW91bnQoKSk7CisKKyAgICAgICAg ICAgIEZsb2F0U2l6ZSBuZXdTdHJldGNoID0gbV9jbGllbnQtPnN0cmV0Y2hBbW91bnQoKTsKKwor ICAgICAgICAgICAgbV9zdHJldGNoU2Nyb2xsRm9yY2Uuc2V0V2lkdGgocmVib3VuZERlbHRhRm9y RWxhc3RpY0RlbHRhKG5ld1N0cmV0Y2gud2lkdGgoKSkpOworICAgICAgICAgICAgbV9zdHJldGNo U2Nyb2xsRm9yY2Uuc2V0SGVpZ2h0KHJlYm91bmREZWx0YUZvckVsYXN0aWNEZWx0YShuZXdTdHJl dGNoLmhlaWdodCgpKSk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBtX2NsaWVudC0+ aW1tZWRpYXRlU2Nyb2xsQnkobV9vcmlnT3JpZ2luIC0gbV9jbGllbnQtPmFic29sdXRlU2Nyb2xs UG9zaXRpb24oKSk7CisgICAgICAgICAgICBtX2NsaWVudC0+c3RvcFNuYXBSdWJiZXJiYW5kVGlt ZXIoKTsKKworICAgICAgICAgICAgbV9zdHJldGNoU2Nyb2xsRm9yY2UgPSBGbG9hdFNpemUoKTsK KyAgICAgICAgICAgIG1fc3RhcnRUaW1lID0gMDsKKyAgICAgICAgICAgIG1fc3RhcnRTdHJldGNo ID0gRmxvYXRTaXplKCk7CisgICAgICAgICAgICBtX29yaWdPcmlnaW4gPSBGbG9hdFBvaW50KCk7 CisgICAgICAgICAgICBtX29yaWdWZWxvY2l0eSA9IEZsb2F0U2l6ZSgpOworICAgICAgICAgICAg bV9zbmFwUnViYmVyYmFuZFRpbWVySXNBY3RpdmUgPSBmYWxzZTsKKyAgICAgICAgfQorICAgIH0g ZWxzZSB7CisgICAgICAgIG1fc3RhcnRUaW1lID0gW05TRGF0ZSB0aW1lSW50ZXJ2YWxTaW5jZVJl ZmVyZW5jZURhdGVdOworICAgICAgICBtX3N0YXJ0U3RyZXRjaCA9IEZsb2F0U2l6ZSgpOworICAg IH0KK30KKwogdm9pZCBTY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlcjo6c3RvcFNuYXBSdWJiZXJi YW5kVGltZXIoKQogewogICAgIG1fY2xpZW50LT5zdG9wU25hcFJ1YmJlcmJhbmRUaW1lcigpOwo=