17918 2008-03-18 11:53:13 -0700 -webkit-box-align stretch does not work on replaced content 2010-08-11 00:18:18 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED HasReduction P2 Normal --- 1 erik.arvidsson webkit-unassigned arv commit-queue hamaji hyatt ojan yhayashi oldest_to_newest 74288 0 erik.arvidsson 2008-03-18 11:53:13 -0700 I have -webkit-box-align set to stretch but it does not seem to work. start, end and center seems to work fine though. Test case coming 74289 1 19867 erik.arvidsson 2008-03-18 11:54:10 -0700 Created attachment 19867 Tests -webkit-box-align: stretch The buttons should be 100% of the width of the div 74291 2 hyatt 2008-03-18 12:02:35 -0700 I suspect this is a bug with <button> rather than box stretch not working in general. 74296 3 erik.arvidsson 2008-03-18 13:15:54 -0700 I suspect it is a bug with any replaced content since it happens for textareas and inputs as well. 74297 4 19868 erik.arvidsson 2008-03-18 13:16:45 -0700 Created attachment 19868 Updated test case that tests, button, textarea, input and spans 223206 5 yhayashi 2010-05-10 02:29:41 -0700 I investigated this bug and found that the root cause seems to be that CSSStyleSelector::adjustRenderStyle in WebCore/css/CSSStyleSelector.cpp changes width: auto to mean width: intrinsic for these tags (button, input, select and textarea). Changing those to be kept as width: auto fixes this bug and doesn't cause any regression as far as I can see so I'm going to attach that patch to this issue. It looks like the change was made in http://trac.webkit.org/changeset/10662 by David, so I believe he can shoot my patch down quickly if I'm doing something completely stupid. Alternative solution I could see is to treat width: intrinsic of button, input, select or textarea in flexbox as width: auto. That looks uglier so I didn't implement it that way but if it's the desired way or there's some other way I should formulate my patch, I could implement it. 223207 6 55530 yhayashi 2010-05-10 02:30:47 -0700 Created attachment 55530 Proposed Patch 223820 7 yhayashi 2010-05-11 01:51:03 -0700 Shinichiro (hamaji@chromium.org) pointed it out to me that treating width: auto as is for form controls for display: block isn't in sync with other browsers like Firefox, Opera and Internet Explorer and as far as I can see, the spec doesn't demand it either way, so I created a new patch that keeps the current width: auto -> width: intrinsic behavior outside of flexbox and only stretches vertically when text controls are in the vertical flex box with stretch specified as box-align. Since I couldn't come up with any better way, the new patch moves width: auto -> width: intrinsic conversion from CSSStyleSelector::adjustRenderStyle to RenderBox::sizesToIntrinsicWidth. 223821 8 55678 yhayashi 2010-05-11 01:52:11 -0700 Created attachment 55678 Proposed Patch 2 223854 9 hamaji 2010-05-11 03:43:36 -0700 This change broke the following 3 tests on Mac: fast/forms/003.html fast/forms/select-block-background.html fast/text/drawBidiText.html I guess some code for <select> needs to check sizesToIntrinsicWidth. I suspect isAuto() in Render(MenuList|ListBox)::calcPrefWidths() . Also, I guess we need the same change for <datagrid> . I'm not sure about <legend>, but probably it has similar issue when we specify display:inline-block explicitly? CCing dhyatt. 223857 10 55678 hamaji 2010-05-11 03:48:02 -0700 Comment on attachment 55678 Proposed Patch 2 Putting r- per my comment, but the overall plan looks sane to me. Thanks for tackling this issue! 225192 11 yhayashi 2010-05-13 00:49:38 -0700 (In reply to comment #9) > This change broke the following 3 tests on Mac: > > fast/forms/003.html > fast/forms/select-block-background.html > fast/text/drawBidiText.html > > I guess some code for <select> needs to check sizesToIntrinsicWidth. I suspect isAuto() in Render(MenuList|ListBox)::calcPrefWidths() . My bad. I forgot to include <select> in sizesToIntrinsicWidth. > Also, I guess we need the same change for <datagrid> . I'm not sure about <legend>, but probably it has similar issue when we specify display:inline-block explicitly? I'm not sure what would be the desired behavior but I've changed the code as suggested. Now all the tags formerly treated width: auto as width: intrinsic behaves the same way, it is handled as width: auto only when in vertical flexbox with box-align: stretch. Otherwise those are handled as width: intrinsic as before. 225193 12 55953 yhayashi 2010-05-13 00:54:19 -0700 Created attachment 55953 Proposed Patch 3 225210 13 55953 hamaji 2010-05-13 02:34:09 -0700 Comment on attachment 55953 Proposed Patch 3 > + * fast/flexbox/vertical-box-form-controls-expected.txt: Added. > + * fast/flexbox/vertical-box-form-controls.html: Added. I think you forgot to include the test cases into your patch :) 225213 14 yhayashi 2010-05-13 02:41:02 -0700 (In reply to comment #13) > (From update of attachment 55953 [details]) > > + * fast/flexbox/vertical-box-form-controls-expected.txt: Added. > > + * fast/flexbox/vertical-box-form-controls.html: Added. > > I think you forgot to include the test cases into your patch :) Oops. Sorry about that! 225215 15 55957 yhayashi 2010-05-13 02:43:59 -0700 Created attachment 55957 Proposed Patch 4 260391 16 55957 hamaji 2010-08-04 22:14:23 -0700 Comment on attachment 55957 Proposed Patch 4 Looks good to me. I'd wait a few days to see if someone object. 263050 17 55957 abarth 2010-08-10 23:01:24 -0700 Comment on attachment 55957 Proposed Patch 4 The few days have passed. :) 263083 18 55957 commit-queue 2010-08-11 00:14:16 -0700 Comment on attachment 55957 Proposed Patch 4 Clearing flags on attachment: 55957 Committed r65131: <http://trac.webkit.org/changeset/65131> 263084 19 commit-queue 2010-08-11 00:14:22 -0700 All reviewed patches have been landed. Closing bug. 263089 20 hamaji 2010-08-11 00:18:18 -0700 (In reply to comment #17) > (From update of attachment 55957 [details]) > The few days have passed. :) Ah, thanks for putting cq+ for this! 19867 2008-03-18 11:54:10 -0700 2008-03-18 13:16:45 -0700 Tests -webkit-box-align: stretch webkitbox.html text/html 752 erik.arvidsson PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8aGVhZD4KPHRpdGxlPkNTUyBYVUwgQm94IE1vZGVsPC90 aXRsZT4KPHN0eWxlPgoKZGl2IHsKICBkaXNwbGF5OiAtd2Via2l0LWJveDsKICBkaXNwbGF5OiAt bW96LWJveDsKICBiYWNrZ3JvdW5kOiByZWQ7CiAgd2lkdGg6IDUwMHB4OwogIGhlaWdodDogMTAw cHg7CiAgLXdlYmtpdC1ib3gtb3JpZW50OiB2ZXJ0aWNhbDsKICAtbW96LWJveC1vcmllbnQ6IHZl cnRpY2FsOwogIC8qLXdlYmtpdC1ib3gtcGFjazogY2VudGVyOyovCiAgLyotbW96LWJveC1wYWNr OiBjZW50ZXI7Ki8KICAtd2Via2l0LWJveC1hbGlnbjogc3RyZXRjaDsKICAtbW96LWJveC1hbGln bjogc3RyZXRjaDsKfQoKZGl2ID4gKiB7CiAgZGlzcGxheTogLXdlYmtpdC1ib3g7CiAgZGlzcGxh eTogLW1vei1ib3g7CiAgLyotd2Via2l0LWJveC1mbGV4OiAxOyovCiAgLyotbW96LWJveC1mbGV4 OiAxOyovCiAgbWFyZ2luOiAwOwogIHBhZGRpbmc6IDAuNWVtIDFlbTsKfQoKI2EgewogIC8qLXdl YmtpdC1ib3gtZmxleDogMTsqLwogIC8qLW1vei1ib3gtZmxleDogMTsqLwp9CgojYiB7CiAgLXdl YmtpdC1ib3gtZmxleDogMjsKICAtbW96LWJveC1mbGV4OiAyOwp9Cgo8L3N0eWxlPgo8c2NyaXB0 PgoKPC9zY3JpcHQ+CjwvaGVhZD4KPGJvZHk+Cgo8ZGl2PgogIDxidXR0b24gaWQ9YT5CdXR0b24g QTwvYnV0dG9uPgogIDxidXR0b24gaWQ9Yj5CdXR0b24gQjwvYnV0dG9uPgo8L2Rpdj4KCjwvYm9k eT4KPC9odG1sPgo= 19868 2008-03-18 13:16:45 -0700 2008-03-18 13:16:45 -0700 Updated test case that tests, button, textarea, input and spans webkitbox.html text/html 1363 erik.arvidsson PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8aGVhZD4KPHRpdGxlPkNTUyBYVUwgQm94IE1vZGVsPC90 aXRsZT4KPHN0eWxlPgoKZGl2IHsKICBkaXNwbGF5OiAtd2Via2l0LWJveDsKICBkaXNwbGF5OiAt bW96LWJveDsKICBiYWNrZ3JvdW5kOiByZWQ7CiAgd2lkdGg6IDUwMHB4OwogIGhlaWdodDogMTAw cHg7CiAgLXdlYmtpdC1ib3gtb3JpZW50OiB2ZXJ0aWNhbDsKICAtbW96LWJveC1vcmllbnQ6IHZl cnRpY2FsOwogIC8qLXdlYmtpdC1ib3gtcGFjazogY2VudGVyOyovCiAgLyotbW96LWJveC1wYWNr OiBjZW50ZXI7Ki8KICAtd2Via2l0LWJveC1hbGlnbjogc3RyZXRjaDsKICAtbW96LWJveC1hbGln bjogc3RyZXRjaDsKICBtYXJnaW46IDJweDsKfQoKZGl2ID4gKiB7CiAgZGlzcGxheTogLXdlYmtp dC1ib3g7CiAgZGlzcGxheTogLW1vei1ib3g7CiAgLyotd2Via2l0LWJveC1mbGV4OiAxOyovCiAg LyotbW96LWJveC1mbGV4OiAxOyovCiAgbWFyZ2luOiAwOwogIHBhZGRpbmc6IDAuNWVtIDFlbTsK CiAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47CiAgYm9yZGVyOiAwOwp9CgpbbmFtZT1hXSB7CiAg Lyotd2Via2l0LWJveC1mbGV4OiAxOyovCiAgLyotbW96LWJveC1mbGV4OiAxOyovCn0KCltuYW1l PWJdIHsKICAtd2Via2l0LWJveC1mbGV4OiAyOwogIC1tb3otYm94LWZsZXg6IDI7Cn0KCnNwYW4g ewogIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOwp9Cgo8L3N0eWxlPgo8c2NyaXB0PgoKPC9zY3Jp cHQ+CjwvaGVhZD4KPGJvZHk+Cgo8cD5UaGVyZSBzaG91bGQgYmUgbm8gcmVkIG9uIHRoaXMgcGFn ZQoKPGRpdj4KICA8YnV0dG9uIG5hbWU9YT5CdXR0b24gQTwvYnV0dG9uPgogIDxidXR0b24gbmFt ZT1iPkJ1dHRvbiBCPC9idXR0b24+CjwvZGl2PgoKPGRpdj4KICA8dGV4dGFyZWEgbmFtZT1hPlRl eHRhcmVhIEE8L3RleHRhcmVhPgogIDx0ZXh0YXJlYSBuYW1lPWI+VGV4dGFyZWEgQjwvdGV4dGFy ZWE+CjwvZGl2PgoKPGRpdj4KICA8aW5wdXQgdHlwZT10ZXh0IG5hbWU9YSB2YWx1ZT0iSW5wdXQg QSI+CiAgPGlucHV0IHR5cGU9dGV4dCBuYW1lPWIgdmFsdWU9IklucHV0IEIiPgo8L2Rpdj4KCjxk aXY+CiAgPGlucHV0IHR5cGU9cmFuZ2UgbmFtZT1hIHZhbHVlPTUwPgogIDxpbnB1dCB0eXBlPXJh bmdlIG5hbWU9YiB2YWx1ZT05MD4KPC9kaXY+Cgo8ZGl2PgogIDxpbnB1dCB0eXBlPXN1Ym1pdCBu YW1lPWEgdmFsdWU9IlN1Ym1pdCBBIj4KICA8aW5wdXQgdHlwZT1zdWJtaXQgbmFtZT1iIHZhbHVl PSJTdWJtaXQgQiI+CjwvZGl2PgoKPGRpdj4KICA8c3BhbiBuYW1lPWE+U3BhbiBBPC9zcGFuPgog IDxzcGFuIG5hbWU9Yj5TcGFuIEI8L3NwYW4+CjwvZGl2PgoKPC9ib2R5Pgo8L2h0bWw+Cg== 55530 2010-05-10 02:30:47 -0700 2010-05-11 01:52:05 -0700 Proposed Patch bug-17918-20100510183045.patch text/plain 6830 yhayashi ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxYTQyN2MzNTIzYzEyZjNkYjI0MzZmNWMxNzc4NjFhZDUzMGM4M2ZhLi5mOTRiMjlk OTMyM2RmOTI1MTgxN2Q4YTk3MWRjMmVmMDhlYjEwMjQwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTAtMDUtMTAgIFlvc2hpa2kgSGF5YXNoaSAgPHloYXlhc2hpQGdvb2dsZS5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBmb3JtIGNv bnRyb2xzIGFuZCB0ZXh0YXJlYSB0cmVhdCB3aWR0aDogYXV0byBhcyBzcGVjaWZpZWQgaW5zdGVh ZAorICAgICAgICBvZiB3aWR0aDogaW50cmluc2ljLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc5MTgKKworICAgICAgICAqIGZhc3QvZmxleGJveC92 ZXJ0aWNhbC1ib3gtZm9ybS1jb250cm9scy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAq IGZhc3QvZmxleGJveC92ZXJ0aWNhbC1ib3gtZm9ybS1jb250cm9scy5odG1sOiBBZGRlZC4KKwog MjAxMC0wNS0wOSAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg VW5yZXZpZXdlZCwgdGVzdCBleHBlY3RhdGlvbiB1cGRhdGUuCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9mYXN0L2ZsZXhib3gvdmVydGljYWwtYm94LWZvcm0tY29udHJvbHMtZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L3ZlcnRpY2FsLWJveC1mb3JtLWNvbnRyb2xzLWV4 cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi42ZTAzODRlMWI2ZjNiMmRkMWRlZmM5ZDY1OTEyNjRmMDZl ODhiNTM2Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L3ZlcnRp Y2FsLWJveC1mb3JtLWNvbnRyb2xzLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDI1IEBACisKKwor CisKK0NoZWNrIGlmIGZvcm0gY29udHJvbHMgaW4gdmVydGljYWwgZmxleCBib3ggd2lsbCBzdHJl dGNoIGhvcml6b250YWxseSB3aGVuIHJlbmRlcmVkIGFzIGJveCBhcyBvcHBvc2VkIHRvIGlubGlu ZS1ib3guIElmIHlvdSBzZWUgYW55IHJlZCwgdGhlbiB0aGUgdGVzdCBoYXMgZmFpbGVkLgorCitP biBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xs b3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworQnV0dG9uCitQQVNTIGVsZW1lbnQub2Zmc2V0 SGVpZ2h0IGlzIDEwMAorUEFTUyBlbGVtZW50Lm9mZnNldFdpZHRoIGlzIDEwMAorVGV4dCBpbnB1 dAorUEFTUyBlbGVtZW50Lm9mZnNldEhlaWdodCBpcyAxMDAKK1BBU1MgZWxlbWVudC5vZmZzZXRX aWR0aCBpcyAxMDAKK1RleHRhcmVhCitQQVNTIGVsZW1lbnQub2Zmc2V0SGVpZ2h0IGlzIDEwMAor UEFTUyBlbGVtZW50Lm9mZnNldFdpZHRoIGlzIDEwMAorU3VibWl0CitQQVNTIGVsZW1lbnQub2Zm c2V0SGVpZ2h0IGlzIDEwMAorUEFTUyBlbGVtZW50Lm9mZnNldFdpZHRoIGlzIDEwMAorUEFTUyBz dWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC92ZXJ0aWNhbC1ib3gtZm9ybS1jb250cm9scy5odG1s IGIvTGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L3ZlcnRpY2FsLWJveC1mb3JtLWNvbnRyb2xzLmh0 bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uM2YzODIyYjZjNzkwMjhhMTE3ZGZjNTI2YmIzZDYxZWI2NTIzZGNhZAot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC92ZXJ0aWNhbC1ib3gt Zm9ybS1jb250cm9scy5odG1sCkBAIC0wLDAgKzEsODAgQEAKKzxodG1sPgorPGhlYWQ+Cis8bGlu ayByZWw9InN0eWxlc2hlZXQiIGhyZWY9Ii4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXN0eWxlLmNz cyI+Cis8c2NyaXB0IHNyYz0iLi4vanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3Njcmlw dD4KKzxzdHlsZT4KK2Rpdi5ib3ggeworICBkaXNwbGF5OiAtbW96LWJveDsKKyAgZGlzcGxheTog LXdlYmtpdC1ib3g7CisgIGRpc3BsYXk6IGJveDsKK30KKworZGl2Lm91dGVyIHsKKyAgd2lkdGg6 IDEwMHB4OworICBoZWlnaHQ6IDEwMHB4OworICBiYWNrZ3JvdW5kLWNvbG9yOiByZWQ7CisgIGJv eC1vcmllbnQ6IHZlcnRpY2FsOworICAtbW96LWJveC1vcmllbnQ6IHZlcnRpY2FsOworICAtd2Vi a2l0LWJveC1vcmllbnQ6IHZlcnRpY2FsOworfQorCisuaW5uZXIgeworICBkaXNwbGF5OiAtd2Vi a2l0LWJveDsKKyAgZGlzcGxheTogLW1vei1ib3g7CisgIGRpc3BsYXk6IGJveDsKKyAgYm94LWFs aWduOiBzdHJldGNoOworICAtbW96LWJveC1hbGlnbjogc3RyZXRjaDsKKyAgLXdlYmtpdC1ib3gt YWxpZ246IHN0cmV0Y2g7CisgIG1hcmdpbjogMDsKKyAgYm9yZGVyOiAwOworICBwYWRkaW5nOiAw OworICBoZWlnaHQ6IDEwMHB4OworICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKK30KKzwvc3R5 bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKzxkaXYgY2xhc3M9ImJveCBvdXRlciI+Cis8YnV0dG9uIGNs YXNzPSJpbm5lciIgdHlwZT0ic3VibWl0IiBpZD0iYnV0dG9uIj48L2J1dHRvbj4KKzwvZGl2Pgor PGRpdiBjbGFzcz0iYm94IG91dGVyIj4KKzxpbnB1dCBjbGFzcz0iaW5uZXIiIHR5cGU9InRleHQi IHZhbHVlPSIiIGlkPSJpbnB1dFRleHQiPgorPC9kaXY+Cis8ZGl2IGNsYXNzPSJib3ggb3V0ZXIi PgorPHRleHRhcmVhIGNsYXNzPSJpbm5lciIgaWQ9InRleHRhcmVhIj48L3RleHRhcmVhPgorPC9k aXY+Cis8ZGl2IGNsYXNzPSJib3ggb3V0ZXIiPgorPGlucHV0IGNsYXNzPSJpbm5lciIgdHlwZT0i c3VibWl0IiB2YWx1ZT0iIiBpZD0ic3VibWl0Ij4KKzwvZGl2PgorPHAgaWQ9ImRlc2NyaXB0aW9u Ij48L3A+Cis8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKzxzY3JpcHQ+CitkZXNjcmlwdGlvbigi Q2hlY2sgaWYgZm9ybSBjb250cm9scyBpbiB2ZXJ0aWNhbCBmbGV4IGJveCB3aWxsIHN0cmV0Y2gg aG9yaXpvbnRhbGx5IHdoZW4gcmVuZGVyZWQgYXMgYm94IGFzIG9wcG9zZWQgdG8gaW5saW5lLWJv eC4gIElmIHlvdSBzZWUgYW55IHJlZCwgdGhlbiB0aGUgdGVzdCBoYXMgZmFpbGVkLiIpOworCit2 YXIgZWxlbWVudCA9IG51bGw7CisKK2RlYnVnKCJCdXR0b24iKTsKK2VsZW1lbnQgPSBkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgiYnV0dG9uIik7CitzaG91bGRCZSgiZWxlbWVudC5vZmZzZXRIZWln aHQiLCAiMTAwIik7CitzaG91bGRCZSgiZWxlbWVudC5vZmZzZXRXaWR0aCIsICIxMDAiKTsKKwor ZGVidWcoIlRleHQgaW5wdXQiKTsKK2VsZW1lbnQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgi aW5wdXRUZXh0Iik7CitzaG91bGRCZSgiZWxlbWVudC5vZmZzZXRIZWlnaHQiLCAiMTAwIik7Citz aG91bGRCZSgiZWxlbWVudC5vZmZzZXRXaWR0aCIsICIxMDAiKTsKKworZGVidWcoIlRleHRhcmVh Iik7CitlbGVtZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInRleHRhcmVhIik7CitzaG91 bGRCZSgiZWxlbWVudC5vZmZzZXRIZWlnaHQiLCAiMTAwIik7CitzaG91bGRCZSgiZWxlbWVudC5v ZmZzZXRXaWR0aCIsICIxMDAiKTsKKworZGVidWcoIlN1Ym1pdCIpOworZWxlbWVudCA9IGRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKCJzdWJtaXQiKTsKK3Nob3VsZEJlKCJlbGVtZW50Lm9mZnNldEhl aWdodCIsICIxMDAiKTsKK3Nob3VsZEJlKCJlbGVtZW50Lm9mZnNldFdpZHRoIiwgIjEwMCIpOwor CitzdWNjZXNzZnVsbHlQYXJzZWQgPSB0cnVlOworPC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4v anMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+ CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4 IGE0Yjc3YmFiMzM2ZjI3MThjMTZjYWUzOTQwODdhOWZmZDRiNmVjM2QuLmM5NTgxZmYwYzg3ZGE0 YjQzYzc1ZjNmZGFlZjdhMGE4ZTMzNjY5NzggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9n CisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDUtMTAgIFlv c2hpa2kgSGF5YXNoaSAgPHloYXlhc2hpQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBmb3JtIGNvbnRyb2xzIGFuZCB0ZXh0 YXJlYSB0cmVhdCB3aWR0aDogYXV0byBhcyBzcGVjaWZpZWQgaW5zdGVhZAorICAgICAgICBvZiB3 aWR0aDogaW50cmluc2ljLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTc5MTgKKworICAgICAgICBUZXN0OiBmYXN0L2ZsZXhib3gvdmVydGljYWwtYm94 LWZvcm0tY29udHJvbHMuaHRtbAorCisgICAgICAgICogY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6YWRqdXN0UmVuZGVyU3R5bGUp OgorCiAyMDEwLTA1LTEwICBJbHlhIFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4K IAogICAgICAgICBOb3QgcmV2aWV3ZWQ6IHJvbGxiYWNrIHRoZSBjb21taXQgcjU5MDYyCmRpZmYg LS1naXQgYS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcCBiL1dlYkNvcmUvY3NzL0NT U1N0eWxlU2VsZWN0b3IuY3BwCmluZGV4IDk2YjM2YmJkMDhiZDUzNWQ4MGIzZWUzYjMxOTJhZTdm NWE3YjY1M2UuLmY1YTcxOTYyMTZlOGQyYzAyZTI1ZWI5NDg3MmRlNDYyODkzYjJjYmMgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCisrKyBiL1dlYkNvcmUvY3Nz L0NTU1N0eWxlU2VsZWN0b3IuY3BwCkBAIC0xNjYyLDEwICsxNjYyLDggQEAgdm9pZCBDU1NTdHls ZVNlbGVjdG9yOjphZGp1c3RSZW5kZXJTdHlsZShSZW5kZXJTdHlsZSogc3R5bGUsIEVsZW1lbnQg KmUpCiAgICAgICAgIHN0eWxlLT5oYXNUcmFuc2Zvcm1SZWxhdGVkUHJvcGVydHkoKSB8fCBzdHls ZS0+aGFzTWFzaygpIHx8IHN0eWxlLT5ib3hSZWZsZWN0KCkpKQogICAgICAgICBzdHlsZS0+c2V0 WkluZGV4KDApOwogICAgIAotICAgIC8vIEJ1dHRvbiwgbGVnZW5kLCBpbnB1dCwgc2VsZWN0IGFu ZCB0ZXh0YXJlYSBhbGwgY29uc2lkZXIgd2lkdGggdmFsdWVzIG9mICdhdXRvJyB0byBiZSAnaW50 cmluc2ljJy4KLSAgICAvLyBUaGlzIHdpbGwgYmUgaW1wb3J0YW50IHdoZW4gd2UgdXNlIGJsb2Nr IGZsb3dzIGZvciBhbGwgZm9ybSBjb250cm9scy4KLSAgICBpZiAoZSAmJiAoZS0+aGFzVGFnTmFt ZShsZWdlbmRUYWcpIHx8IGUtPmhhc1RhZ05hbWUoYnV0dG9uVGFnKSB8fCBlLT5oYXNUYWdOYW1l KGlucHV0VGFnKSB8fAotICAgICAgICAgICAgICBlLT5oYXNUYWdOYW1lKHNlbGVjdFRhZykgfHwg ZS0+aGFzVGFnTmFtZSh0ZXh0YXJlYVRhZykgfHwgZS0+aGFzVGFnTmFtZShkYXRhZ3JpZFRhZykK KyAgICAvLyBMZWdlbmQgYW5kIGRhdGFncmlkIGNvbnNpZGVyIHdpZHRoIHZhbHVlcyBvZiAnYXV0 bycgdG8gYmUgJ2ludHJpbnNpYycuCisgICAgaWYgKGUgJiYgKGUtPmhhc1RhZ05hbWUobGVnZW5k VGFnKSB8fCBlLT5oYXNUYWdOYW1lKGRhdGFncmlkVGFnKQogI2lmIEVOQUJMRShXTUwpCiAgICAg ICAgICAgICAgIHx8IGUtPmhhc1RhZ05hbWUoV01MTmFtZXM6Omluc2VydGVkTGVnZW5kVGFnKQog ICAgICAgICAgICAgICB8fCBlLT5oYXNUYWdOYW1lKFdNTE5hbWVzOjppbnB1dFRhZykKQEAgLTE2 NzMsMTIgKzE2NzEsMTIgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjphZGp1c3RSZW5kZXJTdHls ZShSZW5kZXJTdHlsZSogc3R5bGUsIEVsZW1lbnQgKmUpCiAgICAgICAgKSkgewogICAgICAgICBp ZiAoc3R5bGUtPndpZHRoKCkuaXNBdXRvKCkpCiAgICAgICAgICAgICBzdHlsZS0+c2V0V2lkdGgo TGVuZ3RoKEludHJpbnNpYykpOworICAgIH0KIAotICAgICAgICAvLyBUZXh0YXJlYSBjb25zaWRl cnMgb3ZlcmZsb3cgdmlzaWJsZSBhcyBhdXRvLgotICAgICAgICBpZiAoZSAmJiBlLT5oYXNUYWdO YW1lKHRleHRhcmVhVGFnKSkgewotICAgICAgICAgICAgc3R5bGUtPnNldE92ZXJmbG93WChzdHls ZS0+b3ZlcmZsb3dYKCkgPT0gT1ZJU0lCTEUgPyBPQVVUTyA6IHN0eWxlLT5vdmVyZmxvd1goKSk7 Ci0gICAgICAgICAgICBzdHlsZS0+c2V0T3ZlcmZsb3dZKHN0eWxlLT5vdmVyZmxvd1koKSA9PSBP VklTSUJMRSA/IE9BVVRPIDogc3R5bGUtPm92ZXJmbG93WSgpKTsKLSAgICAgICAgfQorICAgIC8v IFRleHRhcmVhIGNvbnNpZGVycyBvdmVyZmxvdyB2aXNpYmxlIGFzIGF1dG8uCisgICAgaWYgKGUg JiYgZS0+aGFzVGFnTmFtZSh0ZXh0YXJlYVRhZykpIHsKKyAgICAgICAgc3R5bGUtPnNldE92ZXJm bG93WChzdHlsZS0+b3ZlcmZsb3dYKCkgPT0gT1ZJU0lCTEUgPyBPQVVUTyA6IHN0eWxlLT5vdmVy Zmxvd1goKSk7CisgICAgICAgIHN0eWxlLT5zZXRPdmVyZmxvd1koc3R5bGUtPm92ZXJmbG93WSgp ID09IE9WSVNJQkxFID8gT0FVVE8gOiBzdHlsZS0+b3ZlcmZsb3dZKCkpOwogICAgIH0KIAogICAg IC8vIEZpbmFsbHkgdXBkYXRlIG91ciB0ZXh0IGRlY29yYXRpb25zIGluIGVmZmVjdCwgYnV0IGRv bid0IGFsbG93IHRleHQtZGVjb3JhdGlvbiB0byBwZXJjb2xhdGUgdGhyb3VnaAo= 55678 2010-05-11 01:52:11 -0700 2010-05-13 00:54:13 -0700 Proposed Patch 2 bug-17918-20100511175209.patch text/plain 7980 yhayashi ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2MzlmN2QzNzgwYjc2NzY3Zjk1MmU4OGZiZTQzOGNlODczNjE1Y2FhLi5jMGUyOWM3 ZTBlMDBiNjY1MjRlZjdhYjlkOWM2MDlhZmE1OWIxZWE1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAK KzIwMTAtMDUtMTEgIFlvc2hpa2kgSGF5YXNoaSAgPHloYXlhc2hpQGdvb2dsZS5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKworICAgICAgICBNYWtlIGZvcm0g Y29udHJvbHMgYW5kIHRleHRhcmVhIHRyZWF0IHdpZHRoOiBhdXRvIGFzIHNwZWNpZmllZCBpbgor ICAgICAgICBzdHJldGNoaW5nIHZlcnRpY2FsIGZsZXhib3guICBPdGhlcndpc2UgaXQncyB0cmVh dGVkIGFzIGludHJpbnNpYworICAgICAgICBhcyBiZWZvcmUuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzkxOAorCisgICAgICAgICogZmFzdC9mbGV4 Ym94L3ZlcnRpY2FsLWJveC1mb3JtLWNvbnRyb2xzLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAg ICAgICogZmFzdC9mbGV4Ym94L3ZlcnRpY2FsLWJveC1mb3JtLWNvbnRyb2xzLmh0bWw6IEFkZGVk LgorCiAyMDEwLTA1LTEwICBKb2huIEdyZWdnICA8am9obm55Z0Bnb29nbGUuY29tPgogCiAgICAg ICAgIFtjaHJvbWl1bV0gcmViYXNlbGluZSBTVkcgdGVzdCBmb3Igd2luZG93cyBhZnRlciByZWNl bnQgY2hhbmdlcy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC92ZXJ0aWNh bC1ib3gtZm9ybS1jb250cm9scy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhi b3gvdmVydGljYWwtYm94LWZvcm0tY29udHJvbHMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjZl MDM4NGUxYjZmM2IyZGQxZGVmYzlkNjU5MTI2NGYwNmU4OGI1MzYKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvdmVydGljYWwtYm94LWZvcm0tY29udHJvbHMtZXhw ZWN0ZWQudHh0CkBAIC0wLDAgKzEsMjUgQEAKKworCisKKworQ2hlY2sgaWYgZm9ybSBjb250cm9s cyBpbiB2ZXJ0aWNhbCBmbGV4IGJveCB3aWxsIHN0cmV0Y2ggaG9yaXpvbnRhbGx5IHdoZW4gcmVu ZGVyZWQgYXMgYm94IGFzIG9wcG9zZWQgdG8gaW5saW5lLWJveC4gSWYgeW91IHNlZSBhbnkgcmVk LCB0aGVuIHRoZSB0ZXN0IGhhcyBmYWlsZWQuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBh IHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4K KworCitCdXR0b24KK1BBU1MgZWxlbWVudC5vZmZzZXRIZWlnaHQgaXMgMTAwCitQQVNTIGVsZW1l bnQub2Zmc2V0V2lkdGggaXMgMTAwCitUZXh0IGlucHV0CitQQVNTIGVsZW1lbnQub2Zmc2V0SGVp Z2h0IGlzIDEwMAorUEFTUyBlbGVtZW50Lm9mZnNldFdpZHRoIGlzIDEwMAorVGV4dGFyZWEKK1BB U1MgZWxlbWVudC5vZmZzZXRIZWlnaHQgaXMgMTAwCitQQVNTIGVsZW1lbnQub2Zmc2V0V2lkdGgg aXMgMTAwCitTdWJtaXQKK1BBU1MgZWxlbWVudC5vZmZzZXRIZWlnaHQgaXMgMTAwCitQQVNTIGVs ZW1lbnQub2Zmc2V0V2lkdGggaXMgMTAwCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVl CisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94 L3ZlcnRpY2FsLWJveC1mb3JtLWNvbnRyb2xzLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhi b3gvdmVydGljYWwtYm94LWZvcm0tY29udHJvbHMuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zZjM4MjJiNmM3 OTAyOGExMTdkZmM1MjZiYjNkNjFlYjY1MjNkY2FkCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC9mbGV4Ym94L3ZlcnRpY2FsLWJveC1mb3JtLWNvbnRyb2xzLmh0bWwKQEAgLTAs MCArMSw4MCBAQAorPGh0bWw+Cis8aGVhZD4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0i Li4vanMvcmVzb3VyY2VzL2pzLXRlc3Qtc3R5bGUuY3NzIj4KKzxzY3JpcHQgc3JjPSIuLi9qcy9y ZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPHN0eWxlPgorZGl2LmJveCB7Cisg IGRpc3BsYXk6IC1tb3otYm94OworICBkaXNwbGF5OiAtd2Via2l0LWJveDsKKyAgZGlzcGxheTog Ym94OworfQorCitkaXYub3V0ZXIgeworICB3aWR0aDogMTAwcHg7CisgIGhlaWdodDogMTAwcHg7 CisgIGJhY2tncm91bmQtY29sb3I6IHJlZDsKKyAgYm94LW9yaWVudDogdmVydGljYWw7CisgIC1t b3otYm94LW9yaWVudDogdmVydGljYWw7CisgIC13ZWJraXQtYm94LW9yaWVudDogdmVydGljYWw7 Cit9CisKKy5pbm5lciB7CisgIGRpc3BsYXk6IC13ZWJraXQtYm94OworICBkaXNwbGF5OiAtbW96 LWJveDsKKyAgZGlzcGxheTogYm94OworICBib3gtYWxpZ246IHN0cmV0Y2g7CisgIC1tb3otYm94 LWFsaWduOiBzdHJldGNoOworICAtd2Via2l0LWJveC1hbGlnbjogc3RyZXRjaDsKKyAgbWFyZ2lu OiAwOworICBib3JkZXI6IDA7CisgIHBhZGRpbmc6IDA7CisgIGhlaWdodDogMTAwcHg7CisgIGJh Y2tncm91bmQtY29sb3I6IGdyZWVuOworfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorPGRp diBjbGFzcz0iYm94IG91dGVyIj4KKzxidXR0b24gY2xhc3M9ImlubmVyIiB0eXBlPSJzdWJtaXQi IGlkPSJidXR0b24iPjwvYnV0dG9uPgorPC9kaXY+Cis8ZGl2IGNsYXNzPSJib3ggb3V0ZXIiPgor PGlucHV0IGNsYXNzPSJpbm5lciIgdHlwZT0idGV4dCIgdmFsdWU9IiIgaWQ9ImlucHV0VGV4dCI+ Cis8L2Rpdj4KKzxkaXYgY2xhc3M9ImJveCBvdXRlciI+Cis8dGV4dGFyZWEgY2xhc3M9ImlubmVy IiBpZD0idGV4dGFyZWEiPjwvdGV4dGFyZWE+Cis8L2Rpdj4KKzxkaXYgY2xhc3M9ImJveCBvdXRl ciI+Cis8aW5wdXQgY2xhc3M9ImlubmVyIiB0eXBlPSJzdWJtaXQiIHZhbHVlPSIiIGlkPSJzdWJt aXQiPgorPC9kaXY+Cis8cCBpZD0iZGVzY3JpcHRpb24iPjwvcD4KKzxkaXYgaWQ9ImNvbnNvbGUi PjwvZGl2PgorPHNjcmlwdD4KK2Rlc2NyaXB0aW9uKCJDaGVjayBpZiBmb3JtIGNvbnRyb2xzIGlu IHZlcnRpY2FsIGZsZXggYm94IHdpbGwgc3RyZXRjaCBob3Jpem9udGFsbHkgd2hlbiByZW5kZXJl ZCBhcyBib3ggYXMgb3Bwb3NlZCB0byBpbmxpbmUtYm94LiAgSWYgeW91IHNlZSBhbnkgcmVkLCB0 aGVuIHRoZSB0ZXN0IGhhcyBmYWlsZWQuIik7CisKK3ZhciBlbGVtZW50ID0gbnVsbDsKKworZGVi dWcoIkJ1dHRvbiIpOworZWxlbWVudCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJidXR0b24i KTsKK3Nob3VsZEJlKCJlbGVtZW50Lm9mZnNldEhlaWdodCIsICIxMDAiKTsKK3Nob3VsZEJlKCJl bGVtZW50Lm9mZnNldFdpZHRoIiwgIjEwMCIpOworCitkZWJ1ZygiVGV4dCBpbnB1dCIpOworZWxl bWVudCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJpbnB1dFRleHQiKTsKK3Nob3VsZEJlKCJl bGVtZW50Lm9mZnNldEhlaWdodCIsICIxMDAiKTsKK3Nob3VsZEJlKCJlbGVtZW50Lm9mZnNldFdp ZHRoIiwgIjEwMCIpOworCitkZWJ1ZygiVGV4dGFyZWEiKTsKK2VsZW1lbnQgPSBkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgidGV4dGFyZWEiKTsKK3Nob3VsZEJlKCJlbGVtZW50Lm9mZnNldEhlaWdo dCIsICIxMDAiKTsKK3Nob3VsZEJlKCJlbGVtZW50Lm9mZnNldFdpZHRoIiwgIjEwMCIpOworCitk ZWJ1ZygiU3VibWl0Iik7CitlbGVtZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInN1Ym1p dCIpOworc2hvdWxkQmUoImVsZW1lbnQub2Zmc2V0SGVpZ2h0IiwgIjEwMCIpOworc2hvdWxkQmUo ImVsZW1lbnQub2Zmc2V0V2lkdGgiLCAiMTAwIik7CisKK3N1Y2Nlc3NmdWxseVBhcnNlZCA9IHRy dWU7Cis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0 LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hh bmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWRiZmY1NThlYjdlNTZlNWJjY2E5N2M5 ZjRmZmI5ZjZjNTVkMDYxMC4uODc0NGQ4ODAyZDQxM2ZlYzJhMGRjOTNkMGI2YjQwOGMxYzVhZjE3 OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cK QEAgLTEsMyArMSwyMCBAQAorMjAxMC0wNS0xMSAgWW9zaGlraSBIYXlhc2hpICA8eWhheWFzaGlA Z29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworCisg ICAgICAgIE1ha2UgZm9ybSBjb250cm9scyBhbmQgdGV4dGFyZWEgdHJlYXQgd2lkdGg6IGF1dG8g YXMgc3BlY2lmaWVkIGluCisgICAgICAgIHN0cmV0Y2hpbmcgdmVydGljYWwgZmxleGJveC4gIE90 aGVyd2lzZSBpdCdzIHRyZWF0ZWQgYXMgaW50cmluc2ljCisgICAgICAgIGFzIGJlZm9yZS4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3OTE4CisKKyAg ICAgICAgVGVzdDogZmFzdC9mbGV4Ym94L3ZlcnRpY2FsLWJveC1mb3JtLWNvbnRyb2xzLmh0bWwK KworICAgICAgICAqIGNzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkNTU1N0eWxlU2VsZWN0b3I6OmFkanVzdFJlbmRlclN0eWxlKToKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6c2l6ZXNUb0lu dHJpbnNpY1dpZHRoKToKKwogMjAxMC0wNS0xMCAgRHVtaXRydSBEYW5pbGl1YyAgPGR1bWlAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEJyYWR5IEVpZHNvbi4KZGlmZiAtLWdp dCBhL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwIGIvV2ViQ29yZS9jc3MvQ1NTU3R5 bGVTZWxlY3Rvci5jcHAKaW5kZXggOTZiMzZiYmQwOGJkNTM1ZDgwYjNlZTNiMzE5MmFlN2Y1YTdi NjUzZS4uZjVhNzE5NjIxNmU4ZDJjMDJlMjVlYjk0ODcyZGU0NjI4OTNiMmNiYyAxMDA2NDQKLS0t IGEvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKKysrIGIvV2ViQ29yZS9jc3MvQ1NT U3R5bGVTZWxlY3Rvci5jcHAKQEAgLTE2NjIsMTAgKzE2NjIsOCBAQCB2b2lkIENTU1N0eWxlU2Vs ZWN0b3I6OmFkanVzdFJlbmRlclN0eWxlKFJlbmRlclN0eWxlKiBzdHlsZSwgRWxlbWVudCAqZSkK ICAgICAgICAgc3R5bGUtPmhhc1RyYW5zZm9ybVJlbGF0ZWRQcm9wZXJ0eSgpIHx8IHN0eWxlLT5o YXNNYXNrKCkgfHwgc3R5bGUtPmJveFJlZmxlY3QoKSkpCiAgICAgICAgIHN0eWxlLT5zZXRaSW5k ZXgoMCk7CiAgICAgCi0gICAgLy8gQnV0dG9uLCBsZWdlbmQsIGlucHV0LCBzZWxlY3QgYW5kIHRl eHRhcmVhIGFsbCBjb25zaWRlciB3aWR0aCB2YWx1ZXMgb2YgJ2F1dG8nIHRvIGJlICdpbnRyaW5z aWMnLgotICAgIC8vIFRoaXMgd2lsbCBiZSBpbXBvcnRhbnQgd2hlbiB3ZSB1c2UgYmxvY2sgZmxv d3MgZm9yIGFsbCBmb3JtIGNvbnRyb2xzLgotICAgIGlmIChlICYmIChlLT5oYXNUYWdOYW1lKGxl Z2VuZFRhZykgfHwgZS0+aGFzVGFnTmFtZShidXR0b25UYWcpIHx8IGUtPmhhc1RhZ05hbWUoaW5w dXRUYWcpIHx8Ci0gICAgICAgICAgICAgIGUtPmhhc1RhZ05hbWUoc2VsZWN0VGFnKSB8fCBlLT5o YXNUYWdOYW1lKHRleHRhcmVhVGFnKSB8fCBlLT5oYXNUYWdOYW1lKGRhdGFncmlkVGFnKQorICAg IC8vIExlZ2VuZCBhbmQgZGF0YWdyaWQgY29uc2lkZXIgd2lkdGggdmFsdWVzIG9mICdhdXRvJyB0 byBiZSAnaW50cmluc2ljJy4KKyAgICBpZiAoZSAmJiAoZS0+aGFzVGFnTmFtZShsZWdlbmRUYWcp IHx8IGUtPmhhc1RhZ05hbWUoZGF0YWdyaWRUYWcpCiAjaWYgRU5BQkxFKFdNTCkKICAgICAgICAg ICAgICAgfHwgZS0+aGFzVGFnTmFtZShXTUxOYW1lczo6aW5zZXJ0ZWRMZWdlbmRUYWcpCiAgICAg ICAgICAgICAgIHx8IGUtPmhhc1RhZ05hbWUoV01MTmFtZXM6OmlucHV0VGFnKQpAQCAtMTY3Mywx MiArMTY3MSwxMiBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6OmFkanVzdFJlbmRlclN0eWxlKFJl bmRlclN0eWxlKiBzdHlsZSwgRWxlbWVudCAqZSkKICAgICAgICApKSB7CiAgICAgICAgIGlmIChz dHlsZS0+d2lkdGgoKS5pc0F1dG8oKSkKICAgICAgICAgICAgIHN0eWxlLT5zZXRXaWR0aChMZW5n dGgoSW50cmluc2ljKSk7CisgICAgfQogCi0gICAgICAgIC8vIFRleHRhcmVhIGNvbnNpZGVycyBv dmVyZmxvdyB2aXNpYmxlIGFzIGF1dG8uCi0gICAgICAgIGlmIChlICYmIGUtPmhhc1RhZ05hbWUo dGV4dGFyZWFUYWcpKSB7Ci0gICAgICAgICAgICBzdHlsZS0+c2V0T3ZlcmZsb3dYKHN0eWxlLT5v dmVyZmxvd1goKSA9PSBPVklTSUJMRSA/IE9BVVRPIDogc3R5bGUtPm92ZXJmbG93WCgpKTsKLSAg ICAgICAgICAgIHN0eWxlLT5zZXRPdmVyZmxvd1koc3R5bGUtPm92ZXJmbG93WSgpID09IE9WSVNJ QkxFID8gT0FVVE8gOiBzdHlsZS0+b3ZlcmZsb3dZKCkpOwotICAgICAgICB9CisgICAgLy8gVGV4 dGFyZWEgY29uc2lkZXJzIG92ZXJmbG93IHZpc2libGUgYXMgYXV0by4KKyAgICBpZiAoZSAmJiBl LT5oYXNUYWdOYW1lKHRleHRhcmVhVGFnKSkgeworICAgICAgICBzdHlsZS0+c2V0T3ZlcmZsb3dY KHN0eWxlLT5vdmVyZmxvd1goKSA9PSBPVklTSUJMRSA/IE9BVVRPIDogc3R5bGUtPm92ZXJmbG93 WCgpKTsKKyAgICAgICAgc3R5bGUtPnNldE92ZXJmbG93WShzdHlsZS0+b3ZlcmZsb3dZKCkgPT0g T1ZJU0lCTEUgPyBPQVVUTyA6IHN0eWxlLT5vdmVyZmxvd1koKSk7CiAgICAgfQogCiAgICAgLy8g RmluYWxseSB1cGRhdGUgb3VyIHRleHQgZGVjb3JhdGlvbnMgaW4gZWZmZWN0LCBidXQgZG9uJ3Qg YWxsb3cgdGV4dC1kZWNvcmF0aW9uIHRvIHBlcmNvbGF0ZSB0aHJvdWdoCmRpZmYgLS1naXQgYS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy Qm94LmNwcAppbmRleCBkM2RhZjFjNDMxODBjMWYzMTBiNzlmMGYzMmE0YTBkZGU4OTQwMWE0Li44 ZTZkYzQ3NzgyNGYyZWRjMzJmOTU2Mzc2NzIwZDg5NDcxZGM2YjU0IDEwMDY0NAotLS0gYS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveC5jcHAKQEAgLTE0MDgsNiArMTQwOCwxMSBAQCBib29sIFJlbmRlckJveDo6c2l6ZXNUb0lu dHJpbnNpY1dpZHRoKFdpZHRoVHlwZSB3aWR0aFR5cGUpIGNvbnN0CiAgICAgICAgICAgICAmJiAo cGFyZW50KCktPnN0eWxlKCktPmJveE9yaWVudCgpID09IEhPUklaT05UQUwgfHwgcGFyZW50KCkt PnN0eWxlKCktPmJveEFsaWduKCkgIT0gQlNUUkVUQ0gpKQogICAgICAgICByZXR1cm4gdHJ1ZTsK IAorICAgIC8vIEJ1dHRvbiwgaW5wdXQsIHNlbGVjdCBhbmQgdGV4dGFyZWEgdHJlYXQgd2lkdGgg dmFsdWUgb2YgJ2F1dG8nCisgICAgLy8gYXMgJ2ludHJpbnNpYycgdW5sZXNzIGl0J3MgaW4gYSBz dHJldGNoaW5nIHZlcnRpY2FsIGZsZXhib3guCisgICAgaWYgKHdpZHRoLnR5cGUoKSA9PSBBdXRv ICYmICEocGFyZW50KCktPmlzRmxleGlibGVCb3goKSAmJiBwYXJlbnQoKS0+c3R5bGUoKS0+Ym94 T3JpZW50KCkgPT0gVkVSVElDQUwgJiYgcGFyZW50KCktPnN0eWxlKCktPmJveEFsaWduKCkgPT0g QlNUUkVUQ0gpICYmIG5vZGUoKSAmJiAobm9kZSgpLT5oYXNUYWdOYW1lKGlucHV0VGFnKSB8fCBu b2RlKCktPmhhc1RhZ05hbWUoYnV0dG9uVGFnKSB8fCBub2RlKCktPmhhc1RhZ05hbWUodGV4dGFy ZWFUYWcpKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKICAgICByZXR1cm4gZmFsc2U7CiB9CiAK 55953 2010-05-13 00:54:19 -0700 2010-05-13 02:43:52 -0700 Proposed Patch 3 bug-17918-20100513165418.patch text/plain 4726 yhayashi ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA5ZTcwNDZkNzAwODM1YzBkY2RhZmNkNDEwZDg1NWFhNDE4ZDQ0NDQ0Li45ZmIzOGMy ZWMzNjg1ZTJjMTIzOGVjOWI4Y2JmMGY0NWMzYmIzZTQxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTAtMDUtMTIgIFlvc2hpa2kgSGF5YXNoaSAgPHloYXlhc2hpQGdvb2dsZS5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBmb3JtIGNv bnRyb2xzLCB0ZXh0YXJlYSwgbGVnZW5kIGFuZCBkYXRhZ3JpZCB0cmVhdCB3aWR0aDoKKyAgICAg ICAgYXV0byBhcyBzcGVjaWZpZWQgaW4gc3RyZXRjaGluZyB2ZXJ0aWNhbCBmbGV4Ym94LiAgT3Ro ZXJ3aXNlIGl0J3MKKyAgICAgICAgdHJlYXRlZCBhcyBpbnRyaW5zaWMgYXMgYmVmb3JlLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc5MTgKKworICAg ICAgICAqIGZhc3QvZmxleGJveC92ZXJ0aWNhbC1ib3gtZm9ybS1jb250cm9scy1leHBlY3RlZC50 eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZmxleGJveC92ZXJ0aWNhbC1ib3gtZm9ybS1jb250 cm9scy5odG1sOiBBZGRlZC4KKwogMjAxMC0wNS0xMiAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCBidWlsZCBmaXguCmRpZmYgLS1naXQg YS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGRjMGExMjViMDBh MzJhZDI5ZjBiOGQ0MWJhYzhjOTZjYWVjNzA1NDQuLjAyYjcyOTkyN2IxZTMxNzI1Y2Q4Yjg0N2Rh YzRhNmI4NDEwNWJkODYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNv cmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMDUtMTIgIFlvc2hpa2kgSGF5YXNo aSAgPHloYXlhc2hpQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTWFrZSBmb3JtIGNvbnRyb2xzLCB0ZXh0YXJlYSwgbGVnZW5kIGFu ZCBkYXRhZ3JpZCB0cmVhdCB3aWR0aDoKKyAgICAgICAgYXV0byBhcyBzcGVjaWZpZWQgaW4gc3Ry ZXRjaGluZyB2ZXJ0aWNhbCBmbGV4Ym94LiAgT3RoZXJ3aXNlIGl0J3MKKyAgICAgICAgdHJlYXRl ZCBhcyBpbnRyaW5zaWMgYXMgYmVmb3JlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTc5MTgKKworICAgICAgICBUZXN0OiBmYXN0L2ZsZXhib3gvdmVy dGljYWwtYm94LWZvcm0tY29udHJvbHMuaHRtbAorCisgICAgICAgICogY3NzL0NTU1N0eWxlU2Vs ZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6YWRqdXN0UmVu ZGVyU3R5bGUpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyQm94OjpzaXplc1RvSW50cmluc2ljV2lkdGgpOgorCiAyMDEwLTA1LTEy ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgU2ltb24gRnJhc2VyLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxl Y3Rvci5jcHAgYi9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAppbmRleCA5YTRjY2Zj MTFlMmJjODRiMWU3N2I0YTY5YTA3OGYxNjYyNjI5YmZmLi5lZTRmYWNhMWExZDY5YmY0ZTI0Y2Uz NTkxOTZkNGEzZGE0MTQyMTNkIDEwMDY0NAotLS0gYS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVj dG9yLmNwcAorKysgYi9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcApAQCAtMTY2Miwy MyArMTY2MiwxNyBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6OmFkanVzdFJlbmRlclN0eWxlKFJl bmRlclN0eWxlKiBzdHlsZSwgRWxlbWVudCAqZSkKICAgICAgICAgc3R5bGUtPmhhc1RyYW5zZm9y bVJlbGF0ZWRQcm9wZXJ0eSgpIHx8IHN0eWxlLT5oYXNNYXNrKCkgfHwgc3R5bGUtPmJveFJlZmxl Y3QoKSkpCiAgICAgICAgIHN0eWxlLT5zZXRaSW5kZXgoMCk7CiAgICAgCi0gICAgLy8gQnV0dG9u LCBsZWdlbmQsIGlucHV0LCBzZWxlY3QgYW5kIHRleHRhcmVhIGFsbCBjb25zaWRlciB3aWR0aCB2 YWx1ZXMgb2YgJ2F1dG8nIHRvIGJlICdpbnRyaW5zaWMnLgotICAgIC8vIFRoaXMgd2lsbCBiZSBp bXBvcnRhbnQgd2hlbiB3ZSB1c2UgYmxvY2sgZmxvd3MgZm9yIGFsbCBmb3JtIGNvbnRyb2xzLgot ICAgIGlmIChlICYmIChlLT5oYXNUYWdOYW1lKGxlZ2VuZFRhZykgfHwgZS0+aGFzVGFnTmFtZShi dXR0b25UYWcpIHx8IGUtPmhhc1RhZ05hbWUoaW5wdXRUYWcpIHx8Ci0gICAgICAgICAgICAgIGUt Pmhhc1RhZ05hbWUoc2VsZWN0VGFnKSB8fCBlLT5oYXNUYWdOYW1lKHRleHRhcmVhVGFnKSB8fCBl LT5oYXNUYWdOYW1lKGRhdGFncmlkVGFnKQogI2lmIEVOQUJMRShXTUwpCi0gICAgICAgICAgICAg IHx8IGUtPmhhc1RhZ05hbWUoV01MTmFtZXM6Omluc2VydGVkTGVnZW5kVGFnKQotICAgICAgICAg ICAgICB8fCBlLT5oYXNUYWdOYW1lKFdNTE5hbWVzOjppbnB1dFRhZykKKyAgICBpZiAoZSAmJiAo ZS0+aGFzVGFnTmFtZShXTUxOYW1lczo6aW5zZXJ0ZWRMZWdlbmRUYWcpCisgICAgICAgICAgICAg IHx8IGUtPmhhc1RhZ05hbWUoV01MTmFtZXM6OmlucHV0VGFnKSkKKyAgICAgICAgICAgICYmIHN0 eWxlLT53aWR0aCgpLmlzQXV0bygpKQorICAgICAgICBzdHlsZS0+c2V0V2lkdGgoTGVuZ3RoKElu dHJpbnNpYykpOwogI2VuZGlmCi0gICAgICAgKSkgewotICAgICAgICBpZiAoc3R5bGUtPndpZHRo KCkuaXNBdXRvKCkpCi0gICAgICAgICAgICBzdHlsZS0+c2V0V2lkdGgoTGVuZ3RoKEludHJpbnNp YykpOwogCi0gICAgICAgIC8vIFRleHRhcmVhIGNvbnNpZGVycyBvdmVyZmxvdyB2aXNpYmxlIGFz IGF1dG8uCi0gICAgICAgIGlmIChlICYmIGUtPmhhc1RhZ05hbWUodGV4dGFyZWFUYWcpKSB7Ci0g ICAgICAgICAgICBzdHlsZS0+c2V0T3ZlcmZsb3dYKHN0eWxlLT5vdmVyZmxvd1goKSA9PSBPVklT SUJMRSA/IE9BVVRPIDogc3R5bGUtPm92ZXJmbG93WCgpKTsKLSAgICAgICAgICAgIHN0eWxlLT5z ZXRPdmVyZmxvd1koc3R5bGUtPm92ZXJmbG93WSgpID09IE9WSVNJQkxFID8gT0FVVE8gOiBzdHls ZS0+b3ZlcmZsb3dZKCkpOwotICAgICAgICB9CisgICAgLy8gVGV4dGFyZWEgY29uc2lkZXJzIG92 ZXJmbG93IHZpc2libGUgYXMgYXV0by4KKyAgICBpZiAoZSAmJiBlLT5oYXNUYWdOYW1lKHRleHRh cmVhVGFnKSkgeworICAgICAgICBzdHlsZS0+c2V0T3ZlcmZsb3dYKHN0eWxlLT5vdmVyZmxvd1go KSA9PSBPVklTSUJMRSA/IE9BVVRPIDogc3R5bGUtPm92ZXJmbG93WCgpKTsKKyAgICAgICAgc3R5 bGUtPnNldE92ZXJmbG93WShzdHlsZS0+b3ZlcmZsb3dZKCkgPT0gT1ZJU0lCTEUgPyBPQVVUTyA6 IHN0eWxlLT5vdmVyZmxvd1koKSk7CiAgICAgfQogCiAgICAgLy8gRmluYWxseSB1cGRhdGUgb3Vy IHRleHQgZGVjb3JhdGlvbnMgaW4gZWZmZWN0LCBidXQgZG9uJ3QgYWxsb3cgdGV4dC1kZWNvcmF0 aW9uIHRvIHBlcmNvbGF0ZSB0aHJvdWdoCmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCb3guY3BwIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCBkM2Rh ZjFjNDMxODBjMWYzMTBiNzlmMGYzMmE0YTBkZGU4OTQwMWE0Li5iNWVlNDgwYWY0NmE0MjVhMDlj YmM5OWM1MjJkZmY3MGU4ZjUzYzBhIDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCb3guY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTE0MDgs NiArMTQwOCwxMiBAQCBib29sIFJlbmRlckJveDo6c2l6ZXNUb0ludHJpbnNpY1dpZHRoKFdpZHRo VHlwZSB3aWR0aFR5cGUpIGNvbnN0CiAgICAgICAgICAgICAmJiAocGFyZW50KCktPnN0eWxlKCkt PmJveE9yaWVudCgpID09IEhPUklaT05UQUwgfHwgcGFyZW50KCktPnN0eWxlKCktPmJveEFsaWdu KCkgIT0gQlNUUkVUQ0gpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAorICAgIC8vIEJ1dHRvbiwg aW5wdXQsIHNlbGVjdCwgdGV4dGFyZWEsIGxlZ2VuZCBhbmQgZGF0YWdyaWQgdHJlYXQKKyAgICAv LyB3aWR0aCB2YWx1ZSBvZiAnYXV0bycgYXMgJ2ludHJpbnNpYycgdW5sZXNzIGl0J3MgaW4gYQor ICAgIC8vIHN0cmV0Y2hpbmcgdmVydGljYWwgZmxleGJveC4KKyAgICBpZiAod2lkdGgudHlwZSgp ID09IEF1dG8gJiYgIShwYXJlbnQoKS0+aXNGbGV4aWJsZUJveCgpICYmIHBhcmVudCgpLT5zdHls ZSgpLT5ib3hPcmllbnQoKSA9PSBWRVJUSUNBTCAmJiBwYXJlbnQoKS0+c3R5bGUoKS0+Ym94QWxp Z24oKSA9PSBCU1RSRVRDSCkgJiYgbm9kZSgpICYmIChub2RlKCktPmhhc1RhZ05hbWUoaW5wdXRU YWcpIHx8IG5vZGUoKS0+aGFzVGFnTmFtZShzZWxlY3RUYWcpIHx8IG5vZGUoKS0+aGFzVGFnTmFt ZShidXR0b25UYWcpIHx8IG5vZGUoKS0+aGFzVGFnTmFtZSh0ZXh0YXJlYVRhZykgfHwgbm9kZSgp LT5oYXNUYWdOYW1lKGxlZ2VuZFRhZykgfHwgbm9kZSgpLT5oYXNUYWdOYW1lKGRhdGFncmlkVGFn KSkpCisgICAgICAgIHJldHVybiB0cnVlOworCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCg== 55957 2010-05-13 02:43:59 -0700 2010-08-11 00:14:16 -0700 Proposed Patch 4 bug-17918-20100513184357.patch text/plain 8053 yhayashi ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA5ZTcwNDZkNzAwODM1YzBkY2RhZmNkNDEwZDg1NWFhNDE4ZDQ0NDQ0Li45ZmIzOGMy ZWMzNjg1ZTJjMTIzOGVjOWI4Y2JmMGY0NWMzYmIzZTQxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTAtMDUtMTIgIFlvc2hpa2kgSGF5YXNoaSAgPHloYXlhc2hpQGdvb2dsZS5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBmb3JtIGNv bnRyb2xzLCB0ZXh0YXJlYSwgbGVnZW5kIGFuZCBkYXRhZ3JpZCB0cmVhdCB3aWR0aDoKKyAgICAg ICAgYXV0byBhcyBzcGVjaWZpZWQgaW4gc3RyZXRjaGluZyB2ZXJ0aWNhbCBmbGV4Ym94LiAgT3Ro ZXJ3aXNlIGl0J3MKKyAgICAgICAgdHJlYXRlZCBhcyBpbnRyaW5zaWMgYXMgYmVmb3JlLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc5MTgKKworICAg ICAgICAqIGZhc3QvZmxleGJveC92ZXJ0aWNhbC1ib3gtZm9ybS1jb250cm9scy1leHBlY3RlZC50 eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZmxleGJveC92ZXJ0aWNhbC1ib3gtZm9ybS1jb250 cm9scy5odG1sOiBBZGRlZC4KKwogMjAxMC0wNS0xMiAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCBidWlsZCBmaXguCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvdmVydGljYWwtYm94LWZvcm0tY29udHJvbHMtZXhw ZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L3ZlcnRpY2FsLWJveC1mb3JtLWNv bnRyb2xzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi42ZTAzODRlMWI2ZjNiMmRkMWRlZmM5ZDY1 OTEyNjRmMDZlODhiNTM2Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9mbGV4 Ym94L3ZlcnRpY2FsLWJveC1mb3JtLWNvbnRyb2xzLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDI1 IEBACisKKworCisKK0NoZWNrIGlmIGZvcm0gY29udHJvbHMgaW4gdmVydGljYWwgZmxleCBib3gg d2lsbCBzdHJldGNoIGhvcml6b250YWxseSB3aGVuIHJlbmRlcmVkIGFzIGJveCBhcyBvcHBvc2Vk IHRvIGlubGluZS1ib3guIElmIHlvdSBzZWUgYW55IHJlZCwgdGhlbiB0aGUgdGVzdCBoYXMgZmFp bGVkLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3Nh Z2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworQnV0dG9uCitQQVNTIGVsZW1l bnQub2Zmc2V0SGVpZ2h0IGlzIDEwMAorUEFTUyBlbGVtZW50Lm9mZnNldFdpZHRoIGlzIDEwMAor VGV4dCBpbnB1dAorUEFTUyBlbGVtZW50Lm9mZnNldEhlaWdodCBpcyAxMDAKK1BBU1MgZWxlbWVu dC5vZmZzZXRXaWR0aCBpcyAxMDAKK1RleHRhcmVhCitQQVNTIGVsZW1lbnQub2Zmc2V0SGVpZ2h0 IGlzIDEwMAorUEFTUyBlbGVtZW50Lm9mZnNldFdpZHRoIGlzIDEwMAorU3VibWl0CitQQVNTIGVs ZW1lbnQub2Zmc2V0SGVpZ2h0IGlzIDEwMAorUEFTUyBlbGVtZW50Lm9mZnNldFdpZHRoIGlzIDEw MAorUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC92ZXJ0aWNhbC1ib3gtZm9ybS1jb250 cm9scy5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L3ZlcnRpY2FsLWJveC1mb3JtLWNv bnRyb2xzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uM2YzODIyYjZjNzkwMjhhMTE3ZGZjNTI2YmIzZDYxZWI2 NTIzZGNhZAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC92ZXJ0 aWNhbC1ib3gtZm9ybS1jb250cm9scy5odG1sCkBAIC0wLDAgKzEsODAgQEAKKzxodG1sPgorPGhl YWQ+Cis8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9Ii4uL2pzL3Jlc291cmNlcy9qcy10ZXN0 LXN0eWxlLmNzcyI+Cis8c2NyaXB0IHNyYz0iLi4vanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpz Ij48L3NjcmlwdD4KKzxzdHlsZT4KK2Rpdi5ib3ggeworICBkaXNwbGF5OiAtbW96LWJveDsKKyAg ZGlzcGxheTogLXdlYmtpdC1ib3g7CisgIGRpc3BsYXk6IGJveDsKK30KKworZGl2Lm91dGVyIHsK KyAgd2lkdGg6IDEwMHB4OworICBoZWlnaHQ6IDEwMHB4OworICBiYWNrZ3JvdW5kLWNvbG9yOiBy ZWQ7CisgIGJveC1vcmllbnQ6IHZlcnRpY2FsOworICAtbW96LWJveC1vcmllbnQ6IHZlcnRpY2Fs OworICAtd2Via2l0LWJveC1vcmllbnQ6IHZlcnRpY2FsOworfQorCisuaW5uZXIgeworICBkaXNw bGF5OiAtd2Via2l0LWJveDsKKyAgZGlzcGxheTogLW1vei1ib3g7CisgIGRpc3BsYXk6IGJveDsK KyAgYm94LWFsaWduOiBzdHJldGNoOworICAtbW96LWJveC1hbGlnbjogc3RyZXRjaDsKKyAgLXdl YmtpdC1ib3gtYWxpZ246IHN0cmV0Y2g7CisgIG1hcmdpbjogMDsKKyAgYm9yZGVyOiAwOworICBw YWRkaW5nOiAwOworICBoZWlnaHQ6IDEwMHB4OworICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsK K30KKzwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKzxkaXYgY2xhc3M9ImJveCBvdXRlciI+Cis8 YnV0dG9uIGNsYXNzPSJpbm5lciIgdHlwZT0ic3VibWl0IiBpZD0iYnV0dG9uIj48L2J1dHRvbj4K KzwvZGl2PgorPGRpdiBjbGFzcz0iYm94IG91dGVyIj4KKzxpbnB1dCBjbGFzcz0iaW5uZXIiIHR5 cGU9InRleHQiIHZhbHVlPSIiIGlkPSJpbnB1dFRleHQiPgorPC9kaXY+Cis8ZGl2IGNsYXNzPSJi b3ggb3V0ZXIiPgorPHRleHRhcmVhIGNsYXNzPSJpbm5lciIgaWQ9InRleHRhcmVhIj48L3RleHRh cmVhPgorPC9kaXY+Cis8ZGl2IGNsYXNzPSJib3ggb3V0ZXIiPgorPGlucHV0IGNsYXNzPSJpbm5l ciIgdHlwZT0ic3VibWl0IiB2YWx1ZT0iIiBpZD0ic3VibWl0Ij4KKzwvZGl2PgorPHAgaWQ9ImRl c2NyaXB0aW9uIj48L3A+Cis8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKzxzY3JpcHQ+CitkZXNj cmlwdGlvbigiQ2hlY2sgaWYgZm9ybSBjb250cm9scyBpbiB2ZXJ0aWNhbCBmbGV4IGJveCB3aWxs IHN0cmV0Y2ggaG9yaXpvbnRhbGx5IHdoZW4gcmVuZGVyZWQgYXMgYm94IGFzIG9wcG9zZWQgdG8g aW5saW5lLWJveC4gIElmIHlvdSBzZWUgYW55IHJlZCwgdGhlbiB0aGUgdGVzdCBoYXMgZmFpbGVk LiIpOworCit2YXIgZWxlbWVudCA9IG51bGw7CisKK2RlYnVnKCJCdXR0b24iKTsKK2VsZW1lbnQg PSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiYnV0dG9uIik7CitzaG91bGRCZSgiZWxlbWVudC5v ZmZzZXRIZWlnaHQiLCAiMTAwIik7CitzaG91bGRCZSgiZWxlbWVudC5vZmZzZXRXaWR0aCIsICIx MDAiKTsKKworZGVidWcoIlRleHQgaW5wdXQiKTsKK2VsZW1lbnQgPSBkb2N1bWVudC5nZXRFbGVt ZW50QnlJZCgiaW5wdXRUZXh0Iik7CitzaG91bGRCZSgiZWxlbWVudC5vZmZzZXRIZWlnaHQiLCAi MTAwIik7CitzaG91bGRCZSgiZWxlbWVudC5vZmZzZXRXaWR0aCIsICIxMDAiKTsKKworZGVidWco IlRleHRhcmVhIik7CitlbGVtZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInRleHRhcmVh Iik7CitzaG91bGRCZSgiZWxlbWVudC5vZmZzZXRIZWlnaHQiLCAiMTAwIik7CitzaG91bGRCZSgi ZWxlbWVudC5vZmZzZXRXaWR0aCIsICIxMDAiKTsKKworZGVidWcoIlN1Ym1pdCIpOworZWxlbWVu dCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzdWJtaXQiKTsKK3Nob3VsZEJlKCJlbGVtZW50 Lm9mZnNldEhlaWdodCIsICIxMDAiKTsKK3Nob3VsZEJlKCJlbGVtZW50Lm9mZnNldFdpZHRoIiwg IjEwMCIpOworCitzdWNjZXNzZnVsbHlQYXJzZWQgPSB0cnVlOworPC9zY3JpcHQ+Cis8c2NyaXB0 IHNyYz0iLi4vanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+ Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdl TG9nCmluZGV4IGRjMGExMjViMDBhMzJhZDI5ZjBiOGQ0MWJhYzhjOTZjYWVjNzA1NDQuLjAyYjcy OTkyN2IxZTMxNzI1Y2Q4Yjg0N2RhYzRhNmI4NDEwNWJkODYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv Q2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAt MDUtMTIgIFlvc2hpa2kgSGF5YXNoaSAgPHloYXlhc2hpQGdvb2dsZS5jb20+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBmb3JtIGNvbnRyb2xz LCB0ZXh0YXJlYSwgbGVnZW5kIGFuZCBkYXRhZ3JpZCB0cmVhdCB3aWR0aDoKKyAgICAgICAgYXV0 byBhcyBzcGVjaWZpZWQgaW4gc3RyZXRjaGluZyB2ZXJ0aWNhbCBmbGV4Ym94LiAgT3RoZXJ3aXNl IGl0J3MKKyAgICAgICAgdHJlYXRlZCBhcyBpbnRyaW5zaWMgYXMgYmVmb3JlLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc5MTgKKworICAgICAgICBU ZXN0OiBmYXN0L2ZsZXhib3gvdmVydGljYWwtYm94LWZvcm0tY29udHJvbHMuaHRtbAorCisgICAg ICAgICogY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5 bGVTZWxlY3Rvcjo6YWRqdXN0UmVuZGVyU3R5bGUpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpzaXplc1RvSW50cmluc2lj V2lkdGgpOgorCiAyMDEwLTA1LTEyICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAgYi9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVj dG9yLmNwcAppbmRleCA5YTRjY2ZjMTFlMmJjODRiMWU3N2I0YTY5YTA3OGYxNjYyNjI5YmZmLi5l ZTRmYWNhMWExZDY5YmY0ZTI0Y2UzNTkxOTZkNGEzZGE0MTQyMTNkIDEwMDY0NAotLS0gYS9XZWJD b3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAorKysgYi9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNl bGVjdG9yLmNwcApAQCAtMTY2MiwyMyArMTY2MiwxNyBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6 OmFkanVzdFJlbmRlclN0eWxlKFJlbmRlclN0eWxlKiBzdHlsZSwgRWxlbWVudCAqZSkKICAgICAg ICAgc3R5bGUtPmhhc1RyYW5zZm9ybVJlbGF0ZWRQcm9wZXJ0eSgpIHx8IHN0eWxlLT5oYXNNYXNr KCkgfHwgc3R5bGUtPmJveFJlZmxlY3QoKSkpCiAgICAgICAgIHN0eWxlLT5zZXRaSW5kZXgoMCk7 CiAgICAgCi0gICAgLy8gQnV0dG9uLCBsZWdlbmQsIGlucHV0LCBzZWxlY3QgYW5kIHRleHRhcmVh IGFsbCBjb25zaWRlciB3aWR0aCB2YWx1ZXMgb2YgJ2F1dG8nIHRvIGJlICdpbnRyaW5zaWMnLgot ICAgIC8vIFRoaXMgd2lsbCBiZSBpbXBvcnRhbnQgd2hlbiB3ZSB1c2UgYmxvY2sgZmxvd3MgZm9y IGFsbCBmb3JtIGNvbnRyb2xzLgotICAgIGlmIChlICYmIChlLT5oYXNUYWdOYW1lKGxlZ2VuZFRh ZykgfHwgZS0+aGFzVGFnTmFtZShidXR0b25UYWcpIHx8IGUtPmhhc1RhZ05hbWUoaW5wdXRUYWcp IHx8Ci0gICAgICAgICAgICAgIGUtPmhhc1RhZ05hbWUoc2VsZWN0VGFnKSB8fCBlLT5oYXNUYWdO YW1lKHRleHRhcmVhVGFnKSB8fCBlLT5oYXNUYWdOYW1lKGRhdGFncmlkVGFnKQogI2lmIEVOQUJM RShXTUwpCi0gICAgICAgICAgICAgIHx8IGUtPmhhc1RhZ05hbWUoV01MTmFtZXM6Omluc2VydGVk TGVnZW5kVGFnKQotICAgICAgICAgICAgICB8fCBlLT5oYXNUYWdOYW1lKFdNTE5hbWVzOjppbnB1 dFRhZykKKyAgICBpZiAoZSAmJiAoZS0+aGFzVGFnTmFtZShXTUxOYW1lczo6aW5zZXJ0ZWRMZWdl bmRUYWcpCisgICAgICAgICAgICAgIHx8IGUtPmhhc1RhZ05hbWUoV01MTmFtZXM6OmlucHV0VGFn KSkKKyAgICAgICAgICAgICYmIHN0eWxlLT53aWR0aCgpLmlzQXV0bygpKQorICAgICAgICBzdHls ZS0+c2V0V2lkdGgoTGVuZ3RoKEludHJpbnNpYykpOwogI2VuZGlmCi0gICAgICAgKSkgewotICAg ICAgICBpZiAoc3R5bGUtPndpZHRoKCkuaXNBdXRvKCkpCi0gICAgICAgICAgICBzdHlsZS0+c2V0 V2lkdGgoTGVuZ3RoKEludHJpbnNpYykpOwogCi0gICAgICAgIC8vIFRleHRhcmVhIGNvbnNpZGVy cyBvdmVyZmxvdyB2aXNpYmxlIGFzIGF1dG8uCi0gICAgICAgIGlmIChlICYmIGUtPmhhc1RhZ05h bWUodGV4dGFyZWFUYWcpKSB7Ci0gICAgICAgICAgICBzdHlsZS0+c2V0T3ZlcmZsb3dYKHN0eWxl LT5vdmVyZmxvd1goKSA9PSBPVklTSUJMRSA/IE9BVVRPIDogc3R5bGUtPm92ZXJmbG93WCgpKTsK LSAgICAgICAgICAgIHN0eWxlLT5zZXRPdmVyZmxvd1koc3R5bGUtPm92ZXJmbG93WSgpID09IE9W SVNJQkxFID8gT0FVVE8gOiBzdHlsZS0+b3ZlcmZsb3dZKCkpOwotICAgICAgICB9CisgICAgLy8g VGV4dGFyZWEgY29uc2lkZXJzIG92ZXJmbG93IHZpc2libGUgYXMgYXV0by4KKyAgICBpZiAoZSAm JiBlLT5oYXNUYWdOYW1lKHRleHRhcmVhVGFnKSkgeworICAgICAgICBzdHlsZS0+c2V0T3ZlcmZs b3dYKHN0eWxlLT5vdmVyZmxvd1goKSA9PSBPVklTSUJMRSA/IE9BVVRPIDogc3R5bGUtPm92ZXJm bG93WCgpKTsKKyAgICAgICAgc3R5bGUtPnNldE92ZXJmbG93WShzdHlsZS0+b3ZlcmZsb3dZKCkg PT0gT1ZJU0lCTEUgPyBPQVVUTyA6IHN0eWxlLT5vdmVyZmxvd1koKSk7CiAgICAgfQogCiAgICAg Ly8gRmluYWxseSB1cGRhdGUgb3VyIHRleHQgZGVjb3JhdGlvbnMgaW4gZWZmZWN0LCBidXQgZG9u J3QgYWxsb3cgdGV4dC1kZWNvcmF0aW9uIHRvIHBlcmNvbGF0ZSB0aHJvdWdoCmRpZmYgLS1naXQg YS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQm94LmNwcAppbmRleCBkM2RhZjFjNDMxODBjMWYzMTBiNzlmMGYzMmE0YTBkZGU4OTQwMWE0 Li5iNWVlNDgwYWY0NmE0MjVhMDljYmM5OWM1MjJkZmY3MGU4ZjUzYzBhIDEwMDY0NAotLS0gYS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJveC5jcHAKQEAgLTE0MDgsNiArMTQwOCwxMiBAQCBib29sIFJlbmRlckJveDo6c2l6ZXNU b0ludHJpbnNpY1dpZHRoKFdpZHRoVHlwZSB3aWR0aFR5cGUpIGNvbnN0CiAgICAgICAgICAgICAm JiAocGFyZW50KCktPnN0eWxlKCktPmJveE9yaWVudCgpID09IEhPUklaT05UQUwgfHwgcGFyZW50 KCktPnN0eWxlKCktPmJveEFsaWduKCkgIT0gQlNUUkVUQ0gpKQogICAgICAgICByZXR1cm4gdHJ1 ZTsKIAorICAgIC8vIEJ1dHRvbiwgaW5wdXQsIHNlbGVjdCwgdGV4dGFyZWEsIGxlZ2VuZCBhbmQg ZGF0YWdyaWQgdHJlYXQKKyAgICAvLyB3aWR0aCB2YWx1ZSBvZiAnYXV0bycgYXMgJ2ludHJpbnNp YycgdW5sZXNzIGl0J3MgaW4gYQorICAgIC8vIHN0cmV0Y2hpbmcgdmVydGljYWwgZmxleGJveC4K KyAgICBpZiAod2lkdGgudHlwZSgpID09IEF1dG8gJiYgIShwYXJlbnQoKS0+aXNGbGV4aWJsZUJv eCgpICYmIHBhcmVudCgpLT5zdHlsZSgpLT5ib3hPcmllbnQoKSA9PSBWRVJUSUNBTCAmJiBwYXJl bnQoKS0+c3R5bGUoKS0+Ym94QWxpZ24oKSA9PSBCU1RSRVRDSCkgJiYgbm9kZSgpICYmIChub2Rl KCktPmhhc1RhZ05hbWUoaW5wdXRUYWcpIHx8IG5vZGUoKS0+aGFzVGFnTmFtZShzZWxlY3RUYWcp IHx8IG5vZGUoKS0+aGFzVGFnTmFtZShidXR0b25UYWcpIHx8IG5vZGUoKS0+aGFzVGFnTmFtZSh0 ZXh0YXJlYVRhZykgfHwgbm9kZSgpLT5oYXNUYWdOYW1lKGxlZ2VuZFRhZykgfHwgbm9kZSgpLT5o YXNUYWdOYW1lKGRhdGFncmlkVGFnKSkpCisgICAgICAgIHJldHVybiB0cnVlOworCiAgICAgcmV0 dXJuIGZhbHNlOwogfQogCg==