38249 2010-04-28 01:15:40 -0700 Vertically shrinking flexbox has wrong height when padding is specified 2010-05-01 00:07:21 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 yhayashi webkit-unassigned hamaji oldest_to_newest 218262 0 54536 yhayashi 2010-04-28 01:15:40 -0700 Created attachment 54536 HTML file to reproduce bug When a flexbox with non-zero box-flex property is resized to smaller size than the specified one, the height of the flexbox gets an unexpected value. If you open the attached HTML file, 100x100 mostly green box rendered is the expected result. However, current implementation renders 100x114 mostly green box. 218269 1 54538 yhayashi 2010-04-28 01:25:29 -0700 Created attachment 54538 Proposed Patch 218281 2 54538 hamaji 2010-04-28 02:20:42 -0700 Comment on attachment 54538 Proposed Patch Generally, this looks good. Putting r- for some style nitpicks. LayoutTests/fast/flexbox/child-flexing.html:37 + overflow-y: auto; Some properties are duplicated with verticalOuter. I'd write div.outer { width: 100px; height: 100px; ... } Also, I'm not sure we are setting overflow-y. I think overflow: auto would be fine. LayoutTests/fast/flexbox/child-flexing.html:35 + box-align: top; I don't think box-align is necessary to check this behavior? LayoutTests/fast/flexbox/child-flexing.html:43 + background-color: green; We usually use greens to mean "the test passes". I think it's better to choose a different color. LayoutTests/fast/flexbox/child-flexing.html:53 + border-left: 90px solid olive; As the bug summary contains the word "padding", I think it's better to check paddings as well. LayoutTests/fast/flexbox/child-flexing.html:124 + shouldBe("element.scrollHeight", "100"); I'd add debug("vertically expanding") above this line. In this way we can see which test is failing easily. Or, we can just change the shouldBe lines like shouldBe("document.getElementById('expandVertical')", "100"); LayoutTests/fast/flexbox/child-flexing-expected.txt:9 + horizontally shrinking These messages are unnecessary. It may be better to put all HTMLs above id="console" into a single <div> and remove the div if window.layoutTestController exists. Please check printing/script-tests/pageNumerForElementById.js as an example. 218306 3 54544 yhayashi 2010-04-28 03:40:59 -0700 Created attachment 54544 2010-04-28 Eric Seidel <eric@webkit.org> 218310 4 yhayashi 2010-04-28 03:45:34 -0700 Argh, wrong command line arg ended up uploading unrelated patch. Sorry for the noise. Will upload updated patch shortly. 218313 5 54547 yhayashi 2010-04-28 03:49:55 -0700 Created attachment 54547 Proposed Patch 2 219400 6 54547 hamaji 2010-04-30 01:47:53 -0700 Comment on attachment 54547 Proposed Patch 2 Looks good. The original C++ code was apparently wrong and the test case appropriately checks the code around the fix. I'd land this manually so I'm setting cq-. 219699 7 hamaji 2010-05-01 00:07:21 -0700 Committed r58630: <http://trac.webkit.org/changeset/58630> 54536 2010-04-28 01:15:40 -0700 2010-04-28 01:15:40 -0700 HTML file to reproduce bug flexbox-height.html text/html 830 yhayashi PGh0bWw+CjxoZWFkPgo8c3R5bGU+CmRpdi5ib3ggewogIGRpc3BsYXk6IC1tb3otYm94OwogIGRp c3BsYXk6IC1raHRtbC1ib3g7CiAgZGlzcGxheTogYm94Owp9CgpkaXYudmVydGljYWxPdXRlciB7 CiAgd2lkdGg6IDEwMHB4OwogIGhlaWdodDogMTAwcHg7CiAgYmFja2dyb3VuZC1jb2xvcjogcmVk OwogIC1tb3otYm94LW9yaWVudDogdmVydGljYWw7CiAgLWtodG1sLWJveC1vcmllbnQ6IHZlcnRp Y2FsOwogIGJveC1vcmllbnQ6IHZlcnRpY2FsOwogIC1tb3otYm94LWFsaWduOiB0b3A7CiAgLWto dG1sLWJveC1hbGlnbjogdG9wOwogIGJveC1hbGlnbjogdG9wOwogIHBvc2l0aW9uOiByZWxhdGl2 ZTsKICBvdmVyZmxvdy15OiBhdXRvOwp9CgpkaXYudmVydGljYWxNaWRkbGUgewogIHdpZHRoOiAx MDBweDsKICBoZWlnaHQ6IDkwcHg7CiAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47Cn0KCmRpdi5z aHJpbmtWZXJ0aWNhbEJvdHRvbSB7CiAgd2lkdGg6IDEwcHg7CiAgaGVpZ2h0OiAyMHB4OwogIGJh Y2tncm91bmQtY29sb3I6IGdyZWVuOwogIC1tb3otYm94LWZsZXg6IDE7CiAgLXdlYmtpdC1ib3gt ZmxleDogMTsKICBib3gtZmxleDogMTsKICBib3JkZXItbGVmdDogOTBweCBzb2xpZCBvbGl2ZTsK ICBib3JkZXItdG9wOiA0cHggc29saWQgYmx1ZTsKfQo8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5Pgo8 ZGl2IGNsYXNzPSJib3ggdmVydGljYWxPdXRlciIgaWQ9InNocmlua1ZlcnRpY2FsIj4KICA8ZGl2 IGNsYXNzPSJ2ZXJ0aWNhbE1pZGRsZSI+PC9kaXY+CiAgPGRpdiBjbGFzcz0ic2hyaW5rVmVydGlj YWxCb3R0b20iPjwvZGl2Pgo8L2Rpdj4KPC9ib2R5Pgo= 54538 2010-04-28 01:25:29 -0700 2010-04-28 03:49:45 -0700 Proposed Patch bug-38249-20100428172527.patch text/plain 6891 yhayashi ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA0YTE5YzkyODgwNWVlYmY4MGZiZjQ5M2QyMDBmNzVjOTQyZTc2Njg5Li4yZjc4YTZk NzAxMTJhODA3MzJhNzgzNDA3OWIwMzYxMDFlODhlNjg5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTAtMDQtMjggIFlvc2hpa2kgSGF5YXNoaSAgPHloYXlhc2hpQGdvb2dsZS5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM4MjQ5CisgICAgICAgIAorICAgICAgICBGaXhl cyBhbiBpc3N1ZSB3aGVyZSBib3JkZXIgaGVpZ2h0IGFuZCBwYWRkaW5nIGhlaWdodCBhcmUgaWdu b3JlZCB3aGVuIGNvbXB1dGluZyB2ZXJ0aWNhbGx5IHNocmlua2luZyBmbGV4Ym94J3MgaGVpZ2h0 LgorCisgICAgICAgICogZmFzdC9mbGV4Ym94L2NoaWxkLWZsZXhpbmctZXhwZWN0ZWQudHh0OiBB ZGRlZC4KKyAgICAgICAgKiBmYXN0L2ZsZXhib3gvY2hpbGQtZmxleGluZy5odG1sOiBBZGRlZC4K KwogMjAxMC0wNC0yNyAgWXV6byBGdWppc2hpbWEgIDx5dXpvQGdvb2dsZS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0 L2ZsZXhib3gvY2hpbGQtZmxleGluZy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2Zs ZXhib3gvY2hpbGQtZmxleGluZy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYWY0ODY2ZDI0NjVl ZWMyNDViZTM0YzA3ZWUzMGEwNTA3ZDY5YTc0OQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL2Zhc3QvZmxleGJveC9jaGlsZC1mbGV4aW5nLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDIy IEBACitDaGVjayBpZiBib3gtZmxleCBzcGVjaWZpZWQgZmxleGJveGVzIGV4cGFuZCBvciBzaHJp bmsgY29ycmVjdGx5LiBJZiB5b3Ugc2VlIGFueSBzY3JvbGxiYXJzLCB0aGVuIHRoZSB0ZXN0IGhh cyBmYWlsZWQuCisKK3ZlcnRpY2FsbHkgZXhwYW5kaW5nCisKK3ZlcnRpY2FsbHkgc2hyaW5raW5n CisKK2hvcml6b250YWxseSBleHBhbmRpbmcKKworaG9yaXpvbnRhbGx5IHNocmlua2luZworCitQ QVNTIGVsZW1lbnQuc2Nyb2xsSGVpZ2h0IGlzIDEwMAorUEFTUyBlbGVtZW50LnNjcm9sbFdpZHRo IGlzIDEwMAorUEFTUyBlbGVtZW50LnNjcm9sbEhlaWdodCBpcyAxMDAKK1BBU1MgZWxlbWVudC5z Y3JvbGxXaWR0aCBpcyAxMDAKK1BBU1MgZWxlbWVudC5zY3JvbGxIZWlnaHQgaXMgMTAwCitQQVNT IGVsZW1lbnQuc2Nyb2xsV2lkdGggaXMgMTAwCitQQVNTIGVsZW1lbnQuc2Nyb2xsSGVpZ2h0IGlz IDEwMAorUEFTUyBlbGVtZW50LnNjcm9sbFdpZHRoIGlzIDEwMAorUEFTUyBzdWNjZXNzZnVsbHlQ YXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2Zhc3QvZmxleGJveC9jaGlsZC1mbGV4aW5nLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhi b3gvY2hpbGQtZmxleGluZy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmU2ZmQ4MmNmNjAyODMwMmVhYTU1MDUw YjNjZWQ3MTc0YWNmMTAzMDUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Zs ZXhib3gvY2hpbGQtZmxleGluZy5odG1sCkBAIC0wLDAgKzEsMTQyIEBACis8aHRtbD4KKzxoZWFk PgorPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSIuLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1z dHlsZS5jc3MiPgorPHNjcmlwdCBzcmM9Ii4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+ PC9zY3JpcHQ+Cis8c3R5bGU+CitkaXYuYm94IHsKKyAgZGlzcGxheTogLW1vei1ib3g7CisgIGRp c3BsYXk6IC1raHRtbC1ib3g7CisgIGRpc3BsYXk6IGJveDsKK30KKworZGl2LnZlcnRpY2FsT3V0 ZXIgeworICB3aWR0aDogMTAwcHg7CisgIGhlaWdodDogMTAwcHg7CisgIGJhY2tncm91bmQtY29s b3I6IHJlZDsKKyAgLW1vei1ib3gtb3JpZW50OiB2ZXJ0aWNhbDsKKyAgLWtodG1sLWJveC1vcmll bnQ6IHZlcnRpY2FsOworICBib3gtb3JpZW50OiB2ZXJ0aWNhbDsKKyAgLW1vei1ib3gtYWxpZ246 IHRvcDsKKyAgLWtodG1sLWJveC1hbGlnbjogdG9wOworICBib3gtYWxpZ246IHRvcDsKKyAgcG9z aXRpb246IHJlbGF0aXZlOworICBvdmVyZmxvdy15OiBhdXRvOworfQorCitkaXYuaG9yaXpvbnRh bE91dGVyIHsKKyAgd2lkdGg6IDEwMHB4OworICBoZWlnaHQ6IDEwMHB4OworICBiYWNrZ3JvdW5k LWNvbG9yOiByZWQ7CisgIC1tb3otYm94LW9yaWVudDogaG9yaXpvbnRhbDsKKyAgLWtodG1sLWJv eC1vcmllbnQ6IGhvcml6b250YWw7CisgIGJveC1vcmllbnQ6IGhvcml6b250YWw7CisgIC1tb3ot Ym94LWFsaWduOiB0b3A7CisgIC1raHRtbC1ib3gtYWxpZ246IHRvcDsKKyAgYm94LWFsaWduOiB0 b3A7CisgIHBvc2l0aW9uOiByZWxhdGl2ZTsKKyAgb3ZlcmZsb3cteTogYXV0bzsKK30KKworZGl2 LnZlcnRpY2FsTWlkZGxlIHsKKyAgd2lkdGg6IDEwMHB4OworICBoZWlnaHQ6IDkwcHg7CisgIGJh Y2tncm91bmQtY29sb3I6IGdyZWVuOworfQorCitkaXYuZXhwYW5kVmVydGljYWxCb3R0b20gewor ICB3aWR0aDogMTBweDsKKyAgaGVpZ2h0OiA1cHg7CisgIGJhY2tncm91bmQtY29sb3I6IGdyZWVu OworICAtbW96LWJveC1mbGV4OiAxOworICAtd2Via2l0LWJveC1mbGV4OiAxOworICBib3gtZmxl eDogMTsKKyAgYm9yZGVyLWxlZnQ6IDkwcHggc29saWQgb2xpdmU7CisgIGJvcmRlci10b3A6IDRw eCBzb2xpZCBibHVlOworfQorCitkaXYuc2hyaW5rVmVydGljYWxCb3R0b20geworICB3aWR0aDog MTBweDsKKyAgaGVpZ2h0OiAyMHB4OworICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgLW1v ei1ib3gtZmxleDogMTsKKyAgLXdlYmtpdC1ib3gtZmxleDogMTsKKyAgYm94LWZsZXg6IDE7Cisg IGJvcmRlci1sZWZ0OiA5MHB4IHNvbGlkIG9saXZlOworICBib3JkZXItdG9wOiA0cHggc29saWQg Ymx1ZTsKK30KKworZGl2Lmhvcml6b250YWxNaWRkbGUgeworICB3aWR0aDogOTBweDsKKyAgaGVp Z2h0OiAxMDBweDsKKyAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47Cit9CisKK2Rpdi5leHBhbmRI b3Jpem9udGFsUmlnaHQgeworICB3aWR0aDogNXB4OworICBoZWlnaHQ6IDEwcHg7CisgIGJhY2tn cm91bmQtY29sb3I6IGdyZWVuOworICAtbW96LWJveC1mbGV4OiAxOworICAtd2Via2l0LWJveC1m bGV4OiAxOworICBib3gtZmxleDogMTsKKyAgYm9yZGVyLWxlZnQ6IDRweCBzb2xpZCBvbGl2ZTsK KyAgYm9yZGVyLXRvcDogOTBweCBzb2xpZCBibHVlOworfQorCitkaXYuc2hyaW5rSG9yaXpvbnRh bFJpZ2h0IHsKKyAgd2lkdGg6IDIwcHg7CisgIGhlaWdodDogMTBweDsKKyAgYmFja2dyb3VuZC1j b2xvcjogZ3JlZW47CisgIC1tb3otYm94LWZsZXg6IDE7CisgIC13ZWJraXQtYm94LWZsZXg6IDE7 CisgIGJveC1mbGV4OiAxOworICBib3JkZXItbGVmdDogNHB4IHNvbGlkIG9saXZlOworICBib3Jk ZXItdG9wOiA5MHB4IHNvbGlkIGJsdWU7Cit9Cis8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+Cis8 cD5DaGVjayBpZiBib3gtZmxleCBzcGVjaWZpZWQgZmxleGJveGVzIGV4cGFuZCBvciBzaHJpbmsg Y29ycmVjdGx5LiBJZiB5b3Ugc2VlIGFueSBzY3JvbGxiYXJzLCB0aGVuIHRoZSB0ZXN0IGhhcyBm YWlsZWQuPC9wPgorPHA+dmVydGljYWxseSBleHBhbmRpbmc8L3A+Cis8ZGl2IGNsYXNzPSJib3gg dmVydGljYWxPdXRlciIgaWQ9ImV4cGFuZFZlcnRpY2FsIj4KKyAgPGRpdiBjbGFzcz0idmVydGlj YWxNaWRkbGUiPjwvZGl2PgorICA8ZGl2IGNsYXNzPSJleHBhbmRWZXJ0aWNhbEJvdHRvbSI+PC9k aXY+Cis8L2Rpdj4KKzxwPnZlcnRpY2FsbHkgc2hyaW5raW5nPC9wPgorPGRpdiBjbGFzcz0iYm94 IHZlcnRpY2FsT3V0ZXIiIGlkPSJzaHJpbmtWZXJ0aWNhbCI+CisgIDxkaXYgY2xhc3M9InZlcnRp Y2FsTWlkZGxlIj48L2Rpdj4KKyAgPGRpdiBjbGFzcz0ic2hyaW5rVmVydGljYWxCb3R0b20iPjwv ZGl2PgorPC9kaXY+Cis8cD5ob3Jpem9udGFsbHkgZXhwYW5kaW5nPC9wPgorPGRpdiBjbGFzcz0i Ym94IGhvcml6b250YWxPdXRlciIgaWQ9ImV4cGFuZEhvcml6b250YWwiPgorICA8ZGl2IGNsYXNz PSJob3Jpem9udGFsTWlkZGxlIj48L2Rpdj4KKyAgPGRpdiBjbGFzcz0iZXhwYW5kSG9yaXpvbnRh bFJpZ2h0Ij48L2Rpdj4KKzwvZGl2PgorPHA+aG9yaXpvbnRhbGx5IHNocmlua2luZzwvcD4KKzxk aXYgY2xhc3M9ImJveCBob3Jpem9udGFsT3V0ZXIiIGlkPSJzaHJpbmtIb3Jpem9udGFsIj4KKyAg PGRpdiBjbGFzcz0iaG9yaXpvbnRhbE1pZGRsZSI+PC9kaXY+CisgIDxkaXYgY2xhc3M9InNocmlu a0hvcml6b250YWxSaWdodCI+PC9kaXY+Cis8L2Rpdj4KKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2 PgorPHNjcmlwdD4KK3ZhciBlbGVtZW50ID0gbnVsbDsKKworZWxlbWVudCA9IGRvY3VtZW50Lmdl dEVsZW1lbnRCeUlkKCJleHBhbmRWZXJ0aWNhbCIpOworc2hvdWxkQmUoImVsZW1lbnQuc2Nyb2xs SGVpZ2h0IiwgIjEwMCIpOworc2hvdWxkQmUoImVsZW1lbnQuc2Nyb2xsV2lkdGgiLCAiMTAwIik7 CisKK2VsZW1lbnQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgic2hyaW5rVmVydGljYWwiKTsK K3Nob3VsZEJlKCJlbGVtZW50LnNjcm9sbEhlaWdodCIsICIxMDAiKTsKK3Nob3VsZEJlKCJlbGVt ZW50LnNjcm9sbFdpZHRoIiwgIjEwMCIpOworCitlbGVtZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVu dEJ5SWQoImV4cGFuZEhvcml6b250YWwiKTsKK3Nob3VsZEJlKCJlbGVtZW50LnNjcm9sbEhlaWdo dCIsICIxMDAiKTsKK3Nob3VsZEJlKCJlbGVtZW50LnNjcm9sbFdpZHRoIiwgIjEwMCIpOworCitl bGVtZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInNocmlua0hvcml6b250YWwiKTsKK3No b3VsZEJlKCJlbGVtZW50LnNjcm9sbEhlaWdodCIsICIxMDAiKTsKK3Nob3VsZEJlKCJlbGVtZW50 LnNjcm9sbFdpZHRoIiwgIjEwMCIpOworCitzdWNjZXNzZnVsbHlQYXJzZWQgPSB0cnVlOworPC9z Y3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9z Y3JpcHQ+Cis8L2JvZHk+CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUv Q2hhbmdlTG9nCmluZGV4IGI4NjUwMGZkMTY1NjliOWM3OGY5N2JjZWY5MjBmY2ZhYzVjYzQwNWQu Ljc3MmJjMzYzOGUwODFmOWNmMmIxMTlkNWJlNjhlYzEzMDU4ZGIyZjggMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAK KzIwMTAtMDQtMjggIFlvc2hpa2kgSGF5YXNoaSAgPHloYXlhc2hpQGdvb2dsZS5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM4MjQ5CisgICAgICAgIAorICAgICAgICBGaXhl cyBhbiBpc3N1ZSB3aGVyZSBib3JkZXIgaGVpZ2h0IGFuZCBwYWRkaW5nIGhlaWdodCBhcmUgaWdu b3JlZCB3aGVuIGNvbXB1dGluZyB2ZXJ0aWNhbGx5IHNocmlua2luZyBmbGV4Ym94J3MgaGVpZ2h0 LgorCisgICAgICAgIFRlc3Q6IGZhc3QvZmxleGJveC9jaGlsZC1mbGV4aW5nLmh0bWwKKworICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJGbGV4aWJsZUJveDo6YWxsb3dlZENoaWxkRmxleCk6CisKIDIwMTAtMDQtMjcgIFl1 em8gRnVqaXNoaW1hICA8eXV6b0Bnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVy aWMgU2VpZGVsLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVC b3guY3BwIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4IGFi YzA1MzJhOTI4Njk1MjcwMDE2NGU5YzlhMDhlOTI1YTMxMTA5ZjQuLjIzOGIxNmQzZTJjNmVkOGM1 MGVkYTZjOThlNWRiMjg2MWMyMDRkZTMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJs ZUJveC5jcHAKQEAgLTEwNTksNyArMTA1OSw3IEBAIGludCBSZW5kZXJGbGV4aWJsZUJveDo6YWxs b3dlZENoaWxkRmxleChSZW5kZXJCb3gqIGNoaWxkLCBib29sIGV4cGFuZGluZywgdW5zaWduCiAg ICAgfSBlbHNlIHsKICAgICAgICAgaWYgKGNoaWxkLT5zdHlsZSgpLT5taW5IZWlnaHQoKS5pc0Zp eGVkKCkpIHsKICAgICAgICAgICAgIGludCBtaW5IID0gY2hpbGQtPnN0eWxlKCktPm1pbkhlaWdo dCgpLnZhbHVlKCk7Ci0gICAgICAgICAgICBpbnQgaCA9IGNoaWxkLT5vdmVycmlkZUhlaWdodCgp IC0gKGNoaWxkLT5ib3JkZXJMZWZ0KCkgKyBjaGlsZC0+Ym9yZGVyUmlnaHQoKSArIGNoaWxkLT5w YWRkaW5nTGVmdCgpICsgY2hpbGQtPnBhZGRpbmdSaWdodCgpKTsKKyAgICAgICAgICAgIGludCBo ID0gY2hpbGQtPm92ZXJyaWRlSGVpZ2h0KCkgLSBjaGlsZC0+Ym9yZGVyQW5kUGFkZGluZ0hlaWdo dCgpOwogICAgICAgICAgICAgaW50IGFsbG93ZWRTaHJpbmthZ2UgPSBtaW4oMCwgbWluSCAtIGgp OwogICAgICAgICAgICAgcmV0dXJuIGFsbG93ZWRTaHJpbmthZ2U7CiAgICAgICAgIH0K 54544 2010-04-28 03:40:59 -0700 2010-04-28 03:49:50 -0700 2010-04-28 Eric Seidel <eric@webkit.org> bug-38249-20100428194058.patch text/plain 15693 yhayashi ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBiNGRiZWNiZjQ4NDJkYjljNzljMWQ2ODBkZDVjM2E2MGY4NjM4MDczLi5jMDMyZTYw NDg2OTRhNTliMTgyNjc4YmNhMDRhNmQzYTJhNmVjZmMwIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzIgQEAK IDIwMTAtMDQtMjggIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJl dmlld2VkIGJ5IEplcmVteSBPcmxvdy4KKworICAgICAgICB3ZWJraXRweTogU2NyaXB0RXJyb3Io J0ZhaWxlZCB0byBydW4gIlt1XCd0YXNra2lsbC5leGVcJywgdVwnL2ZcJywgdVwnL2ltXCcsIHVc J2h0dHBkLmV4ZVwnXSIgZXhpdF9jb2RlOiAxMjgnLCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM4MjQ4CisKKyAgICAgICAgVGhlIHByZXZpb3VzIGNv ZGUgZGlkIG5vdCBjaGVjayB0aGUgcmV0dXJuIGNvZGUgb2YgdGFza2tpbGwuCisgICAgICAgIFdo ZW4gSSBtb3ZlZCB0aGF0IGNhbGxzaXRlIGZyb20gdXNpbmcgc3VicHJvY2Vzcy5jYWxsIHRvCisg ICAgICAgIEV4ZWN1dGl2ZS5ydW5fY29tbWFuZCBoYXZpbmcgYSBub24temVybyByZXR1cm4gY29k ZSBiZWNhbWUgYW4gZXJyb3IuCisKKyAgICAgICAgSW4gdGhpcyBjaGFuZ2UgSSd2ZSBjZW50cmFs aXplZCBvdXIga2lsbGFsbCBoYW5kbGluZyBpbiBleGVjdXRpdmUsCisgICAgICAgIGFuZCBhZGRl ZCB0ZXN0cyBmb3IgaXQgdG8gbWFrZSBzdXJlIGl0IHdvcmtzLgorCisgICAgICAgIEN1cnJlbnRs eSBraWxsX3Byb2Nlc3MgYW5kIGtpbGxfYWxsIHN3YWxsb3cgZXhjZXB0aW9ucyBpbiB0aGUgY2Fz ZXMKKyAgICAgICAgd2hlcmUgdGhlIHByb2Nlc3MoZXMpIHRvIGJlIGtpbGxlZCBkbyhlcykgbm90 IGV4aXN0LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2V4ZWN1 dGl2ZS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0 aXZlX3VuaXR0ZXN0LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvY2hyb21pdW1fbGludXgucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV93aW4ucHk6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9ndGsucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWMucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L3dpbi5weToKKworMjAxMC0wNC0yOCAgRXJpYyBTZWlkZWwgIDxlcmlj QHdlYmtpdC5vcmc+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgU2hpbmljaGlybyBIYW1hamkuCiAK ICAgICAgICAgd2RpZmZfdGV4dCB0aHJvd3MgU2NyaXB0RXJyb3IgYmVjYXVzZSB3ZGlmZiByZXR1 cm5zIG5vbi16ZXJvIHdoZW4gZmlsZXMgZGlmZmVyCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZlLnB5IGIvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2V4ZWN1dGl2ZS5weQppbmRleCA1YzFkMjhj YTZmNWFlNDVjZWJhYWQzMzAwMThiYzNiNmMzYzZjYjFlLi4xYTdlNjFlZjI2ZDE1OWE0MmEzNWQ3 MDU2ZDdiZDg3OGMyM2JlZWU5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZlLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL3N5c3RlbS9leGVjdXRpdmUucHkKQEAgLTE2MSwxNyArMTYxLDM5IEBA IGNsYXNzIEV4ZWN1dGl2ZShvYmplY3QpOgogICAgICAgICByZXR1cm4gMgogCiAgICAgZGVmIGtp bGxfcHJvY2VzcyhzZWxmLCBwaWQpOgorICAgICAgICAiIiJBdHRlbXB0cyB0byBraWxsIHRoZSBn aXZlbiBwaWQuCisgICAgICAgIFdpbGwgZmFpbCBzaWxlbnRseSBpZiBwaWQgZG9lcyBub3QgZXhp c3Qgb3IgaW5zdWZmaWNpZW50IHBlcm1pc3NzaW9ucy4iIiIKICAgICAgICAgaWYgcGxhdGZvcm0u c3lzdGVtKCkgPT0gIldpbmRvd3MiOgogICAgICAgICAgICAgIyBBY2NvcmRpbmcgdG8gaHR0cDov L2RvY3MucHl0aG9uLm9yZy9saWJyYXJ5L29zLmh0bWwKICAgICAgICAgICAgICMgb3Mua2lsbCBp c24ndCBhdmFpbGFibGUgb24gV2luZG93cy4gIEhvd2V2ZXIsIHdoZW4gSSB0cmllZCBpdAogICAg ICAgICAgICAgIyB1c2luZyBDeWd3aW4sIGl0IHdvcmtlZCBmaW5lLiAgV2Ugc2hvdWxkIGludmVz dGlnYXRlIHdoZXRoZXIKICAgICAgICAgICAgICMgd2UgbmVlZCB0aGlzIHBsYXRmb3JtIHNwZWNp ZmljIGNvZGUgaGVyZS4KLSAgICAgICAgICAgIHN1YnByb2Nlc3MuY2FsbCgoJ3Rhc2traWxsLmV4 ZScsICcvZicsICcvcGlkJywgdW5pY29kZShwaWQpKSwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICBzdGRpbj1vcGVuKG9zLmRldm51bGwsICdyJyksCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgc3Rkb3V0PXN1YnByb2Nlc3MuUElQRSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICBzdGRlcnI9c3VicHJvY2Vzcy5QSVBFKQorICAgICAgICAgICAgY29tbWFuZCA9IFsidGFza2tp bGwuZXhlIiwgIi9mIiwgIi9waWQiLCBzdHIocGlkKV0KKyAgICAgICAgICAgICMgdGFza2tpbGwg d2lsbCBleGl0IDEyOCBpZiB0aGUgcHJvY2VzcyBpcyBub3QgZm91bmQuCisgICAgICAgICAgICBz ZWxmLnJ1bl9jb21tYW5kKGNvbW1hbmQsIGVycm9yX2hhbmRsZXI9c2VsZi5pZ25vcmVfZXJyb3Ip CiAgICAgICAgICAgICByZXR1cm4KLSAgICAgICAgb3Mua2lsbChwaWQsIHNpZ25hbC5TSUdLSUxM KQorICAgICAgICB0cnk6CisgICAgICAgICAgICBvcy5raWxsKHBpZCwgc2lnbmFsLlNJR0tJTEwp CisgICAgICAgIGV4Y2VwdCBPU0Vycm9yLCBlOgorICAgICAgICAgICAgIyBGSVhNRTogV2Ugc2hv dWxkIG1ha2Ugbm9uLXNpbGVudCBmYWlsdXJlIGFuIG9wdGlvbi4KKyAgICAgICAgICAgIHBhc3MK KworICAgIGRlZiBraWxsX2FsbChzZWxmLCBwcm9jZXNzX25hbWUpOgorICAgICAgICAiIiJBdHRl bXB0cyB0byBraWxsIHByb2Nlc3NlcyBtYXRjaGluZyBwcm9jZXNzX25hbWUuCisgICAgICAgIFdp bGwgZmFpbCBzaWxlbnRseSBpZiBubyBwcm9jZXNzIGFyZSBmb3VuZC4iIiIKKyAgICAgICAgaWYg cGxhdGZvcm0uc3lzdGVtKCkgPT0gIldpbmRvd3MiOgorICAgICAgICAgICAgIyBXZSBtaWdodCB3 YW50IHRvIGF1dG9tYXRpY2FsbHkgYXBwZW5kIC5leGU/CisgICAgICAgICAgICBjb21tYW5kID0g WyJ0YXNra2lsbC5leGUiLCAiL2YiLCAiL2ltIiwgcHJvY2Vzc19uYW1lXQorICAgICAgICAgICAg IyB0YXNra2lsbCB3aWxsIGV4aXQgMTI4IGlmIHRoZSBwcm9jZXNzIGlzIG5vdCBmb3VuZC4KKyAg ICAgICAgICAgIHNlbGYucnVuX2NvbW1hbmQoY29tbWFuZCwgZXJyb3JfaGFuZGxlcj1zZWxmLmln bm9yZV9lcnJvcikKKyAgICAgICAgICAgIHJldHVybgorCisgICAgICAgICMgRklYTUU6IFRoaXMg aXMgaW5jb25zaXN0ZW50IHRoYXQga2lsbF9hbGwgdXNlcyBURVJNIGFuZCBraWxsX3Byb2Nlc3MK KyAgICAgICAgIyB1c2VzIEtJTEwuICBXaW5kb3dzIGlzIGFsd2F5cyB1c2luZyAvZiAod2hpY2gg c2VlbXMgbGlrZSAtS0lMTCkuCisgICAgICAgICMgV2Ugc2hvdWxkIHBpY2sgb25lIG1vZGUsIG9y IGFkZCBzdXBwb3J0IGZvciBzd2l0Y2hpbmcgYmV0d2VlbiB0aGVtLgorICAgICAgICAjIE5vdGU6 IE1hYyBPUyBYIDEwLjYgcmVxdWlyZXMgLVNJR05BTE5BTUUgYmVmb3JlIC11IFVTRVIKKyAgICAg ICAgY29tbWFuZCA9IFsia2lsbGFsbCIsICItVEVSTSIsICItdSIsIG9zLmdldGVudigiVVNFUiIp LCBwcm9jZXNzX25hbWVdCisgICAgICAgIHNlbGYucnVuX2NvbW1hbmQoY29tbWFuZCwgZXJyb3Jf aGFuZGxlcj1zZWxmLmlnbm9yZV9lcnJvcikKIAogICAgICMgRXJyb3IgaGFuZGxlcnMgZG8gbm90 IG5lZWQgdG8gYmUgc3RhdGljIG1ldGhvZHMgb25jZSBhbGwgY2FsbGVycyBhcmUKICAgICAjIHVw ZGF0ZWQgdG8gdXNlIGFuIEV4ZWN1dGl2ZSBvYmplY3QuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZlX3VuaXR0ZXN0LnB5IGIv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2V4ZWN1dGl2ZV91bml0 dGVzdC5weQppbmRleCA4OWQzNDBiNjBjMThiNjQ3OGZmYmVmNTM0Yzk0Y2I3YTg3MTdlYjAwLi5j ZTkxMjY5YzE2ZDA1NzdiYjQyZGExMTkzNjZmNWU0NTAyMDE3ZDM1IDEwMDY0NAotLS0gYS9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZlX3VuaXR0ZXN0 LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9leGVj dXRpdmVfdW5pdHRlc3QucHkKQEAgLTI3LDYgKzI3LDkgQEAKICMgKElOQ0xVRElORyBORUdMSUdF TkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCiAjIE9G IFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VD SCBEQU1BR0UuCiAKK2ltcG9ydCBzaWduYWwKK2ltcG9ydCBzdWJwcm9jZXNzCitpbXBvcnQgc3lz CiBpbXBvcnQgdW5pdHRlc3QKIAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2 ZSBpbXBvcnQgRXhlY3V0aXZlLCBydW5fY29tbWFuZApAQCAtNjYsMyArNjksMjUgQEAgY2xhc3Mg RXhlY3V0aXZlVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAKICAgICAgICAgb3V0cHV0ID0gZXhl Y3V0aXZlLnJ1bl9hbmRfdGhyb3dfaWZfZmFpbChbImVjaG8iLCAiLW4iLCB1bmljb2RlX3Rvcl0s IHF1aWV0PVRydWUsIGRlY29kZV9vdXRwdXQ9RmFsc2UpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWxzKG91dHB1dCwgdXRmOF90b3IpCisKKyAgICBkZWYgdGVzdF9raWxsX3Byb2Nlc3Moc2VsZik6 CisgICAgICAgIGV4ZWN1dGl2ZSA9IEV4ZWN1dGl2ZSgpCisgICAgICAgICMgRklYTUU6IFRoaXMg bWF5IG5lZWQgZWRpdHMgdG8gd29yayByaWdodCBvbiB3aW5kb3dzLgorICAgICAgICAjIFdlIHVz ZSAieWVzIiBiZWNhdXNlIGl0IGxvb3BzIGZvcmV2ZXIuCisgICAgICAgIHByb2Nlc3MgPSBzdWJw cm9jZXNzLlBvcGVuKFsieWVzIl0sIHN0ZG91dD1zdWJwcm9jZXNzLlBJUEUpCisgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwocHJvY2Vzcy5wb2xsKCksIE5vbmUpICAjIFByb2Nlc3MgaXMgcnVubmlu ZworICAgICAgICBleGVjdXRpdmUua2lsbF9wcm9jZXNzKHByb2Nlc3MucGlkKQorICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKHByb2Nlc3Mud2FpdCgpLCAtc2lnbmFsLlNJR0tJTEwpCisgICAgICAg ICMgS2lsbGluZyBhZ2FpbiBzaG91bGQgZmFpbCBzaWxlbnRseS4KKyAgICAgICAgZXhlY3V0aXZl LmtpbGxfcHJvY2Vzcyhwcm9jZXNzLnBpZCkKKworICAgIGRlZiB0ZXN0X2tpbGxfYWxsKHNlbGYp OgorICAgICAgICBleGVjdXRpdmUgPSBFeGVjdXRpdmUoKQorICAgICAgICAjIEZJWE1FOiBUaGlz IG1heSBuZWVkIGVkaXRzIHRvIHdvcmsgcmlnaHQgb24gd2luZG93cy4KKyAgICAgICAgIyBXZSB1 c2UgInllcyIgYmVjYXVzZSBpdCBsb29wcyBmb3JldmVyLgorICAgICAgICBwcm9jZXNzID0gc3Vi cHJvY2Vzcy5Qb3BlbihbInllcyJdLCBzdGRvdXQ9c3VicHJvY2Vzcy5QSVBFKQorICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKHByb2Nlc3MucG9sbCgpLCBOb25lKSAgIyBQcm9jZXNzIGlzIHJ1bm5p bmcKKyAgICAgICAgZXhlY3V0aXZlLmtpbGxfYWxsKCJ5ZXMiKQorICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKHByb2Nlc3Mud2FpdCgpLCAtc2lnbmFsLlNJR1RFUk0pCisgICAgICAgICMgS2lsbGlu ZyBhZ2FpbiBzaG91bGQgZmFpbCBzaWxlbnRseS4KKyAgICAgICAgZXhlY3V0aXZlLmtpbGxfYWxs KCJ5ZXMiKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9jaHJvbWl1bV9saW51eC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbGludXgucHkKaW5kZXggMTUwM2EwMzg4ZmQ2 YTUxMmExMTM2NzcwZmQzMzg5ZDRiYjY5YmYxYy4uYjgyMTE1NWY2NzJmMGUxNTVmM2NkZTUxNWYz YzY5NTEwM2JkMzdhOCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9saW51eC5weQorKysgYi9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2xpbnV4LnB5CkBAIC0xMjQs MTQgKzEyNCw2IEBAIGNsYXNzIENocm9taXVtTGludXhQb3J0KGNocm9taXVtLkNocm9taXVtUG9y dCk6CiAgICAgICAgICAgICBfbG9nLmVycm9yKCcnKQogICAgICAgICByZXR1cm4gcmVzdWx0CiAK LQotICAgIGRlZiBfa2lsbF9hbGxfcHJvY2VzcyhzZWxmLCBwcm9jZXNzX25hbWUpOgotICAgICAg ICAjIEZJWE1FOiBUaGlzIHNob3VsZCB1c2UgRXhlY3V0aXZlLgotICAgICAgICBudWxsID0gb3Bl bihvcy5kZXZudWxsKQotICAgICAgICBzdWJwcm9jZXNzLmNhbGwoWydraWxsYWxsJywgJy1URVJN JywgJy11Jywgb3MuZ2V0ZW52KCdVU0VSJyksCi0gICAgICAgICAgICAgICAgICAgICAgICBwcm9j ZXNzX25hbWVdLCBzdGRlcnI9bnVsbCkKLSAgICAgICAgbnVsbC5jbG9zZSgpCi0KICAgICBkZWYg X3BhdGhfdG9fYXBhY2hlKHNlbGYpOgogICAgICAgICBpZiBzZWxmLl9pc19yZWRoYXRfYmFzZWQo KToKICAgICAgICAgICAgIHJldHVybiAnL3Vzci9zYmluL2h0dHBkJwpAQCAtMTg4LDggKzE4MCw4 IEBAIGNsYXNzIENocm9taXVtTGludXhQb3J0KGNocm9taXVtLkNocm9taXVtUG9ydCk6CiAgICAg ICAgICAgICAjIFRPRE8obW1vc3MpIFRoaXMgaXNuJ3QgaWRlYWwsIHNpbmNlIGl0IGNvdWxkIGNv bmZsaWN0IHdpdGgKICAgICAgICAgICAgICMgbGlnaHR0cGQgcHJvY2Vzc2VzIG5vdCBzdGFydGVk IGJ5IGh0dHBfc2VydmVyLnB5LAogICAgICAgICAgICAgIyBidXQgZ29vZCBlbm91Z2ggZm9yIG5v dy4KLSAgICAgICAgICAgIHNlbGYuX2tpbGxfYWxsX3Byb2Nlc3MoJ2xpZ2h0dHBkJykKLSAgICAg ICAgICAgIHNlbGYuX2tpbGxfYWxsX3Byb2Nlc3MoJ2FwYWNoZTInKQorICAgICAgICAgICAgc2Vs Zi5fZXhlY3V0aXZlLmtpbGxfYWxsKCJsaWdodHRwZCIpCisgICAgICAgICAgICBzZWxmLl9leGVj dXRpdmUua2lsbF9hbGwoImFwYWNoZTIiKQogICAgICAgICBlbHNlOgogICAgICAgICAgICAgdHJ5 OgogICAgICAgICAgICAgICAgIG9zLmtpbGwoc2VydmVyX3BpZCwgc2lnbmFsLlNJR1RFUk0pCmRp ZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2Nocm9taXVtX21hYy5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5CmluZGV4IDBiZjM4YjVkNDY0MWU3Y2M1NTg4NTljODc5 MTQwMWY0ZWY5YWMzMjguLjQ0ZmQzOGJjYWM4NWMxZjFjMmVkNTZhN2UwYzFlYjBiYTVjYjI5YjYg MTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvY2hyb21pdW1fbWFjLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5CkBAIC0xMTUsMTkgKzExNSw2IEBAIGNsYXNz IENocm9taXVtTWFjUG9ydChjaHJvbWl1bS5DaHJvbWl1bVBvcnQpOgogICAgICAgICByZXR1cm4g c2VsZi5wYXRoX2Zyb21fY2hyb21pdW1fYmFzZSgndGhpcmRfcGFydHknLCAnbGlnaHR0cGQnLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnbWFjJywgKmNvbXBz KQogCi0gICAgZGVmIF9raWxsX2FsbF9wcm9jZXNzKHNlbGYsIHByb2Nlc3NfbmFtZSk6Ci0gICAg ICAgICIiIktpbGwgYW55IHByb2Nlc3NlcyBydW5uaW5nIHVuZGVyIHRoaXMgbmFtZS4iIiIKLSAg ICAgICAgIyBGSVhNRTogVGhpcyBzaG91bGQgdXNlIEV4ZWN1dGl2ZS4KLSAgICAgICAgIyBPbiBN YWMgT1MgWCAxMC42LCBraWxsYWxsIGhhcyBhIG5ldyBjb25zdHJhaW50OiAtU0lHTkFMTkFNRSBv cgotICAgICAgICAjIC1TSUdOQUxOVU1CRVIgbXVzdCBjb21lIGZpcnN0LiAgRXhhbXBsZSBwcm9i bGVtOgotICAgICAgICAjICAgJCBraWxsYWxsIC11ICRVU0VSIC1URVJNIGxpZ2h0dHBkCi0gICAg ICAgICMgICBraWxsYWxsOiBpbGxlZ2FsIG9wdGlvbiAtLSBUCi0gICAgICAgICMgVXNlIG9mIHRo ZSBlYXJsaWVyIC1URVJNIHBsYWNlbWVudCBpcyBqdXN0IGZpbmUgb24gMTAuNS4KLSAgICAgICAg bnVsbCA9IG9wZW4ob3MuZGV2bnVsbCkKLSAgICAgICAgc3VicHJvY2Vzcy5jYWxsKFsna2lsbGFs bCcsICctVEVSTScsICctdScsIG9zLmdldGVudignVVNFUicpLAotICAgICAgICAgICAgICAgICAg ICAgICAgcHJvY2Vzc19uYW1lXSwgc3RkZXJyPW51bGwpCi0gICAgICAgIG51bGwuY2xvc2UoKQot CiAgICAgZGVmIF9wYXRoX3RvX2FwYWNoZShzZWxmKToKICAgICAgICAgcmV0dXJuICcvdXNyL3Ni aW4vaHR0cGQnCiAKQEAgLTE3OSw4ICsxNjYsOCBAQCBjbGFzcyBDaHJvbWl1bU1hY1BvcnQoY2hy b21pdW0uQ2hyb21pdW1Qb3J0KToKICAgICAgICAgICAgICMgVE9ETyhtbW9zcykgVGhpcyBpc24n dCBpZGVhbCwgc2luY2UgaXQgY291bGQgY29uZmxpY3Qgd2l0aAogICAgICAgICAgICAgIyBsaWdo dHRwZCBwcm9jZXNzZXMgbm90IHN0YXJ0ZWQgYnkgaHR0cF9zZXJ2ZXIucHksCiAgICAgICAgICAg ICAjIGJ1dCBnb29kIGVub3VnaCBmb3Igbm93LgotICAgICAgICAgICAgc2VsZi5fa2lsbF9hbGxf cHJvY2VzcygnbGlnaHR0cGQnKQotICAgICAgICAgICAgc2VsZi5fa2lsbF9hbGxfcHJvY2Vzcygn aHR0cGQnKQorICAgICAgICAgICAgc2VsZi5fZXhlY3V0aXZlLmtpbGxfYWxsKCdsaWdodHRwZCcp CisgICAgICAgICAgICBzZWxmLl9leGVjdXRpdmUua2lsbF9hbGwoJ2h0dHBkJykKICAgICAgICAg ZWxzZToKICAgICAgICAgICAgIHRyeToKICAgICAgICAgICAgICAgICBvcy5raWxsKHNlcnZlcl9w aWQsIHNpZ25hbC5TSUdURVJNKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV93aW4ucHkgYi9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX3dpbi5weQppbmRleCA1NWU2 ODk2MjUyMzQ4NmJmM2RlOWY2YzJjZTg1NGFjYTM0NGFmMjMwLi5iNDg0ODU5NzAyM2MwMjc2ZTQ2 OThlOTkzYzc2MzM4MGFhYzgzY2IxIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX3dpbi5weQorKysgYi9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX3dpbi5weQpAQCAt MTQ0LDEwICsxNDQsNiBAQCBjbGFzcyBDaHJvbWl1bVdpblBvcnQoY2hyb21pdW0uQ2hyb21pdW1Q b3J0KToKICAgICAgICAgcmV0dXJuIHNlbGYucGF0aF9mcm9tX2Nocm9taXVtX2Jhc2UoJ3RoaXJk X3BhcnR5JywgJ2N5Z3dpbicsICdiaW4nLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAnd2RpZmYuZXhlJykKIAotICAgIGRlZiBfa2lsbF9hbGwoc2VsZiwgcHJv Y2Vzc19uYW1lKToKLSAgICAgICAgY21kID0gWyd0YXNra2lsbC5leGUnLCAnL2YnLCAnL2ltJywg cHJvY2Vzc19uYW1lXQotICAgICAgICBzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQoY21kKQot CiAgICAgZGVmIF9zaHV0X2Rvd25faHR0cF9zZXJ2ZXIoc2VsZiwgc2VydmVyX3BpZCk6CiAgICAg ICAgICIiIlNodXQgZG93biB0aGUgbGlnaHR0cGQgd2ViIHNlcnZlci4gQmxvY2tzIHVudGlsIGl0 J3MgZnVsbHkKICAgICAgICAgc2h1dCBkb3duLgpAQCAtMTU3LDUgKzE1Myw1IEBAIGNsYXNzIENo cm9taXVtV2luUG9ydChjaHJvbWl1bS5DaHJvbWl1bVBvcnQpOgogICAgICAgICAiIiIKICAgICAg ICAgIyBGSVhNRTogV2h5IGFyZSB3ZSBpZ25vcmluZyBzZXJ2ZXJfcGlkIGFuZCBjYWxsaW5nCiAg ICAgICAgICMgX2tpbGxfYWxsIGluc3RlYWQgb2YgRXhlY3V0aXZlLmtpbGxfcHJvY2VzcyhwaWQp PwotICAgICAgICBzZWxmLl9raWxsX2FsbCgiTGlnaHRUUEQuZXhlIikKLSAgICAgICAgc2VsZi5f a2lsbF9hbGwoImh0dHBkLmV4ZSIpCisgICAgICAgIHNlbGYuX2V4ZWN1dGl2ZS5raWxsX2FsbCgi TGlnaHRUUEQuZXhlIikKKyAgICAgICAgc2VsZi5fZXhlY3V0aXZlLmtpbGxfYWxsKCJodHRwZC5l eGUiKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9ndGsucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L2d0ay5weQppbmRleCAyNzY5Y2M2NzkwZTAxOTkwOTFiZjlhNGE4YzcyNzdhMWQ3N2Fh MDBiLi44Y2M4YjdkODdmN2UxMDY3NTM2NmRhMjVlNDJlYzkyMWIwN2Y2YTlkIDEwMDY0NAotLS0g YS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2d0ay5weQor KysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2d0ay5w eQpAQCAtNjEsMTMgKzYxLDYgQEAgY2xhc3MgR3RrUG9ydChXZWJLaXRQb3J0KToKICAgICAgICAg cmV0dXJuIG9zLnBhdGguam9pbihzZWxmLmxheW91dF90ZXN0c19kaXIoKSwgJ2h0dHAnLCAnY29u ZicsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2FwYWNoZTItZGViaWFuLWh0dHBkLmNv bmYnKQogCi0gICAgZGVmIF9raWxsX2FsbF9wcm9jZXNzKHNlbGYsIHByb2Nlc3NfbmFtZSk6Ci0g ICAgICAgICMgRklYTUU6IFRoaXMgc2hvdWxkIHVzZSBFeGVjdXRpdmUuCi0gICAgICAgIG51bGwg PSBvcGVuKG9zLmRldm51bGwpCi0gICAgICAgIHN1YnByb2Nlc3MuY2FsbChbJ2tpbGxhbGwnLCAn LVRFUk0nLCAnLXUnLCBvcy5nZXRlbnYoJ1VTRVInKSwKLSAgICAgICAgICAgICAgICAgICAgICAg IHByb2Nlc3NfbmFtZV0sIHN0ZGVycj1udWxsKQotICAgICAgICBudWxsLmNsb3NlKCkKLQogICAg IGRlZiBfc2h1dF9kb3duX2h0dHBfc2VydmVyKHNlbGYsIHNlcnZlcl9waWQpOgogICAgICAgICAi IiJTaHV0IGRvd24gdGhlIGh0dHBkIHdlYiBzZXJ2ZXIuIEJsb2NrcyB1bnRpbCBpdCdzIGZ1bGx5 CiAgICAgICAgIHNodXQgZG93bi4KQEAgLTgwLDcgKzczLDcgQEAgY2xhc3MgR3RrUG9ydChXZWJL aXRQb3J0KToKICAgICAgICAgICAgICMgRklYTUU6IFRoaXMgaXNuJ3QgaWRlYWwsIHNpbmNlIGl0 IGNvdWxkIGNvbmZsaWN0IHdpdGgKICAgICAgICAgICAgICMgbGlnaHR0cGQgcHJvY2Vzc2VzIG5v dCBzdGFydGVkIGJ5IGh0dHBfc2VydmVyLnB5LAogICAgICAgICAgICAgIyBidXQgZ29vZCBlbm91 Z2ggZm9yIG5vdy4KLSAgICAgICAgICAgIHNlbGYuX2tpbGxfYWxsX3Byb2Nlc3MoJ2FwYWNoZTIn KQorICAgICAgICAgICAgc2VsZi5fZXhlY3V0aXZlLmtpbGxfYWxsKCdhcGFjaGUyJykKICAgICAg ICAgZWxzZToKICAgICAgICAgICAgIHRyeToKICAgICAgICAgICAgICAgICBvcy5raWxsKHNlcnZl cl9waWQsIHNpZ25hbC5TSUdURVJNKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWMucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5weQppbmRleCA3OWRlNjliMmNhMGVmZjFjYTE2 OGI2MWUwMmM0MDliZmVjODFkYTcwLi5mMzIxZmM1ZWMwMjdmYTI4MjQ1NzYwZjJhZGYyNzMwZDlj NWUwYzA1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L21hYy5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L21hYy5weQpAQCAtMTMxLDE5ICsxMzEsNiBAQCBjbGFzcyBNYWNQb3J0KFdl YktpdFBvcnQpOgogICAgICAgICAgICAgInBsYXRmb3JtL3dpbiIsCiAgICAgICAgIF0KIAotICAg ICMgRklYTUU6IFRoaXMgZG9lc24ndCBoYXZlIGFueXRoaW5nIHRvIGRvIHdpdGggV2ViS2l0Lgot ICAgIGRlZiBfa2lsbF9hbGxfcHJvY2VzcyhzZWxmLCBwcm9jZXNzX25hbWUpOgotICAgICAgICAj IEZJWE1FOiBUaGlzIHNob3VsZCB1c2UgRXhlY3V0aXZlLgotICAgICAgICAjIE9uIE1hYyBPUyBY IDEwLjYsIGtpbGxhbGwgaGFzIGEgbmV3IGNvbnN0cmFpbnQ6IC1TSUdOQUxOQU1FIG9yCi0gICAg ICAgICMgLVNJR05BTE5VTUJFUiBtdXN0IGNvbWUgZmlyc3QuICBFeGFtcGxlIHByb2JsZW06Ci0g ICAgICAgICMgICAkIGtpbGxhbGwgLXUgJFVTRVIgLVRFUk0gbGlnaHR0cGQKLSAgICAgICAgIyAg IGtpbGxhbGw6IGlsbGVnYWwgb3B0aW9uIC0tIFQKLSAgICAgICAgIyBVc2Ugb2YgdGhlIGVhcmxp ZXIgLVRFUk0gcGxhY2VtZW50IGlzIGp1c3QgZmluZSBvbiAxMC41LgotICAgICAgICBudWxsID0g b3Blbihvcy5kZXZudWxsKQotICAgICAgICBzdWJwcm9jZXNzLmNhbGwoWydraWxsYWxsJywgJy1U RVJNJywgJy11Jywgb3MuZ2V0ZW52KCdVU0VSJyksCi0gICAgICAgICAgICAgICAgICAgICAgICBw cm9jZXNzX25hbWVdLCBzdGRlcnI9bnVsbCkKLSAgICAgICAgbnVsbC5jbG9zZSgpCi0KICAgICBk ZWYgX3BhdGhfdG9fYXBhY2hlX2NvbmZpZ19maWxlKHNlbGYpOgogICAgICAgICByZXR1cm4gb3Mu cGF0aC5qb2luKHNlbGYubGF5b3V0X3Rlc3RzX2RpcigpLCAnaHR0cCcsICdjb25mJywKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAnYXBhY2hlMi1odHRwZC5jb25mJykKQEAgLTE2MSw3ICsx NDgsNyBAQCBjbGFzcyBNYWNQb3J0KFdlYktpdFBvcnQpOgogICAgICAgICAgICAgIyBGSVhNRTog VGhpcyBpc24ndCBpZGVhbCwgc2luY2UgaXQgY291bGQgY29uZmxpY3Qgd2l0aAogICAgICAgICAg ICAgIyBsaWdodHRwZCBwcm9jZXNzZXMgbm90IHN0YXJ0ZWQgYnkgaHR0cF9zZXJ2ZXIucHksCiAg ICAgICAgICAgICAjIGJ1dCBnb29kIGVub3VnaCBmb3Igbm93LgotICAgICAgICAgICAgc2VsZi5f a2lsbF9hbGxfcHJvY2VzcygnaHR0cGQnKQorICAgICAgICAgICAgc2VsZi5fZXhlY3V0aXZlLmtp bGxfYWxsKCdodHRwZCcpCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICB0cnk6CiAgICAgICAg ICAgICAgICAgb3Mua2lsbChzZXJ2ZXJfcGlkLCBzaWduYWwuU0lHVEVSTSkKZGlmZiAtLWdpdCBh L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXQucHkgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5CmluZGV4 IDYyMDQ4NmViNzJjYThjMjJlNGI1NjQxNDVhOGUyYTdmYTQ1MDNiMTUuLjU4ZTkwZGNmZDQ1NzA3 ZGY4OGU2ODdhMTRlYmM1MTlmMjMwMzlhMjEgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXQucHkKKysrIGIvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weQpAQCAtNjIsMTMgKzYyLDYgQEAg Y2xhc3MgUXRQb3J0KFdlYktpdFBvcnQpOgogICAgICAgICByZXR1cm4gb3MucGF0aC5qb2luKHNl bGYubGF5b3V0X3Rlc3RzX2RpcigpLCAnaHR0cCcsICdjb25mJywKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAnYXBhY2hlMi1kZWJpYW4taHR0cGQuY29uZicpCiAKLSAgICBkZWYgX2tpbGxf YWxsX3Byb2Nlc3Moc2VsZiwgcHJvY2Vzc19uYW1lKToKLSAgICAgICAgIyBGSVhNRTogVGhpcyBz aG91bGQgdXNlIEV4ZWN1dGl2ZS4KLSAgICAgICAgbnVsbCA9IG9wZW4ob3MuZGV2bnVsbCkKLSAg ICAgICAgc3VicHJvY2Vzcy5jYWxsKFsna2lsbGFsbCcsICctVEVSTScsICctdScsIG9zLmdldGVu dignVVNFUicpLAotICAgICAgICAgICAgICAgICAgICAgICAgcHJvY2Vzc19uYW1lXSwgc3RkZXJy PW51bGwpCi0gICAgICAgIG51bGwuY2xvc2UoKQotCiAgICAgZGVmIF9zaHV0X2Rvd25faHR0cF9z ZXJ2ZXIoc2VsZiwgc2VydmVyX3BpZCk6CiAgICAgICAgICIiIlNodXQgZG93biB0aGUgaHR0cGQg d2ViIHNlcnZlci4gQmxvY2tzIHVudGlsIGl0J3MgZnVsbHkKICAgICAgICAgc2h1dCBkb3duLgpA QCAtODEsNyArNzQsNyBAQCBjbGFzcyBRdFBvcnQoV2ViS2l0UG9ydCk6CiAgICAgICAgICAgICAj IEZJWE1FOiBUaGlzIGlzbid0IGlkZWFsLCBzaW5jZSBpdCBjb3VsZCBjb25mbGljdCB3aXRoCiAg ICAgICAgICAgICAjIGxpZ2h0dHBkIHByb2Nlc3NlcyBub3Qgc3RhcnRlZCBieSBodHRwX3NlcnZl ci5weSwKICAgICAgICAgICAgICMgYnV0IGdvb2QgZW5vdWdoIGZvciBub3cuCi0gICAgICAgICAg ICBzZWxmLl9raWxsX2FsbF9wcm9jZXNzKCdhcGFjaGUyJykKKyAgICAgICAgICAgIHNlbGYuX2V4 ZWN1dGl2ZS5raWxsX2FsbCgnYXBhY2hlMicpCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICB0 cnk6CiAgICAgICAgICAgICAgICAgb3Mua2lsbChzZXJ2ZXJfcGlkLCBzaWduYWwuU0lHVEVSTSkK ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvd2luLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC93aW4ucHkKaW5kZXggMmJmNjkyYjYyOGU2YTUyZTA2YzIyNTVkNDZhZmQ2ZDUyYWNkMGQ5Ni4u ZjdiM2I3OGZlYmVjMDZkMThlNDA5ZmI3NzEzYzJkOWExYzI2MmUzOSAxMDA2NDQKLS0tIGEvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93aW4ucHkKKysrIGIv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93aW4ucHkKQEAg LTY5LDcgKzY5LDQgQEAgY2xhc3MgV2luUG9ydChXZWJLaXRQb3J0KToKICAgICAgICAgIiIiCiAg ICAgICAgICMgTG9va3MgbGlrZSB3ZSBpZ25vcmUgc2VydmVyX3BpZC4KICAgICAgICAgIyBDb3B5 L3Bhc3RlZCBmcm9tIGNocm9taXVtLXdpbi4KLSAgICAgICAgc3VicHJvY2Vzcy5Qb3BlbigoJ3Rh c2traWxsLmV4ZScsICcvZicsICcvaW0nLCAnaHR0cGQuZXhlJyksCi0gICAgICAgICAgICAgICAg ICAgICAgICBzdGRpbj1vcGVuKG9zLmRldm51bGwsICdyJyksCi0gICAgICAgICAgICAgICAgICAg ICAgICBzdGRvdXQ9c3VicHJvY2Vzcy5QSVBFLAotICAgICAgICAgICAgICAgICAgICAgICAgc3Rk ZXJyPXN1YnByb2Nlc3MuUElQRSkud2FpdCgpCisgICAgICAgIHNlbGYuX2V4ZWN1dGl2ZS5raWxs X2FsbCgiaHR0cGQuZXhlIikK 54547 2010-04-28 03:49:55 -0700 2010-04-30 01:47:52 -0700 Proposed Patch 2 bug-38249-20100428194953.patch text/plain 7089 yhayashi ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiYTE2NDAzMjAyN2ZhYjQ1MDNhYTUxMDhhODBiNTFkMzI0MWUxNWMwLi40MTQwMjlj NjJlMGU3MWExNjE2N2QwZDlhYzRkYmQzNmYzMWM2NDYxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTAtMDQtMjggIFlvc2hpa2kgSGF5YXNoaSAgPHloYXlhc2hpQGdvb2dsZS5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM4MjQ5CisgICAgICAgIAorICAgICAgICBGaXhl cyBhbiBpc3N1ZSB3aGVyZSBib3JkZXIgaGVpZ2h0IGFuZCBwYWRkaW5nIGhlaWdodCBhcmUgaWdu b3JlZCB3aGVuIGNvbXB1dGluZyB2ZXJ0aWNhbGx5IHNocmlua2luZyBmbGV4Ym94J3MgaGVpZ2h0 LgorCisgICAgICAgICogZmFzdC9mbGV4Ym94L2NoaWxkLWZsZXhpbmctZXhwZWN0ZWQudHh0OiBB ZGRlZC4KKyAgICAgICAgKiBmYXN0L2ZsZXhib3gvY2hpbGQtZmxleGluZy5odG1sOiBBZGRlZC4K KwogMjAxMC0wNC0yOCAgU2hpbmljaGlybyBIYW1hamkgIDxoYW1hamlAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFVucmV2aWV3ZWQuICBBZGRlZCBtaXNzaW5nIGV4cGVjdGF0aW9uIGZpbGVzIG1p c3NlZCBpbiByNTgzODYuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvY2hp bGQtZmxleGluZy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvY2hpbGQt ZmxleGluZy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMGM2OGEzOTg1NjM5ZjVlY2VjYjdmNjY0 Y2Q2Y2YxOWI3NWYxZmQ3MwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZmxl eGJveC9jaGlsZC1mbGV4aW5nLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDIxIEBACitDaGVjayBp ZiBib3gtZmxleCBzcGVjaWZpZWQgZmxleGJveGVzIGV4cGFuZCBvciBzaHJpbmsgY29ycmVjdGx5 LiBJZiB5b3Ugc2VlIGFueSBzY3JvbGxiYXJzLCB0aGVuIHRoZSB0ZXN0IGhhcyBmYWlsZWQuCisK K09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZv bGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCit2ZXJ0aWNhbGx5IGV4cGFuZGluZworUEFT UyBlbGVtZW50LnNjcm9sbEhlaWdodCBpcyAxMDAKK1BBU1MgZWxlbWVudC5zY3JvbGxXaWR0aCBp cyAxMDAKK3ZlcnRpY2FsbHkgc2hyaW5raW5nCitQQVNTIGVsZW1lbnQuc2Nyb2xsSGVpZ2h0IGlz IDEwMAorUEFTUyBlbGVtZW50LnNjcm9sbFdpZHRoIGlzIDEwMAoraG9yaXpvbnRhbGx5IGV4cGFu ZGluZworUEFTUyBlbGVtZW50LnNjcm9sbEhlaWdodCBpcyAxMDAKK1BBU1MgZWxlbWVudC5zY3Jv bGxXaWR0aCBpcyAxMDAKK2hvcml6b250YWxseSBzaHJpbmtpbmcKK1BBU1MgZWxlbWVudC5zY3Jv bGxIZWlnaHQgaXMgMTAwCitQQVNTIGVsZW1lbnQuc2Nyb2xsV2lkdGggaXMgMTAwCitQQVNTIHN1 Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L2NoaWxkLWZsZXhpbmcuaHRtbCBiL0xheW91dFRlc3Rz L2Zhc3QvZmxleGJveC9jaGlsZC1mbGV4aW5nLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMDUwZTczYTM4ODVl NWRlYjAwMTE2NThiMzkwZjdlMTA5MmE2ZWNiZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL2Zhc3QvZmxleGJveC9jaGlsZC1mbGV4aW5nLmh0bWwKQEAgLTAsMCArMSwxNDYgQEAKKzxo dG1sPgorPGhlYWQ+Cis8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9Ii4uL2pzL3Jlc291cmNl cy9qcy10ZXN0LXN0eWxlLmNzcyI+Cis8c2NyaXB0IHNyYz0iLi4vanMvcmVzb3VyY2VzL2pzLXRl c3QtcHJlLmpzIj48L3NjcmlwdD4KKzxzdHlsZT4KK2Rpdi5ib3ggeworICBkaXNwbGF5OiAtbW96 LWJveDsKKyAgZGlzcGxheTogLWtodG1sLWJveDsKKyAgZGlzcGxheTogYm94OworfQorCitkaXYu b3V0ZXIgeworICB3aWR0aDogMTAwcHg7CisgIGhlaWdodDogMTAwcHg7CisgIGJhY2tncm91bmQt Y29sb3I6IHJlZDsKKyAgLW1vei1ib3gtYWxpZ246IHRvcDsKKyAgLWtodG1sLWJveC1hbGlnbjog dG9wOworICBwb3NpdGlvbjogcmVsYXRpdmU7CisgIG92ZXJmbG93OiBhdXRvOworfQorCitkaXYu dmVydGljYWwgeworICAtbW96LWJveC1vcmllbnQ6IHZlcnRpY2FsOworICAta2h0bWwtYm94LW9y aWVudDogdmVydGljYWw7CisgIGJveC1vcmllbnQ6IHZlcnRpY2FsOworfQorCitkaXYuaG9yaXpv bnRhbCB7CisgIC1tb3otYm94LW9yaWVudDogaG9yaXpvbnRhbDsKKyAgLWtodG1sLWJveC1vcmll bnQ6IGhvcml6b250YWw7CisgIGJveC1vcmllbnQ6IGhvcml6b250YWw7Cit9CisKK2Rpdi52ZXJ0 aWNhbE1pZGRsZSB7CisgIHdpZHRoOiAxMDBweDsKKyAgaGVpZ2h0OiA5MHB4OworICBiYWNrZ3Jv dW5kLWNvbG9yOiBibGFjazsKK30KKworZGl2LmV4cGFuZFZlcnRpY2FsQm90dG9tIHsKKyAgd2lk dGg6IDEwcHg7CisgIGhlaWdodDogNXB4OworICBiYWNrZ3JvdW5kLWNvbG9yOiBibGFjazsKKyAg LW1vei1ib3gtZmxleDogMTsKKyAgLXdlYmtpdC1ib3gtZmxleDogMTsKKyAgYm94LWZsZXg6IDE7 CisgIGJvcmRlci1sZWZ0OiA2MHB4IHNvbGlkIG9saXZlOworICBib3JkZXItdG9wOiAycHggc29s aWQgYmx1ZTsKKyAgcGFkZGluZy1yaWdodDogMzBweDsKKyAgcGFkZGluZy1ib3R0b206IDJweDsK K30KKworZGl2LnNocmlua1ZlcnRpY2FsQm90dG9tIHsKKyAgd2lkdGg6IDEwcHg7CisgIGhlaWdo dDogMjBweDsKKyAgYmFja2dyb3VuZC1jb2xvcjogYmxhY2s7CisgIC1tb3otYm94LWZsZXg6IDE7 CisgIC13ZWJraXQtYm94LWZsZXg6IDE7CisgIGJveC1mbGV4OiAxOworICBib3JkZXItbGVmdDog NjBweCBzb2xpZCBvbGl2ZTsKKyAgYm9yZGVyLXRvcDogMnB4IHNvbGlkIGJsdWU7CisgIHBhZGRp bmctcmlnaHQ6IDMwcHg7CisgIHBhZGRpbmctYm90dG9tOiAycHg7Cit9CisKK2Rpdi5ob3Jpem9u dGFsTWlkZGxlIHsKKyAgd2lkdGg6IDkwcHg7CisgIGhlaWdodDogMTAwcHg7CisgIGJhY2tncm91 bmQtY29sb3I6IGJsYWNrOworfQorCitkaXYuZXhwYW5kSG9yaXpvbnRhbFJpZ2h0IHsKKyAgd2lk dGg6IDVweDsKKyAgaGVpZ2h0OiAxMHB4OworICBiYWNrZ3JvdW5kLWNvbG9yOiBibGFjazsKKyAg LW1vei1ib3gtZmxleDogMTsKKyAgLXdlYmtpdC1ib3gtZmxleDogMTsKKyAgYm94LWZsZXg6IDE7 CisgIGJvcmRlci1sZWZ0OiAycHggc29saWQgb2xpdmU7CisgIGJvcmRlci10b3A6IDYwcHggc29s aWQgYmx1ZTsKKyAgcGFkZGluZy1yaWdodDogMnB4OworICBwYWRkaW5nLWJvdHRvbTogMzBweDsK K30KKworZGl2LnNocmlua0hvcml6b250YWxSaWdodCB7CisgIHdpZHRoOiAyMHB4OworICBoZWln aHQ6IDEwcHg7CisgIGJhY2tncm91bmQtY29sb3I6IGJsYWNrOworICAtbW96LWJveC1mbGV4OiAx OworICAtd2Via2l0LWJveC1mbGV4OiAxOworICBib3gtZmxleDogMTsKKyAgYm9yZGVyLWxlZnQ6 IDJweCBzb2xpZCBvbGl2ZTsKKyAgYm9yZGVyLXRvcDogNjBweCBzb2xpZCBibHVlOworICBwYWRk aW5nLXJpZ2h0OiAycHg7CisgIHBhZGRpbmctYm90dG9tOiAzMHB4OworfQorPC9zdHlsZT4KKzwv aGVhZD4KKzxib2R5PgorPGRpdiBjbGFzcz0iYm94IHZlcnRpY2FsIG91dGVyIiBpZD0iZXhwYW5k VmVydGljYWwiPgorICA8ZGl2IGNsYXNzPSJ2ZXJ0aWNhbE1pZGRsZSI+PC9kaXY+CisgIDxkaXYg Y2xhc3M9ImV4cGFuZFZlcnRpY2FsQm90dG9tIj48L2Rpdj4KKzwvZGl2PgorPGRpdiBjbGFzcz0i Ym94IHZlcnRpY2FsIG91dGVyIiBpZD0ic2hyaW5rVmVydGljYWwiPgorICA8ZGl2IGNsYXNzPSJ2 ZXJ0aWNhbE1pZGRsZSI+PC9kaXY+CisgIDxkaXYgY2xhc3M9InNocmlua1ZlcnRpY2FsQm90dG9t Ij48L2Rpdj4KKzwvZGl2PgorPGRpdiBjbGFzcz0iYm94IGhvcml6b250YWwgb3V0ZXIiIGlkPSJl eHBhbmRIb3Jpem9udGFsIj4KKyAgPGRpdiBjbGFzcz0iaG9yaXpvbnRhbE1pZGRsZSI+PC9kaXY+ CisgIDxkaXYgY2xhc3M9ImV4cGFuZEhvcml6b250YWxSaWdodCI+PC9kaXY+Cis8L2Rpdj4KKzxk aXYgY2xhc3M9ImJveCBob3Jpem9udGFsIG91dGVyIiBpZD0ic2hyaW5rSG9yaXpvbnRhbCI+Cisg IDxkaXYgY2xhc3M9Imhvcml6b250YWxNaWRkbGUiPjwvZGl2PgorICA8ZGl2IGNsYXNzPSJzaHJp bmtIb3Jpem9udGFsUmlnaHQiPjwvZGl2PgorPC9kaXY+Cis8cCBpZD0iZGVzY3JpcHRpb24iPjwv cD4KKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorPHNjcmlwdD4KK2Rlc2NyaXB0aW9uKCJDaGVj ayBpZiBib3gtZmxleCBzcGVjaWZpZWQgZmxleGJveGVzIGV4cGFuZCBvciBzaHJpbmsgY29ycmVj dGx5LiBJZiB5b3Ugc2VlIGFueSBzY3JvbGxiYXJzLCB0aGVuIHRoZSB0ZXN0IGhhcyBmYWlsZWQu Iik7CisKK3ZhciBlbGVtZW50ID0gbnVsbDsKKworZGVidWcoInZlcnRpY2FsbHkgZXhwYW5kaW5n Iik7CitlbGVtZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImV4cGFuZFZlcnRpY2FsIik7 CitzaG91bGRCZSgiZWxlbWVudC5zY3JvbGxIZWlnaHQiLCAiMTAwIik7CitzaG91bGRCZSgiZWxl bWVudC5zY3JvbGxXaWR0aCIsICIxMDAiKTsKKworZGVidWcoInZlcnRpY2FsbHkgc2hyaW5raW5n Iik7CitlbGVtZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInNocmlua1ZlcnRpY2FsIik7 CitzaG91bGRCZSgiZWxlbWVudC5zY3JvbGxIZWlnaHQiLCAiMTAwIik7CitzaG91bGRCZSgiZWxl bWVudC5zY3JvbGxXaWR0aCIsICIxMDAiKTsKKworZGVidWcoImhvcml6b250YWxseSBleHBhbmRp bmciKTsKK2VsZW1lbnQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiZXhwYW5kSG9yaXpvbnRh bCIpOworc2hvdWxkQmUoImVsZW1lbnQuc2Nyb2xsSGVpZ2h0IiwgIjEwMCIpOworc2hvdWxkQmUo ImVsZW1lbnQuc2Nyb2xsV2lkdGgiLCAiMTAwIik7CisKK2RlYnVnKCJob3Jpem9udGFsbHkgc2hy aW5raW5nIik7CitlbGVtZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInNocmlua0hvcml6 b250YWwiKTsKK3Nob3VsZEJlKCJlbGVtZW50LnNjcm9sbEhlaWdodCIsICIxMDAiKTsKK3Nob3Vs ZEJlKCJlbGVtZW50LnNjcm9sbFdpZHRoIiwgIjEwMCIpOworCitzdWNjZXNzZnVsbHlQYXJzZWQg PSB0cnVlOworPC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vanMvcmVzb3VyY2VzL2pzLXRlc3Qt cG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxv ZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDMwZGMyNzhjYTI1M2U2MGUwMDVjMzExNmQ3ZjFi YzhlOTM3Yjg0YzYuLjFiMGRlOTdkOWFhNjIxZDhkMTUwYjRiZDQyMjdkYWYzOWQ3M2M2NWUgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTYgQEAKKzIwMTAtMDQtMjggIFlvc2hpa2kgSGF5YXNoaSAgPHloYXlhc2hpQGdvb2ds ZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM4MjQ5CisgICAgICAgIAor ICAgICAgICBGaXhlcyBhbiBpc3N1ZSB3aGVyZSBib3JkZXIgaGVpZ2h0IGFuZCBwYWRkaW5nIGhl aWdodCBhcmUgaWdub3JlZCB3aGVuIGNvbXB1dGluZyB2ZXJ0aWNhbGx5IHNocmlua2luZyBmbGV4 Ym94J3MgaGVpZ2h0LgorCisgICAgICAgIFRlc3Q6IGZhc3QvZmxleGJveC9jaGlsZC1mbGV4aW5n Lmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6YWxsb3dlZENoaWxkRmxleCk6CisKIDIw MTAtMDQtMjggIEp1c3RpbiBNY1BoZXJzb24gPGp1c3Rpbi5tY3BoZXJzb25Abm9raWEuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhhdXNtYW5uLgpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyRmxleGlibGVCb3guY3BwCmluZGV4IGFiYzA1MzJhOTI4Njk1MjcwMDE2NGU5YzlhMDhlOTI1 YTMxMTA5ZjQuLjIzOGIxNmQzZTJjNmVkOGM1MGVkYTZjOThlNWRiMjg2MWMyMDRkZTMgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKQEAgLTEwNTksNyArMTA1OSw3IEBA IGludCBSZW5kZXJGbGV4aWJsZUJveDo6YWxsb3dlZENoaWxkRmxleChSZW5kZXJCb3gqIGNoaWxk LCBib29sIGV4cGFuZGluZywgdW5zaWduCiAgICAgfSBlbHNlIHsKICAgICAgICAgaWYgKGNoaWxk LT5zdHlsZSgpLT5taW5IZWlnaHQoKS5pc0ZpeGVkKCkpIHsKICAgICAgICAgICAgIGludCBtaW5I ID0gY2hpbGQtPnN0eWxlKCktPm1pbkhlaWdodCgpLnZhbHVlKCk7Ci0gICAgICAgICAgICBpbnQg aCA9IGNoaWxkLT5vdmVycmlkZUhlaWdodCgpIC0gKGNoaWxkLT5ib3JkZXJMZWZ0KCkgKyBjaGls ZC0+Ym9yZGVyUmlnaHQoKSArIGNoaWxkLT5wYWRkaW5nTGVmdCgpICsgY2hpbGQtPnBhZGRpbmdS aWdodCgpKTsKKyAgICAgICAgICAgIGludCBoID0gY2hpbGQtPm92ZXJyaWRlSGVpZ2h0KCkgLSBj aGlsZC0+Ym9yZGVyQW5kUGFkZGluZ0hlaWdodCgpOwogICAgICAgICAgICAgaW50IGFsbG93ZWRT aHJpbmthZ2UgPSBtaW4oMCwgbWluSCAtIGgpOwogICAgICAgICAgICAgcmV0dXJuIGFsbG93ZWRT aHJpbmthZ2U7CiAgICAgICAgIH0K