9717 2006-07-03 14:27:30 -0700 Replace IDL ConvertUndefinedToTrue parameter attribute with Optional attribute 2006-07-25 08:29:24 -0700 1 1 1 Unclassified WebKit DOM 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 9179 1 ddkilzer ddkilzer ian mjs oldest_to_newest 48104 0 ddkilzer 2006-07-03 14:27:30 -0700 Patch v2 for Bug 9179 (hence the dependency) implements the ability to call overloaded implementation methods when JavaScript methods have optional arguments.  This bug is to remove the ConvertUndefinedToTrue parameter attribute from the IDL language and replace it with the Optional attribute, letting overloaded implementation methods handle the default value. Note that the ConvertUndefinedToTrue param attribute was first added in Bug 8227 (r13726).  See also Bug 9179 Comment #9. 48105 1 9175 ddkilzer 2006-07-03 14:33:38 -0700 Created attachment 9175 Patch v1 Proposed patch. 48106 2 9176 ddkilzer 2006-07-03 14:35:14 -0700 Created attachment 9176 Generated code changes (DO NOT APPLY) This patch demonstrates how the generated code changes after Patch v2 from Bug 9179 is applied, then this bug's Patch v1 is applied. 48107 3 ddkilzer 2006-07-03 14:40:58 -0700 (In reply to comment #2) > Created an attachment (id=9176) [edit] > Generated code changes (DO NOT APPLY) > > This patch demonstrates how the generated code changes after Patch v2 from Bug > 9179 is applied, then this bug's Patch v1 is applied. I wonder if the argsCount comparison should be '<=' instead of  '==' in case a method is called within JavaScript with too few arguments? 48109 4 ggaren 2006-07-03 14:48:18 -0700 Yes, I think you need <=, although I would vote for < as being a little clearer. That's something to change in your patch for bug 9179, right? With one exception, I think this patch is ready to land once the patch for bug 9179 is reviewed. The exception is that you do need a testcase, even if there is no behavior change. We have had many bugs with IDL changes accidentally producing behavior changes. You need to confirm that the optional parameter calling convention actually works. If an existing test already covers that, it's fine to name that test in the ChangeLog instead of duplicating the effort, but I don't think it's OK to land this change without any test. 48119 5 9175 darin 2006-07-03 18:03:02 -0700 Comment on attachment 9175 Patch v1 Looks good. r=me 48168 6 ddkilzer 2006-07-04 04:47:03 -0700 (In reply to comment #4) > Yes, I think you need <=, although I would vote for < as being a little > clearer. That's something to change in your patch for bug 9179, right? Yes.  I'll go make that change in Bug 9179. > With one exception, I think this patch is ready to land once the patch for bug > 9179 is reviewed. The exception is that you do need a testcase, even if there > is no behavior change. We have had many bugs with IDL changes accidentally > producing behavior changes. You need to confirm that the optional parameter > calling convention actually works. If an existing test already covers that, > it's fine to name that test in the ChangeLog instead of duplicating the effort, > but I don't think it's OK to land this change without any test. Test cases for DOMWindow.getMatchedCSSRules() are (the last two rely on the overloaded behavior): LayoutTests/fast/dom/defaultView.html LayoutTests/fast/inspector/matchedrules.html LayoutTests/fast/inspector/style.html Test cases for Element.scrollIntoView() are: WebCore/manual-tests/scrollIntoView-horizontal.html WebCore/manual-tests/scrollIntoView-vertical.html Note that there are no test cases for Element.scrollIntoViewIfNeeded(), although the change to the code is identical for both scrollIntoView() and scrollIntoViewIfNeeded(). The manual tests above passed, e.g., they did the same thing in Safari 2.0.4 (419.3) on Mac OS X 10.4.7 (8J135/PowerPC) as they did with a locally-built WebKit r15147 with patches for Bug 9179 and this patch applied; and they passed per instructions on the manual tests. All of the layout tests passed as well. 48169 7 ddkilzer 2006-07-04 04:52:50 -0700 (In reply to comment #6) > Test cases for Element.scrollIntoView() are: > > WebCore/manual-tests/scrollIntoView-horizontal.html > WebCore/manual-tests/scrollIntoView-vertical.html It's worth noting that both of these test cases exercise the overloaded behavior as well. 48185 8 darin 2006-07-04 10:57:56 -0700 Sorry, I didn't read Geoff's comments. I think it's OK to land -- there do seem to be tests here already. It would be better to cover all the functions, though. Not having a test for scrollIntoViewIfNeeded is a minor problem, because the way our IDL works, a small syntax error could completely break that function -- it doesn't matter how similar scrollIntoView is, because an omitted semicolon, for example, could break one and not affect the other. 50765 9 ddkilzer 2006-07-25 08:29:24 -0700 Committed revision 15619. 9175 2006-07-03 14:33:38 -0700 2006-07-03 18:03:02 -0700 Patch v1 bug-9717-v1.diff text/plain 5272 ddkilzer SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAxNTE0NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMDYtMDctMDMgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGtpbHpl ci5uZXQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg LSBmaXggaHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVnLmNnaT9pZD05NzE3 CisgICAgICAgICAgUmVwbGFjZSBJREwgQ29udmVydFVuZGVmaW5lZFRvVHJ1ZSBwYXJhbWV0ZXIg YXR0cmlidXRlIHdpdGggT3B0aW9uYWwgYXR0cmlidXRlCisKKyAgICAgICAgTm8gdGVzdCBhZGRl ZCBiZWNhdXNlIHRoZXJlIGlzIG5vIGNoYW5nZSBpbiBmdW5jdGlvbmFsaXR5LgorCisgICAgICAg ICogYmluZGluZ3MvanMva2pzX2JpbmRpbmcuY3BwOiBSZW1vdmVkIHZhbHVlVG9Cb29sZWFuVHJl YXRVbmRlZmluZWRBc1RydWUoKSBtZXRob2QuCisgICAgICAgICogYmluZGluZ3MvanMva2pzX2Jp bmRpbmcuaDogRGl0dG8uCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9y SlMucG06IFJlbW92ZWQgc3VwcG9ydCBmb3IgQ29udmVydFVuZGVmaW5lZFRvVHJ1ZSBwYXJhbWV0 ZXIgYXR0cmlidXRlLgorICAgICAgICAqIGRvbS9FbGVtZW50Lmg6IFNldCBkZWZhdWx0IHZhbHVl IHRvIHRydWUgZm9yIHNjcm9sbEludG9WaWV3KCkgYW5kIHNjcm9sbEludG9WaWV3SWZOZWVkZWQo KSBhcmd1bWVudHMuCisgICAgICAgICogZG9tL0VsZW1lbnQuaWRsOiBSZXBsYWNlZCBDb252ZXJ0 VW5kZWZpbmVkVG9UcnVlIGF0dHJpYnV0ZSB3aXRoIE9wdGlvbmFsIGF0dHJpYnV0ZS4KKyAgICAg ICAgICBGaXhlZCBuYW1lIG9mIHNjcm9sbEludG9WaWV3SWZOZWVkZWQoKSBhcmd1bWVudCB0byBt YXRjaCBpbXBsZW1lbnRhdGlvbi4KKyAgICAgICAgKiBwYWdlL0RPTVdpbmRvdy5pZGw6IFJlcGxh Y2VkIENvbnZlcnRVbmRlZmluZWRUb1RydWUgYXR0cmlidXRlIHdpdGggT3B0aW9uYWwgYXR0cmli dXRlLgorCiAyMDA2LTA3LTAyICBNaWtlIEVtbWVsICA8bWlrZS5lbW1lbEBnbWFpbC5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYW5kIGxhbmRlZCBieSBnZ2FyZW4uCkluZGV4OiBXZWJDb3JlL2Jp bmRpbmdzL2pzL2tqc19iaW5kaW5nLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdz L2pzL2tqc19iaW5kaW5nLmNwcAkocmV2aXNpb24gMTUxNDcpCisrKyBXZWJDb3JlL2JpbmRpbmdz L2pzL2tqc19iaW5kaW5nLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjg1LDEzICsyODUsNiBAQCBT dHJpbmcgdmFsdWVUb1N0cmluZ1dpdGhOdWxsQ2hlY2soRXhlY1N0CiAgICAgcmV0dXJuIHZhbC0+ dG9TdHJpbmcoZXhlYyk7CiB9CiAKLWJvb2wgdmFsdWVUb0Jvb2xlYW5UcmVhdFVuZGVmaW5lZEFz VHJ1ZShFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUqIHZhbCkKLXsKLSAgICBpZiAodmFsLT5pc1Vu ZGVmaW5lZCgpKQotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICByZXR1cm4gdmFsLT50b0Jvb2xl YW4oZXhlYyk7Ci19Ci0KIHN0YXRpYyBjb25zdCBjaGFyICogY29uc3QgZXhjZXB0aW9uTmFtZXNb XSA9IHsKICAgICAwLAogICAgICJJTkRFWF9TSVpFX0VSUiIsCkluZGV4OiBXZWJDb3JlL2JpbmRp bmdzL2pzL2tqc19iaW5kaW5nLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9qcy9r anNfYmluZGluZy5oCShyZXZpc2lvbiAxNTE0NykKKysrIFdlYkNvcmUvYmluZGluZ3MvanMva2pz X2JpbmRpbmcuaAkod29ya2luZyBjb3B5KQpAQCAtMTU5LDggKzE1OSw2IEBAIG5hbWVzcGFjZSBL SlMgewogICAgKi8KICAgV2ViQ29yZTo6U3RyaW5nIHZhbHVlVG9TdHJpbmdXaXRoTnVsbENoZWNr KEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSogdmFsKTsKIAotICBib29sIHZhbHVlVG9Cb29sZWFu VHJlYXRVbmRlZmluZWRBc1RydWUoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlKiB2YWwpOwotCiAg IHRlbXBsYXRlIDx0eXBlbmFtZSBUPiBpbmxpbmUgSlNWYWx1ZSogdG9KUyhFeGVjU3RhdGUqIGV4 ZWMsIFBhc3NSZWZQdHI8VD4gcHRyKSB7IHJldHVybiB0b0pTKGV4ZWMsIHB0ci5nZXQoKSk7IH0K ICAgCiB9IC8vIG5hbWVzcGFjZQpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVH ZW5lcmF0b3JKUy5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29k ZUdlbmVyYXRvckpTLnBtCShyZXZpc2lvbiAxNTE0NykKKysrIFdlYkNvcmUvYmluZGluZ3Mvc2Ny aXB0cy9Db2RlR2VuZXJhdG9ySlMucG0JKHdvcmtpbmcgY29weSkKQEAgLTk4NCwxMiArMTAyMyw3 IEBAIHN1YiBKU1ZhbHVlVG9OYXRpdmUKICAgICBteSAkdHlwZSA9ICRjb2RlR2VuZXJhdG9yLT5T dHJpcE1vZHVsZSgkc2lnbmF0dXJlLT50eXBlKTsKICAgICAKICAgICBpZiAoJHR5cGUgZXEgImJv b2xlYW4iKSB7Ci0gICAgICAgIG15ICRjb252ID0gJHNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1 dGVzLT57IkNvbnZlcnRVbmRlZmluZWRUb1RydWUifTsKLSAgICAgICAgaWYgKGRlZmluZWQgJGNv bnYpIHsKLSAgICAgICAgICAgIHJldHVybiAidmFsdWVUb0Jvb2xlYW5UcmVhdFVuZGVmaW5lZEFz VHJ1ZShleGVjLCAkdmFsdWUpIjsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHJldHVy biAiJHZhbHVlLT50b0Jvb2xlYW4oZXhlYykiOwotICAgICAgICB9CisgICAgICAgIHJldHVybiAi JHZhbHVlLT50b0Jvb2xlYW4oZXhlYykiOwogICAgIH0gZWxzaWYgKCR0eXBlIGVxICJ1bnNpZ25l ZCBsb25nIiBvcgogICAgICAgICAgICAgICR0eXBlIGVxICJsb25nIiBvcgogICAgICAgICAgICAg ICR0eXBlIGVxICJ1bnNpZ25lZCBzaG9ydCIpIHsKSW5kZXg6IFdlYkNvcmUvZG9tL0VsZW1lbnQu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2RvbS9FbGVtZW50LmgJKHJldmlzaW9uIDE1MTQ3KQor KysgV2ViQ29yZS9kb20vRWxlbWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC02NCw4ICs2NCw4IEBA IHB1YmxpYzoKICAgICB2b2lkIHNldEF0dHJpYnV0ZShjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0 IFN0cmluZyYgdmFsdWUsIEV4Y2VwdGlvbkNvZGUmKTsKICAgICB2b2lkIHNldEF0dHJpYnV0ZU5T KGNvbnN0IFN0cmluZyYgbmFtZXNwYWNlVVJJLCBjb25zdCBTdHJpbmcmIHF1YWxpZmllZE5hbWUs IGNvbnN0IFN0cmluZyYgdmFsdWUsIEV4Y2VwdGlvbkNvZGUmKTsKIAotICAgIHZvaWQgc2Nyb2xs SW50b1ZpZXcgKGJvb2wgYWxpZ25Ub1RvcCk7Ci0gICAgdm9pZCBzY3JvbGxJbnRvVmlld0lmTmVl ZGVkKGJvb2wgY2VudGVySWZOZWVkZWQpOworICAgIHZvaWQgc2Nyb2xsSW50b1ZpZXcgKGJvb2wg YWxpZ25Ub1RvcCA9IHRydWUpOworICAgIHZvaWQgc2Nyb2xsSW50b1ZpZXdJZk5lZWRlZChib29s IGNlbnRlcklmTmVlZGVkID0gdHJ1ZSk7CiAKICAgICB2b2lkIHNjcm9sbEJ5VW5pdHMoaW50IHVu aXRzLCBLV1FTY3JvbGxHcmFudWxhcml0eSBncmFudWxhcml0eSk7CiAgICAgdm9pZCBzY3JvbGxC eUxpbmVzKGludCBsaW5lcyk7CkluZGV4OiBXZWJDb3JlL2RvbS9FbGVtZW50LmlkbAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL2RvbS9FbGVtZW50LmlkbAkocmV2aXNpb24gMTUxNDcpCisrKyBXZWJD b3JlL2RvbS9FbGVtZW50LmlkbAkod29ya2luZyBjb3B5KQpAQCAtMTAyLDcgKzEwMiw3IEBAIG1v ZHVsZSBjb3JlIHsKIAogICAgICAgICB2b2lkIGJsdXIoKTsKIAotICAgICAgICB2b2lkIHNjcm9s bEludG9WaWV3KGluIFtDb252ZXJ0VW5kZWZpbmVkVG9UcnVlXSBib29sZWFuIGFsaWduV2l0aFRv cCk7CisgICAgICAgIHZvaWQgc2Nyb2xsSW50b1ZpZXcoaW4gW09wdGlvbmFsXSBib29sZWFuIGFs aWduV2l0aFRvcCk7CiAKICAgICAgICAgLy8gSUUgZXh0ZW5zaW9ucwogCkBAIC0xMTQsNyArMTE0 LDcgQEAgbW9kdWxlIGNvcmUgewogCiAgICAgICAgIC8vIFdlYktpdCBleHRlbnNpb25zCiAKLSAg ICAgICAgdm9pZCBzY3JvbGxJbnRvVmlld0lmTmVlZGVkKGluIFtDb252ZXJ0VW5kZWZpbmVkVG9U cnVlXSBib29sZWFuIGFsaWduV2l0aFRvcCk7CisgICAgICAgIHZvaWQgc2Nyb2xsSW50b1ZpZXdJ Zk5lZWRlZChpbiBbT3B0aW9uYWxdIGJvb2xlYW4gY2VudGVySWZOZWVkZWQpOwogCiAgICAgICAg IHZvaWQgc2Nyb2xsQnlMaW5lcyhpbiBsb25nIGxpbmVzKTsKIApJbmRleDogV2ViQ29yZS9wYWdl L0RPTVdpbmRvdy5pZGwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5pZGwJ KHJldmlzaW9uIDE1MTQ3KQorKysgV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5pZGwJKHdvcmtpbmcg Y29weSkKQEAgLTM4LDcgKzM4LDcgQEAgbW9kdWxlIHdpbmRvdyB7CiAgICAgICAgIC8vIFdlYktp dCBleHRlbnNpb24gZm9yIHRoZSBXZWIgSW5zcGVjdG9yCiAgICAgICAgIENTU1J1bGVMaXN0IGdl dE1hdGNoZWRDU1NSdWxlcyhpbiBFbGVtZW50IGVsdCwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGluIERPTVN0cmluZyBwc2V1ZG9FbHQsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBpbiBbQ29udmVydFVuZGVmaW5lZFRvVHJ1ZV0gYm9vbGVh biBhdXRob3JPbmx5KTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlu IFtPcHRpb25hbF0gYm9vbGVhbiBhdXRob3JPbmx5KTsKICAgICAgICAgCiAgICAgICAgIC8vIEds b2JhbCBjb25zdHJ1Y3RvcnMKICAgICAgICAgYXR0cmlidXRlIENTU1ByaW1pdGl2ZVZhbHVlQ29u c3RydWN0b3IgQ1NTUHJpbWl0aXZlVmFsdWU7Cg== 9176 2006-07-03 14:35:14 -0700 2006-07-03 14:35:14 -0700 Generated code changes (DO NOT APPLY) bug-9717-example-generated-code-change.diff text/plain 2235 ddkilzer ZGlmZiAtdXIgR2VuZXJhdGVkV2ViQ29yZS9KU0RPTVdpbmRvdy5jcHAgV2ViS2l0QnVpbGQvRGVi dWcvRGVyaXZlZFNvdXJjZXMvV2ViQ29yZS9KU0RPTVdpbmRvdy5jcHAKLS0tIEdlbmVyYXRlZFdl YkNvcmUvSlNET01XaW5kb3cuY3BwCTIwMDYtMDctMDMgMDk6MTM6MTEuMDAwMDAwMDAwIC0wNTAw CisrKyBXZWJLaXRCdWlsZC9EZWJ1Zy9EZXJpdmVkU291cmNlcy9XZWJDb3JlL0pTRE9NV2luZG93 LmNwcAkyMDA2LTA3LTAzIDE0OjIwOjMyLjAwMDAwMDAwMCAtMDUwMApAQCAtMzI2LDkgKzMyNiwx NyBAQAogICAgIGNhc2UgSlNET01XaW5kb3c6OkdldE1hdGNoZWRDU1NSdWxlc0Z1bmNOdW06IHsK ICAgICAgICAgRWxlbWVudCogZWx0ID0gdG9FbGVtZW50KGFyZ3NbMF0pOwogICAgICAgICBTdHJp bmcgcHNldWRvRWx0ID0gYXJnc1sxXS0+dG9TdHJpbmcoZXhlYyk7Ci0gICAgICAgIGJvb2wgYXV0 aG9yT25seSA9IHZhbHVlVG9Cb29sZWFuVHJlYXRVbmRlZmluZWRBc1RydWUoZXhlYywgYXJnc1sy XSk7CisKKyAgICAgICAgaW50IGFyZ3NDb3VudCA9IGFyZ3Muc2l6ZSgpOworICAgICAgICBpZiAo YXJnc0NvdW50ID09IDIpIHsKKworICAgICAgICAgICAgS0pTOjpKU1ZhbHVlKiByZXN1bHQgPSB0 b0pTKGV4ZWMsIGltcC0+Z2V0TWF0Y2hlZENTU1J1bGVzKGVsdCwgcHNldWRvRWx0KSk7CisgICAg ICAgICAgICByZXR1cm4gcmVzdWx0OworICAgICAgICB9CisKKyAgICAgICAgYm9vbCBhdXRob3JP bmx5ID0gYXJnc1syXS0+dG9Cb29sZWFuKGV4ZWMpOwogCiAKICAgICAgICAgS0pTOjpKU1ZhbHVl KiByZXN1bHQgPSB0b0pTKGV4ZWMsIGltcC0+Z2V0TWF0Y2hlZENTU1J1bGVzKGVsdCwgcHNldWRv RWx0LCBhdXRob3JPbmx5KSk7CiAgICAgICAgIHJldHVybiByZXN1bHQ7CiAgICAgfQpkaWZmIC11 ciBHZW5lcmF0ZWRXZWJDb3JlL0pTRWxlbWVudC5jcHAgV2ViS2l0QnVpbGQvRGVidWcvRGVyaXZl ZFNvdXJjZXMvV2ViQ29yZS9KU0VsZW1lbnQuY3BwCi0tLSBHZW5lcmF0ZWRXZWJDb3JlL0pTRWxl bWVudC5jcHAJMjAwNi0wNy0wMyAwOToxMzoxMy4wMDAwMDAwMDAgLTA1MDAKKysrIFdlYktpdEJ1 aWxkL0RlYnVnL0Rlcml2ZWRTb3VyY2VzL1dlYkNvcmUvSlNFbGVtZW50LmNwcAkyMDA2LTA3LTAz IDE0OjIwOjM0LjAwMDAwMDAwMCAtMDUwMApAQCAtNDAyLDcgKzQwMiwxNCBAQAogICAgICAgICBy ZXR1cm4ganNVbmRlZmluZWQoKTsKICAgICB9CiAgICAgY2FzZSBKU0VsZW1lbnQ6OlNjcm9sbElu dG9WaWV3RnVuY051bTogewotICAgICAgICBib29sIGFsaWduV2l0aFRvcCA9IHZhbHVlVG9Cb29s ZWFuVHJlYXRVbmRlZmluZWRBc1RydWUoZXhlYywgYXJnc1swXSk7CisKKyAgICAgICAgaW50IGFy Z3NDb3VudCA9IGFyZ3Muc2l6ZSgpOworICAgICAgICBpZiAoYXJnc0NvdW50ID09IDApIHsKKyAg ICAgICAgICAgIGltcC0+c2Nyb2xsSW50b1ZpZXcoKTsKKyAgICAgICAgICAgIHJldHVybiBqc1Vu ZGVmaW5lZCgpOworICAgICAgICB9CisKKyAgICAgICAgYm9vbCBhbGlnbldpdGhUb3AgPSBhcmdz WzBdLT50b0Jvb2xlYW4oZXhlYyk7CiAKICAgICAgICAgaW1wLT5zY3JvbGxJbnRvVmlldyhhbGln bldpdGhUb3ApOwogICAgICAgICByZXR1cm4ganNVbmRlZmluZWQoKTsKQEAgLTQyNSw5ICs0MzIs MTYgQEAKICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICB9CiAgICAgY2FzZSBKU0VsZW1lbnQ6 OlNjcm9sbEludG9WaWV3SWZOZWVkZWRGdW5jTnVtOiB7Ci0gICAgICAgIGJvb2wgYWxpZ25XaXRo VG9wID0gdmFsdWVUb0Jvb2xlYW5UcmVhdFVuZGVmaW5lZEFzVHJ1ZShleGVjLCBhcmdzWzBdKTsK IAotICAgICAgICBpbXAtPnNjcm9sbEludG9WaWV3SWZOZWVkZWQoYWxpZ25XaXRoVG9wKTsKKyAg ICAgICAgaW50IGFyZ3NDb3VudCA9IGFyZ3Muc2l6ZSgpOworICAgICAgICBpZiAoYXJnc0NvdW50 ID09IDApIHsKKyAgICAgICAgICAgIGltcC0+c2Nyb2xsSW50b1ZpZXdJZk5lZWRlZCgpOworICAg ICAgICAgICAgcmV0dXJuIGpzVW5kZWZpbmVkKCk7CisgICAgICAgIH0KKworICAgICAgICBib29s IGNlbnRlcklmTmVlZGVkID0gYXJnc1swXS0+dG9Cb29sZWFuKGV4ZWMpOworCisgICAgICAgIGlt cC0+c2Nyb2xsSW50b1ZpZXdJZk5lZWRlZChjZW50ZXJJZk5lZWRlZCk7CiAgICAgICAgIHJldHVy biBqc1VuZGVmaW5lZCgpOwogICAgIH0KICAgICBjYXNlIEpTRWxlbWVudDo6U2Nyb2xsQnlMaW5l c0Z1bmNOdW06IHsK