216326 2020-09-09 15:02:01 -0700 macCatalyst: Form controls behave strangely (like iPhone) in macOS-idiom apps 2020-09-09 15:54:46 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton bdakin hi megan_gardner wenson_hsieh oldest_to_newest 1687137 0 thorton 2020-09-09 15:02:01 -0700 macCatalyst: Form controls behave strangely (like iPhone) in macOS-idiom apps 1687138 1 408369 thorton 2020-09-09 15:02:13 -0700 Created attachment 408369 Patch 1687139 2 thorton 2020-09-09 15:02:36 -0700 <rdar://problem/68595838> 1687178 3 ews-feeder 2020-09-09 15:54:45 -0700 Committed r266804: <https://trac.webkit.org/changeset/266804> All reviewed patches have been landed. Closing bug and clearing flags on attachment 408369. 408369 2020-09-09 15:02:13 -0700 2020-09-09 15:54:45 -0700 Patch bug-216326-20200909150213.patch text/plain 20581 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2NzY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGZkZjQ1MjgzODRhZmIzYzA2 MDkxNjE1YTUyMmJhOTYyNjJlM2ZjMjMuLjk1ZTZiMDQ0MjY4NDE4ZWE1N2FkNTc2NzRhM2UwZGYx YmVlYjU3ZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNjAgQEAKKzIwMjAtMDktMDkgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgbWFjQ2F0YWx5c3Q6IEZv cm0gY29udHJvbHMgYmVoYXZlIHN0cmFuZ2VseSAobGlrZSBpUGhvbmUpIGluIG1hY09TLWlkaW9t IGFwcHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx NjMyNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog U2hhcmVkL1VzZXJJbnRlcmZhY2VJZGlvbS5oOgorICAgICAgICAqIFNoYXJlZC9Vc2VySW50ZXJm YWNlSWRpb20ubW06CisgICAgICAgIChXZWJLaXQ6OnVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkKToK KyAgICAgICAgKFdlYktpdDo6Y3VycmVudFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkT3JNYWMpOgor ICAgICAgICAoV2ViS2l0OjpzZXRDdXJyZW50VXNlckludGVyZmFjZUlkaW9tSXNQYWRPck1hYyk6 CisgICAgICAgIChXZWJLaXQ6OmN1cnJlbnRVc2VySW50ZXJmYWNlSWRpb21Jc1BhZCk6IERlbGV0 ZWQuCisgICAgICAgIChXZWJLaXQ6OnNldEN1cnJlbnRVc2VySW50ZXJmYWNlSWRpb21Jc1BhZCk6 IERlbGV0ZWQuCisgICAgICAgICogU2hhcmVkL2lvcy9XZWJQcmVmZXJlbmNlc0RlZmF1bHRWYWx1 ZXNJT1MubW06CisgICAgICAgIChXZWJLaXQ6OmRlZmF1bHRUZXh0QXV0b3NpemluZ1VzZXNJZGVt cG90ZW50TW9kZSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdDb25m aWd1cmF0aW9uLm1tOgorICAgICAgICAoLVtXS1dlYlZpZXdDb25maWd1cmF0aW9uIGluaXRdKToK KyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbToKKyAgICAg ICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3Mp OgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvU21hcnRNYWduaWZpY2F0aW9uQ29udHJvbGxlci5t bToKKyAgICAgICAgKFdlYktpdDo6U21hcnRNYWduaWZpY2F0aW9uQ29udHJvbGxlcjo6ZGlkQ29s bGVjdEdlb21ldHJ5Rm9yU21hcnRNYWduaWZpY2F0aW9uR2VzdHVyZSk6CisgICAgICAgICogVUlQ cm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAgICgtW1dLRm9y bUlucHV0U2Vzc2lvbiBzZXRBY2Nlc3NvcnlWaWV3Q3VzdG9tQnV0dG9uVGl0bGU6XSk6CisgICAg ICAgICgtW1dLQ29udGVudFZpZXcgZW5kRWRpdGluZ0FuZFVwZGF0ZUZvY3VzQXBwZWFyYW5jZVdp dGhSZWFzb246XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX3Nob3VsZFNob3dBdXRvbWF0 aWNLZXlib2FyZFVJSWdub3JpbmdJbnB1dE1vZGVdKToKKyAgICAgICAgKC1bV0tDb250ZW50Vmll dyBfem9vbVRvUmV2ZWFsRm9jdXNlZEVsZW1lbnRdKToKKyAgICAgICAgKC1bV0tDb250ZW50Vmll dyByZXF1aXJlc0FjY2Vzc29yeVZpZXddKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfdXBk YXRlQWNjZXNzb3J5XSk6CisgICAgICAgIChzaG91bGRTaG93S2V5Ym9hcmRGb3JFbGVtZW50KToK KyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfc2hvdWxkVXNlTGVnYWN5U2VsZWN0UG9wb3ZlckRp c21pc3NhbEJlaGF2aW9yXSk6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XZWJEYXRhTGlzdFN1 Z2dlc3Rpb25zRHJvcGRvd25JT1MubW06CisgICAgICAgIChXZWJLaXQ6OldlYkRhdGFMaXN0U3Vn Z2VzdGlvbnNEcm9wZG93bklPUzo6c2hvdyk6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XZWJQ YWdlUHJveHlJT1MubW06CisgICAgICAgIChXZWJLaXQ6OmRlc2t0b3BDbGFzc0Jyb3dzaW5nU3Vw cG9ydGVkKToKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL2Zvcm1zL1dLQWlyUGxheVJvdXRlUGlj a2VyLm1tOgorICAgICAgICAoLVtXS0FpclBsYXlSb3V0ZVBpY2tlciBzaG93OmZyb21SZWN0Ol0p OgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGaWxlVXBsb2FkUGFuZWwubW06Cisg ICAgICAgICgtW1dLRmlsZVVwbG9hZFBhbmVsIF9zaG93UGhvdG9QaWNrZXJXaXRoU291cmNlVHlw ZTpdKToKKyAgICAgICAgKC1bV0tGaWxlVXBsb2FkUGFuZWwgX3ByZXNlbnRNZW51T3B0aW9uRm9y Q3VycmVudEludGVyZmFjZUlkaW9tOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvZm9ybXMv V0tGb3JtQ29sb3JDb250cm9sLm1tOgorICAgICAgICAoLVtXS0Zvcm1Db2xvckNvbnRyb2wgaW5p dFdpdGhWaWV3Ol0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGb3JtQ29sb3JQ aWNrZXIubW06CisgICAgICAgICgtW1dLQ29sb3JQaWNrZXIgaW5pdFdpdGhWaWV3OmluUG9wb3Zl cjpdKToKKyAgICAgICAgKC1bV0tDb2xvclBpY2tlciBkcmF3U2VsZWN0aW9uSW5kaWNhdG9yRm9y Q29sb3JCdXR0b246XSk6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0Zvcm1TZWxl Y3RDb250cm9sLm1tOgorICAgICAgICAoLVtXS0Zvcm1TZWxlY3RDb250cm9sIGluaXRXaXRoVmll dzpdKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbToKKyAg ICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyk6 CisgICAgICAgIFJlbmFtZSBjdXJyZW50VXNlckludGVyZmFjZUlkaW9tSXNQYWQgdG8gY3VycmVu dFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkT3JNYWMsCisgICAgICAgIGFuZCBmb3JjZSBpdCB0byBZ RVMgb24gbWFjQ2F0YWx5c3Qgc2luY2UgaW50ZXJuYWxseSB3ZSB1c2UgaXQgdG8gZGlzdGluZ3Vp c2gKKyAgICAgICAgYmV0d2VlbiBpUGhvbmUgYW5kIGlQYWQgYmVoYXZpb3IsIGFuZCAoZm9yIG91 ciBiZWhhdmlvcnMsIGF0IGxlYXN0KSBtYWNDYXRhbHlzdAorICAgICAgICBzaG91bGQgYWx3YXlz IGZvbGxvdyBpUGFkLgorCisgICAgICAgIFdlIHNob3VsZCBjbGVhbiB0aGlzIHVwLCBhbmQgbWFr ZSBhbGwgY2FsbGVycyBtYWtlIHRoZWlyCisgICAgICAgIGlQaG9uZSB2cy4gaVBhZCB2cy4gbWFj T1MgZGVjaXNpb25zIG1vcmUgZXhwbGljaXQuCisKIDIwMjAtMDktMDggIE1lZ2FuIEdhcmRuZXIg IDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmVkIHVubmVlZGVkIHJl c3BvbmRzVG9TZWxlY3RvciBjaGVja3Mgb24gVUlXS1RleHRJbnRlcmFjdGlvbkFzc2lzdGFudCBp biBXS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1No YXJlZC9Vc2VySW50ZXJmYWNlSWRpb20uaCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1VzZXJJbnRl cmZhY2VJZGlvbS5oCmluZGV4IDViMzBlNmZhMmQ5ZDlhZWIzZmE5NDFlYjM2MmQ3ZTM5ODkzYzA3 MzIuLmViZGM2NzgxMDE5NjgwYWY2MTFlMTJiMDU0MmM2YzU2YTYyOGY1Y2QgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvU2hhcmVkL1VzZXJJbnRlcmZhY2VJZGlvbS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvU2hhcmVkL1VzZXJJbnRlcmZhY2VJZGlvbS5oCkBAIC0yOSw4ICsyOSw4IEBACiAKIG5h bWVzcGFjZSBXZWJLaXQgewogCi1ib29sIGN1cnJlbnRVc2VySW50ZXJmYWNlSWRpb21Jc1BhZCgp Owotdm9pZCBzZXRDdXJyZW50VXNlckludGVyZmFjZUlkaW9tSXNQYWQoYm9vbCk7Citib29sIGN1 cnJlbnRVc2VySW50ZXJmYWNlSWRpb21Jc1BhZE9yTWFjKCk7Cit2b2lkIHNldEN1cnJlbnRVc2Vy SW50ZXJmYWNlSWRpb21Jc1BhZE9yTWFjKGJvb2wpOwogCiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvU2hhcmVkL1VzZXJJbnRlcmZhY2VJZGlvbS5tbSBiL1NvdXJjZS9XZWJLaXQvU2hh cmVkL1VzZXJJbnRlcmZhY2VJZGlvbS5tbQppbmRleCAyZTIzNTJkY2I0OGVkY2JhZDE4YjZlYmVi N2U3OTQ4OGQ0MjQyMzUzLi43YWNlMTI4YWZjYzM2YTI0MTM5MWRiY2Y1NzYyMmUyY2U5NTI1MmM3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Vc2VySW50ZXJmYWNlSWRpb20ubW0K KysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvVXNlckludGVyZmFjZUlkaW9tLm1tCkBAIC00Myw2 ICs0MywxMiBAQCBzdGF0aWMgVXNlckludGVyZmFjZUlkaW9tU3RhdGUgdXNlckludGVyZmFjZUlk aW9tSXNQYWRTdGF0ZSA9IFVzZXJJbnRlcmZhY2VJZGlvbQogCiBzdGF0aWMgaW5saW5lIGJvb2wg dXNlckludGVyZmFjZUlkaW9tSXNQYWQoKQogeworI2lmIFBMQVRGT1JNKE1BQ0NBVEFMWVNUKQor ICAgIC8vIFVJS2l0IHZhcmllcyB0aGUgVUlVc2VySW50ZXJmYWNlSWRpb20gYmV0d2VlbiBpUGFk IGFuZCBtYWNPUyBpbiBtYWNDYXRhbHlzdCwgZGVwZW5kaW5nIG9uIHZhcmlvdXMgc2V0dGluZ3Ms CisgICAgLy8gYnV0IGZvciB0aGUgcHVycG9zZXMgb2YgV2ViS2l0IHdlIGFsd2F5cyB3YW50IHRv IHVzZSBpUGFkIGJlaGF2aW9yICh2cy4gaVBob25lKSBpbiBtYWNDYXRhbHlzdC4KKyAgICAvLyBG SVhNRTogV2Ugc2hvdWxkIGdldCByaWQgb2YgdGhpcyBmdW5jdGlvbiBhbmQgaGF2ZSBjYWxsZXJz IG1ha2UgZXhwbGljaXQgZGVjaXNpb25zIGZvciBhbGwgb2YgaVBob25lL2lQYWQvbWFjT1MuCisg ICAgcmV0dXJuIHRydWU7CisjZWxzZQogICAgIC8vIElmIHdlIGFyZSBpbiBhIGRhZW1vbiwgd2Ug Y2Fubm90IHVzZSBVSURldmljZS4gRmFsbCBiYWNrIHRvIGNoZWNraW5nIHRoZSBoYXJkd2FyZSBp dHNlbGYuCiAgICAgLy8gU2luY2UgZGFlbW9ucyBkb24ndCBldmVyIHJ1biBpbiBhbiBpUGhvbmUt YXBwLW9uLWlQYWQgamFpbCwgdGhpcyB3aWxsIGJlIGFjY3VyYXRlIGluIHRoZSBkYWVtb24gY2Fz ZSwKICAgICAvLyBidXQgaXMgbm90IHN1ZmZpY2llbnQgaW4gdGhlIGFwcGxpY2F0aW9uIGNhc2Uu CkBAIC01MiwyMiArNTgsMjMgQEAgc3RhdGljIGlubGluZSBib29sIHVzZXJJbnRlcmZhY2VJZGlv bUlzUGFkKCkKICAgICAvLyBUaGlzIGlubGluZSBmdW5jdGlvbiBleGlzdHMgdG8gdGh3YXJ0IHVu cmVhY2hhYmxlIGNvZGUKICAgICAvLyBkZXRlY3Rpb24gb24gcGxhdGZvcm1zIHdoZXJlIFVJQ3Vy cmVudFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkCiAgICAgLy8gaXMgZGVmaW5lZCBkaXJlY3RseSB0 byBmYWxzZS4KLSNpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKSAmJiAhUExBVEZPUk0oTUFDQ0FU QUxZU1QpCisjaWYgVVNFKEFQUExFX0lOVEVSTkFMX1NESykKICAgICByZXR1cm4gVUlDdXJyZW50 VXNlckludGVyZmFjZUlkaW9tSXNQYWQoKTsKICNlbHNlCiAgICAgcmV0dXJuIFtbVUlEZXZpY2Ug Y3VycmVudERldmljZV0gdXNlckludGVyZmFjZUlkaW9tXSA9PSBVSVVzZXJJbnRlcmZhY2VJZGlv bVBhZDsKICNlbmRpZgorI2VuZGlmCiB9CiAKLWJvb2wgY3VycmVudFVzZXJJbnRlcmZhY2VJZGlv bUlzUGFkKCkKK2Jvb2wgY3VycmVudFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkT3JNYWMoKQogewog ICAgIGlmICh1c2VySW50ZXJmYWNlSWRpb21Jc1BhZFN0YXRlID09IFVzZXJJbnRlcmZhY2VJZGlv bVN0YXRlOjpVbmtub3duKQotICAgICAgICBzZXRDdXJyZW50VXNlckludGVyZmFjZUlkaW9tSXNQ YWQodXNlckludGVyZmFjZUlkaW9tSXNQYWQoKSk7CisgICAgICAgIHNldEN1cnJlbnRVc2VySW50 ZXJmYWNlSWRpb21Jc1BhZE9yTWFjKHVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkKCkpOwogCiAgICAg cmV0dXJuIHVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkU3RhdGUgPT0gVXNlckludGVyZmFjZUlkaW9t U3RhdGU6OklzUGFkOwogfQogCi12b2lkIHNldEN1cnJlbnRVc2VySW50ZXJmYWNlSWRpb21Jc1Bh ZChib29sIGlzUGFkKQordm9pZCBzZXRDdXJyZW50VXNlckludGVyZmFjZUlkaW9tSXNQYWRPck1h Yyhib29sIGlzUGFkKQogewogICAgIHVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkU3RhdGUgPSBpc1Bh ZCA/IFVzZXJJbnRlcmZhY2VJZGlvbVN0YXRlOjpJc1BhZCA6IFVzZXJJbnRlcmZhY2VJZGlvbVN0 YXRlOjpJc05vdFBhZDsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2lvcy9X ZWJQcmVmZXJlbmNlc0RlZmF1bHRWYWx1ZXNJT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9p b3MvV2ViUHJlZmVyZW5jZXNEZWZhdWx0VmFsdWVzSU9TLm1tCmluZGV4IDQwYzUxOWM1M2Y2ZmNh NjZlOTYzOTM4ZTBjYjZmZmIxOGRhODU2N2EuLjM2MmRjZDIxZTFhMTgzN2VhNDY0OTA0NDE3MjQ2 Yjk3MzA0MGI3MjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2lvcy9XZWJQcmVm ZXJlbmNlc0RlZmF1bHRWYWx1ZXNJT1MubW0KKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvaW9z L1dlYlByZWZlcmVuY2VzRGVmYXVsdFZhbHVlc0lPUy5tbQpAQCAtMzgsNyArMzgsNyBAQCBuYW1l c3BhY2UgV2ViS2l0IHsKIAogYm9vbCBkZWZhdWx0VGV4dEF1dG9zaXppbmdVc2VzSWRlbXBvdGVu dE1vZGUoKQogewotICAgIHJldHVybiBjdXJyZW50VXNlckludGVyZmFjZUlkaW9tSXNQYWQoKTsK KyAgICByZXR1cm4gY3VycmVudFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkT3JNYWMoKTsKIH0KIAog I2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tX ZWJWaWV3Q29uZmlndXJhdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYlZpZXdDb25maWd1cmF0aW9uLm1tCmluZGV4IDgzNjkzY2JmZjQ2OTFjNDEwMmRlZTYy MzVjZTE1NmUwNWRmYmM4NmMuLmJmYzZhY2UyMWNlZTQ0ZTkwNjY0MmY0NWEwNDc5N2M1YWFjMjQ4 ZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZp ZXdDb25maWd1cmF0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYlZpZXdDb25maWd1cmF0aW9uLm1tCkBAIC0xOTMsMTEgKzE5Myw3IEBAIC0gKGluc3Rh bmNldHlwZSlpbml0CiAgICAgX2FsbG93c1BpY3R1cmVJblBpY3R1cmVNZWRpYVBsYXliYWNrID0g WUVTOwogI2VuZGlmCiAKLSNpZiBQTEFURk9STShNQUNDQVRBTFlTVCkKLSAgICBfYWxsb3dzSW5s aW5lTWVkaWFQbGF5YmFjayA9IFlFUzsKLSNlbHNlCi0gICAgX2FsbG93c0lubGluZU1lZGlhUGxh eWJhY2sgPSBXZWJLaXQ6OmN1cnJlbnRVc2VySW50ZXJmYWNlSWRpb21Jc1BhZCgpOwotI2VuZGlm CisgICAgX2FsbG93c0lubGluZU1lZGlhUGxheWJhY2sgPSBXZWJLaXQ6OmN1cnJlbnRVc2VySW50 ZXJmYWNlSWRpb21Jc1BhZE9yTWFjKCk7CiAgICAgX2lubGluZU1lZGlhUGxheWJhY2tSZXF1aXJl c1BsYXlzSW5saW5lQXR0cmlidXRlID0gIV9hbGxvd3NJbmxpbmVNZWRpYVBsYXliYWNrOwogICAg IF9hbGxvd3NJbmxpbmVNZWRpYVBsYXliYWNrQWZ0ZXJGdWxsc2NyZWVuID0gIV9hbGxvd3NJbmxp bmVNZWRpYVBsYXliYWNrOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9D b2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29j b2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbQppbmRleCBlN2UxMGU0ZTBmMTViODkxNTk2Mjc3NjBk YmFmMzU5OWM5OTE3MDU2Li5jZWE2NWM0NzliZjU2M2VmMzgzNGYxOGVkNjgxMDkwYzY3YjllZTk4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9v bENvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQ b29sQ29jb2EubW0KQEAgLTQ0MSw3ICs0NDEsNyBAQCB2b2lkIFdlYlByb2Nlc3NQb29sOjpwbGF0 Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKGNvbnN0IFdlYlByb2Nlc3NQcm94eSYgcHJvY2Vzcwog ICAgIH0KIAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0gICAgcGFyYW1ldGVycy5jdXJyZW50 VXNlckludGVyZmFjZUlkaW9tSXNQYWQgPSBjdXJyZW50VXNlckludGVyZmFjZUlkaW9tSXNQYWQo KTsKKyAgICBwYXJhbWV0ZXJzLmN1cnJlbnRVc2VySW50ZXJmYWNlSWRpb21Jc1BhZCA9IGN1cnJl bnRVc2VySW50ZXJmYWNlSWRpb21Jc1BhZE9yTWFjKCk7CiAgICAgcGFyYW1ldGVycy5zdXBwb3J0 c1BpY3R1cmVJblBpY3R1cmUgPSBzdXBwb3J0c1BpY3R1cmVJblBpY3R1cmUoKTsKICAgICBwYXJh bWV0ZXJzLmNzc1ZhbHVlVG9TeXN0ZW1Db2xvck1hcCA9IFJlbmRlclRoZW1lSU9TOjpjc3NWYWx1 ZVRvU3lzdGVtQ29sb3JNYXAoKTsKICNpZiBFTkFCTEUoRlVMTF9LRVlCT0FSRF9BQ0NFU1MpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvU21hcnRNYWduaWZpY2F0aW9u Q29udHJvbGxlci5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9TbWFydE1hZ25pZmlj YXRpb25Db250cm9sbGVyLm1tCmluZGV4IDY5MTQxMjRhNDU1NDIxODIxOTRiZWMxZGI3ZmNiM2I1 MTIyMDk4NjQuLjUzMzQwNjRhMGI4NmVlMjcwMGY0OTIyZjI0YjY1MGU5N2ViZWVhNzkgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9TbWFydE1hZ25pZmljYXRpb25Db250 cm9sbGVyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9TbWFydE1hZ25pZmlj YXRpb25Db250cm9sbGVyLm1tCkBAIC0xMTksNyArMTE5LDcgQEAgdm9pZCBTbWFydE1hZ25pZmlj YXRpb25Db250cm9sbGVyOjpkaWRDb2xsZWN0R2VvbWV0cnlGb3JTbWFydE1hZ25pZmljYXRpb25H ZXN0dXIKICAgICBmbG9hdCBtaW5pbXVtU2Nyb2xsRGlzdGFuY2U7CiAgICAgaWYgKFttX2NvbnRl bnRWaWV3IGJvdW5kc10uc2l6ZS53aWR0aCA8PSBtX3dlYlBhZ2VQcm94eS51bm9ic2N1cmVkQ29u dGVudFJlY3QoKS53aWR0aCgpKQogICAgICAgICBtaW5pbXVtU2Nyb2xsRGlzdGFuY2UgPSBzbWFy dE1hZ25pZmljYXRpb25QYW5TY3JvbGxUaHJlc2hvbGRab29tZWRPdXQ7Ci0gICAgZWxzZSBpZiAo Y3VycmVudFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkKCkpCisgICAgZWxzZSBpZiAoY3VycmVudFVz ZXJJbnRlcmZhY2VJZGlvbUlzUGFkT3JNYWMoKSkKICAgICAgICAgbWluaW11bVNjcm9sbERpc3Rh bmNlID0gc21hcnRNYWduaWZpY2F0aW9uUGFuU2Nyb2xsVGhyZXNob2xkSVBhZDsKICAgICBlbHNl CiAgICAgICAgIG1pbmltdW1TY3JvbGxEaXN0YW5jZSA9IHNtYXJ0TWFnbmlmaWNhdGlvblBhblNj cm9sbFRocmVzaG9sZElQaG9uZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IDVmODdlMjdiZTk3YThjMTJk ZTQ2NmFmNjM1ZDE5OTViMDkyYTk3OTYuLmJmMTc0YTZhYjZlYmI0YWI0YTY0MjY0ZDE3ZDVhOTE0 MDZiZWY1MjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRl bnRWaWV3SW50ZXJhY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dL Q29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpAQCAtMzg4LDcgKzM4OCw3IEBAIC0gKHZvaWQpc2V0 QWNjZXNzb3J5Vmlld0N1c3RvbUJ1dHRvblRpdGxlOihOU1N0cmluZyAqKXRpdGxlCiAgICAgICAg IFtbX2NvbnRlbnRWaWV3IGZvcm1BY2Nlc3NvcnlWaWV3XSBzaG93QXV0b0ZpbGxCdXR0b25XaXRo VGl0bGU6dGl0bGVdOwogICAgIGVsc2UKICAgICAgICAgW1tfY29udGVudFZpZXcgZm9ybUFjY2Vz c29yeVZpZXddIGhpZGVBdXRvRmlsbEJ1dHRvbl07Ci0gICAgaWYgKFdlYktpdDo6Y3VycmVudFVz ZXJJbnRlcmZhY2VJZGlvbUlzUGFkKCkpCisgICAgaWYgKFdlYktpdDo6Y3VycmVudFVzZXJJbnRl cmZhY2VJZGlvbUlzUGFkT3JNYWMoKSkKICAgICAgICAgW19jb250ZW50VmlldyByZWxvYWRJbnB1 dFZpZXdzXTsKIH0KIApAQCAtMTM4MCw3ICsxMzgwLDcgQEAgLSAodm9pZCllbmRFZGl0aW5nQW5k VXBkYXRlRm9jdXNBcHBlYXJhbmNlV2l0aFJlYXNvbjooRW5kRWRpdGluZ1JlYXNvbilyZWFzb24K ICAgICAgICAgICAgICAgICBpZiAoX2ZvY3VzUmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lzdGFu Y2UpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwogCi0gICAgICAgICAgICAgICAg aWYgKCFXZWJLaXQ6OmN1cnJlbnRVc2VySW50ZXJmYWNlSWRpb21Jc1BhZCgpKQorICAgICAgICAg ICAgICAgIGlmICghV2ViS2l0OjpjdXJyZW50VXNlckludGVyZmFjZUlkaW9tSXNQYWRPck1hYygp KQogICAgICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgICAgIH0KIApAQCAt MTk1MSw3ICsxOTUxLDcgQEAgLSAoQk9PTClfc2hvdWxkU2hvd0F1dG9tYXRpY0tleWJvYXJkVUlJ Z25vcmluZ0lucHV0TW9kZQogI2lmIEVOQUJMRShJTlBVVF9UWVBFX0NPTE9SKQogICAgIGNhc2Ug V2ViS2l0OjpJbnB1dFR5cGU6OkNvbG9yOgogI2VuZGlmCi0gICAgICAgIHJldHVybiAhV2ViS2l0 OjpjdXJyZW50VXNlckludGVyZmFjZUlkaW9tSXNQYWQoKTsKKyAgICAgICAgcmV0dXJuICFXZWJL aXQ6OmN1cnJlbnRVc2VySW50ZXJmYWNlSWRpb21Jc1BhZE9yTWFjKCk7CiAgICAgZGVmYXVsdDoK ICAgICAgICAgcmV0dXJuIFlFUzsKICAgICB9CkBAIC0xOTk1LDcgKzE5OTUsNyBAQCAtICh2b2lk KV96b29tVG9SZXZlYWxGb2N1c2VkRWxlbWVudAogICAgICAgICBmb250U2l6ZTpfZm9jdXNlZEVs ZW1lbnRJbmZvcm1hdGlvbi5ub2RlRm9udFNpemUKICAgICAgICAgbWluaW11bVNjYWxlOl9mb2N1 c2VkRWxlbWVudEluZm9ybWF0aW9uLm1pbmltdW1TY2FsZUZhY3RvcgogICAgICAgICBtYXhpbXVt U2NhbGU6X2ZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24ubWF4aW11bVNjYWxlRmFjdG9ySWdub3Jp bmdBbHdheXNTY2FsYWJsZQotICAgICAgICBhbGxvd1NjYWxpbmc6X2ZvY3VzZWRFbGVtZW50SW5m b3JtYXRpb24uYWxsb3dzVXNlclNjYWxpbmdJZ25vcmluZ0Fsd2F5c1NjYWxhYmxlICYmICFXZWJL aXQ6OmN1cnJlbnRVc2VySW50ZXJmYWNlSWRpb21Jc1BhZCgpCisgICAgICAgIGFsbG93U2NhbGlu ZzpfZm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5hbGxvd3NVc2VyU2NhbGluZ0lnbm9yaW5nQWx3 YXlzU2NhbGFibGUgJiYgIVdlYktpdDo6Y3VycmVudFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkT3JN YWMoKQogICAgICAgICBmb3JjZVNjcm9sbDpbc2VsZiByZXF1aXJlc0FjY2Vzc29yeVZpZXddXTsK IH0KIApAQCAtMjk2NSw3ICsyOTY1LDcgQEAgLSAoQk9PTClyZXF1aXJlc0FjY2Vzc29yeVZpZXcK ICNpZiBFTkFCTEUoSU5QVVRfVFlQRV9DT0xPUikKICAgICBjYXNlIFdlYktpdDo6SW5wdXRUeXBl OjpDb2xvcjoKICNlbmRpZgotICAgICAgICByZXR1cm4gIVdlYktpdDo6Y3VycmVudFVzZXJJbnRl cmZhY2VJZGlvbUlzUGFkKCk7CisgICAgICAgIHJldHVybiAhV2ViS2l0OjpjdXJyZW50VXNlcklu dGVyZmFjZUlkaW9tSXNQYWRPck1hYygpOwogICAgIH0KIH0KIApAQCAtNDQ0OCw3ICs0NDQ4LDcg QEAgLSAodm9pZClfdXBkYXRlQWNjZXNzb3J5CiAgICAgW2FjY2Vzc29yeVZpZXcgc2V0TmV4dEVu YWJsZWQ6X2ZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uaGFzTmV4dE5vZGVdOwogICAgIFthY2Nl c3NvcnlWaWV3IHNldFByZXZpb3VzRW5hYmxlZDpfZm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5o YXNQcmV2aW91c05vZGVdOwogCi0gICAgaWYgKFdlYktpdDo6Y3VycmVudFVzZXJJbnRlcmZhY2VJ ZGlvbUlzUGFkKCkpIHsKKyAgICBpZiAoV2ViS2l0OjpjdXJyZW50VXNlckludGVyZmFjZUlkaW9t SXNQYWRPck1hYygpKSB7CiAgICAgICAgIFthY2Nlc3NvcnlWaWV3IHNldENsZWFyVmlzaWJsZTpO T107CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC01ODIwLDcgKzU4MjAsNyBAQCBzdGF0aWMg Ym9vbCBzaG91bGRTaG93S2V5Ym9hcmRGb3JFbGVtZW50KGNvbnN0IFdlYktpdDo6Rm9jdXNlZEVs ZW1lbnRJbmZvcm1hdGlvbgogICAgIGlmIChtYXlDb250YWluU2VsZWN0YWJsZVRleHQoaW5mb3Jt YXRpb24uZWxlbWVudFR5cGUpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAotICAgIHJldHVybiAh V2ViS2l0OjpjdXJyZW50VXNlckludGVyZmFjZUlkaW9tSXNQYWQoKTsKKyAgICByZXR1cm4gIVdl YktpdDo6Y3VycmVudFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkT3JNYWMoKTsKIH0KIAogc3RhdGlj IFdlYkNvcmU6OkZsb2F0UmVjdCByZWN0VG9SZXZlYWxXaGVuWm9vbWluZ1RvRm9jdXNlZEVsZW1l bnQoY29uc3QgV2ViS2l0OjpGb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uJiBlbGVtZW50SW5mbywg Y29uc3QgV2ViS2l0OjpFZGl0b3JTdGF0ZSYgZWRpdG9yU3RhdGUpCkBAIC03MTE1LDcgKzcxMTUs NyBAQCAtIChCT09MKV9zaG91bGRBdm9pZFNjcm9sbGluZ1doZW5Gb2N1c2VkQ29udGVudElzVmlz aWJsZQogCiAtIChCT09MKV9zaG91bGRVc2VMZWdhY3lTZWxlY3RQb3BvdmVyRGlzbWlzc2FsQmVo YXZpb3IKIHsKLSAgICBpZiAoIVdlYktpdDo6Y3VycmVudFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFk KCkpCisgICAgaWYgKCFXZWJLaXQ6OmN1cnJlbnRVc2VySW50ZXJmYWNlSWRpb21Jc1BhZE9yTWFj KCkpCiAgICAgICAgIHJldHVybiBOTzsKIAogICAgIGlmIChfZm9jdXNlZEVsZW1lbnRJbmZvcm1h dGlvbi5lbGVtZW50VHlwZSAhPSBXZWJLaXQ6OklucHV0VHlwZTo6U2VsZWN0KQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dlYkRhdGFMaXN0U3VnZ2VzdGlvbnNEcm9w ZG93bklPUy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XZWJEYXRhTGlzdFN1Z2dl c3Rpb25zRHJvcGRvd25JT1MubW0KaW5kZXggNzYyMGFkOGEyMmRlMGZhMDczMDA5ZTE5ZDM4ZmFk N2I5YjVjZGZjOC4uYjkzODU3ZWY5MGQxM2ZmOTJjZjQ0OTNkZGFiMjQ2MzM1M2VjYTQzNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dlYkRhdGFMaXN0U3VnZ2VzdGlv bnNEcm9wZG93bklPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV2ViRGF0 YUxpc3RTdWdnZXN0aW9uc0Ryb3Bkb3duSU9TLm1tCkBAIC0xMDIsNyArMTAyLDcgQEAgdm9pZCBX ZWJEYXRhTGlzdFN1Z2dlc3Rpb25zRHJvcGRvd25JT1M6OnNob3coV2ViQ29yZTo6RGF0YUxpc3RT dWdnZXN0aW9uSW5mb3JtYXQKIAogICAgIFdlYkNvcmU6OkRhdGFMaXN0U3VnZ2VzdGlvbkFjdGl2 YXRpb25UeXBlIHR5cGUgPSBpbmZvcm1hdGlvbi5hY3RpdmF0aW9uVHlwZTsKIAotICAgIGlmIChj dXJyZW50VXNlckludGVyZmFjZUlkaW9tSXNQYWQoKSkKKyAgICBpZiAoY3VycmVudFVzZXJJbnRl cmZhY2VJZGlvbUlzUGFkT3JNYWMoKSkKICAgICAgICAgbV9zdWdnZXN0aW9uc0NvbnRyb2wgPSBh ZG9wdE5TKFtbV0tEYXRhTGlzdFN1Z2dlc3Rpb25zUG9wb3ZlciBhbGxvY10gaW5pdFdpdGhJbmZv cm1hdGlvbjpXVEZNb3ZlKGluZm9ybWF0aW9uKSBpblZpZXc6bV9jb250ZW50Vmlld10pOwogICAg IGVsc2UKICAgICAgICAgbV9zdWdnZXN0aW9uc0NvbnRyb2wgPSBhZG9wdE5TKFtbV0tEYXRhTGlz dFN1Z2dlc3Rpb25zUGlja2VyIGFsbG9jXSBpbml0V2l0aEluZm9ybWF0aW9uOldURk1vdmUoaW5m b3JtYXRpb24pIGluVmlldzptX2NvbnRlbnRWaWV3XSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9TLm1tIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbQppbmRleCA3NGUwY2UxMjQyYjEwMDdmNGVmMjQ2 ZmNhMjk3Nzg0Mzc3MWUyNTg5Li5mMzdhNzZmODk3M2I4YjQ4ZTA0N2FiZmFlZTc4ZDJlNGE4NmY0 MTI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5 SU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJT1Mu bW0KQEAgLTEzMzksMTEgKzEzMzksNyBAQCBzdGF0aWMgYm9vbCBkZXNrdG9wQ2xhc3NCcm93c2lu Z1N1cHBvcnRlZCgpCiAgICAgc3RhdGljIGJvb2wgc3VwcG9ydHNEZXNrdG9wQ2xhc3NCcm93c2lu ZyA9IGZhbHNlOwogICAgIHN0YXRpYyBkaXNwYXRjaF9vbmNlX3Qgb25jZVRva2VuOwogICAgIGRp c3BhdGNoX29uY2UoJm9uY2VUb2tlbiwgXnsKLSNpZiBQTEFURk9STShNQUNDQVRBTFlTVCkKLSAg ICAgICAgc3VwcG9ydHNEZXNrdG9wQ2xhc3NCcm93c2luZyA9IHRydWU7Ci0jZWxzZQotICAgICAg ICBzdXBwb3J0c0Rlc2t0b3BDbGFzc0Jyb3dzaW5nID0gY3VycmVudFVzZXJJbnRlcmZhY2VJZGlv bUlzUGFkKCk7Ci0jZW5kaWYKKyAgICAgICAgc3VwcG9ydHNEZXNrdG9wQ2xhc3NCcm93c2luZyA9 IGN1cnJlbnRVc2VySW50ZXJmYWNlSWRpb21Jc1BhZE9yTWFjKCk7CiAgICAgfSk7CiAgICAgcmV0 dXJuIHN1cHBvcnRzRGVza3RvcENsYXNzQnJvd3Npbmc7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tBaXJQbGF5Um91dGVQaWNrZXIubW0gYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tBaXJQbGF5Um91dGVQaWNrZXIubW0KaW5k ZXggODkzOTI2OGZmZTE1ZWE4OTg5YTIxNGM0Y2U5YmIyMGE5ZmZlZDM0ZS4uMmM4ZGJiNmJjYjY4 ZmNiODY5NjZhMDk5MzQ5Njc3YTI3ZjUyMzdkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvaW9zL2Zvcm1zL1dLQWlyUGxheVJvdXRlUGlja2VyLm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0FpclBsYXlSb3V0ZVBpY2tlci5tbQpAQCAtMTU0 LDcgKzE1NCw3IEBAIC0gKHZvaWQpc2hvdzooQk9PTCloYXNWaWRlbyBmcm9tUmVjdDooQ0dSZWN0 KWVsZW1lbnRSZWN0CiAgICAgW19yb3V0aW5nQ29udHJvbGxlciBzZXREaXNjb3ZlcnlNb2RlOk1Q Um91dGVEaXNjb3ZlcnlNb2RlRGV0YWlsZWRdOwogCiAgICAgTVBBVkl0ZW1UeXBlIGl0ZW1UeXBl ID0gaGFzVmlkZW8gPyBNUEFWSXRlbVR5cGVWaWRlbyA6IE1QQVZJdGVtVHlwZUF1ZGlvOwotICAg IGlmIChjdXJyZW50VXNlckludGVyZmFjZUlkaW9tSXNQYWQoKSkKKyAgICBpZiAoY3VycmVudFVz ZXJJbnRlcmZhY2VJZGlvbUlzUGFkT3JNYWMoKSkKICAgICAgICAgW3NlbGYgc2hvd0FpclBsYXlQ aWNrZXJJUGFkOml0ZW1UeXBlIGZyb21SZWN0OmVsZW1lbnRSZWN0XTsKICAgICBlbHNlCiAgICAg ICAgIFtzZWxmIHNob3dBaXJQbGF5UGlja2VySVBob25lOml0ZW1UeXBlXTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0ZpbGVVcGxvYWRQYW5lbC5tbSBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0ZpbGVVcGxvYWRQYW5lbC5tbQpp bmRleCA1OGI1NjJmZmEwZDZhNzVjN2IzOGVkNjk0OTJiZWVkOGI1OGFlZGJmLi41Y2I5NDdjZDU5 ZDk4MmY4N2NiNGMyNTNkY2ExZjgzNGZhMDIyNjg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGaWxlVXBsb2FkUGFuZWwubW0KKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRmlsZVVwbG9hZFBhbmVsLm1tCkBAIC01NjgsNyAr NTY4LDcgQEAgLSAodm9pZClfc2hvd1Bob3RvUGlja2VyV2l0aFNvdXJjZVR5cGU6KFVJSW1hZ2VQ aWNrZXJDb250cm9sbGVyU291cmNlVHlwZSlzb3VyY2UKIAogICAgIC8vIFVzZSBhIHBvcG92ZXIg b24gdGhlIGlQYWQgaWYgdGhlIHNvdXJjZSB0eXBlIGlzIG5vdCB0aGUgY2FtZXJhLgogICAgIC8v IFRoZSBjYW1lcmEgd2lsbCB1c2UgYSBmdWxsc2NyZWVuLCBtb2RhbCB2aWV3IGNvbnRyb2xsZXIu Ci0gICAgQk9PTCB1c2VQb3BvdmVyID0gY3VycmVudFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkKCkg JiYgc291cmNlVHlwZSAhPSBVSUltYWdlUGlja2VyQ29udHJvbGxlclNvdXJjZVR5cGVDYW1lcmE7 CisgICAgQk9PTCB1c2VQb3BvdmVyID0gY3VycmVudFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkT3JN YWMoKSAmJiBzb3VyY2VUeXBlICE9IFVJSW1hZ2VQaWNrZXJDb250cm9sbGVyU291cmNlVHlwZUNh bWVyYTsKICAgICBpZiAodXNlUG9wb3ZlcikKICAgICAgICAgW3NlbGYgX3ByZXNlbnRQb3BvdmVy V2l0aENvbnRlbnRWaWV3Q29udHJvbGxlcjpfaW1hZ2VQaWNrZXIuZ2V0KCkgYW5pbWF0ZWQ6WUVT XTsKICAgICBlbHNlCkBAIC01NzksNyArNTc5LDcgQEAgLSAodm9pZClfc2hvd1Bob3RvUGlja2Vy V2l0aFNvdXJjZVR5cGU6KFVJSW1hZ2VQaWNrZXJDb250cm9sbGVyU291cmNlVHlwZSlzb3VyY2UK IAogLSAodm9pZClfcHJlc2VudE1lbnVPcHRpb25Gb3JDdXJyZW50SW50ZXJmYWNlSWRpb206KFVJ Vmlld0NvbnRyb2xsZXIgKil2aWV3Q29udHJvbGxlcgogewotICAgIGlmIChjdXJyZW50VXNlcklu dGVyZmFjZUlkaW9tSXNQYWQoKSkKKyAgICBpZiAoY3VycmVudFVzZXJJbnRlcmZhY2VJZGlvbUlz UGFkT3JNYWMoKSkKICAgICAgICAgW3NlbGYgX3ByZXNlbnRQb3BvdmVyV2l0aENvbnRlbnRWaWV3 Q29udHJvbGxlcjp2aWV3Q29udHJvbGxlciBhbmltYXRlZDpZRVNdOwogICAgIGVsc2UKICAgICAg ICAgW3NlbGYgX3ByZXNlbnRGdWxsc2NyZWVuVmlld0NvbnRyb2xsZXI6dmlld0NvbnRyb2xsZXIg YW5pbWF0ZWQ6WUVTXTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9m b3Jtcy9XS0Zvcm1Db2xvckNvbnRyb2wubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3Mv Zm9ybXMvV0tGb3JtQ29sb3JDb250cm9sLm1tCmluZGV4IGUxYTFmY2U1MGMzM2M1M2Q1YWQwMWE5 OTg0M2FhYTk3OGZhZWFlOTUuLjVhZDA4YzY2NGUxZGM4OTVjYzE2Mzc5M2UxODhhNjNjYWU1MzU1 NzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0Zvcm1D b2xvckNvbnRyb2wubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dL Rm9ybUNvbG9yQ29udHJvbC5tbQpAQCAtOTksNyArOTksNyBAQCBAaW1wbGVtZW50YXRpb24gV0tG b3JtQ29sb3JDb250cm9sCiAtIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhWaWV3OihXS0NvbnRlbnRW aWV3ICopdmlldwogewogICAgIFJldGFpblB0cjxOU09iamVjdCA8V0tGb3JtQ29udHJvbD4+IGNv bnRyb2w7Ci0gICAgaWYgKFdlYktpdDo6Y3VycmVudFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkKCkp CisgICAgaWYgKFdlYktpdDo6Y3VycmVudFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkT3JNYWMoKSkK ICAgICAgICAgY29udHJvbCA9IGFkb3B0TlMoW1tXS0NvbG9yUG9wb3ZlciBhbGxvY10gaW5pdFdp dGhWaWV3OnZpZXddKTsKICAgICBlbHNlCiAgICAgICAgIGNvbnRyb2wgPSBhZG9wdE5TKFtbV0tD b2xvclBpY2tlciBhbGxvY10gaW5pdFdpdGhWaWV3OnZpZXddKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0Zvcm1Db2xvclBpY2tlci5tbSBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0Zvcm1Db2xvclBpY2tlci5tbQppbmRleCBk MTQyNDMwNDQzMGZiMTM3NDE2ZDFiZGE0N2NjODMxZmEyMmYxN2ExLi41MzFjZDFkNjEzMzNlNzhi MTJiYjk2M2NjNDk1YmIzNzRkYzU0ZDdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9pb3MvZm9ybXMvV0tGb3JtQ29sb3JQaWNrZXIubW0KKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvaW9zL2Zvcm1zL1dLRm9ybUNvbG9yUGlja2VyLm1tCkBAIC0xOTIsNyArMTkyLDcg QEAgLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoVmlldzooV0tDb250ZW50VmlldyAqKXZpZXcgaW5Q b3BvdmVyOihXS0NvbG9yUG9wb3ZlciAqKXAKICAgICBfcG9wb3ZlciA9IHBvcG92ZXI7CiAKICAg ICBDR1NpemUgY29sb3JQaWNrZXJTaXplOwotICAgIGlmIChjdXJyZW50VXNlckludGVyZmFjZUlk aW9tSXNQYWQoKSkKKyAgICBpZiAoY3VycmVudFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkT3JNYWMo KSkKICAgICAgICAgY29sb3JQaWNrZXJTaXplID0gQ0dTaXplTWFrZShwaWNrZXJXaWR0aEZvclBv cG92ZXIsIHBpY2tlcldpZHRoRm9yUG9wb3Zlcik7CiAgICAgZWxzZSB7CiAgICAgICAgIGF1dG8g a2V5Ym9hcmRTaXplID0gW1VJS2V5Ym9hcmQgZGVmYXVsdFNpemVGb3JJbnRlcmZhY2VPcmllbnRh dGlvbjp2aWV3LmludGVyZmFjZU9yaWVudGF0aW9uXTsKQEAgLTI1Miw3ICsyNTIsNyBAQCAtICh2 b2lkKWRyYXdTZWxlY3Rpb25JbmRpY2F0b3JGb3JDb2xvckJ1dHRvbjooV0tDb2xvckJ1dHRvbiAq KWNvbG9yQnV0dG9uCiAgICAgW19jb2xvclNlbGVjdGlvbkluZGljYXRvciBzZXRGcmFtZTpmcmFt ZV07CiAKICAgICBVSVJlY3RDb3JuZXIgcm91bmRDb3JuZXIgPSAwOwotICAgIGlmIChjdXJyZW50 VXNlckludGVyZmFjZUlkaW9tSXNQYWQoKSkgeworICAgIGlmIChjdXJyZW50VXNlckludGVyZmFj ZUlkaW9tSXNQYWRPck1hYygpKSB7CiAgICAgICAgIENHUmVjdCBjb2xvclBpY2tlckJvdW5kcyA9 IFtfY29sb3JQaWNrZXIgYm91bmRzXTsKIAogICAgICAgICBib29sIG1pblhFcXVhbCA9IHN0ZDo6 YWJzKENHUmVjdEdldE1pblgoZnJhbWUpIC0gQ0dSZWN0R2V0TWluWChjb2xvclBpY2tlckJvdW5k cykpIDwgRkxUX0VQU0lMT047CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvZm9ybXMvV0tGb3JtU2VsZWN0Q29udHJvbC5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9mb3Jtcy9XS0Zvcm1TZWxlY3RDb250cm9sLm1tCmluZGV4IGU1N2MzZDNhNGJjMmM1ODcy ODJjMjg1MmIxNzlmZmM2NjVlNWNlYjMuLmMxYWYxNjBmN2IyYjZkMTdmMjU5YzkwNmZmNThjNmFj MDBlYjM1NDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9X S0Zvcm1TZWxlY3RDb250cm9sLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9m b3Jtcy9XS0Zvcm1TZWxlY3RDb250cm9sLm1tCkBAIC03NCw3ICs3NCw3IEBAIC0gKGluc3RhbmNl dHlwZSlpbml0V2l0aFZpZXc6KFdLQ29udGVudFZpZXcgKil2aWV3CiAgICAgfQogCiAgICAgUmV0 YWluUHRyPE5TT2JqZWN0IDxXS0Zvcm1Db250cm9sPj4gY29udHJvbDsKLSAgICBpZiAoY3VycmVu dFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkKCkpCisgICAgaWYgKGN1cnJlbnRVc2VySW50ZXJmYWNl SWRpb21Jc1BhZE9yTWFjKCkpCiAgICAgICAgIGNvbnRyb2wgPSBhZG9wdE5TKFtbV0tTZWxlY3RQ b3BvdmVyIGFsbG9jXSBpbml0V2l0aFZpZXc6dmlldyBoYXNHcm91cHM6aGFzR3JvdXBzXSk7CiAg ICAgZWxzZSBpZiAodmlldy5mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmlzTXVsdGlTZWxlY3Qg fHwgaGFzR3JvdXBzKQogICAgICAgICBjb250cm9sID0gYWRvcHROUyhbW1dLTXVsdGlwbGVTZWxl Y3RQaWNrZXIgYWxsb2NdIGluaXRXaXRoVmlldzp2aWV3XSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbQppbmRleCA3ZjkxN2FiNTljNzBk Zjc4YmRjZGRiYmE1NzY1M2E4NjlkMzZmMTlkLi4zMjYwYWY5NDgxYTdhNDMyZGEyN2EzYWUxYTli ZDZmMTZiYTQ2NWJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2Ev V2ViUHJvY2Vzc0NvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9X ZWJQcm9jZXNzQ29jb2EubW0KQEAgLTIzOSw3ICsyMzksNyBAQCB2b2lkIFdlYlByb2Nlc3M6OnBs YXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MoV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyYg cGFyYQogICAgIHNldEVuaGFuY2VkQWNjZXNzaWJpbGl0eShwYXJhbWV0ZXJzLmFjY2Vzc2liaWxp dHlFbmhhbmNlZFVzZXJJbnRlcmZhY2VFbmFibGVkKTsKIAogI2lmIFBMQVRGT1JNKElPU19GQU1J TFkpCi0gICAgc2V0Q3VycmVudFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkKHBhcmFtZXRlcnMuY3Vy cmVudFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkKTsKKyAgICBzZXRDdXJyZW50VXNlckludGVyZmFj ZUlkaW9tSXNQYWRPck1hYyhwYXJhbWV0ZXJzLmN1cnJlbnRVc2VySW50ZXJmYWNlSWRpb21Jc1Bh ZCk7CiAgICAgc2V0TG9jYWxpemVkRGV2aWNlTW9kZWwocGFyYW1ldGVycy5sb2NhbGl6ZWREZXZp Y2VNb2RlbCk7CiAjaWYgRU5BQkxFKFZJREVPX1BSRVNFTlRBVElPTl9NT0RFKQogICAgIHNldFN1 cHBvcnRzUGljdHVyZUluUGljdHVyZShwYXJhbWV0ZXJzLnN1cHBvcnRzUGljdHVyZUluUGljdHVy ZSk7Cg==