65008 2011-07-21 21:18:46 -0700 REGRESSION(r89535): Form reset doesn't redraw a file upload control 2011-09-11 23:05:09 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED data:text/html,<form><input type=file><input type=reset></form> P2 Normal --- 1 tkent webkit-unassigned dglazkov haraken oldest_to_newest 440825 0 tkent 2011-07-21 21:18:46 -0700 1. Open data:text/html,<form><input type=file><input type=reset></form> 2. Select a file for the file upload control 3. Click the reset button Expected: The file upload control is cleared and shows "No file chosen" Actual: The file upload control doesn't change. If the file upload control is repainted (e.g. inspect the file upload control), it shows "No file chosen". 440826 1 tkent 2011-07-21 21:19:31 -0700 Chrome 12 doesn't have this issue. 440844 2 haraken 2011-07-21 22:46:16 -0700 I confirmed on Mac Safari that this is a regression caused by r89535 (https://bugs.webkit.org/show_bug.cgi?id=62069). I am making a patch. 440845 3 tkent 2011-07-21 22:49:00 -0700 Thank you for the investigation. 440900 4 101711 haraken 2011-07-22 04:46:58 -0700 Created attachment 101711 Patch 440904 5 101711 tkent 2011-07-22 04:56:01 -0700 Comment on attachment 101711 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=101711&action=review The code change looks ok. > LayoutTests/fast/forms/file-input-reset-expected.html:16 > +<div id="console"> > +<p> > +This tests whether the label next to the file chooser button becomes "No file chosen" > +when we press the reset button. > +To run this test manually, choose a file and then click the reset button. > +If the label next to the file chooser button changes to "No file chosen",the test passes. > +</p> <div id=console> is not needed. > LayoutTests/fast/forms/file-input-reset.html:10 > +<div id="console"> ditto. > LayoutTests/fast/forms/file-input-reset.html:24 > + var reset = document.getElementById("reset"); > + click(reset.offsetLeft + reset.offsetWidth / 2, reset.offsetTop + reset.offsetHeight / 2); > + click(reset.offsetLeft + reset.offsetWidth + 10, reset.offsetTop + reset.offsetHeight + 10); // Move a cursor out of the reset button. Why don't you use getElementById('form').reset()? > Source/WebCore/ChangeLog:8 > + This is a regression caused by r98535. This patch fixes the code r98535 -> r89535. Anyway, If you change the 1-list summary to "REGRESSION(r89535): Form reset doesn't redraw a file upload control", this sentence is not needed. 440905 6 tkent 2011-07-22 04:57:04 -0700 (In reply to comment #5) > Anyway, If you change the 1-list summary to "REGRESSION(r89535): Form reset doesn't redraw a file upload control", this sentence is not needed. 1-list -> 1-line 440914 7 101719 haraken 2011-07-22 05:36:23 -0700 Created attachment 101719 Patch 440915 8 101711 haraken 2011-07-22 05:36:32 -0700 Comment on attachment 101711 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=101711&action=review >> LayoutTests/fast/forms/file-input-reset-expected.html:16 >> +</p> > > <div id=console> is not needed. I added a selected file name here, in order to confirm that the file is really selected before being reset. >> LayoutTests/fast/forms/file-input-reset.html:10 >> +<div id="console"> > > ditto. Ditto. >> LayoutTests/fast/forms/file-input-reset.html:24 >> + click(reset.offsetLeft + reset.offsetWidth + 10, reset.offsetTop + reset.offsetHeight + 10); // Move a cursor out of the reset button. > > Why don't you use getElementById('form').reset()? I found that getElementById('form').reset() does not work. Even updateFromElement() is not invoked. This seems to be a regression too. Thus, I would like to commit this patch as it is, and then investigate the problem of reset() in the next patch. >> Source/WebCore/ChangeLog:8 >> + This is a regression caused by r98535. This patch fixes the code > > r98535 -> r89535. > Anyway, If you change the 1-list summary to "REGRESSION(r89535): Form reset doesn't redraw a file upload control", this sentence is not needed. Done. 440916 9 101719 tkent 2011-07-22 05:38:33 -0700 Comment on attachment 101719 Patch Looks good. Thank you for fixing this! 440925 10 101711 haraken 2011-07-22 06:29:09 -0700 Comment on attachment 101711 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=101711&action=review >>> LayoutTests/fast/forms/file-input-reset.html:24 >>> + click(reset.offsetLeft + reset.offsetWidth + 10, reset.offsetTop + reset.offsetHeight + 10); // Move a cursor out of the reset button. >> >> Why don't you use getElementById('form').reset()? > > I found that getElementById('form').reset() does not work. Even updateFromElement() is not invoked. This seems to be a regression too. Thus, I would like to commit this patch as it is, and then investigate the problem of reset() in the next patch. Sorry, this is not a bug. When we write like this <form id="form"> <input id="reset" type="reset" /> </form> then getElementById("form").reset is overridden by the reset input element, and thus getElementById("form").reset() does not work as expected. 440929 11 101719 webkit.review.bot 2011-07-22 06:41:12 -0700 Comment on attachment 101719 Patch Clearing flags on attachment: 101719 Committed r91566: <http://trac.webkit.org/changeset/91566> 101711 2011-07-22 04:46:58 -0700 2011-09-11 23:05:00 -0700 Patch bug-65008-20110722204657.patch text/plain 5528 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogOTE0NDMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2NWIyMmM0MzIxYWRhNjFhNjMzYmE0 NTU4MmJjOTRlZjc4ZmIyYjY2Li5hMmM4MThhNWJlMWY1NzQyOTIzNmJjZDg0N2Y2YzljNTU0MDRi OTJlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDctMjIgIEtlbnRhcm8gSGFyYSAgPGhh cmFrZW5AZ29vZ2xlLmNvbT4KKworICAgICAgICBGb3JtIHJlc2V0IGRvZXMgbm90IHJlcGFpbnQg YSBmaWxlIHVwbG9hZCBjb250cm9sLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NjUwMDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGlzIGlzIGEgcmVncmVzc2lvbiBjYXVzZWQgYnkgcjk4NTM1LiBUaGlz IHBhdGNoIGZpeGVzIHRoZSBjb2RlCisgICAgICAgIHNvIHRoYXQgdGhlIGZpbGUgdXBsb2FkIGNv bnRyb2wgaXMgcmVwYWludGVkIGluIHVwZGF0ZUZyb21FbGVtZW50KCkKKyAgICAgICAgaWYgbm8g ZmlsZXMgYXJlIHNlbGVjdGVkLiBUaGUgYWRkZWQgdGVzdCBjaGVja3MgaWYgdGhlIGxhYmVsIG5l eHQgdG8KKyAgICAgICAgdGhlIGZpbGUgY2hvb3NlciBidXR0b24gYmVjb21lcyAiTm8gZmlsZSBj aG9zZW4iIHdoZW4gd2UgcHJlc3MgdGhlCisgICAgICAgIHJlc2V0IGJ1dHRvbi4KKworICAgICAg ICAqIGZhc3QvZm9ybXMvZmlsZS1pbnB1dC1yZXNldC1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAg ICAgICAgKiBmYXN0L2Zvcm1zL2ZpbGUtaW5wdXQtcmVzZXQuaHRtbDogQWRkZWQuCisKIDIwMTEt MDctMjAgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQWRkIGNy YXNoIGV4cGVjdGF0aW9uIHRvIGZhc3QvY2FudmFzL3dlYmdsL3JlbmRlcmJ1ZmZlci1pbml0aWFs aXphdGlvbi5odG1sIG9uIENocm9taXVtIFdpbmRvd3MsCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9mYXN0L2Zvcm1zL2ZpbGUtaW5wdXQtcmVzZXQtZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3Rz L2Zhc3QvZm9ybXMvZmlsZS1pbnB1dC1yZXNldC1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmVi YWI0MzdlYjIxYWE0OTA0YzMwZDRlNjRkZWE2OWFmNWY0Y2I0MWIKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL2ZpbGUtaW5wdXQtcmVzZXQtZXhwZWN0ZWQuaHRtbApA QCAtMCwwICsxLDE5IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8L2hlYWQ+ Cis8Ym9keT4KKzxmb3JtIGlkPSJmb3JtIj4KKzxpbnB1dCBpZD0iZmlsZSIgdHlwZT0iZmlsZSIg Lz4KKzxpbnB1dCBpZD0icmVzZXQiIHR5cGU9InJlc2V0IiAvPgorPC9mb3JtPgorPGRpdiBpZD0i Y29uc29sZSI+Cis8cD4KK1RoaXMgdGVzdHMgd2hldGhlciB0aGUgbGFiZWwgbmV4dCB0byB0aGUg ZmlsZSBjaG9vc2VyIGJ1dHRvbiBiZWNvbWVzICJObyBmaWxlIGNob3NlbiIKK3doZW4gd2UgcHJl c3MgdGhlIHJlc2V0IGJ1dHRvbi4KK1RvIHJ1biB0aGlzIHRlc3QgbWFudWFsbHksIGNob29zZSBh IGZpbGUgYW5kIHRoZW4gY2xpY2sgdGhlIHJlc2V0IGJ1dHRvbi4KK0lmIHRoZSBsYWJlbCBuZXh0 IHRvIHRoZSBmaWxlIGNob29zZXIgYnV0dG9uIGNoYW5nZXMgdG8gIk5vIGZpbGUgY2hvc2VuIix0 aGUgdGVzdCBwYXNzZXMuCis8L3A+Cis8L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvZmlsZS1pbnB1dC1yZXNldC5odG1sIGIvTGF5b3V0 VGVzdHMvZmFzdC9mb3Jtcy9maWxlLWlucHV0LXJlc2V0Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMDg1MmZm Y2E2OTZkNTdkMWM2ZjVmMGJmYmE0ZGFjNmFiZWUzNmQ0YgotLS0gL2Rldi9udWxsCisrKyBiL0xh eW91dFRlc3RzL2Zhc3QvZm9ybXMvZmlsZS1pbnB1dC1yZXNldC5odG1sCkBAIC0wLDAgKzEsNDUg QEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzwvaGVhZD4KKzxib2R5PgorPGZv cm0gaWQ9ImZvcm0iPgorPGlucHV0IGlkPSJmaWxlIiB0eXBlPSJmaWxlIiAvPgorPGlucHV0IGlk PSJyZXNldCIgdHlwZT0icmVzZXQiIC8+Cis8L2Zvcm0+Cis8ZGl2IGlkPSJjb25zb2xlIj4KKzxw PgorVGhpcyB0ZXN0cyB3aGV0aGVyIHRoZSBsYWJlbCBuZXh0IHRvIHRoZSBmaWxlIGNob29zZXIg YnV0dG9uIGJlY29tZXMgIk5vIGZpbGUgY2hvc2VuIgord2hlbiB3ZSBwcmVzcyB0aGUgcmVzZXQg YnV0dG9uLgorVG8gcnVuIHRoaXMgdGVzdCBtYW51YWxseSwgY2hvb3NlIGEgZmlsZSBhbmQgdGhl biBjbGljayB0aGUgcmVzZXQgYnV0dG9uLgorSWYgdGhlIGxhYmVsIG5leHQgdG8gdGhlIGZpbGUg Y2hvb3NlciBidXR0b24gY2hhbmdlcyB0byAiTm8gZmlsZSBjaG9zZW4iLHRoZSB0ZXN0IHBhc3Nl cy4KKzwvcD4KKzwvZGl2PgorPHNjcmlwdD4KK2lmIChsYXlvdXRUZXN0Q29udHJvbGxlciAmJiBl dmVudFNlbmRlcikgeworICAgIHZhciBpbnB1dCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJm aWxlIik7CisgICAgZHJhZ0ZpbGVzT250b0VsZW1lbnQoaW5wdXQsIFsiZm9vLnR4dCJdKTsKKyAg ICB2YXIgcmVzZXQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicmVzZXQiKTsKKyAgICBjbGlj ayhyZXNldC5vZmZzZXRMZWZ0ICsgcmVzZXQub2Zmc2V0V2lkdGggLyAyLCByZXNldC5vZmZzZXRU b3AgKyByZXNldC5vZmZzZXRIZWlnaHQgLyAyKTsKKyAgICBjbGljayhyZXNldC5vZmZzZXRMZWZ0 ICsgcmVzZXQub2Zmc2V0V2lkdGggKyAxMCwgcmVzZXQub2Zmc2V0VG9wICsgcmVzZXQub2Zmc2V0 SGVpZ2h0ICsgMTApOyAvLyBNb3ZlIGEgY3Vyc29yIG91dCBvZiB0aGUgcmVzZXQgYnV0dG9uLgor fQorCitmdW5jdGlvbiBjbGljayh4LCB5KSB7CisgICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8o eCwgeSk7CisgICAgZXZlbnRTZW5kZXIubW91c2VEb3duKCk7CisgICAgZXZlbnRTZW5kZXIubW91 c2VNb3ZlVG8oeCwgeSk7CisgICAgZXZlbnRTZW5kZXIubW91c2VVcCgpOworfQorCitmdW5jdGlv biBkcmFnRmlsZXNPbnRvRWxlbWVudChlbGVtZW50LCBmaWxlcykgeworICAgIGV2ZW50U2VuZGVy LmJlZ2luRHJhZ1dpdGhGaWxlcyhmaWxlcyk7CisgICAgdmFyIGNlbnRlclggPSBlbGVtZW50Lm9m ZnNldExlZnQgKyBlbGVtZW50Lm9mZnNldFdpZHRoIC8gMjsKKyAgICB2YXIgY2VudGVyWSA9IGVs ZW1lbnQub2Zmc2V0VG9wICsgZWxlbWVudC5vZmZzZXRIZWlnaHQgLyAyOworICAgIGV2ZW50U2Vu ZGVyLm1vdXNlTW92ZVRvKGNlbnRlclgsIGNlbnRlclkpOworICAgIGV2ZW50U2VuZGVyLm1vdXNl VXAoKTsKK30KKwordmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7Cis8L3NjcmlwdD4KKzwv Ym9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlODMwMWU2ZTZiYWYwMDE5NTI2Y2YxODc5OGIw OTY2YmU2NmFlMzQ3Li5hMDRiYzcxZGJkZWQ4ZmRjNTljNjc2NjBlZDg1MDk2NzExMjUxY2IwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDctMjIgIEtlbnRhcm8gSGFyYSAgPGhh cmFrZW5AZ29vZ2xlLmNvbT4KKworICAgICAgICBGb3JtIHJlc2V0IGRvZXMgbm90IHJlcGFpbnQg YSBmaWxlIHVwbG9hZCBjb250cm9sLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NjUwMDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGlzIGlzIGEgcmVncmVzc2lvbiBjYXVzZWQgYnkgcjk4NTM1LiBUaGlz IHBhdGNoIGZpeGVzIHRoZSBjb2RlCisgICAgICAgIHNvIHRoYXQgdGhlIGZpbGUgdXBsb2FkIGNv bnRyb2wgaXMgcmVwYWludGVkIGluIHVwZGF0ZUZyb21FbGVtZW50KCkKKyAgICAgICAgaWYgbm8g ZmlsZXMgYXJlIHNlbGVjdGVkLgorCisgICAgICAgIFRlc3RzOiBmYXN0L2Zvcm1zL2ZpbGUtaW5w dXQtcmVzZXQuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZpbGVVcGxvYWRDb250 cm9sLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZpbGVVcGxvYWRDb250cm9sOjp1cGRh dGVGcm9tRWxlbWVudCk6IENhbGxzIHJlcGFpbnQoKSBpZiBubyBmaWxlcyBhcmUgc2VsZWN0ZWQu CisKIDIwMTEtMDctMjAgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgQ2hyb21pdW0gYnVpbGQgZml4IGFmdGVyIHI5MTQ0MC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGaWxlVXBsb2FkQ29udHJvbC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyRmlsZVVwbG9hZENvbnRyb2wuY3BwCmluZGV4IGM1ZTUzZTM1 ZTk4NzlkYTE1NWJjNmQ2YzA1YzRmNWRlMGI2NWExMDYuLjUzMjA2N2EyMzcxMGMyYmM0ZWFkYTE4 NjlkYWQzZmNmNzJhYTM1NDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJGaWxlVXBsb2FkQ29udHJvbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckZpbGVVcGxvYWRDb250cm9sLmNwcApAQCAtNjAsOCArNjAsMTggQEAgUmVuZGVyRmls ZVVwbG9hZENvbnRyb2w6On5SZW5kZXJGaWxlVXBsb2FkQ29udHJvbCgpCiAKIHZvaWQgUmVuZGVy RmlsZVVwbG9hZENvbnRyb2w6OnVwZGF0ZUZyb21FbGVtZW50KCkKIHsKKyAgICBIVE1MSW5wdXRF bGVtZW50KiBpbnB1dCA9IHN0YXRpY19jYXN0PEhUTUxJbnB1dEVsZW1lbnQqPihub2RlKCkpOwor ICAgIEFTU0VSVChpbnB1dC0+aXNGaWxlVXBsb2FkKCkpOworCiAgICAgaWYgKEhUTUxJbnB1dEVs ZW1lbnQqIGJ1dHRvbiA9IHVwbG9hZEJ1dHRvbigpKQogICAgICAgICBidXR0b24tPnNldERpc2Fi bGVkKCF0aGVtZSgpLT5pc0VuYWJsZWQodGhpcykpOworCisgICAgLy8gVGhpcyBvbmx5IHN1cHBv cnRzIGNsZWFyaW5nIG91dCB0aGUgZmlsZXMsIGJ1dCB0aGF0J3MgT0sgYmVjYXVzZSBmb3IKKyAg ICAvLyBzZWN1cml0eSByZWFzb25zIHRoYXQncyB0aGUgb25seSBjaGFuZ2UgdGhlIERPTSBpcyBh bGxvd2VkIHRvIG1ha2UuCisgICAgRmlsZUxpc3QqIGZpbGVzID0gaW5wdXQtPmZpbGVzKCk7Cisg ICAgQVNTRVJUKGZpbGVzKTsKKyAgICBpZiAoZmlsZXMgJiYgZmlsZXMtPmlzRW1wdHkoKSkKKyAg ICAgICAgcmVwYWludCgpOwogfQogCiBzdGF0aWMgaW50IG5vZGVXaWR0aChOb2RlKiBub2RlKQo= 101719 2011-07-22 05:36:23 -0700 2011-07-22 06:41:12 -0700 Patch bug-65008-20110722213621.patch text/plain 5582 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogOTE0NDMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2NWIyMmM0MzIxYWRhNjFhNjMzYmE0 NTU4MmJjOTRlZjc4ZmIyYjY2Li42YThlNjI2YWFhNDI1MDlkYzBjMmE0NWI3MTkxYmM2YjJlZjFj YjhkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDctMjIgIEtlbnRhcm8gSGFyYSAgPGhh cmFrZW5AZ29vZ2xlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OKHI4OTUzNSk6IEZvcm0gcmVz ZXQgZG9lcyBub3QgcmVwYWludCBhIGZpbGUgdXBsb2FkIGNvbnRyb2wuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTAwOAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggZml4ZXMgdGhlIGNv ZGUgc28gdGhhdCB0aGUgZmlsZSB1cGxvYWQgY29udHJvbCBpcyByZXBhaW50ZWQKKyAgICAgICAg aW4gdXBkYXRlRnJvbUVsZW1lbnQoKSBpZiBubyBmaWxlcyBhcmUgc2VsZWN0ZWQuIFRoZSBhZGRl ZCB0ZXN0IGNoZWNrcworICAgICAgICBpZiB0aGUgbGFiZWwgbmV4dCB0byB0aGUgZmlsZSBjaG9v c2VyIGJ1dHRvbiBiZWNvbWVzICJObyBmaWxlIGNob3NlbiIKKyAgICAgICAgd2hlbiB3ZSBwcmVz cyB0aGUgcmVzZXQgYnV0dG9uLgorCisgICAgICAgICogZmFzdC9mb3Jtcy9maWxlLWlucHV0LXJl c2V0LWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZm9ybXMvZmlsZS1pbnB1 dC1yZXNldC5odG1sOiBBZGRlZC4KKwogMjAxMS0wNy0yMCAgUnlvc3VrZSBOaXdhICA8cm5pd2FA d2Via2l0Lm9yZz4KIAogICAgICAgICBBZGQgY3Jhc2ggZXhwZWN0YXRpb24gdG8gZmFzdC9jYW52 YXMvd2ViZ2wvcmVuZGVyYnVmZmVyLWluaXRpYWxpemF0aW9uLmh0bWwgb24gQ2hyb21pdW0gV2lu ZG93cywKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvZmlsZS1pbnB1dC1yZXNl dC1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9maWxlLWlucHV0LXJlc2V0 LWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNGVlYTJiYzcwNWMxOTAxMzg2NDFlOTQxY2EzM2Vk YTFlM2QwODk2ZQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvZmls ZS1pbnB1dC1yZXNldC1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsMTggQEAKKzwhRE9DVFlQRSBo dG1sPgorPGh0bWw+Cis8aGVhZD4KKzwvaGVhZD4KKzxib2R5PgorPGZvcm0gaWQ9ImZvcm0iPgor PGlucHV0IGlkPSJmaWxlIiB0eXBlPSJmaWxlIiAvPgorPGlucHV0IGlkPSJyZXNldCIgdHlwZT0i cmVzZXQiIC8+Cis8L2Zvcm0+Cis8ZGl2IGlkPSJjb25zb2xlIj5DOlxmYWtlcGF0aFxmb28udHh0 IGlzIHNlbGVjdGVkLjwvZGl2PgorPHA+CitUaGlzIHRlc3RzIHdoZXRoZXIgdGhlIGxhYmVsIG5l eHQgdG8gdGhlIGZpbGUgY2hvb3NlciBidXR0b24gYmVjb21lcyAiTm8gZmlsZSBjaG9zZW4iCit3 aGVuIHdlIHByZXNzIHRoZSByZXNldCBidXR0b24uCitUbyBydW4gdGhpcyB0ZXN0IG1hbnVhbGx5 LCBjaG9vc2UgYSBmaWxlIGFuZCB0aGVuIGNsaWNrIHRoZSByZXNldCBidXR0b24uCitJZiB0aGUg bGFiZWwgbmV4dCB0byB0aGUgZmlsZSBjaG9vc2VyIGJ1dHRvbiBjaGFuZ2VzIHRvICJObyBmaWxl IGNob3NlbiIsIHRoZSB0ZXN0IHBhc3Nlcy4KKzwvcD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvZmlsZS1pbnB1dC1yZXNldC5odG1sIGIvTGF5 b3V0VGVzdHMvZmFzdC9mb3Jtcy9maWxlLWlucHV0LXJlc2V0Lmh0bWwKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYTU0 Nzg1MDk5ODhmMjM1YzA3NTVlMTgxZDZjOTA4OGMxZTMzYzJjNwotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvZmlsZS1pbnB1dC1yZXNldC5odG1sCkBAIC0wLDAgKzEs NDUgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzwvaGVhZD4KKzxib2R5Pgor PGZvcm0gaWQ9ImZvcm0iPgorPGlucHV0IGlkPSJmaWxlIiB0eXBlPSJmaWxlIiAvPgorPGlucHV0 IGlkPSJyZXNldCIgdHlwZT0icmVzZXQiIC8+Cis8L2Zvcm0+Cis8ZGl2IGlkPSJjb25zb2xlIj48 L2Rpdj4KKzxwPgorVGhpcyB0ZXN0cyB3aGV0aGVyIHRoZSBsYWJlbCBuZXh0IHRvIHRoZSBmaWxl IGNob29zZXIgYnV0dG9uIGJlY29tZXMgIk5vIGZpbGUgY2hvc2VuIgord2hlbiB3ZSBwcmVzcyB0 aGUgcmVzZXQgYnV0dG9uLgorVG8gcnVuIHRoaXMgdGVzdCBtYW51YWxseSwgY2hvb3NlIGEgZmls ZSBhbmQgdGhlbiBjbGljayB0aGUgcmVzZXQgYnV0dG9uLgorSWYgdGhlIGxhYmVsIG5leHQgdG8g dGhlIGZpbGUgY2hvb3NlciBidXR0b24gY2hhbmdlcyB0byAiTm8gZmlsZSBjaG9zZW4iLCB0aGUg dGVzdCBwYXNzZXMuCis8L3A+Cis8c2NyaXB0PgoraWYgKGxheW91dFRlc3RDb250cm9sbGVyICYm IGV2ZW50U2VuZGVyKSB7CisgICAgdmFyIGZpbGUgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgi ZmlsZSIpOworICAgIHZhciByZXNldCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJyZXNldCIp OworICAgIGRyYWdGaWxlc09udG9FbGVtZW50KGZpbGUsIFsiZm9vLnR4dCJdKTsKKyAgICBkb2N1 bWVudC5nZXRFbGVtZW50QnlJZCgiY29uc29sZSIpLmlubmVySFRNTCA9IGZpbGUudmFsdWUgKyAi IGlzIHNlbGVjdGVkLiI7CisgICAgY2xpY2socmVzZXQub2Zmc2V0TGVmdCArIHJlc2V0Lm9mZnNl dFdpZHRoIC8gMiwgcmVzZXQub2Zmc2V0VG9wICsgcmVzZXQub2Zmc2V0SGVpZ2h0IC8gMik7Cisg ICAgY2xpY2socmVzZXQub2Zmc2V0TGVmdCArIHJlc2V0Lm9mZnNldFdpZHRoICsgMTAsIHJlc2V0 Lm9mZnNldFRvcCArIHJlc2V0Lm9mZnNldEhlaWdodCArIDEwKTsgLy8gTW92ZSBhIGN1cnNvciBv dXQgb2YgdGhlIHJlc2V0IGJ1dHRvbi4KK30KKworZnVuY3Rpb24gY2xpY2soeCwgeSkgeworICAg IGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHgsIHkpOworICAgIGV2ZW50U2VuZGVyLm1vdXNlRG93 bigpOworICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHgsIHkpOworICAgIGV2ZW50U2VuZGVy Lm1vdXNlVXAoKTsKK30KKworZnVuY3Rpb24gZHJhZ0ZpbGVzT250b0VsZW1lbnQoZWxlbWVudCwg ZmlsZXMpIHsKKyAgICBldmVudFNlbmRlci5iZWdpbkRyYWdXaXRoRmlsZXMoZmlsZXMpOworICAg IHZhciBjZW50ZXJYID0gZWxlbWVudC5vZmZzZXRMZWZ0ICsgZWxlbWVudC5vZmZzZXRXaWR0aCAv IDI7CisgICAgdmFyIGNlbnRlclkgPSBlbGVtZW50Lm9mZnNldFRvcCArIGVsZW1lbnQub2Zmc2V0 SGVpZ2h0IC8gMjsKKyAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyhjZW50ZXJYLCBjZW50ZXJZ KTsKKyAgICBldmVudFNlbmRlci5tb3VzZVVwKCk7Cit9CisKK3ZhciBzdWNjZXNzZnVsbHlQYXJz ZWQgPSB0cnVlOworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTgz MDFlNmU2YmFmMDAxOTUyNmNmMTg3OThiMDk2NmJlNjZhZTM0Ny4uN2UyMWI4OWUxMTVhNmI2OWY1 MDM3MmE0OTY1OWI1NDI3NjU2NDZiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEx LTA3LTIyICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGdvb2dsZS5jb20+CisKKyAgICAgICAgUkVH UkVTU0lPTihyODk1MzUpOiBGb3JtIHJlc2V0IGRvZXMgbm90IHJlcGFpbnQgYSBmaWxlIHVwbG9h ZCBjb250cm9sLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NjUwMDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBUaGlzIHBhdGNoIGZpeGVzIHRoZSBjb2RlIHNvIHRoYXQgdGhlIGZpbGUgdXBsb2FkIGNvbnRy b2wgaXMgcmVwYWludGVkCisgICAgICAgIGluIHVwZGF0ZUZyb21FbGVtZW50KCkgaWYgbm8gZmls ZXMgYXJlIHNlbGVjdGVkLgorCisgICAgICAgIFRlc3RzOiBmYXN0L2Zvcm1zL2ZpbGUtaW5wdXQt cmVzZXQuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZpbGVVcGxvYWRDb250cm9s LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZpbGVVcGxvYWRDb250cm9sOjp1cGRhdGVG cm9tRWxlbWVudCk6IENhbGxzIHJlcGFpbnQoKSBpZiBubyBmaWxlcyBhcmUgc2VsZWN0ZWQuCisK IDIwMTEtMDctMjAgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAg Q2hyb21pdW0gYnVpbGQgZml4IGFmdGVyIHI5MTQ0MC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJGaWxlVXBsb2FkQ29udHJvbC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRmlsZVVwbG9hZENvbnRyb2wuY3BwCmluZGV4IGM1ZTUzZTM1ZTk4 NzlkYTE1NWJjNmQ2YzA1YzRmNWRlMGI2NWExMDYuLjUzMjA2N2EyMzcxMGMyYmM0ZWFkYTE4Njlk YWQzZmNmNzJhYTM1NDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJGaWxlVXBsb2FkQ29udHJvbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckZpbGVVcGxvYWRDb250cm9sLmNwcApAQCAtNjAsOCArNjAsMTggQEAgUmVuZGVyRmlsZVVw bG9hZENvbnRyb2w6On5SZW5kZXJGaWxlVXBsb2FkQ29udHJvbCgpCiAKIHZvaWQgUmVuZGVyRmls ZVVwbG9hZENvbnRyb2w6OnVwZGF0ZUZyb21FbGVtZW50KCkKIHsKKyAgICBIVE1MSW5wdXRFbGVt ZW50KiBpbnB1dCA9IHN0YXRpY19jYXN0PEhUTUxJbnB1dEVsZW1lbnQqPihub2RlKCkpOworICAg IEFTU0VSVChpbnB1dC0+aXNGaWxlVXBsb2FkKCkpOworCiAgICAgaWYgKEhUTUxJbnB1dEVsZW1l bnQqIGJ1dHRvbiA9IHVwbG9hZEJ1dHRvbigpKQogICAgICAgICBidXR0b24tPnNldERpc2FibGVk KCF0aGVtZSgpLT5pc0VuYWJsZWQodGhpcykpOworCisgICAgLy8gVGhpcyBvbmx5IHN1cHBvcnRz IGNsZWFyaW5nIG91dCB0aGUgZmlsZXMsIGJ1dCB0aGF0J3MgT0sgYmVjYXVzZSBmb3IKKyAgICAv LyBzZWN1cml0eSByZWFzb25zIHRoYXQncyB0aGUgb25seSBjaGFuZ2UgdGhlIERPTSBpcyBhbGxv d2VkIHRvIG1ha2UuCisgICAgRmlsZUxpc3QqIGZpbGVzID0gaW5wdXQtPmZpbGVzKCk7CisgICAg QVNTRVJUKGZpbGVzKTsKKyAgICBpZiAoZmlsZXMgJiYgZmlsZXMtPmlzRW1wdHkoKSkKKyAgICAg ICAgcmVwYWludCgpOwogfQogCiBzdGF0aWMgaW50IG5vZGVXaWR0aChOb2RlKiBub2RlKQo=