210294 2020-04-09 11:34:27 -0700 Add an API test for <https://trac.webkit.org/r259766> 2020-04-09 13:16:44 -0700 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=210215 DoNotImportToRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh bdakin ews-watchlist mifenton rniwa sihui_liu thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1639750 0 wenson_hsieh 2020-04-09 11:34:27 -0700 Followup to <https://webkit.org/b/210215>. 1639763 1 395985 wenson_hsieh 2020-04-09 12:02:39 -0700 Created attachment 395985 Patch 1639765 2 395985 thorton 2020-04-09 12:04:21 -0700 Comment on attachment 395985 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395985&action=review > Source/WebCore/editing/TextManipulationController.cpp:379 > + if (start.isNull() || end.isNull()) I think this part landed already? 1639767 3 wenson_hsieh 2020-04-09 12:07:10 -0700 Thanks for the review! (In reply to Tim Horton from comment #2) > Comment on attachment 395985 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=395985&action=review > > > Source/WebCore/editing/TextManipulationController.cpp:379 > > + if (start.isNull() || end.isNull()) > > I think this part landed already? Ah, this was a different null check (at the top of TextManipulationController::observeParagraphs). Technically, the early `continue;` here obviates the need for the early return in TextManipulationController::observeParagraphs. I considered reverting the other early return, but since there is at least one other call site of observeParagraphs (and possibly more in the future), I don’t think it’s a bad idea to keep observeParagraphs robust against null positions. 1639769 4 395987 wenson_hsieh 2020-04-09 12:09:36 -0700 Created attachment 395987 Fix a minor typo 1639815 5 ews-feeder 2020-04-09 13:16:43 -0700 Committed r259819: <https://trac.webkit.org/changeset/259819> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395987. 395985 2020-04-09 12:02:39 -0700 2020-04-09 12:09:35 -0700 Patch bug-210294-20200409120238.patch text/plain 5442 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5Nzc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTExZGRjN2RlZjM0MTAy ZTU4NWI3MmZlZjY1ZmUyZjI4MmEzMzA1NC4uOTQ3YTMzNzFjY2IxOGY0ZWMzMzc3ZDUwYzFmNWFl ZDc4MDZkNjAzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIwLTA0LTA5ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBhbiBBUEkg dGVzdCBmb3IgPGh0dHBzOi8vdHJhYy53ZWJraXQub3JnL3IyNTk3NjY+CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTAyOTQKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBdm9pZCB0cnlpbmcgdG8gcGxhY2Ug dGhlIG1pc3NpbmcgdmFsdWUgaW50byBwYXJhZ3JhcGhTZXRzIGluIFRleHRNYW5pcHVsYXRpb25D b250cm9sbGVyIGJ5IGJhaWxpbmcgaWYgZWl0aGVyCisgICAgICAgIHRoZSBzdGFydCBvciBlbmQg cG9zaXRpb25zIGFyZSBudWxsICh3aGlsZSB0aGUgbWlzc2luZyB2YWx1ZSByZXF1aXJlcyBib3Ro IHRoZSBzdGFydCBhbmQgZW5kIHRvIGJlIG51bGwsIGl0IGlzCisgICAgICAgIHN1ZmZpY2llbnQg dG8gYmFpbCBpZiBlaXRoZXIgYXJlIG51bGwgYmVjYXVzZSBgb2JzZXJ2ZVBhcmFncmFwaHNgIHdp bGwgYmUgYSBuby1vcCBhbnl3YXlzKS4KKworICAgICAgICBTZWUgVG9vbHMvQ2hhbmdlTG9nIGZv ciBtb3JlIGRldGFpbHMuCisKKyAgICAgICAgVGVzdDogVGV4dE1hbmlwdWxhdGlvbi5Db21wbGV0 ZVRleHRNYW5pcHVsYXRpb25Bdm9pZENyYXNoaW5nV2hlbkNvbnRlbnRJc1JlbW92ZWQKKworICAg ICAgICAqIGVkaXRpbmcvVGV4dE1hbmlwdWxhdGlvbkNvbnRyb2xsZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6VGV4dE1hbmlwdWxhdGlvbkNvbnRyb2xsZXI6OnNjaGVkdWxlT2JzZXJ2YXJ0aW9u VXBkYXRlKToKKwogMjAyMC0wNC0wOCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgog CiAgICAgICAgIHF1ZXJ5U2VsZWN0b3IoIiNcdTAwMDAiKSBzaG91bGQgbWF0Y2ggYW4gZWxlbWVu dCB3aXRoIElEIFUrRkZGRApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9UZXh0 TWFuaXB1bGF0aW9uQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1RleHRN YW5pcHVsYXRpb25Db250cm9sbGVyLmNwcAppbmRleCBkYmVlNjQ1ODhiMGM0ZjdhYzdiMzkzYWRl OWI2ZTA5NmJhMmY2MTJiLi40OTEzYjVlYmQ0MTZiMjM2N2FlMTFhYzM3Yjc3ZDFlNTc0NDk0NmUz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1RleHRNYW5pcHVsYXRpb25Db250 cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1RleHRNYW5pcHVsYXRpb25D b250cm9sbGVyLmNwcApAQCAtMzc2LDYgKzM3Niw5IEBAIHZvaWQgVGV4dE1hbmlwdWxhdGlvbkNv bnRyb2xsZXI6OnNjaGVkdWxlT2JzZXJ2YXJ0aW9uVXBkYXRlKCkKICAgICAgICAgICAgIGF1dG8g c3RhcnQgPSBzdGFydE9mUGFyYWdyYXBoKGZpcnN0UG9zaXRpb25Jbk9yQmVmb3JlTm9kZShlbGVt ZW50LnB0cigpKSk7CiAgICAgICAgICAgICBhdXRvIGVuZCA9IGVuZE9mUGFyYWdyYXBoKGxhc3RQ b3NpdGlvbkluT3JBZnRlck5vZGUoZWxlbWVudC5wdHIoKSkpOwogCisgICAgICAgICAgICBpZiAo c3RhcnQuaXNOdWxsKCkgfHwgZW5kLmlzTnVsbCgpKQorICAgICAgICAgICAgICAgIGNvbnRpbnVl OworCiAgICAgICAgICAgICBhdXRvIGtleSA9IG1ha2VIYXNoYWJsZVBvc2l0aW9uUmFuZ2Uoc3Rh cnQsIGVuZCk7CiAgICAgICAgICAgICBpZiAoIXBhcmFncmFwaFNldHMuYWRkKGtleSkuaXNOZXdF bnRyeSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5n ZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA0NjhlZTQ1YjJjOWIwZTBmYjFlMzcxY2M5YTU4 NjlhNjkzOTM4OGFjLi42NjE0ZGQxZjU1NWQ4NzMxYzNiNzg0MmY1MjhmYmUxNDQ5OWEyYzQ2IDEw MDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTggQEAKKzIwMjAtMDQtMDkgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5j b20+CisKKyAgICAgICAgQWRkIGFuIEFQSSB0ZXN0IGZvciA8aHR0cHM6Ly90cmFjLndlYmtpdC5v cmcvcjI1OTc2Nj4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIxMDI5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEV4ZXJjaXNlIHRoZSBwYXRob2xvZ2ljYWwgY2FzZSBmaXhlZCBpbiByMjU5NzY2IGJ5IGlu c2VydGluZyBhbmQgdGhlbiBpbW1lZGlhdGVseSByZW1vdmluZyBhIHBhcmFncmFwaCBlbGVtZW50 CisgICAgICAgIGFmdGVyIHN0YXJ0aW5nIHRleHQgbWFuaXB1bGF0aW9uLiBUaGlzIHRlc3QgYWxz byByZXZlYWxlZCBhbiBleGlzdGluZyBpc3N1ZSBpbiBUZXh0TWFuaXB1bGF0aW9uQ29udHJvbGxl ciwgd2hlcmUKKyAgICAgICAgd2Ugd2lsbCBlbmQgdXAgaGl0dGluZyBhIGRlYnVnIGFzc2VydGlv biB3aGVuIHRyeWluZyB0byBpbnNlcnQgeyBudWxsIHBvc2l0aW9uLCBudWxsIHBvc2l0aW9uIH0g aW50byBhIEhhc2hNYXAKKyAgICAgICAgdW5kZXJuZWF0aCBgVGV4dE1hbmlwdWxhdGlvbkNvbnRy b2xsZXI6OnNjaGVkdWxlT2JzZXJ2YXJ0aW9uVXBkYXRlYC4KKworICAgICAgICAqIFRlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVGV4dE1hbmlwdWxhdGlvbi5tbToKKyAgICAgICAgKFRl c3RXZWJLaXRBUEk6OlRFU1QpOgorCiAyMDIwLTA0LTA4ICBBbGV4IENocmlzdGVuc2VuICA8YWNo cmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgX2NvcnNEaXNhYmxpbmdQYXR0ZXJucyBz aG91bGQgYWxsb3cgc2VjdXJpdHkgcG9saWN5IGFjY2VzcyB0byB0aG9zZSBwYXR0ZXJucwpkaWZm IC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9UZXh0TWFuaXB1 bGF0aW9uLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9UZXh0TWFu aXB1bGF0aW9uLm1tCmluZGV4IDdhZmNhMGEwZDM3MTRiZTczMTNhZDhhZTFhOGQxMDlmZGE5ZDFj NTYuLmMzMzliZmFiNTY4MTUyZDUzMGY3OGExZTNiY2ZmZWFiMzQyNGY4ZWYgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVGV4dE1hbmlwdWxhdGlvbi5t bQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1RleHRNYW5pcHVs YXRpb24ubW0KQEAgLTg0Myw2ICs4NDMsNDcgQEAgVEVTVChUZXh0TWFuaXB1bGF0aW9uLCBDb21w bGV0ZVRleHRNYW5pcHVsYXRpb25GYWlsV2hlbkJSSXNJbnNlcnRlZCkKICAgICBFWFBFQ1RfV0tf U1RSRVEoIjxwPmhlbGxsbywgPGJyPjxiPndvcnJsZDwvYj48L3A+IiwgW3dlYlZpZXcgc3RyaW5n QnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAImRvY3VtZW50LmJvZHkuaW5uZXJIVE1MIl0pOwogfQog CitURVNUKFRleHRNYW5pcHVsYXRpb24sIENvbXBsZXRlVGV4dE1hbmlwdWxhdGlvbkF2b2lkQ3Jh c2hpbmdXaGVuQ29udGVudElzUmVtb3ZlZCkKK3sKKyAgICBhdXRvIGRlbGVnYXRlID0gYWRvcHRO UyhbW1RleHRNYW5pcHVsYXRpb25EZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOworICAgIGF1dG8gd2Vi VmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFr ZVJlY3QoMCwgMCwgNDAwLCA0MDApXSk7CisgICAgW3dlYlZpZXcgX3NldFRleHRNYW5pcHVsYXRp b25EZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQoKV07CisKKyAgICBbd2ViVmlldyBzeW5jaHJvbm91c2x5 TG9hZFRlc3RQYWdlTmFtZWQ6QCJzaW1wbGUiXTsKKworICAgIGRvbmUgPSBmYWxzZTsKKyAgICBb d2ViVmlldyBfc3RhcnRUZXh0TWFuaXB1bGF0aW9uc1dpdGhDb25maWd1cmF0aW9uOm5pbCBjb21w bGV0aW9uOl57CisgICAgICAgIGRvbmUgPSB0cnVlOworICAgIH1dOworICAgIFRlc3RXZWJLaXRB UEk6OlV0aWw6OnJ1bigmZG9uZSk7CisKKyAgICBhdXRvICppdGVtcyA9IFtkZWxlZ2F0ZSBpdGVt c107CisgICAgRVhQRUNUX0VRKGl0ZW1zLmNvdW50LCAxVUwpOworICAgIGF1dG8gKnRva2VucyA9 IGl0ZW1zWzBdLnRva2VuczsKKyAgICBFWFBFQ1RfRVEodG9rZW5zLmNvdW50LCAxVUwpOworCisg ICAgX19ibG9jayBib29sIGRvbmUgPSBmYWxzZTsKKyAgICBbd2ViVmlldyBwZXJmb3JtQWZ0ZXJS ZWNlaXZpbmdNZXNzYWdlOkAiRG9uZVJlbW92aW5nUGFyYWdyYXBoIiBhY3Rpb246XnsKKyAgICAg ICAgZG9uZSA9IHRydWU7CisgICAgfV07CisKKyAgICBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRp bmdKYXZhU2NyaXB0OgorICAgICAgICBAImNvbnN0IHBhcmFncmFwaCA9IGRvY3VtZW50LmNyZWF0 ZUVsZW1lbnQoJ3AnKTsiCisgICAgICAgICJwYXJhZ3JhcGgudGV4dENvbnRlbnQgPSAnSGVsbG8g d29ybGQnOyIKKyAgICAgICAgImRvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQocGFyYWdyYXBoKTsi CisgICAgICAgICJzZXRUaW1lb3V0KCgpID0+IHtwYXJhZ3JhcGgucmVtb3ZlKCk7IHdlYmtpdC5t ZXNzYWdlSGFuZGxlcnMudGVzdEhhbmRsZXIucG9zdE1lc3NhZ2UoJ0RvbmVSZW1vdmluZ1BhcmFn cmFwaCcpIH0pIl07CisKKyAgICBkb25lID0gZmFsc2U7CisgICAgW3dlYlZpZXcgX2NvbXBsZXRl VGV4dE1hbmlwdWxhdGlvbkZvckl0ZW1zOkBbKF9XS1RleHRNYW5pcHVsYXRpb25JdGVtICopY3Jl YXRlSXRlbShpdGVtc1swXS5pZGVudGlmaWVyLCB7CisgICAgICAgIHsgdG9rZW5zWzBdLmlkZW50 aWZpZXIsIEAiU2ltcGxlIEhUTUwgZmlsZSEiIH0sCisgICAgfSldIGNvbXBsZXRpb246XihOU0Fy cmF5PE5TRXJyb3IgKj4gKmVycm9ycykgeworICAgICAgICBFWFBFQ1RfRVEoZXJyb3JzLCBuaWwp OworICAgICAgICBkb25lID0gdHJ1ZTsKKyAgICB9XTsKKworICAgIEVYUEVDVF9XS19TVFJFUSgi U2ltcGxlIEhUTUwgZmlsZSEiLCBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0 OkAiZG9jdW1lbnQuYm9keS50ZXh0Q29udGVudCJdKTsKK30KKwogVEVTVChUZXh0TWFuaXB1bGF0 aW9uLCBDb21wbGV0ZVRleHRNYW5pcHVsYXRpb25TaG91bGRQcmVzZXJ2ZUltYWdlc0FzRXhjbHVk ZWRUb2tlbnMpCiB7CiAgICAgYXV0byBkZWxlZ2F0ZSA9IGFkb3B0TlMoW1tUZXh0TWFuaXB1bGF0 aW9uRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsK 395987 2020-04-09 12:09:36 -0700 2020-04-09 13:16:44 -0700 Fix a minor typo bug-210294-20200409120935.patch text/plain 5435 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5Nzc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTExZGRjN2RlZjM0MTAy ZTU4NWI3MmZlZjY1ZmUyZjI4MmEzMzA1NC4uNWVjYTlmMmY2OGJhZDUzOTJmOWQ3YzA1ZTFkNWJj OWM2ZTU3MDI1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIwLTA0LTA5ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBhbiBBUEkg dGVzdCBmb3IgPGh0dHBzOi8vdHJhYy53ZWJraXQub3JnL3IyNTk3NjY+CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTAyOTQKKworICAgICAgICBSZXZp ZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgIEF2b2lkIHRyeWluZyB0byBwbGFjZSB0aGUg bWlzc2luZyB2YWx1ZSBpbnRvIHBhcmFncmFwaFNldHMgaW4gVGV4dE1hbmlwdWxhdGlvbkNvbnRy b2xsZXIgYnkgYmFpbGluZyBpZiBlaXRoZXIKKyAgICAgICAgdGhlIHN0YXJ0IG9yIGVuZCBwb3Np dGlvbnMgYXJlIG51bGwgKHdoaWxlIHRoZSBtaXNzaW5nIHZhbHVlIHJlcXVpcmVzIGJvdGggdGhl IHN0YXJ0IGFuZCBlbmQgdG8gYmUgbnVsbCwgaXQgaXMKKyAgICAgICAgc3VmZmljaWVudCB0byBi YWlsIGlmIGVpdGhlciBhcmUgbnVsbCBiZWNhdXNlIGBvYnNlcnZlUGFyYWdyYXBoc2Agd2lsbCBi ZSBhIG5vLW9wIGFueXdheXMpLgorCisgICAgICAgIFNlZSBUb29scy9DaGFuZ2VMb2cgZm9yIG1v cmUgZGV0YWlscy4KKworICAgICAgICBUZXN0OiBUZXh0TWFuaXB1bGF0aW9uLkNvbXBsZXRlVGV4 dE1hbmlwdWxhdGlvbkF2b2lkQ3Jhc2hpbmdXaGVuQ29udGVudElzUmVtb3ZlZAorCisgICAgICAg ICogZWRpdGluZy9UZXh0TWFuaXB1bGF0aW9uQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpUZXh0TWFuaXB1bGF0aW9uQ29udHJvbGxlcjo6c2NoZWR1bGVPYnNlcnZhcnRpb25VcGRh dGUpOgorCiAyMDIwLTA0LTA4ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAg ICAgICAgcXVlcnlTZWxlY3RvcigiI1x1MDAwMCIpIHNob3VsZCBtYXRjaCBhbiBlbGVtZW50IHdp dGggSUQgVStGRkZECmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1RleHRNYW5p cHVsYXRpb25Db250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVGV4dE1hbmlw dWxhdGlvbkNvbnRyb2xsZXIuY3BwCmluZGV4IGRiZWU2NDU4OGIwYzRmN2FjN2IzOTNhZGU5YjZl MDk2YmEyZjYxMmIuLjQ5MTNiNWViZDQxNmIyMzY3YWUxMWFjMzdiNzdkMWU1NzQ0OTQ2ZTMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVGV4dE1hbmlwdWxhdGlvbkNvbnRyb2xs ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVGV4dE1hbmlwdWxhdGlvbkNvbnRy b2xsZXIuY3BwCkBAIC0zNzYsNiArMzc2LDkgQEAgdm9pZCBUZXh0TWFuaXB1bGF0aW9uQ29udHJv bGxlcjo6c2NoZWR1bGVPYnNlcnZhcnRpb25VcGRhdGUoKQogICAgICAgICAgICAgYXV0byBzdGFy dCA9IHN0YXJ0T2ZQYXJhZ3JhcGgoZmlyc3RQb3NpdGlvbkluT3JCZWZvcmVOb2RlKGVsZW1lbnQu cHRyKCkpKTsKICAgICAgICAgICAgIGF1dG8gZW5kID0gZW5kT2ZQYXJhZ3JhcGgobGFzdFBvc2l0 aW9uSW5PckFmdGVyTm9kZShlbGVtZW50LnB0cigpKSk7CiAKKyAgICAgICAgICAgIGlmIChzdGFy dC5pc051bGwoKSB8fCBlbmQuaXNOdWxsKCkpCisgICAgICAgICAgICAgICAgY29udGludWU7CisK ICAgICAgICAgICAgIGF1dG8ga2V5ID0gbWFrZUhhc2hhYmxlUG9zaXRpb25SYW5nZShzdGFydCwg ZW5kKTsKICAgICAgICAgICAgIGlmICghcGFyYWdyYXBoU2V0cy5hZGQoa2V5KS5pc05ld0VudHJ5 KQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9n IGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDQ2OGVlNDViMmM5YjBlMGZiMWUzNzFjYzlhNTg2OWE2 OTM5Mzg4YWMuLjZiZDZmYmI5Y2Q2ODY0NjcyZjJiMTMzYmNkODQwZDBjY2VlNjFmZDYgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx OCBAQAorMjAyMC0wNC0wOSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4K KworICAgICAgICBBZGQgYW4gQVBJIHRlc3QgZm9yIDxodHRwczovL3RyYWMud2Via2l0Lm9yZy9y MjU5NzY2PgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjEwMjk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICBFeGVy Y2lzZSB0aGUgcGF0aG9sb2dpY2FsIGNhc2UgZml4ZWQgaW4gcjI1OTc2NiBieSBpbnNlcnRpbmcg YW5kIHRoZW4gaW1tZWRpYXRlbHkgcmVtb3ZpbmcgYSBwYXJhZ3JhcGggZWxlbWVudAorICAgICAg ICBhZnRlciBzdGFydGluZyB0ZXh0IG1hbmlwdWxhdGlvbi4gVGhpcyB0ZXN0IGFsc28gcmV2ZWFs ZWQgYW4gZXhpc3RpbmcgaXNzdWUgaW4gVGV4dE1hbmlwdWxhdGlvbkNvbnRyb2xsZXIsIHdoZXJl CisgICAgICAgIHdlIHdpbGwgZW5kIHVwIGhpdHRpbmcgYSBkZWJ1ZyBhc3NlcnRpb24gd2hlbiB0 cnlpbmcgdG8gaW5zZXJ0IHsgbnVsbCBwb3NpdGlvbiwgbnVsbCBwb3NpdGlvbiB9IGludG8gYSBI YXNoTWFwCisgICAgICAgIHVuZGVybmVhdGggYFRleHRNYW5pcHVsYXRpb25Db250cm9sbGVyOjpz Y2hlZHVsZU9ic2VydmFydGlvblVwZGF0ZWAuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL1RleHRNYW5pcHVsYXRpb24ubW06CisgICAgICAgIChUZXN0V2ViS2l0 QVBJOjpURVNUKToKKwogMjAyMC0wNC0wOCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNl bkB3ZWJraXQub3JnPgogCiAgICAgICAgIF9jb3JzRGlzYWJsaW5nUGF0dGVybnMgc2hvdWxkIGFs bG93IHNlY3VyaXR5IHBvbGljeSBhY2Nlc3MgdG8gdGhvc2UgcGF0dGVybnMKZGlmZiAtLWdpdCBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVGV4dE1hbmlwdWxhdGlvbi5t bSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVGV4dE1hbmlwdWxhdGlv bi5tbQppbmRleCA3YWZjYTBhMGQzNzE0YmU3MzEzYWQ4YWUxYThkMTA5ZmRhOWQxYzU2Li5kY2E3 YmNmOTk3M2QzM2M3MDI2NjllMmQzZDNhNWNmMzYyNzA3YzE3IDEwMDY0NAotLS0gYS9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1RleHRNYW5pcHVsYXRpb24ubW0KKysrIGIv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9UZXh0TWFuaXB1bGF0aW9uLm1t CkBAIC04NDMsNiArODQzLDQ3IEBAIFRFU1QoVGV4dE1hbmlwdWxhdGlvbiwgQ29tcGxldGVUZXh0 TWFuaXB1bGF0aW9uRmFpbFdoZW5CUklzSW5zZXJ0ZWQpCiAgICAgRVhQRUNUX1dLX1NUUkVRKCI8 cD5oZWxsbG8sIDxicj48Yj53b3JybGQ8L2I+PC9wPiIsIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVh dGluZ0phdmFTY3JpcHQ6QCJkb2N1bWVudC5ib2R5LmlubmVySFRNTCJdKTsKIH0KIAorVEVTVChU ZXh0TWFuaXB1bGF0aW9uLCBDb21wbGV0ZVRleHRNYW5pcHVsYXRpb25Bdm9pZENyYXNoaW5nV2hl bkNvbnRlbnRJc1JlbW92ZWQpCit7CisgICAgYXV0byBkZWxlZ2F0ZSA9IGFkb3B0TlMoW1tUZXh0 TWFuaXB1bGF0aW9uRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAgICBhdXRvIHdlYlZpZXcgPSBh ZG9wdE5TKFtbVGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAs IDAsIDQwMCwgNDAwKV0pOworICAgIFt3ZWJWaWV3IF9zZXRUZXh0TWFuaXB1bGF0aW9uRGVsZWdh dGU6ZGVsZWdhdGUuZ2V0KCldOworCisgICAgW3dlYlZpZXcgc3luY2hyb25vdXNseUxvYWRUZXN0 UGFnZU5hbWVkOkAic2ltcGxlIl07CisKKyAgICBkb25lID0gZmFsc2U7CisgICAgW3dlYlZpZXcg X3N0YXJ0VGV4dE1hbmlwdWxhdGlvbnNXaXRoQ29uZmlndXJhdGlvbjpuaWwgY29tcGxldGlvbjpe eworICAgICAgICBkb25lID0gdHJ1ZTsKKyAgICB9XTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGls OjpydW4oJmRvbmUpOworCisgICAgYXV0byAqaXRlbXMgPSBbZGVsZWdhdGUgaXRlbXNdOworICAg IEVYUEVDVF9FUShpdGVtcy5jb3VudCwgMVVMKTsKKyAgICBhdXRvICp0b2tlbnMgPSBpdGVtc1sw XS50b2tlbnM7CisgICAgRVhQRUNUX0VRKHRva2Vucy5jb3VudCwgMVVMKTsKKworICAgIF9fYmxv Y2sgYm9vbCBkb25lID0gZmFsc2U7CisgICAgW3dlYlZpZXcgcGVyZm9ybUFmdGVyUmVjZWl2aW5n TWVzc2FnZTpAIkRvbmVSZW1vdmluZ1BhcmFncmFwaCIgYWN0aW9uOl57CisgICAgICAgIGRvbmUg PSB0cnVlOworICAgIH1dOworCisgICAgW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNj cmlwdDoKKyAgICAgICAgQCJjb25zdCBwYXJhZ3JhcGggPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCdwJyk7IgorICAgICAgICAicGFyYWdyYXBoLnRleHRDb250ZW50ID0gJ0hlbGxvIHdvcmxkJzsi CisgICAgICAgICJkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKHBhcmFncmFwaCk7IgorICAgICAg ICAic2V0VGltZW91dCgoKSA9PiB7IHBhcmFncmFwaC5yZW1vdmUoKTsgd2Via2l0Lm1lc3NhZ2VI YW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgnRG9uZVJlbW92aW5nUGFyYWdyYXBoJykg fSkiXTsKKworICAgIGRvbmUgPSBmYWxzZTsKKyAgICBbd2ViVmlldyBfY29tcGxldGVUZXh0TWFu aXB1bGF0aW9uRm9ySXRlbXM6QFsoX1dLVGV4dE1hbmlwdWxhdGlvbkl0ZW0gKiljcmVhdGVJdGVt KGl0ZW1zWzBdLmlkZW50aWZpZXIsIHsKKyAgICAgICAgeyB0b2tlbnNbMF0uaWRlbnRpZmllciwg QCJTaW1wbGUgSFRNTCBmaWxlISIgfSwKKyAgICB9KV0gY29tcGxldGlvbjpeKE5TQXJyYXk8TlNF cnJvciAqPiAqZXJyb3JzKSB7CisgICAgICAgIEVYUEVDVF9FUShlcnJvcnMsIG5pbCk7CisgICAg ICAgIGRvbmUgPSB0cnVlOworICAgIH1dOworCisgICAgRVhQRUNUX1dLX1NUUkVRKCJTaW1wbGUg SFRNTCBmaWxlISIsIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJkb2N1 bWVudC5ib2R5LnRleHRDb250ZW50Il0pOworfQorCiBURVNUKFRleHRNYW5pcHVsYXRpb24sIENv bXBsZXRlVGV4dE1hbmlwdWxhdGlvblNob3VsZFByZXNlcnZlSW1hZ2VzQXNFeGNsdWRlZFRva2Vu cykKIHsKICAgICBhdXRvIGRlbGVnYXRlID0gYWRvcHROUyhbW1RleHRNYW5pcHVsYXRpb25EZWxl Z2F0ZSBhbGxvY10gaW5pdF0pOwo=