239423 2022-04-16 13:40:09 -0700 [macOS] Image controls are editable and prevent drops in editable web views 2022-04-16 20:14:14 -0700 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh akeerthi cdumez changseok darin esprehn+autocc ews-watchlist gyuyoung.kim hi kangil.han katherine_cheney megan_gardner thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1862078 0 wenson_hsieh 2022-04-16 13:40:09 -0700 rdar://81027082 1862081 1 457755 wenson_hsieh 2022-04-16 14:05:03 -0700 Created attachment 457755 For EWS 1862085 2 457755 darin 2022-04-16 15:14:31 -0700 Comment on attachment 457755 For EWS View in context: https://bugs.webkit.org/attachment.cgi?id=457755&action=review > Source/WebCore/dom/mac/ImageControlsMac.cpp:93 > + controlLayer->setContentEditable("false"_s); Mildly sad that we allocate and then deallocate the String containing "false" here. There is, however, a clean way to fix that. We can change HTMLElement::setContentEditable to take a StringView. Will still work with the String&& that the JavaScript bindings will pass to it. Probably will have to edit DOMHTMLElement.mm to keep it compiling since an NSString * knows how to turn itself into a String but not a StringView. Not really necessary to do *any* of this as part of this patch, just something I am noticing in passing. 1862087 3 457755 cdumez 2022-04-16 15:42:33 -0700 Comment on attachment 457755 For EWS View in context: https://bugs.webkit.org/attachment.cgi?id=457755&action=review >> Source/WebCore/dom/mac/ImageControlsMac.cpp:93 >> + controlLayer->setContentEditable("false"_s); > > Mildly sad that we allocate and then deallocate the String containing "false" here. There is, however, a clean way to fix that. We can change HTMLElement::setContentEditable to take a StringView. Will still work with the String&& that the JavaScript bindings will pass to it. Probably will have to edit DOMHTMLElement.mm to keep it compiling since an NSString * knows how to turn itself into a String but not a StringView. Not really necessary to do *any* of this as part of this patch, just something I am noticing in passing. I totally agree that setContentEditable() should take a StringView. I also think that the most efficient code may be: controlLayer->setAttributeWithoutSynchronization(contenteditableAttr, "false"_s); or even controlLayer->setAttributeWithoutSynchronization(contenteditableAttr, HTMLElement::falseName()); if we expose falseName() in the HTMLElement header (it is currently in the cpp only). To avoid the string comparisons inside setContentEditable(). 1862091 4 wenson_hsieh 2022-04-16 15:47:38 -0700 Thanks for the reviews, Chris and Darin! (In reply to Chris Dumez from comment #3) > Comment on attachment 457755 [details] > For EWS > > View in context: > https://bugs.webkit.org/attachment.cgi?id=457755&action=review > > >> Source/WebCore/dom/mac/ImageControlsMac.cpp:93 > >> + controlLayer->setContentEditable("false"_s); > > > > Mildly sad that we allocate and then deallocate the String containing "false" here. There is, however, a clean way to fix that. We can change HTMLElement::setContentEditable to take a StringView. Will still work with the String&& that the JavaScript bindings will pass to it. Probably will have to edit DOMHTMLElement.mm to keep it compiling since an NSString * knows how to turn itself into a String but not a StringView. Not really necessary to do *any* of this as part of this patch, just something I am noticing in passing. > > I totally agree that setContentEditable() should take a StringView. I also > think that the most efficient code may be: > controlLayer->setAttributeWithoutSynchronization(contenteditableAttr, > "false"_s); > or even > controlLayer->setAttributeWithoutSynchronization(contenteditableAttr, > HTMLElement::falseName()); > if we expose falseName() in the HTMLElement header (it is currently in the > cpp only). > > To avoid the string comparisons inside setContentEditable(). That's a great point — I filed <https://webkit.org/b/239424> to track refactoring setContentEditable to take a StringView; I'll also tweak this patch so that it does: ``` controlLayer->setAttributeWithoutSynchronization(contenteditableAttr, "false"_s); ``` ...instead of using `setContentEditable()`. 1862094 5 457758 wenson_hsieh 2022-04-16 16:05:17 -0700 Created attachment 457758 For landing 1862102 6 ews-feeder 2022-04-16 20:14:11 -0700 Committed r292944 (249709@main): <https://commits.webkit.org/249709@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 457758. 457755 2022-04-16 14:05:03 -0700 2022-04-16 16:05:14 -0700 For EWS bug-239423-20220416140503.patch text/plain 6438 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyOTM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDI2NThiZWQzNjk3MTY5 YTY0M2Q0M2ZmNmQxYWMwOWQ0NzA0ZWU5Yi4uNGE1ZTYzZDcxZmI5ZmE5MzFlMTY5NTVkZjdhZTVi MDQ1Mzk2YTJkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDIyLTA0LTE2ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFttYWNPU10gSW1h Z2UgY29udHJvbHMgYXJlIGVkaXRhYmxlIGFuZCBwcmV2ZW50IGRyb3BzIGluIGVkaXRhYmxlIHdl YiB2aWV3cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjM5NDIzCisgICAgICAgIHJkYXI6Ly84MTAyNzA4MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkanVzdCB0aGUgVUEgc3R5bGVzaGVldCBmb3IgaW1h Z2UgY29udHJvbHMgKGkuZS4sIHRoZSBzZXJ2aWNlcyBkcm9wZG93biBtZW51IGJ1dHRvbikgc3Vj aCB0aGF0OgorCisgICAgICAgIDEuIFRoZSBjb250YWluZXIgZm9yIGltYWdlIGNvbnRyb2xzIGlz IG5vbi1lZGl0YWJsZSwgYW5kOgorICAgICAgICAyLiBUaGUgY29udGFpbmVyIGFib3ZlIHRoZSBi dXR0b24gKHdoaWNoIGVuY29tcGFzc2VzIHRoZSBib3VuZHMgb2YgdGhlIGhvc3QgaW1hZ2UpIGln bm9yZXMgaGl0LXRlc3RpbmcuCisKKyAgICAgICAgVGhpcyBlbnN1cmVzIHRoYXQgd2UncmUgYWJs ZSB0byBoYW5kbGUgYSBkcm9wIG92ZXIgYW4gaW1hZ2Ugd2l0aCBpbWFnZSBjb250cm9scyBpbiBh biBlZGl0YWJsZSB3ZWIgdmlldywgYnkKKyAgICAgICAgaW5zZXJ0aW5nIHRoZSBkcm9wcGVkIGNv bnRlbnQgYmVmb3JlIG9yIGFmdGVyIHRoZSBpbWFnZSBlbGVtZW50IChhcyBvcHBvc2VkIHRvIGVp dGhlciBpbnNlcnRpbmcgaXQgaW5zaWRlIHRoZQorICAgICAgICBzaGFkb3cgcm9vdCBvZiB0aGUg aW1hZ2UsIG9yIG5vdCBoYW5kbGluZyB0aGUgZHJvcCB2aWEgZWRpdGluZyBhdCBhbGwpLgorCisg ICAgICAgIFRlc3Q6IFdLQXR0YWNobWVudFRlc3RzTWFjLkRyb3BJbWFnZU92ZXJJbWFnZVdpdGhD b250cm9scworCisgICAgICAgICogZG9tL21hYy9JbWFnZUNvbnRyb2xzTWFjLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkltYWdlQ29udHJvbHNNYWM6OmNyZWF0ZUltYWdlQ29udHJvbHMpOgorICAg ICAgICAqIGh0bWwvc2hhZG93L21hYy9pbWFnZUNvbnRyb2xzTWFjLmNzczoKKyAgICAgICAgKCNp ZiBkZWZpbmVkKEVOQUJMRV9TRVJWSUNFX0NPTlRST0xTKSAmJiBFTkFCTEVfU0VSVklDRV9DT05U Uk9MUyk6CisgICAgICAgIChidXR0b24jaW1hZ2UtY29udHJvbHMtYnV0dG9uKToKKworICAgICAg ICBNYWtlIHRoZSBjb250ZW50cyBvZiB0aGUgaW1hZ2UgY29udHJvbHMgY29udGFpbmVyIG5vbi1z ZWxlY3RhYmxlLCBhbmQgYWxzbyBhdm9pZCBoaXQtdGVzdGluZyBvdmVyIHRoZSBjb250YWluZXIu CisKKyAgICAgICAgKDpob3N0KDpob3ZlcikgYnV0dG9uI2ltYWdlLWNvbnRyb2xzLWJ1dHRvbik6 CisgICAgICAgIChkaXYjaW1hZ2UtY29udHJvbHMgYnV0dG9uI2ltYWdlLWNvbnRyb2xzLWJ1dHRv bik6IERlbGV0ZWQuCisKKyAgICAgICAgRW5zdXJlIHRoYXQgdGhlIHNlcnZpY2VzIG1lbnUgYnV0 dG9uIGl0c2VsZiBjYW4gc3RpbGwgYmUgYWN0aXZhdGVkIGJ5IHNldHRpbmcgYHBvaW50ZXItZXZl bnRzOiBhdXRvO2Agd2hlbiB0aGUKKyAgICAgICAgaG9zdCBlbGVtZW50IChpLmUuIHRoZSBgaW1n YCkgaXMgaG92ZXJlZC4gSXQncyBpbXBvcnRhbnQgdGhhdCB3ZSB1c2UgdGhlIGhvc3QgZWxlbWVu dCdzIGBob3ZlcmAgc3RhdGUgaW5zdGVhZCBvZgorICAgICAgICB0aGUgY29udGFpbmluZyBgI2lt YWdlLWNvbnRyb2xzYCwgc2luY2UgdGhpcyBjb250YWluZXIgbm93IGhhcyBgcG9pbnRlci1ldmVu dHM6IG5vbmU7YC4KKworICAgICAgICBUaGVzZSBjaGFuZ2VzIG1ha2UgaXQgc3RpbGwgcG9zc2li bGUgdG8gcmV2ZWFsIGFuZCBpbnRlcmFjdCB3aXRoIHRoZSBzZXJ2aWNlcyBtZW51IGJ1dHRvbiwg YnV0IGFsbG93cworICAgICAgICBkcmFnLWFuZC1kcm9wIHRvIGF2b2lkIGhpdC10ZXN0aW5nIGlu dG8gc2hhZG93IHJvb3QgY29udGVudCBmb3IgYW4gaW1hZ2Ugd2l0aCBjb250cm9scy4KKworICAg ICAgICAoZGl2I2ltYWdlLWNvbnRyb2xzOmhvdmVyIGJ1dHRvbiNpbWFnZS1jb250cm9scy1idXR0 b24pOiBEZWxldGVkLgorCiAyMDIyLTA0LTE1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5j b20+CiAKICAgICAgICAgUmVuYW1lIFdlYkNvcmU6OndlYkNvcmVCdWlsdGluTmFtZXMoKSB0byBX ZWJDb3JlOjpidWlsdGluTmFtZXMoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL21h Yy9JbWFnZUNvbnRyb2xzTWFjLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9tYWMvSW1hZ2VDb250 cm9sc01hYy5jcHAKaW5kZXggYzRlNDc3Njc2ZmMxMWY2ZTUyYzIwMjFkOTFiZGIxNjFmMGVmNzI4 ZC4uNjJlYjRhNGY2NWFjZWMxMzUyYThkM2MwYzE3NjMwYTRkNmYxYTY4ZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvZG9tL21hYy9JbWFnZUNvbnRyb2xzTWFjLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9kb20vbWFjL0ltYWdlQ29udHJvbHNNYWMuY3BwCkBAIC05MCw2ICs5MCw3IEBAIHZv aWQgY3JlYXRlSW1hZ2VDb250cm9scyhIVE1MRWxlbWVudCYgZWxlbWVudCkKICAgICBSZWYgc2hh ZG93Um9vdCA9IGVsZW1lbnQuZW5zdXJlVXNlckFnZW50U2hhZG93Um9vdCgpOwogICAgIGF1dG8g Y29udHJvbExheWVyID0gSFRNTERpdkVsZW1lbnQ6OmNyZWF0ZShkb2N1bWVudC5nZXQoKSk7CiAg ICAgY29udHJvbExheWVyLT5zZXRJZEF0dHJpYnV0ZShpbWFnZUNvbnRyb2xzRWxlbWVudElkZW50 aWZpZXIoKSk7CisgICAgY29udHJvbExheWVyLT5zZXRDb250ZW50RWRpdGFibGUoImZhbHNlIl9z KTsKICAgICBzaGFkb3dSb290LT5hcHBlbmRDaGlsZChjb250cm9sTGF5ZXIpOwogICAgIAogICAg IHN0YXRpYyBNYWluVGhyZWFkTmV2ZXJEZXN0cm95ZWQ8Y29uc3QgU3RyaW5nPiBzaGFkb3dTdHls ZShTdHJpbmdJbXBsOjpjcmVhdGVXaXRob3V0Q29weWluZyhpbWFnZUNvbnRyb2xzTWFjVXNlckFn ZW50U3R5bGVTaGVldCwgc2l6ZW9mKGltYWdlQ29udHJvbHNNYWNVc2VyQWdlbnRTdHlsZVNoZWV0 KSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvbWFjL2ltYWdlQ29u dHJvbHNNYWMuY3NzIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvbWFjL2ltYWdlQ29udHJv bHNNYWMuY3NzCmluZGV4IGUyYzhjZmRmOWEyYjYwMzU4ODIyZGQxNDU5Nzg5OTI4YzVjNzRjMGIu LmFkZDY1ZDY1NjI4NDg5NDYzNTY2MDdkN2IyYWMzNGMxNDM5ODBlNTIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L21hYy9pbWFnZUNvbnRyb2xzTWFjLmNzcworKysgYi9T b3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9tYWMvaW1hZ2VDb250cm9sc01hYy5jc3MKQEAgLTMw LDkgKzMwLDExIEBAIGRpdiNpbWFnZS1jb250cm9scyB7CiAgICAgcG9zaXRpb246IHJlbGF0aXZl OwogICAgIG92ZXJmbG93OiBoaWRkZW47CiAgICAgY29sb3I6IHRyYW5zcGFyZW50OworICAgIC13 ZWJraXQtdXNlci1zZWxlY3Q6IG5vbmU7CisgICAgcG9pbnRlci1ldmVudHM6IG5vbmU7CiB9CiAK LWRpdiNpbWFnZS1jb250cm9scyBidXR0b24jaW1hZ2UtY29udHJvbHMtYnV0dG9uIHsKK2J1dHRv biNpbWFnZS1jb250cm9scy1idXR0b24gewogICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKICAgICB0 b3A6IDIwcHg7CiAgICAgcmlnaHQ6IDIwcHg7CkBAIC00NSwxMCArNDcsOSBAQCBkaXYjaW1hZ2Ut Y29udHJvbHMgYnV0dG9uI2ltYWdlLWNvbnRyb2xzLWJ1dHRvbiB7CiAgICAgb3BhY2l0eTogMC4w OwogfQogCi1kaXYjaW1hZ2UtY29udHJvbHM6aG92ZXIgYnV0dG9uI2ltYWdlLWNvbnRyb2xzLWJ1 dHRvbiB7Cis6aG9zdCg6aG92ZXIpIGJ1dHRvbiNpbWFnZS1jb250cm9scy1idXR0b24gewogICAg IG9wYWNpdHk6IDEuMDsKKyAgICBwb2ludGVyLWV2ZW50czogYXV0bzsKIH0KIAogI2VuZGlmCi0K LQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGM3 NzI0MjgwMTJkYTEzMmU5ZjNlNWNmNzNkZDg3NmMxYmVjMDk2MmYuLjk4MmYwZjI5MzE3YjcxZjk0 NzA1ZTM5MTQwYWNjMzk3NWZlNDQ0NjkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysg Yi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMi0wNC0xNiAgV2Vuc29uIEhz aWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIEltYWdlIGNv bnRyb2xzIGFyZSBlZGl0YWJsZSBhbmQgcHJldmVudCBkcm9wcyBpbiBlZGl0YWJsZSB3ZWIgdmll d3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzOTQy MworICAgICAgICByZGFyOi8vODEwMjcwODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGQgYSBuZXcgQVBJIHRlc3QgdG8gZXhlcmNpc2UgdGhlIGNo YW5nZS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tBdHRh Y2htZW50VGVzdHMubW06CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUKToKKwogMjAyMi0w NC0xMiAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAgW2dp dC13ZWJraXRdIEFsbG93IHByb2plY3RzIHRvIGRlY2xhcmUgYWx0ZXJuYXRlIHJlbW90ZXMKZGlm ZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tBdHRhY2ht ZW50VGVzdHMubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLQXR0 YWNobWVudFRlc3RzLm1tCmluZGV4IGQxM2Y5YzM3NDU3YTg3NzcxZDEwMmU3NTk1ZWQ0ZTJjNTVl ZTRmNGQuLjVhYzAxOWQzZjFmZGNhNTkxMTYyMzc3YmNlZjFhZDJlMjY2NmFiZDIgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tBdHRhY2htZW50VGVz dHMubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0F0dGFj aG1lbnRUZXN0cy5tbQpAQCAtMTk1NSw2ICsxOTU1LDI1IEBAIFRFU1QoV0tBdHRhY2htZW50VGVz dHNNYWMsIERyYWdBdHRhY2htZW50V2l0aE5vVHlwZVNob3VsZE5vdENyYXNoKQogICAgIEVYUEVD VF9FUSgwVSwgdXJscy5jb3VudCk7CiB9CiAKK1RFU1QoV0tBdHRhY2htZW50VGVzdHNNYWMsIERy b3BJbWFnZU92ZXJJbWFnZVdpdGhDb250cm9scykKK3sKKyAgICBhdXRvIGNvbmZpZ3VyYXRpb24g PSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIFtj b25maWd1cmF0aW9uIF9zZXRBdHRhY2htZW50RWxlbWVudEVuYWJsZWQ6WUVTXTsKKyAgICBbY29u ZmlndXJhdGlvbiBfc2V0SW1hZ2VDb250cm9sc0VuYWJsZWQ6WUVTXTsKKyAgICBhdXRvIHNpbXVs YXRvciA9IGFkb3B0TlMoW1tEcmFnQW5kRHJvcFNpbXVsYXRvciBhbGxvY10gaW5pdFdpdGhXZWJW aWV3RnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA0MDAsIDQwMCkgY29uZmlndXJhdGlvbjpjb25maWd1 cmF0aW9uLmdldCgpXSk7CisgICAgVGVzdFdLV2ViVmlldyAqd2ViVmlldyA9IFtzaW11bGF0b3Ig d2ViVmlld107CisgICAgW3dlYlZpZXcgc3luY2hyb25vdXNseUxvYWRIVE1MU3RyaW5nOmF0dGFj aG1lbnRFZGl0aW5nVGVzdE1hcmt1cF07CisKKyAgICBwbGF0Zm9ybUNvcHlQTkcoKTsKKyAgICBb d2ViVmlldyBfc3luY2hyb25vdXNseUV4ZWN1dGVFZGl0Q29tbWFuZDpAIlBhc3RlIiBhcmd1bWVu dDpuaWxdOworICAgIFt3ZWJWaWV3IHdhaXRGb3JJbWFnZUVsZW1lbnRTaXplVG9CZWNvbWU6Q0dT aXplTWFrZSgyMTUsIDE3NCldOworCisgICAgW3NpbXVsYXRvciB3cml0ZVByb21pc2VkRmlsZXM6 QFsgdGVzdEltYWdlRmlsZVVSTCgpIF1dOworICAgIFtzaW11bGF0b3IgcnVuRnJvbTpOU01ha2VQ b2ludCg0MDAsIDQwMCkgdG86TlNNYWtlUG9pbnQoNTAsIDUwKV07CisgICAgW3dlYlZpZXcgd2Fp dEZvckltYWdlRWxlbWVudFNpemVUb0JlY29tZTpDR1NpemVNYWtlKDIxNSwgMTc0KV07CisgICAg W3dlYlZpZXcgZXhwZWN0RWxlbWVudENvdW50OjIgcXVlcnlTZWxlY3RvcjpAIklNRyJdOworfQor CiAjZW5kaWYgLy8gUExBVEZPUk0oTUFDKQogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkK 457758 2022-04-16 16:05:17 -0700 2022-04-16 20:14:13 -0700 For landing bug-239423-20220416160516.patch text/plain 6480 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyOTM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDI2NThiZWQzNjk3MTY5 YTY0M2Q0M2ZmNmQxYWMwOWQ0NzA0ZWU5Yi4uODg5NjkzOGFkYTg3YWQzNDRiYTFjZDY5YjVjYjIw NTI1NmViNDA2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDIyLTA0LTE2ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFttYWNPU10gSW1h Z2UgY29udHJvbHMgYXJlIGVkaXRhYmxlIGFuZCBwcmV2ZW50IGRyb3BzIGluIGVkaXRhYmxlIHdl YiB2aWV3cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjM5NDIzCisgICAgICAgIHJkYXI6Ly84MTAyNzA4MgorCisgICAgICAgIFJldmlld2VkIGJ5IERh cmluIEFkbGVyLgorCisgICAgICAgIEFkanVzdCB0aGUgVUEgc3R5bGVzaGVldCBmb3IgaW1hZ2Ug Y29udHJvbHMgKGkuZS4sIHRoZSBzZXJ2aWNlcyBkcm9wZG93biBtZW51IGJ1dHRvbikgc3VjaCB0 aGF0OgorCisgICAgICAgIDEuIFRoZSBjb250YWluZXIgZm9yIGltYWdlIGNvbnRyb2xzIGlzIG5v bi1lZGl0YWJsZSwgYW5kOgorICAgICAgICAyLiBUaGUgY29udGFpbmVyIGFib3ZlIHRoZSBidXR0 b24gKHdoaWNoIGVuY29tcGFzc2VzIHRoZSBib3VuZHMgb2YgdGhlIGhvc3QgaW1hZ2UpIGlnbm9y ZXMgaGl0LXRlc3RpbmcuCisKKyAgICAgICAgVGhpcyBlbnN1cmVzIHRoYXQgd2UncmUgYWJsZSB0 byBoYW5kbGUgYSBkcm9wIG92ZXIgYW4gaW1hZ2Ugd2l0aCBpbWFnZSBjb250cm9scyBpbiBhbiBl ZGl0YWJsZSB3ZWIgdmlldywgYnkKKyAgICAgICAgaW5zZXJ0aW5nIHRoZSBkcm9wcGVkIGNvbnRl bnQgYmVmb3JlIG9yIGFmdGVyIHRoZSBpbWFnZSBlbGVtZW50IChhcyBvcHBvc2VkIHRvIGVpdGhl ciBpbnNlcnRpbmcgaXQgaW5zaWRlIHRoZQorICAgICAgICBzaGFkb3cgcm9vdCBvZiB0aGUgaW1h Z2UsIG9yIG5vdCBoYW5kbGluZyB0aGUgZHJvcCB2aWEgZWRpdGluZyBhdCBhbGwpLgorCisgICAg ICAgIFRlc3Q6IFdLQXR0YWNobWVudFRlc3RzTWFjLkRyb3BJbWFnZU92ZXJJbWFnZVdpdGhDb250 cm9scworCisgICAgICAgICogZG9tL21hYy9JbWFnZUNvbnRyb2xzTWFjLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkltYWdlQ29udHJvbHNNYWM6OmNyZWF0ZUltYWdlQ29udHJvbHMpOgorICAgICAg ICAqIGh0bWwvc2hhZG93L21hYy9pbWFnZUNvbnRyb2xzTWFjLmNzczoKKyAgICAgICAgKCNpZiBk ZWZpbmVkKEVOQUJMRV9TRVJWSUNFX0NPTlRST0xTKSAmJiBFTkFCTEVfU0VSVklDRV9DT05UUk9M Uyk6CisgICAgICAgIChidXR0b24jaW1hZ2UtY29udHJvbHMtYnV0dG9uKToKKworICAgICAgICBN YWtlIHRoZSBjb250ZW50cyBvZiB0aGUgaW1hZ2UgY29udHJvbHMgY29udGFpbmVyIG5vbi1zZWxl Y3RhYmxlLCBhbmQgYWxzbyBhdm9pZCBoaXQtdGVzdGluZyBvdmVyIHRoZSBjb250YWluZXIuCisK KyAgICAgICAgKDpob3N0KDpob3ZlcikgYnV0dG9uI2ltYWdlLWNvbnRyb2xzLWJ1dHRvbik6Cisg ICAgICAgIChkaXYjaW1hZ2UtY29udHJvbHMgYnV0dG9uI2ltYWdlLWNvbnRyb2xzLWJ1dHRvbik6 IERlbGV0ZWQuCisKKyAgICAgICAgRW5zdXJlIHRoYXQgdGhlIHNlcnZpY2VzIG1lbnUgYnV0dG9u IGl0c2VsZiBjYW4gc3RpbGwgYmUgYWN0aXZhdGVkIGJ5IHNldHRpbmcgYHBvaW50ZXItZXZlbnRz OiBhdXRvO2Agd2hlbiB0aGUKKyAgICAgICAgaG9zdCBlbGVtZW50IChpLmUuIHRoZSBgaW1nYCkg aXMgaG92ZXJlZC4gSXQncyBpbXBvcnRhbnQgdGhhdCB3ZSB1c2UgdGhlIGhvc3QgZWxlbWVudCdz IGBob3ZlcmAgc3RhdGUgaW5zdGVhZCBvZgorICAgICAgICB0aGUgY29udGFpbmluZyBgI2ltYWdl LWNvbnRyb2xzYCwgc2luY2UgdGhpcyBjb250YWluZXIgbm93IGhhcyBgcG9pbnRlci1ldmVudHM6 IG5vbmU7YC4KKworICAgICAgICBUaGVzZSBjaGFuZ2VzIG1ha2UgaXQgc3RpbGwgcG9zc2libGUg dG8gcmV2ZWFsIGFuZCBpbnRlcmFjdCB3aXRoIHRoZSBzZXJ2aWNlcyBtZW51IGJ1dHRvbiwgYnV0 IGFsbG93cworICAgICAgICBkcmFnLWFuZC1kcm9wIHRvIGF2b2lkIGhpdC10ZXN0aW5nIGludG8g c2hhZG93IHJvb3QgY29udGVudCBmb3IgYW4gaW1hZ2Ugd2l0aCBjb250cm9scy4KKworICAgICAg ICAoZGl2I2ltYWdlLWNvbnRyb2xzOmhvdmVyIGJ1dHRvbiNpbWFnZS1jb250cm9scy1idXR0b24p OiBEZWxldGVkLgorCiAyMDIyLTA0LTE1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+ CiAKICAgICAgICAgUmVuYW1lIFdlYkNvcmU6OndlYkNvcmVCdWlsdGluTmFtZXMoKSB0byBXZWJD b3JlOjpidWlsdGluTmFtZXMoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL21hYy9J bWFnZUNvbnRyb2xzTWFjLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9tYWMvSW1hZ2VDb250cm9s c01hYy5jcHAKaW5kZXggYzRlNDc3Njc2ZmMxMWY2ZTUyYzIwMjFkOTFiZGIxNjFmMGVmNzI4ZC4u YmUyMzY4OGUzMWJlMzRhNjBiMGFiZWE3NjNiNWFiZmZhZGJlOWVlMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvZG9tL21hYy9JbWFnZUNvbnRyb2xzTWFjLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vbWFjL0ltYWdlQ29udHJvbHNNYWMuY3BwCkBAIC05MCw2ICs5MCw3IEBAIHZvaWQg Y3JlYXRlSW1hZ2VDb250cm9scyhIVE1MRWxlbWVudCYgZWxlbWVudCkKICAgICBSZWYgc2hhZG93 Um9vdCA9IGVsZW1lbnQuZW5zdXJlVXNlckFnZW50U2hhZG93Um9vdCgpOwogICAgIGF1dG8gY29u dHJvbExheWVyID0gSFRNTERpdkVsZW1lbnQ6OmNyZWF0ZShkb2N1bWVudC5nZXQoKSk7CiAgICAg Y29udHJvbExheWVyLT5zZXRJZEF0dHJpYnV0ZShpbWFnZUNvbnRyb2xzRWxlbWVudElkZW50aWZp ZXIoKSk7CisgICAgY29udHJvbExheWVyLT5zZXRBdHRyaWJ1dGVXaXRob3V0U3luY2hyb25pemF0 aW9uKEhUTUxOYW1lczo6Y29udGVudGVkaXRhYmxlQXR0ciwgImZhbHNlIl9zKTsKICAgICBzaGFk b3dSb290LT5hcHBlbmRDaGlsZChjb250cm9sTGF5ZXIpOwogICAgIAogICAgIHN0YXRpYyBNYWlu VGhyZWFkTmV2ZXJEZXN0cm95ZWQ8Y29uc3QgU3RyaW5nPiBzaGFkb3dTdHlsZShTdHJpbmdJbXBs OjpjcmVhdGVXaXRob3V0Q29weWluZyhpbWFnZUNvbnRyb2xzTWFjVXNlckFnZW50U3R5bGVTaGVl dCwgc2l6ZW9mKGltYWdlQ29udHJvbHNNYWNVc2VyQWdlbnRTdHlsZVNoZWV0KSkpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvbWFjL2ltYWdlQ29udHJvbHNNYWMuY3Nz IGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvbWFjL2ltYWdlQ29udHJvbHNNYWMuY3NzCmlu ZGV4IGUyYzhjZmRmOWEyYjYwMzU4ODIyZGQxNDU5Nzg5OTI4YzVjNzRjMGIuLmFkZDY1ZDY1NjI4 NDg5NDYzNTY2MDdkN2IyYWMzNGMxNDM5ODBlNTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvc2hhZG93L21hYy9pbWFnZUNvbnRyb2xzTWFjLmNzcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL3NoYWRvdy9tYWMvaW1hZ2VDb250cm9sc01hYy5jc3MKQEAgLTMwLDkgKzMwLDExIEBA IGRpdiNpbWFnZS1jb250cm9scyB7CiAgICAgcG9zaXRpb246IHJlbGF0aXZlOwogICAgIG92ZXJm bG93OiBoaWRkZW47CiAgICAgY29sb3I6IHRyYW5zcGFyZW50OworICAgIC13ZWJraXQtdXNlci1z ZWxlY3Q6IG5vbmU7CisgICAgcG9pbnRlci1ldmVudHM6IG5vbmU7CiB9CiAKLWRpdiNpbWFnZS1j b250cm9scyBidXR0b24jaW1hZ2UtY29udHJvbHMtYnV0dG9uIHsKK2J1dHRvbiNpbWFnZS1jb250 cm9scy1idXR0b24gewogICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKICAgICB0b3A6IDIwcHg7CiAg ICAgcmlnaHQ6IDIwcHg7CkBAIC00NSwxMCArNDcsOSBAQCBkaXYjaW1hZ2UtY29udHJvbHMgYnV0 dG9uI2ltYWdlLWNvbnRyb2xzLWJ1dHRvbiB7CiAgICAgb3BhY2l0eTogMC4wOwogfQogCi1kaXYj aW1hZ2UtY29udHJvbHM6aG92ZXIgYnV0dG9uI2ltYWdlLWNvbnRyb2xzLWJ1dHRvbiB7Cis6aG9z dCg6aG92ZXIpIGJ1dHRvbiNpbWFnZS1jb250cm9scy1idXR0b24gewogICAgIG9wYWNpdHk6IDEu MDsKKyAgICBwb2ludGVyLWV2ZW50czogYXV0bzsKIH0KIAogI2VuZGlmCi0KLQpkaWZmIC0tZ2l0 IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGM3NzI0MjgwMTJkYTEz MmU5ZjNlNWNmNzNkZDg3NmMxYmVjMDk2MmYuLmUxY2JmMTkyZjZiMjFhMGU3ZTBkODJmN2U2NjBl ZjYxODRmNGViZTggMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMi0wNC0xNiAgV2Vuc29uIEhzaWVoICA8d2Vuc29u X2hzaWVoQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIEltYWdlIGNvbnRyb2xzIGFyZSBl ZGl0YWJsZSBhbmQgcHJldmVudCBkcm9wcyBpbiBlZGl0YWJsZSB3ZWIgdmlld3MKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzOTQyMworICAgICAgICBy ZGFyOi8vODEwMjcwODIKKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAg ICAgICBBZGQgYSBuZXcgQVBJIHRlc3QgdG8gZXhlcmNpc2UgdGhlIGNoYW5nZS4KKworICAgICAg ICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tBdHRhY2htZW50VGVzdHMubW06 CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUKToKKwogMjAyMi0wNC0xMiAgSm9uYXRoYW4g QmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAgW2dpdC13ZWJraXRdIEFsbG93 IHByb2plY3RzIHRvIGRlY2xhcmUgYWx0ZXJuYXRlIHJlbW90ZXMKZGlmZiAtLWdpdCBhL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tBdHRhY2htZW50VGVzdHMubW0gYi9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLQXR0YWNobWVudFRlc3RzLm1t CmluZGV4IGQxM2Y5YzM3NDU3YTg3NzcxZDEwMmU3NTk1ZWQ0ZTJjNTVlZTRmNGQuLjVhYzAxOWQz ZjFmZGNhNTkxMTYyMzc3YmNlZjFhZDJlMjY2NmFiZDIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tBdHRhY2htZW50VGVzdHMubW0KKysrIGIvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0F0dGFjaG1lbnRUZXN0cy5tbQpA QCAtMTk1NSw2ICsxOTU1LDI1IEBAIFRFU1QoV0tBdHRhY2htZW50VGVzdHNNYWMsIERyYWdBdHRh Y2htZW50V2l0aE5vVHlwZVNob3VsZE5vdENyYXNoKQogICAgIEVYUEVDVF9FUSgwVSwgdXJscy5j b3VudCk7CiB9CiAKK1RFU1QoV0tBdHRhY2htZW50VGVzdHNNYWMsIERyb3BJbWFnZU92ZXJJbWFn ZVdpdGhDb250cm9scykKK3sKKyAgICBhdXRvIGNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tX ZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIFtjb25maWd1cmF0aW9uIF9z ZXRBdHRhY2htZW50RWxlbWVudEVuYWJsZWQ6WUVTXTsKKyAgICBbY29uZmlndXJhdGlvbiBfc2V0 SW1hZ2VDb250cm9sc0VuYWJsZWQ6WUVTXTsKKyAgICBhdXRvIHNpbXVsYXRvciA9IGFkb3B0TlMo W1tEcmFnQW5kRHJvcFNpbXVsYXRvciBhbGxvY10gaW5pdFdpdGhXZWJWaWV3RnJhbWU6TlNNYWtl UmVjdCgwLCAwLCA0MDAsIDQwMCkgY29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9uLmdldCgpXSk7 CisgICAgVGVzdFdLV2ViVmlldyAqd2ViVmlldyA9IFtzaW11bGF0b3Igd2ViVmlld107CisgICAg W3dlYlZpZXcgc3luY2hyb25vdXNseUxvYWRIVE1MU3RyaW5nOmF0dGFjaG1lbnRFZGl0aW5nVGVz dE1hcmt1cF07CisKKyAgICBwbGF0Zm9ybUNvcHlQTkcoKTsKKyAgICBbd2ViVmlldyBfc3luY2hy b25vdXNseUV4ZWN1dGVFZGl0Q29tbWFuZDpAIlBhc3RlIiBhcmd1bWVudDpuaWxdOworICAgIFt3 ZWJWaWV3IHdhaXRGb3JJbWFnZUVsZW1lbnRTaXplVG9CZWNvbWU6Q0dTaXplTWFrZSgyMTUsIDE3 NCldOworCisgICAgW3NpbXVsYXRvciB3cml0ZVByb21pc2VkRmlsZXM6QFsgdGVzdEltYWdlRmls ZVVSTCgpIF1dOworICAgIFtzaW11bGF0b3IgcnVuRnJvbTpOU01ha2VQb2ludCg0MDAsIDQwMCkg dG86TlNNYWtlUG9pbnQoNTAsIDUwKV07CisgICAgW3dlYlZpZXcgd2FpdEZvckltYWdlRWxlbWVu dFNpemVUb0JlY29tZTpDR1NpemVNYWtlKDIxNSwgMTc0KV07CisgICAgW3dlYlZpZXcgZXhwZWN0 RWxlbWVudENvdW50OjIgcXVlcnlTZWxlY3RvcjpAIklNRyJdOworfQorCiAjZW5kaWYgLy8gUExB VEZPUk0oTUFDKQogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkK