69379 2011-10-04 14:46:07 -0700 Move all rubber-banding related member variables to ScrollElasticityController 2011-10-04 14:57:16 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca webkit.review.bot oldest_to_newest 477975 0 andersca 2011-10-04 14:46:07 -0700 Move all rubber-banding related member variables to ScrollElasticityController 477979 1 109698 andersca 2011-10-04 14:46:53 -0700 Created attachment 109698 Patch 477983 2 andersca 2011-10-04 14:57:16 -0700 Committed r96651: <http://trac.webkit.org/changeset/96651> 109698 2011-10-04 14:46:53 -0700 2011-10-04 14:56:44 -0700 Patch bug-69379-20111004144652.patch text/plain 24060 andersca SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk2NjQ5KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMTAtMDQgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIGFsbCBydWJiZXIt YmFuZGluZyByZWxhdGVkIG1lbWJlciB2YXJpYWJsZXMgdG8gU2Nyb2xsRWxhc3RpY2l0eUNvbnRy b2xsZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5 Mzc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMv U2Nyb2xsQW5pbWF0b3JNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxBbmltYXRvck1h Yzo6U2Nyb2xsQW5pbWF0b3JNYWMpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3JN YWM6OmhhbmRsZVdoZWVsRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3JN YWM6OnNtb290aFNjcm9sbFdpdGhFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxBbmlt YXRvck1hYzo6YmVnaW5TY3JvbGxHZXN0dXJlKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFu aW1hdG9yTWFjOjpzbmFwUnViYmVyQmFuZCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxBbmlt YXRvck1hYzo6c25hcFJ1YmJlckJhbmRUaW1lckZpcmVkKToKKyAgICAgICAgKiBwbGF0Zm9ybS9t YWMvU2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMv U2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubW06CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxF bGFzdGljaXR5Q29udHJvbGxlcjo6U2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIpOgorCiAyMDEx LTEwLTA0ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAg QnVpbGQgZml4ZXMgZm9yIGV2ZXJ5b25lLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWFjL1Njcm9sbEFuaW1hdG9yTWFjLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLmgJKHJldmlzaW9uIDk2NjQ0KQorKysgU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLmgJKHdvcmtpbmcgY29weSkK QEAgLTE0OCwyMiArMTQ4LDkgQEAgcHJpdmF0ZToKICAgICB2b2lkIGVuZFNjcm9sbEdlc3R1cmUo KTsKIAogICAgIFNjcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyIG1fc2Nyb2xsRWxhc3RpY2l0eUNv bnRyb2xsZXI7Ci0KLSAgICBpbnQgbV9jdW11bGF0aXZlSG9yaXpvbnRhbFNjcm9sbDsKLSAgICBi b29sIG1fZGlkQ3VtdWxhdGl2ZUhvcml6b250YWxTY3JvbGxFdmVyU3dpdGNoVG9PcHBvc2l0ZURp cmVjdGlvbk9mUGluOwotICAgIAotICAgIENGVGltZUludGVydmFsIG1fbGFzdE1vbWVudHVtU2Ny b2xsVGltZXN0YW1wOwotICAgIEZsb2F0U2l6ZSBtX292ZXJmbG93U2Nyb2xsRGVsdGE7Ci0gICAg RmxvYXRTaXplIG1fc3RyZXRjaFNjcm9sbEZvcmNlOwotICAgIEZsb2F0U2l6ZSBtX21vbWVudHVt VmVsb2NpdHk7Ci0KLSAgICAvLyBSdWJiZXIgYmFuZCBzdGF0ZS4KLSAgICBDRlRpbWVJbnRlcnZh bCBtX3N0YXJ0VGltZTsKLSAgICBGbG9hdFNpemUgbV9zdGFydFN0cmV0Y2g7Ci0gICAgRmxvYXRQ b2ludCBtX29yaWdPcmlnaW47Ci0gICAgRmxvYXRTaXplIG1fb3JpZ1ZlbG9jaXR5OwogICAgIFRp bWVyPFNjcm9sbEFuaW1hdG9yTWFjPiBtX3NuYXBSdWJiZXJCYW5kVGltZXI7CiAjZW5kaWYKKwog ICAgIGJvb2wgbV9kcmF3aW5nSW50b0xheWVyOwogICAgIGJvb2wgbV9oYXZlU2Nyb2xsZWRTaW5j ZVBhZ2VMb2FkOwogICAgIGJvb2wgbV9uZWVkc1Njcm9sbGVyU3R5bGVVcGRhdGU7CkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMubW0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1tCShy ZXZpc2lvbiA5NjY0NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmlt YXRvck1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtNDU5LDggKzQ1OSw2IEBAIFNjcm9sbEFuaW1h dG9yTWFjOjpTY3JvbGxBbmltYXRvck1hYyhTY3IKICNlbmRpZgogI2lmIEVOQUJMRShSVUJCRVJf QkFORElORykKICAgICAsIG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIodGhpcykKLSAgICAs IG1fbGFzdE1vbWVudHVtU2Nyb2xsVGltZXN0YW1wKDApCi0gICAgLCBtX3N0YXJ0VGltZSgwKQog ICAgICwgbV9zbmFwUnViYmVyQmFuZFRpbWVyKHRoaXMsICZTY3JvbGxBbmltYXRvck1hYzo6c25h cFJ1YmJlckJhbmRUaW1lckZpcmVkKQogI2VuZGlmCiAgICAgLCBtX2RyYXdpbmdJbnRvTGF5ZXIo ZmFsc2UpCkBAIC03OTQsOSArNzkyLDggQEAgYm9vbCBTY3JvbGxBbmltYXRvck1hYzo6aGFuZGxl V2hlZWxFdmVudAogewogICAgIG1faGF2ZVNjcm9sbGVkU2luY2VQYWdlTG9hZCA9IHRydWU7CiAK LSAgICBpZiAoIXdoZWVsRXZlbnQuaGFzUHJlY2lzZVNjcm9sbGluZ0RlbHRhcygpKSB7CisgICAg aWYgKCF3aGVlbEV2ZW50Lmhhc1ByZWNpc2VTY3JvbGxpbmdEZWx0YXMoKSkKICAgICAgICAgcmV0 dXJuIFNjcm9sbEFuaW1hdG9yOjpoYW5kbGVXaGVlbEV2ZW50KHdoZWVsRXZlbnQpOwotICAgIH0K IAogICAgIC8vIEZJWE1FOiBUaGlzIGlzIHNvbWV3aGF0IHJvdW5kYWJvdXQgaGFjayB0byBhbGxv dyBmb3J3YXJkaW5nIHdoZWVsIGV2ZW50cwogICAgIC8vIHVwIHRvIHRoZSBwYXJlbnQgc2Nyb2xs YWJsZSBhcmVhLiBJdCB0YWtlcyBhZHZhbnRhZ2Ugb2YgdGhlIGZhY3QgdGhhdApAQCAtODE1LDE4 ICs4MTIsMTggQEAgYm9vbCBTY3JvbGxBbmltYXRvck1hYzo6aGFuZGxlV2hlZWxFdmVudAogICAg ICAgICAgICAgLy8gaW4gdGhlIG9wcG9zaXRlIGRpcmVjdGlvbiBvZiB0aGUgcGluIGxvY2F0aW9u LCB0aGVuIHdlIHN3aXRjaCB0aGUKICAgICAgICAgICAgIC8vIGJvb2xlYW4sIGFuZCBydWJiZXIg YmFuZC4gVGhhdCBpcywgaWYgd2Ugd2VyZSBwaW5uZWQgdG8gdGhlIGxlZnQsCiAgICAgICAgICAg ICAvLyBhbmQgd2UgZW5kZWQgdXAgc2Nyb2xsaW5nIHRvIHRoZSByaWdodCwgd2UgcnViYmVyIGJh bmQuCi0gICAgICAgICAgICBtX2N1bXVsYXRpdmVIb3Jpem9udGFsU2Nyb2xsICs9IHdoZWVsRXZl bnQuZGVsdGFYKCk7Ci0gICAgICAgICAgICBpZiAobV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxl ci5tX3Njcm9sbGVySW5pdGlhbGx5UGlubmVkT25MZWZ0ICYmIG1fY3VtdWxhdGl2ZUhvcml6b250 YWxTY3JvbGwgPCAwKQotICAgICAgICAgICAgICAgIG1fZGlkQ3VtdWxhdGl2ZUhvcml6b250YWxT Y3JvbGxFdmVyU3dpdGNoVG9PcHBvc2l0ZURpcmVjdGlvbk9mUGluID0gdHJ1ZTsKLSAgICAgICAg ICAgIGlmIChtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fc2Nyb2xsZXJJbml0aWFsbHlQ aW5uZWRPblJpZ2h0ICYmIG1fY3VtdWxhdGl2ZUhvcml6b250YWxTY3JvbGwgPiAwKQotICAgICAg ICAgICAgICAgIG1fZGlkQ3VtdWxhdGl2ZUhvcml6b250YWxTY3JvbGxFdmVyU3dpdGNoVG9PcHBv c2l0ZURpcmVjdGlvbk9mUGluID0gdHJ1ZTsKKyAgICAgICAgICAgIG1fc2Nyb2xsRWxhc3RpY2l0 eUNvbnRyb2xsZXIubV9jdW11bGF0aXZlSG9yaXpvbnRhbFNjcm9sbCArPSB3aGVlbEV2ZW50LmRl bHRhWCgpOworICAgICAgICAgICAgaWYgKG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9z Y3JvbGxlckluaXRpYWxseVBpbm5lZE9uTGVmdCAmJiBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9s bGVyLm1fY3VtdWxhdGl2ZUhvcml6b250YWxTY3JvbGwgPCAwKQorICAgICAgICAgICAgICAgIG1f c2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9kaWRDdW11bGF0aXZlSG9yaXpvbnRhbFNjcm9s bEV2ZXJTd2l0Y2hUb09wcG9zaXRlRGlyZWN0aW9uT2ZQaW4gPSB0cnVlOworICAgICAgICAgICAg aWYgKG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9zY3JvbGxlckluaXRpYWxseVBpbm5l ZE9uUmlnaHQgJiYgbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tX2N1bXVsYXRpdmVIb3Jp em9udGFsU2Nyb2xsID4gMCkKKyAgICAgICAgICAgICAgICBtX3Njcm9sbEVsYXN0aWNpdHlDb250 cm9sbGVyLm1fZGlkQ3VtdWxhdGl2ZUhvcml6b250YWxTY3JvbGxFdmVyU3dpdGNoVG9PcHBvc2l0 ZURpcmVjdGlvbk9mUGluID0gdHJ1ZTsKICAgICAgICAgfQogCiAgICAgICAgIC8vIEFmdGVyIGEg Z2VzdHVyZSBiZWdpbnMsIHdlIGdvIHRocm91Z2g6CiAgICAgICAgIC8vIDErIFBsYXRmb3JtV2hl ZWxFdmVudFBoYXNlTm9uZQogICAgICAgICAvLyAwKyBQbGF0Zm9ybVdoZWVsRXZlbnRQaGFzZUNo YW5nZWQKICAgICAgICAgLy8gMSBQbGF0Zm9ybVdoZWVsRXZlbnRQaGFzZUVuZGVkIGlmIHRoZXJl IHdhcyBhdCBsZWFzdCBvbmUgY2hhbmdlZCBldmVudAotICAgICAgICBpZiAod2hlZWxFdmVudC5t b21lbnR1bVBoYXNlKCkgPT0gUGxhdGZvcm1XaGVlbEV2ZW50UGhhc2VOb25lICYmICFtX2RpZEN1 bXVsYXRpdmVIb3Jpem9udGFsU2Nyb2xsRXZlclN3aXRjaFRvT3Bwb3NpdGVEaXJlY3Rpb25PZlBp bikgeworICAgICAgICBpZiAod2hlZWxFdmVudC5tb21lbnR1bVBoYXNlKCkgPT0gUGxhdGZvcm1X aGVlbEV2ZW50UGhhc2VOb25lICYmICFtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fZGlk Q3VtdWxhdGl2ZUhvcml6b250YWxTY3JvbGxFdmVyU3dpdGNoVG9PcHBvc2l0ZURpcmVjdGlvbk9m UGluKSB7CiAgICAgICAgICAgICBpZiAoKGlzU2Nyb2xsaW5nTGVmdEFuZFNob3VsZE5vdFJ1YmJl ckJhbmQod2hlZWxFdmVudCwgbV9zY3JvbGxhYmxlQXJlYSkgJiYKICAgICAgICAgICAgICAgICBt X3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fc2Nyb2xsZXJJbml0aWFsbHlQaW5uZWRPbkxl ZnQgJiYKICAgICAgICAgICAgICAgICBtX3Njcm9sbGFibGVBcmVhLT5pc0hvcml6b250YWxTY3Jv bGxlclBpbm5lZFRvTWluaW11bVBvc2l0aW9uKCkpIHx8CkBAIC05MjUsMTEgKzkyMiwxMSBAQCB2 b2lkIFNjcm9sbEFuaW1hdG9yTWFjOjpzbW9vdGhTY3JvbGxXaXRoCiB7CiAgICAgbV9oYXZlU2Ny b2xsZWRTaW5jZVBhZ2VMb2FkID0gdHJ1ZTsKIAotICAgIGZsb2F0IGRlbHRhWCA9IG1fb3ZlcmZs b3dTY3JvbGxEZWx0YS53aWR0aCgpOwotICAgIGZsb2F0IGRlbHRhWSA9IG1fb3ZlcmZsb3dTY3Jv bGxEZWx0YS5oZWlnaHQoKTsKKyAgICBmbG9hdCBkZWx0YVggPSBtX3Njcm9sbEVsYXN0aWNpdHlD b250cm9sbGVyLm1fb3ZlcmZsb3dTY3JvbGxEZWx0YS53aWR0aCgpOworICAgIGZsb2F0IGRlbHRh WSA9IG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9vdmVyZmxvd1Njcm9sbERlbHRhLmhl aWdodCgpOwogCiAgICAgLy8gUmVzZXQgb3ZlcmZsb3cgdmFsdWVzIGJlY2F1c2Ugd2UgbWF5IGRl Y2lkZSB0byByZW1vdmUgZGVsdGEgYXQgdmFyaW91cyBwb2ludHMgYW5kIHB1dCBpdCBpbnRvIG92 ZXJmbG93LgotICAgIG1fb3ZlcmZsb3dTY3JvbGxEZWx0YSA9IEZsb2F0U2l6ZSgpOworICAgIG1f c2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9vdmVyZmxvd1Njcm9sbERlbHRhID0gRmxvYXRT aXplKCk7CiAKICAgICBmbG9hdCBldmVudENvYWxlc2NlZERlbHRhWCA9IC13aGVlbEV2ZW50LmRl bHRhWCgpOwogICAgIGZsb2F0IGV2ZW50Q29hbGVzY2VkRGVsdGFZID0gLXdoZWVsRXZlbnQuZGVs dGFZKCk7CkBAIC05NTgsMTUgKzk1NSwxNSBAQCB2b2lkIFNjcm9sbEFuaW1hdG9yTWFjOjpzbW9v dGhTY3JvbGxXaXRoCiAgICAgaWYgKCFtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fbW9t ZW50dW1TY3JvbGxJblByb2dyZXNzICYmIChwaGFzZSA9PSBQbGF0Zm9ybVdoZWVsRXZlbnRQaGFz ZUJlZ2FuIHx8IHBoYXNlID09IFBsYXRmb3JtV2hlZWxFdmVudFBoYXNlQ2hhbmdlZCkpCiAgICAg ICAgIG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9tb21lbnR1bVNjcm9sbEluUHJvZ3Jl c3MgPSB0cnVlOwogCi0gICAgQ0ZUaW1lSW50ZXJ2YWwgdGltZURlbHRhID0gd2hlZWxFdmVudC50 aW1lc3RhbXAoKSAtIG1fbGFzdE1vbWVudHVtU2Nyb2xsVGltZXN0YW1wOworICAgIENGVGltZUlu dGVydmFsIHRpbWVEZWx0YSA9IHdoZWVsRXZlbnQudGltZXN0YW1wKCkgLSBtX3Njcm9sbEVsYXN0 aWNpdHlDb250cm9sbGVyLm1fbGFzdE1vbWVudHVtU2Nyb2xsVGltZXN0YW1wOwogICAgIGlmICht X3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1faW5TY3JvbGxHZXN0dXJlIHx8IG1fc2Nyb2xs RWxhc3RpY2l0eUNvbnRyb2xsZXIubV9tb21lbnR1bVNjcm9sbEluUHJvZ3Jlc3MpIHsKLSAgICAg ICAgaWYgKG1fbGFzdE1vbWVudHVtU2Nyb2xsVGltZXN0YW1wICYmIHRpbWVEZWx0YSA+IDAgJiYg dGltZURlbHRhIDwgc2Nyb2xsVmVsb2NpdHlaZXJvaW5nVGltZW91dCkgewotICAgICAgICAgICAg bV9tb21lbnR1bVZlbG9jaXR5LnNldFdpZHRoKGV2ZW50Q29hbGVzY2VkRGVsdGFYIC8gKGZsb2F0 KXRpbWVEZWx0YSk7Ci0gICAgICAgICAgICBtX21vbWVudHVtVmVsb2NpdHkuc2V0SGVpZ2h0KGV2 ZW50Q29hbGVzY2VkRGVsdGFZIC8gKGZsb2F0KXRpbWVEZWx0YSk7Ci0gICAgICAgICAgICBtX2xh c3RNb21lbnR1bVNjcm9sbFRpbWVzdGFtcCA9IHdoZWVsRXZlbnQudGltZXN0YW1wKCk7CisgICAg ICAgIGlmIChtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fbGFzdE1vbWVudHVtU2Nyb2xs VGltZXN0YW1wICYmIHRpbWVEZWx0YSA+IDAgJiYgdGltZURlbHRhIDwgc2Nyb2xsVmVsb2NpdHla ZXJvaW5nVGltZW91dCkgeworICAgICAgICAgICAgbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxl ci5tX21vbWVudHVtVmVsb2NpdHkuc2V0V2lkdGgoZXZlbnRDb2FsZXNjZWREZWx0YVggLyAoZmxv YXQpdGltZURlbHRhKTsKKyAgICAgICAgICAgIG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIu bV9tb21lbnR1bVZlbG9jaXR5LnNldEhlaWdodChldmVudENvYWxlc2NlZERlbHRhWSAvIChmbG9h dCl0aW1lRGVsdGEpOworICAgICAgICAgICAgbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5t X2xhc3RNb21lbnR1bVNjcm9sbFRpbWVzdGFtcCA9IHdoZWVsRXZlbnQudGltZXN0YW1wKCk7CiAg ICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBtX2xhc3RNb21lbnR1bVNjcm9sbFRpbWVzdGFt cCA9IHdoZWVsRXZlbnQudGltZXN0YW1wKCk7Ci0gICAgICAgICAgICBtX21vbWVudHVtVmVsb2Np dHkgPSBGbG9hdFNpemUoKTsKKyAgICAgICAgICAgIG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xs ZXIubV9sYXN0TW9tZW50dW1TY3JvbGxUaW1lc3RhbXAgPSB3aGVlbEV2ZW50LnRpbWVzdGFtcCgp OworICAgICAgICAgICAgbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tX21vbWVudHVtVmVs b2NpdHkgPSBGbG9hdFNpemUoKTsKICAgICAgICAgfQogCiAgICAgICAgIGlmIChpc1ZlcnRpY2Fs bHlTdHJldGNoZWQpIHsKQEAgLTk3NSwxMCArOTcyLDEwIEBAIHZvaWQgU2Nyb2xsQW5pbWF0b3JN YWM6OnNtb290aFNjcm9sbFdpdGgKICAgICAgICAgICAgICAgICBpZiAoZGVsdGFZICE9IDAgJiYg KGZhYnNmKGRlbHRhWCAvIGRlbHRhWSkgPCBydWJiZXJiYW5kRGlyZWN0aW9uTG9ja1N0cmV0Y2hS YXRpbykpCiAgICAgICAgICAgICAgICAgICAgIGRlbHRhWCA9IDA7CiAgICAgICAgICAgICAgICAg ZWxzZSBpZiAoZmFic2YoZGVsdGFYKSA8IHJ1YmJlcmJhbmRNaW5pbXVtUmVxdWlyZWREZWx0YUJl Zm9yZVN0cmV0Y2gpIHsKLSAgICAgICAgICAgICAgICAgICAgbV9vdmVyZmxvd1Njcm9sbERlbHRh LnNldFdpZHRoKG1fb3ZlcmZsb3dTY3JvbGxEZWx0YS53aWR0aCgpICsgZGVsdGFYKTsKKyAgICAg ICAgICAgICAgICAgICAgbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tX292ZXJmbG93U2Ny b2xsRGVsdGEuc2V0V2lkdGgobV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tX292ZXJmbG93 U2Nyb2xsRGVsdGEud2lkdGgoKSArIGRlbHRhWCk7CiAgICAgICAgICAgICAgICAgICAgIGRlbHRh WCA9IDA7CiAgICAgICAgICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICAgICAgICAgIG1fb3Zl cmZsb3dTY3JvbGxEZWx0YS5zZXRXaWR0aChtX292ZXJmbG93U2Nyb2xsRGVsdGEud2lkdGgoKSAr IGRlbHRhWCk7CisgICAgICAgICAgICAgICAgICAgIG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xs ZXIubV9vdmVyZmxvd1Njcm9sbERlbHRhLnNldFdpZHRoKG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRy b2xsZXIubV9vdmVyZmxvd1Njcm9sbERlbHRhLndpZHRoKCkgKyBkZWx0YVgpOwogICAgICAgICAg ICAgfQogICAgICAgICB9IGVsc2UgaWYgKGlzSG9yaXpvbnRhbGx5U3RyZXRjaGVkKSB7CiAgICAg ICAgICAgICAvLyBTdHJldGNoaW5nIG9ubHkgaW4gdGhlIGhvcml6b250YWwuCkBAIC05ODYsMjAg Kzk4MywyMCBAQCB2b2lkIFNjcm9sbEFuaW1hdG9yTWFjOjpzbW9vdGhTY3JvbGxXaXRoCiAgICAg ICAgICAgICAgICAgaWYgKGRlbHRhWCAhPSAwICYmIChmYWJzZihkZWx0YVkgLyBkZWx0YVgpIDwg cnViYmVyYmFuZERpcmVjdGlvbkxvY2tTdHJldGNoUmF0aW8pKQogICAgICAgICAgICAgICAgICAg ICBkZWx0YVkgPSAwOwogICAgICAgICAgICAgICAgIGVsc2UgaWYgKGZhYnNmKGRlbHRhWSkgPCBy dWJiZXJiYW5kTWluaW11bVJlcXVpcmVkRGVsdGFCZWZvcmVTdHJldGNoKSB7Ci0gICAgICAgICAg ICAgICAgICAgIG1fb3ZlcmZsb3dTY3JvbGxEZWx0YS5zZXRIZWlnaHQobV9vdmVyZmxvd1Njcm9s bERlbHRhLmhlaWdodCgpICsgZGVsdGFZKTsKKyAgICAgICAgICAgICAgICAgICAgbV9zY3JvbGxF bGFzdGljaXR5Q29udHJvbGxlci5tX292ZXJmbG93U2Nyb2xsRGVsdGEuc2V0SGVpZ2h0KG1fc2Ny b2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9vdmVyZmxvd1Njcm9sbERlbHRhLmhlaWdodCgpICsg ZGVsdGFZKTsKICAgICAgICAgICAgICAgICAgICAgZGVsdGFZID0gMDsKICAgICAgICAgICAgICAg ICB9IGVsc2UKLSAgICAgICAgICAgICAgICAgICAgbV9vdmVyZmxvd1Njcm9sbERlbHRhLnNldEhl aWdodChtX292ZXJmbG93U2Nyb2xsRGVsdGEuaGVpZ2h0KCkgKyBkZWx0YVkpOworICAgICAgICAg ICAgICAgICAgICBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fb3ZlcmZsb3dTY3JvbGxE ZWx0YS5zZXRIZWlnaHQobV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tX292ZXJmbG93U2Ny b2xsRGVsdGEuaGVpZ2h0KCkgKyBkZWx0YVkpOwogICAgICAgICAgICAgfQogICAgICAgICB9IGVs c2UgewogICAgICAgICAgICAgLy8gTm90IHN0cmV0Y2hpbmcgYXQgYWxsIHlldC4KICAgICAgICAg ICAgIGlmIChwaW5uZWRJbkRpcmVjdGlvbihkZWx0YVgsIGRlbHRhWSkpIHsKICAgICAgICAgICAg ICAgICBpZiAoZmFic2YoZGVsdGFZKSA+PSBmYWJzZihkZWx0YVgpKSB7CiAgICAgICAgICAgICAg ICAgICAgIGlmIChmYWJzZihkZWx0YVgpIDwgcnViYmVyYmFuZE1pbmltdW1SZXF1aXJlZERlbHRh QmVmb3JlU3RyZXRjaCkgewotICAgICAgICAgICAgICAgICAgICAgICAgbV9vdmVyZmxvd1Njcm9s bERlbHRhLnNldFdpZHRoKG1fb3ZlcmZsb3dTY3JvbGxEZWx0YS53aWR0aCgpICsgZGVsdGFYKTsK KyAgICAgICAgICAgICAgICAgICAgICAgIG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9v dmVyZmxvd1Njcm9sbERlbHRhLnNldFdpZHRoKG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIu bV9vdmVyZmxvd1Njcm9sbERlbHRhLndpZHRoKCkgKyBkZWx0YVgpOwogICAgICAgICAgICAgICAg ICAgICAgICAgZGVsdGFYID0gMDsKICAgICAgICAgICAgICAgICAgICAgfSBlbHNlCi0gICAgICAg ICAgICAgICAgICAgICAgICBtX292ZXJmbG93U2Nyb2xsRGVsdGEuc2V0V2lkdGgobV9vdmVyZmxv d1Njcm9sbERlbHRhLndpZHRoKCkgKyBkZWx0YVgpOworICAgICAgICAgICAgICAgICAgICAgICAg bV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tX292ZXJmbG93U2Nyb2xsRGVsdGEuc2V0V2lk dGgobV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tX292ZXJmbG93U2Nyb2xsRGVsdGEud2lk dGgoKSArIGRlbHRhWCk7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIHNob3Vs ZFN0cmV0Y2ggPSB0cnVlOwogICAgICAgICAgICAgfQpAQCAtMTA0NiwxNyArMTA0MywxNyBAQCB2 b2lkIFNjcm9sbEFuaW1hdG9yTWFjOjpzbW9vdGhTY3JvbGxXaXRoCiAgICAgICAgICAgICBJbnRT aXplIHN0cmV0Y2hBbW91bnQgPSBtX3Njcm9sbGFibGVBcmVhLT5vdmVyaGFuZ0Ftb3VudCgpOwog ICAgICAgICAKICAgICAgICAgICAgIGlmIChtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1f bW9tZW50dW1TY3JvbGxJblByb2dyZXNzKSB7Ci0gICAgICAgICAgICAgICAgaWYgKChwaW5uZWRJ bkRpcmVjdGlvbihldmVudENvYWxlc2NlZERlbHRhWCwgZXZlbnRDb2FsZXNjZWREZWx0YVkpIHx8 IChmYWJzZihldmVudENvYWxlc2NlZERlbHRhWCkgKyBmYWJzZihldmVudENvYWxlc2NlZERlbHRh WSkgPD0gMCkpICYmIG1fbGFzdE1vbWVudHVtU2Nyb2xsVGltZXN0YW1wKSB7CisgICAgICAgICAg ICAgICAgaWYgKChwaW5uZWRJbkRpcmVjdGlvbihldmVudENvYWxlc2NlZERlbHRhWCwgZXZlbnRD b2FsZXNjZWREZWx0YVkpIHx8IChmYWJzZihldmVudENvYWxlc2NlZERlbHRhWCkgKyBmYWJzZihl dmVudENvYWxlc2NlZERlbHRhWSkgPD0gMCkpICYmIG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xs ZXIubV9sYXN0TW9tZW50dW1TY3JvbGxUaW1lc3RhbXApIHsKICAgICAgICAgICAgICAgICAgICAg bV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tX2lnbm9yZU1vbWVudHVtU2Nyb2xscyA9IHRy dWU7CiAgICAgICAgICAgICAgICAgICAgIG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9t b21lbnR1bVNjcm9sbEluUHJvZ3Jlc3MgPSBmYWxzZTsKICAgICAgICAgICAgICAgICAgICAgc25h cFJ1YmJlckJhbmQoKTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAKLSAgICAg ICAgICAgIG1fc3RyZXRjaFNjcm9sbEZvcmNlLnNldFdpZHRoKG1fc3RyZXRjaFNjcm9sbEZvcmNl LndpZHRoKCkgKyBkZWx0YVgpOwotICAgICAgICAgICAgbV9zdHJldGNoU2Nyb2xsRm9yY2Uuc2V0 SGVpZ2h0KG1fc3RyZXRjaFNjcm9sbEZvcmNlLmhlaWdodCgpICsgZGVsdGFZKTsKKyAgICAgICAg ICAgIG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9zdHJldGNoU2Nyb2xsRm9yY2Uuc2V0 V2lkdGgobV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tX3N0cmV0Y2hTY3JvbGxGb3JjZS53 aWR0aCgpICsgZGVsdGFYKTsKKyAgICAgICAgICAgIG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xs ZXIubV9zdHJldGNoU2Nyb2xsRm9yY2Uuc2V0SGVpZ2h0KG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRy b2xsZXIubV9zdHJldGNoU2Nyb2xsRm9yY2UuaGVpZ2h0KCkgKyBkZWx0YVkpOwogCi0gICAgICAg ICAgICBGbG9hdFNpemUgZGFtcGVkRGVsdGEoY2VpbGYoZWxhc3RpY0RlbHRhRm9yUmVib3VuZERl bHRhKG1fc3RyZXRjaFNjcm9sbEZvcmNlLndpZHRoKCkpKSwgY2VpbGYoZWxhc3RpY0RlbHRhRm9y UmVib3VuZERlbHRhKG1fc3RyZXRjaFNjcm9sbEZvcmNlLmhlaWdodCgpKSkpOworICAgICAgICAg ICAgRmxvYXRTaXplIGRhbXBlZERlbHRhKGNlaWxmKGVsYXN0aWNEZWx0YUZvclJlYm91bmREZWx0 YShtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fc3RyZXRjaFNjcm9sbEZvcmNlLndpZHRo KCkpKSwgY2VpbGYoZWxhc3RpY0RlbHRhRm9yUmVib3VuZERlbHRhKG1fc2Nyb2xsRWxhc3RpY2l0 eUNvbnRyb2xsZXIubV9zdHJldGNoU2Nyb2xsRm9yY2UuaGVpZ2h0KCkpKSk7CiAgICAgICAgICAg ICBGbG9hdFBvaW50IG9yaWdPcmlnaW4gPSAobV9zY3JvbGxhYmxlQXJlYS0+dmlzaWJsZUNvbnRl bnRSZWN0KCkubG9jYXRpb24oKSArIG1fc2Nyb2xsYWJsZUFyZWEtPnNjcm9sbE9yaWdpbigpKSAt IHN0cmV0Y2hBbW91bnQ7CiAgICAgICAgICAgICBGbG9hdFBvaW50IG5ld09yaWdpbiA9IG9yaWdP cmlnaW4gKyBkYW1wZWREZWx0YTsKIApAQCAtMTA3MSw3ICsxMDY4LDcgQEAgdm9pZCBTY3JvbGxB bmltYXRvck1hYzo6c21vb3RoU2Nyb2xsV2l0aAogICAgIGlmIChtX3Njcm9sbEVsYXN0aWNpdHlD b250cm9sbGVyLm1fbW9tZW50dW1TY3JvbGxJblByb2dyZXNzICYmIHBoYXNlID09IFBsYXRmb3Jt V2hlZWxFdmVudFBoYXNlRW5kZWQpIHsKICAgICAgICAgbV9zY3JvbGxFbGFzdGljaXR5Q29udHJv bGxlci5tX21vbWVudHVtU2Nyb2xsSW5Qcm9ncmVzcyA9IGZhbHNlOwogICAgICAgICBtX3Njcm9s bEVsYXN0aWNpdHlDb250cm9sbGVyLm1faWdub3JlTW9tZW50dW1TY3JvbGxzID0gZmFsc2U7Ci0g ICAgICAgIG1fbGFzdE1vbWVudHVtU2Nyb2xsVGltZXN0YW1wID0gMDsKKyAgICAgICAgbV9zY3Jv bGxFbGFzdGljaXR5Q29udHJvbGxlci5tX2xhc3RNb21lbnR1bVNjcm9sbFRpbWVzdGFtcCA9IDA7 CiAgICAgfQogfQogCkBAIC0xMDgzLDE4ICsxMDgwLDE4IEBAIHZvaWQgU2Nyb2xsQW5pbWF0b3JN YWM6OmJlZ2luU2Nyb2xsR2VzdHUKICAgICBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1f aW5TY3JvbGxHZXN0dXJlID0gdHJ1ZTsKICAgICBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVy Lm1fbW9tZW50dW1TY3JvbGxJblByb2dyZXNzID0gZmFsc2U7CiAgICAgbV9zY3JvbGxFbGFzdGlj aXR5Q29udHJvbGxlci5tX2lnbm9yZU1vbWVudHVtU2Nyb2xscyA9IGZhbHNlOwotICAgIG1fbGFz dE1vbWVudHVtU2Nyb2xsVGltZXN0YW1wID0gMDsKLSAgICBtX21vbWVudHVtVmVsb2NpdHkgPSBG bG9hdFNpemUoKTsKKyAgICBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fbGFzdE1vbWVu dHVtU2Nyb2xsVGltZXN0YW1wID0gMDsKKyAgICBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVy Lm1fbW9tZW50dW1WZWxvY2l0eSA9IEZsb2F0U2l6ZSgpOwogICAgIG1fc2Nyb2xsRWxhc3RpY2l0 eUNvbnRyb2xsZXIubV9zY3JvbGxlckluaXRpYWxseVBpbm5lZE9uTGVmdCA9IG1fc2Nyb2xsYWJs ZUFyZWEtPmlzSG9yaXpvbnRhbFNjcm9sbGVyUGlubmVkVG9NaW5pbXVtUG9zaXRpb24oKTsKICAg ICBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fc2Nyb2xsZXJJbml0aWFsbHlQaW5uZWRP blJpZ2h0ID0gbV9zY3JvbGxhYmxlQXJlYS0+aXNIb3Jpem9udGFsU2Nyb2xsZXJQaW5uZWRUb01h eGltdW1Qb3NpdGlvbigpOwotICAgIG1fY3VtdWxhdGl2ZUhvcml6b250YWxTY3JvbGwgPSAwOwot ICAgIG1fZGlkQ3VtdWxhdGl2ZUhvcml6b250YWxTY3JvbGxFdmVyU3dpdGNoVG9PcHBvc2l0ZURp cmVjdGlvbk9mUGluID0gZmFsc2U7CisgICAgbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5t X2N1bXVsYXRpdmVIb3Jpem9udGFsU2Nyb2xsID0gMDsKKyAgICBtX3Njcm9sbEVsYXN0aWNpdHlD b250cm9sbGVyLm1fZGlkQ3VtdWxhdGl2ZUhvcml6b250YWxTY3JvbGxFdmVyU3dpdGNoVG9PcHBv c2l0ZURpcmVjdGlvbk9mUGluID0gZmFsc2U7CiAgICAgCiAgICAgSW50U2l6ZSBzdHJldGNoQW1v dW50ID0gbV9zY3JvbGxhYmxlQXJlYS0+b3ZlcmhhbmdBbW91bnQoKTsKLSAgICBtX3N0cmV0Y2hT Y3JvbGxGb3JjZS5zZXRXaWR0aChyZWJvdW5kRGVsdGFGb3JFbGFzdGljRGVsdGEoc3RyZXRjaEFt b3VudC53aWR0aCgpKSk7Ci0gICAgbV9zdHJldGNoU2Nyb2xsRm9yY2Uuc2V0SGVpZ2h0KHJlYm91 bmREZWx0YUZvckVsYXN0aWNEZWx0YShzdHJldGNoQW1vdW50LmhlaWdodCgpKSk7CisgICAgbV9z Y3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tX3N0cmV0Y2hTY3JvbGxGb3JjZS5zZXRXaWR0aChy ZWJvdW5kRGVsdGFGb3JFbGFzdGljRGVsdGEoc3RyZXRjaEFtb3VudC53aWR0aCgpKSk7CisgICAg bV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tX3N0cmV0Y2hTY3JvbGxGb3JjZS5zZXRIZWln aHQocmVib3VuZERlbHRhRm9yRWxhc3RpY0RlbHRhKHN0cmV0Y2hBbW91bnQuaGVpZ2h0KCkpKTsK IAotICAgIG1fb3ZlcmZsb3dTY3JvbGxEZWx0YSA9IEZsb2F0U2l6ZSgpOworICAgIG1fc2Nyb2xs RWxhc3RpY2l0eUNvbnRyb2xsZXIubV9vdmVyZmxvd1Njcm9sbERlbHRhID0gRmxvYXRTaXplKCk7 CiAgICAgCiAgICAgaWYgKG1fc25hcFJ1YmJlckJhbmRUaW1lci5pc0FjdGl2ZSgpKQogICAgICAg ICBtX3NuYXBSdWJiZXJCYW5kVGltZXIuc3RvcCgpOwpAQCAtMTEwOSwxOSArMTEwNiwxOSBAQCB2 b2lkIFNjcm9sbEFuaW1hdG9yTWFjOjplbmRTY3JvbGxHZXN0dXJlCiAKIHZvaWQgU2Nyb2xsQW5p bWF0b3JNYWM6OnNuYXBSdWJiZXJCYW5kKCkKIHsKLSAgICBDRlRpbWVJbnRlcnZhbCB0aW1lRGVs dGEgPSBbW05TUHJvY2Vzc0luZm8gcHJvY2Vzc0luZm9dIHN5c3RlbVVwdGltZV0gLSBtX2xhc3RN b21lbnR1bVNjcm9sbFRpbWVzdGFtcDsKLSAgICBpZiAobV9sYXN0TW9tZW50dW1TY3JvbGxUaW1l c3RhbXAgJiYgdGltZURlbHRhID49IHNjcm9sbFZlbG9jaXR5WmVyb2luZ1RpbWVvdXQpCi0gICAg ICAgIG1fbW9tZW50dW1WZWxvY2l0eSA9IEZsb2F0U2l6ZSgpOworICAgIENGVGltZUludGVydmFs IHRpbWVEZWx0YSA9IFtbTlNQcm9jZXNzSW5mbyBwcm9jZXNzSW5mb10gc3lzdGVtVXB0aW1lXSAt IG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9sYXN0TW9tZW50dW1TY3JvbGxUaW1lc3Rh bXA7CisgICAgaWYgKG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9sYXN0TW9tZW50dW1T Y3JvbGxUaW1lc3RhbXAgJiYgdGltZURlbHRhID49IHNjcm9sbFZlbG9jaXR5WmVyb2luZ1RpbWVv dXQpCisgICAgICAgIG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9tb21lbnR1bVZlbG9j aXR5ID0gRmxvYXRTaXplKCk7CiAKICAgICBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1f aW5TY3JvbGxHZXN0dXJlID0gZmFsc2U7CiAKICAgICBpZiAobV9zbmFwUnViYmVyQmFuZFRpbWVy LmlzQWN0aXZlKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIG1fc3RhcnRUaW1lID0gW05TRGF0 ZSB0aW1lSW50ZXJ2YWxTaW5jZVJlZmVyZW5jZURhdGVdOwotICAgIG1fc3RhcnRTdHJldGNoID0g RmxvYXRTaXplKCk7Ci0gICAgbV9vcmlnT3JpZ2luID0gRmxvYXRQb2ludCgpOwotICAgIG1fb3Jp Z1ZlbG9jaXR5ID0gRmxvYXRTaXplKCk7CisgICAgbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxl ci5tX3N0YXJ0VGltZSA9IFtOU0RhdGUgdGltZUludGVydmFsU2luY2VSZWZlcmVuY2VEYXRlXTsK KyAgICBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fc3RhcnRTdHJldGNoID0gRmxvYXRT aXplKCk7CisgICAgbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tX29yaWdPcmlnaW4gPSBG bG9hdFBvaW50KCk7CisgICAgbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tX29yaWdWZWxv Y2l0eSA9IEZsb2F0U2l6ZSgpOwogCiAgICAgbV9zbmFwUnViYmVyQmFuZFRpbWVyLnN0YXJ0UmVw ZWF0aW5nKDEuMC82MC4wKTsKIH0KQEAgLTExNDMsNDYgKzExNDAsNDYgQEAgc3RhdGljIGlubGlu ZSBmbG9hdCByb3VuZFRvRGV2aWNlUGl4ZWxUbwogdm9pZCBTY3JvbGxBbmltYXRvck1hYzo6c25h cFJ1YmJlckJhbmRUaW1lckZpcmVkKFRpbWVyPFNjcm9sbEFuaW1hdG9yTWFjPiopCiB7CiAgICAg aWYgKCFtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fbW9tZW50dW1TY3JvbGxJblByb2dy ZXNzIHx8IG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9pZ25vcmVNb21lbnR1bVNjcm9s bHMpIHsKLSAgICAgICAgQ0ZUaW1lSW50ZXJ2YWwgdGltZURlbHRhID0gW05TRGF0ZSB0aW1lSW50 ZXJ2YWxTaW5jZVJlZmVyZW5jZURhdGVdIC0gbV9zdGFydFRpbWU7CisgICAgICAgIENGVGltZUlu dGVydmFsIHRpbWVEZWx0YSA9IFtOU0RhdGUgdGltZUludGVydmFsU2luY2VSZWZlcmVuY2VEYXRl XSAtIG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9zdGFydFRpbWU7CiAKLSAgICAgICAg aWYgKG1fc3RhcnRTdHJldGNoID09IEZsb2F0U2l6ZSgpKSB7Ci0gICAgICAgICAgICBtX3N0YXJ0 U3RyZXRjaCA9IG1fc2Nyb2xsYWJsZUFyZWEtPm92ZXJoYW5nQW1vdW50KCk7Ci0gICAgICAgICAg ICBpZiAobV9zdGFydFN0cmV0Y2ggPT0gRmxvYXRTaXplKCkpIHsgICAgCisgICAgICAgIGlmICht X3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fc3RhcnRTdHJldGNoID09IEZsb2F0U2l6ZSgp KSB7CisgICAgICAgICAgICBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fc3RhcnRTdHJl dGNoID0gbV9zY3JvbGxhYmxlQXJlYS0+b3ZlcmhhbmdBbW91bnQoKTsKKyAgICAgICAgICAgIGlm IChtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fc3RhcnRTdHJldGNoID09IEZsb2F0U2l6 ZSgpKSB7ICAgIAogICAgICAgICAgICAgICAgIG1fc25hcFJ1YmJlckJhbmRUaW1lci5zdG9wKCk7 Ci0gICAgICAgICAgICAgICAgbV9zdHJldGNoU2Nyb2xsRm9yY2UgPSBGbG9hdFNpemUoKTsKLSAg ICAgICAgICAgICAgICBtX3N0YXJ0VGltZSA9IDA7Ci0gICAgICAgICAgICAgICAgbV9zdGFydFN0 cmV0Y2ggPSBGbG9hdFNpemUoKTsKLSAgICAgICAgICAgICAgICBtX29yaWdPcmlnaW4gPSBGbG9h dFBvaW50KCk7Ci0gICAgICAgICAgICAgICAgbV9vcmlnVmVsb2NpdHkgPSBGbG9hdFNpemUoKTsK KyAgICAgICAgICAgICAgICBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fc3RyZXRjaFNj cm9sbEZvcmNlID0gRmxvYXRTaXplKCk7CisgICAgICAgICAgICAgICAgbV9zY3JvbGxFbGFzdGlj aXR5Q29udHJvbGxlci5tX3N0YXJ0VGltZSA9IDA7CisgICAgICAgICAgICAgICAgbV9zY3JvbGxF bGFzdGljaXR5Q29udHJvbGxlci5tX3N0YXJ0U3RyZXRjaCA9IEZsb2F0U2l6ZSgpOworICAgICAg ICAgICAgICAgIG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9vcmlnT3JpZ2luID0gRmxv YXRQb2ludCgpOworICAgICAgICAgICAgICAgIG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIu bV9vcmlnVmVsb2NpdHkgPSBGbG9hdFNpemUoKTsKIAogICAgICAgICAgICAgICAgIHJldHVybjsK ICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgbV9zY3JvbGxhYmxlQXJlYS0+ZGlkU3RhcnRS dWJiZXJCYW5kKHJvdW5kZWRJbnRTaXplKG1fc3RhcnRTdHJldGNoKSk7CisgICAgICAgICAgICBt X3Njcm9sbGFibGVBcmVhLT5kaWRTdGFydFJ1YmJlckJhbmQocm91bmRlZEludFNpemUobV9zY3Jv bGxFbGFzdGljaXR5Q29udHJvbGxlci5tX3N0YXJ0U3RyZXRjaCkpOwogICAgICAgICAgICAgCi0g ICAgICAgICAgICBtX29yaWdPcmlnaW4gPSAobV9zY3JvbGxhYmxlQXJlYS0+dmlzaWJsZUNvbnRl bnRSZWN0KCkubG9jYXRpb24oKSArIG1fc2Nyb2xsYWJsZUFyZWEtPnNjcm9sbE9yaWdpbigpKSAt IG1fc3RhcnRTdHJldGNoOwotICAgICAgICAgICAgbV9vcmlnVmVsb2NpdHkgPSBtX21vbWVudHVt VmVsb2NpdHk7CisgICAgICAgICAgICBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fb3Jp Z09yaWdpbiA9IChtX3Njcm9sbGFibGVBcmVhLT52aXNpYmxlQ29udGVudFJlY3QoKS5sb2NhdGlv bigpICsgbV9zY3JvbGxhYmxlQXJlYS0+c2Nyb2xsT3JpZ2luKCkpIC0gbV9zY3JvbGxFbGFzdGlj aXR5Q29udHJvbGxlci5tX3N0YXJ0U3RyZXRjaDsKKyAgICAgICAgICAgIG1fc2Nyb2xsRWxhc3Rp Y2l0eUNvbnRyb2xsZXIubV9vcmlnVmVsb2NpdHkgPSBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9s bGVyLm1fbW9tZW50dW1WZWxvY2l0eTsKIAogICAgICAgICAgICAgLy8gSnVzdCBsaWtlIG5vcm1h bCBzY3JvbGxpbmcsIHByZWZlciB2ZXJ0aWNhbCBydWJiZXJiYW5kaW5nCi0gICAgICAgICAgICBp ZiAoZmFic2YobV9vcmlnVmVsb2NpdHkuaGVpZ2h0KCkpID49IGZhYnNmKG1fb3JpZ1ZlbG9jaXR5 LndpZHRoKCkpKQotICAgICAgICAgICAgICAgIG1fb3JpZ1ZlbG9jaXR5LnNldFdpZHRoKDApOwor ICAgICAgICAgICAgaWYgKGZhYnNmKG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9vcmln VmVsb2NpdHkuaGVpZ2h0KCkpID49IGZhYnNmKG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIu bV9vcmlnVmVsb2NpdHkud2lkdGgoKSkpCisgICAgICAgICAgICAgICAgbV9zY3JvbGxFbGFzdGlj aXR5Q29udHJvbGxlci5tX29yaWdWZWxvY2l0eS5zZXRXaWR0aCgwKTsKICAgICAgICAgICAgIAog ICAgICAgICAgICAgLy8gRG9uJ3QgcnViYmVyLWJhbmQgaG9yaXpvbnRhbGx5IGlmIGl0J3Mgbm90 IHBvc3NpYmxlIHRvIHNjcm9sbCBob3Jpem9udGFsbHkKICAgICAgICAgICAgIFNjcm9sbGJhciog aFNjcm9sbGVyID0gbV9zY3JvbGxhYmxlQXJlYS0+aG9yaXpvbnRhbFNjcm9sbGJhcigpOwogICAg ICAgICAgICAgaWYgKCFoU2Nyb2xsZXIgfHwgIWhTY3JvbGxlci0+ZW5hYmxlZCgpKQotICAgICAg ICAgICAgICAgIG1fb3JpZ1ZlbG9jaXR5LnNldFdpZHRoKDApOworICAgICAgICAgICAgICAgIG1f c2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9vcmlnVmVsb2NpdHkuc2V0V2lkdGgoMCk7CiAg ICAgICAgICAgICAKICAgICAgICAgICAgIC8vIERvbid0IHJ1YmJlci1iYW5kIHZlcnRpY2FsbHkg aWYgaXQncyBub3QgcG9zc2libGUgdG8gc2Nyb2xsIGhvcml6b250YWxseQogICAgICAgICAgICAg U2Nyb2xsYmFyKiB2U2Nyb2xsZXIgPSBtX3Njcm9sbGFibGVBcmVhLT52ZXJ0aWNhbFNjcm9sbGJh cigpOwogICAgICAgICAgICAgaWYgKCF2U2Nyb2xsZXIgfHwgIXZTY3JvbGxlci0+ZW5hYmxlZCgp KQotICAgICAgICAgICAgICAgIG1fb3JpZ1ZlbG9jaXR5LnNldEhlaWdodCgwKTsKKyAgICAgICAg ICAgICAgICBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fb3JpZ1ZlbG9jaXR5LnNldEhl aWdodCgwKTsKICAgICAgICAgfQogCi0gICAgICAgIEZsb2F0UG9pbnQgZGVsdGEocm91bmRUb0Rl dmljZVBpeGVsVG93YXJkWmVybyhlbGFzdGljRGVsdGFGb3JUaW1lRGVsdGEobV9zdGFydFN0cmV0 Y2gud2lkdGgoKSwgLW1fb3JpZ1ZlbG9jaXR5LndpZHRoKCksIChmbG9hdCl0aW1lRGVsdGEpKSwK LSAgICAgICAgICAgICAgICAgICAgICAgICByb3VuZFRvRGV2aWNlUGl4ZWxUb3dhcmRaZXJvKGVs YXN0aWNEZWx0YUZvclRpbWVEZWx0YShtX3N0YXJ0U3RyZXRjaC5oZWlnaHQoKSwgLW1fb3JpZ1Zl bG9jaXR5LmhlaWdodCgpLCAoZmxvYXQpdGltZURlbHRhKSkpOworICAgICAgICBGbG9hdFBvaW50 IGRlbHRhKHJvdW5kVG9EZXZpY2VQaXhlbFRvd2FyZFplcm8oZWxhc3RpY0RlbHRhRm9yVGltZURl bHRhKG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9zdGFydFN0cmV0Y2gud2lkdGgoKSwg LW1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9vcmlnVmVsb2NpdHkud2lkdGgoKSwgKGZs b2F0KXRpbWVEZWx0YSkpLAorICAgICAgICAgICAgICAgICAgICAgICAgIHJvdW5kVG9EZXZpY2VQ aXhlbFRvd2FyZFplcm8oZWxhc3RpY0RlbHRhRm9yVGltZURlbHRhKG1fc2Nyb2xsRWxhc3RpY2l0 eUNvbnRyb2xsZXIubV9zdGFydFN0cmV0Y2guaGVpZ2h0KCksIC1tX3Njcm9sbEVsYXN0aWNpdHlD b250cm9sbGVyLm1fb3JpZ1ZlbG9jaXR5LmhlaWdodCgpLCAoZmxvYXQpdGltZURlbHRhKSkpOwog CiAgICAgICAgIGlmIChmYWJzKGRlbHRhLngoKSkgPj0gMSB8fCBmYWJzKGRlbHRhLnkoKSkgPj0g MSkgewotICAgICAgICAgICAgRmxvYXRQb2ludCBuZXdPcmlnaW4gPSBtX29yaWdPcmlnaW4gKyBk ZWx0YTsKKyAgICAgICAgICAgIEZsb2F0UG9pbnQgbmV3T3JpZ2luID0gbV9zY3JvbGxFbGFzdGlj aXR5Q29udHJvbGxlci5tX29yaWdPcmlnaW4gKyBkZWx0YTsKIAogICAgICAgICAgICAgbV9zY3Jv bGxhYmxlQXJlYS0+c2V0Q29uc3RyYWluc1Njcm9sbGluZ1RvQ29udGVudEVkZ2UoZmFsc2UpOwog ICAgICAgICAgICAgaW1tZWRpYXRlU2Nyb2xsVG9Qb2ludChuZXdPcmlnaW4pOwpAQCAtMTE5MCwy NCArMTE4NywyNCBAQCB2b2lkIFNjcm9sbEFuaW1hdG9yTWFjOjpzbmFwUnViYmVyQmFuZFRpCiAK ICAgICAgICAgICAgIEZsb2F0U2l6ZSBuZXdTdHJldGNoID0gbV9zY3JvbGxhYmxlQXJlYS0+b3Zl cmhhbmdBbW91bnQoKTsKICAgICAgICAgICAgIAotICAgICAgICAgICAgbV9zdHJldGNoU2Nyb2xs Rm9yY2Uuc2V0V2lkdGgocmVib3VuZERlbHRhRm9yRWxhc3RpY0RlbHRhKG5ld1N0cmV0Y2gud2lk dGgoKSkpOwotICAgICAgICAgICAgbV9zdHJldGNoU2Nyb2xsRm9yY2Uuc2V0SGVpZ2h0KHJlYm91 bmREZWx0YUZvckVsYXN0aWNEZWx0YShuZXdTdHJldGNoLmhlaWdodCgpKSk7CisgICAgICAgICAg ICBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fc3RyZXRjaFNjcm9sbEZvcmNlLnNldFdp ZHRoKHJlYm91bmREZWx0YUZvckVsYXN0aWNEZWx0YShuZXdTdHJldGNoLndpZHRoKCkpKTsKKyAg ICAgICAgICAgIG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9zdHJldGNoU2Nyb2xsRm9y Y2Uuc2V0SGVpZ2h0KHJlYm91bmREZWx0YUZvckVsYXN0aWNEZWx0YShuZXdTdHJldGNoLmhlaWdo dCgpKSk7CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBpbW1lZGlhdGVTY3JvbGxUb1Bv aW50KG1fb3JpZ09yaWdpbik7CisgICAgICAgICAgICBpbW1lZGlhdGVTY3JvbGxUb1BvaW50KG1f c2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9vcmlnT3JpZ2luKTsKIAotICAgICAgICAgICAg bV9zY3JvbGxhYmxlQXJlYS0+ZGlkQ29tcGxldGVSdWJiZXJCYW5kKHJvdW5kZWRJbnRTaXplKG1f c3RhcnRTdHJldGNoKSk7CisgICAgICAgICAgICBtX3Njcm9sbGFibGVBcmVhLT5kaWRDb21wbGV0 ZVJ1YmJlckJhbmQocm91bmRlZEludFNpemUobV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5t X3N0YXJ0U3RyZXRjaCkpOwogCiAgICAgICAgICAgICBtX3NuYXBSdWJiZXJCYW5kVGltZXIuc3Rv cCgpOwotICAgICAgICAgICAgbV9zdHJldGNoU2Nyb2xsRm9yY2UgPSBGbG9hdFNpemUoKTsKKyAg ICAgICAgICAgIG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9zdHJldGNoU2Nyb2xsRm9y Y2UgPSBGbG9hdFNpemUoKTsKICAgICAgICAgICAgIAotICAgICAgICAgICAgbV9zdGFydFRpbWUg PSAwOwotICAgICAgICAgICAgbV9zdGFydFN0cmV0Y2ggPSBGbG9hdFNpemUoKTsKLSAgICAgICAg ICAgIG1fb3JpZ09yaWdpbiA9IEZsb2F0UG9pbnQoKTsKLSAgICAgICAgICAgIG1fb3JpZ1ZlbG9j aXR5ID0gRmxvYXRTaXplKCk7CisgICAgICAgICAgICBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9s bGVyLm1fc3RhcnRUaW1lID0gMDsKKyAgICAgICAgICAgIG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRy b2xsZXIubV9zdGFydFN0cmV0Y2ggPSBGbG9hdFNpemUoKTsKKyAgICAgICAgICAgIG1fc2Nyb2xs RWxhc3RpY2l0eUNvbnRyb2xsZXIubV9vcmlnT3JpZ2luID0gRmxvYXRQb2ludCgpOworICAgICAg ICAgICAgbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tX29yaWdWZWxvY2l0eSA9IEZsb2F0 U2l6ZSgpOwogICAgICAgICB9CiAgICAgfSBlbHNlIHsKLSAgICAgICAgbV9zdGFydFRpbWUgPSBb TlNEYXRlIHRpbWVJbnRlcnZhbFNpbmNlUmVmZXJlbmNlRGF0ZV07Ci0gICAgICAgIG1fc3RhcnRT dHJldGNoID0gRmxvYXRTaXplKCk7CisgICAgICAgIG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xs ZXIubV9zdGFydFRpbWUgPSBbTlNEYXRlIHRpbWVJbnRlcnZhbFNpbmNlUmVmZXJlbmNlRGF0ZV07 CisgICAgICAgIG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubV9zdGFydFN0cmV0Y2ggPSBG bG9hdFNpemUoKTsKICAgICB9CiB9CiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21hYy9TY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5oCShyZXZp c2lvbiA5NjY0NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxFbGFzdGlj aXR5Q29udHJvbGxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOCw2ICsyOCw4IEBACiAKICNpZiBF TkFCTEUoUlVCQkVSX0JBTkRJTkcpCiAKKyNpbmNsdWRlIDxXZWJDb3JlL0Zsb2F0UG9pbnQuaD4K KyNpbmNsdWRlIDxXZWJDb3JlL0Zsb2F0U2l6ZS5oPgogI2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJs ZS5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC01NCw3ICs1NiwyMCBAQCBwdWJsaWM6CiAg ICAgYm9vbCBtX2lnbm9yZU1vbWVudHVtU2Nyb2xsczsKICAgICBib29sIG1fc2Nyb2xsZXJJbml0 aWFsbHlQaW5uZWRPbkxlZnQ7CiAgICAgYm9vbCBtX3Njcm9sbGVySW5pdGlhbGx5UGlubmVkT25S aWdodDsKLQorICAgIAorICAgIGludCBtX2N1bXVsYXRpdmVIb3Jpem9udGFsU2Nyb2xsOworICAg IGJvb2wgbV9kaWRDdW11bGF0aXZlSG9yaXpvbnRhbFNjcm9sbEV2ZXJTd2l0Y2hUb09wcG9zaXRl RGlyZWN0aW9uT2ZQaW47CisKKyAgICBDRlRpbWVJbnRlcnZhbCBtX2xhc3RNb21lbnR1bVNjcm9s bFRpbWVzdGFtcDsKKyAgICBGbG9hdFNpemUgbV9vdmVyZmxvd1Njcm9sbERlbHRhOworICAgIEZs b2F0U2l6ZSBtX3N0cmV0Y2hTY3JvbGxGb3JjZTsKKyAgICBGbG9hdFNpemUgbV9tb21lbnR1bVZl bG9jaXR5OworCisgICAgLy8gUnViYmVyIGJhbmQgc3RhdGUuCisgICAgQ0ZUaW1lSW50ZXJ2YWwg bV9zdGFydFRpbWU7CisgICAgRmxvYXRTaXplIG1fc3RhcnRTdHJldGNoOworICAgIEZsb2F0UG9p bnQgbV9vcmlnT3JpZ2luOworICAgIEZsb2F0U2l6ZSBtX29yaWdWZWxvY2l0eTsKIH07CiAKIH0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9T Y3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIubW0JKHJldmlzaW9uIDk2 NjQ0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEVsYXN0aWNpdHlDb250 cm9sbGVyLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zNyw2ICszNywxMCBAQCBTY3JvbGxFbGFzdGlj aXR5Q29udHJvbGxlcjo6U2Nyb2xsRWxhc3RpCiAgICAgLCBtX2lnbm9yZU1vbWVudHVtU2Nyb2xs cyhmYWxzZSkKICAgICAsIG1fc2Nyb2xsZXJJbml0aWFsbHlQaW5uZWRPbkxlZnQoZmFsc2UpCiAg ICAgLCBtX3Njcm9sbGVySW5pdGlhbGx5UGlubmVkT25SaWdodChmYWxzZSkKKyAgICAsIG1fY3Vt dWxhdGl2ZUhvcml6b250YWxTY3JvbGwoMCkKKyAgICAsIG1fZGlkQ3VtdWxhdGl2ZUhvcml6b250 YWxTY3JvbGxFdmVyU3dpdGNoVG9PcHBvc2l0ZURpcmVjdGlvbk9mUGluKGZhbHNlKQorICAgICwg bV9sYXN0TW9tZW50dW1TY3JvbGxUaW1lc3RhbXAoMCkKKyAgICAsIG1fc3RhcnRUaW1lKDApCiB7 CiB9CiAK