219952 2020-12-16 10:28:52 -0800 Suppress the image extraction interaction while editing text 2020-12-16 12:40:15 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh hi megan_gardner thorton webkit-bug-importer oldest_to_newest 1715160 0 wenson_hsieh 2020-12-16 10:28:52 -0800 <rdar://problem/72390053> 1715165 1 416347 wenson_hsieh 2020-12-16 10:46:02 -0800 Created attachment 416347 Patch 1715178 2 416347 hi 2020-12-16 11:52:52 -0800 Comment on attachment 416347 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=416347&action=review r=me > Source/WebKit/UIProcess/ios/WKContentViewInteraction.h:211 > + if (interaction) NIT: IMO it's a bit weird that we'd have an object that's supposed to suppress an interaction also function if no interaction is given. Should we `ASSERT(interaction);`? There's no harm in doing it as written, but it does seem a little odd to me :P > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:1297 > + if (self._imageExtractionEnabled && (!_isBlurringFocusedElement || !_isChangingFocus)) Are there any other flags we should also be checking (e.g. `_textInteractionIsHappening`)? > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:1298 > + _suppressImageExtractionToken = isEditable ? makeUnique<WebKit::SuppressInteractionToken>(self, _imageExtractionInteraction.get()) : nullptr; NIT: Is the `<WebKit::SuppressInteractionToken>` necessary? I think this can be implicit. 1715183 3 416347 wenson_hsieh 2020-12-16 12:02:13 -0800 Comment on attachment 416347 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=416347&action=review Thanks for the review! >> Source/WebKit/UIProcess/ios/WKContentViewInteraction.h:211 >> + if (interaction) > > NIT: IMO it's a bit weird that we'd have an object that's supposed to suppress an interaction also function if no interaction is given. Should we `ASSERT(interaction);`? There's no harm in doing it as written, but it does seem a little odd to me :P Good point! Since the only place that creates one of these is behind `_imageExtractionEnabled`, the interaction should always be nonnull here. I'll add an `ASSERT(interaction);` to clarify this. >> Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:1297 >> + if (self._imageExtractionEnabled && (!_isBlurringFocusedElement || !_isChangingFocus)) > > Are there any other flags we should also be checking (e.g. `_textInteractionIsHappening`)? I /think/ this should be it, since the intent was just to avoid introducing the interaction just to remove it again when changing focus between editable fields. IIUC, `_textInteractionIsHappening` is just about pencil, which (I think) shouldn't conflict with the new image extraction interaction. >> Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:1298 >> + _suppressImageExtractionToken = isEditable ? makeUnique<WebKit::SuppressInteractionToken>(self, _imageExtractionInteraction.get()) : nullptr; > > NIT: Is the `<WebKit::SuppressInteractionToken>` necessary? I think this can be implicit. Yes, it's necessary since this is outside of any `using namespace WebCore;` (since we're in an ObjC @implementation block, this code isn't wrapped inside a `namespace WebKit`). 1715188 4 416354 wenson_hsieh 2020-12-16 12:11:26 -0800 Created attachment 416354 Patch for landing 1715196 5 ews-feeder 2020-12-16 12:40:14 -0800 Committed r270901: <https://trac.webkit.org/changeset/270901> All reviewed patches have been landed. Closing bug and clearing flags on attachment 416354. 416347 2020-12-16 10:46:02 -0800 2020-12-16 11:52:52 -0800 Patch bug-219952-20201216104601.patch text/plain 4068 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwODk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGU4ODczMWM5NGM0NzEwOGNk NjY5OWFlNjUzOTEzOWQzMThjZWU4M2IuLjkwNzc2ZTM0NjNiOTI0OTRkNWQ3M2Q1NTg1ZTZmODhh NzYxY2IyYjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjAtMTItMTYgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgU3VwcHJlc3MgdGhlIGlt YWdlIGV4dHJhY3Rpb24gaW50ZXJhY3Rpb24gd2hpbGUgZWRpdGluZyB0ZXh0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk5NTIKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzcyMzkwMDUzPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFNlZSByYWRhciBhbmQgV2ViS2l0QWRkaXRpb25zIGZvciBtb3JlIGRl dGFpbHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv bi5oOgorICAgICAgICAoV2ViS2l0OjpTdXBwcmVzc0ludGVyYWN0aW9uVG9rZW46OlN1cHByZXNz SW50ZXJhY3Rpb25Ub2tlbik6CisgICAgICAgIChXZWJLaXQ6OlN1cHByZXNzSW50ZXJhY3Rpb25U b2tlbjo6flN1cHByZXNzSW50ZXJhY3Rpb25Ub2tlbik6CisKKyAgICAgICAgQWRkIGEgaGVscGVy IGNsYXNzIHRvIGhlbHAgZmFjaWxpdGF0ZSB0aGUgdGVtcG9yYXJ5IHJlbW92YWwgb2YgVUlJbnRl cmFjdGlvbiBvYmplY3RzIGZyb20gYSBXS0NvbnRlbnRWaWV3LgorCisgICAgICAgICogVUlQcm9j ZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAgICgtW1dLQ29udGVu dFZpZXcgc2V0SXNFZGl0YWJsZTpdKToKKworICAgICAgICBVc2UgdGhlIGFib3ZlIGhlbHBlciBj bGFzcyB0byB0ZW1wb3JhcmlseSByZW1vdmUgdGhlIGltYWdlIGV4dHJhY3Rpb24gaW50ZXJhY3Rp b24gd2hpbGUgdGhlIHVzZXIgaXMgZWRpdGluZworICAgICAgICB0ZXh0IChhbmQgaXMgdGhlcmVm b3JlIGRlcGVuZGluZyBvbiBlZGl0YWJsZSB0ZXh0IGludGVyYWN0aW9uIGdlc3R1cmVzKS4gTm90 ZSB0aGF0IHdlIGF2b2lkIHVubmVjZXNzYXJpbHkKKyAgICAgICAgY2xlYXJpbmcgb3V0IGFuZCBy ZXNldHRpbmcgdGhpcyBtZW1iZXIgdmFyaWFibGUgd2hlbiBjaGFuZ2luZyBmb2N1cyBiZXR3ZWVu IGVkaXRhYmxlIHRleHQgZmllbGRzLgorCisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2RpZFN0 YXJ0UHJvdmlzaW9uYWxMb2FkRm9yTWFpbkZyYW1lXSk6CisKIDIwMjAtMTItMTUgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgQ2FsbHMgdG8gc2V0Rml4 ZWRMYXlvdXRTaXplKCkgc2hvdWxkIG5vdCBiZSBpbnNpZGUgRU5BQkxFKFRFWFRfQVVUT1NJWklO RykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 SW50ZXJhY3Rpb24uaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 SW50ZXJhY3Rpb24uaAppbmRleCAzYjI5NTBhNjIxZGZjYTI5NDU3ODVkODIyZThiNTQ3ODM4NjUw MDVhLi40ZmI4Nzk4Y2VhOThhMWFlMmY5YzMxODFlMjMwNWMyMThlMjcxMWIyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmgK KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv bi5oCkBAIC0yMDEsNiArMjAxLDMwIEBAIHN0cnVjdCBXS0F1dG9Db3JyZWN0aW9uRGF0YSB7CiAg ICAgQ0dSZWN0IHRleHRMYXN0UmVjdDsKIH07CiAKK2NsYXNzIFN1cHByZXNzSW50ZXJhY3Rpb25U b2tlbiB7CisgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoU3VwcHJlc3NJbnRlcmFjdGlvblRva2Vu KTsgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CitwdWJsaWM6CisgICAgU3VwcHJlc3NJbnRlcmFj dGlvblRva2VuKFdLQ29udGVudFZpZXcgKnZpZXcsIE5TT2JqZWN0PFVJSW50ZXJhY3Rpb24+ICpp bnRlcmFjdGlvbikKKyAgICAgICAgOiBtX3ZpZXcodmlldykKKyAgICAgICAgLCBtX2ludGVyYWN0 aW9uKGludGVyYWN0aW9uKQorICAgIHsKKyAgICAgICAgaWYgKGludGVyYWN0aW9uKQorICAgICAg ICAgICAgW3ZpZXcgcmVtb3ZlSW50ZXJhY3Rpb246aW50ZXJhY3Rpb25dOworICAgIH0KKworICAg IH5TdXBwcmVzc0ludGVyYWN0aW9uVG9rZW4oKQorICAgIHsKKyAgICAgICAgaWYgKCFtX3ZpZXcg fHwgIW1faW50ZXJhY3Rpb24pCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgW21fdmll dyBhZGRJbnRlcmFjdGlvbjptX2ludGVyYWN0aW9uLmdldCgpLmdldCgpXTsKKyAgICB9CisKK3By aXZhdGU6CisgICAgV2Vha09iakNQdHI8V0tDb250ZW50Vmlldz4gbV92aWV3OworICAgIFdlYWtP YmpDUHRyPE5TT2JqZWN0PFVJSW50ZXJhY3Rpb24+PiBtX2ludGVyYWN0aW9uOworfTsKKwogfQog CiBAY2xhc3MgV0tGb2N1c2VkRWxlbWVudEluZm87CkBAIC00MzUsNiArNDU5LDcgQEAgc3RydWN0 IFdLQXV0b0NvcnJlY3Rpb25EYXRhIHsKICAgICBXZWJLaXQ6OkltYWdlRXh0cmFjdGlvblN0YXRl IF9pbWFnZUV4dHJhY3Rpb25TdGF0ZTsKICAgICBDR1JlY3QgX2ltYWdlRXh0cmFjdGlvbkludGVy YWN0aW9uQm91bmRzOwogICAgIFZlY3RvcjxCbG9ja1B0cjx2b2lkKCk+PiBfYWN0aW9uc1RvUGVy Zm9ybUFmdGVyUGVuZGluZ0ltYWdlRXh0cmFjdGlvbjsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8V2Vi S2l0OjpTdXBwcmVzc0ludGVyYWN0aW9uVG9rZW4+IF9zdXBwcmVzc0ltYWdlRXh0cmFjdGlvblRv a2VuOwogI2VuZGlmCiAKICNpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbSBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0K aW5kZXggYmZjZjA1MWYzYmUxNzBjNDNhNmE4ZWUxZjliNDVjM2VjZGJjMmE5MS4uNDUyMzk2MTFk NWRjZmU1MTBjOTk2YmUwYWU2YzJkNjVlMTNlZGYwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC0xMjky LDYgKzEyOTIsMTIgQEAgLSAoQk9PTClzZXRJc0VkaXRhYmxlOihCT09MKWlzRWRpdGFibGUKICAg ICAgICAgcmV0dXJuIE5POwogCiAgICAgX2lzRWRpdGFibGUgPSBpc0VkaXRhYmxlOworCisjaWYg RU5BQkxFKElNQUdFX0VYVFJBQ1RJT04pCisgICAgaWYgKHNlbGYuX2ltYWdlRXh0cmFjdGlvbkVu YWJsZWQgJiYgKCFfaXNCbHVycmluZ0ZvY3VzZWRFbGVtZW50IHx8ICFfaXNDaGFuZ2luZ0ZvY3Vz KSkKKyAgICAgICAgX3N1cHByZXNzSW1hZ2VFeHRyYWN0aW9uVG9rZW4gPSBpc0VkaXRhYmxlID8g bWFrZVVuaXF1ZTxXZWJLaXQ6OlN1cHByZXNzSW50ZXJhY3Rpb25Ub2tlbj4oc2VsZiwgX2ltYWdl RXh0cmFjdGlvbkludGVyYWN0aW9uLmdldCgpKSA6IG51bGxwdHI7CisjZW5kaWYKKwogICAgIHJl dHVybiBZRVM7CiB9CiAKQEAgLTQzODEsNiArNDM4Nyw3IEBAIC0gKHZvaWQpX2RpZFN0YXJ0UHJv dmlzaW9uYWxMb2FkRm9yTWFpbkZyYW1lCiAgICAgW3NlbGYgX3NldERvdWJsZVRhcEdlc3R1cmVz RW5hYmxlZDpOT107CiAgICAgW190d29GaW5nZXJEb3VibGVUYXBHZXN0dXJlUmVjb2duaXplciBf d2tfY2FuY2VsXTsKICNpZiBFTkFCTEUoSU1BR0VfRVhUUkFDVElPTikKKyAgICBfc3VwcHJlc3NJ bWFnZUV4dHJhY3Rpb25Ub2tlbiA9IG51bGxwdHI7CiAgICAgW3NlbGYgX2NhbmNlbEltYWdlRXh0 cmFjdGlvbl07CiAjZW5kaWYKIH0K 416354 2020-12-16 12:11:26 -0800 2020-12-16 12:40:14 -0800 Patch for landing bug-219952-20201216121125.patch text/plain 4119 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwODk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGU4ODczMWM5NGM0NzEwOGNk NjY5OWFlNjUzOTEzOWQzMThjZWU4M2IuLjQ1N2YzMzkzNTkxNGM2MDNjOTJiNzVlODliNWMyYTlm M2NjMGE2NDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjAtMTItMTYgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgU3VwcHJlc3MgdGhlIGlt YWdlIGV4dHJhY3Rpb24gaW50ZXJhY3Rpb24gd2hpbGUgZWRpdGluZyB0ZXh0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk5NTIKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzcyMzkwMDUzPgorCisgICAgICAgIFJldmlld2VkIGJ5IERldmluIFJvdXNz by4KKworICAgICAgICBTZWUgcmFkYXIgYW5kIFdlYktpdEFkZGl0aW9ucyBmb3IgbW9yZSBkZXRh aWxzLgorCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24u aDoKKyAgICAgICAgKFdlYktpdDo6U3VwcHJlc3NJbnRlcmFjdGlvblRva2VuOjpTdXBwcmVzc0lu dGVyYWN0aW9uVG9rZW4pOgorICAgICAgICAoV2ViS2l0OjpTdXBwcmVzc0ludGVyYWN0aW9uVG9r ZW46On5TdXBwcmVzc0ludGVyYWN0aW9uVG9rZW4pOgorCisgICAgICAgIEFkZCBhIGhlbHBlciBj bGFzcyB0byBoZWxwIGZhY2lsaXRhdGUgdGhlIHRlbXBvcmFyeSByZW1vdmFsIG9mIFVJSW50ZXJh Y3Rpb24gb2JqZWN0cyBmcm9tIGEgV0tDb250ZW50Vmlldy4KKworICAgICAgICAqIFVJUHJvY2Vz cy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRW aWV3IHNldElzRWRpdGFibGU6XSk6CisKKyAgICAgICAgVXNlIHRoZSBhYm92ZSBoZWxwZXIgY2xh c3MgdG8gdGVtcG9yYXJpbHkgcmVtb3ZlIHRoZSBpbWFnZSBleHRyYWN0aW9uIGludGVyYWN0aW9u IHdoaWxlIHRoZSB1c2VyIGlzIGVkaXRpbmcKKyAgICAgICAgdGV4dCAoYW5kIGlzIHRoZXJlZm9y ZSBkZXBlbmRpbmcgb24gZWRpdGFibGUgdGV4dCBpbnRlcmFjdGlvbiBnZXN0dXJlcykuIE5vdGUg dGhhdCB3ZSBhdm9pZCB1bm5lY2Vzc2FyaWx5CisgICAgICAgIGNsZWFyaW5nIG91dCBhbmQgcmVz ZXR0aW5nIHRoaXMgbWVtYmVyIHZhcmlhYmxlIHdoZW4gY2hhbmdpbmcgZm9jdXMgYmV0d2VlbiBl ZGl0YWJsZSB0ZXh0IGZpZWxkcy4KKworICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9kaWRTdGFy dFByb3Zpc2lvbmFsTG9hZEZvck1haW5GcmFtZV0pOgorCiAyMDIwLTEyLTE1ICBTaW1vbiBGcmFz ZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIENhbGxzIHRvIHNldEZpeGVk TGF5b3V0U2l6ZSgpIHNob3VsZCBub3QgYmUgaW5zaWRlIEVOQUJMRShURVhUX0FVVE9TSVpJTkcp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0lu dGVyYWN0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0lu dGVyYWN0aW9uLmgKaW5kZXggM2IyOTUwYTYyMWRmY2EyOTQ1Nzg1ZDgyMmU4YjU0NzgzODY1MDA1 YS4uNDMwMWEwOTE5ZTg4NmUyMjAwMmVmYzhhNDBmYzU1Yjg4MWQ3MWFmOCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24u aApAQCAtMjAxLDYgKzIwMSwzMiBAQCBzdHJ1Y3QgV0tBdXRvQ29ycmVjdGlvbkRhdGEgewogICAg IENHUmVjdCB0ZXh0TGFzdFJlY3Q7CiB9OwogCitjbGFzcyBTdXBwcmVzc0ludGVyYWN0aW9uVG9r ZW4geworICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKFN1cHByZXNzSW50ZXJhY3Rpb25Ub2tlbik7 IFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOworcHVibGljOgorICAgIFN1cHByZXNzSW50ZXJhY3Rp b25Ub2tlbihXS0NvbnRlbnRWaWV3ICp2aWV3LCBOU09iamVjdDxVSUludGVyYWN0aW9uPiAqaW50 ZXJhY3Rpb24pCisgICAgICAgIDogbV92aWV3KHZpZXcpCisgICAgICAgICwgbV9pbnRlcmFjdGlv bihpbnRlcmFjdGlvbikKKyAgICB7CisgICAgICAgIEFTU0VSVCh2aWV3KTsKKyAgICAgICAgQVNT RVJUKGludGVyYWN0aW9uKTsKKyAgICAgICAgaWYgKGludGVyYWN0aW9uKQorICAgICAgICAgICAg W3ZpZXcgcmVtb3ZlSW50ZXJhY3Rpb246aW50ZXJhY3Rpb25dOworICAgIH0KKworICAgIH5TdXBw cmVzc0ludGVyYWN0aW9uVG9rZW4oKQorICAgIHsKKyAgICAgICAgaWYgKCFtX3ZpZXcgfHwgIW1f aW50ZXJhY3Rpb24pCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgW21fdmlldyBhZGRJ bnRlcmFjdGlvbjptX2ludGVyYWN0aW9uLmdldCgpLmdldCgpXTsKKyAgICB9CisKK3ByaXZhdGU6 CisgICAgV2Vha09iakNQdHI8V0tDb250ZW50Vmlldz4gbV92aWV3OworICAgIFdlYWtPYmpDUHRy PE5TT2JqZWN0PFVJSW50ZXJhY3Rpb24+PiBtX2ludGVyYWN0aW9uOworfTsKKwogfQogCiBAY2xh c3MgV0tGb2N1c2VkRWxlbWVudEluZm87CkBAIC00MzUsNiArNDYxLDcgQEAgc3RydWN0IFdLQXV0 b0NvcnJlY3Rpb25EYXRhIHsKICAgICBXZWJLaXQ6OkltYWdlRXh0cmFjdGlvblN0YXRlIF9pbWFn ZUV4dHJhY3Rpb25TdGF0ZTsKICAgICBDR1JlY3QgX2ltYWdlRXh0cmFjdGlvbkludGVyYWN0aW9u Qm91bmRzOwogICAgIFZlY3RvcjxCbG9ja1B0cjx2b2lkKCk+PiBfYWN0aW9uc1RvUGVyZm9ybUFm dGVyUGVuZGluZ0ltYWdlRXh0cmFjdGlvbjsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8V2ViS2l0OjpT dXBwcmVzc0ludGVyYWN0aW9uVG9rZW4+IF9zdXBwcmVzc0ltYWdlRXh0cmFjdGlvblRva2VuOwog I2VuZGlmCiAKICNpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbSBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KaW5kZXgg YmZjZjA1MWYzYmUxNzBjNDNhNmE4ZWUxZjliNDVjM2VjZGJjMmE5MS4uNDUyMzk2MTFkNWRjZmU1 MTBjOTk2YmUwYWU2YzJkNjVlMTNlZGYwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC0xMjkyLDYgKzEy OTIsMTIgQEAgLSAoQk9PTClzZXRJc0VkaXRhYmxlOihCT09MKWlzRWRpdGFibGUKICAgICAgICAg cmV0dXJuIE5POwogCiAgICAgX2lzRWRpdGFibGUgPSBpc0VkaXRhYmxlOworCisjaWYgRU5BQkxF KElNQUdFX0VYVFJBQ1RJT04pCisgICAgaWYgKHNlbGYuX2ltYWdlRXh0cmFjdGlvbkVuYWJsZWQg JiYgKCFfaXNCbHVycmluZ0ZvY3VzZWRFbGVtZW50IHx8ICFfaXNDaGFuZ2luZ0ZvY3VzKSkKKyAg ICAgICAgX3N1cHByZXNzSW1hZ2VFeHRyYWN0aW9uVG9rZW4gPSBpc0VkaXRhYmxlID8gbWFrZVVu aXF1ZTxXZWJLaXQ6OlN1cHByZXNzSW50ZXJhY3Rpb25Ub2tlbj4oc2VsZiwgX2ltYWdlRXh0cmFj dGlvbkludGVyYWN0aW9uLmdldCgpKSA6IG51bGxwdHI7CisjZW5kaWYKKwogICAgIHJldHVybiBZ RVM7CiB9CiAKQEAgLTQzODEsNiArNDM4Nyw3IEBAIC0gKHZvaWQpX2RpZFN0YXJ0UHJvdmlzaW9u YWxMb2FkRm9yTWFpbkZyYW1lCiAgICAgW3NlbGYgX3NldERvdWJsZVRhcEdlc3R1cmVzRW5hYmxl ZDpOT107CiAgICAgW190d29GaW5nZXJEb3VibGVUYXBHZXN0dXJlUmVjb2duaXplciBfd2tfY2Fu Y2VsXTsKICNpZiBFTkFCTEUoSU1BR0VfRVhUUkFDVElPTikKKyAgICBfc3VwcHJlc3NJbWFnZUV4 dHJhY3Rpb25Ub2tlbiA9IG51bGxwdHI7CiAgICAgW3NlbGYgX2NhbmNlbEltYWdlRXh0cmFjdGlv bl07CiAjZW5kaWYKIH0K