128199 2014-02-04 11:18:14 -0800 Add WK2 event handling path for iOS, and make Mac and iOS code more similar 2014-02-04 15:19:32 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser enrica sam simon.fraser thorton oldest_to_newest 976451 0 simon.fraser 2014-02-04 11:18:14 -0800 Add WK2 event handling path for iOS, and make Mac and iOS code more similar 976452 1 223143 simon.fraser 2014-02-04 11:22:26 -0800 Created attachment 223143 Patch 976526 2 simon.fraser 2014-02-04 15:19:32 -0800 https://trac.webkit.org/r163406 223143 2014-02-04 11:22:26 -0800 2014-02-04 14:22:31 -0800 Patch bug-128199-20140204112222.patch text/plain 12668 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzMzM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2Y5NTUzYTMyMzZiMDRk ZTlmMjU0MjE3MWVmNDUyNTE0Y2U1YTNmNS4uMjEyNGZkZmJlZTFhNjRkNTM1Yjc2NTE4ZWUxZWUz MjM3NDRjNDIwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE0LTAyLTA0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBXSzIgZXZl bnQgaGFuZGxpbmcgcGF0aCBmb3IgaU9TLCBhbmQgbWFrZSBNYWMgYW5kIGlPUyBjb2RlIG1vcmUg c2ltaWxhcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTI4MTk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg RXZlbnRIYW5kbGVySU9TIG5lZWQgc29tZSBjaGFuZ2VzIGZvciBXZWJLaXQyLCB3aGVyZSB3ZSBo YXZlIG5vIG5hdGl2ZQorICAgICAgICB3aWRnZXQuIE1lcmdlIHRob3NlIGNoYW5nZXMgZnJvbSBF dmVudEhhbmRsZXJNYWMuCisgICAgICAgIAorICAgICAgICBNYWtlIGEgZmV3IGRyaXZlLWJ5IGNo YW5nZXMgdG8gbWF0Y2ggRXZlbnRIYW5kbGVyTWFjIGJlaGF2aW9yLgorICAgICAgICAKKyAgICAg ICAgQ2xlYW4gdXAgRXZlbnRIYW5kbGVyTWFjLCByZW1vdmluZyB0cmFpbGluZyB3aGl0ZXNwYWNl IGFuZCBmaXhpbmcKKyAgICAgICAgdGhlIG9kZCBjb21tZW50LgorCisgICAgICAgICogcGFnZS9p b3MvRXZlbnRIYW5kbGVySU9TLm1tOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpw YXNzV2lkZ2V0TW91c2VEb3duRXZlbnRUb1dpZGdldCk6CisgICAgICAgIChXZWJDb3JlOjpFdmVu dEhhbmRsZXI6OnBhc3NNb3VzZURvd25FdmVudFRvV2lkZ2V0KToKKyAgICAgICAgKFdlYkNvcmU6 OkV2ZW50SGFuZGxlcjo6cGFzc1N1YmZyYW1lRXZlbnRUb1N1YmZyYW1lKToKKyAgICAgICAgKFdl YkNvcmU6OkV2ZW50SGFuZGxlcjo6cGFzc1doZWVsRXZlbnRUb1dpZGdldCk6CisgICAgICAgIChX ZWJDb3JlOjpFdmVudEhhbmRsZXI6Om1vdXNlRG93bik6CisgICAgICAgIChXZWJDb3JlOjpFdmVu dEhhbmRsZXI6Om1vdXNlTW92ZWQpOgorICAgICAgICAoV2ViQ29yZTo6ZnJhbWVIYXNQbGF0Zm9y bVdpZGdldCk6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OnBhc3NNb3VzZVByZXNz RXZlbnRUb1N1YmZyYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6cGFzc01v dXNlTW92ZUV2ZW50VG9TdWJmcmFtZSk6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6 OnBhc3NNb3VzZVJlbGVhc2VFdmVudFRvU3ViZnJhbWUpOgorICAgICAgICAqIHBhZ2UvbWFjL0V2 ZW50SGFuZGxlck1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6cGFzc1dp ZGdldE1vdXNlRG93bkV2ZW50VG9XaWRnZXQpOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5k bGVyOjpwYXNzTW91c2VEb3duRXZlbnRUb1dpZGdldCk6CisgICAgICAgIChXZWJDb3JlOjpmaW5k Vmlld0luU3Vidmlld3MpOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpldmVudExv b3BIYW5kbGVNb3VzZVVwKToKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6cGFzc1do ZWVsRXZlbnRUb1dpZGdldCk6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6Om1vdXNl TW92ZWQpOgorCiAyMDE0LTAyLTAzICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAog ICAgICAgICBGZWF0dXJlIGZsYWcgZm9yIHNoYXBlLWluc2lkZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGFnZS9pb3MvRXZlbnRIYW5kbGVySU9TLm1tIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9pb3MvRXZlbnRIYW5kbGVySU9TLm1tCmluZGV4IDVhYzc2ZmQ4MGRkOGZjMzMxYzk5MjI5YzM3 ZjU0OWVmYWJjMTQ1MmYuLmQ0YWFhMGYwMWRhNzM5MDA0Mzc3OTliMjE2ZTI4MDRhMWI3YTJlYzMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0V2ZW50SGFuZGxlcklPUy5tbQor KysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9FdmVudEhhbmRsZXJJT1MubW0KQEAgLTE2OSw3 ICsxNjksNyBAQCB2b2lkIEV2ZW50SGFuZGxlcjo6Zm9jdXNEb2N1bWVudFZpZXcoKQogYm9vbCBF dmVudEhhbmRsZXI6OnBhc3NXaWRnZXRNb3VzZURvd25FdmVudFRvV2lkZ2V0KGNvbnN0IE1vdXNl RXZlbnRXaXRoSGl0VGVzdFJlc3VsdHMmIGV2ZW50KQogewogICAgIC8vIEZpZ3VyZSBvdXQgd2hp Y2ggdmlldyB0byBzZW5kIHRoZSBldmVudCB0by4KLSAgICBSZW5kZXJPYmplY3QqIHRhcmdldCA9 IGV2ZW50LnRhcmdldE5vZGUoKSA/IGV2ZW50LnRhcmdldE5vZGUoKS0+cmVuZGVyZXIoKSA6IG51 bGxwdHI7CisgICAgYXV0byB0YXJnZXQgPSBldmVudC50YXJnZXROb2RlKCkgPyBldmVudC50YXJn ZXROb2RlKCktPnJlbmRlcmVyKCkgOiBudWxscHRyOwogICAgIGlmICghdGFyZ2V0IHx8ICF0YXJn ZXQtPmlzV2lkZ2V0KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApAQCAtMjE2LDYgKzIxNiwx MSBAQCBib29sIEV2ZW50SGFuZGxlcjo6cGFzc01vdXNlRG93bkV2ZW50VG9XaWRnZXQoV2lkZ2V0 KiBwV2lkZ2V0KQogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKKyAgICAvLyBJbiBXZWJL aXQyIHdlIHdpbGwgbmV2ZXIgaGF2ZSBhIG5hdGl2ZSB3aWRnZXQuIEp1c3QgcmV0dXJuIGVhcmx5 IGFuZCBsZXQgdGhlIHJlZ3VsYXIgZXZlbnQgaGFuZGxlciBtYWNoaW5lcnkgdGFrZSBjYXJlIG9m CisgICAgLy8gZGlzcGF0Y2hpbmcgdGhlIGV2ZW50LgorICAgIGlmICghd2lkZ2V0LT5wbGF0Zm9y bVdpZGdldCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICBCRUdJTl9CTE9DS19PQkpD X0VYQ0VQVElPTlM7CiAKICAgICBOU1ZpZXcgKm5vZGVWaWV3ID0gd2lkZ2V0LT5wbGF0Zm9ybVdp ZGdldCgpOwpAQCAtMjUxLDcgKzI1NiwxMiBAQCBib29sIEV2ZW50SGFuZGxlcjo6cGFzc01vdXNl RG93bkV2ZW50VG9XaWRnZXQoV2lkZ2V0KiBwV2lkZ2V0KQogCiAgICAgQVNTRVJUKCFtX3NlbmRp bmdFdmVudFRvU3Vidmlldyk7CiAgICAgbV9zZW5kaW5nRXZlbnRUb1N1YnZpZXcgPSB0cnVlOwot ICAgIFt2aWV3IG1vdXNlRG93bjpjdXJyZW50RXZlbnQoKV07CisKKyAgICB7CisgICAgICAgIFdp ZGdldEhpZXJhcmNoeVVwZGF0ZXNTdXNwZW5zaW9uU2NvcGUgc3VzcGVuZFdpZGdldEhpZXJhcmNo eVVwZGF0ZXM7CisgICAgICAgIFt2aWV3IG1vdXNlRG93bjpjdXJyZW50RXZlbnQoKV07CisgICAg fQorCiAgICAgbV9zZW5kaW5nRXZlbnRUb1N1YnZpZXcgPSBmYWxzZTsKICAgICAKICAgICBpZiAo IXdhc0RlZmVycmluZ0xvYWRpbmcpCkBAIC0zNTMsNyArMzYzLDcgQEAgYm9vbCBFdmVudEhhbmRs ZXI6OnBhc3NTdWJmcmFtZUV2ZW50VG9TdWJmcmFtZShNb3VzZUV2ZW50V2l0aEhpdFRlc3RSZXN1 bHRzJiBldmUKICAgICAgICAgICAgIE5vZGUqIG5vZGUgPSBldmVudC50YXJnZXROb2RlKCk7CiAg ICAgICAgICAgICBpZiAoIW5vZGUpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAg ICAgICAgICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IG5vZGUtPnJlbmRlcmVyKCk7CisgICAg ICAgICAgICBhdXRvIHJlbmRlcmVyID0gbm9kZS0+cmVuZGVyZXIoKTsKICAgICAgICAgICAgIGlm ICghcmVuZGVyZXIgfHwgIXJlbmRlcmVyLT5pc1dpZGdldCgpKQogICAgICAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKICAgICAgICAgICAgIFdpZGdldCogd2lkZ2V0ID0gdG9SZW5kZXJXaWRnZXQo cmVuZGVyZXIpLT53aWRnZXQoKTsKQEAgLTM5MSwxMCArNDAxLDE4IEBAIGJvb2wgRXZlbnRIYW5k bGVyOjpwYXNzV2hlZWxFdmVudFRvV2lkZ2V0KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYsIFdp ZGdldCogd2lkCiB7CiAgICAgQkVHSU5fQkxPQ0tfT0JKQ19FWENFUFRJT05TOwogCi0gICAgaWYg KGN1cnJlbnRFdmVudCgpLnR5cGUgIT0gV2ViRXZlbnRTY3JvbGxXaGVlbCB8fCBtX3NlbmRpbmdF dmVudFRvU3VidmlldyB8fCAhd2lkZ2V0KQorICAgIGlmICghd2lkZ2V0KQogICAgICAgICByZXR1 cm4gZmFsc2U7CiAKICAgICBOU1ZpZXcqIG5vZGVWaWV3ID0gd2lkZ2V0LT5wbGF0Zm9ybVdpZGdl dCgpOworICAgIGlmICghbm9kZVZpZXcpIHsKKyAgICAgICAgLy8gV0syIGNvZGUgcGF0aC4gTm8g d2hlZWwgZXZlbnRzIG9uIGlPUyBhbnl3YXkuCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9 CisKKyAgICBpZiAoY3VycmVudEV2ZW50KCkudHlwZSAhPSBXZWJFdmVudFNjcm9sbFdoZWVsIHx8 IG1fc2VuZGluZ0V2ZW50VG9TdWJ2aWV3IHx8ICF3aWRnZXQpCisgICAgICAgIHJldHVybiBmYWxz ZTsKKwogICAgIEFTU0VSVChub2RlVmlldyk7CiAgICAgQVNTRVJUKFtub2RlVmlldyBzdXBlcnZp ZXddKTsKICAgICBOU1ZpZXcgKnZpZXcgPSBbbm9kZVZpZXcgaGl0VGVzdDpbW25vZGVWaWV3IHN1 cGVydmlld10gY29udmVydFBvaW50OmN1cnJlbnRFdmVudCgpLmxvY2F0aW9uSW5XaW5kb3cgZnJv bVZpZXc6bmlsXV07CkBAIC00MjEsNiArNDM5LDcgQEAgdm9pZCBFdmVudEhhbmRsZXI6Om1vdXNl RG93bihXZWJFdmVudCAqZXZlbnQpCiAKICAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlM7 CiAKKyAgICAvLyBGSVhNRTogV2h5IGlzIHRoaXMgaGVyZT8gRXZlbnRIYW5kbGVyOjpoYW5kbGVN b3VzZVByZXNzRXZlbnQoKSBjYWxscyBpdC4KICAgICBtX2ZyYW1lLmxvYWRlcigpLnJlc2V0TXVs dGlwbGVGb3JtU3VibWlzc2lvblByb3RlY3Rpb24oKTsKIAogICAgIG1fbW91c2VEb3duVmlldyA9 IG5pbDsKQEAgLTQ2MywyNSArNDgyLDU0IEBAIHZvaWQgRXZlbnRIYW5kbGVyOjptb3VzZU1vdmVk KFdlYkV2ZW50ICpldmVudCkKICAgICBXS0JlZ2luT2JzZXJ2aW5nQ29udGVudENoYW5nZXModHJ1 ZSk7CiAgICAgQ3VycmVudEV2ZW50U2NvcGUgc2NvcGUoZXZlbnQpOwogICAgIGV2ZW50Lndhc0hh bmRsZWQgPSBtb3VzZU1vdmVkKGN1cnJlbnRQbGF0Zm9ybU1vdXNlRXZlbnQoKSk7CisgICAgCisg ICAgLy8gRklYTUU6IFdoeSBpcyB0aGlzIGhlcmU/CiAgICAgbV9mcmFtZS5kb2N1bWVudCgpLT51 cGRhdGVTdHlsZUlmTmVlZGVkKCk7CiAgICAgV0tTdG9wT2JzZXJ2aW5nQ29udGVudENoYW5nZXMo KTsKIAogICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQVElPTlM7CiB9CiAKK3N0YXRpYyBib29sIGZy YW1lSGFzUGxhdGZvcm1XaWRnZXQoY29uc3QgRnJhbWUmIGZyYW1lKQoreworICAgIGlmIChGcmFt ZVZpZXcqIGZyYW1lVmlldyA9IGZyYW1lLnZpZXcoKSkgeworICAgICAgICBpZiAoZnJhbWVWaWV3 LT5wbGF0Zm9ybVdpZGdldCgpKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorCisg ICAgcmV0dXJuIGZhbHNlOworfQorCiBib29sIEV2ZW50SGFuZGxlcjo6cGFzc01vdXNlUHJlc3NF dmVudFRvU3ViZnJhbWUoTW91c2VFdmVudFdpdGhIaXRUZXN0UmVzdWx0cyYgbWV2LCBGcmFtZSog c3ViZnJhbWUpCiB7Ci0gICAgcmV0dXJuIHBhc3NTdWJmcmFtZUV2ZW50VG9TdWJmcmFtZShtZXYs IHN1YmZyYW1lKTsKKyAgICAvLyBXZWJLaXQxIGNvZGUgcGF0aC4KKyAgICBpZiAoZnJhbWVIYXNQ bGF0Zm9ybVdpZGdldChtX2ZyYW1lKSkKKyAgICAgICAgcmV0dXJuIHBhc3NTdWJmcmFtZUV2ZW50 VG9TdWJmcmFtZShtZXYsIHN1YmZyYW1lKTsKKworICAgIC8vIFdlYktpdDIgY29kZSBwYXRoLgor ICAgIHN1YmZyYW1lLT5ldmVudEhhbmRsZXIoKS5oYW5kbGVNb3VzZVByZXNzRXZlbnQobWV2LmV2 ZW50KCkpOworICAgIHJldHVybiB0cnVlOwogfQogCiBib29sIEV2ZW50SGFuZGxlcjo6cGFzc01v dXNlTW92ZUV2ZW50VG9TdWJmcmFtZShNb3VzZUV2ZW50V2l0aEhpdFRlc3RSZXN1bHRzJiBtZXYs IEZyYW1lKiBzdWJmcmFtZSwgSGl0VGVzdFJlc3VsdCogaG92ZXJlZE5vZGUpCiB7Ci0gICAgcmV0 dXJuIHBhc3NTdWJmcmFtZUV2ZW50VG9TdWJmcmFtZShtZXYsIHN1YmZyYW1lLCBob3ZlcmVkTm9k ZSk7CisgICAgLy8gV2ViS2l0MSBjb2RlIHBhdGguCisgICAgaWYgKGZyYW1lSGFzUGxhdGZvcm1X aWRnZXQobV9mcmFtZSkpCisgICAgICAgIHJldHVybiBwYXNzU3ViZnJhbWVFdmVudFRvU3ViZnJh bWUobWV2LCBzdWJmcmFtZSwgaG92ZXJlZE5vZGUpOworCisgICAgc3ViZnJhbWUtPmV2ZW50SGFu ZGxlcigpLmhhbmRsZU1vdXNlTW92ZUV2ZW50KG1ldi5ldmVudCgpLCBob3ZlcmVkTm9kZSk7Cisg ICAgcmV0dXJuIHRydWU7CiB9CiAKIGJvb2wgRXZlbnRIYW5kbGVyOjpwYXNzTW91c2VSZWxlYXNl RXZlbnRUb1N1YmZyYW1lKE1vdXNlRXZlbnRXaXRoSGl0VGVzdFJlc3VsdHMmIG1ldiwgRnJhbWUq IHN1YmZyYW1lKQogewotICAgIHJldHVybiBwYXNzU3ViZnJhbWVFdmVudFRvU3ViZnJhbWUobWV2 LCBzdWJmcmFtZSk7CisgICAgLy8gV2ViS2l0MSBjb2RlIHBhdGguCisgICAgaWYgKGZyYW1lSGFz UGxhdGZvcm1XaWRnZXQobV9mcmFtZSkpCisgICAgICAgIHJldHVybiBwYXNzU3ViZnJhbWVFdmVu dFRvU3ViZnJhbWUobWV2LCBzdWJmcmFtZSk7CisKKyAgICAvLyBXZWJLaXQyIGNvZGUgcGF0aC4K KyAgICBzdWJmcmFtZS0+ZXZlbnRIYW5kbGVyKCkuaGFuZGxlTW91c2VSZWxlYXNlRXZlbnQobWV2 LmV2ZW50KCkpOworICAgIHJldHVybiB0cnVlOwogfQogCiB1bnNpZ25lZCBFdmVudEhhbmRsZXI6 OmFjY2Vzc0tleU1vZGlmaWVycygpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL21h Yy9FdmVudEhhbmRsZXJNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL21hYy9FdmVudEhhbmRs ZXJNYWMubW0KaW5kZXggZDNhMWY5NWUzMjM3NWIwZjlkMjE3M2NlOGFkODYyOTdiMDAyZjQ2Yi4u YzViMmFmNmQ4NDQ0NGZlMGQxODE1YzBlMTZlM2M3NjQ5NDlhOTg4ZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9tYWMvRXZlbnRIYW5kbGVyTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvbWFjL0V2ZW50SGFuZGxlck1hYy5tbQpAQCAtMTM4LDEzICsxMzgsMTMgQEAgdm9p ZCBFdmVudEhhbmRsZXI6OmZvY3VzRG9jdW1lbnRWaWV3KCkKIGJvb2wgRXZlbnRIYW5kbGVyOjpw YXNzV2lkZ2V0TW91c2VEb3duRXZlbnRUb1dpZGdldChjb25zdCBNb3VzZUV2ZW50V2l0aEhpdFRl c3RSZXN1bHRzJiBldmVudCkKIHsKICAgICAvLyBGaWd1cmUgb3V0IHdoaWNoIHZpZXcgdG8gc2Vu ZCB0aGUgZXZlbnQgdG8uCi0gICAgYXV0byB0YXJnZXQgPSBldmVudC50YXJnZXROb2RlKCkgPyBl dmVudC50YXJnZXROb2RlKCktPnJlbmRlcmVyKCkgOiAwOworICAgIGF1dG8gdGFyZ2V0ID0gZXZl bnQudGFyZ2V0Tm9kZSgpID8gZXZlbnQudGFyZ2V0Tm9kZSgpLT5yZW5kZXJlcigpIDogbnVsbHB0 cjsKICAgICBpZiAoIXRhcmdldCB8fCAhdGFyZ2V0LT5pc1dpZGdldCgpKQogICAgICAgICByZXR1 cm4gZmFsc2U7Ci0gICAgCi0gICAgLy8gRG91YmxlLWNsaWNrIGV2ZW50cyBkb24ndCBleGlzdCBp biBDb2NvYS4gU2luY2UgcGFzc1dpZGdldE1vdXNlRG93bkV2ZW50VG9XaWRnZXQgd2lsbAorCisg ICAgLy8gRG91YmxlLWNsaWNrIGV2ZW50cyBkb24ndCBleGlzdCBpbiBDb2NvYS4gU2luY2UgcGFz c1dpZGdldE1vdXNlRG93bkV2ZW50VG9XaWRnZXQoKSB3aWxsCiAgICAgLy8ganVzdCBwYXNzIGN1 cnJlbnRFdmVudCBkb3duIHRvIHRoZSB3aWRnZXQsIHdlIGRvbid0IHdhbnQgdG8gY2FsbCBpdCBm b3IgZXZlbnRzIHRoYXQKLSAgICAvLyBkb24ndCBjb3JyZXNwb25kIHRvIENvY29hIGV2ZW50cy4g IFRoZSBtb3VzZWRvd24vdXBzIHdpbGwgaGF2ZSBhbHJlYWR5IGJlZW4gcGFzc2VkIG9uIGFzCisg ICAgLy8gZG9uJ3QgY29ycmVzcG9uZCB0byBDb2NvYSBldmVudHMuIFRoZSBtb3VzZWRvd24vdXBz IHdpbGwgaGF2ZSBhbHJlYWR5IGJlZW4gcGFzc2VkIG9uIGFzCiAgICAgLy8gcGFydCBvZiB0aGUg cHJlc3NlZC9yZWxlYXNlZCBoYW5kbGluZy4KICAgICByZXR1cm4gcGFzc01vdXNlRG93bkV2ZW50 VG9XaWRnZXQodG9SZW5kZXJXaWRnZXQodGFyZ2V0KS0+d2lkZ2V0KCkpOwogfQpAQCAtMTc2LDcg KzE3Niw3IEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpwYXNzTW91c2VEb3duRXZlbnRUb1dpZGdldChX aWRnZXQqIHBXaWRnZXQpCiB7CiAgICAgLy8gRklYTUU6IFRoaXMgZnVuY3Rpb24gYWx3YXlzIHJl dHVybnMgdHJ1ZS4gSXQgc2hvdWxkIGJlIGNoYW5nZWQgZWl0aGVyIHRvIHJldHVybgogICAgIC8v IGZhbHNlIGluIHNvbWUgY2FzZXMgb3IgdGhlIHJldHVybiB2YWx1ZSBzaG91bGQgYmUgcmVtb3Zl ZC4KLSAgICAKKwogICAgIFJlZlB0cjxXaWRnZXQ+IHdpZGdldCA9IHBXaWRnZXQ7CiAKICAgICBp ZiAoIXdpZGdldCkgewpAQCAtMTg0LDEzICsxODQsMTMgQEAgYm9vbCBFdmVudEhhbmRsZXI6OnBh c3NNb3VzZURvd25FdmVudFRvV2lkZ2V0KFdpZGdldCogcFdpZGdldCkKICAgICAgICAgcmV0dXJu IHRydWU7CiAgICAgfQogCi0gICAgLy8gSW4gV2ViS2l0MiB3ZSB3aWxsIG5ldmVyIGhhdmUgYW4g TlNWaWV3LiBKdXN0IHJldHVybiBlYXJseSBhbmQgbGV0IHRoZSByZWd1bGFyIGV2ZW50IGhhbmRs ZXIgbWFjaGluZXJ5IHRha2UgY2FyZSBvZgorICAgIC8vIEluIFdlYktpdDIgd2Ugd2lsbCBuZXZl ciBoYXZlIGEgbmF0aXZlIHdpZGdldC4gSnVzdCByZXR1cm4gZWFybHkgYW5kIGxldCB0aGUgcmVn dWxhciBldmVudCBoYW5kbGVyIG1hY2hpbmVyeSB0YWtlIGNhcmUgb2YKICAgICAvLyBkaXNwYXRj aGluZyB0aGUgZXZlbnQuCiAgICAgaWYgKCF3aWRnZXQtPnBsYXRmb3JtV2lkZ2V0KCkpCiAgICAg ICAgIHJldHVybiBmYWxzZTsKIAogICAgIEJFR0lOX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKLSAg ICAKKwogICAgIE5TVmlldyAqbm9kZVZpZXcgPSB3aWRnZXQtPnBsYXRmb3JtV2lkZ2V0KCk7CiAg ICAgQVNTRVJUKFtub2RlVmlldyBzdXBlcnZpZXddKTsKICAgICBOU1ZpZXcgKnZpZXcgPSBbbm9k ZVZpZXcgaGl0VGVzdDpbW25vZGVWaWV3IHN1cGVydmlld10gY29udmVydFBvaW50OltjdXJyZW50 TlNFdmVudCgpIGxvY2F0aW9uSW5XaW5kb3ddIGZyb21WaWV3Om5pbF1dOwpAQCAtMTk4LDcgKzE5 OCw3IEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpwYXNzTW91c2VEb3duRXZlbnRUb1dpZGdldChXaWRn ZXQqIHBXaWRnZXQpCiAgICAgICAgIC8vIFdlIHByb2JhYmx5IGhpdCB0aGUgYm9yZGVyIG9mIGEg UmVuZGVyV2lkZ2V0CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KLSAgICAKKwogICAgIFBh Z2UqIHBhZ2UgPSBtX2ZyYW1lLnBhZ2UoKTsKICAgICBpZiAoIXBhZ2UpCiAgICAgICAgIHJldHVy biB0cnVlOwpAQCAtMjEyLDExICsyMTIsMTEgQEAgYm9vbCBFdmVudEhhbmRsZXI6OnBhc3NNb3Vz ZURvd25FdmVudFRvV2lkZ2V0KFdpZGdldCogcFdpZGdldCkKIAogICAgIC8vIFdlIG5lZWQgdG8g ImRlZmVyIGxvYWRpbmciIHdoaWxlIHRyYWNraW5nIHRoZSBtb3VzZSwgYmVjYXVzZSB0ZWFyaW5n IGRvd24gdGhlCiAgICAgLy8gcGFnZSB3aGlsZSBhbiBBcHBLaXQgY29udHJvbCBpcyB0cmFja2lu ZyB0aGUgbW91c2UgY2FuIGNhdXNlIGEgY3Jhc2guCi0gICAgCisKICAgICAvLyBGSVhNRTogSW4g dGhlb3J5LCBXZWJDb3JlIG5vdyB0b2xlcmF0ZXMgdGVhci1kb3duIHdoaWxlIHRyYWNraW5nIHRo ZQogICAgIC8vIG1vdXNlLiBXZSBzaG91bGQgY29uZmlybSB0aGF0LCBhbmQgdGhlbiByZW1vdmUg dGhlIGRlZmVycnNMb2FkaW5nCiAgICAgLy8gaGFjayBlbnRpcmVseS4KLSAgICAKKwogICAgIGJv b2wgd2FzRGVmZXJyaW5nTG9hZGluZyA9IHBhZ2UtPmRlZmVyc0xvYWRpbmcoKTsKICAgICBpZiAo IXdhc0RlZmVycmluZ0xvYWRpbmcpCiAgICAgICAgIHBhZ2UtPnNldERlZmVyc0xvYWRpbmcodHJ1 ZSk7CkBAIC0yMzcsNyArMjM3LDcgQEAgYm9vbCBFdmVudEhhbmRsZXI6OnBhc3NNb3VzZURvd25F dmVudFRvV2lkZ2V0KFdpZGdldCogcFdpZGdldCkKICAgICAvLyBSZW1lbWJlciB3aGljaCB2aWV3 IHdlIHNlbnQgdGhlIGV2ZW50IHRvLCBzbyB3ZSBjYW4gZGlyZWN0IHRoZSByZWxlYXNlIGV2ZW50 IHByb3Blcmx5LgogICAgIG1fbW91c2VEb3duVmlldyA9IHZpZXc7CiAgICAgbV9tb3VzZURvd25X YXNJblN1YmZyYW1lID0gZmFsc2U7Ci0gICAgCisKICAgICAvLyBNYW55IEFwcEtpdCB3aWRnZXRz IHJ1biB0aGVpciBvd24gZXZlbnQgbG9vcHMgYW5kIGNvbnN1bWUgZXZlbnRzIHdoaWxlIHRoZSBt b3VzZSBpcyBkb3duLgogICAgIC8vIFdoZW4gdGhleSBmaW5pc2gsIGN1cnJlbnRFdmVudCBpcyB0 aGUgbW91c2VVcCB0aGF0IHRoZXkgZXhpdGVkIG9uLiAgV2UgbmVlZCB0byB1cGRhdGUKICAgICAv LyB0aGUgRXZlbnRIYW5kbGVyIHN0YXRlIHdpdGggdGhpcyBtb3VzZVVwLCB3aGljaCB3ZSBuZXZl ciBzYXcuCkBAIC0yNTAsNyArMjUwLDcgQEAgYm9vbCBFdmVudEhhbmRsZXI6OnBhc3NNb3VzZURv d25FdmVudFRvV2lkZ2V0KFdpZGdldCogcFdpZGdldCkKIAogICAgIHJldHVybiB0cnVlOwogfQot ICAgIAorCiAvLyBOb3RlIHRoYXQgdGhpcyBkb2VzIHRoZSBzYW1lIGtpbmQgb2YgY2hlY2sgYXMg W3RhcmdldCBpc0Rlc2NlbmRhbnRPZjpzdXBlcnZpZXddLgogLy8gVGhlcmUgYXJlIHR3byBkaWZm ZXJlbmNlczogVGhpcyBpcyBhIGxvdCBzbG93ZXIgYmVjYXVzZSBpdCBoYXMgdG8gd2FsayB0aGUg d2hvbGUKIC8vIHRyZWUsIGFuZCB0aGlzIHdvcmtzIGluIGNhc2VzIHdoZXJlIHRoZSB0YXJnZXQg aGFzIGFscmVhZHkgYmVlbiBkZWFsbG9jYXRlZC4KQEAgLTI2NSw3ICsyNjUsNyBAQCBzdGF0aWMg Ym9vbCBmaW5kVmlld0luU3Vidmlld3MoTlNWaWV3ICpzdXBlcnZpZXcsIE5TVmlldyAqdGFyZ2V0 KQogICAgICAgICB9CiAgICAgfQogICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQVElPTlM7Ci0gICAg CisKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKQEAgLTMwNywxMyArMzA3LDEzIEBAIGJvb2wgRXZl bnRIYW5kbGVyOjpldmVudExvb3BIYW5kbGVNb3VzZURyYWdnZWQoY29uc3QgTW91c2VFdmVudFdp dGhIaXRUZXN0UmVzdWx0CiAgICAgcmV0dXJuIHRydWU7CiB9CiAjZW5kaWYgLy8gRU5BQkxFKERS QUdfU1VQUE9SVCkKLSAgICAKKwogYm9vbCBFdmVudEhhbmRsZXI6OmV2ZW50TG9vcEhhbmRsZU1v dXNlVXAoY29uc3QgTW91c2VFdmVudFdpdGhIaXRUZXN0UmVzdWx0cyYpCiB7CiAgICAgTlNWaWV3 ICp2aWV3ID0gbW91c2VEb3duVmlld0lmU3RpbGxHb29kKCk7CiAgICAgaWYgKCF2aWV3KQogICAg ICAgICByZXR1cm4gZmFsc2U7Ci0gICAgCisKICAgICBpZiAoIW1fbW91c2VEb3duV2FzSW5TdWJm cmFtZSkgewogICAgICAgICBBU1NFUlQoIW1fc2VuZGluZ0V2ZW50VG9TdWJ2aWV3KTsKICAgICAg ICAgbV9zZW5kaW5nRXZlbnRUb1N1YnZpZXcgPSB0cnVlOwpAQCAtNDQwLDkgKzQ0MCwxMCBAQCBi b29sIEV2ZW50SGFuZGxlcjo6cGFzc1doZWVsRXZlbnRUb1dpZGdldChjb25zdCBQbGF0Zm9ybVdo ZWVsRXZlbnQmIHdoZWVsRXZlbnQsCiAgICAgQVNTRVJUKG5vZGVWaWV3KTsKICAgICBBU1NFUlQo W25vZGVWaWV3IHN1cGVydmlld10pOwogICAgIE5TVmlldyAqdmlldyA9IFtub2RlVmlldyBoaXRU ZXN0Oltbbm9kZVZpZXcgc3VwZXJ2aWV3XSBjb252ZXJ0UG9pbnQ6W2N1cnJlbnROU0V2ZW50KCkg bG9jYXRpb25JbldpbmRvd10gZnJvbVZpZXc6bmlsXV07Ci0gICAgaWYgKCF2aWV3KQorICAgIGlm ICghdmlldykgewogICAgICAgICAvLyBXZSBwcm9iYWJseSBoaXQgdGhlIGJvcmRlciBvZiBhIFJl bmRlcldpZGdldAogICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQogCiAgICAgQVNTRVJUKCFt X3NlbmRpbmdFdmVudFRvU3Vidmlldyk7CiAgICAgbV9zZW5kaW5nRXZlbnRUb1N1YnZpZXcgPSB0 cnVlOwpAQCAtNDU0LDcgKzQ1NSw3IEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpwYXNzV2hlZWxFdmVu dFRvV2lkZ2V0KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgd2hlZWxFdmVudCwKICAgICBzZXRO U1Njcm9sbFZpZXdTY3JvbGxXaGVlbFNob3VsZFJldGFpblNlbGYoZmFsc2UpOwogICAgIG1fc2Vu ZGluZ0V2ZW50VG9TdWJ2aWV3ID0gZmFsc2U7CiAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgICAg ICAKKwogICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQVElPTlM7CiAgICAgcmV0dXJuIGZhbHNlOwog fQpAQCAtNTkxLDcgKzU5Miw3IEBAIHZvaWQgRXZlbnRIYW5kbGVyOjptb3VzZU1vdmVkKE5TRXZl bnQgKmV2ZW50KQogICAgIC8vIFRoZXNlIGhhcHBlbiBiZWNhdXNlIFdlYktpdCBzb21ldGltZXMg aGFzIHRvIGZha2UgdXAgbW92ZWQgZXZlbnRzLgogICAgIGlmICghbV9mcmFtZS52aWV3KCkgfHwg bV9tb3VzZVByZXNzZWQgfHwgbV9zZW5kaW5nRXZlbnRUb1N1YnZpZXcpCiAgICAgICAgIHJldHVy bjsKLSAgICAKKwogICAgIEJFR0lOX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKICAgICBDdXJyZW50 RXZlbnRTY29wZSBzY29wZShldmVudCk7CiAgICAgbW91c2VNb3ZlZChjdXJyZW50UGxhdGZvcm1N b3VzZUV2ZW50KCkpOwo=