69755 2011-10-10 06:20:08 -0700 Make static functions in HTMLSelectElement.cpp member functions of HTMLSelectElement class 2011-10-10 19:29:16 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P3 Minor --- 69701 69812 1 tkent tkent darin rniwa webkit.review.bot oldest_to_newest 480929 0 tkent 2011-10-10 06:20:08 -0700 Make static functions in HTMLSelectElement.cpp member functions of HTMLSelectElement class 480931 1 110352 tkent 2011-10-10 06:23:59 -0700 Created attachment 110352 Patch 480981 2 110352 rniwa 2011-10-10 09:55:48 -0700 Comment on attachment 110352 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=110352&action=review > Source/WebCore/ChangeLog:8 > + > + Nit: two blank lines. 481002 3 110352 webkit.review.bot 2011-10-10 11:00:17 -0700 Comment on attachment 110352 Patch Clearing flags on attachment: 110352 Committed r97069: <http://trac.webkit.org/changeset/97069> 481003 4 webkit.review.bot 2011-10-10 11:00:22 -0700 All reviewed patches have been landed. Closing bug. 110352 2011-10-10 06:23:59 -0700 2011-10-10 11:00:17 -0700 Patch bug-69755-20111010222357.patch text/plain 10309 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogOTcwNDYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjYjU0MmViMWZiZjM2OGM2 ZDFiY2Y4MjYwYzcwZDVjMmJmNzFkMjRlLi4yNmJlMTUwMDNkZWE1NzNmNmU1YTYwYTAxMzkyODU3 Y2FhNjI3MTQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMTAtMTAgIEtlbnQg VGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgorCisgICAgICAgIE1ha2Ugc3RhdGljIGZ1bmN0 aW9ucyBpbiBIVE1MU2VsZWN0RWxlbWVudC5jcHAgbWVtYmVyIGZ1bmN0aW9ucyBvZiBIVE1MU2Vs ZWN0RWxlbWVudCBjbGFzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9Njk3NTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBqdXN0IGEgcmVmYWN0b3JpbmcuCisKKyAg ICAgICAgKiBodG1sL0hUTUxTZWxlY3RFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhU TUxTZWxlY3RFbGVtZW50OjpuZXh0VmFsaWRJbmRleCk6CisgICAgICAgIE1ha2UgdGhpcyBhIHN0 YXRpYyBtZW1iZXIgZnVuY3Rpb24gb2YgSFRNTFNlbGVjdEVsZW1lbnQuCisgICAgICAgIChXZWJD b3JlOjpIVE1MU2VsZWN0RWxlbWVudDo6bmV4dFNlbGVjdGFibGVMaXN0SW5kZXgpOgorICAgICAg ICBNYWtlIHRoaXMgYSBtZW1iZXIgZnVuY3Rpb24gb2YgSFRNTFNlbGVjdEVsZW1lbnQuCisgICAg ICAgIChXZWJDb3JlOjpIVE1MU2VsZWN0RWxlbWVudDo6cHJldmlvdXNTZWxlY3RhYmxlTGlzdElu ZGV4KTogZGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpIVE1MU2VsZWN0RWxlbWVudDo6Zmlyc3RT ZWxlY3RhYmxlTGlzdEluZGV4KTogZGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpIVE1MU2VsZWN0 RWxlbWVudDo6bGFzdFNlbGVjdGFibGVMaXN0SW5kZXgpOiBkaXR0by4KKyAgICAgICAgKFdlYkNv cmU6OkhUTUxTZWxlY3RFbGVtZW50OjpuZXh0U2VsZWN0YWJsZUxpc3RJbmRleFBhZ2VBd2F5KTog ZGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpIVE1MU2VsZWN0RWxlbWVudDo6c2VsZWN0QWxsKTog VXBkYXRlIGNhbGxzaXRlIG9mIHRoZSBhYm92ZSBmdW5jdGlvbnMuCisgICAgICAgIChXZWJDb3Jl OjpIVE1MU2VsZWN0RWxlbWVudDo6c2V0U2VsZWN0ZWRJbmRleEludGVybmFsKTogZGl0dG8uCisg ICAgICAgIChXZWJDb3JlOjpIVE1MU2VsZWN0RWxlbWVudDo6bGlzdEJveERlZmF1bHRFdmVudEhh bmRsZXIpOiBkaXR0by4KKyAgICAgICAgKiBodG1sL0hUTUxTZWxlY3RFbGVtZW50Lmg6CisgICAg ICAgICAtIEFkZCB0aGUgYWJvdmUgZnVuY3Rpb24gZGVjbGFyYXRpb25zLgorICAgICAgICAgLSBN b3ZlIFNraXBEaXJlY3Rpb24gZGVmaW5pdGlvbiBmcm9tIEhUTUxTZWxlY3RFbGVtZW50LmNwcC4K KwogMjAxMS0xMC0xMCAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+ CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjk3MDQ1LgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MU2VsZWN0RWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxTZWxlY3RFbGVtZW50LmNwcAppbmRleCA3ZWFkZTBmZDU2MjM0YmFiYzAzNzU4 ZmRhZTA3NTNjZDgzYzE5ZTE4Li45OWM4NDJiNjUzOWY4ZGZmZjc5MTliMmMwNjczOTQ2MTUzYWJh ZDA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTZWxlY3RFbGVtZW50LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTZWxlY3RFbGVtZW50LmNwcApAQCAtNzQs MTEgKzc0LDYgQEAgc3RhdGljIGNvbnN0IHVuc2lnbmVkIG1heFNlbGVjdEl0ZW1zID0gMTAwMDA7 CiAKIHN0YXRpYyBjb25zdCBET01UaW1lU3RhbXAgdHlwZUFoZWFkVGltZW91dCA9IDEwMDA7CiAK LWVudW0gU2tpcERpcmVjdGlvbiB7Ci0gICAgU2tpcEJhY2t3YXJkcyA9IC0xLAotICAgIFNraXBG b3J3YXJkcyA9IDEKLX07Ci0KIEhUTUxTZWxlY3RFbGVtZW50OjpIVE1MU2VsZWN0RWxlbWVudChj b25zdCBRdWFsaWZpZWROYW1lJiB0YWdOYW1lLCBEb2N1bWVudCogZG9jdW1lbnQsIEhUTUxGb3Jt RWxlbWVudCogZm9ybSkKICAgICA6IEhUTUxGb3JtQ29udHJvbEVsZW1lbnRXaXRoU3RhdGUodGFn TmFtZSwgZG9jdW1lbnQsIGZvcm0pCiB7CkBAIC00NDMsNyArNDM4LDcgQEAgYm9vbCBIVE1MU2Vs ZWN0RWxlbWVudDo6aXNSZXF1aXJlZEZvcm1Db250cm9sKCkgY29uc3QKIC8vIE90aGVyd2lzZSwg aXQgcmV0dXJucyB0aGUgdmFsaWQgaXRlbSBjbG9zZXN0IHRvIHRoYXQgYm91bmRhcnkgd2hpY2gg aXMgcGFzdCB8bGlzdEluZGV4fCBpZiB0aGVyZSBpcyBvbmUuCiAvLyBPdGhlcndpc2UsIGl0IHJl dHVybnMgfGxpc3RJbmRleHwuCiAvLyBWYWxpZCBtZWFucyB0aGF0IGl0IGlzIGVuYWJsZWQgYW5k IGFuIG9wdGlvbiBlbGVtZW50Lgotc3RhdGljIGludCBuZXh0VmFsaWRJbmRleChjb25zdCBWZWN0 b3I8RWxlbWVudCo+JiBsaXN0SXRlbXMsIGludCBsaXN0SW5kZXgsIFNraXBEaXJlY3Rpb24gZGly ZWN0aW9uLCBpbnQgc2tpcCkKK2ludCBIVE1MU2VsZWN0RWxlbWVudDo6bmV4dFZhbGlkSW5kZXgo Y29uc3QgVmVjdG9yPEVsZW1lbnQqPiYgbGlzdEl0ZW1zLCBpbnQgbGlzdEluZGV4LCBTa2lwRGly ZWN0aW9uIGRpcmVjdGlvbiwgaW50IHNraXApCiB7CiAgICAgQVNTRVJUKGRpcmVjdGlvbiA9PSAt MSB8fCBkaXJlY3Rpb24gPT0gMSk7CiAgICAgaW50IGxhc3RHb29kSW5kZXggPSBsaXN0SW5kZXg7 CkBAIC00NTksNDAgKzQ1NCw0MCBAQCBzdGF0aWMgaW50IG5leHRWYWxpZEluZGV4KGNvbnN0IFZl Y3RvcjxFbGVtZW50Kj4mIGxpc3RJdGVtcywgaW50IGxpc3RJbmRleCwgU2tpcAogICAgIHJldHVy biBsYXN0R29vZEluZGV4OwogfQogCi1zdGF0aWMgaW50IG5leHRTZWxlY3RhYmxlTGlzdEluZGV4 KFNlbGVjdEVsZW1lbnREYXRhJiBkYXRhLCBFbGVtZW50KiBlbGVtZW50LCBpbnQgc3RhcnRJbmRl eCkKK2ludCBIVE1MU2VsZWN0RWxlbWVudDo6bmV4dFNlbGVjdGFibGVMaXN0SW5kZXgoaW50IHN0 YXJ0SW5kZXgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG5leHRWYWxpZEluZGV4KGRhdGEubGlzdEl0 ZW1zKGVsZW1lbnQpLCBzdGFydEluZGV4LCBTa2lwRm9yd2FyZHMsIDEpOworICAgIHJldHVybiBu ZXh0VmFsaWRJbmRleChtX2RhdGEubGlzdEl0ZW1zKHRoaXMpLCBzdGFydEluZGV4LCBTa2lwRm9y d2FyZHMsIDEpOwogfQogCi1zdGF0aWMgaW50IHByZXZpb3VzU2VsZWN0YWJsZUxpc3RJbmRleChT ZWxlY3RFbGVtZW50RGF0YSYgZGF0YSwgRWxlbWVudCogZWxlbWVudCwgaW50IHN0YXJ0SW5kZXgp CitpbnQgSFRNTFNlbGVjdEVsZW1lbnQ6OnByZXZpb3VzU2VsZWN0YWJsZUxpc3RJbmRleChpbnQg c3RhcnRJbmRleCkgY29uc3QKIHsKICAgICBpZiAoc3RhcnRJbmRleCA9PSAtMSkKLSAgICAgICAg c3RhcnRJbmRleCA9IGRhdGEubGlzdEl0ZW1zKGVsZW1lbnQpLnNpemUoKTsKLSAgICByZXR1cm4g bmV4dFZhbGlkSW5kZXgoZGF0YS5saXN0SXRlbXMoZWxlbWVudCksIHN0YXJ0SW5kZXgsIFNraXBC YWNrd2FyZHMsIDEpOworICAgICAgICBzdGFydEluZGV4ID0gbV9kYXRhLmxpc3RJdGVtcyh0aGlz KS5zaXplKCk7CisgICAgcmV0dXJuIG5leHRWYWxpZEluZGV4KG1fZGF0YS5saXN0SXRlbXModGhp cyksIHN0YXJ0SW5kZXgsIFNraXBCYWNrd2FyZHMsIDEpOwogfQogCi1zdGF0aWMgaW50IGZpcnN0 U2VsZWN0YWJsZUxpc3RJbmRleChTZWxlY3RFbGVtZW50RGF0YSYgZGF0YSwgRWxlbWVudCogZWxl bWVudCkKK2ludCBIVE1MU2VsZWN0RWxlbWVudDo6Zmlyc3RTZWxlY3RhYmxlTGlzdEluZGV4KCkg Y29uc3QKIHsKLSAgICBjb25zdCBWZWN0b3I8RWxlbWVudCo+JiBpdGVtcyA9IGRhdGEubGlzdEl0 ZW1zKGVsZW1lbnQpOworICAgIGNvbnN0IFZlY3RvcjxFbGVtZW50Kj4mIGl0ZW1zID0gbV9kYXRh Lmxpc3RJdGVtcyh0aGlzKTsKICAgICBpbnQgaW5kZXggPSBuZXh0VmFsaWRJbmRleChpdGVtcywg aXRlbXMuc2l6ZSgpLCBTa2lwQmFja3dhcmRzLCBJTlRfTUFYKTsKICAgICBpZiAoc3RhdGljX2Nh c3Q8dW5zaWduZWQ+KGluZGV4KSA9PSBpdGVtcy5zaXplKCkpCiAgICAgICAgIHJldHVybiAtMTsK ICAgICByZXR1cm4gaW5kZXg7CiB9CiAKLXN0YXRpYyBpbnQgbGFzdFNlbGVjdGFibGVMaXN0SW5k ZXgoU2VsZWN0RWxlbWVudERhdGEmIGRhdGEsIEVsZW1lbnQqIGVsZW1lbnQpCitpbnQgSFRNTFNl bGVjdEVsZW1lbnQ6Omxhc3RTZWxlY3RhYmxlTGlzdEluZGV4KCkgY29uc3QKIHsKLSAgICByZXR1 cm4gbmV4dFZhbGlkSW5kZXgoZGF0YS5saXN0SXRlbXMoZWxlbWVudCksIC0xLCBTa2lwRm9yd2Fy ZHMsIElOVF9NQVgpOworICAgIHJldHVybiBuZXh0VmFsaWRJbmRleChtX2RhdGEubGlzdEl0ZW1z KHRoaXMpLCAtMSwgU2tpcEZvcndhcmRzLCBJTlRfTUFYKTsKIH0KIAogLy8gUmV0dXJucyB0aGUg aW5kZXggb2YgdGhlIG5leHQgdmFsaWQgaXRlbSBvbmUgcGFnZSBhd2F5IGZyb20gfHN0YXJ0SW5k ZXh8IGluIGRpcmVjdGlvbiB8ZGlyZWN0aW9ufC4KLXN0YXRpYyBpbnQgbmV4dFNlbGVjdGFibGVM aXN0SW5kZXhQYWdlQXdheShTZWxlY3RFbGVtZW50RGF0YSYgZGF0YSwgRWxlbWVudCogZWxlbWVu dCwgaW50IHN0YXJ0SW5kZXgsIFNraXBEaXJlY3Rpb24gZGlyZWN0aW9uKQoraW50IEhUTUxTZWxl Y3RFbGVtZW50OjpuZXh0U2VsZWN0YWJsZUxpc3RJbmRleFBhZ2VBd2F5KGludCBzdGFydEluZGV4 LCBTa2lwRGlyZWN0aW9uIGRpcmVjdGlvbikgY29uc3QKIHsKLSAgICBjb25zdCBWZWN0b3I8RWxl bWVudCo+JiBpdGVtcyA9IGRhdGEubGlzdEl0ZW1zKGVsZW1lbnQpOworICAgIGNvbnN0IFZlY3Rv cjxFbGVtZW50Kj4mIGl0ZW1zID0gbV9kYXRhLmxpc3RJdGVtcyh0aGlzKTsKICAgICAvLyBDYW4n dCB1c2UgZGF0YS0+c2l6ZSgpIGJlY2F1c2UgcmVuZGVyZXIgZm9yY2VzIGEgbWluaW11bSBzaXpl LgogICAgIGludCBwYWdlU2l6ZSA9IDA7Ci0gICAgaWYgKGVsZW1lbnQtPnJlbmRlcmVyKCktPmlz TGlzdEJveCgpKQotICAgICAgICBwYWdlU2l6ZSA9IHRvUmVuZGVyTGlzdEJveChlbGVtZW50LT5y ZW5kZXJlcigpKS0+c2l6ZSgpIC0gMTsgLy8gLTEgc28gd2Ugc3RpbGwgc2hvdyBjb250ZXh0Cisg ICAgaWYgKHJlbmRlcmVyKCktPmlzTGlzdEJveCgpKQorICAgICAgICBwYWdlU2l6ZSA9IHRvUmVu ZGVyTGlzdEJveChyZW5kZXJlcigpKS0+c2l6ZSgpIC0gMTsgLy8gLTEgc28gd2Ugc3RpbGwgc2hv dyBjb250ZXh0CiAKICAgICAvLyBPbmUgcGFnZSBhd2F5LCBidXQgbm90IG91dHNpZGUgdmFsaWQg Ym91bmRzLgogICAgIC8vIElmIHRoZXJlIGlzIGEgdmFsaWQgb3B0aW9uIGl0ZW0gb25lIHBhZ2Ug YXdheSwgdGhlIGluZGV4IGlzIGNob3Nlbi4KQEAgLTUxMyw4ICs1MDgsOCBAQCB2b2lkIEhUTUxT ZWxlY3RFbGVtZW50OjpzZWxlY3RBbGwoKQogICAgIHNhdmVMYXN0U2VsZWN0aW9uKCk7CiAKICAg ICBtX2RhdGEuc2V0QWN0aXZlU2VsZWN0aW9uU3RhdGUodHJ1ZSk7Ci0gICAgc2V0QWN0aXZlU2Vs ZWN0aW9uQW5jaG9ySW5kZXgobmV4dFNlbGVjdGFibGVMaXN0SW5kZXgobV9kYXRhLCB0aGlzLCAt MSkpOwotICAgIHNldEFjdGl2ZVNlbGVjdGlvbkVuZEluZGV4KHByZXZpb3VzU2VsZWN0YWJsZUxp c3RJbmRleChtX2RhdGEsIHRoaXMsIC0xKSk7CisgICAgc2V0QWN0aXZlU2VsZWN0aW9uQW5jaG9y SW5kZXgobmV4dFNlbGVjdGFibGVMaXN0SW5kZXgoLTEpKTsKKyAgICBzZXRBY3RpdmVTZWxlY3Rp b25FbmRJbmRleChwcmV2aW91c1NlbGVjdGFibGVMaXN0SW5kZXgoLTEpKTsKIAogICAgIHVwZGF0 ZUxpc3RCb3hTZWxlY3Rpb24oZmFsc2UpOwogICAgIGxpc3RCb3hPbkNoYW5nZSgpOwpAQCAtNzMw LDcgKzcyNSw3IEBAIGludCBIVE1MU2VsZWN0RWxlbWVudDo6c2VsZWN0ZWRJbmRleCgpIGNvbnN0 CiB2b2lkIEhUTUxTZWxlY3RFbGVtZW50OjpzZXRTZWxlY3RlZEluZGV4SW50ZXJuYWwoaW50IG9w dGlvbkluZGV4LCBib29sIGRlc2VsZWN0LCBib29sIGZpcmVPbkNoYW5nZU5vdywgYm9vbCB1c2Vy RHJpdmVuQ2hhbmdlKQogewogICAgIGlmIChvcHRpb25JbmRleCA9PSAtMSAmJiAhZGVzZWxlY3Qg JiYgIW1fZGF0YS5tdWx0aXBsZSgpKQotICAgICAgICBvcHRpb25JbmRleCA9IG5leHRTZWxlY3Rh YmxlTGlzdEluZGV4KG1fZGF0YSwgdGhpcywgLTEpOworICAgICAgICBvcHRpb25JbmRleCA9IG5l eHRTZWxlY3RhYmxlTGlzdEluZGV4KC0xKTsKICAgICBpZiAoIW1fZGF0YS5tdWx0aXBsZSgpKQog ICAgICAgICBkZXNlbGVjdCA9IHRydWU7CiAKQEAgLTExOTQsMzggKzExODksMzggQEAgdm9pZCBI VE1MU2VsZWN0RWxlbWVudDo6bGlzdEJveERlZmF1bHRFdmVudEhhbmRsZXIoRXZlbnQqIGV2ZW50 KQogICAgICAgICAgICAgICAgIGludCBzdGFydEluZGV4ID0gbGFzdFNlbGVjdGVkTGlzdEluZGV4 KCk7CiAgICAgICAgICAgICAgICAgaGFuZGxlZCA9IHRydWU7CiAgICAgICAgICAgICAgICAgaWYg KGtleUlkZW50aWZpZXIgPT0gIkRvd24iKQotICAgICAgICAgICAgICAgICAgICBlbmRJbmRleCA9 IG5leHRTZWxlY3RhYmxlTGlzdEluZGV4KG1fZGF0YSwgdGhpcywgc3RhcnRJbmRleCk7CisgICAg ICAgICAgICAgICAgICAgIGVuZEluZGV4ID0gbmV4dFNlbGVjdGFibGVMaXN0SW5kZXgoc3RhcnRJ bmRleCk7CiAgICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgICAgICBlbmRJbmRl eCA9IG5leHRTZWxlY3RhYmxlTGlzdEluZGV4UGFnZUF3YXkobV9kYXRhLCB0aGlzLCBzdGFydElu ZGV4LCBTa2lwRm9yd2FyZHMpOworICAgICAgICAgICAgICAgICAgICBlbmRJbmRleCA9IG5leHRT ZWxlY3RhYmxlTGlzdEluZGV4UGFnZUF3YXkoc3RhcnRJbmRleCwgU2tpcEZvcndhcmRzKTsKICAg ICAgICAgICAgIH0gZWxzZSBpZiAoa2V5SWRlbnRpZmllciA9PSAiVXAiIHx8IGtleUlkZW50aWZp ZXIgPT0gIlBhZ2VVcCIpIHsKICAgICAgICAgICAgICAgICBpbnQgc3RhcnRJbmRleCA9IG9wdGlv blRvTGlzdEluZGV4KHNlbGVjdGVkSW5kZXgoKSk7CiAgICAgICAgICAgICAgICAgaGFuZGxlZCA9 IHRydWU7CiAgICAgICAgICAgICAgICAgaWYgKGtleUlkZW50aWZpZXIgPT0gIlVwIikKLSAgICAg ICAgICAgICAgICAgICAgZW5kSW5kZXggPSBwcmV2aW91c1NlbGVjdGFibGVMaXN0SW5kZXgobV9k YXRhLCB0aGlzLCBzdGFydEluZGV4KTsKKyAgICAgICAgICAgICAgICAgICAgZW5kSW5kZXggPSBw cmV2aW91c1NlbGVjdGFibGVMaXN0SW5kZXgoc3RhcnRJbmRleCk7CiAgICAgICAgICAgICAgICAg ZWxzZQotICAgICAgICAgICAgICAgICAgICBlbmRJbmRleCA9IG5leHRTZWxlY3RhYmxlTGlzdElu ZGV4UGFnZUF3YXkobV9kYXRhLCB0aGlzLCBzdGFydEluZGV4LCBTa2lwQmFja3dhcmRzKTsKKyAg ICAgICAgICAgICAgICAgICAgZW5kSW5kZXggPSBuZXh0U2VsZWN0YWJsZUxpc3RJbmRleFBhZ2VB d2F5KHN0YXJ0SW5kZXgsIFNraXBCYWNrd2FyZHMpOwogICAgICAgICAgICAgfQogICAgICAgICB9 IGVsc2UgewogICAgICAgICAgICAgLy8gU2V0IHRoZSBlbmQgaW5kZXggYmFzZWQgb24gdGhlIGN1 cnJlbnQgZW5kIGluZGV4CiAgICAgICAgICAgICBpZiAoa2V5SWRlbnRpZmllciA9PSAiRG93biIp IHsKLSAgICAgICAgICAgICAgICBlbmRJbmRleCA9IG5leHRTZWxlY3RhYmxlTGlzdEluZGV4KG1f ZGF0YSwgdGhpcywgbV9kYXRhLmFjdGl2ZVNlbGVjdGlvbkVuZEluZGV4KCkpOworICAgICAgICAg ICAgICAgIGVuZEluZGV4ID0gbmV4dFNlbGVjdGFibGVMaXN0SW5kZXgobV9kYXRhLmFjdGl2ZVNl bGVjdGlvbkVuZEluZGV4KCkpOwogICAgICAgICAgICAgICAgIGhhbmRsZWQgPSB0cnVlOwogICAg ICAgICAgICAgfSBlbHNlIGlmIChrZXlJZGVudGlmaWVyID09ICJVcCIpIHsKLSAgICAgICAgICAg ICAgICBlbmRJbmRleCA9IHByZXZpb3VzU2VsZWN0YWJsZUxpc3RJbmRleChtX2RhdGEsIHRoaXMs IG1fZGF0YS5hY3RpdmVTZWxlY3Rpb25FbmRJbmRleCgpKTsKKyAgICAgICAgICAgICAgICBlbmRJ bmRleCA9IHByZXZpb3VzU2VsZWN0YWJsZUxpc3RJbmRleChtX2RhdGEuYWN0aXZlU2VsZWN0aW9u RW5kSW5kZXgoKSk7CiAgICAgICAgICAgICAgICAgaGFuZGxlZCA9IHRydWU7CiAgICAgICAgICAg ICB9IGVsc2UgaWYgKGtleUlkZW50aWZpZXIgPT0gIlBhZ2VEb3duIikgewotICAgICAgICAgICAg ICAgIGVuZEluZGV4ID0gbmV4dFNlbGVjdGFibGVMaXN0SW5kZXhQYWdlQXdheShtX2RhdGEsIHRo aXMsIG1fZGF0YS5hY3RpdmVTZWxlY3Rpb25FbmRJbmRleCgpLCBTa2lwRm9yd2FyZHMpOworICAg ICAgICAgICAgICAgIGVuZEluZGV4ID0gbmV4dFNlbGVjdGFibGVMaXN0SW5kZXhQYWdlQXdheSht X2RhdGEuYWN0aXZlU2VsZWN0aW9uRW5kSW5kZXgoKSwgU2tpcEZvcndhcmRzKTsKICAgICAgICAg ICAgICAgICBoYW5kbGVkID0gdHJ1ZTsKICAgICAgICAgICAgIH0gZWxzZSBpZiAoa2V5SWRlbnRp ZmllciA9PSAiUGFnZVVwIikgewotICAgICAgICAgICAgICAgIGVuZEluZGV4ID0gbmV4dFNlbGVj dGFibGVMaXN0SW5kZXhQYWdlQXdheShtX2RhdGEsIHRoaXMsIG1fZGF0YS5hY3RpdmVTZWxlY3Rp b25FbmRJbmRleCgpLCBTa2lwQmFja3dhcmRzKTsKKyAgICAgICAgICAgICAgICBlbmRJbmRleCA9 IG5leHRTZWxlY3RhYmxlTGlzdEluZGV4UGFnZUF3YXkobV9kYXRhLmFjdGl2ZVNlbGVjdGlvbkVu ZEluZGV4KCksIFNraXBCYWNrd2FyZHMpOwogICAgICAgICAgICAgICAgIGhhbmRsZWQgPSB0cnVl OwogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAgIGlmIChrZXlJZGVudGlmaWVyID09 ICJIb21lIikgewotICAgICAgICAgICAgZW5kSW5kZXggPSBmaXJzdFNlbGVjdGFibGVMaXN0SW5k ZXgobV9kYXRhLCB0aGlzKTsKKyAgICAgICAgICAgIGVuZEluZGV4ID0gZmlyc3RTZWxlY3RhYmxl TGlzdEluZGV4KCk7CiAgICAgICAgICAgICBoYW5kbGVkID0gdHJ1ZTsKICAgICAgICAgfSBlbHNl IGlmIChrZXlJZGVudGlmaWVyID09ICJFbmQiKSB7Ci0gICAgICAgICAgICBlbmRJbmRleCA9IGxh c3RTZWxlY3RhYmxlTGlzdEluZGV4KG1fZGF0YSwgdGhpcyk7CisgICAgICAgICAgICBlbmRJbmRl eCA9IGxhc3RTZWxlY3RhYmxlTGlzdEluZGV4KCk7CiAgICAgICAgICAgICBoYW5kbGVkID0gdHJ1 ZTsKICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTZWxl Y3RFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTZWxlY3RFbGVtZW50LmgKaW5k ZXggYmIxZjZhZWYzNzFlYjkxYjczMzkwMTFkYWU5NGYzY2VkOWIxYTQ5Mi4uNTIyYzM1MWFlOTZj NjQ3ODExNzNjZmY1Y2I2NGJhM2VkZWE5NTNiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MU2VsZWN0RWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFNl bGVjdEVsZW1lbnQuaApAQCAtMTU1LDYgKzE1NSwxNyBAQCBwcml2YXRlOgogICAgIHZvaWQgc2V0 T3B0aW9uc0NoYW5nZWRPblJlbmRlcmVyKCk7CiAgICAgZnJpZW5kIGNsYXNzIFNlbGVjdEVsZW1l bnREYXRhOwogCisgICAgZW51bSBTa2lwRGlyZWN0aW9uIHsKKyAgICAgICAgU2tpcEJhY2t3YXJk cyA9IC0xLAorICAgICAgICBTa2lwRm9yd2FyZHMgPSAxCisgICAgfTsKKyAgICBzdGF0aWMgaW50 IG5leHRWYWxpZEluZGV4KGNvbnN0IFZlY3RvcjxFbGVtZW50Kj4mIGxpc3RJdGVtcywgaW50IGxp c3RJbmRleCwgU2tpcERpcmVjdGlvbiwgaW50IHNraXApOworICAgIGludCBuZXh0U2VsZWN0YWJs ZUxpc3RJbmRleChpbnQgc3RhcnRJbmRleCkgY29uc3Q7CisgICAgaW50IHByZXZpb3VzU2VsZWN0 YWJsZUxpc3RJbmRleChpbnQgc3RhcnRJbmRleCkgY29uc3Q7CisgICAgaW50IGZpcnN0U2VsZWN0 YWJsZUxpc3RJbmRleCgpIGNvbnN0OworICAgIGludCBsYXN0U2VsZWN0YWJsZUxpc3RJbmRleCgp IGNvbnN0OworICAgIGludCBuZXh0U2VsZWN0YWJsZUxpc3RJbmRleFBhZ2VBd2F5KGludCBzdGFy dEluZGV4LCBTa2lwRGlyZWN0aW9uKSBjb25zdDsKKwogICAgIFNlbGVjdEVsZW1lbnREYXRhIG1f ZGF0YTsKICAgICBDb2xsZWN0aW9uQ2FjaGUgbV9jb2xsZWN0aW9uSW5mbzsKIH07Cg==