220933 2021-01-25 10:57:40 -0800 [iOS] improve support for sequential scribble interactions that involving different inputs 2021-01-25 16:36:38 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 hi hi hi thorton webkit-bug-importer oldest_to_newest 1722136 0 hi 2021-01-25 10:57:40 -0800 . 1722139 1 hi 2021-01-25 10:58:07 -0800 <rdar://problem/71911346> 1722141 2 418308 hi 2021-01-25 10:58:49 -0800 Created attachment 418308 Patch 1722167 3 418308 thorton 2021-01-25 11:39:22 -0800 Comment on attachment 418308 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=418308&action=review > Source/WebKit/UIProcess/ios/WKContentViewInteraction.h:399 > + uint64_t _activeTextInteractionCount; That's a lot of active text interactions! > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:5351 > + --_activeTextInteractionCount; How sure are you this will never underflow? Maybe an assertion at a minimum? 1722170 4 418308 hi 2021-01-25 11:42:45 -0800 Comment on attachment 418308 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=418308&action=review >> Source/WebKit/UIProcess/ios/WKContentViewInteraction.h:399 >> + uint64_t _activeTextInteractionCount; > > That's a lot of active text interactions! /me attempts to see how many interactions he could have at the same time Aside: I guess I could make it an `NSInteger` instead to match other member variables 🤔 >> Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:5351 >> + --_activeTextInteractionCount; > > How sure are you this will never underflow? Maybe an assertion at a minimum? Good idea. 1722175 5 418316 hi 2021-01-25 11:45:34 -0800 Created attachment 418316 Patch 1722347 6 ews-feeder 2021-01-25 16:36:37 -0800 Committed r271868: <https://trac.webkit.org/changeset/271868> All reviewed patches have been landed. Closing bug and clearing flags on attachment 418316. 418308 2021-01-25 10:58:49 -0800 2021-01-25 11:45:32 -0800 Patch 220933.diff text/plain 5617 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggYTdhYTc3YzI2OTlkLi4wZTJlZTgwNWExNzMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjQgQEAKKzIwMjEtMDEtMTIgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgor CisgICAgICAgIFtpT1NdIGltcHJvdmUgc3VwcG9ydCBmb3Igc2VxdWVudGlhbCBzY3JpYmJsZSBp bnRlcmFjdGlvbnMgdGhhdCBpbnZvbHZpbmcgZGlmZmVyZW50IGlucHV0cworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwOTMzCisgICAgICAgIDxyZGFy Oi9wcm9ibGVtLzcxOTExMzQ2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaDoK KyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAg ICAgICAgKC1bV0tDb250ZW50VmlldyBjbGVhblVwSW50ZXJhY3Rpb25dKToKKyAgICAgICAgKC1b V0tDb250ZW50VmlldyBiZWNvbWVGaXJzdFJlc3BvbmRlckZvcldlYlZpZXddKToKKyAgICAgICAg KC1bV0tDb250ZW50VmlldyBfem9vbVRvUmV2ZWFsRm9jdXNlZEVsZW1lbnRdKToKKyAgICAgICAg KC1bV0tDb250ZW50VmlldyBfZGlkQ29tbWl0TG9hZEZvck1haW5GcmFtZV0pOgorICAgICAgICAo LVtXS0NvbnRlbnRWaWV3IF93aWxsQmVnaW5UZXh0SW50ZXJhY3Rpb25JblRleHRJbnB1dENvbnRl eHQ6XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2RpZEZpbmlzaFRleHRJbnRlcmFjdGlv bkluVGV4dElucHV0Q29udGV4dDpdKToKKyAgICAgICAgUmF0aGVyIHRoYW4gaGF2ZSBhIHNpbXBs ZSAieWVzL25vIiBgX3RleHRJbnRlcmFjdGlvbklzSGFwcGVuaW5nYCB3ZSBzaG91bGQga2VlcCBh IGNvdW50IG9mCisgICAgICAgIHNjcmliYmxlIGludGVyYWN0aW9ucyAoaW5jcmVtZW50IGluIGB3 aWxsQmVnaW4qYCBhbmQgZGVjcmVtZW50IGluIGBkaWRGaW5pc2gqYCkgc28gdGhhdCB3ZQorICAg ICAgICBkb24ndCBzZW5kIHVubmVjZXNzYXJ5L2luY29ycmVjdCBJUEMgdG8gdGhlIFdlYlByb2Nl c3MgYWZ0ZXIgdGhlIGZpcnN0IHNjcmliYmxlIGNvbW1pdHMgaWYKKyAgICAgICAgdGhlcmUncyBh IHNlY29uZCBzY3JpYmJsZSBpbiBwcm9ncmVzcyBmb3IgYW5vdGhlciBlbGVtZW50LgorCiAyMDIx LTAxLTExICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFtt YWNPU10gRW5hYmxlIHRoZSBjbGllbnQgZGVjb2RlciBlbnRpdGxlbWVudCBmb3IgdGhlIEdQVSBQ cm9jZXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50 Vmlld0ludGVyYWN0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50 Vmlld0ludGVyYWN0aW9uLmgKaW5kZXggNDE0NmE5ZmY5MzlhLi4xNTY2ZDhhMjM2ZTMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rp b24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVy YWN0aW9uLmgKQEAgLTM5NCw5ICszOTQsOSBAQCBwcml2YXRlOgogICAgIEJPT0wgX2lzRXhwZWN0 aW5nRmFzdFNpbmdsZVRhcENvbW1pdDsKICAgICBCT09MIF9zaG93RGVidWdUYXBIaWdobGlnaHRz Rm9yRmFzdENsaWNraW5nOwogICAgIEJPT0wgX3RleHRJbnRlcmFjdGlvbkRpZENoYW5nZUZvY3Vz ZWRFbGVtZW50OwotICAgIEJPT0wgX3RleHRJbnRlcmFjdGlvbklzSGFwcGVuaW5nOwogICAgIEJP T0wgX3RyZWF0QXNDb250ZW50RWRpdGFibGVVbnRpbE5leHRFZGl0b3JTdGF0ZVVwZGF0ZTsKICAg ICBib29sIF9pc1dhaXRpbmdPblBvc2l0aW9uSW5mb3JtYXRpb247CisgICAgdWludDY0X3QgX2Fj dGl2ZVRleHRJbnRlcmFjdGlvbkNvdW50OwogCiAgICAgV2ViQ29yZTo6UG9pbnRlcklEIG1fY29t bWl0UG90ZW50aWFsVGFwUG9pbnRlcklkOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQppbmRleCAyM2ZiMDJhNzc3 YzUuLmU5NWRiYTBhMWViNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9z L1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC05MzcsNyArOTM3LDcgQEAgLSAo dm9pZCljbGVhblVwSW50ZXJhY3Rpb24KICNlbmRpZgogCiAgICAgX3RleHRJbnRlcmFjdGlvbkRp ZENoYW5nZUZvY3VzZWRFbGVtZW50ID0gTk87Ci0gICAgX3RleHRJbnRlcmFjdGlvbklzSGFwcGVu aW5nID0gTk87CisgICAgX2FjdGl2ZVRleHRJbnRlcmFjdGlvbkNvdW50ID0gMDsKIAogICAgIF90 cmVhdEFzQ29udGVudEVkaXRhYmxlVW50aWxOZXh0RWRpdG9yU3RhdGVVcGRhdGUgPSBOTzsKIApA QCAtMTM3Myw3ICsxMzczLDcgQEAgLSAoQk9PTCliZWNvbWVGaXJzdFJlc3BvbmRlckZvcldlYlZp ZXcKIAogICAgICAgICBfcGFnZS0+YWN0aXZpdHlTdGF0ZURpZENoYW5nZShXZWJDb3JlOjpBY3Rp dml0eVN0YXRlOjpJc0ZvY3VzZWQsIFdlYktpdDo6V2ViUGFnZVByb3h5OjpBY3Rpdml0eVN0YXRl Q2hhbmdlRGlzcGF0Y2hNb2RlOjpJbW1lZGlhdGUpOwogCi0gICAgICAgIGlmIChbc2VsZiBjYW5T aG93Tm9uRW1wdHlTZWxlY3Rpb25WaWV3XSB8fCAoIV9zdXBwcmVzc1NlbGVjdGlvbkFzc2lzdGFu dFJlYXNvbnMgJiYgX3RleHRJbnRlcmFjdGlvbklzSGFwcGVuaW5nKSkKKyAgICAgICAgaWYgKFtz ZWxmIGNhblNob3dOb25FbXB0eVNlbGVjdGlvblZpZXddIHx8ICghX3N1cHByZXNzU2VsZWN0aW9u QXNzaXN0YW50UmVhc29ucyAmJiBfYWN0aXZlVGV4dEludGVyYWN0aW9uQ291bnQpKQogICAgICAg ICAgICAgW190ZXh0SW50ZXJhY3Rpb25Bc3Npc3RhbnQgYWN0aXZhdGVTZWxlY3Rpb25dOwogCiAg ICAgICAgIFtzZWxmIF9zY2hlZHVsZVJlc2V0SW5wdXRWaWV3RGVmZXJyYWxBZnRlckJlY29taW5n Rmlyc3RSZXNwb25kZXJdOwpAQCAtMjAyMyw3ICsyMDIzLDcgQEAgLSAoQk9PTClfcmVxdWlyZXNL ZXlib2FyZFJlc2V0T25SZWxvYWQKIAogLSAodm9pZClfem9vbVRvUmV2ZWFsRm9jdXNlZEVsZW1l bnQKIHsKLSAgICBpZiAoX3N1cHByZXNzU2VsZWN0aW9uQXNzaXN0YW50UmVhc29ucyB8fCBfdGV4 dEludGVyYWN0aW9uSXNIYXBwZW5pbmcpCisgICAgaWYgKF9zdXBwcmVzc1NlbGVjdGlvbkFzc2lz dGFudFJlYXNvbnMgfHwgX2FjdGl2ZVRleHRJbnRlcmFjdGlvbkNvdW50KQogICAgICAgICByZXR1 cm47CiAKICAgICAvLyBJbiBjYXNlIHVzZXIgc2NhbGluZyBpcyBmb3JjZSBlbmFibGVkLCBkbyBu b3QgdXNlIHRoYXQgc2NhbGluZyB3aGVuIHpvb21pbmcgaW4gd2l0aCBhbiBpbnB1dCBmaWVsZC4K QEAgLTQzOTcsNyArNDM5Nyw3IEBAIC0gKHZvaWQpX2RpZENvbW1pdExvYWRGb3JNYWluRnJhbWUK ICAgICBbX3dlYlZpZXcgX2RpZENvbW1pdExvYWRGb3JNYWluRnJhbWVdOwogCiAgICAgX3RleHRJ bnRlcmFjdGlvbkRpZENoYW5nZUZvY3VzZWRFbGVtZW50ID0gTk87Ci0gICAgX3RleHRJbnRlcmFj dGlvbklzSGFwcGVuaW5nID0gTk87CisgICAgX2FjdGl2ZVRleHRJbnRlcmFjdGlvbkNvdW50ID0g MDsKICAgICBfdHJlYXRBc0NvbnRlbnRFZGl0YWJsZVVudGlsTmV4dEVkaXRvclN0YXRlVXBkYXRl ID0gTk87CiAgICAgX2hhc1ZhbGlkUG9zaXRpb25JbmZvcm1hdGlvbiA9IE5POwogICAgIF9wb3Np dGlvbkluZm9ybWF0aW9uID0geyB9OwpAQCAtNTMzMCwxOSArNTMzMCwzMCBAQCAtICh2b2lkKV9y ZXF1ZXN0VGV4dElucHV0Q29udGV4dHNJblJlY3Q6KENHUmVjdClyZWN0IGNvbXBsZXRpb25IYW5k bGVyOih2b2lkICheKQogLSAodm9pZClfd2lsbEJlZ2luVGV4dEludGVyYWN0aW9uSW5UZXh0SW5w dXRDb250ZXh0OihfV0tUZXh0SW5wdXRDb250ZXh0ICopY29udGV4dAogewogICAgIEFTU0VSVChj b250ZXh0KTsKKworICAgIF9wYWdlLT5zZXRDYW5TaG93UGxhY2Vob2xkZXIoY29udGV4dC5fdGV4 dElucHV0Q29udGV4dCwgZmFsc2UpOworCisgICAgKytfYWN0aXZlVGV4dEludGVyYWN0aW9uQ291 bnQ7CisgICAgaWYgKF9hY3RpdmVUZXh0SW50ZXJhY3Rpb25Db3VudCA+IDEpCisgICAgICAgIHJl dHVybjsKKwogICAgIF90ZXh0SW50ZXJhY3Rpb25EaWRDaGFuZ2VGb2N1c2VkRWxlbWVudCA9IE5P OwogICAgIF9wYWdlLT5zZXRTaG91bGRSZXZlYWxDdXJyZW50U2VsZWN0aW9uQWZ0ZXJJbnNlcnRp b24oZmFsc2UpOwotICAgIF9wYWdlLT5zZXRDYW5TaG93UGxhY2Vob2xkZXIoY29udGV4dC5fdGV4 dElucHV0Q29udGV4dCwgZmFsc2UpOwogICAgIF91c2luZ0dlc3R1cmVGb3JTZWxlY3Rpb24gPSBZ RVM7Ci0gICAgX3RleHRJbnRlcmFjdGlvbklzSGFwcGVuaW5nID0gWUVTOwogfQogCiAtICh2b2lk KV9kaWRGaW5pc2hUZXh0SW50ZXJhY3Rpb25JblRleHRJbnB1dENvbnRleHQ6KF9XS1RleHRJbnB1 dENvbnRleHQgKiljb250ZXh0CiB7CiAgICAgQVNTRVJUKGNvbnRleHQpOwotICAgIF90ZXh0SW50 ZXJhY3Rpb25Jc0hhcHBlbmluZyA9IE5POwotICAgIF91c2luZ0dlc3R1cmVGb3JTZWxlY3Rpb24g PSBOTzsKKwogICAgIF9wYWdlLT5zZXRDYW5TaG93UGxhY2Vob2xkZXIoY29udGV4dC5fdGV4dElu cHV0Q29udGV4dCwgdHJ1ZSk7CisKKyAgICAtLV9hY3RpdmVUZXh0SW50ZXJhY3Rpb25Db3VudDsK KyAgICBpZiAoX2FjdGl2ZVRleHRJbnRlcmFjdGlvbkNvdW50KQorICAgICAgICByZXR1cm47CisK KyAgICBfdXNpbmdHZXN0dXJlRm9yU2VsZWN0aW9uID0gTk87CisKICAgICBpZiAoX3RleHRJbnRl cmFjdGlvbkRpZENoYW5nZUZvY3VzZWRFbGVtZW50KSB7CiAgICAgICAgIC8vIE1hcmsgdG8gem9v bSB0byByZXZlYWwgdGhlIG5ld2x5IGZvY3VzZWQgZWxlbWVudCBvbiB0aGUgbmV4dCBlZGl0b3Ig c3RhdGUgdXBkYXRlLgogICAgICAgICAvLyBUaGVuIHRlbGwgdGhlIHdlYiBwcm9jZXNzIHRvIHJl dmVhbCB0aGUgY3VycmVudCBzZWxlY3Rpb24sIHdoaWNoIHdpbGwgc2VuZCB1cyAodGhlCkBAIC01 MzUwLDYgKzUzNjEsNyBAQCAtICh2b2lkKV9kaWRGaW5pc2hUZXh0SW50ZXJhY3Rpb25JblRleHRJ bnB1dENvbnRleHQ6KF9XS1RleHRJbnB1dENvbnRleHQgKiljb250ZQogICAgICAgICBfcGFnZS0+ c2V0V2FpdGluZ0ZvclBvc3RMYXlvdXRFZGl0b3JTdGF0ZVVwZGF0ZUFmdGVyRm9jdXNpbmdFbGVt ZW50KHRydWUpOwogICAgICAgICBfdGV4dEludGVyYWN0aW9uRGlkQ2hhbmdlRm9jdXNlZEVsZW1l bnQgPSBOTzsKICAgICB9CisKICAgICBfcGFnZS0+c2V0U2hvdWxkUmV2ZWFsQ3VycmVudFNlbGVj dGlvbkFmdGVySW5zZXJ0aW9uKHRydWUpOwogfQogCg== 418316 2021-01-25 11:45:34 -0800 2021-01-25 16:36:38 -0800 Patch bug-220933-20210125124533.patch text/plain 6149 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggYzYwOWU5Nzk5OGMxN2FmYTYzN2I1YzEzNTFlZjNiMjRlMDE0YmM5NC4uYzky NDk3N2M1MzA2ODcxMmRmZGZkMTg4ZjA4MjA4ODlmMDQzMTk5MSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwyNCBAQAorMjAyMS0wMS0yNSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisK KyAgICAgICAgW2lPU10gaW1wcm92ZSBzdXBwb3J0IGZvciBzZXF1ZW50aWFsIHNjcmliYmxlIGlu dGVyYWN0aW9ucyB0aGF0IGludm9sdmluZyBkaWZmZXJlbnQgaW5wdXRzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA5MzMKKyAgICAgICAgPHJkYXI6 L3Byb2JsZW0vNzE5MTEzNDY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmg6CisgICAg ICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAg ICgtW1dLQ29udGVudFZpZXcgY2xlYW5VcEludGVyYWN0aW9uXSk6CisgICAgICAgICgtW1dLQ29u dGVudFZpZXcgYmVjb21lRmlyc3RSZXNwb25kZXJGb3JXZWJWaWV3XSk6CisgICAgICAgICgtW1dL Q29udGVudFZpZXcgX3pvb21Ub1JldmVhbEZvY3VzZWRFbGVtZW50XSk6CisgICAgICAgICgtW1dL Q29udGVudFZpZXcgX2RpZENvbW1pdExvYWRGb3JNYWluRnJhbWVdKToKKyAgICAgICAgKC1bV0tD b250ZW50VmlldyBfd2lsbEJlZ2luVGV4dEludGVyYWN0aW9uSW5UZXh0SW5wdXRDb250ZXh0Ol0p OgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9kaWRGaW5pc2hUZXh0SW50ZXJhY3Rpb25JblRl eHRJbnB1dENvbnRleHQ6XSk6CisgICAgICAgIFJhdGhlciB0aGFuIGhhdmUgYSBzaW1wbGUgInll cy9ubyIgYF90ZXh0SW50ZXJhY3Rpb25Jc0hhcHBlbmluZ2Agd2Ugc2hvdWxkIGtlZXAgYSBjb3Vu dCBvZgorICAgICAgICBzY3JpYmJsZSBpbnRlcmFjdGlvbnMgKGluY3JlbWVudCBpbiBgd2lsbEJl Z2luKmAgYW5kIGRlY3JlbWVudCBpbiBgZGlkRmluaXNoKmApIHNvIHRoYXQgd2UKKyAgICAgICAg ZG9uJ3Qgc2VuZCB1bm5lY2Vzc2FyeS9pbmNvcnJlY3QgSVBDIHRvIHRoZSBXZWJQcm9jZXNzIGFm dGVyIHRoZSBmaXJzdCBzY3JpYmJsZSBjb21taXRzIGlmCisgICAgICAgIHRoZXJlJ3MgYSBzZWNv bmQgc2NyaWJibGUgaW4gcHJvZ3Jlc3MgZm9yIGFub3RoZXIgZWxlbWVudC4KKwogMjAyMS0wMS0y MiAgSmlld2VuIFRhbiAgPGppZXdlbl90YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWJBdXRo bl0gTm8gZXJyb3IgaXMgdmlzaWJsZSBhZnRlciB1c2VyIGVudGVycyB0aGUgaW5jb3JyZWN0IFBJ TgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJ bnRlcmFjdGlvbi5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJ bnRlcmFjdGlvbi5oCmluZGV4IDcyMTQ0ODc0MmIzYzA0Yzg1ZDNjOTQyMzRhZWEwYzU1MTUzNTk2 YmYuLmM2OTIyY2FkOGY0MDhhZWI4Mjc0MWE4YmYyNzU0ZTVlMzBhZjNhMTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaAor KysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9u LmgKQEAgLTM5Nyw3ICszOTcsNiBAQCBwcml2YXRlOgogICAgIEJPT0wgX2lzRXhwZWN0aW5nRmFz dFNpbmdsZVRhcENvbW1pdDsKICAgICBCT09MIF9zaG93RGVidWdUYXBIaWdobGlnaHRzRm9yRmFz dENsaWNraW5nOwogICAgIEJPT0wgX3RleHRJbnRlcmFjdGlvbkRpZENoYW5nZUZvY3VzZWRFbGVt ZW50OwotICAgIEJPT0wgX3RleHRJbnRlcmFjdGlvbklzSGFwcGVuaW5nOwogICAgIEJPT0wgX3Ry ZWF0QXNDb250ZW50RWRpdGFibGVVbnRpbE5leHRFZGl0b3JTdGF0ZVVwZGF0ZTsKICAgICBib29s IF9pc1dhaXRpbmdPblBvc2l0aW9uSW5mb3JtYXRpb247CiAKQEAgLTQyNCw2ICs0MjMsNyBAQCBw cml2YXRlOgogCiAgICAgQk9PTCBfaGFzU2V0VXBJbnRlcmFjdGlvbnM7CiAgICAgTlNVSW50ZWdl ciBfaWdub3JlU2VsZWN0aW9uQ29tbWFuZEZhZGVDb3VudDsKKyAgICBOU1VJbnRlZ2VyIF9hY3Rp dmVUZXh0SW50ZXJhY3Rpb25Db3VudDsKICAgICBOU0ludGVnZXIgX3N1cHByZXNzTm9uRWRpdGFi bGVTaW5nbGVUYXBUZXh0SW50ZXJhY3Rpb25Db3VudDsKICAgICBDb21wbGV0aW9uSGFuZGxlcjx2 b2lkKFdlYkNvcmU6OkRPTVBhc3RlQWNjZXNzUmVzcG9uc2UpPiBfZG9tUGFzdGVSZXF1ZXN0SGFu ZGxlcjsKICAgICBCbG9ja1B0cjx2b2lkKFVJV0tBdXRvY29ycmVjdGlvbkNvbnRleHQgKik+IF9w ZW5kaW5nQXV0b2NvcnJlY3Rpb25Db250ZXh0SGFuZGxlcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IGIy ZjdhOGJhYTQ1NWQwNTZkN2ZmMjIzOGRhNmVhNDk1NjU0YmQ2YTkuLjFmZGU4NzliYWI2OGJiMDM3 ZWIwM2Y4ZjBhNjcxODY4MDE1ZGY1YTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpAQCAtOTQyLDcgKzk0Miw3 IEBAIC0gKHZvaWQpY2xlYW5VcEludGVyYWN0aW9uCiAjZW5kaWYKIAogICAgIF90ZXh0SW50ZXJh Y3Rpb25EaWRDaGFuZ2VGb2N1c2VkRWxlbWVudCA9IE5POwotICAgIF90ZXh0SW50ZXJhY3Rpb25J c0hhcHBlbmluZyA9IE5POworICAgIF9hY3RpdmVUZXh0SW50ZXJhY3Rpb25Db3VudCA9IDA7CiAK ICAgICBfdHJlYXRBc0NvbnRlbnRFZGl0YWJsZVVudGlsTmV4dEVkaXRvclN0YXRlVXBkYXRlID0g Tk87CiAKQEAgLTEzNzgsNyArMTM3OCw3IEBAIC0gKEJPT0wpYmVjb21lRmlyc3RSZXNwb25kZXJG b3JXZWJWaWV3CiAKICAgICAgICAgX3BhZ2UtPmFjdGl2aXR5U3RhdGVEaWRDaGFuZ2UoV2ViQ29y ZTo6QWN0aXZpdHlTdGF0ZTo6SXNGb2N1c2VkLCBXZWJLaXQ6OldlYlBhZ2VQcm94eTo6QWN0aXZp dHlTdGF0ZUNoYW5nZURpc3BhdGNoTW9kZTo6SW1tZWRpYXRlKTsKIAotICAgICAgICBpZiAoW3Nl bGYgY2FuU2hvd05vbkVtcHR5U2VsZWN0aW9uVmlld10gfHwgKCFfc3VwcHJlc3NTZWxlY3Rpb25B c3Npc3RhbnRSZWFzb25zICYmIF90ZXh0SW50ZXJhY3Rpb25Jc0hhcHBlbmluZykpCisgICAgICAg IGlmIChbc2VsZiBjYW5TaG93Tm9uRW1wdHlTZWxlY3Rpb25WaWV3XSB8fCAoIV9zdXBwcmVzc1Nl bGVjdGlvbkFzc2lzdGFudFJlYXNvbnMgJiYgX2FjdGl2ZVRleHRJbnRlcmFjdGlvbkNvdW50KSkK ICAgICAgICAgICAgIFtfdGV4dEludGVyYWN0aW9uQXNzaXN0YW50IGFjdGl2YXRlU2VsZWN0aW9u XTsKIAogICAgICAgICBbc2VsZiBfc2NoZWR1bGVSZXNldElucHV0Vmlld0RlZmVycmFsQWZ0ZXJC ZWNvbWluZ0ZpcnN0UmVzcG9uZGVyXTsKQEAgLTIwNzksNyArMjA3OSw3IEBAIC0gKFdlYkNvcmU6 OkZsb2F0UmVjdClyZWN0VG9SZXZlYWxXaGVuWm9vbWluZ1RvRm9jdXNlZEVsZW1lbnQKIAogLSAo dm9pZClfem9vbVRvUmV2ZWFsRm9jdXNlZEVsZW1lbnQKIHsKLSAgICBpZiAoX3N1cHByZXNzU2Vs ZWN0aW9uQXNzaXN0YW50UmVhc29ucyB8fCBfdGV4dEludGVyYWN0aW9uSXNIYXBwZW5pbmcpCisg ICAgaWYgKF9zdXBwcmVzc1NlbGVjdGlvbkFzc2lzdGFudFJlYXNvbnMgfHwgX2FjdGl2ZVRleHRJ bnRlcmFjdGlvbkNvdW50KQogICAgICAgICByZXR1cm47CiAKICAgICAvLyBJbiBjYXNlIHVzZXIg c2NhbGluZyBpcyBmb3JjZSBlbmFibGVkLCBkbyBub3QgdXNlIHRoYXQgc2NhbGluZyB3aGVuIHpv b21pbmcgaW4gd2l0aCBhbiBpbnB1dCBmaWVsZC4KQEAgLTQ0NTQsNyArNDQ1NCw3IEBAIC0gKHZv aWQpX2RpZENvbW1pdExvYWRGb3JNYWluRnJhbWUKICAgICBbX3dlYlZpZXcgX2RpZENvbW1pdExv YWRGb3JNYWluRnJhbWVdOwogCiAgICAgX3RleHRJbnRlcmFjdGlvbkRpZENoYW5nZUZvY3VzZWRF bGVtZW50ID0gTk87Ci0gICAgX3RleHRJbnRlcmFjdGlvbklzSGFwcGVuaW5nID0gTk87CisgICAg X2FjdGl2ZVRleHRJbnRlcmFjdGlvbkNvdW50ID0gMDsKICAgICBfdHJlYXRBc0NvbnRlbnRFZGl0 YWJsZVVudGlsTmV4dEVkaXRvclN0YXRlVXBkYXRlID0gTk87CiAgICAgX2hhc1ZhbGlkUG9zaXRp b25JbmZvcm1hdGlvbiA9IE5POwogICAgIF9wb3NpdGlvbkluZm9ybWF0aW9uID0geyB9OwpAQCAt NTM4NywxOSArNTM4NywzMSBAQCAtICh2b2lkKV9yZXF1ZXN0VGV4dElucHV0Q29udGV4dHNJblJl Y3Q6KENHUmVjdClyZWN0IGNvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKQogLSAodm9pZClfd2ls bEJlZ2luVGV4dEludGVyYWN0aW9uSW5UZXh0SW5wdXRDb250ZXh0OihfV0tUZXh0SW5wdXRDb250 ZXh0ICopY29udGV4dAogewogICAgIEFTU0VSVChjb250ZXh0KTsKKworICAgIF9wYWdlLT5zZXRD YW5TaG93UGxhY2Vob2xkZXIoY29udGV4dC5fdGV4dElucHV0Q29udGV4dCwgZmFsc2UpOworCisg ICAgKytfYWN0aXZlVGV4dEludGVyYWN0aW9uQ291bnQ7CisgICAgaWYgKF9hY3RpdmVUZXh0SW50 ZXJhY3Rpb25Db3VudCA+IDEpCisgICAgICAgIHJldHVybjsKKwogICAgIF90ZXh0SW50ZXJhY3Rp b25EaWRDaGFuZ2VGb2N1c2VkRWxlbWVudCA9IE5POwogICAgIF9wYWdlLT5zZXRTaG91bGRSZXZl YWxDdXJyZW50U2VsZWN0aW9uQWZ0ZXJJbnNlcnRpb24oZmFsc2UpOwotICAgIF9wYWdlLT5zZXRD YW5TaG93UGxhY2Vob2xkZXIoY29udGV4dC5fdGV4dElucHV0Q29udGV4dCwgZmFsc2UpOwogICAg IF91c2luZ0dlc3R1cmVGb3JTZWxlY3Rpb24gPSBZRVM7Ci0gICAgX3RleHRJbnRlcmFjdGlvbklz SGFwcGVuaW5nID0gWUVTOwogfQogCiAtICh2b2lkKV9kaWRGaW5pc2hUZXh0SW50ZXJhY3Rpb25J blRleHRJbnB1dENvbnRleHQ6KF9XS1RleHRJbnB1dENvbnRleHQgKiljb250ZXh0CiB7CiAgICAg QVNTRVJUKGNvbnRleHQpOwotICAgIF90ZXh0SW50ZXJhY3Rpb25Jc0hhcHBlbmluZyA9IE5POwot ICAgIF91c2luZ0dlc3R1cmVGb3JTZWxlY3Rpb24gPSBOTzsKKwogICAgIF9wYWdlLT5zZXRDYW5T aG93UGxhY2Vob2xkZXIoY29udGV4dC5fdGV4dElucHV0Q29udGV4dCwgdHJ1ZSk7CisKKyAgICBB U1NFUlQoX2FjdGl2ZVRleHRJbnRlcmFjdGlvbkNvdW50ID4gMCk7CisgICAgLS1fYWN0aXZlVGV4 dEludGVyYWN0aW9uQ291bnQ7CisgICAgaWYgKF9hY3RpdmVUZXh0SW50ZXJhY3Rpb25Db3VudCkK KyAgICAgICAgcmV0dXJuOworCisgICAgX3VzaW5nR2VzdHVyZUZvclNlbGVjdGlvbiA9IE5POwor CiAgICAgaWYgKF90ZXh0SW50ZXJhY3Rpb25EaWRDaGFuZ2VGb2N1c2VkRWxlbWVudCkgewogICAg ICAgICAvLyBNYXJrIHRvIHpvb20gdG8gcmV2ZWFsIHRoZSBuZXdseSBmb2N1c2VkIGVsZW1lbnQg b24gdGhlIG5leHQgZWRpdG9yIHN0YXRlIHVwZGF0ZS4KICAgICAgICAgLy8gVGhlbiB0ZWxsIHRo ZSB3ZWIgcHJvY2VzcyB0byByZXZlYWwgdGhlIGN1cnJlbnQgc2VsZWN0aW9uLCB3aGljaCB3aWxs IHNlbmQgdXMgKHRoZQpAQCAtNTQwNyw2ICs1NDE5LDcgQEAgLSAodm9pZClfZGlkRmluaXNoVGV4 dEludGVyYWN0aW9uSW5UZXh0SW5wdXRDb250ZXh0OihfV0tUZXh0SW5wdXRDb250ZXh0ICopY29u dGUKICAgICAgICAgX3BhZ2UtPnNldFdhaXRpbmdGb3JQb3N0TGF5b3V0RWRpdG9yU3RhdGVVcGRh dGVBZnRlckZvY3VzaW5nRWxlbWVudCh0cnVlKTsKICAgICAgICAgX3RleHRJbnRlcmFjdGlvbkRp ZENoYW5nZUZvY3VzZWRFbGVtZW50ID0gTk87CiAgICAgfQorCiAgICAgX3BhZ2UtPnNldFNob3Vs ZFJldmVhbEN1cnJlbnRTZWxlY3Rpb25BZnRlckluc2VydGlvbih0cnVlKTsKIH0KIAo=