215634 2020-08-18 17:32:27 -0700 Rename replaceAllChildren to replaceAllChildrenWithNewText 2020-08-18 18:29:13 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 215600 1 rniwa rniwa cdumez changseok darin esprehn+autocc ews-watchlist gyuyoung.kim kangil.han webkit-bug-importer oldest_to_newest 1681265 0 rniwa 2020-08-18 17:32:27 -0700 Rename replaceAllChildren to replaceAllChildrenWithNewText 1681267 1 406825 rniwa 2020-08-18 17:36:51 -0700 Created attachment 406825 Renamed the function 1681268 2 406825 darin 2020-08-18 17:38:04 -0700 Comment on attachment 406825 Renamed the function View in context: https://bugs.webkit.org/attachment.cgi?id=406825&action=review > Source/WebCore/dom/ContainerNode.h:62 > + void replaceAllChildrenWithNewText(Ref<Text>&&); Why not just take a String instead of requiring the caller make the text node? 1681269 3 rniwa 2020-08-18 17:38:31 -0700 (In reply to Darin Adler from comment #2) > Comment on attachment 406825 [details] > Renamed the function > > View in context: > https://bugs.webkit.org/attachment.cgi?id=406825&action=review > > > Source/WebCore/dom/ContainerNode.h:62 > > + void replaceAllChildrenWithNewText(Ref<Text>&&); > > Why not just take a String instead of requiring the caller make the text > node? That's a good point. Let's just do that. 1681270 4 406825 darin 2020-08-18 17:38:49 -0700 Comment on attachment 406825 Renamed the function View in context: https://bugs.webkit.org/attachment.cgi?id=406825&action=review > Source/WebCore/dom/ContainerNode.cpp:635 > // This function assumes the input node is not a DocumentFragment and is parentless to decrease complexity. I realized that there is one call site that *wishes* it could use this for DocumentFragment. 1681273 5 rniwa 2020-08-18 17:41:34 -0700 (In reply to Darin Adler from comment #4) > Comment on attachment 406825 [details] > Renamed the function > > View in context: > https://bugs.webkit.org/attachment.cgi?id=406825&action=review > > > Source/WebCore/dom/ContainerNode.cpp:635 > > // This function assumes the input node is not a DocumentFragment and is parentless to decrease complexity. > > I realized that there is one call site that *wishes* it could use this for > DocumentFragment. Yeah but now that I think about it more, that just needs a separate function. 1681277 6 406827 rniwa 2020-08-18 18:08:49 -0700 Created attachment 406827 Updated per Darin's comment 1681279 7 rniwa 2020-08-18 18:28:58 -0700 Committed r265844: <https://trac.webkit.org/changeset/265844> 1681280 8 webkit-bug-importer 2020-08-18 18:29:13 -0700 <rdar://problem/67367468> 406825 2020-08-18 17:36:51 -0700 2020-08-18 18:08:48 -0700 Renamed the function bug-215634-20200818173650.patch text/plain 5211 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2NTg0MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDIwLTA4LTE4ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFJlbmFtZSByZXBsYWNlQWxsQ2hp bGRyZW4gdG8gcmVwbGFjZUFsbENoaWxkcmVuV2l0aE5ld1RleHQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTYzNAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbmFtZWQgQ29udGFpbmVyTm9kZTo6cmVw bGFjZUFsbENoaWxkcmVuIHRvIHJlcGxhY2VBbGxDaGlsZHJlbldpdGhOZXdUZXh0CisgICAgICAg IGFuZCBjaGFuZ2VkIHRoZSB0eXBlIG9mIEFyZ3VtZW50IGZyb20gTm9kZSB0byBUZXh0LgorCisg ICAgICAgICogZG9tL0NvbnRhaW5lck5vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGFp bmVyTm9kZTo6cmVwbGFjZUFsbENoaWxkcmVuV2l0aE5ld1RleHQpOgorICAgICAgICAqIGRvbS9D b250YWluZXJOb2RlLmg6CisgICAgICAgICogZG9tL05vZGUuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Tm9kZTo6c2V0VGV4dENvbnRlbnQpOgorICAgICAgICAqIGh0bWwvSFRNTEVsZW1lbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SFRNTEVsZW1lbnQ6OnNldElubmVyVGV4dCk6CisKIDIwMjAt MDgtMTggIEphbWVzIERhcnBpbmlhbiAgPGpkYXJwaW5pYW5AY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFtXZWJHTDJdIFZhcmlvdXMgcGFyYW1ldGVycyBzaG91bGQgYmUgbm9uLW51bGxhYmxlIGlu IElETApJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0NvbnRhaW5lck5vZGUuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9Db250YWluZXJOb2RlLmNwcAkocmV2aXNpb24gMjY1 ODMyKQorKysgU291cmNlL1dlYkNvcmUvZG9tL0NvbnRhaW5lck5vZGUuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC02MzAsMTEgKzYzMCwxMCBAQCB2b2lkIENvbnRhaW5lck5vZGU6OnJlcGxhY2VBbGxD aGlsZHJlbihzCiB9CiAKIC8vIGh0dHBzOi8vZG9tLnNwZWMud2hhdHdnLm9yZy8jY29uY2VwdC1u b2RlLXJlcGxhY2UtYWxsCi12b2lkIENvbnRhaW5lck5vZGU6OnJlcGxhY2VBbGxDaGlsZHJlbihS ZWY8Tm9kZT4mJiBub2RlKQordm9pZCBDb250YWluZXJOb2RlOjpyZXBsYWNlQWxsQ2hpbGRyZW5X aXRoTmV3VGV4dChSZWY8VGV4dD4mJiBub2RlKQogewogICAgIC8vIFRoaXMgZnVuY3Rpb24gYXNz dW1lcyB0aGUgaW5wdXQgbm9kZSBpcyBub3QgYSBEb2N1bWVudEZyYWdtZW50IGFuZCBpcyBwYXJl bnRsZXNzIHRvIGRlY3JlYXNlIGNvbXBsZXhpdHkuCiAgICAgLy8gVGhpcyBmdW5jdGlvbiBtdXN0 IGJlIGNhbGxlZCBvbiBhIG5ldyBub2RlIHRoYXQgaGFzIG5vdCB5ZXQgYmVlbiBleHBvc2VkIHRv IHNjcmlwdCBkdWUgdG8gdGhlIHVzZSBvZiBEZWZlckNoaWxkcmVuQ2hhbmdlZDo6WWVzLgotICAg IEFTU0VSVCghaXM8RG9jdW1lbnRGcmFnbWVudD4obm9kZSkpOwogICAgIEFTU0VSVCghbm9kZS0+ cGFyZW50Tm9kZSgpKTsKICAgICBSRUxFQVNFX0FTU0VSVCghbm9kZS0+d3JhcHBlcigpICYmIG5v ZGUtPnJlZkNvdW50KCkgPT0gMSk7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Db250YWlu ZXJOb2RlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0NvbnRhaW5lck5vZGUu aAkocmV2aXNpb24gMjY1ODMyKQorKysgU291cmNlL1dlYkNvcmUvZG9tL0NvbnRhaW5lck5vZGUu aAkod29ya2luZyBjb3B5KQpAQCAtMzIsNiArMzIsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiBj bGFzcyBIVE1MQ29sbGVjdGlvbjsKIGNsYXNzIFJhZGlvTm9kZUxpc3Q7CiBjbGFzcyBSZW5kZXJF bGVtZW50OworY2xhc3MgVGV4dDsKIAogY29uc3QgaW50IGluaXRpYWxOb2RlVmVjdG9yU2l6ZSA9 IDExOyAvLyBDb3ZlcnMgOTkuNSUuIFNlZSB3ZWJraXQub3JnL2IvODA3MDYKIHR5cGVkZWYgVmVj dG9yPFJlZjxOb2RlPiwgaW5pdGlhbE5vZGVWZWN0b3JTaXplPiBOb2RlVmVjdG9yOwpAQCAtNTgs NyArNTksNyBAQCBwdWJsaWM6CiAgICAgRXhjZXB0aW9uT3I8dm9pZD4gcmVwbGFjZUNoaWxkKE5v ZGUmIG5ld0NoaWxkLCBOb2RlJiBvbGRDaGlsZCk7CiAgICAgV0VCQ09SRV9FWFBPUlQgRXhjZXB0 aW9uT3I8dm9pZD4gcmVtb3ZlQ2hpbGQoTm9kZSYgY2hpbGQpOwogICAgIFdFQkNPUkVfRVhQT1JU IEV4Y2VwdGlvbk9yPHZvaWQ+IGFwcGVuZENoaWxkKE5vZGUmIG5ld0NoaWxkKTsKLSAgICB2b2lk IHJlcGxhY2VBbGxDaGlsZHJlbihSZWY8Tm9kZT4mJik7CisgICAgdm9pZCByZXBsYWNlQWxsQ2hp bGRyZW5XaXRoTmV3VGV4dChSZWY8VGV4dD4mJik7CiAgICAgdm9pZCByZXBsYWNlQWxsQ2hpbGRy ZW4oc3RkOjpudWxscHRyX3QpOwogCiAgICAgLy8gVGhlc2UgbWV0aG9kcyBhcmUgb25seSB1c2Vk IGR1cmluZyBwYXJzaW5nLgpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAkocmV2aXNpb24gMjY1ODMyKQor KysgU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTg0LDcg KzE1ODQsNyBAQCBFeGNlcHRpb25Pcjx2b2lkPiBOb2RlOjpzZXRUZXh0Q29udGVudChjCiAgICAg ICAgIGlmICh0ZXh0LmlzRW1wdHkoKSkKICAgICAgICAgICAgIGNvbnRhaW5lci5yZXBsYWNlQWxs Q2hpbGRyZW4obnVsbHB0cik7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIGNvbnRhaW5lci5y ZXBsYWNlQWxsQ2hpbGRyZW4oZG9jdW1lbnQoKS5jcmVhdGVUZXh0Tm9kZSh0ZXh0KSk7CisgICAg ICAgICAgICBjb250YWluZXIucmVwbGFjZUFsbENoaWxkcmVuV2l0aE5ld1RleHQoZG9jdW1lbnQo KS5jcmVhdGVUZXh0Tm9kZSh0ZXh0KSk7CiAgICAgICAgIHJldHVybiB7IH07CiAgICAgfQogICAg IGNhc2UgRE9DVU1FTlRfTk9ERToKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVsZW1l bnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnQuY3Bw CShyZXZpc2lvbiAyNjU4MzIpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxFbGVtZW50LmNw cAkod29ya2luZyBjb3B5KQpAQCAtNTQyLDcgKzU0Miw3IEBAIEV4Y2VwdGlvbk9yPHZvaWQ+IEhU TUxFbGVtZW50OjpzZXRJbm5lclQKICAgICAgICAgaWYgKHRleHQuaXNFbXB0eSgpKQogICAgICAg ICAgICAgcmVwbGFjZUFsbENoaWxkcmVuKG51bGxwdHIpOwogICAgICAgICBlbHNlCi0gICAgICAg ICAgICByZXBsYWNlQWxsQ2hpbGRyZW4oZG9jdW1lbnQoKS5jcmVhdGVUZXh0Tm9kZSh0ZXh0KSk7 CisgICAgICAgICAgICByZXBsYWNlQWxsQ2hpbGRyZW5XaXRoTmV3VGV4dChkb2N1bWVudCgpLmNy ZWF0ZVRleHROb2RlKHRleHQpKTsKICAgICAgICAgcmV0dXJuIHsgfTsKICAgICB9CiAKQEAgLTU1 MiwxOSArNTUyLDE5IEBAIEV4Y2VwdGlvbk9yPHZvaWQ+IEhUTUxFbGVtZW50OjpzZXRJbm5lclQK ICAgICBhdXRvKiByID0gcmVuZGVyZXIoKTsKICAgICBpZiAoKHIgJiYgci0+c3R5bGUoKS5wcmVz ZXJ2ZU5ld2xpbmUoKSkgfHwgKGlzQ29ubmVjdGVkKCkgJiYgaXNUZXh0Q29udHJvbElubmVyVGV4 dEVsZW1lbnQoKSkpIHsKICAgICAgICAgaWYgKCF0ZXh0LmNvbnRhaW5zKCdccicpKSB7Ci0gICAg ICAgICAgICByZXBsYWNlQWxsQ2hpbGRyZW4oZG9jdW1lbnQoKS5jcmVhdGVUZXh0Tm9kZSh0ZXh0 KSk7CisgICAgICAgICAgICByZXBsYWNlQWxsQ2hpbGRyZW5XaXRoTmV3VGV4dChkb2N1bWVudCgp LmNyZWF0ZVRleHROb2RlKHRleHQpKTsKICAgICAgICAgICAgIHJldHVybiB7IH07CiAgICAgICAg IH0KICAgICAgICAgU3RyaW5nIHRleHRXaXRoQ29uc2lzdGVudExpbmVCcmVha3MgPSB0ZXh0Owog ICAgICAgICB0ZXh0V2l0aENvbnNpc3RlbnRMaW5lQnJlYWtzLnJlcGxhY2UoIlxyXG4iLCAiXG4i KTsKICAgICAgICAgdGV4dFdpdGhDb25zaXN0ZW50TGluZUJyZWFrcy5yZXBsYWNlKCdccicsICdc bicpOwotICAgICAgICByZXBsYWNlQWxsQ2hpbGRyZW4oZG9jdW1lbnQoKS5jcmVhdGVUZXh0Tm9k ZSh0ZXh0V2l0aENvbnNpc3RlbnRMaW5lQnJlYWtzKSk7CisgICAgICAgIHJlcGxhY2VBbGxDaGls ZHJlbldpdGhOZXdUZXh0KGRvY3VtZW50KCkuY3JlYXRlVGV4dE5vZGUodGV4dFdpdGhDb25zaXN0 ZW50TGluZUJyZWFrcykpOwogICAgICAgICByZXR1cm4geyB9OwogICAgIH0KIAogICAgIC8vIEFk ZCB0ZXh0IG5vZGVzIGFuZCA8YnI+IGVsZW1lbnRzLgogICAgIGF1dG8gZnJhZ21lbnQgPSB0ZXh0 VG9GcmFnbWVudChkb2N1bWVudCgpLCB0ZXh0KTsKLSAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQg dXNlIHJlcGxhY2VBbGxDaGlsZHJlbigpIG9uY2UgaXQgYWNjZXB0cyBEb2N1bWVudEZyYWdtZW50 cyBhcyBpbnB1dC4KKyAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgdXNlIHJlcGxhY2VBbGxDaGls ZHJlbldpdGhOZXdUZXh0KCkgb25jZSBpdCBhY2NlcHRzIERvY3VtZW50RnJhZ21lbnRzIGFzIGlu cHV0LgogICAgIC8vIEl0J3Mgc2FmZSB0byBkaXNwYXRjaCBldmVudHMgb24gdGhlIG5ldyBmcmFn bWVudCBzaW5jZSBhdXRob3Igc2NyaXB0cyBoYXZlIG5vIGFjY2VzcyB0byBpdCB5ZXQuCiAgICAg U2NyaXB0RGlzYWxsb3dlZFNjb3BlOjpFdmVudEFsbG93ZWRTY29wZSBhbGxvd2VkU2NvcGUoZnJh Z21lbnQuZ2V0KCkpOwogICAgIHJldHVybiByZXBsYWNlQ2hpbGRyZW5XaXRoRnJhZ21lbnQoKnRo aXMsIFdURk1vdmUoZnJhZ21lbnQpKTsK 406827 2020-08-18 18:08:49 -0700 2020-08-18 18:22:38 -0700 Updated per Darin's comment bug-215634-20200818180849.patch text/plain 5157 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2NTg0MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDIwLTA4LTE4ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFJlbmFtZSByZXBsYWNlQWxsQ2hp bGRyZW4gdG8gcmVwbGFjZUFsbENoaWxkcmVuV2l0aE5ld1RleHQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTYzNAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbmFtZWQgQ29udGFpbmVyTm9kZTo6cmVw bGFjZUFsbENoaWxkcmVuIHRvIHJlcGxhY2VBbGxDaGlsZHJlbldpdGhOZXdUZXh0IGFuZCBjaGFu Z2VkCisgICAgICAgIHRoZSB0eXBlIG9mIEFyZ3VtZW50IGZyb20gUmVmPE5vZGU+JiYgdG8gY29u c3QgU3RyaW5nJi4KKworICAgICAgICAqIGRvbS9Db250YWluZXJOb2RlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkNvbnRhaW5lck5vZGU6OnJlcGxhY2VBbGxDaGlsZHJlbldpdGhOZXdUZXh0KToK KyAgICAgICAgKiBkb20vQ29udGFpbmVyTm9kZS5oOgorICAgICAgICAqIGRvbS9Ob2RlLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6OnNldFRleHRDb250ZW50KToKKyAgICAgICAgKiBodG1s L0hUTUxFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxFbGVtZW50OjpzZXRJbm5l clRleHQpOgorCiAyMDIwLTA4LTE4ICBKYW1lcyBEYXJwaW5pYW4gIDxqZGFycGluaWFuQGNocm9t aXVtLm9yZz4KIAogICAgICAgICBbV2ViR0wyXSBWYXJpb3VzIHBhcmFtZXRlcnMgc2hvdWxkIGJl IG5vbi1udWxsYWJsZSBpbiBJREwKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Db250YWluZXJO b2RlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vQ29udGFpbmVyTm9kZS5j cHAJKHJldmlzaW9uIDI2NTgzMikKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Db250YWluZXJOb2Rl LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjMwLDE0ICs2MzAsOSBAQCB2b2lkIENvbnRhaW5lck5v ZGU6OnJlcGxhY2VBbGxDaGlsZHJlbihzCiB9CiAKIC8vIGh0dHBzOi8vZG9tLnNwZWMud2hhdHdn Lm9yZy8jY29uY2VwdC1ub2RlLXJlcGxhY2UtYWxsCi12b2lkIENvbnRhaW5lck5vZGU6OnJlcGxh Y2VBbGxDaGlsZHJlbihSZWY8Tm9kZT4mJiBub2RlKQordm9pZCBDb250YWluZXJOb2RlOjpyZXBs YWNlQWxsQ2hpbGRyZW5XaXRoTmV3VGV4dChjb25zdCBTdHJpbmcmIHRleHQpCiB7Ci0gICAgLy8g VGhpcyBmdW5jdGlvbiBhc3N1bWVzIHRoZSBpbnB1dCBub2RlIGlzIG5vdCBhIERvY3VtZW50RnJh Z21lbnQgYW5kIGlzIHBhcmVudGxlc3MgdG8gZGVjcmVhc2UgY29tcGxleGl0eS4KLSAgICAvLyBU aGlzIGZ1bmN0aW9uIG11c3QgYmUgY2FsbGVkIG9uIGEgbmV3IG5vZGUgdGhhdCBoYXMgbm90IHll dCBiZWVuIGV4cG9zZWQgdG8gc2NyaXB0IGR1ZSB0byB0aGUgdXNlIG9mIERlZmVyQ2hpbGRyZW5D aGFuZ2VkOjpZZXMuCi0gICAgQVNTRVJUKCFpczxEb2N1bWVudEZyYWdtZW50Pihub2RlKSk7Ci0g ICAgQVNTRVJUKCFub2RlLT5wYXJlbnROb2RlKCkpOwotICAgIFJFTEVBU0VfQVNTRVJUKCFub2Rl LT53cmFwcGVyKCkgJiYgbm9kZS0+cmVmQ291bnQoKSA9PSAxKTsKLQorICAgIGF1dG8gbm9kZSA9 IGRvY3VtZW50KCkuY3JlYXRlVGV4dE5vZGUodGV4dCk7CiAgICAgaWYgKCFoYXNDaGlsZE5vZGVz KCkpIHsKICAgICAgICAgLy8gYXBwZW5kQ2hpbGRXaXRob3V0UHJlSW5zZXJ0aW9uVmFsaWRpdHlD aGVjaygpIGNhbiBvbmx5IHRocm93IHdoZW4gbm9kZSBoYXMgYSBwYXJlbnQgYW5kIHdlIGFscmVh ZHkgYXNzZXJ0ZWQgaXQgZG9lc24ndC4KICAgICAgICAgYXV0byByZXN1bHQgPSBhcHBlbmRDaGls ZFdpdGhvdXRQcmVJbnNlcnRpb25WYWxpZGl0eUNoZWNrKG5vZGUpOwpJbmRleDogU291cmNlL1dl YkNvcmUvZG9tL0NvbnRhaW5lck5vZGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9k b20vQ29udGFpbmVyTm9kZS5oCShyZXZpc2lvbiAyNjU4MzIpCisrKyBTb3VyY2UvV2ViQ29yZS9k b20vQ29udGFpbmVyTm9kZS5oCSh3b3JraW5nIGNvcHkpCkBAIC01OCw3ICs1OCw3IEBAIHB1Ymxp YzoKICAgICBFeGNlcHRpb25Pcjx2b2lkPiByZXBsYWNlQ2hpbGQoTm9kZSYgbmV3Q2hpbGQsIE5v ZGUmIG9sZENoaWxkKTsKICAgICBXRUJDT1JFX0VYUE9SVCBFeGNlcHRpb25Pcjx2b2lkPiByZW1v dmVDaGlsZChOb2RlJiBjaGlsZCk7CiAgICAgV0VCQ09SRV9FWFBPUlQgRXhjZXB0aW9uT3I8dm9p ZD4gYXBwZW5kQ2hpbGQoTm9kZSYgbmV3Q2hpbGQpOwotICAgIHZvaWQgcmVwbGFjZUFsbENoaWxk cmVuKFJlZjxOb2RlPiYmKTsKKyAgICB2b2lkIHJlcGxhY2VBbGxDaGlsZHJlbldpdGhOZXdUZXh0 KGNvbnN0IFN0cmluZyYpOwogICAgIHZvaWQgcmVwbGFjZUFsbENoaWxkcmVuKHN0ZDo6bnVsbHB0 cl90KTsKIAogICAgIC8vIFRoZXNlIG1ldGhvZHMgYXJlIG9ubHkgdXNlZCBkdXJpbmcgcGFyc2lu Zy4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9kb20vTm9kZS5jcHAJKHJldmlzaW9uIDI2NTgzMikKKysrIFNvdXJjZS9XZWJD b3JlL2RvbS9Ob2RlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTU4NCw3ICsxNTg0LDcgQEAgRXhj ZXB0aW9uT3I8dm9pZD4gTm9kZTo6c2V0VGV4dENvbnRlbnQoYwogICAgICAgICBpZiAodGV4dC5p c0VtcHR5KCkpCiAgICAgICAgICAgICBjb250YWluZXIucmVwbGFjZUFsbENoaWxkcmVuKG51bGxw dHIpOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBjb250YWluZXIucmVwbGFjZUFsbENoaWxk cmVuKGRvY3VtZW50KCkuY3JlYXRlVGV4dE5vZGUodGV4dCkpOworICAgICAgICAgICAgY29udGFp bmVyLnJlcGxhY2VBbGxDaGlsZHJlbldpdGhOZXdUZXh0KHRleHQpOwogICAgICAgICByZXR1cm4g eyB9OwogICAgIH0KICAgICBjYXNlIERPQ1VNRU5UX05PREU6CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxFbGVtZW50LmNwcAkocmV2aXNpb24gMjY1ODMyKQorKysgU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU0Miw3ICs1NDIsNyBAQCBFeGNl cHRpb25Pcjx2b2lkPiBIVE1MRWxlbWVudDo6c2V0SW5uZXJUCiAgICAgICAgIGlmICh0ZXh0Lmlz RW1wdHkoKSkKICAgICAgICAgICAgIHJlcGxhY2VBbGxDaGlsZHJlbihudWxscHRyKTsKICAgICAg ICAgZWxzZQotICAgICAgICAgICAgcmVwbGFjZUFsbENoaWxkcmVuKGRvY3VtZW50KCkuY3JlYXRl VGV4dE5vZGUodGV4dCkpOworICAgICAgICAgICAgcmVwbGFjZUFsbENoaWxkcmVuV2l0aE5ld1Rl eHQodGV4dCk7CiAgICAgICAgIHJldHVybiB7IH07CiAgICAgfQogCkBAIC01NTIsMTkgKzU1Miwx OSBAQCBFeGNlcHRpb25Pcjx2b2lkPiBIVE1MRWxlbWVudDo6c2V0SW5uZXJUCiAgICAgYXV0byog ciA9IHJlbmRlcmVyKCk7CiAgICAgaWYgKChyICYmIHItPnN0eWxlKCkucHJlc2VydmVOZXdsaW5l KCkpIHx8IChpc0Nvbm5lY3RlZCgpICYmIGlzVGV4dENvbnRyb2xJbm5lclRleHRFbGVtZW50KCkp KSB7CiAgICAgICAgIGlmICghdGV4dC5jb250YWlucygnXHInKSkgewotICAgICAgICAgICAgcmVw bGFjZUFsbENoaWxkcmVuKGRvY3VtZW50KCkuY3JlYXRlVGV4dE5vZGUodGV4dCkpOworICAgICAg ICAgICAgcmVwbGFjZUFsbENoaWxkcmVuV2l0aE5ld1RleHQodGV4dCk7CiAgICAgICAgICAgICBy ZXR1cm4geyB9OwogICAgICAgICB9CiAgICAgICAgIFN0cmluZyB0ZXh0V2l0aENvbnNpc3RlbnRM aW5lQnJlYWtzID0gdGV4dDsKICAgICAgICAgdGV4dFdpdGhDb25zaXN0ZW50TGluZUJyZWFrcy5y ZXBsYWNlKCJcclxuIiwgIlxuIik7CiAgICAgICAgIHRleHRXaXRoQ29uc2lzdGVudExpbmVCcmVh a3MucmVwbGFjZSgnXHInLCAnXG4nKTsKLSAgICAgICAgcmVwbGFjZUFsbENoaWxkcmVuKGRvY3Vt ZW50KCkuY3JlYXRlVGV4dE5vZGUodGV4dFdpdGhDb25zaXN0ZW50TGluZUJyZWFrcykpOworICAg ICAgICByZXBsYWNlQWxsQ2hpbGRyZW5XaXRoTmV3VGV4dCh0ZXh0V2l0aENvbnNpc3RlbnRMaW5l QnJlYWtzKTsKICAgICAgICAgcmV0dXJuIHsgfTsKICAgICB9CiAKICAgICAvLyBBZGQgdGV4dCBu b2RlcyBhbmQgPGJyPiBlbGVtZW50cy4KICAgICBhdXRvIGZyYWdtZW50ID0gdGV4dFRvRnJhZ21l bnQoZG9jdW1lbnQoKSwgdGV4dCk7Ci0gICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIHVzZSByZXBs YWNlQWxsQ2hpbGRyZW4oKSBvbmNlIGl0IGFjY2VwdHMgRG9jdW1lbnRGcmFnbWVudHMgYXMgaW5w dXQuCisgICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIHVzZSBhIHZhcmlhbnQgb2YgcmVwbGFjZUFs bENoaWxkcmVuV2l0aE5ld1RleHQoKSB3aGljaCBhY2NlcHRzIERvY3VtZW50RnJhZ21lbnRzIGFz IGlucHV0LgogICAgIC8vIEl0J3Mgc2FmZSB0byBkaXNwYXRjaCBldmVudHMgb24gdGhlIG5ldyBm cmFnbWVudCBzaW5jZSBhdXRob3Igc2NyaXB0cyBoYXZlIG5vIGFjY2VzcyB0byBpdCB5ZXQuCiAg ICAgU2NyaXB0RGlzYWxsb3dlZFNjb3BlOjpFdmVudEFsbG93ZWRTY29wZSBhbGxvd2VkU2NvcGUo ZnJhZ21lbnQuZ2V0KCkpOwogICAgIHJldHVybiByZXBsYWNlQ2hpbGRyZW5XaXRoRnJhZ21lbnQo KnRoaXMsIFdURk1vdmUoZnJhZ21lbnQpKTsK