75115 2011-12-22 12:51:49 -0800 Move some member variables out of ScrollElasticityController 2011-12-22 13:08:50 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca aroben oldest_to_newest 526456 0 andersca 2011-12-22 12:51:49 -0800 Move some member variables out of ScrollElasticityController 526457 1 120366 andersca 2011-12-22 12:53:06 -0800 Created attachment 120366 Patch 526458 2 120366 aroben 2011-12-22 12:54:58 -0800 Comment on attachment 120366 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=120366&action=review > Source/WebCore/platform/mac/ScrollAnimatorMac.mm:996 > // in the opposite direction of the pin location, then we switch the > // boolean, and rubber band. That is, if we were pinned to the left, > // and we ended up scrolling to the right, we rubber band. These comments make it sound like the members are in fact related to rubberbanding. What gives? 526459 3 andersca 2011-12-22 12:56:27 -0800 (In reply to comment #2) > (From update of attachment 120366 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=120366&action=review > > > Source/WebCore/platform/mac/ScrollAnimatorMac.mm:996 > > // in the opposite direction of the pin location, then we switch the > > // boolean, and rubber band. That is, if we were pinned to the left, > > // and we ended up scrolling to the right, we rubber band. > > These comments make it sound like the members are in fact related to rubberbanding. What gives? The comments are about when we should forward the event to the scroll elasticity controller, which is in charge of rubberbanding. 526464 4 andersca 2011-12-22 13:08:50 -0800 Committed r103571: <http://trac.webkit.org/changeset/103571> 120366 2011-12-22 12:53:06 -0800 2011-12-22 12:58:49 -0800 Patch bug-75115-20111222125321.patch text/plain 9900 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzNTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGM5NjZmNDgyYzViMGQ2 NTFiNmE1NTQyNmY0Mzk2MmE2YjQ0NGFjMi4uOGI1OTliMmJiYWUwODMwM2ViZmJjMjk4YTE2MGE3 MzBlZmNlNzczNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDExLTEyLTIyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgTW92ZSBzb21lIG1l bWJlciB2YXJpYWJsZXMgb3V0IG9mIFNjcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NTExNQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgYSBjb3VwbGUgb2Yg bWVtYmVyIHZhcmlhYmxlcyB0aGF0IGFyZW4ndCByZWxhdGVkIHRvIHJ1YmJlcmJhbmRpbmcgb3V0 IGZyb20KKyAgICAgICAgU2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIgYW5kIGJhY2sgaW50byBT Y3JvbGxBbmltYXRvck1hYyBhbmQgcmVtb3ZlIG5vdyB1bm5lZWRlZAorICAgICAgICBTY3JvbGxF bGFzdGljaXR5Q29udHJvbGxlckNsaWVudCBtZW1iZXIgZnVuY3Rpb25zIGFzIHdlbGwuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMuaDoKKyAgICAgICAgKiBwbGF0 Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxB bmltYXRvck1hYzo6U2Nyb2xsQW5pbWF0b3JNYWMpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs QW5pbWF0b3JNYWM6OmhhbmRsZVdoZWVsRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs QW5pbWF0b3JNYWM6OmJlZ2luU2Nyb2xsR2VzdHVyZSk6CisgICAgICAgICogcGxhdGZvcm0vbWFj L1Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLmg6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1Nj cm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1tOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsRWxh c3RpY2l0eUNvbnRyb2xsZXI6OlNjcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyKToKKyAgICAgICAg KFdlYkNvcmU6OlNjcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyOjpiZWdpblNjcm9sbEdlc3R1cmUp OgorCisyMDExLTEyLTIyICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisK ICAgICAgICAgR2V0IHJpZCBvZiBkaWRTdGFydEFuaW1hdGVkU2Nyb2xsIGFuZCBkaWRDb21wbGV0 ZUFuaW1hdGVkU2Nyb2xsCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD03NTEwNwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMv U2Nyb2xsQW5pbWF0b3JNYWMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxB bmltYXRvck1hYy5oCmluZGV4IDljZGMwZDI5MmQzMjZiN2MzYWMxOGE3YTIxZTBmMTM2MjQ4N2Jl NWMuLjkxNGE5NDllZGM5ZWIxYjU4ZWYxODI5ZWJiNDE0NTRiZDM4NjNhZDEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5oCkBAIC0xMzMsOCAr MTMzLDYgQEAgcHJpdmF0ZToKIAogI2lmIEVOQUJMRShSVUJCRVJfQkFORElORykKICAgICAvLy8g U2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXJDbGllbnQgbWVtYmVyIGZ1bmN0aW9ucy4KLSAgICB2 aXJ0dWFsIGJvb2wgaXNIb3Jpem9udGFsU2Nyb2xsZXJQaW5uZWRUb01pbmltdW1Qb3NpdGlvbigp IE9WRVJSSURFOwotICAgIHZpcnR1YWwgYm9vbCBpc0hvcml6b250YWxTY3JvbGxlclBpbm5lZFRv TWF4aW11bVBvc2l0aW9uKCkgT1ZFUlJJREU7CiAgICAgdmlydHVhbCBJbnRTaXplIHN0cmV0Y2hB bW91bnQoKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgc3RhcnRTbmFwUnViYmVyYmFuZFRp bWVyKCkgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIHN0b3BTbmFwUnViYmVyYmFuZFRpbWVy KCkgT1ZFUlJJREU7CkBAIC0xNTAsNiArMTQ4LDExIEBAIHByaXZhdGU6CiAKICAgICBTY3JvbGxF bGFzdGljaXR5Q29udHJvbGxlciBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyOwogICAgIFRp bWVyPFNjcm9sbEFuaW1hdG9yTWFjPiBtX3NuYXBSdWJiZXJCYW5kVGltZXI7CisKKyAgICBib29s IG1fc2Nyb2xsZXJJbml0aWFsbHlQaW5uZWRPbkxlZnQ7CisgICAgYm9vbCBtX3Njcm9sbGVySW5p dGlhbGx5UGlubmVkT25SaWdodDsKKyAgICBpbnQgbV9jdW11bGF0aXZlSG9yaXpvbnRhbFNjcm9s bDsKKyAgICBib29sIG1fZGlkQ3VtdWxhdGl2ZUhvcml6b250YWxTY3JvbGxFdmVyU3dpdGNoVG9P cHBvc2l0ZURpcmVjdGlvbk9mUGluOwogI2VuZGlmCiAKICAgICBib29sIG1faGF2ZVNjcm9sbGVk U2luY2VQYWdlTG9hZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9T Y3JvbGxBbmltYXRvck1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxB bmltYXRvck1hYy5tbQppbmRleCAxMDdkNzgzZDRkNjFmOWRiNzFhYTE1ZjU5YmM2MmU5NGNhZTg4 Nzc5Li5lODQzYThiYWM2MTZlYWJlMDU5MGE0MGExNzgyMzNkYmFjMWE2OTFmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMubW0KKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1tCkBAIC01ODYs NiArNTg2LDEwIEBAIFNjcm9sbEFuaW1hdG9yTWFjOjpTY3JvbGxBbmltYXRvck1hYyhTY3JvbGxh YmxlQXJlYSogc2Nyb2xsYWJsZUFyZWEpCiAjaWYgRU5BQkxFKFJVQkJFUl9CQU5ESU5HKQogICAg ICwgbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlcih0aGlzKQogICAgICwgbV9zbmFwUnViYmVy QmFuZFRpbWVyKHRoaXMsICZTY3JvbGxBbmltYXRvck1hYzo6c25hcFJ1YmJlckJhbmRUaW1lckZp cmVkKQorICAgICwgbV9zY3JvbGxlckluaXRpYWxseVBpbm5lZE9uTGVmdChmYWxzZSkKKyAgICAs IG1fc2Nyb2xsZXJJbml0aWFsbHlQaW5uZWRPblJpZ2h0KGZhbHNlKQorICAgICwgbV9jdW11bGF0 aXZlSG9yaXpvbnRhbFNjcm9sbCgwKQorICAgICwgbV9kaWRDdW11bGF0aXZlSG9yaXpvbnRhbFNj cm9sbEV2ZXJTd2l0Y2hUb09wcG9zaXRlRGlyZWN0aW9uT2ZQaW4oZmFsc2UpCiAjZW5kaWYKICAg ICAsIG1faGF2ZVNjcm9sbGVkU2luY2VQYWdlTG9hZChmYWxzZSkKICAgICAsIG1fbmVlZHNTY3Jv bGxlclN0eWxlVXBkYXRlKGZhbHNlKQpAQCAtOTkwLDIzICs5OTQsMjMgQEAgYm9vbCBTY3JvbGxB bmltYXRvck1hYzo6aGFuZGxlV2hlZWxFdmVudChjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmIHdo ZWVsRXZlbnQpCiAgICAgICAgICAgICAvLyBpbiB0aGUgb3Bwb3NpdGUgZGlyZWN0aW9uIG9mIHRo ZSBwaW4gbG9jYXRpb24sIHRoZW4gd2Ugc3dpdGNoIHRoZQogICAgICAgICAgICAgLy8gYm9vbGVh biwgYW5kIHJ1YmJlciBiYW5kLiBUaGF0IGlzLCBpZiB3ZSB3ZXJlIHBpbm5lZCB0byB0aGUgbGVm dCwKICAgICAgICAgICAgIC8vIGFuZCB3ZSBlbmRlZCB1cCBzY3JvbGxpbmcgdG8gdGhlIHJpZ2h0 LCB3ZSBydWJiZXIgYmFuZC4KLSAgICAgICAgICAgIG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xs ZXIubV9jdW11bGF0aXZlSG9yaXpvbnRhbFNjcm9sbCArPSB3aGVlbEV2ZW50LmRlbHRhWCgpOwot ICAgICAgICAgICAgaWYgKG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9zY3JvbGxlcklu aXRpYWxseVBpbm5lZE9uTGVmdCAmJiBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fY3Vt dWxhdGl2ZUhvcml6b250YWxTY3JvbGwgPCAwKQotICAgICAgICAgICAgICAgIG1fc2Nyb2xsRWxh c3RpY2l0eUNvbnRyb2xsZXIubV9kaWRDdW11bGF0aXZlSG9yaXpvbnRhbFNjcm9sbEV2ZXJTd2l0 Y2hUb09wcG9zaXRlRGlyZWN0aW9uT2ZQaW4gPSB0cnVlOwotICAgICAgICAgICAgaWYgKG1fc2Ny b2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9zY3JvbGxlckluaXRpYWxseVBpbm5lZE9uUmlnaHQg JiYgbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tX2N1bXVsYXRpdmVIb3Jpem9udGFsU2Ny b2xsID4gMCkKLSAgICAgICAgICAgICAgICBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1f ZGlkQ3VtdWxhdGl2ZUhvcml6b250YWxTY3JvbGxFdmVyU3dpdGNoVG9PcHBvc2l0ZURpcmVjdGlv bk9mUGluID0gdHJ1ZTsKKyAgICAgICAgICAgIG1fY3VtdWxhdGl2ZUhvcml6b250YWxTY3JvbGwg Kz0gd2hlZWxFdmVudC5kZWx0YVgoKTsKKyAgICAgICAgICAgIGlmIChtX3Njcm9sbGVySW5pdGlh bGx5UGlubmVkT25MZWZ0ICYmIG1fY3VtdWxhdGl2ZUhvcml6b250YWxTY3JvbGwgPCAwKQorICAg ICAgICAgICAgICAgIG1fZGlkQ3VtdWxhdGl2ZUhvcml6b250YWxTY3JvbGxFdmVyU3dpdGNoVG9P cHBvc2l0ZURpcmVjdGlvbk9mUGluID0gdHJ1ZTsKKyAgICAgICAgICAgIGlmIChtX3Njcm9sbGVy SW5pdGlhbGx5UGlubmVkT25SaWdodCAmJiBtX2N1bXVsYXRpdmVIb3Jpem9udGFsU2Nyb2xsID4g MCkKKyAgICAgICAgICAgICAgICBtX2RpZEN1bXVsYXRpdmVIb3Jpem9udGFsU2Nyb2xsRXZlclN3 aXRjaFRvT3Bwb3NpdGVEaXJlY3Rpb25PZlBpbiA9IHRydWU7CiAgICAgICAgIH0KIAogICAgICAg ICAvLyBBZnRlciBhIGdlc3R1cmUgYmVnaW5zLCB3ZSBnbyB0aHJvdWdoOgogICAgICAgICAvLyAx KyBQbGF0Zm9ybVdoZWVsRXZlbnRQaGFzZU5vbmUKICAgICAgICAgLy8gMCsgUGxhdGZvcm1XaGVl bEV2ZW50UGhhc2VDaGFuZ2VkCiAgICAgICAgIC8vIDEgUGxhdGZvcm1XaGVlbEV2ZW50UGhhc2VF bmRlZCBpZiB0aGVyZSB3YXMgYXQgbGVhc3Qgb25lIGNoYW5nZWQgZXZlbnQKLSAgICAgICAgaWYg KHdoZWVsRXZlbnQubW9tZW50dW1QaGFzZSgpID09IFBsYXRmb3JtV2hlZWxFdmVudFBoYXNlTm9u ZSAmJiAhbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tX2RpZEN1bXVsYXRpdmVIb3Jpem9u dGFsU2Nyb2xsRXZlclN3aXRjaFRvT3Bwb3NpdGVEaXJlY3Rpb25PZlBpbikgeworICAgICAgICBp ZiAod2hlZWxFdmVudC5tb21lbnR1bVBoYXNlKCkgPT0gUGxhdGZvcm1XaGVlbEV2ZW50UGhhc2VO b25lICYmICFtX2RpZEN1bXVsYXRpdmVIb3Jpem9udGFsU2Nyb2xsRXZlclN3aXRjaFRvT3Bwb3Np dGVEaXJlY3Rpb25PZlBpbikgewogICAgICAgICAgICAgaWYgKChpc1Njcm9sbGluZ0xlZnRBbmRT aG91bGROb3RSdWJiZXJCYW5kKHdoZWVsRXZlbnQsIG1fc2Nyb2xsYWJsZUFyZWEpICYmCi0gICAg ICAgICAgICAgICAgbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tX3Njcm9sbGVySW5pdGlh bGx5UGlubmVkT25MZWZ0ICYmCisgICAgICAgICAgICAgICAgbV9zY3JvbGxlckluaXRpYWxseVBp bm5lZE9uTGVmdCAmJgogICAgICAgICAgICAgICAgIG1fc2Nyb2xsYWJsZUFyZWEtPmlzSG9yaXpv bnRhbFNjcm9sbGVyUGlubmVkVG9NaW5pbXVtUG9zaXRpb24oKSkgfHwKICAgICAgICAgICAgICAg ICAoaXNTY3JvbGxpbmdSaWdodEFuZFNob3VsZE5vdFJ1YmJlckJhbmQod2hlZWxFdmVudCwgbV9z Y3JvbGxhYmxlQXJlYSkgJiYKLSAgICAgICAgICAgICAgICBtX3Njcm9sbEVsYXN0aWNpdHlDb250 cm9sbGVyLm1fc2Nyb2xsZXJJbml0aWFsbHlQaW5uZWRPblJpZ2h0ICYmCisgICAgICAgICAgICAg ICAgbV9zY3JvbGxlckluaXRpYWxseVBpbm5lZE9uUmlnaHQgJiYKICAgICAgICAgICAgICAgICBt X3Njcm9sbGFibGVBcmVhLT5pc0hvcml6b250YWxTY3JvbGxlclBpbm5lZFRvTWF4aW11bVBvc2l0 aW9uKCkpKSB7CiAgICAgICAgICAgICAgICAgcmV0dXJuIFNjcm9sbEFuaW1hdG9yOjpoYW5kbGVX aGVlbEV2ZW50KHdoZWVsRXZlbnQpOwogICAgICAgICAgICAgfQpAQCAtMTA2MCwxNiArMTA2NCw2 IEBAIGJvb2wgU2Nyb2xsQW5pbWF0b3JNYWM6OnBpbm5lZEluRGlyZWN0aW9uKGZsb2F0IGRlbHRh WCwgZmxvYXQgZGVsdGFZKQogICAgIHJldHVybiBmYWxzZTsKIH0KIAotYm9vbCBTY3JvbGxBbmlt YXRvck1hYzo6aXNIb3Jpem9udGFsU2Nyb2xsZXJQaW5uZWRUb01pbmltdW1Qb3NpdGlvbigpCi17 Ci0gICAgcmV0dXJuIG1fc2Nyb2xsYWJsZUFyZWEtPmlzSG9yaXpvbnRhbFNjcm9sbGVyUGlubmVk VG9NaW5pbXVtUG9zaXRpb24oKTsKLX0KLQotYm9vbCBTY3JvbGxBbmltYXRvck1hYzo6aXNIb3Jp em9udGFsU2Nyb2xsZXJQaW5uZWRUb01heGltdW1Qb3NpdGlvbigpCi17Ci0gICAgcmV0dXJuIG1f c2Nyb2xsYWJsZUFyZWEtPmlzSG9yaXpvbnRhbFNjcm9sbGVyUGlubmVkVG9NYXhpbXVtUG9zaXRp b24oKTsKLX0KLQogSW50U2l6ZSBTY3JvbGxBbmltYXRvck1hYzo6c3RyZXRjaEFtb3VudCgpCiB7 CiAgICAgcmV0dXJuIG1fc2Nyb2xsYWJsZUFyZWEtPm92ZXJoYW5nQW1vdW50KCk7CkBAIC0xMjc4 LDcgKzEyNzIsMTIgQEAgdm9pZCBTY3JvbGxBbmltYXRvck1hYzo6c21vb3RoU2Nyb2xsV2l0aEV2 ZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgd2hlZWxFdmUKIHZvaWQgU2Nyb2xsQW5pbWF0 b3JNYWM6OmJlZ2luU2Nyb2xsR2VzdHVyZSgpCiB7CiAgICAgZGlkQmVnaW5TY3JvbGxHZXN0dXJl KCk7CisKKyAgICBtX3Njcm9sbGVySW5pdGlhbGx5UGlubmVkT25MZWZ0ID0gbV9zY3JvbGxhYmxl QXJlYS0+aXNIb3Jpem9udGFsU2Nyb2xsZXJQaW5uZWRUb01pbmltdW1Qb3NpdGlvbigpOworICAg IG1fc2Nyb2xsZXJJbml0aWFsbHlQaW5uZWRPblJpZ2h0ID0gbV9zY3JvbGxhYmxlQXJlYS0+aXNI b3Jpem9udGFsU2Nyb2xsZXJQaW5uZWRUb01heGltdW1Qb3NpdGlvbigpOwogICAgIG1faGF2ZVNj cm9sbGVkU2luY2VQYWdlTG9hZCA9IHRydWU7CisgICAgbV9jdW11bGF0aXZlSG9yaXpvbnRhbFNj cm9sbCA9IDA7CisgICAgbV9kaWRDdW11bGF0aXZlSG9yaXpvbnRhbFNjcm9sbEV2ZXJTd2l0Y2hU b09wcG9zaXRlRGlyZWN0aW9uT2ZQaW4gPSBmYWxzZTsKIAogICAgIG1fc2Nyb2xsRWxhc3RpY2l0 eUNvbnRyb2xsZXIuYmVnaW5TY3JvbGxHZXN0dXJlKCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIuaCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5oCmluZGV4 IDNjNTY5MmM0ZTJiYmM3YjBiNzQzMjYwOGUxZjRjYWJkNWM3NWQxYjIuLjQ4NjM3MGIwYjcyNzYy NjczY2ViMzhmYjc0NGRkM2YyYjI4N2VmN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21hYy9TY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL21hYy9TY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5oCkBAIC0zOSw5ICsz OSw2IEBAIHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIH5TY3JvbGxFbGFzdGljaXR5Q29udHJvbGxl ckNsaWVudCgpIHsgfSAKIAogcHVibGljOgotICAgIHZpcnR1YWwgYm9vbCBpc0hvcml6b250YWxT Y3JvbGxlclBpbm5lZFRvTWluaW11bVBvc2l0aW9uKCkgPSAwOwotICAgIHZpcnR1YWwgYm9vbCBp c0hvcml6b250YWxTY3JvbGxlclBpbm5lZFRvTWF4aW11bVBvc2l0aW9uKCkgPSAwOwotCiAgICAg dmlydHVhbCBJbnRTaXplIHN0cmV0Y2hBbW91bnQoKSA9IDA7CiAKICAgICB2aXJ0dWFsIHZvaWQg c3RhcnRTbmFwUnViYmVyYmFuZFRpbWVyKCkgPSAwOwpAQCAtNjcsMTIgKzY0LDcgQEAgcHVibGlj OgogICAgIGJvb2wgbV9pblNjcm9sbEdlc3R1cmU7CiAgICAgYm9vbCBtX21vbWVudHVtU2Nyb2xs SW5Qcm9ncmVzczsKICAgICBib29sIG1faWdub3JlTW9tZW50dW1TY3JvbGxzOwotICAgIGJvb2wg bV9zY3JvbGxlckluaXRpYWxseVBpbm5lZE9uTGVmdDsKLSAgICBib29sIG1fc2Nyb2xsZXJJbml0 aWFsbHlQaW5uZWRPblJpZ2h0OwogICAgIAotICAgIGludCBtX2N1bXVsYXRpdmVIb3Jpem9udGFs U2Nyb2xsOwotICAgIGJvb2wgbV9kaWRDdW11bGF0aXZlSG9yaXpvbnRhbFNjcm9sbEV2ZXJTd2l0 Y2hUb09wcG9zaXRlRGlyZWN0aW9uT2ZQaW47Ci0KICAgICBDRlRpbWVJbnRlcnZhbCBtX2xhc3RN b21lbnR1bVNjcm9sbFRpbWVzdGFtcDsKICAgICBGbG9hdFNpemUgbV9vdmVyZmxvd1Njcm9sbERl bHRhOwogICAgIEZsb2F0U2l6ZSBtX3N0cmV0Y2hTY3JvbGxGb3JjZTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tbSBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5t bQppbmRleCBmZjY2ZjZiNzY0NDRlNzRmNmUyMzMxNDI4YTliOWE2M2NmY2VlZDkyLi5mYTg0MTMz N2UwNmQ0ZmIwNmFkNGQwNjdiYzhmMmI2YzIyMjQ3ZWY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubW0KKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1tCkBA IC00MiwxMCArNDIsNiBAQCBTY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlcjo6U2Nyb2xsRWxhc3Rp Y2l0eUNvbnRyb2xsZXIoU2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZQogICAgICwgbV9pblNjcm9s bEdlc3R1cmUoZmFsc2UpCiAgICAgLCBtX21vbWVudHVtU2Nyb2xsSW5Qcm9ncmVzcyhmYWxzZSkK ICAgICAsIG1faWdub3JlTW9tZW50dW1TY3JvbGxzKGZhbHNlKQotICAgICwgbV9zY3JvbGxlcklu aXRpYWxseVBpbm5lZE9uTGVmdChmYWxzZSkKLSAgICAsIG1fc2Nyb2xsZXJJbml0aWFsbHlQaW5u ZWRPblJpZ2h0KGZhbHNlKQotICAgICwgbV9jdW11bGF0aXZlSG9yaXpvbnRhbFNjcm9sbCgwKQot ICAgICwgbV9kaWRDdW11bGF0aXZlSG9yaXpvbnRhbFNjcm9sbEV2ZXJTd2l0Y2hUb09wcG9zaXRl RGlyZWN0aW9uT2ZQaW4oZmFsc2UpCiAgICAgLCBtX2xhc3RNb21lbnR1bVNjcm9sbFRpbWVzdGFt cCgwKQogICAgICwgbV9zdGFydFRpbWUoMCkKICAgICAsIG1fc25hcFJ1YmJlcmJhbmRUaW1lcklz QWN0aXZlKGZhbHNlKQpAQCAtNTksMTAgKzU1LDYgQEAgdm9pZCBTY3JvbGxFbGFzdGljaXR5Q29u dHJvbGxlcjo6YmVnaW5TY3JvbGxHZXN0dXJlKCkKICAgICBtX2lnbm9yZU1vbWVudHVtU2Nyb2xs cyA9IGZhbHNlOwogICAgIG1fbGFzdE1vbWVudHVtU2Nyb2xsVGltZXN0YW1wID0gMDsKICAgICBt X21vbWVudHVtVmVsb2NpdHkgPSBGbG9hdFNpemUoKTsKLSAgICBtX3Njcm9sbGVySW5pdGlhbGx5 UGlubmVkT25MZWZ0ID0gbV9jbGllbnQtPmlzSG9yaXpvbnRhbFNjcm9sbGVyUGlubmVkVG9NaW5p bXVtUG9zaXRpb24oKTsKLSAgICBtX3Njcm9sbGVySW5pdGlhbGx5UGlubmVkT25SaWdodCA9IG1f Y2xpZW50LT5pc0hvcml6b250YWxTY3JvbGxlclBpbm5lZFRvTWF4aW11bVBvc2l0aW9uKCk7Ci0g ICAgbV9jdW11bGF0aXZlSG9yaXpvbnRhbFNjcm9sbCA9IDA7Ci0gICAgbV9kaWRDdW11bGF0aXZl SG9yaXpvbnRhbFNjcm9sbEV2ZXJTd2l0Y2hUb09wcG9zaXRlRGlyZWN0aW9uT2ZQaW4gPSBmYWxz ZTsKICAgICAKICAgICBJbnRTaXplIHN0cmV0Y2hBbW91bnQgPSBtX2NsaWVudC0+c3RyZXRjaEFt b3VudCgpOwogICAgIG1fc3RyZXRjaFNjcm9sbEZvcmNlLnNldFdpZHRoKHJlYm91bmREZWx0YUZv ckVsYXN0aWNEZWx0YShzdHJldGNoQW1vdW50LndpZHRoKCkpKTsK