143157 2015-03-27 15:36:03 -0700 Safari clears selection when its window gets activated via mouse down 2015-03-27 15:56:58 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar, Regression P2 Normal --- 1 rniwa rniwa andersca enrica mitz oldest_to_newest 1080777 0 rniwa 2015-03-27 15:36:03 -0700 Reproduction steps: 1. In a Safari window, select some text in a webpage 2. Switch to another window (so that Safari window will be inactive). 3. Click anywhere in the Safari window to activate it back. Expected result: Selection stays in tact (not being cleared). Actual result: Selection gets cleared. <rdar://problem/16797013> 1080781 1 249613 rniwa 2015-03-27 15:40:33 -0700 Created attachment 249613 Fixes the bug 1080783 2 249615 rniwa 2015-03-27 15:41:38 -0700 Created attachment 249615 Fixed non-Mac builds 1080787 3 rniwa 2015-03-27 15:55:51 -0700 Per Andres' in-person comment, I'm replacing USE(APP_KIT) by PLATFORM(MAC). 1080789 4 rniwa 2015-03-27 15:56:58 -0700 Committed r182087: <http://trac.webkit.org/changeset/182087> 249613 2015-03-27 15:40:33 -0700 2015-03-27 15:41:35 -0700 Fixes the bug bug-143157-20150327153953.patch text/plain 6115 rniwa SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MjA4NikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE1LTAzLTI3ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFNhZmFyaSBjbGVhcnMgc2VsZWN0 aW9uIHdoZW4gaXRzIHdpbmRvdyBnZXRzIGFjdGl2YXRlZCB2aWEgbW91c2UgZG93bgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzMTU3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGJ1ZyB3YXMgY2F1 c2VkIGJ5IFBsYXRmb3JtTW91c2VFdmVudCBjcmVhdGVkIGluIFdlYktpdDIgbm90IGhhdmluZyBp dHMgZXZlbnQgbnVtYmVyCisgICAgICAgIGV2ZW4gdGhvdWdoIHdlIHdlcmUgY29ycmVjdGx5IGNh bGxpbmcgc2V0QWN0aXZhdGlvbkV2ZW50TnVtYmVyIGluIFdlYlBhZ2U6OmFjY2VwdHNGaXJzdE1v dXNlLgorCisgICAgICAgIEZpeGVkIHRoZSBidWcgYnkgc3RvcmluZyBbTlNFdmVudCBldmVudE51 bWJlcl0gaW4gV2ViTW91c2VFdmVudCBvbiBNYWMgaW4gV2ViS2l0MiBhcyBkb25lIGluIFdlYktp dDEuCisKKyAgICAgICAgKiBTaGFyZWQvV2ViRXZlbnQuaDoKKyAgICAgICAgKFdlYktpdDo6V2Vi TW91c2VFdmVudDo6ZXZlbnROdW1iZXIpOgorICAgICAgICAqIFNoYXJlZC9XZWJFdmVudENvbnZl cnNpb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJLaXQyUGxhdGZvcm1Nb3VzZUV2ZW50OjpX ZWJLaXQyUGxhdGZvcm1Nb3VzZUV2ZW50KToKKyAgICAgICAgKiBTaGFyZWQvV2ViTW91c2VFdmVu dC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6OldlYk1vdXNlRXZlbnQpOgor ICAgICAgICAoV2ViS2l0OjpXZWJNb3VzZUV2ZW50OjplbmNvZGUpOgorICAgICAgICAoV2ViS2l0 OjpXZWJNb3VzZUV2ZW50OjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9tYWMvV2ViRXZlbnRG YWN0b3J5Lm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdlYk1v dXNlRXZlbnQpOgorCiAyMDE1LTAzLTI3ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBs ZS5jb20+CiAKICAgICAgICAgT25seSBkbyB0aGUgQ29ubmVjdGlvbjo6c2V0U2hvdWxkQ2xvc2VD b25uZWN0aW9uT25NYWNoRXhjZXB0aW9ucygpIGhhY2sgd2hlcmUgbmVjZXNzYXJ5CkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViRXZlbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvV2ViRXZlbnQuaAkocmV2aXNpb24gMTgxOTI3KQorKysgU291cmNlL1dlYktp dDIvU2hhcmVkL1dlYkV2ZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTEyMyw3ICsxMjMsMTEgQEAg cHVibGljOgogCiAgICAgV2ViTW91c2VFdmVudCgpOwogCisjaWYgVVNFKEFQUEtJVCkKKyAgICBX ZWJNb3VzZUV2ZW50KFR5cGUsIEJ1dHRvbiwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIHBvc2l0 aW9uLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgZ2xvYmFsUG9zaXRpb24sIGZsb2F0IGRlbHRh WCwgZmxvYXQgZGVsdGFZLCBmbG9hdCBkZWx0YVosIGludCBjbGlja0NvdW50LCBNb2RpZmllcnMs IGRvdWJsZSB0aW1lc3RhbXAsIGludCBldmVudE51bWJlciA9IC0xKTsKKyNlbHNlCiAgICAgV2Vi TW91c2VFdmVudChUeXBlLCBCdXR0b24sIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBwb3NpdGlv biwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIGdsb2JhbFBvc2l0aW9uLCBmbG9hdCBkZWx0YVgs IGZsb2F0IGRlbHRhWSwgZmxvYXQgZGVsdGFaLCBpbnQgY2xpY2tDb3VudCwgTW9kaWZpZXJzLCBk b3VibGUgdGltZXN0YW1wKTsKKyNlbmRpZgogCiAgICAgQnV0dG9uIGJ1dHRvbigpIGNvbnN0IHsg cmV0dXJuIHN0YXRpY19jYXN0PEJ1dHRvbj4obV9idXR0b24pOyB9CiAgICAgY29uc3QgV2ViQ29y ZTo6SW50UG9pbnQmIHBvc2l0aW9uKCkgY29uc3QgeyByZXR1cm4gbV9wb3NpdGlvbjsgfQpAQCAt MTMyLDYgKzEzNiw5IEBAIHB1YmxpYzoKICAgICBmbG9hdCBkZWx0YVkoKSBjb25zdCB7IHJldHVy biBtX2RlbHRhWTsgfQogICAgIGZsb2F0IGRlbHRhWigpIGNvbnN0IHsgcmV0dXJuIG1fZGVsdGFa OyB9CiAgICAgaW50MzJfdCBjbGlja0NvdW50KCkgY29uc3QgeyByZXR1cm4gbV9jbGlja0NvdW50 OyB9CisjaWYgVVNFKEFQUEtJVCkKKyAgICBpbnQzMl90IGV2ZW50TnVtYmVyKCkgY29uc3QgeyBy ZXR1cm4gbV9ldmVudE51bWJlcjsgfQorI2VuZGlmCiAKICAgICB2b2lkIGVuY29kZShJUEM6OkFy Z3VtZW50RW5jb2RlciYpIGNvbnN0OwogICAgIHN0YXRpYyBib29sIGRlY29kZShJUEM6OkFyZ3Vt ZW50RGVjb2RlciYsIFdlYk1vdXNlRXZlbnQmKTsKQEAgLTE0Niw2ICsxNTMsOSBAQCBwcml2YXRl OgogICAgIGZsb2F0IG1fZGVsdGFZOwogICAgIGZsb2F0IG1fZGVsdGFaOwogICAgIGludDMyX3Qg bV9jbGlja0NvdW50OworI2lmIFVTRShBUFBLSVQpCisgICAgaW50MzJfdCBtX2V2ZW50TnVtYmVy OworI2VuZGlmCiB9OwogCiAvLyBGSVhNRTogTW92ZSB0aGlzIGNsYXNzIHRvIGl0cyBvd24gaGVh ZGVyIGZpbGUuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViRXZlbnRDb252ZXJzaW9u LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViRXZlbnRDb252ZXJz aW9uLmNwcAkocmV2aXNpb24gMTgxOTI3KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkV2 ZW50Q29udmVyc2lvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgyLDYgKzgyLDcgQEAgcHVibGlj OgogICAgICAgICBtX3Bvc2l0aW9uID0gd2ViRXZlbnQucG9zaXRpb24oKTsKICAgICAgICAgbV9n bG9iYWxQb3NpdGlvbiA9IHdlYkV2ZW50Lmdsb2JhbFBvc2l0aW9uKCk7CiAgICAgICAgIG1fY2xp Y2tDb3VudCA9IHdlYkV2ZW50LmNsaWNrQ291bnQoKTsKKyAgICAgICAgbV9ldmVudE51bWJlciA9 IHdlYkV2ZW50LmV2ZW50TnVtYmVyKCk7CiAKICAgICAgICAgbV9tb2RpZmllckZsYWdzID0gMDsK ICAgICAgICAgaWYgKHdlYkV2ZW50LnNoaWZ0S2V5KCkpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9T aGFyZWQvV2ViTW91c2VFdmVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hh cmVkL1dlYk1vdXNlRXZlbnQuY3BwCShyZXZpc2lvbiAxODE5MjcpCisrKyBTb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvV2ViTW91c2VFdmVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQwLDEwICs0MCwx NyBAQCBXZWJNb3VzZUV2ZW50OjpXZWJNb3VzZUV2ZW50KCkKICAgICAsIG1fZGVsdGFZKDApCiAg ICAgLCBtX2RlbHRhWigwKQogICAgICwgbV9jbGlja0NvdW50KDApCisjaWYgVVNFKEFQUEtJVCkK KyAgICAsIG1fZXZlbnROdW1iZXIoLTEpCisjZW5kaWYKIHsKIH0KIAorI2lmIFVTRShBUFBLSVQp CitXZWJNb3VzZUV2ZW50OjpXZWJNb3VzZUV2ZW50KFR5cGUgdHlwZSwgQnV0dG9uIGJ1dHRvbiwg Y29uc3QgSW50UG9pbnQmIHBvc2l0aW9uLCBjb25zdCBJbnRQb2ludCYgZ2xvYmFsUG9zaXRpb24s IGZsb2F0IGRlbHRhWCwgZmxvYXQgZGVsdGFZLCBmbG9hdCBkZWx0YVosIGludCBjbGlja0NvdW50 LCBNb2RpZmllcnMgbW9kaWZpZXJzLCBkb3VibGUgdGltZXN0YW1wLCBpbnQgZXZlbnROdW1iZXIp CisjZWxzZQogV2ViTW91c2VFdmVudDo6V2ViTW91c2VFdmVudChUeXBlIHR5cGUsIEJ1dHRvbiBi dXR0b24sIGNvbnN0IEludFBvaW50JiBwb3NpdGlvbiwgY29uc3QgSW50UG9pbnQmIGdsb2JhbFBv c2l0aW9uLCBmbG9hdCBkZWx0YVgsIGZsb2F0IGRlbHRhWSwgZmxvYXQgZGVsdGFaLCBpbnQgY2xp Y2tDb3VudCwgTW9kaWZpZXJzIG1vZGlmaWVycywgZG91YmxlIHRpbWVzdGFtcCkKKyNlbmRpZgog ICAgIDogV2ViRXZlbnQodHlwZSwgbW9kaWZpZXJzLCB0aW1lc3RhbXApCiAgICAgLCBtX2J1dHRv bihidXR0b24pCiAgICAgLCBtX3Bvc2l0aW9uKHBvc2l0aW9uKQpAQCAtNTIsNiArNTksOSBAQCBX ZWJNb3VzZUV2ZW50OjpXZWJNb3VzZUV2ZW50KFR5cGUgdHlwZSwgCiAgICAgLCBtX2RlbHRhWShk ZWx0YVkpCiAgICAgLCBtX2RlbHRhWihkZWx0YVopCiAgICAgLCBtX2NsaWNrQ291bnQoY2xpY2tD b3VudCkKKyNpZiBVU0UoQVBQS0lUKQorICAgICwgbV9ldmVudE51bWJlcihldmVudE51bWJlcikK KyNlbmRpZgogewogICAgIEFTU0VSVChpc01vdXNlRXZlbnRUeXBlKHR5cGUpKTsKIH0KQEAgLTY3 LDYgKzc3LDkgQEAgdm9pZCBXZWJNb3VzZUV2ZW50OjplbmNvZGUoSVBDOjpBcmd1bWVudAogICAg IGVuY29kZXIgPDwgbV9kZWx0YVk7CiAgICAgZW5jb2RlciA8PCBtX2RlbHRhWjsKICAgICBlbmNv ZGVyIDw8IG1fY2xpY2tDb3VudDsKKyNpZiBVU0UoQVBQS0lUKQorICAgIGVuY29kZXIgPDwgbV9l dmVudE51bWJlcjsKKyNlbmRpZgogfQogCiBib29sIFdlYk1vdXNlRXZlbnQ6OmRlY29kZShJUEM6 OkFyZ3VtZW50RGVjb2RlciYgZGVjb2RlciwgV2ViTW91c2VFdmVudCYgcmVzdWx0KQpAQCAtODgs NiArMTAxLDEwIEBAIGJvb2wgV2ViTW91c2VFdmVudDo6ZGVjb2RlKElQQzo6QXJndW1lbnQKICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0Lm1fY2xp Y2tDb3VudCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKKyNpZiBVU0UoQVBQS0lUKQorICAgIGlm ICghZGVjb2Rlci5kZWNvZGUocmVzdWx0Lm1fZXZlbnROdW1iZXIpKQorICAgICAgICByZXR1cm4g ZmFsc2U7CisjZW5kaWYKIAogICAgIHJldHVybiB0cnVlOwogfQpJbmRleDogU291cmNlL1dlYktp dDIvU2hhcmVkL21hYy9XZWJFdmVudEZhY3RvcnkubW0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvU2hhcmVkL21hYy9XZWJFdmVudEZhY3RvcnkubW0JKHJldmlzaW9uIDE4MTkyNykKKysr IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvV2ViRXZlbnRGYWN0b3J5Lm1tCSh3b3JraW5nIGNv cHkpCkBAIC0zNTEsOCArMzUxLDkgQEAgV2ViTW91c2VFdmVudCBXZWJFdmVudEZhY3Rvcnk6OmNy ZWF0ZVdlYgogICAgIGludCBjbGlja0NvdW50ICAgICAgICAgICAgICAgICAgICAgICAgICA9IGNs aWNrQ291bnRGb3JFdmVudChldmVudCk7CiAgICAgV2ViRXZlbnQ6Ok1vZGlmaWVycyBtb2RpZmll cnMgICAgICAgICAgID0gbW9kaWZpZXJzRm9yRXZlbnQoZXZlbnQpOwogICAgIGRvdWJsZSB0aW1l c3RhbXAgICAgICAgICAgICAgICAgICAgICAgICA9IGV2ZW50VGltZVN0YW1wU2luY2UxOTcwKGV2 ZW50KTsKKyAgICBpbnQgZXZlbnROdW1iZXIgICAgICAgICAgICAgICAgICAgICAgICAgPSBbZXZl bnQgZXZlbnROdW1iZXJdOwogCi0gICAgcmV0dXJuIFdlYk1vdXNlRXZlbnQodHlwZSwgYnV0dG9u LCBJbnRQb2ludChwb3NpdGlvbiksIEludFBvaW50KGdsb2JhbFBvc2l0aW9uKSwgZGVsdGFYLCBk ZWx0YVksIGRlbHRhWiwgY2xpY2tDb3VudCwgbW9kaWZpZXJzLCB0aW1lc3RhbXApOworICAgIHJl dHVybiBXZWJNb3VzZUV2ZW50KHR5cGUsIGJ1dHRvbiwgSW50UG9pbnQocG9zaXRpb24pLCBJbnRQ b2ludChnbG9iYWxQb3NpdGlvbiksIGRlbHRhWCwgZGVsdGFZLCBkZWx0YVosIGNsaWNrQ291bnQs IG1vZGlmaWVycywgdGltZXN0YW1wLCBldmVudE51bWJlcik7CiB9CiAKIFdlYldoZWVsRXZlbnQg V2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWJXaGVlbEV2ZW50KE5TRXZlbnQgKmV2ZW50LCBOU1Zp ZXcgKndpbmRvd1ZpZXcpCg== 249615 2015-03-27 15:41:38 -0700 2015-03-27 15:53:19 -0700 Fixed non-Mac builds bug-143157-20150327154059.patch text/plain 6140 rniwa SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MjA4NikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE1LTAzLTI3ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFNhZmFyaSBjbGVhcnMgc2VsZWN0 aW9uIHdoZW4gaXRzIHdpbmRvdyBnZXRzIGFjdGl2YXRlZCB2aWEgbW91c2UgZG93bgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzMTU3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGJ1ZyB3YXMgY2F1 c2VkIGJ5IFBsYXRmb3JtTW91c2VFdmVudCBjcmVhdGVkIGluIFdlYktpdDIgbm90IGhhdmluZyBp dHMgZXZlbnQgbnVtYmVyCisgICAgICAgIGV2ZW4gdGhvdWdoIHdlIHdlcmUgY29ycmVjdGx5IGNh bGxpbmcgc2V0QWN0aXZhdGlvbkV2ZW50TnVtYmVyIGluIFdlYlBhZ2U6OmFjY2VwdHNGaXJzdE1v dXNlLgorCisgICAgICAgIEZpeGVkIHRoZSBidWcgYnkgc3RvcmluZyBbTlNFdmVudCBldmVudE51 bWJlcl0gaW4gV2ViTW91c2VFdmVudCBvbiBNYWMgaW4gV2ViS2l0MiBhcyBkb25lIGluIFdlYktp dDEuCisKKyAgICAgICAgKiBTaGFyZWQvV2ViRXZlbnQuaDoKKyAgICAgICAgKFdlYktpdDo6V2Vi TW91c2VFdmVudDo6ZXZlbnROdW1iZXIpOgorICAgICAgICAqIFNoYXJlZC9XZWJFdmVudENvbnZl cnNpb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJLaXQyUGxhdGZvcm1Nb3VzZUV2ZW50OjpX ZWJLaXQyUGxhdGZvcm1Nb3VzZUV2ZW50KToKKyAgICAgICAgKiBTaGFyZWQvV2ViTW91c2VFdmVu dC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6OldlYk1vdXNlRXZlbnQpOgor ICAgICAgICAoV2ViS2l0OjpXZWJNb3VzZUV2ZW50OjplbmNvZGUpOgorICAgICAgICAoV2ViS2l0 OjpXZWJNb3VzZUV2ZW50OjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9tYWMvV2ViRXZlbnRG YWN0b3J5Lm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdlYk1v dXNlRXZlbnQpOgorCiAyMDE1LTAzLTI3ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBs ZS5jb20+CiAKICAgICAgICAgT25seSBkbyB0aGUgQ29ubmVjdGlvbjo6c2V0U2hvdWxkQ2xvc2VD b25uZWN0aW9uT25NYWNoRXhjZXB0aW9ucygpIGhhY2sgd2hlcmUgbmVjZXNzYXJ5CkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViRXZlbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvV2ViRXZlbnQuaAkocmV2aXNpb24gMTgxOTI3KQorKysgU291cmNlL1dlYktp dDIvU2hhcmVkL1dlYkV2ZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTEyMyw3ICsxMjMsMTEgQEAg cHVibGljOgogCiAgICAgV2ViTW91c2VFdmVudCgpOwogCisjaWYgVVNFKEFQUEtJVCkKKyAgICBX ZWJNb3VzZUV2ZW50KFR5cGUsIEJ1dHRvbiwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIHBvc2l0 aW9uLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgZ2xvYmFsUG9zaXRpb24sIGZsb2F0IGRlbHRh WCwgZmxvYXQgZGVsdGFZLCBmbG9hdCBkZWx0YVosIGludCBjbGlja0NvdW50LCBNb2RpZmllcnMs IGRvdWJsZSB0aW1lc3RhbXAsIGludCBldmVudE51bWJlciA9IC0xKTsKKyNlbHNlCiAgICAgV2Vi TW91c2VFdmVudChUeXBlLCBCdXR0b24sIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBwb3NpdGlv biwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIGdsb2JhbFBvc2l0aW9uLCBmbG9hdCBkZWx0YVgs IGZsb2F0IGRlbHRhWSwgZmxvYXQgZGVsdGFaLCBpbnQgY2xpY2tDb3VudCwgTW9kaWZpZXJzLCBk b3VibGUgdGltZXN0YW1wKTsKKyNlbmRpZgogCiAgICAgQnV0dG9uIGJ1dHRvbigpIGNvbnN0IHsg cmV0dXJuIHN0YXRpY19jYXN0PEJ1dHRvbj4obV9idXR0b24pOyB9CiAgICAgY29uc3QgV2ViQ29y ZTo6SW50UG9pbnQmIHBvc2l0aW9uKCkgY29uc3QgeyByZXR1cm4gbV9wb3NpdGlvbjsgfQpAQCAt MTMyLDYgKzEzNiw5IEBAIHB1YmxpYzoKICAgICBmbG9hdCBkZWx0YVkoKSBjb25zdCB7IHJldHVy biBtX2RlbHRhWTsgfQogICAgIGZsb2F0IGRlbHRhWigpIGNvbnN0IHsgcmV0dXJuIG1fZGVsdGFa OyB9CiAgICAgaW50MzJfdCBjbGlja0NvdW50KCkgY29uc3QgeyByZXR1cm4gbV9jbGlja0NvdW50 OyB9CisjaWYgVVNFKEFQUEtJVCkKKyAgICBpbnQzMl90IGV2ZW50TnVtYmVyKCkgY29uc3QgeyBy ZXR1cm4gbV9ldmVudE51bWJlcjsgfQorI2VuZGlmCiAKICAgICB2b2lkIGVuY29kZShJUEM6OkFy Z3VtZW50RW5jb2RlciYpIGNvbnN0OwogICAgIHN0YXRpYyBib29sIGRlY29kZShJUEM6OkFyZ3Vt ZW50RGVjb2RlciYsIFdlYk1vdXNlRXZlbnQmKTsKQEAgLTE0Niw2ICsxNTMsOSBAQCBwcml2YXRl OgogICAgIGZsb2F0IG1fZGVsdGFZOwogICAgIGZsb2F0IG1fZGVsdGFaOwogICAgIGludDMyX3Qg bV9jbGlja0NvdW50OworI2lmIFVTRShBUFBLSVQpCisgICAgaW50MzJfdCBtX2V2ZW50TnVtYmVy OworI2VuZGlmCiB9OwogCiAvLyBGSVhNRTogTW92ZSB0aGlzIGNsYXNzIHRvIGl0cyBvd24gaGVh ZGVyIGZpbGUuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViRXZlbnRDb252ZXJzaW9u LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViRXZlbnRDb252ZXJz aW9uLmNwcAkocmV2aXNpb24gMTgxOTI3KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkV2 ZW50Q29udmVyc2lvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgyLDYgKzgyLDkgQEAgcHVibGlj OgogICAgICAgICBtX3Bvc2l0aW9uID0gd2ViRXZlbnQucG9zaXRpb24oKTsKICAgICAgICAgbV9n bG9iYWxQb3NpdGlvbiA9IHdlYkV2ZW50Lmdsb2JhbFBvc2l0aW9uKCk7CiAgICAgICAgIG1fY2xp Y2tDb3VudCA9IHdlYkV2ZW50LmNsaWNrQ291bnQoKTsKKyNpZiBVU0UoQVBQS0lUKQorICAgICAg ICBtX2V2ZW50TnVtYmVyID0gd2ViRXZlbnQuZXZlbnROdW1iZXIoKTsKKyNlbmRpZgogCiAgICAg ICAgIG1fbW9kaWZpZXJGbGFncyA9IDA7CiAgICAgICAgIGlmICh3ZWJFdmVudC5zaGlmdEtleSgp KQpJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYk1vdXNlRXZlbnQuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJNb3VzZUV2ZW50LmNwcAkocmV2aXNpb24g MTgxOTI3KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYk1vdXNlRXZlbnQuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC00MCwxMCArNDAsMTcgQEAgV2ViTW91c2VFdmVudDo6V2ViTW91c2VFdmVu dCgpCiAgICAgLCBtX2RlbHRhWSgwKQogICAgICwgbV9kZWx0YVooMCkKICAgICAsIG1fY2xpY2tD b3VudCgwKQorI2lmIFVTRShBUFBLSVQpCisgICAgLCBtX2V2ZW50TnVtYmVyKC0xKQorI2VuZGlm CiB7CiB9CiAKKyNpZiBVU0UoQVBQS0lUKQorV2ViTW91c2VFdmVudDo6V2ViTW91c2VFdmVudChU eXBlIHR5cGUsIEJ1dHRvbiBidXR0b24sIGNvbnN0IEludFBvaW50JiBwb3NpdGlvbiwgY29uc3Qg SW50UG9pbnQmIGdsb2JhbFBvc2l0aW9uLCBmbG9hdCBkZWx0YVgsIGZsb2F0IGRlbHRhWSwgZmxv YXQgZGVsdGFaLCBpbnQgY2xpY2tDb3VudCwgTW9kaWZpZXJzIG1vZGlmaWVycywgZG91YmxlIHRp bWVzdGFtcCwgaW50IGV2ZW50TnVtYmVyKQorI2Vsc2UKIFdlYk1vdXNlRXZlbnQ6OldlYk1vdXNl RXZlbnQoVHlwZSB0eXBlLCBCdXR0b24gYnV0dG9uLCBjb25zdCBJbnRQb2ludCYgcG9zaXRpb24s IGNvbnN0IEludFBvaW50JiBnbG9iYWxQb3NpdGlvbiwgZmxvYXQgZGVsdGFYLCBmbG9hdCBkZWx0 YVksIGZsb2F0IGRlbHRhWiwgaW50IGNsaWNrQ291bnQsIE1vZGlmaWVycyBtb2RpZmllcnMsIGRv dWJsZSB0aW1lc3RhbXApCisjZW5kaWYKICAgICA6IFdlYkV2ZW50KHR5cGUsIG1vZGlmaWVycywg dGltZXN0YW1wKQogICAgICwgbV9idXR0b24oYnV0dG9uKQogICAgICwgbV9wb3NpdGlvbihwb3Np dGlvbikKQEAgLTUyLDYgKzU5LDkgQEAgV2ViTW91c2VFdmVudDo6V2ViTW91c2VFdmVudChUeXBl IHR5cGUsIAogICAgICwgbV9kZWx0YVkoZGVsdGFZKQogICAgICwgbV9kZWx0YVooZGVsdGFaKQog ICAgICwgbV9jbGlja0NvdW50KGNsaWNrQ291bnQpCisjaWYgVVNFKEFQUEtJVCkKKyAgICAsIG1f ZXZlbnROdW1iZXIoZXZlbnROdW1iZXIpCisjZW5kaWYKIHsKICAgICBBU1NFUlQoaXNNb3VzZUV2 ZW50VHlwZSh0eXBlKSk7CiB9CkBAIC02Nyw2ICs3Nyw5IEBAIHZvaWQgV2ViTW91c2VFdmVudDo6 ZW5jb2RlKElQQzo6QXJndW1lbnQKICAgICBlbmNvZGVyIDw8IG1fZGVsdGFZOwogICAgIGVuY29k ZXIgPDwgbV9kZWx0YVo7CiAgICAgZW5jb2RlciA8PCBtX2NsaWNrQ291bnQ7CisjaWYgVVNFKEFQ UEtJVCkKKyAgICBlbmNvZGVyIDw8IG1fZXZlbnROdW1iZXI7CisjZW5kaWYKIH0KIAogYm9vbCBX ZWJNb3VzZUV2ZW50OjpkZWNvZGUoSVBDOjpBcmd1bWVudERlY29kZXImIGRlY29kZXIsIFdlYk1v dXNlRXZlbnQmIHJlc3VsdCkKQEAgLTg4LDYgKzEwMSwxMCBAQCBib29sIFdlYk1vdXNlRXZlbnQ6 OmRlY29kZShJUEM6OkFyZ3VtZW50CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoIWRl Y29kZXIuZGVjb2RlKHJlc3VsdC5tX2NsaWNrQ291bnQpKQogICAgICAgICByZXR1cm4gZmFsc2U7 CisjaWYgVVNFKEFQUEtJVCkKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5tX2V2ZW50 TnVtYmVyKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworI2VuZGlmCiAKICAgICByZXR1cm4gdHJ1 ZTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvV2ViRXZlbnRGYWN0b3J5Lm1t Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvV2ViRXZlbnRGYWN0b3J5 Lm1tCShyZXZpc2lvbiAxODE5MjcpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL1dlYkV2 ZW50RmFjdG9yeS5tbQkod29ya2luZyBjb3B5KQpAQCAtMzUxLDggKzM1MSw5IEBAIFdlYk1vdXNl RXZlbnQgV2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWIKICAgICBpbnQgY2xpY2tDb3VudCAgICAg ICAgICAgICAgICAgICAgICAgICAgPSBjbGlja0NvdW50Rm9yRXZlbnQoZXZlbnQpOwogICAgIFdl YkV2ZW50OjpNb2RpZmllcnMgbW9kaWZpZXJzICAgICAgICAgICA9IG1vZGlmaWVyc0ZvckV2ZW50 KGV2ZW50KTsKICAgICBkb3VibGUgdGltZXN0YW1wICAgICAgICAgICAgICAgICAgICAgICAgPSBl dmVudFRpbWVTdGFtcFNpbmNlMTk3MChldmVudCk7CisgICAgaW50IGV2ZW50TnVtYmVyICAgICAg ICAgICAgICAgICAgICAgICAgID0gW2V2ZW50IGV2ZW50TnVtYmVyXTsKIAotICAgIHJldHVybiBX ZWJNb3VzZUV2ZW50KHR5cGUsIGJ1dHRvbiwgSW50UG9pbnQocG9zaXRpb24pLCBJbnRQb2ludChn bG9iYWxQb3NpdGlvbiksIGRlbHRhWCwgZGVsdGFZLCBkZWx0YVosIGNsaWNrQ291bnQsIG1vZGlm aWVycywgdGltZXN0YW1wKTsKKyAgICByZXR1cm4gV2ViTW91c2VFdmVudCh0eXBlLCBidXR0b24s IEludFBvaW50KHBvc2l0aW9uKSwgSW50UG9pbnQoZ2xvYmFsUG9zaXRpb24pLCBkZWx0YVgsIGRl bHRhWSwgZGVsdGFaLCBjbGlja0NvdW50LCBtb2RpZmllcnMsIHRpbWVzdGFtcCwgZXZlbnROdW1i ZXIpOwogfQogCiBXZWJXaGVlbEV2ZW50IFdlYkV2ZW50RmFjdG9yeTo6Y3JlYXRlV2ViV2hlZWxF dmVudChOU0V2ZW50ICpldmVudCwgTlNWaWV3ICp3aW5kb3dWaWV3KQo=