238271 2022-03-23 10:32:29 -0700 [iOS] Mail compose web view no longer scrolls to reveal selection upon showing the keyboard 2022-03-23 15:08:24 -0700 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh akeerthi hi katherine_cheney megan_gardner thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1854255 0 wenson_hsieh 2022-03-23 10:32:29 -0700 rdar://89821087 1854291 1 455526 wenson_hsieh 2022-03-23 11:24:13 -0700 Created attachment 455526 Patch 1854433 2 ews-feeder 2022-03-23 15:08:19 -0700 Committed r291770 (248800@main): <https://commits.webkit.org/248800@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 455526. 455526 2022-03-23 11:24:13 -0700 2022-03-23 15:08:23 -0700 Patch bug-238271-20220323112412.patch text/plain 10765 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxNzUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDllZGY2MWM4ZGE5NmYxMjIz NTZlOTcxNWUyNzNjYjliZWEzZWUzOTMuLmZkNjBiYTFmZjIxZGVmYWJjYWUwNjBhMjExNTViOGE3 OWY0NjUzMjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMjItMDMtMjMgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gTWFpbCBjb21w b3NlIHdlYiB2aWV3IG5vIGxvbmdlciBzY3JvbGxzIHRvIHJldmVhbCBzZWxlY3Rpb24gdXBvbiBz aG93aW5nIHRoZSBrZXlib2FyZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjM4MjcxCisgICAgICAgIHJkYXI6Ly84OTgyMTA4NworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gYSBjZXJ0YWluIFVJS2l0 IGZlYXR1cmUgaXMgZW5hYmxlZCBvbiBjZXJ0YWluIGJ1aWxkcyBvZiBpT1MsIE1haWwgY29tcG9z ZSBubyBsb25nZXIgc2Nyb2xscyB0byByZXZlYWwgdGhlCisgICAgICAgIHNlbGVjdGlvbiByYW5n ZSBvciBjYXJldC4gVGhpcyBpcyBiZWNhdXNlIHdlIGhhdmUgbG9naWMgdG8gZGVmZXIgc2Nyb2xs aW5nL3pvb21pbmcgdG8gcmV2ZWFsIHRoZSBzZWxlY3Rpb24gYWZ0ZXIKKyAgICAgICAgZm9jdXNp bmcgdGhlIGJvZHkgZWxlbWVudCwgZm9yIHJlYXNvbnMgb3V0bGluZWQgaW4gdHJhYy53ZWJraXQu b3JnL3IyODgxNzguIEhvd2V2ZXIsIHdoZW4gdGhlIGZlYXR1cmUgZmxhZyBpcworICAgICAgICBl bmFibGVkLCBVSUtleWJvYXJkV2lsbFNob3dOb3RpZmljYXRpb24gaXMgbm8gbG9uZ2VyIGZpcmVk IHN5bmNocm9ub3VzbHkgdW5kZXJuZWF0aCB0aGUgY2FsbCB0bworICAgICAgICBgLXJlbG9hZElu cHV0Vmlld3NgLCB3aGljaCBtZWFucyB0aGF0IGBpc0tleWJvYXJkQW5pbWF0aW5nSW4oKWAgd2ls bCAobW9zdCBvZiB0aGUgdGltZSkgcmV0dXJuIGZhbHNlIHVwb24KKyAgICAgICAgY2FsbGluZyBg LV96b29tVG9SZXZlYWxGb2N1c2VkRWxlbWVudGAgd2hlbiByZWNlaXZpbmcgdGhlIG5leHQgcG9z dC1sYXlvdXQgZWRpdG9yIHN0YXRlIHVwZGF0ZS4KKworICAgICAgICBUbyBtaXRpZ2F0ZSB0aGlz LCBhZGQgYSBuZXcgYm9vbGVhbiBmbGFnLCBgX3dhaXRpbmdGb3JLZXlib2FyZFRvU3RhcnRBbmlt YXRpbmdJbkFmdGVyRWxlbWVudEZvY3VzYCwgdGhhdCdzIHNldAorICAgICAgICByaWdodCBiZWZv cmUgd2UgcmVsb2FkIGlucHV0IHZpZXdzIHdoZW4gZm9jdXNpbmcgYW4gZWxlbWVudCB0aGF0IHJl cXVpcmVzIHRoZSBrZXlib2FyZCAoZWl0aGVyIHNvZnR3YXJlIG9yCisgICAgICAgIGhhcmR3YXJl KSwgYW5kIHVuc2V0IHdoZW4gd2Ugb2JzZXJ2ZSB0aGUgIldpbGxTaG93IiBub3RpZmljYXRpb24u IEluIGFkZGl0aW9uIHRvIGNoZWNraW5nCisgICAgICAgIGBfcGFnZS0+aXNLZXlib2FyZEFuaW1h dGluZ0luKClgIHdoZW4gZGV0ZXJtaW5pbmcgd2hldGhlciB0byBkZWZlciB6b29taW5nLCB3ZSBj aGVjayB0aGlzIG5ldyBmbGFnIGFzIHdlbGwuCisKKyAgICAgICAgQ292ZXJlZCBieSBhbiBleGlz dGluZyBsYXlvdXQgdGVzdCAod2hpY2ggY3VycmVudGx5IGZhaWxzIHdoZW4gdGhlIGFmb3JlbWVu dGlvbmVkIFVJS2l0IGZlYXR1cmUgaXMgZW5hYmxlZCk6CisgICAgICAgIGVkaXRpbmcvc2VsZWN0 aW9uL2lvcy9zY3JvbGwtdG8tcmV2ZWFsLXNlbGVjdGlvbi13aXRoLWtleWJvYXJkLWF2b2lkYW5j ZS1kaXNhYmxlZC5odG1sCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJ T1MubW06CisgICAgICAgICgtW1dLV2ViVmlldyBfa2V5Ym9hcmRXaWxsU2hvdzpdKToKKyAgICAg ICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtX S0NvbnRlbnRWaWV3IGNsZWFuVXBJbnRlcmFjdGlvbl0pOgorICAgICAgICAoLVtXS0NvbnRlbnRW aWV3IF9rZXlib2FyZFdpbGxTaG93XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX3pvb21U b1JldmVhbEZvY3VzZWRFbGVtZW50XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2VsZW1l bnREaWRGb2N1czp1c2VySXNJbnRlcmFjdGluZzpibHVyUHJldmlvdXNOb2RlOmFjdGl2aXR5U3Rh dGVDaGFuZ2VzOnVzZXJPYmplY3Q6XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2VsZW1l bnREaWRCbHVyXSk6CisKIDIwMjItMDMtMjMgIEtpbW1vIEtpbm51bmVuICA8a2tpbm51bmVuQGFw cGxlLmNvbT4KIAogICAgICAgICBBZnRlciBsb3NpbmcgY29udGV4dCBkdWUgdG8gdG9vIG1hbnkg Y29udGV4dHMsIGdldEVycm9yKCkgZG9lcyBub3QgcmV0dXJuIENPTlRFWFRfTE9TVF9XRUJHTApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1Mu bW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbQppbmRl eCBhODM5NzQ1YzUyZGQxZjUwMmY3NjAwODFkOWEwYTU2ZTUyNDM1MjE5Li45ZDUzYjRlZjM0MjVk MDIxN2Y0ZmQ4NzVjN2UyNmY4ZmE1YTZkNmFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbQpAQCAtMjU0MSw2ICsyNTQxLDcgQEAgLSAodm9p ZClfa2V5Ym9hcmRXaWxsU2hvdzooTlNOb3RpZmljYXRpb24gKilub3RpZmljYXRpb24KICAgICAg ICAgW3NlbGYgX2tleWJvYXJkQ2hhbmdlZFdpdGhJbmZvOm5vdGlmaWNhdGlvbi51c2VySW5mbyBh ZGp1c3RTY3JvbGxWaWV3OllFU107CiAKICAgICBfcGFnZS0+c2V0SXNLZXlib2FyZEFuaW1hdGlu Z0luKHRydWUpOworICAgIFtfY29udGVudFZpZXcgX2tleWJvYXJkV2lsbFNob3ddOwogfQogCiAt ICh2b2lkKV9rZXlib2FyZERpZFNob3c6KE5TTm90aWZpY2F0aW9uICopbm90aWZpY2F0aW9uCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVy YWN0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVy YWN0aW9uLmgKaW5kZXggMjY4NjYwZmIwMDNhZDhkOTJkOTE1YjZmZjdhZGQ4OTY2MDk5MTBiNC4u MzA2ZmJkM2RhZmY5NzMwMDQyYzI3YzRmY2QyYzdhM2NjNGRlYzk5ZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oCisrKyBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaApA QCAtNDY1LDYgKzQ2NSw3IEBAIHVzaW5nIEltYWdlQW5hbHlzaXNSZXF1ZXN0SWRlbnRpZmllciA9 IE9iamVjdElkZW50aWZpZXI8SW1hZ2VBbmFseXNpc1JlcXVlc3RJZGVuCiAgICAgQk9PTCBfaXNS ZWxpbnF1aXNoaW5nRmlyc3RSZXNwb25kZXJUb0ZvY3VzZWRFbGVtZW50OwogICAgIEJPT0wgX3Vu c3VwcHJlc3NTb2Z0d2FyZUtleWJvYXJkQWZ0ZXJOZXh0QXV0b2NvcnJlY3Rpb25Db250ZXh0VXBk YXRlOwogICAgIEJPT0wgX2lzVW5zdXBwcmVzc2luZ1NvZnR3YXJlS2V5Ym9hcmRVc2luZ0xhc3RB dXRvY29ycmVjdGlvbkNvbnRleHQ7CisgICAgQk9PTCBfd2FpdGluZ0ZvcktleWJvYXJkVG9TdGFy dEFuaW1hdGluZ0luQWZ0ZXJFbGVtZW50Rm9jdXM7CiAgICAgQk9PTCBfc2hvdWxkWm9vbVRvRm9j dXNSZWN0QWZ0ZXJTaG93aW5nS2V5Ym9hcmQ7CiAKICAgICBCT09MIF9mb2N1c1JlcXVpcmVzU3Ry b25nUGFzc3dvcmRBc3Npc3RhbmNlOwpAQCAtNjEwLDYgKzYxMSw3IEBAIHVzaW5nIEltYWdlQW5h bHlzaXNSZXF1ZXN0SWRlbnRpZmllciA9IE9iamVjdElkZW50aWZpZXI8SW1hZ2VBbmFseXNpc1Jl cXVlc3RJZGVuCiAtIChCT09MKV9oYXNGb2N1c2VkRWxlbWVudDsKIC0gKHZvaWQpX3pvb21Ub1Jl dmVhbEZvY3VzZWRFbGVtZW50OwogCistICh2b2lkKV9rZXlib2FyZFdpbGxTaG93OwogLSAodm9p ZClfa2V5Ym9hcmREaWRTaG93OwogCiAtICh2b2lkKWNhbmNlbFBvaW50ZXJzRm9yR2VzdHVyZVJl Y29nbml6ZXI6KFVJR2VzdHVyZVJlY29nbml6ZXIgKilnZXN0dXJlUmVjb2duaXplcjsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rp b24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0 aW9uLm1tCmluZGV4IGUzOWYzNTY2OWUwOTMyODk5Y2Q4MjU0M2RjMTdmMzkwNGI4ZDgzZmYuLmVi N2M2OTFmOWM5OTBmODQ3NWYwOTAyNzRkOWI2ZWUyMDFjMzkwYjAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpA QCAtMTE2NSw2ICsxMTY1LDcgQEAgLSAodm9pZCljbGVhblVwSW50ZXJhY3Rpb24KICAgICAgICAg X2ludGVyYWN0aW9uVmlld3NDb250YWluZXJWaWV3ID0gbmlsOwogICAgIH0KIAorICAgIF93YWl0 aW5nRm9yS2V5Ym9hcmRUb1N0YXJ0QW5pbWF0aW5nSW5BZnRlckVsZW1lbnRGb2N1cyA9IE5POwog ICAgIF9sYXN0SW5zZXJ0ZWRDaGFyYWN0ZXJUb092ZXJyaWRlQ2hhcmFjdGVyQmVmb3JlU2VsZWN0 aW9uID0gc3RkOjpudWxsb3B0OwogCiAgICAgW190b3VjaEV2ZW50R2VzdHVyZVJlY29nbml6ZXIg c2V0RGVsZWdhdGU6bmlsXTsKQEAgLTIzNzIsNiArMjM3MywxMSBAQCAtIChXZWJDb3JlOjpGbG9h dFJlY3QpcmVjdFRvUmV2ZWFsV2hlblpvb21pbmdUb0ZvY3VzZWRFbGVtZW50CiAgICAgcmV0dXJu IGJvdW5kaW5nUmVjdDsKIH0KIAorLSAodm9pZClfa2V5Ym9hcmRXaWxsU2hvdworeworICAgIF93 YWl0aW5nRm9yS2V5Ym9hcmRUb1N0YXJ0QW5pbWF0aW5nSW5BZnRlckVsZW1lbnRGb2N1cyA9IE5P OworfQorCiAtICh2b2lkKV9rZXlib2FyZERpZFNob3cKIHsKICAgICBpZiAoIV9zaG91bGRab29t VG9Gb2N1c1JlY3RBZnRlclNob3dpbmdLZXlib2FyZCkKQEAgLTIzOTYsNyArMjQwMiw4IEBAIC0g KHZvaWQpX3pvb21Ub1JldmVhbEZvY3VzZWRFbGVtZW50CiAgICAgaWYgKF9zdXBwcmVzc1NlbGVj dGlvbkFzc2lzdGFudFJlYXNvbnMgfHwgX2FjdGl2ZVRleHRJbnRlcmFjdGlvbkNvdW50KQogICAg ICAgICByZXR1cm47CiAKLSAgICBpZiAoIXNlbGYuX3Njcm9sbGVyLmZpcnN0UmVzcG9uZGVyS2V5 Ym9hcmRBdm9pZGFuY2VFbmFibGVkICYmIF9wYWdlLT5pc0tleWJvYXJkQW5pbWF0aW5nSW4oKSkg eworICAgIGlmICghc2VsZi5fc2Nyb2xsZXIuZmlyc3RSZXNwb25kZXJLZXlib2FyZEF2b2lkYW5j ZUVuYWJsZWQKKyAgICAgICAgJiYgKF9wYWdlLT5pc0tleWJvYXJkQW5pbWF0aW5nSW4oKSB8fCBf d2FpdGluZ0ZvcktleWJvYXJkVG9TdGFydEFuaW1hdGluZ0luQWZ0ZXJFbGVtZW50Rm9jdXMpKSB7 CiAgICAgICAgIF9zaG91bGRab29tVG9Gb2N1c1JlY3RBZnRlclNob3dpbmdLZXlib2FyZCA9IFlF UzsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTY3NzMsMTUgKzY3ODAsMTUgQEAgLSAodm9p ZClfZWxlbWVudERpZEZvY3VzOihjb25zdCBXZWJLaXQ6OkZvY3VzZWRFbGVtZW50SW5mb3JtYXRp b24mKWluZm9ybWF0aW9uIHUKICAgICBpZiAoZGVsZWdhdGVJbXBsZW1lbnRzV2lsbFN0YXJ0SW5w dXRTZXNzaW9uKQogICAgICAgICBbaW5wdXREZWxlZ2F0ZSBfd2ViVmlldzpzZWxmLndlYlZpZXcg d2lsbFN0YXJ0SW5wdXRTZXNzaW9uOl9mb3JtSW5wdXRTZXNzaW9uLmdldCgpXTsKIAotICAgIEJP T0wgaXNTZWxlY3RhYmxlID0gbWF5Q29udGFpblNlbGVjdGFibGVUZXh0KGluZm9ybWF0aW9uLmVs ZW1lbnRUeXBlKTsKLSAgICBCT09MIGVkaXRhYmxlQ2hhbmdlZCA9IFtzZWxmIHNldElzRWRpdGFi bGU6aXNTZWxlY3RhYmxlXTsKKyAgICBCT09MIHJlcXVpcmVzS2V5Ym9hcmQgPSBtYXlDb250YWlu U2VsZWN0YWJsZVRleHQoaW5mb3JtYXRpb24uZWxlbWVudFR5cGUpOworICAgIEJPT0wgZWRpdGFi bGVDaGFuZ2VkID0gW3NlbGYgc2V0SXNFZGl0YWJsZTpyZXF1aXJlc0tleWJvYXJkXTsKICAgICBf Zm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbiA9IGluZm9ybWF0aW9uOwogICAgIF90cmFpdHMgPSBu aWw7CiAKICAgICBpZiAoIVtzZWxmIGlzRmlyc3RSZXNwb25kZXJdKQogICAgICAgICBbc2VsZiBi ZWNvbWVGaXJzdFJlc3BvbmRlcl07CiAKLSAgICBpZiAoIV9zdXBwcmVzc1NlbGVjdGlvbkFzc2lz dGFudFJlYXNvbnMgJiYgaXNTZWxlY3RhYmxlICYmIGFjdGl2aXR5U3RhdGVDaGFuZ2VzLmNvbnRh aW5zKFdlYkNvcmU6OkFjdGl2aXR5U3RhdGU6OklzRm9jdXNlZCkpIHsKKyAgICBpZiAoIV9zdXBw cmVzc1NlbGVjdGlvbkFzc2lzdGFudFJlYXNvbnMgJiYgcmVxdWlyZXNLZXlib2FyZCAmJiBhY3Rp dml0eVN0YXRlQ2hhbmdlcy5jb250YWlucyhXZWJDb3JlOjpBY3Rpdml0eVN0YXRlOjpJc0ZvY3Vz ZWQpKSB7CiAgICAgICAgIF90cmVhdEFzQ29udGVudEVkaXRhYmxlVW50aWxOZXh0RWRpdG9yU3Rh dGVVcGRhdGUgPSBZRVM7CiAgICAgICAgIFtfdGV4dEludGVyYWN0aW9uQXNzaXN0YW50IGFjdGl2 YXRlU2VsZWN0aW9uXTsKICAgICAgICAgX3BhZ2UtPnJlc3RvcmVTZWxlY3Rpb25JbkZvY3VzZWRF ZGl0YWJsZUVsZW1lbnQoKTsKQEAgLTY3ODksNiArNjc5Niw3IEBAIC0gKHZvaWQpX2VsZW1lbnRE aWRGb2N1czooY29uc3QgV2ViS2l0OjpGb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uJilpbmZvcm1h dGlvbiB1CiAgICAgfQogCiAgICAgX2lucHV0UGVyaXBoZXJhbCA9IGNyZWF0ZUlucHV0UGVyaXBo ZXJhbFdpdGhWaWV3KF9mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmVsZW1lbnRUeXBlLCBzZWxm KTsKKyAgICBfd2FpdGluZ0ZvcktleWJvYXJkVG9TdGFydEFuaW1hdGluZ0luQWZ0ZXJFbGVtZW50 Rm9jdXMgPSByZXF1aXJlc0tleWJvYXJkOwogCiAjaWYgSEFWRShQRVBQRVJfVUlfQ09SRSkKICAg ICBbc2VsZiBhZGRGb2N1c2VkRm9ybUNvbnRyb2xPdmVybGF5XTsKQEAgLTY3OTgsNyArNjgwNiw3 IEBAIC0gKHZvaWQpX2VsZW1lbnREaWRGb2N1czooY29uc3QgV2ViS2l0OjpGb2N1c2VkRWxlbWVu dEluZm9ybWF0aW9uJilpbmZvcm1hdGlvbiB1CiAgICAgW3NlbGYgcmVsb2FkSW5wdXRWaWV3c107 CiAjZW5kaWYKIAotICAgIGlmIChpc1NlbGVjdGFibGUpIHsKKyAgICBpZiAocmVxdWlyZXNLZXli b2FyZCkgewogICAgICAgICBbc2VsZiBfc2hvd0tleWJvYXJkXTsKICAgICAgICAgaWYgKCFzZWxm LndpbmRvdy5rZXlXaW5kb3cpCiAgICAgICAgICAgICBbc2VsZi53aW5kb3cgbWFrZUtleVdpbmRv d107CkBAIC02ODExLDggKzY4MTksNyBAQCAtICh2b2lkKV9lbGVtZW50RGlkRm9jdXM6KGNvbnN0 IFdlYktpdDo6Rm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbiYpaW5mb3JtYXRpb24gdQogICAgIC8v IEZvciBlbGVtZW50cyB0aGF0IGhhdmUgc2VsZWN0YWJsZSBjb250ZW50IChlLmcuIHRleHQgZmll bGQpIHdlIG5lZWQgdG8gd2FpdCBmb3IgdGhlIHdlYiBwcm9jZXNzIHRvIHNlbmQgYW4gdXAtdG8t ZGF0ZQogICAgIC8vIHNlbGVjdGlvbiByZWN0IGJlZm9yZSB3ZSBjYW4gem9vbSBhbmQgcmV2ZWFs IHRoZSBzZWxlY3Rpb24uIE5vbi1zZWxlY3RhYmxlIGVsZW1lbnRzIChlLmcuIDxzZWxlY3Q+KSBj YW4gYmUgem9vbWVkCiAgICAgLy8gaW1tZWRpYXRlbHkgYmVjYXVzZSB0aGV5IGhhdmUgbm8gc2Vs ZWN0aW9uIHRvIHJldmVhbC4KLSAgICBCT09MIG5lZWRzRWRpdG9yU3RhdGVVcGRhdGUgPSBtYXlD b250YWluU2VsZWN0YWJsZVRleHQoX2ZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uZWxlbWVudFR5 cGUpOwotICAgIGlmIChuZWVkc0VkaXRvclN0YXRlVXBkYXRlKQorICAgIGlmIChyZXF1aXJlc0tl eWJvYXJkKQogICAgICAgICBfcGFnZS0+c2V0V2FpdGluZ0ZvclBvc3RMYXlvdXRFZGl0b3JTdGF0 ZVVwZGF0ZUFmdGVyRm9jdXNpbmdFbGVtZW50KHRydWUpOwogICAgIGVsc2UKICAgICAgICAgW3Nl bGYgX3pvb21Ub1JldmVhbEZvY3VzZWRFbGVtZW50XTsKQEAgLTY4NjAsNiArNjg2Nyw3IEBAIC0g KHZvaWQpX2VsZW1lbnREaWRCbHVyCiAgICAgX2ZvY3VzUmVxdWlyZXNTdHJvbmdQYXNzd29yZEFz c2lzdGFuY2UgPSBOTzsKICAgICBfYXV0b2NvcnJlY3Rpb25Db250ZXh0TmVlZHNVcGRhdGUgPSBZ RVM7CiAgICAgX2FkZGl0aW9uYWxDb250ZXh0Rm9yU3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNlID0g bmlsOworICAgIF93YWl0aW5nRm9yS2V5Ym9hcmRUb1N0YXJ0QW5pbWF0aW5nSW5BZnRlckVsZW1l bnRGb2N1cyA9IE5POwogCiAgICAgW3NlbGYgcmVzZXRTaG91bGRab29tVG9Gb2N1c1JlY3RBZnRl clNob3dpbmdLZXlib2FyZF07CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA4MDUyNTE3YmUzZWZhZjE3YWViOWI2YTZlZjU1 ODVhMjNmZDYyY2EwLi4zYmVlOTczMWUxYjkyMWIyNzQ4MGRhMTE5OTNkYWZkZDAwNTdmNjQ0IDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjItMDMtMjMgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9o c2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gTWFpbCBjb21wb3NlIHdlYiB2aWV3IG5v IGxvbmdlciBzY3JvbGxzIHRvIHJldmVhbCBzZWxlY3Rpb24gdXBvbiBzaG93aW5nIHRoZSBrZXli b2FyZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM4 MjcxCisgICAgICAgIHJkYXI6Ly84OTgyMTA4NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFdoaWxlIEknbSBoZXJlLCBhZGp1c3QgdGhlIHRlc3QgdG8g ZW5zdXJlIHRoYXQgdGhlIGtleWJvYXJkIGlzIGhpZGRlbiBhZnRlcndhcmRzLiBXaGVuIHJ1bm5p bmcgdGhpcyB0ZXN0IGJhY2sgdG8KKyAgICAgICAgYmFjayB3aXRoIHRoZSByZWxldmFudCBVSUtp dCBmZWF0dXJlIGZsYWcgZW5hYmxlZCwgaXQgc29tZXRpbWVzIGZhaWxzIHdpdGhvdXQgdGhpcyBh ZGp1c3RtZW50LCBkdWUgdG8ga2V5Ym9hcmQKKyAgICAgICAgZGlzYXBwZWFyYW5jZSBub3RpZmlj YXRpb25zIHRyaWdnZXJlZCBmcm9tIHByaW9yIHRlc3QgaW52b2NhdGlvbnMgYmVpbmcgZmlyZWQg aW4gc3Vic2VxdWVudCB0ZXN0IGludm9jYXRpb25zLgorCisgICAgICAgICogZWRpdGluZy9zZWxl Y3Rpb24vaW9zL3Njcm9sbC10by1yZXZlYWwtc2VsZWN0aW9uLXdpdGgta2V5Ym9hcmQtYXZvaWRh bmNlLWRpc2FibGVkLmh0bWw6CisKIDIwMjItMDMtMjMgIEpvbiBMZWUgIDxqb25sZWVAYXBwbGUu Y29tPgogCiAgICAgICAgIFR1cm4gRE9NIGluIEdQVSBQcm9jZXNzIG9uIGJ5IGRlZmF1bHQgb24g aU9TIGxheW91dCB0ZXN0cwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZWRpdGluZy9zZWxlY3Rp b24vaW9zL3Njcm9sbC10by1yZXZlYWwtc2VsZWN0aW9uLXdpdGgta2V5Ym9hcmQtYXZvaWRhbmNl LWRpc2FibGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL3NlbGVjdGlvbi9pb3Mvc2Nyb2xs LXRvLXJldmVhbC1zZWxlY3Rpb24td2l0aC1rZXlib2FyZC1hdm9pZGFuY2UtZGlzYWJsZWQuaHRt bAppbmRleCBkMmQ0MWJjYWVhMDFlODRiYmNlNzAyMzUwNzEwNmQ3MTJjNGYwYmM0Li43OTA2ZjU4 MmFmMTk2MDRkMTAxMDEyNThiNDliMjg2ODFmNWQ5ODIxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9lZGl0aW5nL3NlbGVjdGlvbi9pb3Mvc2Nyb2xsLXRvLXJldmVhbC1zZWxlY3Rpb24td2l0aC1r ZXlib2FyZC1hdm9pZGFuY2UtZGlzYWJsZWQuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9lZGl0aW5n L3NlbGVjdGlvbi9pb3Mvc2Nyb2xsLXRvLXJldmVhbC1zZWxlY3Rpb24td2l0aC1rZXlib2FyZC1h dm9pZGFuY2UtZGlzYWJsZWQuaHRtbApAQCAtMTUsOCArMTUsMTAgQEAgYWRkRXZlbnRMaXN0ZW5l cigibG9hZCIsIGFzeW5jICgpID0+IHsKICAgICBhd2FpdCBVSUhlbHBlci5zZXRIYXJkd2FyZUtl eWJvYXJkQXR0YWNoZWQoZmFsc2UpOwogICAgIGF3YWl0IFVJSGVscGVyLmFjdGl2YXRlQW5kV2Fp dEZvcklucHV0U2Vzc2lvbkF0KDE2MCwgaW5uZXJIZWlnaHQgLSA1MCk7CiAKLSAgICBzaG91bGRC ZWNvbWVEaWZmZXJlbnQoImRvY3VtZW50LnNjcm9sbGluZ0VsZW1lbnQuc2Nyb2xsVG9wIiwgIjAi LCAoKSA9PiB7CisgICAgc2hvdWxkQmVjb21lRGlmZmVyZW50KCJkb2N1bWVudC5zY3JvbGxpbmdF bGVtZW50LnNjcm9sbFRvcCIsICIwIiwgYXN5bmMgKCkgPT4gewogICAgICAgICBkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgiY29udGVudCIpLnJlbW92ZSgpOworICAgICAgICBkb2N1bWVudC5hY3Rp dmVFbGVtZW50LmJsdXIoKTsKKyAgICAgICAgYXdhaXQgVUlIZWxwZXIud2FpdEZvcktleWJvYXJk VG9IaWRlKCk7CiAgICAgICAgIGZpbmlzaEpTVGVzdCgpOwogICAgIH0pOwogfSk7Cg==