41144 2010-06-24 04:00:15 -0700 Implement the HTML5 <mark> element. 2010-07-02 12:45:44 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) All All RESOLVED FIXED HTML5 P2 Normal --- 32934 0 peter webkit-unassigned commit-queue mike oldest_to_newest 242419 0 59629 peter 2010-06-24 04:00:15 -0700 Created attachment 59629 Proposed patch This patch adds support for the HTML5 <mark> element to WebKit. The default style has been based on the current behavior of searching in Chrome, as well as on Mozilla's implementation of the tag[1]. I'm not sure about how to add tests for this, if they are required, advice would be appreciated. 245519 1 59629 mjs 2010-07-01 13:28:16 -0700 Comment on attachment 59629 Proposed patch Code change looks great! The one thing missing here is a regression test. Take a look at LayoutTests/fast/html for some tests for revently added HTML5 elements. r- for the lack of test, please resubmit with a test case. 245784 2 60343 peter 2010-07-02 00:14:43 -0700 Created attachment 60343 Patch + Regression tests Added a regression test for the element. 246014 3 60343 mjs 2010-07-02 12:13:34 -0700 Comment on attachment 60343 Patch + Regression tests r=me 246039 4 60343 commit-queue 2010-07-02 12:45:40 -0700 Comment on attachment 60343 Patch + Regression tests Clearing flags on attachment: 60343 Committed r62398: <http://trac.webkit.org/changeset/62398> 246040 5 commit-queue 2010-07-02 12:45:44 -0700 All reviewed patches have been landed. Closing bug. 59629 2010-06-24 04:00:15 -0700 2010-07-02 00:14:43 -0700 Proposed patch HTML5 mark element.txt text/plain 4098 peter SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MTc1MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTAtMDYtMjQgIFBldGVyIEJldmVybG9vICA8cGV0ZXJAbHZwLW1l ZGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGQgdGhlIEhUTUw1IDxtYXJrPiBlbGVtZW50LiBUZXh0IGNvbnRlbnQgb2YgdGhlIGVsZW1l bnQgd2lsbCBoYXZlCisgICAgICAgIGEgeWVsbG93IGJhY2tncm91bmQgY29sb3IgYW5kIGJsYWNr IHRleHQuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLgorCisgICAgICAgICogY3NzL2h0bWwuY3Nz OgorICAgICAgICAobWFyayk6CisgICAgICAgICogaHRtbC9IVE1MRWxlbWVudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjppbmxpbmVUYWdMaXN0KToKKyAgICAgICAgKiBodG1sL0hUTUxUYWdOYW1l cy5pbjoKKyAgICAgICAgKiBodG1sL0xlZ2FjeUhUTUxUcmVlQnVpbGRlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpMZWdhY3lIVE1MVHJlZUJ1aWxkZXI6OmdldE5vZGUpOgorICAgICAgICAoV2Vi Q29yZTo6TGVnYWN5SFRNTFRyZWVCdWlsZGVyOjppc0lubGluZSk6CisgICAgICAgIChXZWJDb3Jl OjpMZWdhY3lIVE1MVHJlZUJ1aWxkZXI6OmlzUmVzaWR1YWxTdHlsZVRhZyk6CisKIDIwMTAtMDYt MjQgIFNhdGlzaCBTYW1wYXRoICA8c2F0aXNoQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBLZW50IFRhbXVyYS4KSW5kZXg6IFdlYkNvcmUvY3NzL2h0bWwuY3NzCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvY3NzL2h0bWwuY3NzCShyZXZpc2lvbiA2MTc0NikKKysrIFdlYkNvcmUv Y3NzL2h0bWwuY3NzCSh3b3JraW5nIGNvcHkpCkBAIC02MjQsNiArNjI0LDExIEBAIHByZSwgeG1w LCBwbGFpbnRleHQsIGxpc3RpbmcgewogICAgIG1hcmdpbjogMV9fcWVtIDAKIH0KIAorbWFyayB7 CisgICAgYmFja2dyb3VuZC1jb2xvcjogeWVsbG93OworICAgIGNvbG9yOiBibGFjaworfQorCiBi aWcgewogICAgIGZvbnQtc2l6ZTogbGFyZ2VyCiB9CkluZGV4OiBXZWJDb3JlL2h0bWwvSFRNTEVs ZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9IVE1MRWxlbWVudC5jcHAJKHJl dmlzaW9uIDYxNzQ2KQorKysgV2ViQ29yZS9odG1sL0hUTUxFbGVtZW50LmNwcAkod29ya2luZyBj b3B5KQpAQCAtODU4LDYgKzg1OCw3IEBAIHN0YXRpYyBIYXNoU2V0PEF0b21pY1N0cmluZ0ltcGwq PiogaW5saW4KICAgICAgICAgdGFnTGlzdC5hZGQocnVieVRhZy5sb2NhbE5hbWUoKS5pbXBsKCkp OwogICAgICAgICB0YWdMaXN0LmFkZChwcm9ncmVzc1RhZy5sb2NhbE5hbWUoKS5pbXBsKCkpOwog ICAgICAgICB0YWdMaXN0LmFkZChtZXRlclRhZy5sb2NhbE5hbWUoKS5pbXBsKCkpOworICAgICAg ICB0YWdMaXN0LmFkZChtYXJrVGFnLmxvY2FsTmFtZSgpLmltcGwoKSk7CiAgICAgfQogICAgIHJl dHVybiAmdGFnTGlzdDsKIH0KSW5kZXg6IFdlYkNvcmUvaHRtbC9IVE1MVGFnTmFtZXMuaW4KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9odG1sL0hUTUxUYWdOYW1lcy5pbgkocmV2aXNpb24gNjE3NDYp CisrKyBXZWJDb3JlL2h0bWwvSFRNTFRhZ05hbWVzLmluCSh3b3JraW5nIGNvcHkpCkBAIC03NCw2 ICs3NCw3IEBAIGxpIGludGVyZmFjZU5hbWU9SFRNTExJRWxlbWVudAogbGluayBjb25zdHJ1Y3Rv ck5lZWRzQ3JlYXRlZEJ5UGFyc2VyCiBsaXN0aW5nIGludGVyZmFjZU5hbWU9SFRNTFByZUVsZW1l bnQKIG1hcAorbWFyayBpbnRlcmZhY2VOYW1lPUhUTUxFbGVtZW50CiBtYXJxdWVlCiBtZW51CiBt ZXRhCkluZGV4OiBXZWJDb3JlL2h0bWwvTGVnYWN5SFRNTFRyZWVCdWlsZGVyLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL2h0bWwvTGVnYWN5SFRNTFRyZWVCdWlsZGVyLmNwcAkocmV2aXNpb24g NjE3NDYpCisrKyBXZWJDb3JlL2h0bWwvTGVnYWN5SFRNTFRyZWVCdWlsZGVyLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtOTQ0LDcgKzk0NCw3IEBAIFBhc3NSZWZQdHI8Tm9kZT4gTGVnYWN5SFRNTFRy ZWVCdWlsZGVyOjoKICAgICAgICAgUXVhbGlmaWVkTmFtZSBuZXN0ZWRDcmVhdGVFcnJvclRhZ3Nb XSA9IHsgYVRhZywgYnV0dG9uVGFnLCBub2JyVGFnLCB0clRhZyB9OwogICAgICAgICBtYXBUYWdz VG9GdW5jKGdGdW5jdGlvbk1hcCwgbmVzdGVkQ3JlYXRlRXJyb3JUYWdzLCAmTGVnYWN5SFRNTFRy ZWVCdWlsZGVyOjpuZXN0ZWRDcmVhdGVFcnJvckNoZWNrKTsKIAotICAgICAgICBRdWFsaWZpZWRO YW1lIG5lc3RlZFN0eWxlQ3JlYXRlRXJyb3JUYWdzW10gPSB7IGJUYWcsIGJpZ1RhZywgaVRhZywg c1RhZywgc21hbGxUYWcsIHN0cmlrZVRhZywgdHRUYWcsIHVUYWcgfTsKKyAgICAgICAgUXVhbGlm aWVkTmFtZSBuZXN0ZWRTdHlsZUNyZWF0ZUVycm9yVGFnc1tdID0geyBiVGFnLCBiaWdUYWcsIGlU YWcsIG1hcmtUYWcsIHNUYWcsIHNtYWxsVGFnLCBzdHJpa2VUYWcsIHR0VGFnLCB1VGFnIH07CiAg ICAgICAgIG1hcFRhZ3NUb0Z1bmMoZ0Z1bmN0aW9uTWFwLCBuZXN0ZWRTdHlsZUNyZWF0ZUVycm9y VGFncywgJkxlZ2FjeUhUTUxUcmVlQnVpbGRlcjo6bmVzdGVkU3R5bGVDcmVhdGVFcnJvckNoZWNr KTsKIAogICAgICAgICBRdWFsaWZpZWROYW1lIHBDbG9zZXJDcmVhdGVFcnJvclRhZ3NbXSA9IHsg YWRkcmVzc1RhZywgYXJ0aWNsZVRhZywKQEAgLTEwNTcsNyArMTA1Nyw3IEBAIGJvb2wgTGVnYWN5 SFRNTFRyZWVCdWlsZGVyOjppc0lubGluZShOb2QKICAgICAgICAgICAgIGUtPmhhc0xvY2FsTmFt ZShhYmJyVGFnKSB8fCBlLT5oYXNMb2NhbE5hbWUoYWNyb255bVRhZykgfHwgZS0+aGFzTG9jYWxO YW1lKHN1YlRhZykgfHwKICAgICAgICAgICAgIGUtPmhhc0xvY2FsTmFtZShzdXBUYWcpIHx8IGUt Pmhhc0xvY2FsTmFtZShzcGFuVGFnKSB8fCBlLT5oYXNMb2NhbE5hbWUobm9iclRhZykgfHwKICAg ICAgICAgICAgIGUtPmhhc0xvY2FsTmFtZShub2ZyYW1lc1RhZykgfHwgZS0+aGFzTG9jYWxOYW1l KG5vbGF5ZXJUYWcpIHx8Ci0gICAgICAgICAgICBlLT5oYXNMb2NhbE5hbWUobm9lbWJlZFRhZykp CisgICAgICAgICAgICBlLT5oYXNMb2NhbE5hbWUobm9lbWJlZFRhZykgfHwgZS0+aGFzTG9jYWxO YW1lKG1hcmtUYWcpKQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAjaWYgIUVOQUJMRShYSFRN TE1QKQogICAgICAgICBpZiAoZS0+aGFzTG9jYWxOYW1lKG5vc2NyaXB0VGFnKSAmJiAhbV9pc1Bh cnNpbmdGcmFnbWVudCkgewpAQCAtMTA3Nyw3ICsxMDc3LDcgQEAgYm9vbCBMZWdhY3lIVE1MVHJl ZUJ1aWxkZXI6OmlzUmVzaWR1YWxTdAogICAgIGlmIChyZXNpZHVhbFN0eWxlVGFncy5pc0VtcHR5 KCkpIHsKICAgICAgICAgUXVhbGlmaWVkTmFtZSB0YWdOYW1lc1tdID0geyBhVGFnLCBmb250VGFn LCB0dFRhZywgdVRhZywgYlRhZywgaVRhZywKICAgICAgICAgICAgIHNUYWcsIHN0cmlrZVRhZywg YmlnVGFnLCBzbWFsbFRhZywgZW1UYWcsIHN0cm9uZ1RhZywgZGZuVGFnLAotICAgICAgICAgICAg Y29kZVRhZywgc2FtcFRhZywga2JkVGFnLCB2YXJUYWcsIG5vYnJUYWcgfTsKKyAgICAgICAgICAg IGNvZGVUYWcsIHNhbXBUYWcsIGtiZFRhZywgdmFyVGFnLCBub2JyVGFnLCBtYXJrVGFnIH07CiAg ICAgICAgIGFkZFRhZ3MocmVzaWR1YWxTdHlsZVRhZ3MsIHRhZ05hbWVzKTsKICAgICB9CiAgICAg cmV0dXJuIHJlc2lkdWFsU3R5bGVUYWdzLmNvbnRhaW5zKHRhZ05hbWUuaW1wbCgpKTsK 60343 2010-07-02 00:14:43 -0700 2010-07-02 12:45:40 -0700 Patch + Regression tests HTML5 mark element 2.txt text/plain 7643 peter SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MjM2OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTAtMDctMDIgIFBldGVyIEJldmVybG9vICA8cGV0ZXJAbHZwLW1l ZGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGQgdGhlIEhUTUw1IDxtYXJrPiBlbGVtZW50LiBUZXh0IGNvbnRlbnQgb2YgdGhlIGVsZW1l bnQgd2lsbCBoYXZlCisgICAgICAgIGEgeWVsbG93IGJhY2tncm91bmQgY29sb3IgYW5kIGJsYWNr IHRleHQuCisKKyAgICAgICAgVGVzdDogZmFzdC9odG1sL21hcmstZWxlbWVudC5odG1sCisgICAg ICAgIFRlc3RzIGZvciA8cD4gY2xvc2luZywgcGhyYXNpbmcgY2hpbGQgY29udGVudCBhbmQgcmVz aWR1YWwgc3R5bGUuCisKKyAgICAgICAgKiBjc3MvaHRtbC5jc3M6CisgICAgICAgIChtYXJrKToK KyAgICAgICAgKiBodG1sL0hUTUxFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmlubGlu ZVRhZ0xpc3QpOgorICAgICAgICAqIGh0bWwvSFRNTFRhZ05hbWVzLmluOgorICAgICAgICAqIGh0 bWwvTGVnYWN5SFRNTFRyZWVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxlZ2FjeUhU TUxUcmVlQnVpbGRlcjo6Z2V0Tm9kZSk6CisgICAgICAgIChXZWJDb3JlOjpMZWdhY3lIVE1MVHJl ZUJ1aWxkZXI6OmlzSW5saW5lKToKKyAgICAgICAgKFdlYkNvcmU6OkxlZ2FjeUhUTUxUcmVlQnVp bGRlcjo6aXNSZXNpZHVhbFN0eWxlVGFnKToKKwogMjAxMC0wNy0wMSAgT2xpdmVyIEh1bnQgIDxv bGl2ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEJ1aWxkIGZpeApJbmRleDogV2ViQ29yZS9jc3Mv aHRtbC5jc3MKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9jc3MvaHRtbC5jc3MJKHJldmlzaW9uIDYy MzY0KQorKysgV2ViQ29yZS9jc3MvaHRtbC5jc3MJKHdvcmtpbmcgY29weSkKQEAgLTYzMSw2ICs2 MzEsMTEgQEAgcHJlLCB4bXAsIHBsYWludGV4dCwgbGlzdGluZyB7CiAgICAgbWFyZ2luOiAxX19x ZW0gMAogfQogCittYXJrIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiB5ZWxsb3c7CisgICAgY29s b3I6IGJsYWNrCit9CisKIGJpZyB7CiAgICAgZm9udC1zaXplOiBsYXJnZXIKIH0KSW5kZXg6IFdl YkNvcmUvaHRtbC9IVE1MRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL0hU TUxFbGVtZW50LmNwcAkocmV2aXNpb24gNjIzNjQpCisrKyBXZWJDb3JlL2h0bWwvSFRNTEVsZW1l bnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NTgsNiArODU4LDcgQEAgc3RhdGljIEhhc2hTZXQ8 QXRvbWljU3RyaW5nSW1wbCo+KiBpbmxpbgogICAgICAgICB0YWdMaXN0LmFkZChydWJ5VGFnLmxv Y2FsTmFtZSgpLmltcGwoKSk7CiAgICAgICAgIHRhZ0xpc3QuYWRkKHByb2dyZXNzVGFnLmxvY2Fs TmFtZSgpLmltcGwoKSk7CiAgICAgICAgIHRhZ0xpc3QuYWRkKG1ldGVyVGFnLmxvY2FsTmFtZSgp LmltcGwoKSk7CisgICAgICAgIHRhZ0xpc3QuYWRkKG1hcmtUYWcubG9jYWxOYW1lKCkuaW1wbCgp KTsKICAgICB9CiAgICAgcmV0dXJuICZ0YWdMaXN0OwogfQpJbmRleDogV2ViQ29yZS9odG1sL0hU TUxUYWdOYW1lcy5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0bWwvSFRNTFRhZ05hbWVzLmlu CShyZXZpc2lvbiA2MjM2NCkKKysrIFdlYkNvcmUvaHRtbC9IVE1MVGFnTmFtZXMuaW4JKHdvcmtp bmcgY29weSkKQEAgLTc0LDYgKzc0LDcgQEAgbGkgaW50ZXJmYWNlTmFtZT1IVE1MTElFbGVtZW50 CiBsaW5rIGNvbnN0cnVjdG9yTmVlZHNDcmVhdGVkQnlQYXJzZXIKIGxpc3RpbmcgaW50ZXJmYWNl TmFtZT1IVE1MUHJlRWxlbWVudAogbWFwCittYXJrIGludGVyZmFjZU5hbWU9SFRNTEVsZW1lbnQK IG1hcnF1ZWUKIG1lbnUKIG1ldGEKSW5kZXg6IFdlYkNvcmUvaHRtbC9MZWdhY3lIVE1MVHJlZUJ1 aWxkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9MZWdhY3lIVE1MVHJlZUJ1aWxk ZXIuY3BwCShyZXZpc2lvbiA2MjM2NCkKKysrIFdlYkNvcmUvaHRtbC9MZWdhY3lIVE1MVHJlZUJ1 aWxkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05NDQsNyArOTQ0LDcgQEAgUGFzc1JlZlB0cjxO b2RlPiBMZWdhY3lIVE1MVHJlZUJ1aWxkZXI6OgogICAgICAgICBRdWFsaWZpZWROYW1lIG5lc3Rl ZENyZWF0ZUVycm9yVGFnc1tdID0geyBhVGFnLCBidXR0b25UYWcsIG5vYnJUYWcsIHRyVGFnIH07 CiAgICAgICAgIG1hcFRhZ3NUb0Z1bmMoZ0Z1bmN0aW9uTWFwLCBuZXN0ZWRDcmVhdGVFcnJvclRh Z3MsICZMZWdhY3lIVE1MVHJlZUJ1aWxkZXI6Om5lc3RlZENyZWF0ZUVycm9yQ2hlY2spOwogCi0g ICAgICAgIFF1YWxpZmllZE5hbWUgbmVzdGVkU3R5bGVDcmVhdGVFcnJvclRhZ3NbXSA9IHsgYlRh ZywgYmlnVGFnLCBpVGFnLCBzVGFnLCBzbWFsbFRhZywgc3RyaWtlVGFnLCB0dFRhZywgdVRhZyB9 OworICAgICAgICBRdWFsaWZpZWROYW1lIG5lc3RlZFN0eWxlQ3JlYXRlRXJyb3JUYWdzW10gPSB7 IGJUYWcsIGJpZ1RhZywgaVRhZywgbWFya1RhZywgc1RhZywgc21hbGxUYWcsIHN0cmlrZVRhZywg dHRUYWcsIHVUYWcgfTsKICAgICAgICAgbWFwVGFnc1RvRnVuYyhnRnVuY3Rpb25NYXAsIG5lc3Rl ZFN0eWxlQ3JlYXRlRXJyb3JUYWdzLCAmTGVnYWN5SFRNTFRyZWVCdWlsZGVyOjpuZXN0ZWRTdHls ZUNyZWF0ZUVycm9yQ2hlY2spOwogCiAgICAgICAgIFF1YWxpZmllZE5hbWUgcENsb3NlckNyZWF0 ZUVycm9yVGFnc1tdID0geyBhZGRyZXNzVGFnLCBhcnRpY2xlVGFnLApAQCAtMTA1Nyw3ICsxMDU3 LDcgQEAgYm9vbCBMZWdhY3lIVE1MVHJlZUJ1aWxkZXI6OmlzSW5saW5lKE5vZAogICAgICAgICAg ICAgZS0+aGFzTG9jYWxOYW1lKGFiYnJUYWcpIHx8IGUtPmhhc0xvY2FsTmFtZShhY3JvbnltVGFn KSB8fCBlLT5oYXNMb2NhbE5hbWUoc3ViVGFnKSB8fAogICAgICAgICAgICAgZS0+aGFzTG9jYWxO YW1lKHN1cFRhZykgfHwgZS0+aGFzTG9jYWxOYW1lKHNwYW5UYWcpIHx8IGUtPmhhc0xvY2FsTmFt ZShub2JyVGFnKSB8fAogICAgICAgICAgICAgZS0+aGFzTG9jYWxOYW1lKG5vZnJhbWVzVGFnKSB8 fCBlLT5oYXNMb2NhbE5hbWUobm9sYXllclRhZykgfHwKLSAgICAgICAgICAgIGUtPmhhc0xvY2Fs TmFtZShub2VtYmVkVGFnKSkKKyAgICAgICAgICAgIGUtPmhhc0xvY2FsTmFtZShub2VtYmVkVGFn KSB8fCBlLT5oYXNMb2NhbE5hbWUobWFya1RhZykpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsK ICNpZiAhRU5BQkxFKFhIVE1MTVApCiAgICAgICAgIGlmIChlLT5oYXNMb2NhbE5hbWUobm9zY3Jp cHRUYWcpICYmICFtX2lzUGFyc2luZ0ZyYWdtZW50KSB7CkBAIC0xMDc3LDcgKzEwNzcsNyBAQCBi b29sIExlZ2FjeUhUTUxUcmVlQnVpbGRlcjo6aXNSZXNpZHVhbFN0CiAgICAgaWYgKHJlc2lkdWFs U3R5bGVUYWdzLmlzRW1wdHkoKSkgewogICAgICAgICBRdWFsaWZpZWROYW1lIHRhZ05hbWVzW10g PSB7IGFUYWcsIGZvbnRUYWcsIHR0VGFnLCB1VGFnLCBiVGFnLCBpVGFnLAogICAgICAgICAgICAg c1RhZywgc3RyaWtlVGFnLCBiaWdUYWcsIHNtYWxsVGFnLCBlbVRhZywgc3Ryb25nVGFnLCBkZm5U YWcsCi0gICAgICAgICAgICBjb2RlVGFnLCBzYW1wVGFnLCBrYmRUYWcsIHZhclRhZywgbm9iclRh ZyB9OworICAgICAgICAgICAgY29kZVRhZywgc2FtcFRhZywga2JkVGFnLCB2YXJUYWcsIG5vYnJU YWcsIG1hcmtUYWcgfTsKICAgICAgICAgYWRkVGFncyhyZXNpZHVhbFN0eWxlVGFncywgdGFnTmFt ZXMpOwogICAgIH0KICAgICByZXR1cm4gcmVzaWR1YWxTdHlsZVRhZ3MuY29udGFpbnModGFnTmFt ZS5pbXBsKCkpOw0KSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBM YXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDYyMzY4KQorKysgTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDctMDIgIFBldGVy IEJldmVybG9vICA8cGV0ZXJAbHZwLW1lZGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgdGhlIEhUTUw1IDxtYXJrPiBlbGVtZW50LiBU ZXh0IGNvbnRlbnQgb2YgdGhlIGVsZW1lbnQgd2lsbCBoYXZlCisgICAgICAgIGEgeWVsbG93IGJh Y2tncm91bmQgY29sb3IgYW5kIGJsYWNrIHRleHQuCisKKyAgICAgICAgVGVzdHMgZm9yIDxwPiBj bG9zaW5nLCBwaHJhc2luZyBjaGlsZCBjb250ZW50IGFuZCByZXNpZHVhbCBzdHlsZS4KKworICAg ICAgICAqIGZhc3QvaHRtbC9tYXJrLWVsZW1lbnQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAg ICAgKiBmYXN0L2h0bWwvbWFyay1lbGVtZW50Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3Qv aHRtbC9zY3JpcHQtdGVzdHMvbWFyay1lbGVtZW50LmpzOiBBZGRlZC4KKwogMjAxMC0wNy0wMSAg QW5kcmVhcyBLbGluZyAgPGFuZHJlYXMua2xpbmdAbm9raWEuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IFRvciBBcm5lIFZlc3Riw7guCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2h0bWwvbWFy ay1lbGVtZW50LWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2h0 bWwvbWFyay1lbGVtZW50LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3Rz L2Zhc3QvaHRtbC9tYXJrLWVsZW1lbnQtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCww ICsxLDE2IEBACitWYXJpb3VzIHRlc3RzIGZvciB0aGUgbWFyayBlbGVtZW50LgorCitPbiBzdWNj ZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBi eSAiVEVTVCBDT01QTEVURSIuCisKKworPHA+IGNsb3NlcyA8bWFyaz46CitQQVNTIHBhcmFncmFw aDEucGFyZW50Tm9kZS5ub2RlTmFtZSA9PSAibWFyayIgaXMgZmFsc2UKKzxiPiBkb2VzIG5vdCBj bG9zZSA8bWFyaz46CitQQVNTIGIxLnBhcmVudE5vZGUubm9kZU5hbWUgaXMgIk1BUksiCitSZXNp ZHVhbCBzdHlsZToKK1BBU1MgZ2V0V2VpZ2h0KCJtYXJrMiIpIGlzICJib2xkIgorUEFTUyBnZXRX ZWlnaHQoInNwYW4xIikgaXMgImJvbGQiCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVl CisKK1RFU1QgQ09NUExFVEUKKwpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9odG1sL21hcmstZWxl bWVudC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvaHRtbC9tYXJrLWVsZW1l bnQuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvaHRtbC9tYXJrLWVsZW1l bnQuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwxMyBAQAorPCFET0NUWVBFIEhUTUwgUFVC TElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8aGVhZD4KKzxsaW5rIHJlbD0i c3R5bGVzaGVldCIgaHJlZj0iLi4vLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1zdHlsZS5j c3MiPgorPHNjcmlwdCBzcmM9Ii4uLy4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpz Ij48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPHAgaWQ9ImRlc2NyaXB0aW9uIj48L3A+Cis8 ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKzxzY3JpcHQgc3JjPSJzY3JpcHQtdGVzdHMvbWFyay1l bGVtZW50LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9mYXN0L2pzL3Jlc291cmNl cy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpJbmRleDogTGF5 b3V0VGVzdHMvZmFzdC9odG1sL3NjcmlwdC10ZXN0cy9tYXJrLWVsZW1lbnQuanMKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9odG1sL3NjcmlwdC10ZXN0cy9tYXJrLWVsZW1lbnQuanMJ KHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2h0bWwvc2NyaXB0LXRlc3RzL21hcmst ZWxlbWVudC5qcwkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwyNSBAQAorZGVzY3JpcHRpb24oJ1Zh cmlvdXMgdGVzdHMgZm9yIHRoZSBtYXJrIGVsZW1lbnQuJyk7CisKK3ZhciB0ZXN0UGFyZW50ID0g ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnZGl2Jyk7Citkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxk KHRlc3RQYXJlbnQpOworCitkZWJ1ZygnJmx0O3A+IGNsb3NlcyAmbHQ7bWFyaz46Jyk7Cit0ZXN0 UGFyZW50LmlubmVySFRNTCA9ICc8bWFyaz5UZXN0IHRoYXQgPHAgaWQ9InBhcmFncmFwaDEiPmEg cCBlbGVtZW50PC9wPiBjbG9zZXMgJmx0O21hcms+LjwvcD4nOwordmFyIHBhcmFncmFwaDEgPSBk b2N1bWVudC5nZXRFbGVtZW50QnlJZCgncGFyYWdyYXBoMScpOworc2hvdWxkQmVGYWxzZSgncGFy YWdyYXBoMS5wYXJlbnROb2RlLm5vZGVOYW1lID09ICJtYXJrIicpOworCitkZWJ1ZygnJmx0O2I+ IGRvZXMgbm90IGNsb3NlICZsdDttYXJrPjonKTsKK3Rlc3RQYXJlbnQuaW5uZXJIVE1MID0gJzxt YXJrPlRlc3QgdGhhdCA8YiBpZD0iYjEiPmEgYiBlbGVtZW50PC9iPiBkb2VzIG5vdCBjbG9zZSBh IG1hcmsgZWxlbWVudC48L21hcms+JzsKK3ZhciBiMSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCdiMScpOworc2hvdWxkQmUoJ2IxLnBhcmVudE5vZGUubm9kZU5hbWUnLCAnIk1BUksiJyk7CisK K2RlYnVnKCdSZXNpZHVhbCBzdHlsZTonKTsKK3Rlc3RQYXJlbnQuaW5uZXJIVE1MID0gJzxiPjxt YXJrIGlkPSJtYXJrMiI+VGhpcyB0ZXh0IHNob3VsZCBiZSBib2xkLjwvbWFyaz4gPHNwYW4gaWQ9 InNwYW4xIj5UaGlzIGlzIGFsc28gYm9sZC48L3NwYW4+PC9iPic7CitmdW5jdGlvbiBnZXRXZWln aHQoaWQpIHsKKyAgICByZXR1cm4gZG9jdW1lbnQuZGVmYXVsdFZpZXcuZ2V0Q29tcHV0ZWRTdHls ZShkb2N1bWVudC5nZXRFbGVtZW50QnlJZChpZCksIG51bGwpLmdldFByb3BlcnR5VmFsdWUoJ2Zv bnQtd2VpZ2h0Jyk7Cit9CitzaG91bGRCZSgnZ2V0V2VpZ2h0KCJtYXJrMiIpJywgJyJib2xkIicp Oworc2hvdWxkQmUoJ2dldFdlaWdodCgic3BhbjEiKScsICciYm9sZCInKTsKK2RvY3VtZW50LmJv ZHkucmVtb3ZlQ2hpbGQodGVzdFBhcmVudCk7CisKK3ZhciBzdWNjZXNzZnVsbHlQYXJzZWQgPSB0 cnVlOwo=