58369 2011-04-12 13:30:21 -0700 Add 'muted' content attribute to HTMLMediaElement 2011-09-01 11:13:12 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) All All RESOLVED FIXED HTML5, InRadar P2 Normal --- 1 eric.carlson eric.carlson mike webkit-bug-importer oldest_to_newest 384303 0 eric.carlson 2011-04-12 13:30:21 -0700 http://html5.org/tools/web-apps-tracker?from=5990&to=5991 added a 'muted' content attribute. 460532 1 105981 eric.carlson 2011-09-01 09:49:51 -0700 Created attachment 105981 Proposed patch 460539 2 webkit-bug-importer 2011-09-01 09:58:38 -0700 <rdar://problem/10060343> 460559 3 105981 darin 2011-09-01 10:16:40 -0700 Comment on attachment 105981 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=105981&action=review > Source/WebCore/html/HTMLMediaElement.idl:81 > + attribute boolean defaultMuted; If you wrote this: attribute [Reflect=muted] boolean defaultMuted; Then you would not need to add the HTMLMediaElement::defaultMuted and HTMLMediaElement::setDefaultMuted functions. How about doing it that way? 460560 4 105981 darin 2011-09-01 10:17:21 -0700 Comment on attachment 105981 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=105981&action=review > Source/WebCore/html/HTMLMediaElement.cpp:812 > + if (hasAttribute(mutedAttr)) This can be fastHasAttribute since style attributes and SVG animated attributes are not involved. Faster. 460621 5 eric.carlson 2011-09-01 11:12:17 -0700 (In reply to comment #3) > (From update of attachment 105981 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=105981&action=review > > > Source/WebCore/html/HTMLMediaElement.idl:81 > > + attribute boolean defaultMuted; > > If you wrote this: > > attribute [Reflect=muted] boolean defaultMuted; > > Then you would not need to add the HTMLMediaElement::defaultMuted and HTMLMediaElement::setDefaultMuted functions. How about doing it that way? Good suggestion, thanks! (In reply to comment #4) > (From update of attachment 105981 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=105981&action=review > > > Source/WebCore/html/HTMLMediaElement.cpp:812 > > + if (hasAttribute(mutedAttr)) > > This can be fastHasAttribute since style attributes and SVG animated attributes are not involved. Faster. Another good suggestion, unfortunately I missed it before I submitted. I will fix this in a follow-up patch. 460622 6 eric.carlson 2011-09-01 11:12:40 -0700 https://bugs.webkit.org/show_bug.cgi?id=58369 460623 7 eric.carlson 2011-09-01 11:13:12 -0700 With the correct url this time: http://trac.webkit.org/changeset/94318 105981 2011-09-01 09:49:51 -0700 2011-09-01 10:17:21 -0700 Proposed patch patch_2.txt text/plain 10798 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk0Mjk4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDktMDEgIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkICdtdXRlZCcgY29u dGVudCBhdHRyaWJ1dGUgdG8gSFRNTE1lZGlhRWxlbWVudAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTgzNjkKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBtZWRpYS92aWRlby1kZWZhdWx0bXV0ZWQu aHRtbAorCisgICAgICAgICogaHRtbC9IVE1MQXR0cmlidXRlTmFtZXMuaW46IEFkZCBtdXRlZC4K KworICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpIVE1MTWVkaWFFbGVtZW50Ojpsb2FkUmVzb3VyY2UpOiBEZWFsIHdpdGggdGhlICdtdXRlZCcg YXR0cmlidXRlLgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6ZGVmYXVsdE11 dGVkKTogTmV3LgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6c2V0RGVmYXVs dE11dGVkKTogRGl0dG8uCisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50Lmg6CisgICAg ICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmlkbDogQWRkIGRlZmF1bHRNdXRlZC4KKwogMjAx MS0wOS0wMSAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBXZWIgSW5zcGVjdG9yOiBEZWNvZGUgcXVlcnkvZm9ybSBwYXJhbWV0ZXJzIG5hbWVzIGFzIHdl bGwgYXMgdmFsdWVzLgpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQXR0cmlidXRlTmFt ZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQXR0cmlidXRlTmFt ZXMuaW4JKHJldmlzaW9uIDkzODAyKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQXR0cmli dXRlTmFtZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTE0Niw2ICsxNDYsNyBAQCBtZWRpYQogbWV0 aG9kCiBtaW4KIG11bHRpcGxlCittdXRlZAogbmFtZQogbm9ocmVmCiBub3Jlc2l6ZQpJbmRleDog U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCShyZXZpc2lvbiA5NDE5NikK KysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTgwOCw2ICs4MDgsOSBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmxvYWRSZXNvdXJj ZShjb25zCiAgICAgaWYgKCFhdXRvcGxheSgpKQogICAgICAgICBtX3BsYXllci0+c2V0UHJlbG9h ZChtX3ByZWxvYWQpOwogICAgIG1fcGxheWVyLT5zZXRQcmVzZXJ2ZXNQaXRjaChtX3dlYmtpdFBy ZXNlcnZlc1BpdGNoKTsKKworICAgIGlmIChoYXNBdHRyaWJ1dGUobXV0ZWRBdHRyKSkKKyAgICAg ICAgbV9tdXRlZCA9IHRydWU7CiAgICAgdXBkYXRlVm9sdW1lKCk7CiAKICAgICBpZiAoIW1fcGxh eWVyLT5sb2FkKHVybC5zdHJpbmcoKSwgY29udGVudFR5cGUpKQpAQCAtMTc5Myw2ICsxNzk2LDE3 IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6c2V0TXV0ZWQoYm9vbCBtdXQKICAgICB9CiB9CiAK K2Jvb2wgSFRNTE1lZGlhRWxlbWVudDo6ZGVmYXVsdE11dGVkKCkgY29uc3QKK3sKKyAgICByZXR1 cm4gaGFzQXR0cmlidXRlKG11dGVkQXR0cik7Cit9CisKK3ZvaWQgSFRNTE1lZGlhRWxlbWVudDo6 c2V0RGVmYXVsdE11dGVkKGJvb2wgbXV0ZWQpCit7CisgICAgTE9HKE1lZGlhLCAiSFRNTE1lZGlh RWxlbWVudDo6c2V0RGVmYXVsdE11dGVkKCVzKSIsIGJvb2xTdHJpbmcobXV0ZWQpKTsKKyAgICBz ZXRCb29sZWFuQXR0cmlidXRlKG11dGVkQXR0ciwgbXV0ZWQpOworfQorCiB2b2lkIEhUTUxNZWRp YUVsZW1lbnQ6OnRvZ2dsZVBsYXlTdGF0ZSgpCiB7CiAgICAgTE9HKE1lZGlhLCAiSFRNTE1lZGlh RWxlbWVudDo6dG9nZ2xlUGxheVN0YXRlIC0gY2FuUGxheSgpIGlzICVzIiwgYm9vbFN0cmluZyhj YW5QbGF5KCkpKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCShy ZXZpc2lvbiA5NDE5NikKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5o CSh3b3JraW5nIGNvcHkpCkBAIC0xNTksNiArMTU5LDkgQEAgcHVibGljOgogICAgIHZvaWQgc2V0 Vm9sdW1lKGZsb2F0LCBFeGNlcHRpb25Db2RlJik7CiAgICAgYm9vbCBtdXRlZCgpIGNvbnN0Owog ICAgIHZvaWQgc2V0TXV0ZWQoYm9vbCk7CisgICAgYm9vbCBkZWZhdWx0TXV0ZWQoKSBjb25zdDsK KyAgICB2b2lkIHNldERlZmF1bHRNdXRlZChib29sKTsKKwogICAgIHZvaWQgdG9nZ2xlUGxheVN0 YXRlKCk7CiAgICAgdm9pZCBiZWdpblNjcnViYmluZygpOwogICAgIHZvaWQgZW5kU2NydWJiaW5n KCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaWRsCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5pZGwJKHJldmlz aW9uIDk0MTk0KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmlkbAko d29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDcs IDIwMTAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAy MDA3LCAyMDEwLCAyMDExIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBS ZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9y IHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtNzgsNyArNzgsOCBAQCBtb2R1bGUgaHRtbCB7CiAg ICAgYXR0cmlidXRlIGZsb2F0IHZvbHVtZSAKICAgICAgICAgc2V0dGVyIHJhaXNlcyAoRE9NRXhj ZXB0aW9uKTsKICAgICBhdHRyaWJ1dGUgYm9vbGVhbiBtdXRlZDsKLSAgICAKKyAgICBhdHRyaWJ1 dGUgYm9vbGVhbiBkZWZhdWx0TXV0ZWQ7CisKICAgICAvLyBXZWJLaXQgZXh0ZW5zaW9ucwogICAg IGF0dHJpYnV0ZSBib29sZWFuIHdlYmtpdFByZXNlcnZlc1BpdGNoOwogCkluZGV4OiBMYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZp c2lvbiA5NDI5OCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAt MSwzICsxLDEzIEBACisyMDExLTA5LTAxICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBw bGUuY29tPgorCisgICAgICAgIEFkZCAnbXV0ZWQnIGNvbnRlbnQgYXR0cmlidXRlIHRvIEhUTUxN ZWRpYUVsZW1lbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTU4MzY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBtZWRpYS92aWRlby1kZWZhdWx0bXV0ZWQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAg ICAgKiBtZWRpYS92aWRlby1kZWZhdWx0bXV0ZWQuaHRtbDogQWRkZWQuCisKIDIwMTEtMDktMDEg IFpzb2x0IEZlaMOpciAgPGZlaGVyenNAaW5mLnUtc3plZ2VkLmh1PgogCiAgICAgICAgIFVucmV2 aWV3ZWQgUXQgZ2FyZGVuaW5nLgpJbmRleDogTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tZGVmYXVs dG11dGVkLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9tZWRpYS92aWRl by1kZWZhdWx0bXV0ZWQtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMv bWVkaWEvdmlkZW8tZGVmYXVsdG11dGVkLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAs MCArMSw3MiBAQAorVGVzdCAnbXV0ZWQnIGNvbnRlbnQgYXR0cmlidXRlCisKKworCisqKiogVGVz dCB3aXRoICdtdXRlZCcgY29udGVudCBhdHRyaWJ1dGUKKworUlVOKHZpZGVvID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgndmlkZW8nKSkKK1JVTih2aWRlby5zZXRBdHRyaWJ1dGUoJ2NvbnRyb2xz JywgJ2NvbnRyb2xzJykpCitSVU4odmlkZW8uc2V0QXR0cmlidXRlKCdtdXRlZCcsICdtdXRlZCcp KQorCisqKiogVGVzdCBiZWZvcmUgc2V0dGluZyBzcmMsIElETCBhdHRyaWJ1dGUgc2hvdWxkIGRl ZmF1bHQgdG8gZmFsc2UKK0VYUEVDVEVEICh2aWRlby5tdXRlZCA9PSAnZmFsc2UnKSBPSworRVhQ RUNURUQgKHZpZGVvLmRlZmF1bHRNdXRlZCA9PSAndHJ1ZScpIE9LCisKK0VWRU5UKGxvYWRlZG1l dGFkYXRhKQorCisqKiogQWZ0ZXIgc2V0dGluZyB1cmwsIGNvbnRlbnQgYXR0cmlidXRlIHNob3Vs ZCBoYXZlIHNldCBJREwgYXR0cmlidXRlCitFWFBFQ1RFRCAodmlkZW8ubXV0ZWQgPT0gJ3RydWUn KSBPSworRVhQRUNURUQgKHZpZGVvLmRlZmF1bHRNdXRlZCA9PSAndHJ1ZScpIE9LCisKKyoqKiBD aGFuZ2UgJ2RlZmF1bHRNdXRlZCcsIElETCBhdHRyaWJ1dGUgc2hvdWxkIG5vdCBjaGFuZ2UgYnV0 IGNvbnRlbnQgYXR0cmlidXRlIHNob3VsZC4KK1JVTih2aWRlby5kZWZhdWx0TXV0ZWQgPSBmYWxz ZSkKK0VYUEVDVEVEICh2aWRlby5tdXRlZCA9PSAndHJ1ZScpIE9LCitFWFBFQ1RFRCAodmlkZW8u ZGVmYXVsdE11dGVkID09ICdmYWxzZScpIE9LCitFWFBFQ1RFRCAodmlkZW8uaGFzQXR0cmlidXRl KCdtdXRlZCcpID09ICdmYWxzZScpIE9LCisKKyoqKiBDaGFuZ2UgJ211dGVkJyBJREwgYXR0cmli dXRlLCBjb250ZW50IGF0dHJpYnV0ZSBzaG91bGQgbm90IGNoYW5nZQorUlVOKHZpZGVvLm11dGVk ID0gZmFsc2UpCitFWFBFQ1RFRCAodmlkZW8ubXV0ZWQgPT0gJ2ZhbHNlJykgT0sKK0VYUEVDVEVE ICh2aWRlby5kZWZhdWx0TXV0ZWQgPT0gJ2ZhbHNlJykgT0sKK0VYUEVDVEVEICh2aWRlby5oYXNB dHRyaWJ1dGUoJ211dGVkJykgPT0gJ2ZhbHNlJykgT0sKKworKioqIFJlbW92ZSAnbXV0ZWQnIGNv bnRlbnQgYXR0cmlidXRlLCBpdCBzaG91bGQgaGF2ZSBubyBlZmZlY3Qgb24gSURMIGF0dHJpYnV0 ZQorUlVOKHZpZGVvLnJlbW92ZUF0dHJpYnV0ZSgnbXV0ZWQnKSkKK0VYUEVDVEVEICh2aWRlby5t dXRlZCA9PSAnZmFsc2UnKSBPSworRVhQRUNURUQgKHZpZGVvLmRlZmF1bHRNdXRlZCA9PSAnZmFs c2UnKSBPSworCisKKyoqKiBUZXN0IHdpdGhvdXQgJ211dGVkJyBjb250ZW50IGF0dHJpYnV0ZQor CitSVU4odmlkZW8gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCd2aWRlbycpKQorUlVOKHZpZGVv LnNldEF0dHJpYnV0ZSgnY29udHJvbHMnLCAnY29udHJvbHMnKSkKKworKioqIFRlc3QgYmVmb3Jl IHNldHRpbmcgc3JjLCBJREwgYXR0cmlidXRlIHNob3VsZCBkZWZhdWx0IHRvIGZhbHNlCitFWFBF Q1RFRCAodmlkZW8ubXV0ZWQgPT0gJ2ZhbHNlJykgT0sKK0VYUEVDVEVEICh2aWRlby5kZWZhdWx0 TXV0ZWQgPT0gJ2ZhbHNlJykgT0sKKworRVZFTlQobG9hZGVkbWV0YWRhdGEpCisKKyoqKiBBZnRl ciBzZXR0aW5nIHVybCwgY29udGVudCBhdHRyaWJ1dGUgc2hvdWxkIGhhdmUgc2V0IElETCBhdHRy aWJ1dGUKK0VYUEVDVEVEICh2aWRlby5tdXRlZCA9PSAnZmFsc2UnKSBPSworRVhQRUNURUQgKHZp ZGVvLmRlZmF1bHRNdXRlZCA9PSAnZmFsc2UnKSBPSworCisqKiogQ2hhbmdlICdkZWZhdWx0TXV0 ZWQnLCBJREwgYXR0cmlidXRlIHNob3VsZCBub3QgY2hhbmdlIGJ1dCBjb250ZW50IGF0dHJpYnV0 ZSBzaG91bGQuCitSVU4odmlkZW8uZGVmYXVsdE11dGVkID0gdHJ1ZSkKK0VYUEVDVEVEICh2aWRl by5tdXRlZCA9PSAnZmFsc2UnKSBPSworRVhQRUNURUQgKHZpZGVvLmRlZmF1bHRNdXRlZCA9PSAn dHJ1ZScpIE9LCitFWFBFQ1RFRCAodmlkZW8uaGFzQXR0cmlidXRlKCdtdXRlZCcpID09ICd0cnVl JykgT0sKKworKioqIENoYW5nZSAnbXV0ZWQnIElETCBhdHRyaWJ1dGUsIGNvbnRlbnQgYXR0cmli dXRlIHNob3VsZCBub3QgY2hhbmdlCitSVU4odmlkZW8ubXV0ZWQgPSBmYWxzZSkKK0VYUEVDVEVE ICh2aWRlby5tdXRlZCA9PSAnZmFsc2UnKSBPSworRVhQRUNURUQgKHZpZGVvLmRlZmF1bHRNdXRl ZCA9PSAndHJ1ZScpIE9LCitFWFBFQ1RFRCAodmlkZW8uaGFzQXR0cmlidXRlKCdtdXRlZCcpID09 ICd0cnVlJykgT0sKKworKioqIEFkZCAnbXV0ZWQnIGNvbnRlbnQgYXR0cmlidXRlLCBpdCBzaG91 bGQgaGF2ZSBubyBlZmZlY3Qgb24gSURMIGF0dHJpYnV0ZQorUlVOKHZpZGVvLnNldEF0dHJpYnV0 ZSgnbXV0ZWQnLCAnbXV0ZWQnKSkKK0VYUEVDVEVEICh2aWRlby5tdXRlZCA9PSAnZmFsc2UnKSBP SworRVhQRUNURUQgKHZpZGVvLmRlZmF1bHRNdXRlZCA9PSAndHJ1ZScpIE9LCisKK0VORCBPRiBU RVNUCisKSW5kZXg6IExheW91dFRlc3RzL21lZGlhL3ZpZGVvLWRlZmF1bHRtdXRlZC5odG1sCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIExheW91dFRlc3RzL21lZGlhL3ZpZGVvLWRlZmF1bHRtdXRlZC5odG1sCShy ZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tZGVmYXVsdG11dGVkLmh0bWwJ KHJldmlzaW9uIDApCkBAIC0wLDAgKzEsOTAgQEAKKzwhZG9jdHlwZSBodG1sPgorPGh0bWw+Cisg ICAgPGhlYWQ+CisgICAgICAgIDxzY3JpcHQgc3JjPXZpZGVvLXRlc3QuanM+PC9zY3JpcHQ+Cisg ICAgICAgIDxzY3JpcHQgc3JjPW1lZGlhLWZpbGUuanM+PC9zY3JpcHQ+CisgICAgICAgIDxzY3Jp cHQ+CisgICAgICAgICAgICB2YXIgaW5kZXggPSAwOworCisgICAgICAgICAgICBmdW5jdGlvbiB0 ZXN0TXV0ZWQoZXhwZWN0ZWRNdXRlZCwgZXhwZWN0ZWREZWZhdWx0TXV0ZWQpCisgICAgICAgICAg ICB7CisgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby5tdXRlZCIsIGV4cGVjdGVk TXV0ZWQpOworICAgICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgidmlkZW8uZGVmYXVsdE11dGVk IiwgZXhwZWN0ZWREZWZhdWx0TXV0ZWQpOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBm dW5jdGlvbiB0ZXN0KGRlZmF1bHRNdXRlZCkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAg ICBjb25zb2xlV3JpdGUoIjxicj48YnI+PGI+KioqIFRlc3QgPGVtPiIgKyAoZGVmYXVsdE11dGVk ID8gIndpdGgiIDogIndpdGhvdXQiKSArICI8L2VtPiAnbXV0ZWQnIGNvbnRlbnQgYXR0cmlidXRl PC9iPjxicj4iKTsKKworICAgICAgICAgICAgICAgIHJ1bigidmlkZW8gPSBkb2N1bWVudC5jcmVh dGVFbGVtZW50KCd2aWRlbycpIik7CisgICAgICAgICAgICAgICAgcnVuKCJ2aWRlby5zZXRBdHRy aWJ1dGUoJ2NvbnRyb2xzJywgJ2NvbnRyb2xzJykiKTsKKyAgICAgICAgICAgICAgICB2aWRlby5z ZXRBdHRyaWJ1dGUoJ3dpZHRoJywgJzMwMCcpOworICAgICAgICAgICAgICAgIGlmIChkZWZhdWx0 TXV0ZWQpCisgICAgICAgICAgICAgICAgICAgIHJ1bigidmlkZW8uc2V0QXR0cmlidXRlKCdtdXRl ZCcsICdtdXRlZCcpIik7CisgICAgICAgICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo J3BhcmVudCcpLmFwcGVuZENoaWxkKHZpZGVvKTsKKworICAgICAgICAgICAgICAgIGNvbnNvbGVX cml0ZSgiPGJyPioqKiBUZXN0IGJlZm9yZSBzZXR0aW5nIHNyYywgSURMIGF0dHJpYnV0ZSBzaG91 bGQgZGVmYXVsdCB0byBmYWxzZSIpOworICAgICAgICAgICAgICAgIHRlc3RNdXRlZChmYWxzZSwg ZGVmYXVsdE11dGVkKTsKKworICAgICAgICAgICAgICAgIHZhciBsb2FkZWRtZXRhZGF0YSA9IGZ1 bmN0aW9uKGV2dCkKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIGNvbnNv bGVXcml0ZSgiPGJyPkVWRU5UKCIgKyBldnQudHlwZSArICIpIik7CisKKyAgICAgICAgICAgICAg ICAgICAgY29uc29sZVdyaXRlKCI8YnI+KioqIEFmdGVyIHNldHRpbmcgdXJsLCBjb250ZW50IGF0 dHJpYnV0ZSBzaG91bGQgaGF2ZSBzZXQgSURMIGF0dHJpYnV0ZSIpOworICAgICAgICAgICAgICAg ICAgICB0ZXN0TXV0ZWQoZGVmYXVsdE11dGVkLCBkZWZhdWx0TXV0ZWQpOworCisgICAgICAgICAg ICAgICAgICAgIGNvbnNvbGVXcml0ZSgiPGJyPioqKiBDaGFuZ2UgJ2RlZmF1bHRNdXRlZCcsIElE TCBhdHRyaWJ1dGUgc2hvdWxkIG5vdCBjaGFuZ2UgYnV0IGNvbnRlbnQgYXR0cmlidXRlIHNob3Vs ZC4iKTsKKyAgICAgICAgICAgICAgICAgICAgdmFyIG5ld0RlZmF1bHRNdXRlZCA9ICFkZWZhdWx0 TXV0ZWQ7CisgICAgICAgICAgICAgICAgICAgIHJ1bigidmlkZW8uZGVmYXVsdE11dGVkID0gIiAr IG5ld0RlZmF1bHRNdXRlZCk7CisgICAgICAgICAgICAgICAgICAgIHRlc3RNdXRlZChkZWZhdWx0 TXV0ZWQsIG5ld0RlZmF1bHRNdXRlZCk7CisgICAgICAgICAgICAgICAgICAgIHRlc3RFeHBlY3Rl ZCgidmlkZW8uaGFzQXR0cmlidXRlKCdtdXRlZCcpIiwgbmV3RGVmYXVsdE11dGVkKTsKKyAgICAK KyAgICAgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCI8YnI+KioqIENoYW5nZSAnbXV0ZWQn IElETCBhdHRyaWJ1dGUsIGNvbnRlbnQgYXR0cmlidXRlIHNob3VsZCBub3QgY2hhbmdlIik7Cisg ICAgICAgICAgICAgICAgICAgIHJ1bigidmlkZW8ubXV0ZWQgPSBmYWxzZSIpOworICAgICAgICAg ICAgICAgICAgICB0ZXN0TXV0ZWQoZmFsc2UsIG5ld0RlZmF1bHRNdXRlZCk7CisgICAgICAgICAg ICAgICAgICAgIHRlc3RFeHBlY3RlZCgidmlkZW8uaGFzQXR0cmlidXRlKCdtdXRlZCcpIiwgbmV3 RGVmYXVsdE11dGVkKTsKKworICAgICAgICAgICAgICAgICAgICB2YXIgYWN0aW9uID0gZGVmYXVs dE11dGVkID8gIlJlbW92ZSIgOiAiQWRkIjsKKyAgICAgICAgICAgICAgICAgICAgY29uc29sZVdy aXRlKCI8YnI+KioqICIgKyBhY3Rpb24gKyAiICdtdXRlZCcgY29udGVudCBhdHRyaWJ1dGUsIGl0 IHNob3VsZCBoYXZlIG5vIGVmZmVjdCBvbiBJREwgYXR0cmlidXRlIik7CisgICAgICAgICAgICAg ICAgICAgIGlmIChkZWZhdWx0TXV0ZWQpCisgICAgICAgICAgICAgICAgICAgICAgICBydW4oInZp ZGVvLnJlbW92ZUF0dHJpYnV0ZSgnbXV0ZWQnKSIpOworICAgICAgICAgICAgICAgICAgICBlbHNl CisgICAgICAgICAgICAgICAgICAgICAgICBydW4oInZpZGVvLnNldEF0dHJpYnV0ZSgnbXV0ZWQn LCAnbXV0ZWQnKSIpOworICAgICAgICAgICAgICAgICAgICB0ZXN0TXV0ZWQoZmFsc2UsIHZpZGVv Lmhhc0F0dHJpYnV0ZSgnbXV0ZWQnKSk7CisKKyAgICAgICAgICAgICAgICAgICAgcnVuTmV4dFRl c3QoKTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgdmlkZW8uYWRkRXZlbnRM aXN0ZW5lcignbG9hZGVkbWV0YWRhdGEnLCBsb2FkZWRtZXRhZGF0YSk7CisgICAgICAgICAgICAg ICAgdmlkZW8uc3JjID0gZmluZE1lZGlhRmlsZSgiYXVkaW8iLCAiY29udGVudC90ZXN0Iik7Cisg ICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGZ1bmN0aW9uIHJ1bk5leHRUZXN0KCkKKyAgICAg ICAgICAgIHsKKyAgICAgICAgICAgICAgICBpZiAodmlkZW8pIHsKKyAgICAgICAgICAgICAgICAg ICAgdmlkZW8ucGFyZW50Tm9kZS5yZW1vdmVDaGlsZCh2aWRlbyk7CisgICAgICAgICAgICAgICAg ICAgIHZpZGVvID0gbnVsbDsKKyAgICAgICAgICAgICAgICB9CisKKyAgICAgICAgICAgICAgICBz d2l0Y2ggKCsraW5kZXgpCisgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGNhc2Ug MToKKyAgICAgICAgICAgICAgICAgICAgdGVzdCh0cnVlKTsKKyAgICAgICAgICAgICAgICAgICAg YnJlYWs7CisgICAgICAgICAgICAgICAgY2FzZSAyOgorICAgICAgICAgICAgICAgICAgICB0ZXN0 KGZhbHNlKTsKKyAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgY2Fz ZSAzOgorICAgICAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOworICAgICAgICAgICAg ICAgICAgICBlbmRUZXN0KCk7CisgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAg ICAgICAgIH0KKyAgICAgICAgICAgIH0KKworICAgICAgICA8L3NjcmlwdD4KKyAgICA8L2hlYWQ+ CisKKyAgICA8Ym9keSBvbmxvYWQ9InJ1bk5leHRUZXN0KCkiPgorICAgICAgICA8ZGl2IGlkPSJw YXJlbnQiPjwvZGl2PgorICAgICAgICA8cD5UZXN0ICdtdXRlZCcgY29udGVudCBhdHRyaWJ1dGU8 cD4KKyAgICA8L2JvZHk+Cis8L2h0bWw+Cg==