76000 2012-01-10 15:48:08 -0800 margin test for CSS3 calc 2012-01-11 19:53:20 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 16662 1 mikelawther mikelawther dbates webkit.review.bot oldest_to_newest 533427 0 mikelawther 2012-01-10 15:48:08 -0800 margin test for CSS3 calc 533430 1 121922 mikelawther 2012-01-10 15:49:41 -0800 Created attachment 121922 Patch 533490 2 121922 dbates 2012-01-10 16:54:41 -0800 Comment on attachment 121922 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=121922&action=review I suggest writing this test using LayoutTests/fast/js/resources/js-test-{pre, post}.js, which provide convenience functions to assert equality with descriptive output. Using these scripts would also make the output of this test more consistent with the output other PASS/FAIL tests. One example of using these scripts to write a test is: <http://trac.webkit.org/browser/trunk/LayoutTests/fast/css/aspect-ratio-inheritance.html>. > LayoutTests/css3/calc/margin.html:75 > + var error = []; > + if (width != expectedWidth) > + error.push("wrong width"); > + if (height != expectedHeight) > + error.push("wrong height"); > + It would be beneficial to print the expected width/height and actual width/height in the expected results so as to make it more straight forward to diagnose the reason for test failure should one or more the sub tests fail. 533620 3 mikelawther 2012-01-10 21:33:58 -0800 I agree about printing the actual vs the expected. The problem I had was that cr-linux had a different default margin than WebKit Mac, and since calc() doesn't work yet, the expected values were different. I didn't want to have to maintain two sets of results though. Maybe I'll try setting a margin, and getting calc() to override it instead. 533648 4 121978 mikelawther 2012-01-10 22:33:29 -0800 Created attachment 121978 Patch 533650 5 mikelawther 2012-01-10 22:36:59 -0800 Hi Daniel - I've changed the test to use the pre/post js libraries. I've also defaulted the margin to 0px, so it should pass OK on cr-linux (my results were generated on the Mac port). 534315 6 122106 mikelawther 2012-01-11 15:15:25 -0800 Created attachment 122106 Patch 534468 7 122106 dbates 2012-01-11 18:03:54 -0800 Comment on attachment 122106 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=122106&action=review > LayoutTests/css3/calc/margin.html:29 > + <div><p id="percent-all">This element should have an overall margin of 25 pixels (10% of parent width of 300px minus 5px).</p></div><br/> > + <div><p id="percent-left">This element should have a left margin of 25 pixels (10% of parent width of 300px minus 5px).</p></div><br/> > + <div><p id="percent-right">This element should have a right margin of 25 pixels (10% of parent width of 300px minus 5px).</p></div><br/> > + <div><p id="percent-top">This element should have a top margin of 25 pixels (10% of parent width of 300px minus 5px).</p></div><br/> > + <div><p id="percent-bottom">This element should have a bottom margin of 25 pixels (10% of parent width of 300px minus 5px).</p></div><br/> Are these calculations correct with respect the definitions in <style> above? Notice that the style for the <p> specifies a width and height of 200px and 120px, respectively. Wouldn't a percentage value in the -webkit-calc expression be with respect to the height/width of the <p> (since it explicitly defines such dimensions) instead of its containing block? For example, looking at <p id="percent-left">, I would expect that the value of the margin-left property is -webkit-calc(10% - 5px) = 15px = 10% * 200px - 5px. 534472 8 dbates 2012-01-11 18:06:09 -0800 (In reply to comment #7) > [...] Wouldn't a percentage value in the -webkit-calc expression be with respect to the height/width of the <p> (since it explicitly defines such dimensions) instead of its containing block? I meant to write: Wouldn't a percentage value in the -webkit-calc expression be with respect to the height/width of the <p> (since it explicitly defines such dimensions) instead of the height/width of <div id="wrapper">? 534478 9 dbates 2012-01-11 18:24:22 -0800 (In reply to comment #8) > [...] > Wouldn't a percentage value in the -webkit-calc expression be with respect to the height/width of the <p> (since it explicitly defines such dimensions) instead of the height/width of <div id="wrapper">? Never mind. I'm not sure why I was thinking this. 534496 10 mikelawther 2012-01-11 18:50:22 -0800 Thanks for the review Daniel! I wrote this test a while ago, and margins were one of the trickiest things to measure, hence the contortions this test goes through. If you can think of a better way to measure margins, I'll happily update this test. 534528 11 122106 webkit.review.bot 2012-01-11 19:53:16 -0800 Comment on attachment 122106 Patch Clearing flags on attachment: 122106 Committed r104783: <http://trac.webkit.org/changeset/104783> 534529 12 webkit.review.bot 2012-01-11 19:53:20 -0800 All reviewed patches have been landed. Closing bug. 121922 2012-01-10 15:49:41 -0800 2012-01-10 22:33:21 -0800 Patch bug-76000-20120111104939.patch text/plain 6197 mikelawther U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0NDEyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDhiYzYxYjI1Y2ZlNzI4ZTQ5NDM5 Y2Y0NWExYjUxYTc4MmM3ODM3Mi4uMTA3ZWM1NGJmMzVmMDMyYWU5ODg2YTc1MGMxZmMwMTk5OTE0 YWNkMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTAxLTEwICBNaWtlIExhd3RoZXIgIDxt aWtlbGF3dGhlckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgbWFyZ2luIHRlc3QgZm9yIENTUzMg Y2FsYworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzYw MDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0 cyBmb3IgZnV0dXJlIGltcGxlbWVudGF0aW9uIG9mIENTUzMgY2FsYygpIChzZWUgaHR0cDovL3dl YmtpdC5vcmcvYi8xNjY2MikKKworICAgICAgICBUaGVzZSB0ZXN0cyBhcmUgZXhwZWN0ZWQgdG8g J2ZhaWwnLCBhbmQgd2lsbCBwYXNzIG9uY2UgY2FsYygpIGZ1bmN0aW9uYWxpdHkgaXMgbGFuZGVk LgorICAgICAgICBGb3Igbm93LCB0aGV5IHNlcnZlIHRvIGRlbW9uc3RyYXRlIHRoYXQgdGhlIGN1 cnJlbnQgY29kZSBkb2Vzbid0IGNyYXNoIG9uIHRoZXNlIHRlc3RzLgorCisgICAgICAgICogY3Nz My9jYWxjL21hcmdpbi1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGNzczMvY2FsYy9t YXJnaW4uaHRtbDogQWRkZWQuCisKIDIwMTItMDEtMDggIFNoZXJpZmYgQm90ICA8d2Via2l0LnJl dmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIx MDQ0MDMuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2NhbGMvbWFyZ2luLWV4cGVjdGVk LnR4dCBiL0xheW91dFRlc3RzL2NzczMvY2FsYy9tYXJnaW4tZXhwZWN0ZWQudHh0Cm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLjE2YWI2YzkxMzlhMWMxYjRjM2I3MTI1MThlOWM4Yzg1ZjVhMmUxMTgKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL2NhbGMvbWFyZ2luLWV4cGVjdGVkLnR4dApAQCAtMCww ICsxLDIxIEBACitUaGlzIGVsZW1lbnQgc2hvdWxkIGhhdmUgYW4gb3ZlcmFsbCBtYXJnaW4gb2Yg MjUgcGl4ZWxzLiA9PiBGQUlMOiB3cm9uZyB3aWR0aCwgd3JvbmcgaGVpZ2h0CisKK1RoaXMgZWxl bWVudCBzaG91bGQgaGF2ZSBhIGxlZnQgbWFyZ2luIG9mIDI1IHBpeGVscy4gPT4gRkFJTDogd3Jv bmcgd2lkdGgKKworVGhpcyBlbGVtZW50IHNob3VsZCBoYXZlIGEgcmlnaHQgbWFyZ2luIG9mIDI1 IHBpeGVscy4gPT4gRkFJTDogd3Jvbmcgd2lkdGgKKworVGhpcyBlbGVtZW50IHNob3VsZCBoYXZl IGEgdG9wIG1hcmdpbiBvZiAyNSBwaXhlbHMuID0+IEZBSUw6IHdyb25nIGhlaWdodAorCitUaGlz IGVsZW1lbnQgc2hvdWxkIGhhdmUgYSBib3R0b20gbWFyZ2luIG9mIDI1IHBpeGVscy4gPT4gRkFJ TDogd3JvbmcgaGVpZ2h0CisKK1RoaXMgZWxlbWVudCBzaG91bGQgaGF2ZSBhbiBvdmVyYWxsIG1h cmdpbiBvZiAyNSBwaXhlbHMgKDEwJSBvZiBwYXJlbnQgd2lkdGggb2YgMzAwcHggbWludXMgNXB4 KS4gPT4gRkFJTDogd3Jvbmcgd2lkdGgsIHdyb25nIGhlaWdodAorCitUaGlzIGVsZW1lbnQgc2hv dWxkIGhhdmUgYSBsZWZ0IG1hcmdpbiBvZiAyNSBwaXhlbHMgKDEwJSBvZiBwYXJlbnQgd2lkdGgg b2YgMzAwcHggbWludXMgNXB4KS4gPT4gRkFJTDogd3Jvbmcgd2lkdGgKKworVGhpcyBlbGVtZW50 IHNob3VsZCBoYXZlIGEgcmlnaHQgbWFyZ2luIG9mIDI1IHBpeGVscyAoMTAlIG9mIHBhcmVudCB3 aWR0aCBvZiAzMDBweCBtaW51cyA1cHgpLiA9PiBGQUlMOiB3cm9uZyB3aWR0aAorCitUaGlzIGVs ZW1lbnQgc2hvdWxkIGhhdmUgYSB0b3AgbWFyZ2luIG9mIDI1IHBpeGVscyAoMTAlIG9mIHBhcmVu dCB3aWR0aCBvZiAzMDBweCBtaW51cyA1cHgpLiA9PiBGQUlMOiB3cm9uZyBoZWlnaHQKKworVGhp cyBlbGVtZW50IHNob3VsZCBoYXZlIGEgYm90dG9tIG1hcmdpbiBvZiAyNSBwaXhlbHMgKDEwJSBv ZiBwYXJlbnQgd2lkdGggb2YgMzAwcHggbWludXMgNXB4KS4gPT4gRkFJTDogd3JvbmcgaGVpZ2h0 CisKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9jYWxjL21hcmdpbi5odG1sIGIvTGF5 b3V0VGVzdHMvY3NzMy9jYWxjL21hcmdpbi5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmJlNGNlYjlkMGM5NDA4 OGQ5OGQzZTRmMjk2NjdhNzIxMWFiYjk4NjEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0 cy9jc3MzL2NhbGMvbWFyZ2luLmh0bWwKQEAgLTAsMCArMSw4NSBAQAorPCFET0NUWVBFIEhUTUw+ Cis8c3R5bGU+CisgICAgZGl2IHsgZGlzcGxheTogaW5saW5lLWJsb2NrOyB9CisgICAgcCB7Cisg ICAgICAgIHdpZHRoOjIwMHB4OyAKKyAgICAgICAgaGVpZ2h0OjEyMHB4OworICAgICAgICBtYXJn aW46IDBweDsKKyAgICB9CisgICAgLnNpbXBsZS1hbGwgICAgIHsgbWFyZ2luOiAtd2Via2l0LWNh bGMoMTNweCArIDEycHgpOyB9CisgICAgLnNpbXBsZS1sZWZ0ICAgIHsgbWFyZ2luLWxlZnQ6IC13 ZWJraXQtY2FsYygxM3B4ICsgMTJweCk7IH0KKyAgICAuc2ltcGxlLXJpZ2h0ICAgeyBtYXJnaW4t cmlnaHQ6IC13ZWJraXQtY2FsYygxM3B4ICsgMTJweCk7IH0KKyAgICAuc2ltcGxlLXRvcCAgICAg eyBtYXJnaW4tdG9wOiAtd2Via2l0LWNhbGMoMTNweCArIDEycHgpOyB9CisgICAgLnNpbXBsZS1i b3R0b20gIHsgbWFyZ2luLWJvdHRvbTogLXdlYmtpdC1jYWxjKDEzcHggKyAxMnB4KTsgfQorICAg IC5wZXJjZW50LWFsbCAgICB7IG1hcmdpbjogLXdlYmtpdC1jYWxjKDEwJSAtIDVweCk7IH0KKyAg ICAucGVyY2VudC1sZWZ0ICAgeyBtYXJnaW4tbGVmdDogLXdlYmtpdC1jYWxjKDEwJSAtIDVweCk7 IH0KKyAgICAucGVyY2VudC1yaWdodCAgeyBtYXJnaW4tcmlnaHQ6IC13ZWJraXQtY2FsYygxMCUg LSA1cHgpOyB9CisgICAgLnBlcmNlbnQtdG9wICAgIHsgbWFyZ2luLXRvcDogLXdlYmtpdC1jYWxj KDEwJSAtIDVweCk7IH0KKyAgICAucGVyY2VudC1ib3R0b20geyBtYXJnaW4tYm90dG9tOiAtd2Vi a2l0LWNhbGMoMTAlIC0gNXB4KTsgfQorPC9zdHlsZT4KKworPGRpdj48cCBjbGFzcz0ic2ltcGxl LWFsbCI+VGhpcyBlbGVtZW50IHNob3VsZCBoYXZlIGFuIG92ZXJhbGwgbWFyZ2luIG9mIDI1IHBp eGVscy48L3A+PC9kaXY+PGJyLz4KKzxkaXY+PHAgY2xhc3M9InNpbXBsZS1sZWZ0Ij5UaGlzIGVs ZW1lbnQgc2hvdWxkIGhhdmUgYSBsZWZ0IG1hcmdpbiBvZiAyNSBwaXhlbHMuPC9wPjwvZGl2Pjxi ci8+Cis8ZGl2PjxwIGNsYXNzPSJzaW1wbGUtcmlnaHQiPlRoaXMgZWxlbWVudCBzaG91bGQgaGF2 ZSBhIHJpZ2h0IG1hcmdpbiBvZiAyNSBwaXhlbHMuPC9wPjwvZGl2Pjxici8+Cis8ZGl2PjxwIGNs YXNzPSJzaW1wbGUtdG9wIj5UaGlzIGVsZW1lbnQgc2hvdWxkIGhhdmUgYSB0b3AgbWFyZ2luIG9m IDI1IHBpeGVscy48L3A+PC9kaXY+PGJyLz4KKzxkaXY+PHAgY2xhc3M9InNpbXBsZS1ib3R0b20i PlRoaXMgZWxlbWVudCBzaG91bGQgaGF2ZSBhIGJvdHRvbSBtYXJnaW4gb2YgMjUgcGl4ZWxzLjwv cD48L2Rpdj48YnIvPgorPGRpdiBpZD0id3JhcHBlciIgc3R5bGU9IndpZHRoOiAzMDBweDsgYmFj a2dyb3VuZC1jb2xvcjogY29ybnNpbGs7IGRpc3BsYXk6IGJsb2NrOyI+CisgICAgPGRpdj48cCBj bGFzcz0icGVyY2VudC1hbGwiPlRoaXMgZWxlbWVudCBzaG91bGQgaGF2ZSBhbiBvdmVyYWxsIG1h cmdpbiBvZiAyNSBwaXhlbHMgKDEwJSBvZiBwYXJlbnQgd2lkdGggb2YgMzAwcHggbWludXMgNXB4 KS48L3A+PC9kaXY+PGJyLz4KKyAgICA8ZGl2PjxwIGNsYXNzPSJwZXJjZW50LWxlZnQiPlRoaXMg ZWxlbWVudCBzaG91bGQgaGF2ZSBhIGxlZnQgbWFyZ2luIG9mIDI1IHBpeGVscyAoMTAlIG9mIHBh cmVudCB3aWR0aCBvZiAzMDBweCBtaW51cyA1cHgpLjwvcD48L2Rpdj48YnIvPgorICAgIDxkaXY+ PHAgY2xhc3M9InBlcmNlbnQtcmlnaHQiPlRoaXMgZWxlbWVudCBzaG91bGQgaGF2ZSBhIHJpZ2h0 IG1hcmdpbiBvZiAyNSBwaXhlbHMgKDEwJSBvZiBwYXJlbnQgd2lkdGggb2YgMzAwcHggbWludXMg NXB4KS48L3A+PC9kaXY+PGJyLz4KKyAgICA8ZGl2PjxwIGNsYXNzPSJwZXJjZW50LXRvcCI+VGhp cyBlbGVtZW50IHNob3VsZCBoYXZlIGEgdG9wIG1hcmdpbiBvZiAyNSBwaXhlbHMgKDEwJSBvZiBw YXJlbnQgd2lkdGggb2YgMzAwcHggbWludXMgNXB4KS48L3A+PC9kaXY+PGJyLz4KKyAgICA8ZGl2 PjxwIGNsYXNzPSJwZXJjZW50LWJvdHRvbSI+VGhpcyBlbGVtZW50IHNob3VsZCBoYXZlIGEgYm90 dG9tIG1hcmdpbiBvZiAyNSBwaXhlbHMgKDEwJSBvZiBwYXJlbnQgd2lkdGggb2YgMzAwcHggbWlu dXMgNXB4KS48L3A+PC9kaXY+PGJyLz4KKzwvZGl2PgorCis8c2NyaXB0PgorICAgIGlmICh3aW5k b3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1 bXBBc1RleHQoKTsKKworICAgIHZhciBpbm5lcldpZHRoID0gMjAwOworICAgIHZhciBpbm5lckhl aWdodCA9IDEyMDsKKyAgICB2YXIgbWFyZ2luID0gMjU7CisKKyAgICB2YXIgdGVzdHMgPSBkb2N1 bWVudC5nZXRFbGVtZW50c0J5VGFnTmFtZSgiZGl2Iik7CisgICAgZm9yICh2YXIgaSA9IDA7IGkg PCB0ZXN0cy5sZW5ndGg7ICsraSkgeworICAgICAgICB2YXIgb3V0ZXJFbGVtZW50ID0gdGVzdHNb aV07CisgICAgICAgIGlmIChvdXRlckVsZW1lbnQuaWQgPT0gIndyYXBwZXIiKQorICAgICAgICAg ICAgY29udGludWU7CisgICAgICAgIAorICAgICAgICB2YXIgaW5uZXJFbGVtZW50ID0gdGVzdHNb aV0uZ2V0RWxlbWVudHNCeVRhZ05hbWUoInAiKVswXTsKKyAgICAgICAgdmFyIHdpZHRoID0gb3V0 ZXJFbGVtZW50Lm9mZnNldFdpZHRoOworICAgICAgICB2YXIgaGVpZ2h0ID0gb3V0ZXJFbGVtZW50 Lm9mZnNldEhlaWdodDsKKworICAgICAgICB2YXIgZXhwZWN0ZWRXaWR0aCA9IGlubmVyV2lkdGg7 CisgICAgICAgIHZhciBleHBlY3RlZEhlaWdodCA9IGlubmVySGVpZ2h0OworICAgIAorICAgICAg ICBzd2l0Y2ggKGlubmVyRWxlbWVudC5jbGFzc05hbWUuc3BsaXQoIi0iKVsxXSkgeworICAgICAg ICBjYXNlICJhbGwiOgorICAgICAgICAgICAgZXhwZWN0ZWRXaWR0aCArPSAyICogbWFyZ2luOwor ICAgICAgICAgICAgZXhwZWN0ZWRIZWlnaHQgKz0gMiAqIG1hcmdpbjsKKyAgICAgICAgICAgIGJy ZWFrOworICAgICAgICBjYXNlICJ0b3AiOgorICAgICAgICBjYXNlICJib3R0b20iOgorICAgICAg ICAgICAgZXhwZWN0ZWRIZWlnaHQgKz0gbWFyZ2luOworICAgICAgICAgICAgYnJlYWs7CisgICAg ICAgIGNhc2UgImxlZnQiOgorICAgICAgICBjYXNlICJyaWdodCI6CisgICAgICAgICAgICBleHBl Y3RlZFdpZHRoICs9IG1hcmdpbjsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAg CisgICAgICAgIHZhciBlcnJvciA9IFtdOworICAgICAgICBpZiAod2lkdGggIT0gZXhwZWN0ZWRX aWR0aCkKKyAgICAgICAgICAgIGVycm9yLnB1c2goIndyb25nIHdpZHRoIik7CisgICAgICAgIGlm IChoZWlnaHQgIT0gZXhwZWN0ZWRIZWlnaHQpCisgICAgICAgICAgICBlcnJvci5wdXNoKCJ3cm9u ZyBoZWlnaHQiKTsKKworICAgICAgICByZXN1bHRzID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo InJlc3VsdHMiKTsKKyAgICAgICAgaWYgKGVycm9yID09ICIiKSB7CisgICAgICAgICAgICBpbm5l ckVsZW1lbnQuc3R5bGUuYmFja2dyb3VuZENvbG9yID0gImdyZWVuIjsKKyAgICAgICAgICAgIGlu bmVyRWxlbWVudC5pbm5lckhUTUwgKz0gIiA9PiBQQVNTIjsKKyAgICAgICAgfSBlbHNlIHsKKyAg ICAgICAgICAgIGlubmVyRWxlbWVudC5zdHlsZS5iYWNrZ3JvdW5kQ29sb3IgPSAicmVkIjsKKyAg ICAgICAgICAgIGlubmVyRWxlbWVudC5pbm5lckhUTUwgKz0gIiA9PiBGQUlMOiAiICsgZXJyb3Iu am9pbigiLCAiKTsKKyAgICAgICAgfQorICAgIH0KKzwvc2NyaXB0Pgo= 121978 2012-01-10 22:33:29 -0800 2012-01-11 15:15:16 -0800 Patch bug-76000-20120111173326.patch text/plain 7517 mikelawther U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0NDEyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDhiYzYxYjI1Y2ZlNzI4ZTQ5NDM5 Y2Y0NWExYjUxYTc4MmM3ODM3Mi4uMTA3ZWM1NGJmMzVmMDMyYWU5ODg2YTc1MGMxZmMwMTk5OTE0 YWNkMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTAxLTEwICBNaWtlIExhd3RoZXIgIDxt aWtlbGF3dGhlckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgbWFyZ2luIHRlc3QgZm9yIENTUzMg Y2FsYworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzYw MDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0 cyBmb3IgZnV0dXJlIGltcGxlbWVudGF0aW9uIG9mIENTUzMgY2FsYygpIChzZWUgaHR0cDovL3dl YmtpdC5vcmcvYi8xNjY2MikKKworICAgICAgICBUaGVzZSB0ZXN0cyBhcmUgZXhwZWN0ZWQgdG8g J2ZhaWwnLCBhbmQgd2lsbCBwYXNzIG9uY2UgY2FsYygpIGZ1bmN0aW9uYWxpdHkgaXMgbGFuZGVk LgorICAgICAgICBGb3Igbm93LCB0aGV5IHNlcnZlIHRvIGRlbW9uc3RyYXRlIHRoYXQgdGhlIGN1 cnJlbnQgY29kZSBkb2Vzbid0IGNyYXNoIG9uIHRoZXNlIHRlc3RzLgorCisgICAgICAgICogY3Nz My9jYWxjL21hcmdpbi1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGNzczMvY2FsYy9t YXJnaW4uaHRtbDogQWRkZWQuCisKIDIwMTItMDEtMDggIFNoZXJpZmYgQm90ICA8d2Via2l0LnJl dmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIx MDQ0MDMuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2NhbGMvbWFyZ2luLWV4cGVjdGVk LnR4dCBiL0xheW91dFRlc3RzL2NzczMvY2FsYy9tYXJnaW4tZXhwZWN0ZWQudHh0Cm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLjZjZjJmYjVkMzJhNzlhZWQ2MWQ0MWM2OTk1ZDhmY2UyMjEwZWMzOTYKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL2NhbGMvbWFyZ2luLWV4cGVjdGVkLnR4dApAQCAtMCww ICsxLDI0IEBACitGQUlMIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzaW1wbGUtYWxsIikucGFy ZW50Tm9kZS5vZmZzZXRXaWR0aCBzaG91bGQgYmUgMjUwLiBXYXMgMjAwLgorRkFJTCBkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgic2ltcGxlLWFsbCIpLnBhcmVudE5vZGUub2Zmc2V0SGVpZ2h0IHNo b3VsZCBiZSAxNzAuIFdhcyAxMjAuCitGQUlMIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzaW1w bGUtbGVmdCIpLnBhcmVudE5vZGUub2Zmc2V0V2lkdGggc2hvdWxkIGJlIDIyNS4gV2FzIDIwMC4K K1BBU1MgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInNpbXBsZS1sZWZ0IikucGFyZW50Tm9kZS5v ZmZzZXRIZWlnaHQgaXMgMTIwCitGQUlMIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzaW1wbGUt cmlnaHQiKS5wYXJlbnROb2RlLm9mZnNldFdpZHRoIHNob3VsZCBiZSAyMjUuIFdhcyAyMDAuCitQ QVNTIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzaW1wbGUtcmlnaHQiKS5wYXJlbnROb2RlLm9m ZnNldEhlaWdodCBpcyAxMjAKK1BBU1MgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInNpbXBsZS10 b3AiKS5wYXJlbnROb2RlLm9mZnNldFdpZHRoIGlzIDIwMAorRkFJTCBkb2N1bWVudC5nZXRFbGVt ZW50QnlJZCgic2ltcGxlLXRvcCIpLnBhcmVudE5vZGUub2Zmc2V0SGVpZ2h0IHNob3VsZCBiZSAx NDUuIFdhcyAxMjAuCitQQVNTIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzaW1wbGUtYm90dG9t IikucGFyZW50Tm9kZS5vZmZzZXRXaWR0aCBpcyAyMDAKK0ZBSUwgZG9jdW1lbnQuZ2V0RWxlbWVu dEJ5SWQoInNpbXBsZS1ib3R0b20iKS5wYXJlbnROb2RlLm9mZnNldEhlaWdodCBzaG91bGQgYmUg MTQ1LiBXYXMgMTIwLgorRkFJTCBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicGVyY2VudC1hbGwi KS5wYXJlbnROb2RlLm9mZnNldFdpZHRoIHNob3VsZCBiZSAyNTAuIFdhcyAyMDAuCitGQUlMIGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCJwZXJjZW50LWFsbCIpLnBhcmVudE5vZGUub2Zmc2V0SGVp Z2h0IHNob3VsZCBiZSAxNzAuIFdhcyAxMjAuCitGQUlMIGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCJwZXJjZW50LWxlZnQiKS5wYXJlbnROb2RlLm9mZnNldFdpZHRoIHNob3VsZCBiZSAyMjUuIFdh cyAyMDAuCitQQVNTIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJwZXJjZW50LWxlZnQiKS5wYXJl bnROb2RlLm9mZnNldEhlaWdodCBpcyAxMjAKK0ZBSUwgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo InBlcmNlbnQtcmlnaHQiKS5wYXJlbnROb2RlLm9mZnNldFdpZHRoIHNob3VsZCBiZSAyMjUuIFdh cyAyMDAuCitQQVNTIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJwZXJjZW50LXJpZ2h0IikucGFy ZW50Tm9kZS5vZmZzZXRIZWlnaHQgaXMgMTIwCitQQVNTIGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCJwZXJjZW50LXRvcCIpLnBhcmVudE5vZGUub2Zmc2V0V2lkdGggaXMgMjAwCitGQUlMIGRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKCJwZXJjZW50LXRvcCIpLnBhcmVudE5vZGUub2Zmc2V0SGVpZ2h0 IHNob3VsZCBiZSAxNDUuIFdhcyAxMjAuCitQQVNTIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJw ZXJjZW50LWJvdHRvbSIpLnBhcmVudE5vZGUub2Zmc2V0V2lkdGggaXMgMjAwCitGQUlMIGRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKCJwZXJjZW50LWJvdHRvbSIpLnBhcmVudE5vZGUub2Zmc2V0SGVp Z2h0IHNob3VsZCBiZSAxNDUuIFdhcyAxMjAuCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0 cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9jYWxj L21hcmdpbi5odG1sIGIvTGF5b3V0VGVzdHMvY3NzMy9jYWxjL21hcmdpbi5odG1sCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLjc0OWU1ZDA1ZWNjMmI4ODA5NmVkMDM1ODI4M2QxOWQ5ZWY4MzMxYmMKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL2NhbGMvbWFyZ2luLmh0bWwKQEAgLTAsMCArMSw5MyBA QAorPCFET0NUWVBFIEhUTUw+Cis8c2NyaXB0IHNyYz0iLi4vLi4vZmFzdC9qcy9yZXNvdXJjZXMv anMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPHN0eWxlPgorICAgIGRpdiB7IGRpc3BsYXk6IGlu bGluZS1ibG9jazsgfQorICAgIHAgeworICAgICAgICB3aWR0aDogMjAwcHg7IAorICAgICAgICBo ZWlnaHQ6IDEyMHB4OworICAgICAgICBtYXJnaW46IDBweDsKKyAgICB9CisgICAgI3NpbXBsZS1h bGwgICAgIHsgbWFyZ2luOiAtd2Via2l0LWNhbGMoMTNweCArIDEycHgpOyB9CisgICAgI3NpbXBs ZS1sZWZ0ICAgIHsgbWFyZ2luLWxlZnQ6IC13ZWJraXQtY2FsYygxM3B4ICsgMTJweCk7IH0KKyAg ICAjc2ltcGxlLXJpZ2h0ICAgeyBtYXJnaW4tcmlnaHQ6IC13ZWJraXQtY2FsYygxM3B4ICsgMTJw eCk7IH0KKyAgICAjc2ltcGxlLXRvcCAgICAgeyBtYXJnaW4tdG9wOiAtd2Via2l0LWNhbGMoMTNw eCArIDEycHgpOyB9CisgICAgI3NpbXBsZS1ib3R0b20gIHsgbWFyZ2luLWJvdHRvbTogLXdlYmtp dC1jYWxjKDEzcHggKyAxMnB4KTsgfQorICAgICNwZXJjZW50LWFsbCAgICB7IG1hcmdpbjogLXdl YmtpdC1jYWxjKDEwJSAtIDVweCk7IH0KKyAgICAjcGVyY2VudC1sZWZ0ICAgeyBtYXJnaW4tbGVm dDogLXdlYmtpdC1jYWxjKDEwJSAtIDVweCk7IH0KKyAgICAjcGVyY2VudC1yaWdodCAgeyBtYXJn aW4tcmlnaHQ6IC13ZWJraXQtY2FsYygxMCUgLSA1cHgpOyB9CisgICAgI3BlcmNlbnQtdG9wICAg IHsgbWFyZ2luLXRvcDogLXdlYmtpdC1jYWxjKDEwJSAtIDVweCk7IH0KKyAgICAjcGVyY2VudC1i b3R0b20geyBtYXJnaW4tYm90dG9tOiAtd2Via2l0LWNhbGMoMTAlIC0gNXB4KTsgfQorPC9zdHls ZT4KKworPGRpdiBpZD0idGVzdC1jb250YWluZXIiPgorICAgIDxkaXY+PHAgaWQ9InNpbXBsZS1h bGwiPlRoaXMgZWxlbWVudCBzaG91bGQgaGF2ZSBhbiBvdmVyYWxsIG1hcmdpbiBvZiAyNSBwaXhl bHMuPC9wPjwvZGl2Pjxici8+CisgICAgPGRpdj48cCBpZD0ic2ltcGxlLWxlZnQiPlRoaXMgZWxl bWVudCBzaG91bGQgaGF2ZSBhIGxlZnQgbWFyZ2luIG9mIDI1IHBpeGVscy48L3A+PC9kaXY+PGJy Lz4KKyAgICA8ZGl2PjxwIGlkPSJzaW1wbGUtcmlnaHQiPlRoaXMgZWxlbWVudCBzaG91bGQgaGF2 ZSBhIHJpZ2h0IG1hcmdpbiBvZiAyNSBwaXhlbHMuPC9wPjwvZGl2Pjxici8+CisgICAgPGRpdj48 cCBpZD0ic2ltcGxlLXRvcCI+VGhpcyBlbGVtZW50IHNob3VsZCBoYXZlIGEgdG9wIG1hcmdpbiBv ZiAyNSBwaXhlbHMuPC9wPjwvZGl2Pjxici8+CisgICAgPGRpdj48cCBpZD0ic2ltcGxlLWJvdHRv bSI+VGhpcyBlbGVtZW50IHNob3VsZCBoYXZlIGEgYm90dG9tIG1hcmdpbiBvZiAyNSBwaXhlbHMu PC9wPjwvZGl2Pjxici8+CisgICAgPGRpdiBpZD0id3JhcHBlciIgc3R5bGU9IndpZHRoOiAzMDBw eDsgYmFja2dyb3VuZC1jb2xvcjogY29ybnNpbGs7IGRpc3BsYXk6IGJsb2NrOyI+CisgICAgICAg IDxkaXY+PHAgaWQ9InBlcmNlbnQtYWxsIj5UaGlzIGVsZW1lbnQgc2hvdWxkIGhhdmUgYW4gb3Zl cmFsbCBtYXJnaW4gb2YgMjUgcGl4ZWxzICgxMCUgb2YgcGFyZW50IHdpZHRoIG9mIDMwMHB4IG1p bnVzIDVweCkuPC9wPjwvZGl2Pjxici8+CisgICAgICAgIDxkaXY+PHAgaWQ9InBlcmNlbnQtbGVm dCI+VGhpcyBlbGVtZW50IHNob3VsZCBoYXZlIGEgbGVmdCBtYXJnaW4gb2YgMjUgcGl4ZWxzICgx MCUgb2YgcGFyZW50IHdpZHRoIG9mIDMwMHB4IG1pbnVzIDVweCkuPC9wPjwvZGl2Pjxici8+Cisg ICAgICAgIDxkaXY+PHAgaWQ9InBlcmNlbnQtcmlnaHQiPlRoaXMgZWxlbWVudCBzaG91bGQgaGF2 ZSBhIHJpZ2h0IG1hcmdpbiBvZiAyNSBwaXhlbHMgKDEwJSBvZiBwYXJlbnQgd2lkdGggb2YgMzAw cHggbWludXMgNXB4KS48L3A+PC9kaXY+PGJyLz4KKyAgICAgICAgPGRpdj48cCBpZD0icGVyY2Vu dC10b3AiPlRoaXMgZWxlbWVudCBzaG91bGQgaGF2ZSBhIHRvcCBtYXJnaW4gb2YgMjUgcGl4ZWxz ICgxMCUgb2YgcGFyZW50IHdpZHRoIG9mIDMwMHB4IG1pbnVzIDVweCkuPC9wPjwvZGl2Pjxici8+ CisgICAgICAgIDxkaXY+PHAgaWQ9InBlcmNlbnQtYm90dG9tIj5UaGlzIGVsZW1lbnQgc2hvdWxk IGhhdmUgYSBib3R0b20gbWFyZ2luIG9mIDI1IHBpeGVscyAoMTAlIG9mIHBhcmVudCB3aWR0aCBv ZiAzMDBweCBtaW51cyA1cHgpLjwvcD48L2Rpdj48YnIvPgorICAgIDwvZGl2PgorPC9kaXY+Cis8 c2NyaXB0PgorICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAgIGxh eW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKworICAgIHZhciBpbm5lcldpZHRoID0g MjAwOworICAgIHZhciBpbm5lckhlaWdodCA9IDEyMDsKKyAgICB2YXIgbWFyZ2luID0gMjU7CisK KyAgICB2YXIgdGVzdHMgPSBkb2N1bWVudC5nZXRFbGVtZW50c0J5VGFnTmFtZSgicCIpOworICAg IGZvciAodmFyIGkgPSAwOyBpIDwgdGVzdHMubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgdmFyIG91 dGVyRWxlbWVudCA9IHRlc3RzW2ldLnBhcmVudE5vZGU7CisgICAgICAgIHZhciBpbm5lckVsZW1l bnQgPSB0ZXN0c1tpXTsKKyAgICAgICAgdmFyIHdpZHRoID0gb3V0ZXJFbGVtZW50Lm9mZnNldFdp ZHRoOworICAgICAgICB2YXIgaGVpZ2h0ID0gb3V0ZXJFbGVtZW50Lm9mZnNldEhlaWdodDsKKwor ICAgICAgICB2YXIgZXhwZWN0ZWRXaWR0aCA9IGlubmVyV2lkdGg7CisgICAgICAgIHZhciBleHBl Y3RlZEhlaWdodCA9IGlubmVySGVpZ2h0OworICAgIAorICAgICAgICBzd2l0Y2ggKGlubmVyRWxl bWVudC5pZC5zcGxpdCgiLSIpWzFdKSB7CisgICAgICAgIGNhc2UgImFsbCI6CisgICAgICAgICAg ICBleHBlY3RlZFdpZHRoICs9IDIgKiBtYXJnaW47CisgICAgICAgICAgICBleHBlY3RlZEhlaWdo dCArPSAyICogbWFyZ2luOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgInRvcCI6 CisgICAgICAgIGNhc2UgImJvdHRvbSI6CisgICAgICAgICAgICBleHBlY3RlZEhlaWdodCArPSBt YXJnaW47CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSAibGVmdCI6CisgICAgICAg IGNhc2UgInJpZ2h0IjoKKyAgICAgICAgICAgIGV4cGVjdGVkV2lkdGggKz0gbWFyZ2luOworICAg ICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKworICAgICAgICBzaG91bGRFdmFsdWF0ZVRvKCdk b2N1bWVudC5nZXRFbGVtZW50QnlJZCgiJyArIGlubmVyRWxlbWVudC5pZCArICciKS5wYXJlbnRO b2RlLm9mZnNldFdpZHRoJywgZXhwZWN0ZWRXaWR0aCk7CisgICAgICAgIHNob3VsZEV2YWx1YXRl VG8oJ2RvY3VtZW50LmdldEVsZW1lbnRCeUlkKCInICsgaW5uZXJFbGVtZW50LmlkICsgJyIpLnBh cmVudE5vZGUub2Zmc2V0SGVpZ2h0JywgZXhwZWN0ZWRIZWlnaHQpOworICAgIAorICAgICAgICB2 YXIgZXJyb3IgPSBbXTsKKyAgICAgICAgaWYgKHdpZHRoICE9IGV4cGVjdGVkV2lkdGgpCisgICAg ICAgICAgICBlcnJvci5wdXNoKCJleHBlY3RlZCB3aWR0aCAiICsgZXhwZWN0ZWRXaWR0aCArICIs IHdhcyAiICsgd2lkdGgpOworICAgICAgICBpZiAoaGVpZ2h0ICE9IGV4cGVjdGVkSGVpZ2h0KQor ICAgICAgICAgICAgZXJyb3IucHVzaCgiZXhwZWN0ZWQgaGVpZ2h0ICIgKyBleHBlY3RlZEhlaWdo dCArICIsIHdhcyAiICsgaGVpZ2h0KTsKKworICAgICAgICBpZiAoZXJyb3IgPT0gIiIpIHsKKyAg ICAgICAgICAgIGlubmVyRWxlbWVudC5zdHlsZS5iYWNrZ3JvdW5kQ29sb3IgPSAiZ3JlZW4iOwor ICAgICAgICAgICAgaW5uZXJFbGVtZW50LmlubmVySFRNTCArPSAiID0+IFBBU1MiOworICAgICAg ICB9IGVsc2UgeworICAgICAgICAgICAgaW5uZXJFbGVtZW50LnN0eWxlLmJhY2tncm91bmRDb2xv ciA9ICJyZWQiOworICAgICAgICAgICAgaW5uZXJFbGVtZW50LmlubmVySFRNTCArPSAiID0+IEZB SUw6ICIgKyBlcnJvci5qb2luKCIsICIpOworICAgICAgICB9CisgICAgfQorICAgIAorICAgIGlm ICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKKyAgICAgICAgdmFyIHRlc3RDb250YWlu ZXIgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidGVzdC1jb250YWluZXIiKTsKKyAgICAgICAg aWYgKHRlc3RDb250YWluZXIpCisgICAgICAgICAgICBkb2N1bWVudC5ib2R5LnJlbW92ZUNoaWxk KHRlc3RDb250YWluZXIpOyAgIAorICAgIH0gICAgCis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIu Li8uLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0Pgo= 122106 2012-01-11 15:15:25 -0800 2012-01-11 19:53:16 -0800 Patch bug-76000-20120112101523.patch text/plain 7377 mikelawther U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0NDEyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDhiYzYxYjI1Y2ZlNzI4ZTQ5NDM5 Y2Y0NWExYjUxYTc4MmM3ODM3Mi4uMTA3ZWM1NGJmMzVmMDMyYWU5ODg2YTc1MGMxZmMwMTk5OTE0 YWNkMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTAxLTEwICBNaWtlIExhd3RoZXIgIDxt aWtlbGF3dGhlckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgbWFyZ2luIHRlc3QgZm9yIENTUzMg Y2FsYworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzYw MDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0 cyBmb3IgZnV0dXJlIGltcGxlbWVudGF0aW9uIG9mIENTUzMgY2FsYygpIChzZWUgaHR0cDovL3dl YmtpdC5vcmcvYi8xNjY2MikKKworICAgICAgICBUaGVzZSB0ZXN0cyBhcmUgZXhwZWN0ZWQgdG8g J2ZhaWwnLCBhbmQgd2lsbCBwYXNzIG9uY2UgY2FsYygpIGZ1bmN0aW9uYWxpdHkgaXMgbGFuZGVk LgorICAgICAgICBGb3Igbm93LCB0aGV5IHNlcnZlIHRvIGRlbW9uc3RyYXRlIHRoYXQgdGhlIGN1 cnJlbnQgY29kZSBkb2Vzbid0IGNyYXNoIG9uIHRoZXNlIHRlc3RzLgorCisgICAgICAgICogY3Nz My9jYWxjL21hcmdpbi1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGNzczMvY2FsYy9t YXJnaW4uaHRtbDogQWRkZWQuCisKIDIwMTItMDEtMDggIFNoZXJpZmYgQm90ICA8d2Via2l0LnJl dmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIx MDQ0MDMuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2NhbGMvbWFyZ2luLWV4cGVjdGVk LnR4dCBiL0xheW91dFRlc3RzL2NzczMvY2FsYy9tYXJnaW4tZXhwZWN0ZWQudHh0Cm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLjZjZjJmYjVkMzJhNzlhZWQ2MWQ0MWM2OTk1ZDhmY2UyMjEwZWMzOTYKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL2NhbGMvbWFyZ2luLWV4cGVjdGVkLnR4dApAQCAtMCww ICsxLDI0IEBACitGQUlMIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzaW1wbGUtYWxsIikucGFy ZW50Tm9kZS5vZmZzZXRXaWR0aCBzaG91bGQgYmUgMjUwLiBXYXMgMjAwLgorRkFJTCBkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgic2ltcGxlLWFsbCIpLnBhcmVudE5vZGUub2Zmc2V0SGVpZ2h0IHNo b3VsZCBiZSAxNzAuIFdhcyAxMjAuCitGQUlMIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzaW1w bGUtbGVmdCIpLnBhcmVudE5vZGUub2Zmc2V0V2lkdGggc2hvdWxkIGJlIDIyNS4gV2FzIDIwMC4K K1BBU1MgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInNpbXBsZS1sZWZ0IikucGFyZW50Tm9kZS5v ZmZzZXRIZWlnaHQgaXMgMTIwCitGQUlMIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzaW1wbGUt cmlnaHQiKS5wYXJlbnROb2RlLm9mZnNldFdpZHRoIHNob3VsZCBiZSAyMjUuIFdhcyAyMDAuCitQ QVNTIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzaW1wbGUtcmlnaHQiKS5wYXJlbnROb2RlLm9m ZnNldEhlaWdodCBpcyAxMjAKK1BBU1MgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInNpbXBsZS10 b3AiKS5wYXJlbnROb2RlLm9mZnNldFdpZHRoIGlzIDIwMAorRkFJTCBkb2N1bWVudC5nZXRFbGVt ZW50QnlJZCgic2ltcGxlLXRvcCIpLnBhcmVudE5vZGUub2Zmc2V0SGVpZ2h0IHNob3VsZCBiZSAx NDUuIFdhcyAxMjAuCitQQVNTIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzaW1wbGUtYm90dG9t IikucGFyZW50Tm9kZS5vZmZzZXRXaWR0aCBpcyAyMDAKK0ZBSUwgZG9jdW1lbnQuZ2V0RWxlbWVu dEJ5SWQoInNpbXBsZS1ib3R0b20iKS5wYXJlbnROb2RlLm9mZnNldEhlaWdodCBzaG91bGQgYmUg MTQ1LiBXYXMgMTIwLgorRkFJTCBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicGVyY2VudC1hbGwi KS5wYXJlbnROb2RlLm9mZnNldFdpZHRoIHNob3VsZCBiZSAyNTAuIFdhcyAyMDAuCitGQUlMIGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCJwZXJjZW50LWFsbCIpLnBhcmVudE5vZGUub2Zmc2V0SGVp Z2h0IHNob3VsZCBiZSAxNzAuIFdhcyAxMjAuCitGQUlMIGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCJwZXJjZW50LWxlZnQiKS5wYXJlbnROb2RlLm9mZnNldFdpZHRoIHNob3VsZCBiZSAyMjUuIFdh cyAyMDAuCitQQVNTIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJwZXJjZW50LWxlZnQiKS5wYXJl bnROb2RlLm9mZnNldEhlaWdodCBpcyAxMjAKK0ZBSUwgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo InBlcmNlbnQtcmlnaHQiKS5wYXJlbnROb2RlLm9mZnNldFdpZHRoIHNob3VsZCBiZSAyMjUuIFdh cyAyMDAuCitQQVNTIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJwZXJjZW50LXJpZ2h0IikucGFy ZW50Tm9kZS5vZmZzZXRIZWlnaHQgaXMgMTIwCitQQVNTIGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCJwZXJjZW50LXRvcCIpLnBhcmVudE5vZGUub2Zmc2V0V2lkdGggaXMgMjAwCitGQUlMIGRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKCJwZXJjZW50LXRvcCIpLnBhcmVudE5vZGUub2Zmc2V0SGVpZ2h0 IHNob3VsZCBiZSAxNDUuIFdhcyAxMjAuCitQQVNTIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJw ZXJjZW50LWJvdHRvbSIpLnBhcmVudE5vZGUub2Zmc2V0V2lkdGggaXMgMjAwCitGQUlMIGRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKCJwZXJjZW50LWJvdHRvbSIpLnBhcmVudE5vZGUub2Zmc2V0SGVp Z2h0IHNob3VsZCBiZSAxNDUuIFdhcyAxMjAuCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0 cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9jYWxj L21hcmdpbi5odG1sIGIvTGF5b3V0VGVzdHMvY3NzMy9jYWxjL21hcmdpbi5odG1sCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLjUwOTA3ZTNiZGIxZTM1NWJkM2JlNDhhOTEzY2JmZDIyMjg1MjM5NDgKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL2NhbGMvbWFyZ2luLmh0bWwKQEAgLTAsMCArMSw4NiBA QAorPCFET0NUWVBFIEhUTUw+Cis8c2NyaXB0IHNyYz0iLi4vLi4vZmFzdC9qcy9yZXNvdXJjZXMv anMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPHN0eWxlPgorICAgIGRpdiB7IGRpc3BsYXk6IGlu bGluZS1ibG9jazsgfQorICAgIHAgeyB3aWR0aDogMjAwcHg7IGhlaWdodDogMTIwcHg7IG1hcmdp bjogMHB4OyB9CisgICAgI3NpbXBsZS1hbGwgeyBtYXJnaW46IC13ZWJraXQtY2FsYygxM3B4ICsg MTJweCk7IH0KKyAgICAjc2ltcGxlLWxlZnQgeyBtYXJnaW4tbGVmdDogLXdlYmtpdC1jYWxjKDEz cHggKyAxMnB4KTsgfQorICAgICNzaW1wbGUtcmlnaHQgeyBtYXJnaW4tcmlnaHQ6IC13ZWJraXQt Y2FsYygxM3B4ICsgMTJweCk7IH0KKyAgICAjc2ltcGxlLXRvcCB7IG1hcmdpbi10b3A6IC13ZWJr aXQtY2FsYygxM3B4ICsgMTJweCk7IH0KKyAgICAjc2ltcGxlLWJvdHRvbSB7IG1hcmdpbi1ib3R0 b206IC13ZWJraXQtY2FsYygxM3B4ICsgMTJweCk7IH0KKyAgICAjcGVyY2VudC1hbGwgeyBtYXJn aW46IC13ZWJraXQtY2FsYygxMCUgLSA1cHgpOyB9CisgICAgI3BlcmNlbnQtbGVmdCB7IG1hcmdp bi1sZWZ0OiAtd2Via2l0LWNhbGMoMTAlIC0gNXB4KTsgfQorICAgICNwZXJjZW50LXJpZ2h0IHsg bWFyZ2luLXJpZ2h0OiAtd2Via2l0LWNhbGMoMTAlIC0gNXB4KTsgfQorICAgICNwZXJjZW50LXRv cCB7IG1hcmdpbi10b3A6IC13ZWJraXQtY2FsYygxMCUgLSA1cHgpOyB9CisgICAgI3BlcmNlbnQt Ym90dG9tIHsgbWFyZ2luLWJvdHRvbTogLXdlYmtpdC1jYWxjKDEwJSAtIDVweCk7IH0KKzwvc3R5 bGU+CisKKzxkaXYgaWQ9InRlc3QtY29udGFpbmVyIj4KKyAgICA8ZGl2PjxwIGlkPSJzaW1wbGUt YWxsIj5UaGlzIGVsZW1lbnQgc2hvdWxkIGhhdmUgYW4gb3ZlcmFsbCBtYXJnaW4gb2YgMjUgcGl4 ZWxzLjwvcD48L2Rpdj48YnIvPgorICAgIDxkaXY+PHAgaWQ9InNpbXBsZS1sZWZ0Ij5UaGlzIGVs ZW1lbnQgc2hvdWxkIGhhdmUgYSBsZWZ0IG1hcmdpbiBvZiAyNSBwaXhlbHMuPC9wPjwvZGl2Pjxi ci8+CisgICAgPGRpdj48cCBpZD0ic2ltcGxlLXJpZ2h0Ij5UaGlzIGVsZW1lbnQgc2hvdWxkIGhh dmUgYSByaWdodCBtYXJnaW4gb2YgMjUgcGl4ZWxzLjwvcD48L2Rpdj48YnIvPgorICAgIDxkaXY+ PHAgaWQ9InNpbXBsZS10b3AiPlRoaXMgZWxlbWVudCBzaG91bGQgaGF2ZSBhIHRvcCBtYXJnaW4g b2YgMjUgcGl4ZWxzLjwvcD48L2Rpdj48YnIvPgorICAgIDxkaXY+PHAgaWQ9InNpbXBsZS1ib3R0 b20iPlRoaXMgZWxlbWVudCBzaG91bGQgaGF2ZSBhIGJvdHRvbSBtYXJnaW4gb2YgMjUgcGl4ZWxz LjwvcD48L2Rpdj48YnIvPgorICAgIDxkaXYgaWQ9IndyYXBwZXIiIHN0eWxlPSJ3aWR0aDogMzAw cHg7IGJhY2tncm91bmQtY29sb3I6IGNvcm5zaWxrOyBkaXNwbGF5OiBibG9jazsiPgorICAgICAg ICA8ZGl2PjxwIGlkPSJwZXJjZW50LWFsbCI+VGhpcyBlbGVtZW50IHNob3VsZCBoYXZlIGFuIG92 ZXJhbGwgbWFyZ2luIG9mIDI1IHBpeGVscyAoMTAlIG9mIHBhcmVudCB3aWR0aCBvZiAzMDBweCBt aW51cyA1cHgpLjwvcD48L2Rpdj48YnIvPgorICAgICAgICA8ZGl2PjxwIGlkPSJwZXJjZW50LWxl ZnQiPlRoaXMgZWxlbWVudCBzaG91bGQgaGF2ZSBhIGxlZnQgbWFyZ2luIG9mIDI1IHBpeGVscyAo MTAlIG9mIHBhcmVudCB3aWR0aCBvZiAzMDBweCBtaW51cyA1cHgpLjwvcD48L2Rpdj48YnIvPgor ICAgICAgICA8ZGl2PjxwIGlkPSJwZXJjZW50LXJpZ2h0Ij5UaGlzIGVsZW1lbnQgc2hvdWxkIGhh dmUgYSByaWdodCBtYXJnaW4gb2YgMjUgcGl4ZWxzICgxMCUgb2YgcGFyZW50IHdpZHRoIG9mIDMw MHB4IG1pbnVzIDVweCkuPC9wPjwvZGl2Pjxici8+CisgICAgICAgIDxkaXY+PHAgaWQ9InBlcmNl bnQtdG9wIj5UaGlzIGVsZW1lbnQgc2hvdWxkIGhhdmUgYSB0b3AgbWFyZ2luIG9mIDI1IHBpeGVs cyAoMTAlIG9mIHBhcmVudCB3aWR0aCBvZiAzMDBweCBtaW51cyA1cHgpLjwvcD48L2Rpdj48YnIv PgorICAgICAgICA8ZGl2PjxwIGlkPSJwZXJjZW50LWJvdHRvbSI+VGhpcyBlbGVtZW50IHNob3Vs ZCBoYXZlIGEgYm90dG9tIG1hcmdpbiBvZiAyNSBwaXhlbHMgKDEwJSBvZiBwYXJlbnQgd2lkdGgg b2YgMzAwcHggbWludXMgNXB4KS48L3A+PC9kaXY+PGJyLz4KKyAgICA8L2Rpdj4KKzwvZGl2Pgor PHNjcmlwdD4KKyAgICB2YXIgaW5uZXJXaWR0aCA9IDIwMDsKKyAgICB2YXIgaW5uZXJIZWlnaHQg PSAxMjA7CisgICAgdmFyIG1hcmdpbiA9IDI1OworCisgICAgdmFyIHRlc3RzID0gZG9jdW1lbnQu Z2V0RWxlbWVudHNCeVRhZ05hbWUoInAiKTsKKyAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRlc3Rz Lmxlbmd0aDsgKytpKSB7CisgICAgICAgIHZhciBvdXRlckVsZW1lbnQgPSB0ZXN0c1tpXS5wYXJl bnROb2RlOworICAgICAgICB2YXIgaW5uZXJFbGVtZW50ID0gdGVzdHNbaV07CisgICAgICAgIHZh ciB3aWR0aCA9IG91dGVyRWxlbWVudC5vZmZzZXRXaWR0aDsKKyAgICAgICAgdmFyIGhlaWdodCA9 IG91dGVyRWxlbWVudC5vZmZzZXRIZWlnaHQ7CisKKyAgICAgICAgdmFyIGV4cGVjdGVkV2lkdGgg PSBpbm5lcldpZHRoOworICAgICAgICB2YXIgZXhwZWN0ZWRIZWlnaHQgPSBpbm5lckhlaWdodDsK KyAgICAKKyAgICAgICAgc3dpdGNoIChpbm5lckVsZW1lbnQuaWQuc3BsaXQoIi0iKVsxXSkgewor ICAgICAgICBjYXNlICJhbGwiOgorICAgICAgICAgICAgZXhwZWN0ZWRXaWR0aCArPSAyICogbWFy Z2luOworICAgICAgICAgICAgZXhwZWN0ZWRIZWlnaHQgKz0gMiAqIG1hcmdpbjsKKyAgICAgICAg ICAgIGJyZWFrOworICAgICAgICBjYXNlICJ0b3AiOgorICAgICAgICBjYXNlICJib3R0b20iOgor ICAgICAgICAgICAgZXhwZWN0ZWRIZWlnaHQgKz0gbWFyZ2luOworICAgICAgICAgICAgYnJlYWs7 CisgICAgICAgIGNhc2UgImxlZnQiOgorICAgICAgICBjYXNlICJyaWdodCI6CisgICAgICAgICAg ICBleHBlY3RlZFdpZHRoICs9IG1hcmdpbjsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9 CisKKyAgICAgICAgc2hvdWxkRXZhbHVhdGVUbygnZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIicg KyBpbm5lckVsZW1lbnQuaWQgKyAnIikucGFyZW50Tm9kZS5vZmZzZXRXaWR0aCcsIGV4cGVjdGVk V2lkdGgpOworICAgICAgICBzaG91bGRFdmFsdWF0ZVRvKCdkb2N1bWVudC5nZXRFbGVtZW50QnlJ ZCgiJyArIGlubmVyRWxlbWVudC5pZCArICciKS5wYXJlbnROb2RlLm9mZnNldEhlaWdodCcsIGV4 cGVjdGVkSGVpZ2h0KTsKKyAgICAKKyAgICAgICAgdmFyIGVycm9yID0gW107CisgICAgICAgIGlm ICh3aWR0aCAhPSBleHBlY3RlZFdpZHRoKQorICAgICAgICAgICAgZXJyb3IucHVzaCgiZXhwZWN0 ZWQgd2lkdGggIiArIGV4cGVjdGVkV2lkdGggKyAiLCB3YXMgIiArIHdpZHRoKTsKKyAgICAgICAg aWYgKGhlaWdodCAhPSBleHBlY3RlZEhlaWdodCkKKyAgICAgICAgICAgIGVycm9yLnB1c2goImV4 cGVjdGVkIGhlaWdodCAiICsgZXhwZWN0ZWRIZWlnaHQgKyAiLCB3YXMgIiArIGhlaWdodCk7CisK KyAgICAgICAgaWYgKGVycm9yID09ICIiKSB7CisgICAgICAgICAgICBpbm5lckVsZW1lbnQuc3R5 bGUuYmFja2dyb3VuZENvbG9yID0gImdyZWVuIjsKKyAgICAgICAgICAgIGlubmVyRWxlbWVudC5p bm5lckhUTUwgKz0gIiA9PiBQQVNTIjsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIGlu bmVyRWxlbWVudC5zdHlsZS5iYWNrZ3JvdW5kQ29sb3IgPSAicmVkIjsKKyAgICAgICAgICAgIGlu bmVyRWxlbWVudC5pbm5lckhUTUwgKz0gIiA9PiBGQUlMOiAiICsgZXJyb3Iuam9pbigiLCAiKTsK KyAgICAgICAgfQorICAgIH0KKyAgICAKKyAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9s bGVyKSB7CisgICAgICAgIHZhciB0ZXN0Q29udGFpbmVyID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5 SWQoInRlc3QtY29udGFpbmVyIik7CisgICAgICAgIGlmICh0ZXN0Q29udGFpbmVyKQorICAgICAg ICAgICAgZG9jdW1lbnQuYm9keS5yZW1vdmVDaGlsZCh0ZXN0Q29udGFpbmVyKTsgICAKKyAgICB9 ICAgIAorPC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMt dGVzdC1wb3N0LmpzIj48L3NjcmlwdD4K