40420 2010-06-10 05:32:46 -0700 Web Inspector: Prevent from copying "filename.css" in Styles pane 2010-06-19 09:47:53 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED http://screenr.com/YMK P2 Normal --- 0 me webkit-unassigned bweinstein commit-queue eric joepeck keishi pfeldman pmuellr rik timothy yurys oldest_to_newest 236316 0 me 2010-06-10 05:32:46 -0700 Screencast: http://screenr.com/YMK 236323 1 pfeldman 2010-06-10 05:53:39 -0700 We should render location using pseudo elements (::after or ::before). Pseudo elements do not get into the clipboard. 236335 2 me 2010-06-10 06:34:50 -0700 (In reply to comment #1) How can we change a content of pseudo elements via JavaScript? 236338 3 pfeldman 2010-06-10 06:44:15 -0700 (In reply to comment #2) > (In reply to comment #1) > How can we change a content of pseudo elements via JavaScript? .foo::after { content: attr(attrBar); } <div class="foo" attrBar="Text"></div> 236420 4 58382 me 2010-06-10 10:25:00 -0700 Created attachment 58382 Uncopyable subtitle 236800 5 58382 pfeldman 2010-06-11 06:03:15 -0700 Comment on attachment 58382 Uncopyable subtitle Couple of nits. WebCore/inspector/front-end/Section.js:86 + if (x instanceof Node) { I don't think we should extend section's api to accept both text and Nodes as subtitles. subtitle setter is a convenience method for setting text. Should client need greater extensibility, he is free to access subtitleElement explicitly. WebCore/inspector/front-end/StylesSidebarPane.js:654 + var link = WebInspector.linkifyResourceAsNode(url, "resources", this.rule.sourceLine + 1); So I would leave this code as is with appending child here as it used to be. WebCore/inspector/front-end/inspector.css:4041 + .styles-section .header [data-uncopyable]::before { You should just apply this to ".styles-section .subtitle". 236868 6 me 2010-06-11 09:29:04 -0700 (In reply to comment #5) > WebCore/inspector/front-end/Section.js:86 > + if (x instanceof Node) { > I don't think we should extend section's api to accept both text and Nodes as subtitles. subtitle setter is a convenience method for setting text. Should client need greater extensibility, he is free to access subtitleElement explicitly. I borrowed it from the title setter; tried to be consistent. > WebCore/inspector/front-end/inspector.css:4041 > + .styles-section .header [data-uncopyable]::before { > You should just apply this to ".styles-section .subtitle". And ".styles-section .subtitle a" in case of a link to CSS file. 236882 7 58482 me 2010-06-11 10:04:51 -0700 Created attachment 58482 Uncopyable subtitle 237892 8 me 2010-06-14 10:24:06 -0700 > Pavel Feldman has canceled Nikita Vasilyev's request for review: > Bug 40420: Web Inspector: Prevent from copying "filename.css" in Styles pane > https://bugs.webkit.org/show_bug.cgi?id=40420 > > Attachment 58482: Uncopyable subtitle > https://bugs.webkit.org/attachment.cgi?id=58482&action=review What's the reason? 237961 9 58482 pfeldman 2010-06-14 11:54:54 -0700 Comment on attachment 58482 Uncopyable subtitle Sorry, something went wrong with posting review comments. WebCore/inspector/front-end/inspector.css:4041 + .styles-section .header .subtitle::before, .styles-section .header .subtitle a::before { No need for .header here. Also, could we try to get rid of the pseudo element for <a>? Is it here for the link handler + formatting to work? Rest looks good! 237997 10 58690 me 2010-06-14 12:59:40 -0700 Created attachment 58690 Uncopyable subtitle (.header removed) > Also, could we try to get rid of the pseudo element for <a>? Is it here for the link handler + formatting to work? No, we can't. ".styles-section .subtitle a" simply doesn't work without "::before". To be exact, it doesn't show links at all. 239265 11 58690 commit-queue 2010-06-17 00:16:49 -0700 Comment on attachment 58690 Uncopyable subtitle (.header removed) Rejecting patch 58690 from commit-queue. Failed to run "['WebKitTools/Scripts/run-webkit-tests', '--no-launch-safari', '--exit-after-n-failures=1', '--ignore-tests', 'compositing', '--quiet']" exit_code: 1 Last 500 characters of output: e Compiling Java tests make: Nothing to be done for `default'. Running tests from /Users/eseidel/Projects/CommitQueue/LayoutTests Skipped list contained 'compositing/iframes/composited-iframe.html', but no file of that name could be found Testing 19115 test cases. inspector/elements-panel-styles.html -> failed Exiting early after 1 failures. 15406 tests run. 278.02s total testing time 15405 test cases (99%) succeeded 1 test case (<1%) had incorrect layout 14 test cases (<1%) had stderr output Full output: http://webkit-commit-queue.appspot.com/results/3273251 239443 12 me 2010-06-17 10:02:25 -0700 (In reply to comment #11) I wish I could fix this test, but I can't even run it. My full output from run-webkit-tests: http://gist.github.com/442392. I asked question about it on webkit-help@lists.webkit.org, but no reply so far. 239451 13 58690 pfeldman 2010-06-17 10:20:01 -0700 Comment on attachment 58690 Uncopyable subtitle (.header removed) Let us try it once more. 239582 14 eric 2010-06-17 14:30:53 -0700 (In reply to comment #12) > (In reply to comment #11) > > I wish I could fix this test, but I can't even run it. My full output from run-webkit-tests: http://gist.github.com/442392. I asked question about it on webkit-help@lists.webkit.org, but no reply so far. Looks like you haven't built webkit. "build-webkit --release" will build a copy of webkit. You need a copy of webkit in order for run-webkit-tests to work. :) http://webkit.org/building/build.html 239618 15 58690 commit-queue 2010-06-17 16:13:10 -0700 Comment on attachment 58690 Uncopyable subtitle (.header removed) Rejecting patch 58690 from commit-queue. Failed to run "['WebKitTools/Scripts/run-webkit-tests', '--no-launch-safari', '--exit-after-n-failures=1', '--ignore-tests', 'compositing', '--quiet']" exit_code: 1 Last 500 characters of output: e Compiling Java tests make: Nothing to be done for `default'. Running tests from /Users/eseidel/Projects/CommitQueue/LayoutTests Skipped list contained 'compositing/iframes/composited-iframe.html', but no file of that name could be found Testing 19117 test cases. inspector/elements-panel-styles.html -> failed Exiting early after 1 failures. 15407 tests run. 246.27s total testing time 15406 test cases (99%) succeeded 1 test case (<1%) had incorrect layout 14 test cases (<1%) had stderr output Full output: http://webkit-commit-queue.appspot.com/results/3286303 239767 16 pfeldman 2010-06-17 22:57:51 -0700 > Skipped list contained 'compositing/iframes/composited-iframe.html', but no file of that name could be found > Testing 19117 test cases. > inspector/elements-panel-styles.html -> failed Oh, sorry, I overlooked this one - was confused with the composited iframe and forgot I added this beautiful styles sidebar test earlier. Nikita, are you planning to fix it or should I use your patch locally to fix / rebaseline the test? Here is what you do: WebKitTools/Scripts/build-webkit --debug WebKitTools/Scripts/run-webkit-tests --debug LayoutTests/inspector/elements-panel-styles.html The reason for failure is in LayoutTests/inspector/elements-tests.js:72: " (" + section.subtitleElement.textContent + ")" Test expects to see the location in the .textContent of the subtitle element. See the expected golden output in LayoutTests/inspector/elements-panel-styles-expected.txt (locations in brackets to the first of records). For fixing this, you would need to get the text from your new not-copyable attributes. You could introduce Section.prototype.subtitleAsText in Section.js and use it in test instead of subtitleElement.textContent for convenience. 239832 17 me 2010-06-18 02:46:21 -0700 Finally, I run the test. Thanks to Eric and Pavel. (In reply to comment #16) > > Skipped list contained 'compositing/iframes/composited-iframe.html', but no file of that name could be found > > Testing 19117 test cases. > > inspector/elements-panel-styles.html -> failed > > Oh, sorry, I overlooked this one - was confused with the composited iframe and forgot I added this beautiful styles sidebar test earlier. > > Nikita, are you planning to fix it or should I use your patch locally to fix / rebaseline the test? You do it. I added method subtitleAsText getter next to the subtitle getter. Turns out, it's not accessible within a test, section.subtitleAsText is undefined for some reason. Then I noticed section.subtitle getter undefined too. So, I don't know what's going on, but I'm pretty sure you do. 239871 18 pfeldman 2010-06-18 05:19:08 -0700 > You do it. I added method subtitleAsText getter next to the subtitle getter. Turns out, it's not accessible within a test, section.subtitleAsText is undefined for some reason. Then I noticed section.subtitle getter undefined too. So, I don't know what's going on, but I'm pretty sure you do. Hm. I think your changes to the front-end did not get deployed once you fixed the js files. Make sure they are in WebKitBuiold/Debug/WebCore.framework/Resources/inspector. 239897 19 59104 me 2010-06-18 06:32:54 -0700 Created attachment 59104 Uncopyable subtitle (test fixed) (In reply to comment #18) > Hm. I think your changes to the front-end did not get deployed once you fixed the js files. Exactly! 240357 20 59104 commit-queue 2010-06-19 09:47:47 -0700 Comment on attachment 59104 Uncopyable subtitle (test fixed) Clearing flags on attachment: 59104 Committed r61494: <http://trac.webkit.org/changeset/61494> 240358 21 commit-queue 2010-06-19 09:47:53 -0700 All reviewed patches have been landed. Closing bug. 58382 2010-06-10 10:25:00 -0700 2010-06-11 10:04:51 -0700 Uncopyable subtitle uncopyable.patch text/plain 3326 me ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg Yzk0ZmVlOS4uY2YxMTYxZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wNi0xMCAgTmlraXRhIFZhc2ls eWV2ICA8bWVAZWx2MXMucnU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUHJldmVudCBmcm9tIGNvcHlpbmcgImZpbGVuYW1l LmNzcyIgaW4gU3R5bGVzIHBhbmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTQwNDIwCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NlY3Rp b24uanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2VjdGlvbi5wcm90b3R5cGUuc2V0IHN1YnRp dGxlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24pOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzczoKKyAgICAgICAgKC5zdHlsZXMt c2VjdGlvbiAuaGVhZGVyIFtkYXRhLXVuY29weWFibGVdOjpiZWZvcmUpOgorCiAyMDEwLTA2LTA5 ICBBbmRyZWkgUG9wZXNjdSAgPGFuZHJlaXBAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NlY3Rpb24uanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2VjdGlvbi5qcwppbmRl eCA3NzEwMTkyLi5kNTdhMjE0IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2VjdGlvbi5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2VjdGlvbi5q cwpAQCAtODIsNyArODIsMTIgQEAgV2ViSW5zcGVjdG9yLlNlY3Rpb24ucHJvdG90eXBlID0gewog ICAgICAgICBpZiAodGhpcy5fc3VidGl0bGUgPT09IHgpCiAgICAgICAgICAgICByZXR1cm47CiAg ICAgICAgIHRoaXMuX3N1YnRpdGxlID0geDsKLSAgICAgICAgdGhpcy5zdWJ0aXRsZUVsZW1lbnQu aW5uZXJIVE1MID0geDsKKworICAgICAgICBpZiAoeCBpbnN0YW5jZW9mIE5vZGUpIHsKKyAgICAg ICAgICAgIHRoaXMuc3VidGl0bGVFbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7CisgICAgICAgICAg ICB0aGlzLnN1YnRpdGxlRWxlbWVudC5hcHBlbmRDaGlsZCh4KTsKKyAgICAgICAgfSBlbHNlCisg ICAgICAgICAgICB0aGlzLnN1YnRpdGxlRWxlbWVudC5zZXRBdHRyaWJ1dGUoImRhdGEtdW5jb3B5 YWJsZSIsIHgpOwogICAgIH0sCiAKICAgICBnZXQgZXhwYW5kZWQoKQpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzIGIvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzCmluZGV4IDAxMTYyM2YuLmVh ZWFmNGQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRl YmFyUGFuZS5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJh clBhbmUuanMKQEAgLTY1MSw3ICs2NTEsMTAgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGll c1NlY3Rpb24gPSBmdW5jdGlvbihzdHlsZVJ1bGUsIHN1YnRpdGxlLCBjb21wdXRlZFN0eWwKICAg ICAgICAgaWYgKCFzdWJ0aXRsZSkgewogICAgICAgICAgICAgaWYgKHRoaXMuc3R5bGVSdWxlLnBh cmVudFN0eWxlU2hlZXQgJiYgdGhpcy5zdHlsZVJ1bGUucGFyZW50U3R5bGVTaGVldC5ocmVmKSB7 CiAgICAgICAgICAgICAgICAgdmFyIHVybCA9IHRoaXMuc3R5bGVSdWxlLnBhcmVudFN0eWxlU2hl ZXQuaHJlZjsKLSAgICAgICAgICAgICAgICB0aGlzLnN1YnRpdGxlRWxlbWVudC5hcHBlbmRDaGls ZChXZWJJbnNwZWN0b3IubGlua2lmeVJlc291cmNlQXNOb2RlKHVybCwgInJlc291cmNlcyIsIHRo aXMucnVsZS5zb3VyY2VMaW5lICsgMSkpOworICAgICAgICAgICAgICAgIHZhciBsaW5rID0gV2Vi SW5zcGVjdG9yLmxpbmtpZnlSZXNvdXJjZUFzTm9kZSh1cmwsICJyZXNvdXJjZXMiLCB0aGlzLnJ1 bGUuc291cmNlTGluZSArIDEpOworICAgICAgICAgICAgICAgIGxpbmsuc2V0QXR0cmlidXRlKCJk YXRhLXVuY29weWFibGUiLCBsaW5rLnRleHRDb250ZW50KTsKKyAgICAgICAgICAgICAgICBsaW5r LnRleHRDb250ZW50ID0gIiI7CisgICAgICAgICAgICAgICAgc3VidGl0bGUgPSBsaW5rOwogICAg ICAgICAgICAgfSBlbHNlIGlmIChpc1VzZXJBZ2VudCkKICAgICAgICAgICAgICAgICBzdWJ0aXRs ZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygidXNlciBhZ2VudCBzdHlsZXNoZWV0Iik7CiAgICAg ICAgICAgICBlbHNlIGlmIChpc1VzZXIpCkBAIC02NjgsOCArNjcxLDggQEAgV2ViSW5zcGVjdG9y LlN0eWxlUHJvcGVydGllc1NlY3Rpb24gPSBmdW5jdGlvbihzdHlsZVJ1bGUsIHN1YnRpdGxlLCBj b21wdXRlZFN0eWwKICAgICB9CiAKICAgICB0aGlzLmlkZW50aWZpZXIgPSBzdHlsZVJ1bGUuc2Vs ZWN0b3JUZXh0OwotICAgIGlmICh0aGlzLnN1YnRpdGxlKQotICAgICAgICB0aGlzLmlkZW50aWZp ZXIgKz0gIjoiICsgdGhpcy5zdWJ0aXRsZUVsZW1lbnQudGV4dENvbnRlbnQ7CisgICAgaWYgKHR5 cGVvZiB0aGlzLnN1YnRpdGxlID09PSAic3RyaW5nIikKKyAgICAgICAgdGhpcy5pZGVudGlmaWVy ICs9ICI6IiArIHRoaXMuc3VidGl0bGU7CiB9CiAKIFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRp ZXNTZWN0aW9uLnByb3RvdHlwZSA9IHsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9pbnNwZWN0b3IuY3NzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3Bl Y3Rvci5jc3MKaW5kZXggNjM1ZjZiNy4uNWU0M2FlYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL2luc3BlY3Rvci5jc3MKQEAgLTQwMzgsNiArNDAzOCwxMCBAQCBhLndvcmtlci1pdGVt IHsKICAgICBjb2xvcjogaW5oZXJpdDsKIH0KIAorLnN0eWxlcy1zZWN0aW9uIC5oZWFkZXIgW2Rh dGEtdW5jb3B5YWJsZV06OmJlZm9yZSB7CisgICAgY29udGVudDogYXR0cihkYXRhLXVuY29weWFi bGUpOworfQorCiAuc3R5bGVzLXNlY3Rpb24gLnByb3BlcnRpZXMgewogICAgIGRpc3BsYXk6IG5v bmU7CiAgICAgbWFyZ2luOiAwOwo= 58482 2010-06-11 10:04:51 -0700 2010-06-14 12:59:40 -0700 Uncopyable subtitle uncopyable.patch text/plain 3213 me ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg Yzk0ZmVlOS4uZDAzNTY3MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wNi0xMSAgTmlraXRhIFZhc2ls eWV2ICA8bWVAZWx2MXMucnU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUHJldmVudCBmcm9tIGNvcHlpbmcgImZpbGVuYW1l LmNzcyIgaW4gU3R5bGVzIHBhbmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTQwNDIwCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NlY3Rp b24uanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2VjdGlvbi5wcm90b3R5cGUuc2V0IHN1YnRp dGxlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24pOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzczoKKyAgICAgICAgKC5zdHlsZXMt c2VjdGlvbiAuaGVhZGVyIC5zdWJ0aXRsZTo6YmVmb3JlLCAuc3R5bGVzLXNlY3Rpb24gLmhlYWRl ciAuc3VidGl0bGUgYTo6YmVmb3JlKToKKwogMjAxMC0wNi0wOSAgQW5kcmVpIFBvcGVzY3UgIDxh bmRyZWlwQGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlm ZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZWN0aW9uLmpzIGIvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NlY3Rpb24uanMKaW5kZXggNzcxMDE5Mi4uZmQ0MmU2ZSAx MDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NlY3Rpb24uanMKKysrIGIv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NlY3Rpb24uanMKQEAgLTgyLDcgKzgyLDcgQEAg V2ViSW5zcGVjdG9yLlNlY3Rpb24ucHJvdG90eXBlID0gewogICAgICAgICBpZiAodGhpcy5fc3Vi dGl0bGUgPT09IHgpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIHRoaXMuX3N1YnRpdGxl ID0geDsKLSAgICAgICAgdGhpcy5zdWJ0aXRsZUVsZW1lbnQuaW5uZXJIVE1MID0geDsKKyAgICAg ICAgdGhpcy5zdWJ0aXRsZUVsZW1lbnQuc2V0QXR0cmlidXRlKCJkYXRhLXVuY29weWFibGUiLCB4 KTsKICAgICB9LAogCiAgICAgZ2V0IGV4cGFuZGVkKCkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcwppbmRleCAwMTE2MjNmLi5jZDk3YzFlIDEw MDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUu anMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpz CkBAIC02NTEsNyArNjUxLDEwIEBAIFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9u ID0gZnVuY3Rpb24oc3R5bGVSdWxlLCBzdWJ0aXRsZSwgY29tcHV0ZWRTdHlsCiAgICAgICAgIGlm ICghc3VidGl0bGUpIHsKICAgICAgICAgICAgIGlmICh0aGlzLnN0eWxlUnVsZS5wYXJlbnRTdHls ZVNoZWV0ICYmIHRoaXMuc3R5bGVSdWxlLnBhcmVudFN0eWxlU2hlZXQuaHJlZikgewogICAgICAg ICAgICAgICAgIHZhciB1cmwgPSB0aGlzLnN0eWxlUnVsZS5wYXJlbnRTdHlsZVNoZWV0LmhyZWY7 Ci0gICAgICAgICAgICAgICAgdGhpcy5zdWJ0aXRsZUVsZW1lbnQuYXBwZW5kQ2hpbGQoV2ViSW5z cGVjdG9yLmxpbmtpZnlSZXNvdXJjZUFzTm9kZSh1cmwsICJyZXNvdXJjZXMiLCB0aGlzLnJ1bGUu c291cmNlTGluZSArIDEpKTsKKyAgICAgICAgICAgICAgICB2YXIgbGluayA9IFdlYkluc3BlY3Rv ci5saW5raWZ5UmVzb3VyY2VBc05vZGUodXJsLCAicmVzb3VyY2VzIiwgdGhpcy5ydWxlLnNvdXJj ZUxpbmUgKyAxKTsKKyAgICAgICAgICAgICAgICBsaW5rLnNldEF0dHJpYnV0ZSgiZGF0YS11bmNv cHlhYmxlIiwgbGluay50ZXh0Q29udGVudCk7CisgICAgICAgICAgICAgICAgbGluay50ZXh0Q29u dGVudCA9ICIiOworICAgICAgICAgICAgICAgIHRoaXMuc3VidGl0bGVFbGVtZW50LmFwcGVuZENo aWxkKGxpbmspOwogICAgICAgICAgICAgfSBlbHNlIGlmIChpc1VzZXJBZ2VudCkKICAgICAgICAg ICAgICAgICBzdWJ0aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygidXNlciBhZ2VudCBzdHls ZXNoZWV0Iik7CiAgICAgICAgICAgICBlbHNlIGlmIChpc1VzZXIpCkBAIC02NjksNyArNjcyLDcg QEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24gPSBmdW5jdGlvbihzdHlsZVJ1 bGUsIHN1YnRpdGxlLCBjb21wdXRlZFN0eWwKIAogICAgIHRoaXMuaWRlbnRpZmllciA9IHN0eWxl UnVsZS5zZWxlY3RvclRleHQ7CiAgICAgaWYgKHRoaXMuc3VidGl0bGUpCi0gICAgICAgIHRoaXMu aWRlbnRpZmllciArPSAiOiIgKyB0aGlzLnN1YnRpdGxlRWxlbWVudC50ZXh0Q29udGVudDsKKyAg ICAgICAgdGhpcy5pZGVudGlmaWVyICs9ICI6IiArIHRoaXMuc3VidGl0bGU7CiB9CiAKIFdlYklu c3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZSA9IHsKZGlmZiAtLWdpdCBh L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzIGIvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MKaW5kZXggNjM1ZjZiNy4uYjk5YmYyNyAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MKKysrIGIv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MKQEAgLTQwMzgsNiArNDAz OCwxMCBAQCBhLndvcmtlci1pdGVtIHsKICAgICBjb2xvcjogaW5oZXJpdDsKIH0KIAorLnN0eWxl cy1zZWN0aW9uIC5oZWFkZXIgLnN1YnRpdGxlOjpiZWZvcmUsIC5zdHlsZXMtc2VjdGlvbiAuaGVh ZGVyIC5zdWJ0aXRsZSBhOjpiZWZvcmUgeworICAgIGNvbnRlbnQ6IGF0dHIoZGF0YS11bmNvcHlh YmxlKTsKK30KKwogLnN0eWxlcy1zZWN0aW9uIC5wcm9wZXJ0aWVzIHsKICAgICBkaXNwbGF5OiBu b25lOwogICAgIG1hcmdpbjogMDsK 58690 2010-06-14 12:59:40 -0700 2010-06-18 06:32:54 -0700 Uncopyable subtitle (.header removed) uncopyable.patch text/plain 3181 me ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg Yzk0ZmVlOS4uMjk1MmUxOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wNi0xNCAgTmlraXRhIFZhc2ls eWV2ICA8bWVAZWx2MXMucnU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUHJldmVudCBmcm9tIGNvcHlpbmcgImZpbGVuYW1l LmNzcyIgaW4gU3R5bGVzIHBhbmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTQwNDIwCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NlY3Rp b24uanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2VjdGlvbi5wcm90b3R5cGUuc2V0IHN1YnRp dGxlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24pOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzczoKKyAgICAgICAgKC5zdHlsZXMt c2VjdGlvbiAuc3VidGl0bGU6OmJlZm9yZSwgLnN0eWxlcy1zZWN0aW9uIC5zdWJ0aXRsZSBhOjpi ZWZvcmUpOgorCiAyMDEwLTA2LTA5ICBBbmRyZWkgUG9wZXNjdSAgPGFuZHJlaXBAZ29vZ2xlLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NlY3Rpb24uanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU2VjdGlvbi5qcwppbmRleCA3NzEwMTkyLi5mZDQyZTZlIDEwMDY0NAotLS0gYS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2VjdGlvbi5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU2VjdGlvbi5qcwpAQCAtODIsNyArODIsNyBAQCBXZWJJbnNwZWN0b3IuU2Vj dGlvbi5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICh0aGlzLl9zdWJ0aXRsZSA9PT0geCkKICAg ICAgICAgICAgIHJldHVybjsKICAgICAgICAgdGhpcy5fc3VidGl0bGUgPSB4OwotICAgICAgICB0 aGlzLnN1YnRpdGxlRWxlbWVudC5pbm5lckhUTUwgPSB4OworICAgICAgICB0aGlzLnN1YnRpdGxl RWxlbWVudC5zZXRBdHRyaWJ1dGUoImRhdGEtdW5jb3B5YWJsZSIsIHgpOwogICAgIH0sCiAKICAg ICBnZXQgZXhwYW5kZWQoKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1N0eWxlc1NpZGViYXJQYW5lLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxl c1NpZGViYXJQYW5lLmpzCmluZGV4IDAxMTYyM2YuLmNkOTdjMWUgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcworKysgYi9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMKQEAgLTY1MSw3ICs2NTEs MTAgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24gPSBmdW5jdGlvbihzdHls ZVJ1bGUsIHN1YnRpdGxlLCBjb21wdXRlZFN0eWwKICAgICAgICAgaWYgKCFzdWJ0aXRsZSkgewog ICAgICAgICAgICAgaWYgKHRoaXMuc3R5bGVSdWxlLnBhcmVudFN0eWxlU2hlZXQgJiYgdGhpcy5z dHlsZVJ1bGUucGFyZW50U3R5bGVTaGVldC5ocmVmKSB7CiAgICAgICAgICAgICAgICAgdmFyIHVy bCA9IHRoaXMuc3R5bGVSdWxlLnBhcmVudFN0eWxlU2hlZXQuaHJlZjsKLSAgICAgICAgICAgICAg ICB0aGlzLnN1YnRpdGxlRWxlbWVudC5hcHBlbmRDaGlsZChXZWJJbnNwZWN0b3IubGlua2lmeVJl c291cmNlQXNOb2RlKHVybCwgInJlc291cmNlcyIsIHRoaXMucnVsZS5zb3VyY2VMaW5lICsgMSkp OworICAgICAgICAgICAgICAgIHZhciBsaW5rID0gV2ViSW5zcGVjdG9yLmxpbmtpZnlSZXNvdXJj ZUFzTm9kZSh1cmwsICJyZXNvdXJjZXMiLCB0aGlzLnJ1bGUuc291cmNlTGluZSArIDEpOworICAg ICAgICAgICAgICAgIGxpbmsuc2V0QXR0cmlidXRlKCJkYXRhLXVuY29weWFibGUiLCBsaW5rLnRl eHRDb250ZW50KTsKKyAgICAgICAgICAgICAgICBsaW5rLnRleHRDb250ZW50ID0gIiI7CisgICAg ICAgICAgICAgICAgdGhpcy5zdWJ0aXRsZUVsZW1lbnQuYXBwZW5kQ2hpbGQobGluayk7CiAgICAg ICAgICAgICB9IGVsc2UgaWYgKGlzVXNlckFnZW50KQogICAgICAgICAgICAgICAgIHN1YnRpdGxl ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJ1c2VyIGFnZW50IHN0eWxlc2hlZXQiKTsKICAgICAg ICAgICAgIGVsc2UgaWYgKGlzVXNlcikKQEAgLTY2OSw3ICs2NzIsNyBAQCBXZWJJbnNwZWN0b3Iu U3R5bGVQcm9wZXJ0aWVzU2VjdGlvbiA9IGZ1bmN0aW9uKHN0eWxlUnVsZSwgc3VidGl0bGUsIGNv bXB1dGVkU3R5bAogCiAgICAgdGhpcy5pZGVudGlmaWVyID0gc3R5bGVSdWxlLnNlbGVjdG9yVGV4 dDsKICAgICBpZiAodGhpcy5zdWJ0aXRsZSkKLSAgICAgICAgdGhpcy5pZGVudGlmaWVyICs9ICI6 IiArIHRoaXMuc3VidGl0bGVFbGVtZW50LnRleHRDb250ZW50OworICAgICAgICB0aGlzLmlkZW50 aWZpZXIgKz0gIjoiICsgdGhpcy5zdWJ0aXRsZTsKIH0KIAogV2ViSW5zcGVjdG9yLlN0eWxlUHJv cGVydGllc1NlY3Rpb24ucHJvdG90eXBlID0gewpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv aW5zcGVjdG9yLmNzcwppbmRleCA2MzVmNmI3Li4zMDI5ZWQ1IDEwMDY0NAotLS0gYS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcworKysgYi9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcwpAQCAtNDAzOCw2ICs0MDM4LDEwIEBAIGEud29ya2Vy LWl0ZW0gewogICAgIGNvbG9yOiBpbmhlcml0OwogfQogCisuc3R5bGVzLXNlY3Rpb24gLnN1YnRp dGxlOjpiZWZvcmUsIC5zdHlsZXMtc2VjdGlvbiAuc3VidGl0bGUgYTo6YmVmb3JlIHsKKyAgICBj b250ZW50OiBhdHRyKGRhdGEtdW5jb3B5YWJsZSk7Cit9CisKIC5zdHlsZXMtc2VjdGlvbiAucHJv cGVydGllcyB7CiAgICAgZGlzcGxheTogbm9uZTsKICAgICBtYXJnaW46IDA7Cg== 59104 2010-06-18 06:32:54 -0700 2010-06-19 09:47:47 -0700 Uncopyable subtitle (test fixed) uncopyable.patch text/plain 5310 me ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmMzkyNGNlLi4wNTU2NGY3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTAtMDYt MTggIE5pa2l0YSBWYXNpbHlldiAgPG1lQGVsdjFzLnJ1PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHN1YnRpdGxlRWxlbWVu dC50ZXh0Q29udGVudCBpcyBhbHdheXMgZW1wdHkuIFVzZSBzdWJ0aXRsZUFzVGV4dCBtZXRob2Qg aW5zdGVhZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTQwNDIwCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZWxlbWVudHMtdGVzdHMuanM6CisgICAgICAg IChmcm9udGVuZF9nZXRTZWxlY3RlZEVsZW1lbnRTdHlsZXMpOgorCiAyMDEwLTA2LTA5ICBBbmRy ZWkgUG9wZXNjdSAgPGFuZHJlaXBAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBB ZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzLXRl c3RzLmpzIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzLXRlc3RzLmpzCmluZGV4IDhm YjQ4MGYuLjI2MzU0ZjcgMTAwNzU1Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50 cy10ZXN0cy5qcworKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMtdGVzdHMuanMK QEAgLTY5LDcgKzY5LDcgQEAgZnVuY3Rpb24gZnJvbnRlbmRfZ2V0U2VsZWN0ZWRFbGVtZW50U3R5 bGVzKGV4Y2x1ZGVDb21wdXRlZCwgZXhjbHVkZU1hdGNoZWQpCiAgICAgICAgICAgICAgICAgY29u dGludWU7CiAgICAgICAgICAgICBpZiAoc2VjdGlvbi5lbGVtZW50LnByZXZpb3VzU2libGluZyAm JiBzZWN0aW9uLmVsZW1lbnQucHJldmlvdXNTaWJsaW5nLmNsYXNzTmFtZSA9PT0gInN0eWxlcy1z aWRlYmFyLXNlcGFyYXRvciIpCiAgICAgICAgICAgICAgICAgcmVzdWx0LnB1c2goIj09PT09PT09 ICIgKyBzZWN0aW9uLmVsZW1lbnQucHJldmlvdXNTaWJsaW5nLnRleHRDb250ZW50ICsgIiA9PT09 PT09PSIpOwotICAgICAgICAgICAgcmVzdWx0LnB1c2goKHNlY3Rpb24uZXhwYW5kZWQgPyAiW2V4 cGFuZGVkXSAiIDogIltjb2xsYXBzZWRdICIpICsgc2VjdGlvbi50aXRsZUVsZW1lbnQudGV4dENv bnRlbnQgKyAiICgiICsgc2VjdGlvbi5zdWJ0aXRsZUVsZW1lbnQudGV4dENvbnRlbnQgKyAiKSIp OworICAgICAgICAgICAgcmVzdWx0LnB1c2goKHNlY3Rpb24uZXhwYW5kZWQgPyAiW2V4cGFuZGVk XSAiIDogIltjb2xsYXBzZWRdICIpICsgc2VjdGlvbi50aXRsZUVsZW1lbnQudGV4dENvbnRlbnQg KyAiICgiICsgc2VjdGlvbi5zdWJ0aXRsZUFzVGV4dCArICIpIik7CiAgICAgICAgICAgICBzZWN0 aW9uLmV4cGFuZCgpOwogICAgICAgICAgICAgZnJvbnRlbmRfZHVtcFN0eWxlVHJlZU91dGxpbmUo c2VjdGlvbi5wcm9wZXJ0aWVzVHJlZU91dGxpbmUsIHJlc3VsdCk7CiAgICAgICAgICAgICByZXN1 bHQucHVzaCgiIik7CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IGM5NGZlZTkuLjI0NWQ5MjMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDYtMTgg IE5pa2l0YSBWYXNpbHlldiAgPG1lQGVsdjFzLnJ1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFByZXZlbnQgZnJvbSBjb3B5 aW5nICJmaWxlbmFtZS5jc3MiIGluIFN0eWxlcyBwYW5lCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MDQyMAorCisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9TZWN0aW9uLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNlY3Rpb24ucHJvdG90 eXBlLnNldCBzdWJ0aXRsZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2VjdGlvbi5wcm90b3R5 cGUuZ2V0IHN1YnRpdGxlQXNUZXh0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1N0 eWxlc1NpZGViYXJQYW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGll c1NlY3Rpb24pOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzczoK KyAgICAgICAgKC5zdHlsZXMtc2VjdGlvbiAuc3VidGl0bGU6OmJlZm9yZSwgLnN0eWxlcy1zZWN0 aW9uIC5zdWJ0aXRsZSBhOjpiZWZvcmUpOgorCiAyMDEwLTA2LTA5ICBBbmRyZWkgUG9wZXNjdSAg PGFuZHJlaXBAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NlY3Rpb24uanMgYi9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2VjdGlvbi5qcwppbmRleCA3NzEwMTkyLi45MTNkNDk1 IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2VjdGlvbi5qcworKysg Yi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2VjdGlvbi5qcwpAQCAtODIsNyArODIsMjIg QEAgV2ViSW5zcGVjdG9yLlNlY3Rpb24ucHJvdG90eXBlID0gewogICAgICAgICBpZiAodGhpcy5f c3VidGl0bGUgPT09IHgpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIHRoaXMuX3N1YnRp dGxlID0geDsKLSAgICAgICAgdGhpcy5zdWJ0aXRsZUVsZW1lbnQuaW5uZXJIVE1MID0geDsKKyAg ICAgICAgdGhpcy5zdWJ0aXRsZUVsZW1lbnQuc2V0QXR0cmlidXRlKCJkYXRhLXVuY29weWFibGUi LCB4KTsKKyAgICB9LAorCisgICAgZ2V0IHN1YnRpdGxlQXNUZXh0KCkKKyAgICB7CisgICAgICAg IHZhciByZXN1bHQgPSAiIjsKKyAgICAgICAgdmFyIGRhdGEgPSB0aGlzLnN1YnRpdGxlRWxlbWVu dC5nZXRBdHRyaWJ1dGUoImRhdGEtdW5jb3B5YWJsZSIpOworICAgICAgICBpZiAoZGF0YSkKKyAg ICAgICAgICAgIHJlc3VsdCArPSBkYXRhOworICAgICAgICB2YXIgY2hpbGQgPSB0aGlzLnN1YnRp dGxlRWxlbWVudC5xdWVyeVNlbGVjdG9yKCJbZGF0YS11bmNvcHlhYmxlXSIpOworICAgICAgICBp ZiAoY2hpbGQpIHsKKyAgICAgICAgICAgIHZhciBsaW5rRGF0YSA9IGNoaWxkLmdldEF0dHJpYnV0 ZSgiZGF0YS11bmNvcHlhYmxlIik7CisgICAgICAgICAgICBpZiAobGlua0RhdGEpCisgICAgICAg ICAgICAgICAgcmVzdWx0ICs9IGxpbmtEYXRhOworICAgICAgICB9CisgICAgICAgIHJldHVybiBy ZXN1bHQ7CiAgICAgfSwKIAogICAgIGdldCBleHBhbmRlZCgpCmRpZmYgLS1naXQgYS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMgYi9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMKaW5kZXggMDExNjIzZi4uY2Q5N2Mx ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQ YW5lLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFu ZS5qcwpAQCAtNjUxLDcgKzY1MSwxMCBAQCBXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2Vj dGlvbiA9IGZ1bmN0aW9uKHN0eWxlUnVsZSwgc3VidGl0bGUsIGNvbXB1dGVkU3R5bAogICAgICAg ICBpZiAoIXN1YnRpdGxlKSB7CiAgICAgICAgICAgICBpZiAodGhpcy5zdHlsZVJ1bGUucGFyZW50 U3R5bGVTaGVldCAmJiB0aGlzLnN0eWxlUnVsZS5wYXJlbnRTdHlsZVNoZWV0LmhyZWYpIHsKICAg ICAgICAgICAgICAgICB2YXIgdXJsID0gdGhpcy5zdHlsZVJ1bGUucGFyZW50U3R5bGVTaGVldC5o cmVmOwotICAgICAgICAgICAgICAgIHRoaXMuc3VidGl0bGVFbGVtZW50LmFwcGVuZENoaWxkKFdl Ykluc3BlY3Rvci5saW5raWZ5UmVzb3VyY2VBc05vZGUodXJsLCAicmVzb3VyY2VzIiwgdGhpcy5y dWxlLnNvdXJjZUxpbmUgKyAxKSk7CisgICAgICAgICAgICAgICAgdmFyIGxpbmsgPSBXZWJJbnNw ZWN0b3IubGlua2lmeVJlc291cmNlQXNOb2RlKHVybCwgInJlc291cmNlcyIsIHRoaXMucnVsZS5z b3VyY2VMaW5lICsgMSk7CisgICAgICAgICAgICAgICAgbGluay5zZXRBdHRyaWJ1dGUoImRhdGEt dW5jb3B5YWJsZSIsIGxpbmsudGV4dENvbnRlbnQpOworICAgICAgICAgICAgICAgIGxpbmsudGV4 dENvbnRlbnQgPSAiIjsKKyAgICAgICAgICAgICAgICB0aGlzLnN1YnRpdGxlRWxlbWVudC5hcHBl bmRDaGlsZChsaW5rKTsKICAgICAgICAgICAgIH0gZWxzZSBpZiAoaXNVc2VyQWdlbnQpCiAgICAg ICAgICAgICAgICAgc3VidGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoInVzZXIgYWdlbnQg c3R5bGVzaGVldCIpOwogICAgICAgICAgICAgZWxzZSBpZiAoaXNVc2VyKQpAQCAtNjY5LDcgKzY3 Miw3IEBAIFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uID0gZnVuY3Rpb24oc3R5 bGVSdWxlLCBzdWJ0aXRsZSwgY29tcHV0ZWRTdHlsCiAKICAgICB0aGlzLmlkZW50aWZpZXIgPSBz dHlsZVJ1bGUuc2VsZWN0b3JUZXh0OwogICAgIGlmICh0aGlzLnN1YnRpdGxlKQotICAgICAgICB0 aGlzLmlkZW50aWZpZXIgKz0gIjoiICsgdGhpcy5zdWJ0aXRsZUVsZW1lbnQudGV4dENvbnRlbnQ7 CisgICAgICAgIHRoaXMuaWRlbnRpZmllciArPSAiOiIgKyB0aGlzLnN1YnRpdGxlOwogfQogCiBX ZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUgPSB7CmRpZmYgLS1n aXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcyBiL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzCmluZGV4IDYzNWY2YjcuLjMwMjllZDUg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzCisr KyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzCkBAIC00MDM4LDYg KzQwMzgsMTAgQEAgYS53b3JrZXItaXRlbSB7CiAgICAgY29sb3I6IGluaGVyaXQ7CiB9CiAKKy5z dHlsZXMtc2VjdGlvbiAuc3VidGl0bGU6OmJlZm9yZSwgLnN0eWxlcy1zZWN0aW9uIC5zdWJ0aXRs ZSBhOjpiZWZvcmUgeworICAgIGNvbnRlbnQ6IGF0dHIoZGF0YS11bmNvcHlhYmxlKTsKK30KKwog LnN0eWxlcy1zZWN0aW9uIC5wcm9wZXJ0aWVzIHsKICAgICBkaXNwbGF5OiBub25lOwogICAgIG1h cmdpbjogMDsK