74955 2011-12-20 14:07:26 -0800 WebKit adds vertical paddings and borders to the fixed width of CSS tables 2012-01-05 04:24:03 -0800 1 1 1 Unclassified WebKit Tables 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 mvujovic webkit-unassigned bdakin eric hyatt jchaffraix webkit.review.bot oldest_to_newest 524813 0 120078 mvujovic 2011-12-20 14:07:26 -0800 Created attachment 120078 Reproduction In the attached reproduction, the CSS table has a width style of 100px and a padding-top style of 400px. In WebKit, the table's computed width is 500px (100px+400px), but it should be 100px. Firefox and Opera produce the correct results. 524831 1 120087 mvujovic 2011-12-20 14:28:05 -0800 Created attachment 120087 Patch I uploaded patch that fixes the issue and makes WebKit's behavior match Firefox's and Opera's. The problem was that the width calculation for CSS tables was using borderBefore(), paddingBefore(), borderAfter(), and paddingAfter(), which actually correspond to the vertical borders and paddings. I changed it to use borderStart(), paddingStart(), borderEnd(), and paddingEnd(), which correspond to the horizontal borders and paddings. 525470 2 eric 2011-12-21 12:30:32 -0800 This seems reasonable to me, but really Beth/hyatt are more familiar with this code. 525507 3 mvujovic 2011-12-21 13:19:09 -0800 Thanks for looking at it, Eric. I was planning to ping Julien for a review when he comes on IRC since he changed some code around there recently. Of course, Beth or Hyatt are welcome to review if they have time. 525586 4 120087 jchaffraix 2011-12-21 14:29:25 -0800 Comment on attachment 120087 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=120087&action=review Good catch! Some comments but the change is very fine. > LayoutTests/fast/table/script-tests/css-table-width.js:3 > +description( > +"This test checks that the width style is applied correctly to CSS tables with respect to table paddings and borders." > +); You can put that on one line. > LayoutTests/fast/table/script-tests/css-table-width.js:40 > +shouldEvaluateTo("computeCSSTableWidth('width: 200px; border-style: solid; border-width: 10px 2px 30px 4px; padding: 50px 6px 70px 8px;')", 200+2+4+6+8); > +shouldEvaluateTo("computeCSSTableWidth('width: 200px; border-style: solid; border-width: 10px 2px 30px 4px; padding: 50px 6px 70px 8px; border-collapse: collapse;')", 200 + (2+4)/2); I would love to see some examples with a vertical writing mode (like 'writing-mode: vertical-rl') and some values of 'text-orientation' / 'direction' as this test feels not sufficient. Also a vertical writing mode would have shown the issue pretty easily (just put some padding in the inline base direction but not in the block flow direction). > Source/WebCore/rendering/RenderTable.cpp:233 > + LayoutUnit bordersAndPadding = 0; I am not too fond of the naming. You don't include the paddings if you are on a collapsing border CSS table. I couldn't find anything better (my take was bordersAndPaddingsOnNonCollapsingBordersTable which is too long). The variable name should at least be bordersAndPaddings for consistency. 525709 5 mvujovic 2011-12-21 15:23:55 -0800 Thanks for the review, Julien! > > LayoutTests/fast/table/script-tests/css-table-width.js:3 > > +description( > > +"This test checks that the width style is applied correctly to CSS tables with respect to table paddings and borders." > > +); > > You can put that on one line. Sounds good. > I would love to see some examples with a vertical writing mode (like 'writing-mode: vertical-rl') and some values of 'text-orientation' / 'direction' as this test feels not sufficient. Also a vertical writing mode would have shown the issue pretty easily (just put some padding in the inline base direction but not in the block flow direction). Very good idea- I'll craft some more tests and reupload a patch. > > Source/WebCore/rendering/RenderTable.cpp:233 > > + LayoutUnit bordersAndPadding = 0; > > I am not too fond of the naming. You don't include the paddings if you are on a collapsing border CSS table. > > I couldn't find anything better (my take was bordersAndPaddingsOnNonCollapsingBordersTable which is too long). The variable name should at least be bordersAndPaddings for consistency. Good point. Both "borders" and "bordersAndPaddings" aren't entirely right, but "borders" sounds better. I'll change it back to "borders" :) 529595 6 121122 mvujovic 2012-01-04 10:22:32 -0800 Created attachment 121122 Patch I've updated the patch with the changes from the previous comment. I've added more test cases with different combinations of writing-mode, direction, and text-orientation. 529741 7 121122 jchaffraix 2012-01-04 14:07:06 -0800 Comment on attachment 121122 Patch The cr-linux EWS seems to be cycling and failing on some other issue. The previous change properly passed the bot so it should be fine to land this one. r = me 530184 8 121122 webkit.review.bot 2012-01-05 04:23:58 -0800 Comment on attachment 121122 Patch Clearing flags on attachment: 121122 Committed r104140: <http://trac.webkit.org/changeset/104140> 530185 9 webkit.review.bot 2012-01-05 04:24:03 -0800 All reviewed patches have been landed. Closing bug. 120078 2011-12-20 14:07:26 -0800 2011-12-20 14:07:26 -0800 Reproduction css-table-width-bug-reproduction.html text/html 897 mvujovic PCFET0NUWVBFIGh0bWw+CjxodG1sPgogICAgPGhlYWQ+CiAgICAgICAgPHN0eWxlIHR5cGU9InRl eHQvY3NzIj4KICAgICAgICAgICAgLnRhYmxlIHsgCiAgICAgICAgICAgICAgICBkaXNwbGF5OiB0 YWJsZTsKCiAgICAgICAgICAgICAgICAvKiBQYWRkaW5nLXRvcCBzaG91bGQgbm90IGFmZmVjdCB0 aGUgd2lkdGgsIGJ1dCBpdCBkb2VzLiAqLyAKICAgICAgICAgICAgICAgIHdpZHRoOiAxMDBweDsg CiAgICAgICAgICAgICAgICBwYWRkaW5nLXRvcDogNDAwcHg7IAoKICAgICAgICAgICAgICAgIGJv cmRlci1zdHlsZTogc29saWQ7CiAgICAgICAgICAgIH0KICAgICAgICAgICAgLnRhYmxlX3Jvd19n cm91cCB7IGRpc3BsYXk6IHRhYmxlLXJvdy1ncm91cDsgfQogICAgICAgICAgICAudGFibGVfcm93 IHsgZGlzcGxheTogdGFibGUtcm93OyB9CiAgICAgICAgICAgIC50YWJsZV9jZWxsIHsgZGlzcGxh eTogdGFibGUtY2VsbDsgfQogICAgICAgICAgICAuY2VsbF9jb250ZW50IHsgaGVpZ2h0OiA1MHB4 OyBiYWNrZ3JvdW5kLWNvbG9yOiAjMDYwOyB9CiAgICAgICAgPC9zdHlsZT4KICAgIDwvaGVhZD4K ICAgIDxib2R5PgogICAgICAgIDxkaXYgY2xhc3M9InRhYmxlIj4KICAgICAgICAgICAgPGRpdiBj bGFzcz0idGFibGVfcm93X2dyb3VwIj4KICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9InRhYmxl X3JvdyI+CiAgICAgICAgICAgICAgICAgICAgPGRpdiBjbGFzcz0idGFibGVfY2VsbCI+CiAgICAg ICAgICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9ImNlbGxfY29udGVudCI+PC9kaXY+CiAgICAg ICAgICAgICAgICAgICAgPC9kaXY+CiAgICAgICAgICAgICAgICA8L2Rpdj4KICAgICAgICAgICAg PC9kaXY+CiAgICAgICAgPC9kaXY+CiAgICA8L2JvZHk+CjwvaHRtbD4K 120087 2011-12-20 14:28:05 -0800 2012-01-04 10:22:32 -0800 Patch 74955.patch text/plain 6432 mvujovic ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkNjQxMTM3Li5hMDU4N2UwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMTIt MjAgIE1heCBWdWpvdmljICA8bXZ1am92aWNAYWRvYmUuY29tPgorCisgICAgICAgIFdlYktpdCBh ZGRzIHZlcnRpY2FsIHBhZGRpbmdzIGFuZCBib3JkZXJzIHRvIHRoZSBmaXhlZCB3aWR0aCBvZiBD U1MgdGFibGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD03NDk1NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAK KyAgICAgICAgQWRkZWQgdGVzdHMgdG8gY2hlY2sgdGhhdCB0aGUgZml4ZWQgd2lkdGggc3R5bGUg aXMgYXBwbGllZCBjb3JyZWN0bHkgdG8gCisgICAgICAgIENTUyB0YWJsZXMgd2l0aCByZXNwZWN0 IHRvIHRhYmxlIHBhZGRpbmdzIGFuZCBib3JkZXJzLgorCisgICAgICAgICogZmFzdC90YWJsZS9j c3MtdGFibGUtd2lkdGgtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3RhYmxl L2Nzcy10YWJsZS13aWR0aC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3RhYmxlL3Njcmlw dC10ZXN0cy9jc3MtdGFibGUtd2lkdGguanM6IEFkZGVkLgorICAgICAgICAoY29tcHV0ZUNTU1Rh YmxlV2lkdGgpOgorCiAyMDExLTEyLTIwICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtp dC5vcmc+CiAKICAgICAgICAgW1F0XVtXSzJdIDIgZWRpdGluZyB0ZXN0cyBpbnRyb2R1Y2VkIGlu IHIxMDMwNzMgZmFpbHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvdGFibGUvY3NzLXRh YmxlLXdpZHRoLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvdGFibGUvY3NzLXRhYmxl LXdpZHRoLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4w NjAxODBhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC90YWJsZS9jc3MtdGFi bGUtd2lkdGgtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTEgQEAKK1RoaXMgdGVzdCBjaGVja3Mg dGhhdCB0aGUgd2lkdGggc3R5bGUgaXMgYXBwbGllZCBjb3JyZWN0bHkgdG8gQ1NTIHRhYmxlcyB3 aXRoIHJlc3BlY3QgdG8gdGFibGUgcGFkZGluZ3MgYW5kIGJvcmRlcnMuCisKK09uIHN1Y2Nlc3Ms IHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJU RVNUIENPTVBMRVRFIi4KKworCitQQVNTIGNvbXB1dGVDU1NUYWJsZVdpZHRoKCd3aWR0aDogMjAw cHg7IGJvcmRlci1zdHlsZTogc29saWQ7IGJvcmRlci13aWR0aDogMTBweCAycHggMzBweCA0cHg7 IHBhZGRpbmc6IDUwcHggNnB4IDcwcHggOHB4OycpIGlzIDIyMAorUEFTUyBjb21wdXRlQ1NTVGFi bGVXaWR0aCgnd2lkdGg6IDIwMHB4OyBib3JkZXItc3R5bGU6IHNvbGlkOyBib3JkZXItd2lkdGg6 IDEwcHggMnB4IDMwcHggNHB4OyBwYWRkaW5nOiA1MHB4IDZweCA3MHB4IDhweDsgYm9yZGVyLWNv bGxhcHNlOiBjb2xsYXBzZTsnKSBpcyAyMDMKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRy dWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3RhYmxl L2Nzcy10YWJsZS13aWR0aC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC90YWJsZS9jc3MtdGFibGUt d2lkdGguaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zZTIwZDhlCi0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC90YWJsZS9jc3MtdGFibGUtd2lkdGgu aHRtbApAQCAtMCwwICsxLDEwIEBACis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0vL0lFVEYvL0RU RCBIVE1MLy9FTiI+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uL2pzL3Jlc291cmNl cy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxzY3JpcHQgc3Jj PSJzY3JpcHQtdGVzdHMvY3NzLXRhYmxlLXdpZHRoLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3Jj PSIuLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwv aHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvdGFibGUvc2NyaXB0LXRlc3RzL2Nz cy10YWJsZS13aWR0aC5qcyBiL0xheW91dFRlc3RzL2Zhc3QvdGFibGUvc2NyaXB0LXRlc3RzL2Nz cy10YWJsZS13aWR0aC5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi40ZmE2 NTBmCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC90YWJsZS9zY3JpcHQtdGVz dHMvY3NzLXRhYmxlLXdpZHRoLmpzCkBAIC0wLDAgKzEsNDAgQEAKK2Rlc2NyaXB0aW9uKAorIlRo aXMgdGVzdCBjaGVja3MgdGhhdCB0aGUgd2lkdGggc3R5bGUgaXMgYXBwbGllZCBjb3JyZWN0bHkg dG8gQ1NTIHRhYmxlcyB3aXRoIHJlc3BlY3QgdG8gdGFibGUgcGFkZGluZ3MgYW5kIGJvcmRlcnMu IgorKTsKKworZnVuY3Rpb24gY29tcHV0ZUNTU1RhYmxlV2lkdGgoZXh0cmFUYWJsZVN0eWxlKQor eworICAgIHZhciB0YWJsZVBhcmVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwor ICAgIHRhYmxlUGFyZW50LnNldEF0dHJpYnV0ZSgic3R5bGUiLCAid2lkdGg6IDEwMDBweDsiKTsK KworICAgIHZhciB0YWJsZSA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgIHRh YmxlLnNldEF0dHJpYnV0ZSgic3R5bGUiLCAiZGlzcGxheTogdGFibGU7ICIgKyBleHRyYVRhYmxl U3R5bGUpOworCisgICAgdmFyIHJvd0dyb3VwID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2 Iik7CisgICAgcm93R3JvdXAuc2V0QXR0cmlidXRlKCJzdHlsZSIsICJkaXNwbGF5OiB0YWJsZS1y b3ctZ3JvdXA7Iik7CisKKyAgICB2YXIgcm93ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2 Iik7CisgICAgcm93LnNldEF0dHJpYnV0ZSgic3R5bGUiLCAiZGlzcGxheTogdGFibGUtcm93OyIp OworCisgICAgdmFyIGNlbGwgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICBj ZWxsLnNldEF0dHJpYnV0ZSgic3R5bGUiLCAiZGlzcGxheTogdGFibGUtY2VsbDsiKTsKKworICAg IHZhciBjZWxsQ29udGVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgIGNl bGxDb250ZW50LnNldEF0dHJpYnV0ZSgic3R5bGUiLCAid2lkdGg6IDEwMHB4OyBoZWlnaHQ6IDUw cHg7IGJhY2tncm91bmQtY29sb3I6ICMwOTA7Iik7CisKKyAgICBkb2N1bWVudC5ib2R5LmFwcGVu ZENoaWxkKHRhYmxlUGFyZW50KTsKKyAgICB0YWJsZVBhcmVudC5hcHBlbmRDaGlsZCh0YWJsZSk7 CisgICAgdGFibGUuYXBwZW5kQ2hpbGQocm93R3JvdXApOworICAgIHJvd0dyb3VwLmFwcGVuZENo aWxkKHJvdyk7CisgICAgcm93LmFwcGVuZENoaWxkKGNlbGwpOworICAgIGNlbGwuYXBwZW5kQ2hp bGQoY2VsbENvbnRlbnQpOworCisgICAgdmFyIHRhYmxlV2lkdGggPSB0YWJsZS5vZmZzZXRXaWR0 aDsKKworICAgIGRvY3VtZW50LmJvZHkucmVtb3ZlQ2hpbGQodGFibGVQYXJlbnQpOworCisgICAg cmV0dXJuIHRhYmxlV2lkdGg7Cit9CisKK3Nob3VsZEV2YWx1YXRlVG8oImNvbXB1dGVDU1NUYWJs ZVdpZHRoKCd3aWR0aDogMjAwcHg7IGJvcmRlci1zdHlsZTogc29saWQ7IGJvcmRlci13aWR0aDog MTBweCAycHggMzBweCA0cHg7IHBhZGRpbmc6IDUwcHggNnB4IDcwcHggOHB4OycpIiwgMjAwKzIr NCs2KzgpOworc2hvdWxkRXZhbHVhdGVUbygiY29tcHV0ZUNTU1RhYmxlV2lkdGgoJ3dpZHRoOiAy MDBweDsgYm9yZGVyLXN0eWxlOiBzb2xpZDsgYm9yZGVyLXdpZHRoOiAxMHB4IDJweCAzMHB4IDRw eDsgcGFkZGluZzogNTBweCA2cHggNzBweCA4cHg7IGJvcmRlci1jb2xsYXBzZTogY29sbGFwc2U7 JykiLCAyMDAgKyAoMis0KS8yKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2ZTZiNmU2Li4yNWFiODcxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMTItMjAgIE1heCBWdWpvdmljICA8bXZ1am92 aWNAYWRvYmUuY29tPgorCisgICAgICAgIFdlYktpdCBhZGRzIHZlcnRpY2FsIHBhZGRpbmdzIGFu ZCBib3JkZXJzIHRvIHRoZSBmaXhlZCB3aWR0aCBvZiBDU1MgdGFibGVzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NDk1NQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGZhc3QvdGFibGUvY3NzLXRh YmxlLXdpZHRoLmh0bWw6CisgICAgICAgIENoYW5nZWQgdGhlIHdpZHRoIGNhbGN1bGF0aW9uIGZv ciBDU1MgdGFibGVzIHRvIHRha2UgaW50byBhY2NvdW50IGhvcml6b250YWwKKyAgICAgICAgcGFk ZGluZ3MgYW5kIGJvcmRlcnMgaW5zdGVhZCBvZiB2ZXJ0aWNhbCBwYWRkaW5ncyBhbmQgYm9yZGVy cy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJUYWJsZTo6Y29tcHV0ZUxvZ2ljYWxXaWR0aCk6CisKIDIwMTEtMTItMTkgIEFk YW0gS2xlaW4gIDxhZGFta0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmVuYW1lIEVsZW1lbnQ6 OnNldEF0dHJpYnV0ZU1hcCB0byBwYXJzZXJTZXRBdHRyaWJ1dGVNYXAgYW5kIGxpbWl0IGl0cyB1 c2UgdG8gdGhlIHBhcnNlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRhYmxlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHAK aW5kZXggMzJmN2FiMS4uNTZhZjRhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRhYmxlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGFibGUuY3BwCkBAIC0yMzAsMTQgKzIzMCwxMiBAQCB2b2lkIFJlbmRlclRhYmxlOjpjb21wdXRl TG9naWNhbFdpZHRoKCkKICAgICBpZiAobG9naWNhbFdpZHRoVHlwZSA+IFJlbGF0aXZlICYmIHN0 eWxlKCktPmxvZ2ljYWxXaWR0aCgpLmlzUG9zaXRpdmUoKSkgewogICAgICAgICAvLyBQZXJjZW50 IG9yIGZpeGVkIHRhYmxlCiAgICAgICAgIC8vIEhUTUwgdGFibGVzIHNpemUgYXMgdGhvdWdoIENT UyB3aWR0aCBpbmNsdWRlcyBib3JkZXIvcGFkZGluZywgQ1NTIHRhYmxlcyBkbyBub3QuCi0gICAg ICAgIExheW91dFVuaXQgYm9yZGVycyA9IDA7CisgICAgICAgIExheW91dFVuaXQgYm9yZGVyc0Fu ZFBhZGRpbmcgPSAwOwogICAgICAgICBpZiAobG9naWNhbFdpZHRoVHlwZSAhPSBQZXJjZW50ICYm ICghbm9kZSgpIHx8ICFub2RlKCktPmhhc1RhZ05hbWUodGFibGVUYWcpKSkgewotICAgICAgICAg ICAgYm9vbCBjb2xsYXBzaW5nID0gY29sbGFwc2VCb3JkZXJzKCk7Ci0gICAgICAgICAgICBMYXlv dXRVbml0IGJvcmRlckFuZFBhZGRpbmdCZWZvcmUgPSBib3JkZXJCZWZvcmUoKSArIChjb2xsYXBz aW5nID8gMCA6IHBhZGRpbmdCZWZvcmUoKSk7Ci0gICAgICAgICAgICBMYXlvdXRVbml0IGJvcmRl ckFuZFBhZGRpbmdBZnRlciA9IGJvcmRlckFmdGVyKCkgKyAoY29sbGFwc2luZyA/IDAgOiBwYWRk aW5nQWZ0ZXIoKSk7Ci0gICAgICAgICAgICBib3JkZXJzID0gYm9yZGVyQW5kUGFkZGluZ0JlZm9y ZSArIGJvcmRlckFuZFBhZGRpbmdBZnRlcjsKLSAgICAgICAgfQotICAgICAgICBzZXRMb2dpY2Fs V2lkdGgoc3R5bGUoKS0+bG9naWNhbFdpZHRoKCkuY2FsY01pblZhbHVlKGNvbnRhaW5lcldpZHRo SW5JbmxpbmVEaXJlY3Rpb24pICsgYm9yZGVycyk7CisgICAgICAgICAgICByZWNhbGNCb3JkZXJz SW5Sb3dEaXJlY3Rpb24oKTsKKyAgICAgICAgICAgIGJvcmRlcnNBbmRQYWRkaW5nID0gYm9yZGVy U3RhcnQoKSArIGJvcmRlckVuZCgpICsgKGNvbGxhcHNlQm9yZGVycygpID8gMCA6IHBhZGRpbmdT dGFydCgpICsgcGFkZGluZ0VuZCgpKTsKKyAgICAgICAgIH0KKyAgICAgICAgc2V0TG9naWNhbFdp ZHRoKHN0eWxlKCktPmxvZ2ljYWxXaWR0aCgpLmNhbGNNaW5WYWx1ZShjb250YWluZXJXaWR0aElu SW5saW5lRGlyZWN0aW9uKSArIGJvcmRlcnNBbmRQYWRkaW5nKTsKICAgICAgICAgc2V0TG9naWNh bFdpZHRoKG1heChtaW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSwgbG9naWNhbFdpZHRoKCkpKTsK ICAgICB9IGVsc2UgewogICAgICAgICAvLyBTdWJ0cmFjdCBvdXQgYW55IGZpeGVkIG1hcmdpbnMg ZnJvbSBvdXIgYXZhaWxhYmxlIHdpZHRoIGZvciBhdXRvIHdpZHRoIHRhYmxlcy4K 121122 2012-01-04 10:22:32 -0800 2012-01-05 04:23:58 -0800 Patch 74955.patch text/plain 16169 mvujovic ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1MzIzYzZhLi44YTM1NjliIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTItMDEt MDQgIE1heCBWdWpvdmljICA8bXZ1am92aWNAYWRvYmUuY29tPgorCisgICAgICAgIFdlYktpdCBh ZGRzIHZlcnRpY2FsIHBhZGRpbmdzIGFuZCBib3JkZXJzIHRvIHRoZSBmaXhlZCB3aWR0aCBvZiBD U1MgdGFibGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD03NDk1NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEFkZGVkIHRlc3RzIHRvIGNoZWNrIHRoYXQgdGhlIGZpeGVkIHdpZHRoIHN0eWxlIGlzIGFwcGxp ZWQgY29ycmVjdGx5IHRvIAorICAgICAgICBDU1MgdGFibGVzIHdpdGggcmVzcGVjdCB0byB0YWJs ZSBwYWRkaW5ncyBhbmQgYm9yZGVycy4KKworICAgICAgICAqIGZhc3QvdGFibGUvY3NzLXRhYmxl LXdpZHRoLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC90YWJsZS9jc3MtdGFi bGUtd2lkdGguaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC90YWJsZS9zY3JpcHQtdGVzdHMv Y3NzLXRhYmxlLXdpZHRoLmpzOiBBZGRlZC4KKyAgICAgICAgKGNvbXB1dGVDU1NUYWJsZU9mZnNl dFdpZHRoKToKKyAgICAgICAgKGNvbXB1dGVDU1NUYWJsZU9mZnNldEhlaWdodCk6CisgICAgICAg IChjb21wdXRlQ1NTVGFibGVQcm9wZXJ0eSk6CisKIDIwMTItMDEtMDMgIEFsZXhpcyBNZW5hcmQg IDxhbGV4aXMubWVuYXJkQG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgZ2V0Q29tcHV0ZWRTdHls ZSBmb3Igb3V0bGluZSBpcyBub3QgaW1wbGVtZW50ZWQuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9mYXN0L3RhYmxlL2Nzcy10YWJsZS13aWR0aC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9m YXN0L3RhYmxlL2Nzcy10YWJsZS13aWR0aC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMC4uOTUwMTk2NAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L2Zhc3QvdGFibGUvY3NzLXRhYmxlLXdpZHRoLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDI5IEBA CitUaGlzIHRlc3QgY2hlY2tzIHRoYXQgdGhlIHdpZHRoIHN0eWxlIGlzIGFwcGxpZWQgY29ycmVj dGx5IHRvIENTUyB0YWJsZXMgd2l0aCByZXNwZWN0IHRvIHRhYmxlIHBhZGRpbmdzIGFuZCBib3Jk ZXJzLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3Nh Z2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworUEFTUyBjb21wdXRlQ1NTVGFi bGVPZmZzZXRXaWR0aCgnd2lkdGg6IDIwMHB4OyBoZWlnaHQ6IDE1MHB4OyBib3JkZXItc3R5bGU6 IHNvbGlkOyBib3JkZXItd2lkdGg6IDEwcHggMnB4IDMwcHggNHB4OyBwYWRkaW5nOiA1MHB4IDZw eCA3MHB4IDhweDsnKSBpcyAyMjAKK1BBU1MgY29tcHV0ZUNTU1RhYmxlT2Zmc2V0V2lkdGgoJ3dp ZHRoOiAyMDBweDsgaGVpZ2h0OiAxNTBweDsgYm9yZGVyLXN0eWxlOiBzb2xpZDsgYm9yZGVyLXdp ZHRoOiAxMHB4IDJweCAzMHB4IDRweDsgcGFkZGluZzogNTBweCA2cHggNzBweCA4cHg7IGRpcmVj dGlvbjogcnRsOycpIGlzIDIyMAorUEFTUyBjb21wdXRlQ1NTVGFibGVPZmZzZXRIZWlnaHQoJ3dp ZHRoOiAyMDBweDsgaGVpZ2h0OiAxNTBweDsgYm9yZGVyLXN0eWxlOiBzb2xpZDsgYm9yZGVyLXdp ZHRoOiAxMHB4IDJweCAzMHB4IDRweDsgcGFkZGluZzogNTBweCA2cHggNzBweCA4cHg7IC13ZWJr aXQtd3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1ybDsgd3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1ybDsn KSBpcyAzMTAKK1BBU1MgY29tcHV0ZUNTU1RhYmxlT2Zmc2V0SGVpZ2h0KCd3aWR0aDogMjAwcHg7 IGhlaWdodDogMTUwcHg7IGJvcmRlci1zdHlsZTogc29saWQ7IGJvcmRlci13aWR0aDogMTBweCAy cHggMzBweCA0cHg7IHBhZGRpbmc6IDUwcHggNnB4IDcwcHggOHB4OyAtd2Via2l0LXdyaXRpbmct bW9kZTogdmVydGljYWwtcmw7IHdyaXRpbmctbW9kZTogdmVydGljYWwtcmw7IC13ZWJraXQtdGV4 dC1vcmllbnRhdGlvbjogdXByaWdodDsgdGV4dC1vcmllbnRhdGlvbjogdXByaWdodDsnKSBpcyAz MTAKK1BBU1MgY29tcHV0ZUNTU1RhYmxlT2Zmc2V0SGVpZ2h0KCd3aWR0aDogMjAwcHg7IGhlaWdo dDogMTUwcHg7IGJvcmRlci1zdHlsZTogc29saWQ7IGJvcmRlci13aWR0aDogMTBweCAycHggMzBw eCA0cHg7IHBhZGRpbmc6IDUwcHggNnB4IDcwcHggOHB4OyAtd2Via2l0LXdyaXRpbmctbW9kZTog dmVydGljYWwtcmw7IHdyaXRpbmctbW9kZTogdmVydGljYWwtcmw7IGRpcmVjdGlvbjogcnRsOycp IGlzIDMxMAorUEFTUyBjb21wdXRlQ1NTVGFibGVPZmZzZXRIZWlnaHQoJ3dpZHRoOiAyMDBweDsg aGVpZ2h0OiAxNTBweDsgYm9yZGVyLXN0eWxlOiBzb2xpZDsgYm9yZGVyLXdpZHRoOiAxMHB4IDJw eCAzMHB4IDRweDsgcGFkZGluZzogNTBweCA2cHggNzBweCA4cHg7IC13ZWJraXQtd3JpdGluZy1t b2RlOiB2ZXJ0aWNhbC1ybDsgd3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1ybDsgZGlyZWN0aW9uOiBy dGw7IC13ZWJraXQtdGV4dC1vcmllbnRhdGlvbjogdXByaWdodDsgdGV4dC1vcmllbnRhdGlvbjog dXByaWdodDsnKSBpcyAzMTAKK1BBU1MgY29tcHV0ZUNTU1RhYmxlT2Zmc2V0SGVpZ2h0KCd3aWR0 aDogMjAwcHg7IGhlaWdodDogMTUwcHg7IGJvcmRlci1zdHlsZTogc29saWQ7IGJvcmRlci13aWR0 aDogMTBweCAycHggMzBweCA0cHg7IHBhZGRpbmc6IDUwcHggNnB4IDcwcHggOHB4OyAtd2Via2l0 LXdyaXRpbmctbW9kZTogdmVydGljYWwtbHI7IHdyaXRpbmctbW9kZTogdmVydGljYWwtbHI7Jykg aXMgMzEwCitQQVNTIGNvbXB1dGVDU1NUYWJsZU9mZnNldEhlaWdodCgnd2lkdGg6IDIwMHB4OyBo ZWlnaHQ6IDE1MHB4OyBib3JkZXItc3R5bGU6IHNvbGlkOyBib3JkZXItd2lkdGg6IDEwcHggMnB4 IDMwcHggNHB4OyBwYWRkaW5nOiA1MHB4IDZweCA3MHB4IDhweDsgLXdlYmtpdC13cml0aW5nLW1v ZGU6IHZlcnRpY2FsLWxyOyB3cml0aW5nLW1vZGU6IHZlcnRpY2FsLWxyOyAtd2Via2l0LXRleHQt b3JpZW50YXRpb246IHVwcmlnaHQ7IHRleHQtb3JpZW50YXRpb246IHVwcmlnaHQ7JykgaXMgMzEw CitQQVNTIGNvbXB1dGVDU1NUYWJsZU9mZnNldEhlaWdodCgnd2lkdGg6IDIwMHB4OyBoZWlnaHQ6 IDE1MHB4OyBib3JkZXItc3R5bGU6IHNvbGlkOyBib3JkZXItd2lkdGg6IDEwcHggMnB4IDMwcHgg NHB4OyBwYWRkaW5nOiA1MHB4IDZweCA3MHB4IDhweDsgLXdlYmtpdC13cml0aW5nLW1vZGU6IHZl cnRpY2FsLWxyOyB3cml0aW5nLW1vZGU6IHZlcnRpY2FsLWxyOyBkaXJlY3Rpb246IHJ0bDsnKSBp cyAzMTAKK1BBU1MgY29tcHV0ZUNTU1RhYmxlT2Zmc2V0SGVpZ2h0KCd3aWR0aDogMjAwcHg7IGhl aWdodDogMTUwcHg7IGJvcmRlci1zdHlsZTogc29saWQ7IGJvcmRlci13aWR0aDogMTBweCAycHgg MzBweCA0cHg7IHBhZGRpbmc6IDUwcHggNnB4IDcwcHggOHB4OyAtd2Via2l0LXdyaXRpbmctbW9k ZTogdmVydGljYWwtbHI7IHdyaXRpbmctbW9kZTogdmVydGljYWwtbHI7IGRpcmVjdGlvbjogcnRs OyAtd2Via2l0LXRleHQtb3JpZW50YXRpb246IHVwcmlnaHQ7IHRleHQtb3JpZW50YXRpb246IHVw cmlnaHQ7JykgaXMgMzEwCitQQVNTIGNvbXB1dGVDU1NUYWJsZU9mZnNldFdpZHRoKCd3aWR0aDog MjAwcHg7IGhlaWdodDogMTUwcHg7IGJvcmRlci1zdHlsZTogc29saWQ7IGJvcmRlci13aWR0aDog MTBweCAycHggMzBweCA0cHg7IHBhZGRpbmc6IDUwcHggNnB4IDcwcHggOHB4OyBib3JkZXItY29s bGFwc2U6IGNvbGxhcHNlOycpIGlzIDIwMworUEFTUyBjb21wdXRlQ1NTVGFibGVPZmZzZXRXaWR0 aCgnd2lkdGg6IDIwMHB4OyBoZWlnaHQ6IDE1MHB4OyBib3JkZXItc3R5bGU6IHNvbGlkOyBib3Jk ZXItd2lkdGg6IDEwcHggMnB4IDMwcHggNHB4OyBwYWRkaW5nOiA1MHB4IDZweCA3MHB4IDhweDsg Ym9yZGVyLWNvbGxhcHNlOiBjb2xsYXBzZTsgZGlyZWN0aW9uOiBydGw7JykgaXMgMjAzCitQQVNT IGNvbXB1dGVDU1NUYWJsZU9mZnNldEhlaWdodCgnd2lkdGg6IDIwMHB4OyBoZWlnaHQ6IDE1MHB4 OyBib3JkZXItc3R5bGU6IHNvbGlkOyBib3JkZXItd2lkdGg6IDEwcHggMnB4IDMwcHggNHB4OyBw YWRkaW5nOiA1MHB4IDZweCA3MHB4IDhweDsgYm9yZGVyLWNvbGxhcHNlOiBjb2xsYXBzZTsgLXdl YmtpdC13cml0aW5nLW1vZGU6IHZlcnRpY2FsLXJsOyB3cml0aW5nLW1vZGU6IHZlcnRpY2FsLXJs OycpIGlzIDE3MAorUEFTUyBjb21wdXRlQ1NTVGFibGVPZmZzZXRIZWlnaHQoJ3dpZHRoOiAyMDBw eDsgaGVpZ2h0OiAxNTBweDsgYm9yZGVyLXN0eWxlOiBzb2xpZDsgYm9yZGVyLXdpZHRoOiAxMHB4 IDJweCAzMHB4IDRweDsgcGFkZGluZzogNTBweCA2cHggNzBweCA4cHg7IGJvcmRlci1jb2xsYXBz ZTogY29sbGFwc2U7IC13ZWJraXQtd3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1ybDsgd3JpdGluZy1t b2RlOiB2ZXJ0aWNhbC1ybDsgLXdlYmtpdC10ZXh0LW9yaWVudGF0aW9uOiB1cHJpZ2h0OyB0ZXh0 LW9yaWVudGF0aW9uOiB1cHJpZ2h0OycpIGlzIDE3MAorUEFTUyBjb21wdXRlQ1NTVGFibGVPZmZz ZXRIZWlnaHQoJ3dpZHRoOiAyMDBweDsgaGVpZ2h0OiAxNTBweDsgYm9yZGVyLXN0eWxlOiBzb2xp ZDsgYm9yZGVyLXdpZHRoOiAxMHB4IDJweCAzMHB4IDRweDsgcGFkZGluZzogNTBweCA2cHggNzBw eCA4cHg7IGJvcmRlci1jb2xsYXBzZTogY29sbGFwc2U7IC13ZWJraXQtd3JpdGluZy1tb2RlOiB2 ZXJ0aWNhbC1ybDsgd3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1ybDsgZGlyZWN0aW9uOiBydGw7Jykg aXMgMTcwCitQQVNTIGNvbXB1dGVDU1NUYWJsZU9mZnNldEhlaWdodCgnd2lkdGg6IDIwMHB4OyBo ZWlnaHQ6IDE1MHB4OyBib3JkZXItc3R5bGU6IHNvbGlkOyBib3JkZXItd2lkdGg6IDEwcHggMnB4 IDMwcHggNHB4OyBwYWRkaW5nOiA1MHB4IDZweCA3MHB4IDhweDsgYm9yZGVyLWNvbGxhcHNlOiBj b2xsYXBzZTsgLXdlYmtpdC13cml0aW5nLW1vZGU6IHZlcnRpY2FsLXJsOyB3cml0aW5nLW1vZGU6 IHZlcnRpY2FsLXJsOyBkaXJlY3Rpb246IHJ0bDsgLXdlYmtpdC10ZXh0LW9yaWVudGF0aW9uOiB1 cHJpZ2h0OyB0ZXh0LW9yaWVudGF0aW9uOiB1cHJpZ2h0OycpIGlzIDE3MAorUEFTUyBjb21wdXRl Q1NTVGFibGVPZmZzZXRIZWlnaHQoJ3dpZHRoOiAyMDBweDsgaGVpZ2h0OiAxNTBweDsgYm9yZGVy LXN0eWxlOiBzb2xpZDsgYm9yZGVyLXdpZHRoOiAxMHB4IDJweCAzMHB4IDRweDsgcGFkZGluZzog NTBweCA2cHggNzBweCA4cHg7IGJvcmRlci1jb2xsYXBzZTogY29sbGFwc2U7IC13ZWJraXQtd3Jp dGluZy1tb2RlOiB2ZXJ0aWNhbC1scjsgd3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1scjsnKSBpcyAx NzAKK1BBU1MgY29tcHV0ZUNTU1RhYmxlT2Zmc2V0SGVpZ2h0KCd3aWR0aDogMjAwcHg7IGhlaWdo dDogMTUwcHg7IGJvcmRlci1zdHlsZTogc29saWQ7IGJvcmRlci13aWR0aDogMTBweCAycHggMzBw eCA0cHg7IHBhZGRpbmc6IDUwcHggNnB4IDcwcHggOHB4OyBib3JkZXItY29sbGFwc2U6IGNvbGxh cHNlOyAtd2Via2l0LXdyaXRpbmctbW9kZTogdmVydGljYWwtbHI7IHdyaXRpbmctbW9kZTogdmVy dGljYWwtbHI7IC13ZWJraXQtdGV4dC1vcmllbnRhdGlvbjogdXByaWdodDsgdGV4dC1vcmllbnRh dGlvbjogdXByaWdodDsnKSBpcyAxNzAKK1BBU1MgY29tcHV0ZUNTU1RhYmxlT2Zmc2V0SGVpZ2h0 KCd3aWR0aDogMjAwcHg7IGhlaWdodDogMTUwcHg7IGJvcmRlci1zdHlsZTogc29saWQ7IGJvcmRl ci13aWR0aDogMTBweCAycHggMzBweCA0cHg7IHBhZGRpbmc6IDUwcHggNnB4IDcwcHggOHB4OyBi b3JkZXItY29sbGFwc2U6IGNvbGxhcHNlOyAtd2Via2l0LXdyaXRpbmctbW9kZTogdmVydGljYWwt bHI7IHdyaXRpbmctbW9kZTogdmVydGljYWwtbHI7IGRpcmVjdGlvbjogcnRsOycpIGlzIDE3MAor UEFTUyBjb21wdXRlQ1NTVGFibGVPZmZzZXRIZWlnaHQoJ3dpZHRoOiAyMDBweDsgaGVpZ2h0OiAx NTBweDsgYm9yZGVyLXN0eWxlOiBzb2xpZDsgYm9yZGVyLXdpZHRoOiAxMHB4IDJweCAzMHB4IDRw eDsgcGFkZGluZzogNTBweCA2cHggNzBweCA4cHg7IGJvcmRlci1jb2xsYXBzZTogY29sbGFwc2U7 IC13ZWJraXQtd3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1scjsgd3JpdGluZy1tb2RlOiB2ZXJ0aWNh bC1scjsgZGlyZWN0aW9uOiBydGw7IC13ZWJraXQtdGV4dC1vcmllbnRhdGlvbjogdXByaWdodDsg dGV4dC1vcmllbnRhdGlvbjogdXByaWdodDsnKSBpcyAxNzAKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFy c2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9m YXN0L3RhYmxlL2Nzcy10YWJsZS13aWR0aC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC90YWJsZS9j c3MtdGFibGUtd2lkdGguaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4z ZTIwZDhlCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC90YWJsZS9jc3MtdGFi bGUtd2lkdGguaHRtbApAQCAtMCwwICsxLDEwIEBACis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0v L0lFVEYvL0RURCBIVE1MLy9FTiI+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uL2pz L3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxz Y3JpcHQgc3JjPSJzY3JpcHQtdGVzdHMvY3NzLXRhYmxlLXdpZHRoLmpzIj48L3NjcmlwdD4KKzxz Y3JpcHQgc3JjPSIuLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwv Ym9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvdGFibGUvc2NyaXB0 LXRlc3RzL2Nzcy10YWJsZS13aWR0aC5qcyBiL0xheW91dFRlc3RzL2Zhc3QvdGFibGUvc2NyaXB0 LXRlc3RzL2Nzcy10YWJsZS13aWR0aC5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwLi4zMWRkMzUyCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC90YWJsZS9z Y3JpcHQtdGVzdHMvY3NzLXRhYmxlLXdpZHRoLmpzCkBAIC0wLDAgKzEsNzEgQEAKK2Rlc2NyaXB0 aW9uKCJUaGlzIHRlc3QgY2hlY2tzIHRoYXQgdGhlIHdpZHRoIHN0eWxlIGlzIGFwcGxpZWQgY29y cmVjdGx5IHRvIENTUyB0YWJsZXMgd2l0aCByZXNwZWN0IHRvIHRhYmxlIHBhZGRpbmdzIGFuZCBi b3JkZXJzLiIpOworCitmdW5jdGlvbiBjb21wdXRlQ1NTVGFibGVPZmZzZXRXaWR0aChleHRyYVRh YmxlU3R5bGUpCit7CisgICAgcmV0dXJuIGNvbXB1dGVDU1NUYWJsZVByb3BlcnR5KCdvZmZzZXRX aWR0aCcsIGV4dHJhVGFibGVTdHlsZSkKK30KKworZnVuY3Rpb24gY29tcHV0ZUNTU1RhYmxlT2Zm c2V0SGVpZ2h0KGV4dHJhVGFibGVTdHlsZSkKK3sKKyAgICByZXR1cm4gY29tcHV0ZUNTU1RhYmxl UHJvcGVydHkoJ29mZnNldEhlaWdodCcsIGV4dHJhVGFibGVTdHlsZSkKK30KKworZnVuY3Rpb24g Y29tcHV0ZUNTU1RhYmxlUHJvcGVydHkocHJvcGVydHlOYW1lLCBleHRyYVRhYmxlU3R5bGUpCit7 CisgICAgdmFyIHRhYmxlID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgdGFi bGUuc2V0QXR0cmlidXRlKCJzdHlsZSIsICJkaXNwbGF5OiB0YWJsZTsgIiArIGV4dHJhVGFibGVT dHlsZSk7CisKKyAgICB2YXIgcm93R3JvdXAgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYi KTsKKyAgICByb3dHcm91cC5zZXRBdHRyaWJ1dGUoInN0eWxlIiwgImRpc3BsYXk6IHRhYmxlLXJv dy1ncm91cDsiKTsKKworICAgIHZhciByb3cgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYi KTsKKyAgICByb3cuc2V0QXR0cmlidXRlKCJzdHlsZSIsICJkaXNwbGF5OiB0YWJsZS1yb3c7Iik7 CisKKyAgICB2YXIgY2VsbCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgIGNl bGwuc2V0QXR0cmlidXRlKCJzdHlsZSIsICJkaXNwbGF5OiB0YWJsZS1jZWxsOyIpOworCisgICAg dmFyIGNlbGxDb250ZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgY2Vs bENvbnRlbnQuc2V0QXR0cmlidXRlKCJzdHlsZSIsICJ3aWR0aDogMTAwcHg7IGhlaWdodDogNTBw eDsgYmFja2dyb3VuZC1jb2xvcjogIzA5MDsiKTsKKworICAgIGRvY3VtZW50LmJvZHkuYXBwZW5k Q2hpbGQodGFibGUpOworICAgIHRhYmxlLmFwcGVuZENoaWxkKHJvd0dyb3VwKTsKKyAgICByb3dH cm91cC5hcHBlbmRDaGlsZChyb3cpOworICAgIHJvdy5hcHBlbmRDaGlsZChjZWxsKTsKKyAgICBj ZWxsLmFwcGVuZENoaWxkKGNlbGxDb250ZW50KTsKKworICAgIHZhciBwcm9wZXJ0eVZhbHVlID0g dGFibGVbcHJvcGVydHlOYW1lXTsKKworICAgIGRvY3VtZW50LmJvZHkucmVtb3ZlQ2hpbGQodGFi bGUpOworCisgICAgcmV0dXJuIHByb3BlcnR5VmFsdWU7Cit9CisKKy8vIHNlcGFyYXRlZCBib3Jk ZXJzCisKK3Nob3VsZEV2YWx1YXRlVG8oImNvbXB1dGVDU1NUYWJsZU9mZnNldFdpZHRoKCd3aWR0 aDogMjAwcHg7IGhlaWdodDogMTUwcHg7IGJvcmRlci1zdHlsZTogc29saWQ7IGJvcmRlci13aWR0 aDogMTBweCAycHggMzBweCA0cHg7IHBhZGRpbmc6IDUwcHggNnB4IDcwcHggOHB4OycpIiwgMjAw KzIrNCs2KzgpOworc2hvdWxkRXZhbHVhdGVUbygiY29tcHV0ZUNTU1RhYmxlT2Zmc2V0V2lkdGgo J3dpZHRoOiAyMDBweDsgaGVpZ2h0OiAxNTBweDsgYm9yZGVyLXN0eWxlOiBzb2xpZDsgYm9yZGVy LXdpZHRoOiAxMHB4IDJweCAzMHB4IDRweDsgcGFkZGluZzogNTBweCA2cHggNzBweCA4cHg7IGRp cmVjdGlvbjogcnRsOycpIiwgMjAwKzIrNCs2KzgpOworCitzaG91bGRFdmFsdWF0ZVRvKCJjb21w dXRlQ1NTVGFibGVPZmZzZXRIZWlnaHQoJ3dpZHRoOiAyMDBweDsgaGVpZ2h0OiAxNTBweDsgYm9y ZGVyLXN0eWxlOiBzb2xpZDsgYm9yZGVyLXdpZHRoOiAxMHB4IDJweCAzMHB4IDRweDsgcGFkZGlu ZzogNTBweCA2cHggNzBweCA4cHg7IC13ZWJraXQtd3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1ybDsg d3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1ybDsnKSIsIDE1MCsxMCszMCs1MCs3MCk7CitzaG91bGRF dmFsdWF0ZVRvKCJjb21wdXRlQ1NTVGFibGVPZmZzZXRIZWlnaHQoJ3dpZHRoOiAyMDBweDsgaGVp Z2h0OiAxNTBweDsgYm9yZGVyLXN0eWxlOiBzb2xpZDsgYm9yZGVyLXdpZHRoOiAxMHB4IDJweCAz MHB4IDRweDsgcGFkZGluZzogNTBweCA2cHggNzBweCA4cHg7IC13ZWJraXQtd3JpdGluZy1tb2Rl OiB2ZXJ0aWNhbC1ybDsgd3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1ybDsgLXdlYmtpdC10ZXh0LW9y aWVudGF0aW9uOiB1cHJpZ2h0OyB0ZXh0LW9yaWVudGF0aW9uOiB1cHJpZ2h0OycpIiwgMTUwKzEw KzMwKzUwKzcwKTsKK3Nob3VsZEV2YWx1YXRlVG8oImNvbXB1dGVDU1NUYWJsZU9mZnNldEhlaWdo dCgnd2lkdGg6IDIwMHB4OyBoZWlnaHQ6IDE1MHB4OyBib3JkZXItc3R5bGU6IHNvbGlkOyBib3Jk ZXItd2lkdGg6IDEwcHggMnB4IDMwcHggNHB4OyBwYWRkaW5nOiA1MHB4IDZweCA3MHB4IDhweDsg LXdlYmtpdC13cml0aW5nLW1vZGU6IHZlcnRpY2FsLXJsOyB3cml0aW5nLW1vZGU6IHZlcnRpY2Fs LXJsOyBkaXJlY3Rpb246IHJ0bDsnKSIsIDE1MCsxMCszMCs1MCs3MCk7CitzaG91bGRFdmFsdWF0 ZVRvKCJjb21wdXRlQ1NTVGFibGVPZmZzZXRIZWlnaHQoJ3dpZHRoOiAyMDBweDsgaGVpZ2h0OiAx NTBweDsgYm9yZGVyLXN0eWxlOiBzb2xpZDsgYm9yZGVyLXdpZHRoOiAxMHB4IDJweCAzMHB4IDRw eDsgcGFkZGluZzogNTBweCA2cHggNzBweCA4cHg7IC13ZWJraXQtd3JpdGluZy1tb2RlOiB2ZXJ0 aWNhbC1ybDsgd3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1ybDsgZGlyZWN0aW9uOiBydGw7IC13ZWJr aXQtdGV4dC1vcmllbnRhdGlvbjogdXByaWdodDsgdGV4dC1vcmllbnRhdGlvbjogdXByaWdodDsn KSIsIDE1MCsxMCszMCs1MCs3MCk7CisKK3Nob3VsZEV2YWx1YXRlVG8oImNvbXB1dGVDU1NUYWJs ZU9mZnNldEhlaWdodCgnd2lkdGg6IDIwMHB4OyBoZWlnaHQ6IDE1MHB4OyBib3JkZXItc3R5bGU6 IHNvbGlkOyBib3JkZXItd2lkdGg6IDEwcHggMnB4IDMwcHggNHB4OyBwYWRkaW5nOiA1MHB4IDZw eCA3MHB4IDhweDsgLXdlYmtpdC13cml0aW5nLW1vZGU6IHZlcnRpY2FsLWxyOyB3cml0aW5nLW1v ZGU6IHZlcnRpY2FsLWxyOycpIiwgMTUwKzEwKzMwKzUwKzcwKTsKK3Nob3VsZEV2YWx1YXRlVG8o ImNvbXB1dGVDU1NUYWJsZU9mZnNldEhlaWdodCgnd2lkdGg6IDIwMHB4OyBoZWlnaHQ6IDE1MHB4 OyBib3JkZXItc3R5bGU6IHNvbGlkOyBib3JkZXItd2lkdGg6IDEwcHggMnB4IDMwcHggNHB4OyBw YWRkaW5nOiA1MHB4IDZweCA3MHB4IDhweDsgLXdlYmtpdC13cml0aW5nLW1vZGU6IHZlcnRpY2Fs LWxyOyB3cml0aW5nLW1vZGU6IHZlcnRpY2FsLWxyOyAtd2Via2l0LXRleHQtb3JpZW50YXRpb246 IHVwcmlnaHQ7IHRleHQtb3JpZW50YXRpb246IHVwcmlnaHQ7JykiLCAxNTArMTArMzArNTArNzAp Oworc2hvdWxkRXZhbHVhdGVUbygiY29tcHV0ZUNTU1RhYmxlT2Zmc2V0SGVpZ2h0KCd3aWR0aDog MjAwcHg7IGhlaWdodDogMTUwcHg7IGJvcmRlci1zdHlsZTogc29saWQ7IGJvcmRlci13aWR0aDog MTBweCAycHggMzBweCA0cHg7IHBhZGRpbmc6IDUwcHggNnB4IDcwcHggOHB4OyAtd2Via2l0LXdy aXRpbmctbW9kZTogdmVydGljYWwtbHI7IHdyaXRpbmctbW9kZTogdmVydGljYWwtbHI7IGRpcmVj dGlvbjogcnRsOycpIiwgMTUwKzEwKzMwKzUwKzcwKTsKK3Nob3VsZEV2YWx1YXRlVG8oImNvbXB1 dGVDU1NUYWJsZU9mZnNldEhlaWdodCgnd2lkdGg6IDIwMHB4OyBoZWlnaHQ6IDE1MHB4OyBib3Jk ZXItc3R5bGU6IHNvbGlkOyBib3JkZXItd2lkdGg6IDEwcHggMnB4IDMwcHggNHB4OyBwYWRkaW5n OiA1MHB4IDZweCA3MHB4IDhweDsgLXdlYmtpdC13cml0aW5nLW1vZGU6IHZlcnRpY2FsLWxyOyB3 cml0aW5nLW1vZGU6IHZlcnRpY2FsLWxyOyBkaXJlY3Rpb246IHJ0bDsgLXdlYmtpdC10ZXh0LW9y aWVudGF0aW9uOiB1cHJpZ2h0OyB0ZXh0LW9yaWVudGF0aW9uOiB1cHJpZ2h0OycpIiwgMTUwKzEw KzMwKzUwKzcwKTsKKworLy8gY29sbGFwc2VkIGJvcmRlcnMKKworc2hvdWxkRXZhbHVhdGVUbygi Y29tcHV0ZUNTU1RhYmxlT2Zmc2V0V2lkdGgoJ3dpZHRoOiAyMDBweDsgaGVpZ2h0OiAxNTBweDsg Ym9yZGVyLXN0eWxlOiBzb2xpZDsgYm9yZGVyLXdpZHRoOiAxMHB4IDJweCAzMHB4IDRweDsgcGFk ZGluZzogNTBweCA2cHggNzBweCA4cHg7IGJvcmRlci1jb2xsYXBzZTogY29sbGFwc2U7JykiLCAy MDArKDIrNCkvMik7CitzaG91bGRFdmFsdWF0ZVRvKCJjb21wdXRlQ1NTVGFibGVPZmZzZXRXaWR0 aCgnd2lkdGg6IDIwMHB4OyBoZWlnaHQ6IDE1MHB4OyBib3JkZXItc3R5bGU6IHNvbGlkOyBib3Jk ZXItd2lkdGg6IDEwcHggMnB4IDMwcHggNHB4OyBwYWRkaW5nOiA1MHB4IDZweCA3MHB4IDhweDsg Ym9yZGVyLWNvbGxhcHNlOiBjb2xsYXBzZTsgZGlyZWN0aW9uOiBydGw7JykiLCAyMDArKDIrNCkv Mik7CisKK3Nob3VsZEV2YWx1YXRlVG8oImNvbXB1dGVDU1NUYWJsZU9mZnNldEhlaWdodCgnd2lk dGg6IDIwMHB4OyBoZWlnaHQ6IDE1MHB4OyBib3JkZXItc3R5bGU6IHNvbGlkOyBib3JkZXItd2lk dGg6IDEwcHggMnB4IDMwcHggNHB4OyBwYWRkaW5nOiA1MHB4IDZweCA3MHB4IDhweDsgYm9yZGVy LWNvbGxhcHNlOiBjb2xsYXBzZTsgLXdlYmtpdC13cml0aW5nLW1vZGU6IHZlcnRpY2FsLXJsOyB3 cml0aW5nLW1vZGU6IHZlcnRpY2FsLXJsOycpIiwgMTUwKygxMCszMCkvMik7CitzaG91bGRFdmFs dWF0ZVRvKCJjb21wdXRlQ1NTVGFibGVPZmZzZXRIZWlnaHQoJ3dpZHRoOiAyMDBweDsgaGVpZ2h0 OiAxNTBweDsgYm9yZGVyLXN0eWxlOiBzb2xpZDsgYm9yZGVyLXdpZHRoOiAxMHB4IDJweCAzMHB4 IDRweDsgcGFkZGluZzogNTBweCA2cHggNzBweCA4cHg7IGJvcmRlci1jb2xsYXBzZTogY29sbGFw c2U7IC13ZWJraXQtd3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1ybDsgd3JpdGluZy1tb2RlOiB2ZXJ0 aWNhbC1ybDsgLXdlYmtpdC10ZXh0LW9yaWVudGF0aW9uOiB1cHJpZ2h0OyB0ZXh0LW9yaWVudGF0 aW9uOiB1cHJpZ2h0OycpIiwgMTUwKygxMCszMCkvMik7CitzaG91bGRFdmFsdWF0ZVRvKCJjb21w dXRlQ1NTVGFibGVPZmZzZXRIZWlnaHQoJ3dpZHRoOiAyMDBweDsgaGVpZ2h0OiAxNTBweDsgYm9y ZGVyLXN0eWxlOiBzb2xpZDsgYm9yZGVyLXdpZHRoOiAxMHB4IDJweCAzMHB4IDRweDsgcGFkZGlu ZzogNTBweCA2cHggNzBweCA4cHg7IGJvcmRlci1jb2xsYXBzZTogY29sbGFwc2U7IC13ZWJraXQt d3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1ybDsgd3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1ybDsgZGly ZWN0aW9uOiBydGw7JykiLCAxNTArKDEwKzMwKS8yKTsKK3Nob3VsZEV2YWx1YXRlVG8oImNvbXB1 dGVDU1NUYWJsZU9mZnNldEhlaWdodCgnd2lkdGg6IDIwMHB4OyBoZWlnaHQ6IDE1MHB4OyBib3Jk ZXItc3R5bGU6IHNvbGlkOyBib3JkZXItd2lkdGg6IDEwcHggMnB4IDMwcHggNHB4OyBwYWRkaW5n OiA1MHB4IDZweCA3MHB4IDhweDsgYm9yZGVyLWNvbGxhcHNlOiBjb2xsYXBzZTsgLXdlYmtpdC13 cml0aW5nLW1vZGU6IHZlcnRpY2FsLXJsOyB3cml0aW5nLW1vZGU6IHZlcnRpY2FsLXJsOyBkaXJl Y3Rpb246IHJ0bDsgLXdlYmtpdC10ZXh0LW9yaWVudGF0aW9uOiB1cHJpZ2h0OyB0ZXh0LW9yaWVu dGF0aW9uOiB1cHJpZ2h0OycpIiwgMTUwKygxMCszMCkvMik7CisKK3Nob3VsZEV2YWx1YXRlVG8o ImNvbXB1dGVDU1NUYWJsZU9mZnNldEhlaWdodCgnd2lkdGg6IDIwMHB4OyBoZWlnaHQ6IDE1MHB4 OyBib3JkZXItc3R5bGU6IHNvbGlkOyBib3JkZXItd2lkdGg6IDEwcHggMnB4IDMwcHggNHB4OyBw YWRkaW5nOiA1MHB4IDZweCA3MHB4IDhweDsgYm9yZGVyLWNvbGxhcHNlOiBjb2xsYXBzZTsgLXdl YmtpdC13cml0aW5nLW1vZGU6IHZlcnRpY2FsLWxyOyB3cml0aW5nLW1vZGU6IHZlcnRpY2FsLWxy OycpIiwgMTUwKygxMCszMCkvMik7CitzaG91bGRFdmFsdWF0ZVRvKCJjb21wdXRlQ1NTVGFibGVP ZmZzZXRIZWlnaHQoJ3dpZHRoOiAyMDBweDsgaGVpZ2h0OiAxNTBweDsgYm9yZGVyLXN0eWxlOiBz b2xpZDsgYm9yZGVyLXdpZHRoOiAxMHB4IDJweCAzMHB4IDRweDsgcGFkZGluZzogNTBweCA2cHgg NzBweCA4cHg7IGJvcmRlci1jb2xsYXBzZTogY29sbGFwc2U7IC13ZWJraXQtd3JpdGluZy1tb2Rl OiB2ZXJ0aWNhbC1scjsgd3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1scjsgLXdlYmtpdC10ZXh0LW9y aWVudGF0aW9uOiB1cHJpZ2h0OyB0ZXh0LW9yaWVudGF0aW9uOiB1cHJpZ2h0OycpIiwgMTUwKygx MCszMCkvMik7CitzaG91bGRFdmFsdWF0ZVRvKCJjb21wdXRlQ1NTVGFibGVPZmZzZXRIZWlnaHQo J3dpZHRoOiAyMDBweDsgaGVpZ2h0OiAxNTBweDsgYm9yZGVyLXN0eWxlOiBzb2xpZDsgYm9yZGVy LXdpZHRoOiAxMHB4IDJweCAzMHB4IDRweDsgcGFkZGluZzogNTBweCA2cHggNzBweCA4cHg7IGJv cmRlci1jb2xsYXBzZTogY29sbGFwc2U7IC13ZWJraXQtd3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1s cjsgd3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1scjsgZGlyZWN0aW9uOiBydGw7JykiLCAxNTArKDEw KzMwKS8yKTsKK3Nob3VsZEV2YWx1YXRlVG8oImNvbXB1dGVDU1NUYWJsZU9mZnNldEhlaWdodCgn d2lkdGg6IDIwMHB4OyBoZWlnaHQ6IDE1MHB4OyBib3JkZXItc3R5bGU6IHNvbGlkOyBib3JkZXIt d2lkdGg6IDEwcHggMnB4IDMwcHggNHB4OyBwYWRkaW5nOiA1MHB4IDZweCA3MHB4IDhweDsgYm9y ZGVyLWNvbGxhcHNlOiBjb2xsYXBzZTsgLXdlYmtpdC13cml0aW5nLW1vZGU6IHZlcnRpY2FsLWxy OyB3cml0aW5nLW1vZGU6IHZlcnRpY2FsLWxyOyBkaXJlY3Rpb246IHJ0bDsgLXdlYmtpdC10ZXh0 LW9yaWVudGF0aW9uOiB1cHJpZ2h0OyB0ZXh0LW9yaWVudGF0aW9uOiB1cHJpZ2h0OycpIiwgMTUw KygxMCszMCkvMik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzQzMWU3NS4uYTc4NTVkZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE4IEBACisyMDEyLTAxLTA0ICBNYXggVnVqb3ZpYyAgPG12dWpvdmljQGFkb2Jl LmNvbT4KKworICAgICAgICBXZWJLaXQgYWRkcyB2ZXJ0aWNhbCBwYWRkaW5ncyBhbmQgYm9yZGVy cyB0byB0aGUgZml4ZWQgd2lkdGggb2YgQ1NTIHRhYmxlcworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzQ5NTUKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBmYXN0L3RhYmxlL2Nzcy10YWJsZS13aWR0 aC5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyVGFibGU6OmNvbXB1dGVMb2dpY2FsV2lkdGgpOgorCisgICAgICAgICAg ICBDaGFuZ2VkIHRoZSB3aWR0aCBjYWxjdWxhdGlvbiBmb3IgQ1NTIHRhYmxlcyB0byB0YWtlIGlu dG8gYWNjb3VudCBob3Jpem9udGFsCisgICAgICAgICAgICBwYWRkaW5ncyBhbmQgYm9yZGVycyBp bnN0ZWFkIG9mIHZlcnRpY2FsIHBhZGRpbmdzIGFuZCBib3JkZXJzLgorCiAyMDEyLTAxLTAzICBL ZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2Vk LiBSZWJhc2VsaW5lZCBydW4tYmluZGluZ3MtdGVzdHMgcmVzdWx0cy4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwCmluZGV4IDZkMTJlNWYuLmE4ZWVmOWQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcApAQCAtMjMzLDExICsyMzMsOSBAQCB2 b2lkIFJlbmRlclRhYmxlOjpjb21wdXRlTG9naWNhbFdpZHRoKCkKICAgICAgICAgLy8gSFRNTCB0 YWJsZXMgc2l6ZSBhcyB0aG91Z2ggQ1NTIHdpZHRoIGluY2x1ZGVzIGJvcmRlci9wYWRkaW5nLCBD U1MgdGFibGVzIGRvIG5vdC4KICAgICAgICAgTGF5b3V0VW5pdCBib3JkZXJzID0gMDsKICAgICAg ICAgaWYgKGxvZ2ljYWxXaWR0aFR5cGUgIT0gUGVyY2VudCAmJiAoIW5vZGUoKSB8fCAhbm9kZSgp LT5oYXNUYWdOYW1lKHRhYmxlVGFnKSkpIHsKLSAgICAgICAgICAgIGJvb2wgY29sbGFwc2luZyA9 IGNvbGxhcHNlQm9yZGVycygpOwotICAgICAgICAgICAgTGF5b3V0VW5pdCBib3JkZXJBbmRQYWRk aW5nQmVmb3JlID0gYm9yZGVyQmVmb3JlKCkgKyAoY29sbGFwc2luZyA/IDAgOiBwYWRkaW5nQmVm b3JlKCkpOwotICAgICAgICAgICAgTGF5b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5nQWZ0ZXIgPSBi b3JkZXJBZnRlcigpICsgKGNvbGxhcHNpbmcgPyAwIDogcGFkZGluZ0FmdGVyKCkpOwotICAgICAg ICAgICAgYm9yZGVycyA9IGJvcmRlckFuZFBhZGRpbmdCZWZvcmUgKyBib3JkZXJBbmRQYWRkaW5n QWZ0ZXI7Ci0gICAgICAgIH0KKyAgICAgICAgICAgIHJlY2FsY0JvcmRlcnNJblJvd0RpcmVjdGlv bigpOworICAgICAgICAgICAgYm9yZGVycyA9IGJvcmRlclN0YXJ0KCkgKyBib3JkZXJFbmQoKSAr IChjb2xsYXBzZUJvcmRlcnMoKSA/IDAgOiBwYWRkaW5nU3RhcnQoKSArIHBhZGRpbmdFbmQoKSk7 CisgICAgICAgICB9CiAgICAgICAgIHNldExvZ2ljYWxXaWR0aChzdHlsZSgpLT5sb2dpY2FsV2lk dGgoKS5jYWxjTWluVmFsdWUoY29udGFpbmVyV2lkdGhJbklubGluZURpcmVjdGlvbikgKyBib3Jk ZXJzKTsKICAgICAgICAgc2V0TG9naWNhbFdpZHRoKG1heChtaW5QcmVmZXJyZWRMb2dpY2FsV2lk dGgoKSwgbG9naWNhbFdpZHRoKCkpKTsKICAgICB9IGVsc2Ugewo=