26033 2009-05-26 16:03:25 -0700 OptionElement uses more memory than needed 2009-05-27 05:25:34 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 zimmermann zimmermann staikos oldest_to_newest 123205 0 zimmermann 2009-05-26 16:03:25 -0700 Instead of storing an Element pointer in OptionElementData, just let callers of the static helper functions pass it. Saves 4 byte :-) 123206 1 30685 zimmermann 2009-05-26 16:04:40 -0700 Created attachment 30685 Initial patch No regressions. 123273 2 zimmermann 2009-05-27 05:25:34 -0700 Landed in r44186. 30685 2009-05-26 16:04:40 -0700 2009-05-26 20:11:34 -0700 Initial patch SaveMemOption.diff text/plain 8403 zimmermann SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDQ0MTYy KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzIgQEAKKzIwMDktMDUt MjYgIE5pa29sYXMgWmltbWVybWFubiAgPG5pa29sYXMuemltbWVybWFubkB0b3JjaG1vYmlsZS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4 ZXM6IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjAzMworCisgICAg ICAgIE9wdGlvbkVsZW1lbnREYXRhIHNhdmVzIGFuIEVsZW1lbnQgcG9pbnRlciwgd2hpY2ggaXMg dW5uZXNzYXJ5LgorICAgICAgICBKdXN0IHBhc3MgaXQgdG8gdGhlIHN0YXRpYyBmdW5jdGlvbiBj YWxscyBkaXJlY3RseS4KKworICAgICAgICAqIGRvbS9PcHRpb25FbGVtZW50LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6Ok9wdGlvbkVsZW1lbnQ6OnNldFNlbGVjdGVkU3RhdGUpOgorICAgICAgICAo V2ViQ29yZTo6T3B0aW9uRWxlbWVudDo6Y29sbGVjdE9wdGlvblRleHQpOgorICAgICAgICAoV2Vi Q29yZTo6T3B0aW9uRWxlbWVudDo6Y29sbGVjdE9wdGlvblRleHRSZXNwZWN0aW5nR3JvdXBMYWJl bCk6CisgICAgICAgIChXZWJDb3JlOjpPcHRpb25FbGVtZW50Ojpjb2xsZWN0T3B0aW9uVmFsdWUp OgorICAgICAgICAoV2ViQ29yZTo6T3B0aW9uRWxlbWVudERhdGE6Ok9wdGlvbkVsZW1lbnREYXRh KToKKyAgICAgICAgKiBkb20vT3B0aW9uRWxlbWVudC5oOgorICAgICAgICAqIGh0bWwvSFRNTE9w dGlvbkVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE9wdGlvbkVsZW1lbnQ6OkhU TUxPcHRpb25FbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxPcHRpb25FbGVtZW50Ojp0 ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxPcHRpb25FbGVtZW50Ojp2YWx1ZSk6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MT3B0aW9uRWxlbWVudDo6c2V0U2VsZWN0ZWQpOgorICAgICAgICAo V2ViQ29yZTo6SFRNTE9wdGlvbkVsZW1lbnQ6OnNldFNlbGVjdGVkU3RhdGUpOgorICAgICAgICAo V2ViQ29yZTo6SFRNTE9wdGlvbkVsZW1lbnQ6OnRleHRJbmRlbnRlZFRvUmVzcGVjdEdyb3VwTGFi ZWwpOgorICAgICAgICAqIHdtbC9XTUxPcHRpb25FbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OldNTE9wdGlvbkVsZW1lbnQ6OldNTE9wdGlvbkVsZW1lbnQpOgorICAgICAgICAoV2ViQ29y ZTo6V01MT3B0aW9uRWxlbWVudDo6c2V0U2VsZWN0ZWRTdGF0ZSk6CisgICAgICAgIChXZWJDb3Jl OjpXTUxPcHRpb25FbGVtZW50Ojp2YWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpXTUxPcHRpb25F bGVtZW50Ojp0ZXh0SW5kZW50ZWRUb1Jlc3BlY3RHcm91cExhYmVsKToKKwogMjAwOS0wNS0yNiAg SmlhbiBMaSAgPGppYW5saUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGlt aXRyaSBHbGF6a292LgpJbmRleDogZG9tL09wdGlvbkVsZW1lbnQuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IGRvbS9PcHRpb25FbGVtZW50LmNwcAkocmV2aXNpb24gNDQxNjIpCisrKyBkb20vT3B0aW9uRWxl bWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM2LDE3ICszNiwxOCBAQAogCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKLXZvaWQgT3B0aW9uRWxlbWVudDo6c2V0U2VsZWN0ZWRTdGF0ZShPcHRpb25F bGVtZW50RGF0YSYgZGF0YSwgYm9vbCBzZWxlY3RlZCkKK3ZvaWQgT3B0aW9uRWxlbWVudDo6c2V0 U2VsZWN0ZWRTdGF0ZShPcHRpb25FbGVtZW50RGF0YSYgZGF0YSwgRWxlbWVudCogZWxlbWVudCwg Ym9vbCBzZWxlY3RlZCkKIHsKICAgICBpZiAoZGF0YS5zZWxlY3RlZCgpID09IHNlbGVjdGVkKQog ICAgICAgICByZXR1cm47CiAKICAgICBkYXRhLnNldFNlbGVjdGVkKHNlbGVjdGVkKTsKLSAgICBk YXRhLmVsZW1lbnQoKS0+c2V0TmVlZHNTdHlsZVJlY2FsYygpOworICAgIGVsZW1lbnQtPnNldE5l ZWRzU3R5bGVSZWNhbGMoKTsKIH0KIAotU3RyaW5nIE9wdGlvbkVsZW1lbnQ6OmNvbGxlY3RPcHRp b25UZXh0KGNvbnN0IE9wdGlvbkVsZW1lbnREYXRhJiBkYXRhLCBEb2N1bWVudCogZG9jdW1lbnQp CitTdHJpbmcgT3B0aW9uRWxlbWVudDo6Y29sbGVjdE9wdGlvblRleHQoY29uc3QgT3B0aW9uRWxl bWVudERhdGEmIGRhdGEsIGNvbnN0IEVsZW1lbnQqIGVsZW1lbnQpCiB7CisgICAgRG9jdW1lbnQq IGRvY3VtZW50ID0gZWxlbWVudC0+ZG9jdW1lbnQoKTsKICAgICBTdHJpbmcgdGV4dDsKIAogICAg IC8vIFdpbklFIGRvZXMgbm90IHVzZSB0aGUgbGFiZWwgYXR0cmlidXRlLCBzbyBhcyBhIHF1aXJr LCB3ZSBpZ25vcmUgaXQuCkBAIC01NCwxNiArNTUsMTYgQEAgU3RyaW5nIE9wdGlvbkVsZW1lbnQ6 OmNvbGxlY3RPcHRpb25UZXh0KAogICAgICAgICB0ZXh0ID0gZGF0YS5sYWJlbCgpOwogCiAgICAg aWYgKHRleHQuaXNFbXB0eSgpKSB7Ci0gICAgICAgIE5vZGUqIG4gPSBkYXRhLmVsZW1lbnQoKS0+ Zmlyc3RDaGlsZCgpOworICAgICAgICBOb2RlKiBuID0gZWxlbWVudC0+Zmlyc3RDaGlsZCgpOwog ICAgICAgICB3aGlsZSAobikgewogICAgICAgICAgICAgaWYgKG4tPm5vZGVUeXBlKCkgPT0gTm9k ZTo6VEVYVF9OT0RFIHx8IG4tPm5vZGVUeXBlKCkgPT0gTm9kZTo6Q0RBVEFfU0VDVElPTl9OT0RF KQogICAgICAgICAgICAgICAgIHRleHQgKz0gbi0+bm9kZVZhbHVlKCk7CiAKICAgICAgICAgICAg IC8vIHNraXAgc2NyaXB0IGNvbnRlbnQKICAgICAgICAgICAgIGlmIChuLT5pc0VsZW1lbnROb2Rl KCkgJiYgdG9TY3JpcHRFbGVtZW50KHN0YXRpY19jYXN0PEVsZW1lbnQqPihuKSkpCi0gICAgICAg ICAgICAgICAgbiA9IG4tPnRyYXZlcnNlTmV4dFNpYmxpbmcoZGF0YS5lbGVtZW50KCkpOworICAg ICAgICAgICAgICAgIG4gPSBuLT50cmF2ZXJzZU5leHRTaWJsaW5nKGVsZW1lbnQpOwogICAgICAg ICAgICAgZWxzZQotICAgICAgICAgICAgICAgIG4gPSBuLT50cmF2ZXJzZU5leHROb2RlKGRhdGEu ZWxlbWVudCgpKTsKKyAgICAgICAgICAgICAgICBuID0gbi0+dHJhdmVyc2VOZXh0Tm9kZShlbGVt ZW50KTsKICAgICAgICAgfQogICAgIH0KIApAQCAtNzcsMzEgKzc4LDI5IEBAIFN0cmluZyBPcHRp b25FbGVtZW50Ojpjb2xsZWN0T3B0aW9uVGV4dCgKICAgICByZXR1cm4gdGV4dDsKIH0KIAotU3Ry aW5nIE9wdGlvbkVsZW1lbnQ6OmNvbGxlY3RPcHRpb25UZXh0UmVzcGVjdGluZ0dyb3VwTGFiZWwo Y29uc3QgT3B0aW9uRWxlbWVudERhdGEmIGRhdGEsIERvY3VtZW50KiBkb2N1bWVudCkKK1N0cmlu ZyBPcHRpb25FbGVtZW50Ojpjb2xsZWN0T3B0aW9uVGV4dFJlc3BlY3RpbmdHcm91cExhYmVsKGNv bnN0IE9wdGlvbkVsZW1lbnREYXRhJiBkYXRhLCBjb25zdCBFbGVtZW50KiBlbGVtZW50KQogewot ICAgIEVsZW1lbnQqIHBhcmVudEVsZW1lbnQgPSBzdGF0aWNfY2FzdDxFbGVtZW50Kj4oZGF0YS5l bGVtZW50KCktPnBhcmVudE5vZGUoKSk7CisgICAgRWxlbWVudCogcGFyZW50RWxlbWVudCA9IHN0 YXRpY19jYXN0PEVsZW1lbnQqPihlbGVtZW50LT5wYXJlbnROb2RlKCkpOwogICAgIGlmIChwYXJl bnRFbGVtZW50ICYmIHRvT3B0aW9uR3JvdXBFbGVtZW50KHBhcmVudEVsZW1lbnQpKQotICAgICAg ICByZXR1cm4gIiAgICAiICsgY29sbGVjdE9wdGlvblRleHQoZGF0YSwgZG9jdW1lbnQpOworICAg ICAgICByZXR1cm4gIiAgICAiICsgY29sbGVjdE9wdGlvblRleHQoZGF0YSwgZWxlbWVudCk7CiAK LSAgICByZXR1cm4gY29sbGVjdE9wdGlvblRleHQoZGF0YSwgZG9jdW1lbnQpOworICAgIHJldHVy biBjb2xsZWN0T3B0aW9uVGV4dChkYXRhLCBlbGVtZW50KTsKIH0KIAotU3RyaW5nIE9wdGlvbkVs ZW1lbnQ6OmNvbGxlY3RPcHRpb25WYWx1ZShjb25zdCBPcHRpb25FbGVtZW50RGF0YSYgZGF0YSwg RG9jdW1lbnQqIGRvY3VtZW50KQorU3RyaW5nIE9wdGlvbkVsZW1lbnQ6OmNvbGxlY3RPcHRpb25W YWx1ZShjb25zdCBPcHRpb25FbGVtZW50RGF0YSYgZGF0YSwgY29uc3QgRWxlbWVudCogZWxlbWVu dCkKIHsKICAgICBTdHJpbmcgdmFsdWUgPSBkYXRhLnZhbHVlKCk7CiAgICAgaWYgKCF2YWx1ZS5p c051bGwoKSkKICAgICAgICAgcmV0dXJuIHZhbHVlOwogCiAgICAgLy8gVXNlIHRoZSB0ZXh0IGlm IHRoZSB2YWx1ZSB3YXNuJ3Qgc2V0LgotICAgIHJldHVybiBjb2xsZWN0T3B0aW9uVGV4dChkYXRh LCBkb2N1bWVudCkuc3RyaXBXaGl0ZVNwYWNlKCk7CisgICAgcmV0dXJuIGNvbGxlY3RPcHRpb25U ZXh0KGRhdGEsIGVsZW1lbnQpLnN0cmlwV2hpdGVTcGFjZSgpOwogfQogCiAvLyBPcHRpb25FbGVt ZW50RGF0YQotT3B0aW9uRWxlbWVudERhdGE6Ok9wdGlvbkVsZW1lbnREYXRhKEVsZW1lbnQqIGVs ZW1lbnQpCi0gICAgOiBtX2VsZW1lbnQoZWxlbWVudCkKLSAgICAsIG1fc2VsZWN0ZWQoZmFsc2Up CitPcHRpb25FbGVtZW50RGF0YTo6T3B0aW9uRWxlbWVudERhdGEoKQorICAgIDogbV9zZWxlY3Rl ZChmYWxzZSkKIHsKLSAgICBBU1NFUlQobV9lbGVtZW50KTsKIH0KIAogT3B0aW9uRWxlbWVudERh dGE6On5PcHRpb25FbGVtZW50RGF0YSgpCkluZGV4OiBkb20vT3B0aW9uRWxlbWVudC5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIGRvbS9PcHRpb25FbGVtZW50LmgJKHJldmlzaW9uIDQ0MTYyKQorKysgZG9tL09w dGlvbkVsZW1lbnQuaAkod29ya2luZyBjb3B5KQpAQCAtNDAsMjMgKzQwLDE5IEBAIHB1YmxpYzoK ICAgICB2aXJ0dWFsIFN0cmluZyB2YWx1ZSgpIGNvbnN0ID0gMDsKIAogcHJvdGVjdGVkOgotICAg IE9wdGlvbkVsZW1lbnQoKSB7IH0KLQotICAgIHN0YXRpYyB2b2lkIHNldFNlbGVjdGVkU3RhdGUo T3B0aW9uRWxlbWVudERhdGEmLCBib29sIHNlbGVjdGVkKTsKLSAgICBzdGF0aWMgU3RyaW5nIGNv bGxlY3RPcHRpb25UZXh0KGNvbnN0IE9wdGlvbkVsZW1lbnREYXRhJiwgRG9jdW1lbnQqKTsKLSAg ICBzdGF0aWMgU3RyaW5nIGNvbGxlY3RPcHRpb25UZXh0UmVzcGVjdGluZ0dyb3VwTGFiZWwoY29u c3QgT3B0aW9uRWxlbWVudERhdGEmLCBEb2N1bWVudCopOwotICAgIHN0YXRpYyBTdHJpbmcgY29s bGVjdE9wdGlvblZhbHVlKGNvbnN0IE9wdGlvbkVsZW1lbnREYXRhJiwgRG9jdW1lbnQqKTsKKyAg ICBzdGF0aWMgdm9pZCBzZXRTZWxlY3RlZFN0YXRlKE9wdGlvbkVsZW1lbnREYXRhJiwgRWxlbWVu dCosIGJvb2wgc2VsZWN0ZWQpOworICAgIHN0YXRpYyBTdHJpbmcgY29sbGVjdE9wdGlvblRleHQo Y29uc3QgT3B0aW9uRWxlbWVudERhdGEmLCBjb25zdCBFbGVtZW50Kik7CisgICAgc3RhdGljIFN0 cmluZyBjb2xsZWN0T3B0aW9uVGV4dFJlc3BlY3RpbmdHcm91cExhYmVsKGNvbnN0IE9wdGlvbkVs ZW1lbnREYXRhJiwgY29uc3QgRWxlbWVudCopOworICAgIHN0YXRpYyBTdHJpbmcgY29sbGVjdE9w dGlvblZhbHVlKGNvbnN0IE9wdGlvbkVsZW1lbnREYXRhJiwgY29uc3QgRWxlbWVudCopOwogfTsK IAogLy8gSFRNTC9XTUxPcHRpb25FbGVtZW50IGhvbGQgdGhpcyBzdHJ1Y3QgYXMgbWVtYmVyIHZh cmlhYmxlCiAvLyBhbmQgcGFzcyBpdCB0byB0aGUgc3RhdGljIGhlbHBlciBmdW5jdGlvbnMgaW4g T3B0aW9uRWxlbWVudAogY2xhc3MgT3B0aW9uRWxlbWVudERhdGEgewogcHVibGljOgotICAgIE9w dGlvbkVsZW1lbnREYXRhKEVsZW1lbnQqKTsKKyAgICBPcHRpb25FbGVtZW50RGF0YSgpOwogICAg IH5PcHRpb25FbGVtZW50RGF0YSgpOwogCi0gICAgRWxlbWVudCogZWxlbWVudCgpIGNvbnN0IHsg cmV0dXJuIG1fZWxlbWVudDsgfQotCiAgICAgU3RyaW5nIHZhbHVlKCkgY29uc3QgeyByZXR1cm4g bV92YWx1ZTsgfQogICAgIHZvaWQgc2V0VmFsdWUoY29uc3QgU3RyaW5nJiB2YWx1ZSkgeyBtX3Zh bHVlID0gdmFsdWU7IH0KIApAQCAtNjcsNyArNjMsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRT ZWxlY3RlZChib29sIHNlbGVjdGVkKSB7IG1fc2VsZWN0ZWQgPSBzZWxlY3RlZDsgfQogCiBwcml2 YXRlOgotICAgIEVsZW1lbnQqIG1fZWxlbWVudDsKICAgICBTdHJpbmcgbV92YWx1ZTsKICAgICBT dHJpbmcgbV9sYWJlbDsKICAgICBib29sIG1fc2VsZWN0ZWQ7CkluZGV4OiBodG1sL0hUTUxPcHRp b25FbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBodG1sL0hUTUxPcHRpb25FbGVtZW50LmNwcAko cmV2aXNpb24gNDQxNjIpCisrKyBodG1sL0hUTUxPcHRpb25FbGVtZW50LmNwcAkod29ya2luZyBj b3B5KQpAQCAtNDMsNyArNDMsNiBAQCB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVzOwogCiBIVE1M T3B0aW9uRWxlbWVudDo6SFRNTE9wdGlvbkVsZW1lbnQoY29uc3QgUXVhbGlmaWVkTmFtZSYgdGFn TmFtZSwgRG9jdW1lbnQqIGRvYywgSFRNTEZvcm1FbGVtZW50KiBmKQogICAgIDogSFRNTEZvcm1D b250cm9sRWxlbWVudCh0YWdOYW1lLCBkb2MsIGYpCi0gICAgLCBtX2RhdGEodGhpcykKICAgICAs IG1fc3R5bGUoMCkKIHsKICAgICBBU1NFUlQoaGFzVGFnTmFtZShvcHRpb25UYWcpKTsKQEAgLTgw LDcgKzc5LDcgQEAgY29uc3QgQXRvbWljU3RyaW5nJiBIVE1MT3B0aW9uRWxlbWVudDo6ZgogCiBT dHJpbmcgSFRNTE9wdGlvbkVsZW1lbnQ6OnRleHQoKSBjb25zdAogewotICAgIHJldHVybiBPcHRp b25FbGVtZW50Ojpjb2xsZWN0T3B0aW9uVGV4dChtX2RhdGEsIGRvY3VtZW50KCkpOworICAgIHJl dHVybiBPcHRpb25FbGVtZW50Ojpjb2xsZWN0T3B0aW9uVGV4dChtX2RhdGEsIHRoaXMpOwogfQog CiB2b2lkIEhUTUxPcHRpb25FbGVtZW50OjpzZXRUZXh0KGNvbnN0IFN0cmluZyAmdGV4dCwgRXhj ZXB0aW9uQ29kZSYgZWMpCkBAIC0xMzcsNyArMTM2LDcgQEAgdm9pZCBIVE1MT3B0aW9uRWxlbWVu dDo6cGFyc2VNYXBwZWRBdHRyaQogCiBTdHJpbmcgSFRNTE9wdGlvbkVsZW1lbnQ6OnZhbHVlKCkg Y29uc3QKIHsKLSAgICByZXR1cm4gT3B0aW9uRWxlbWVudDo6Y29sbGVjdE9wdGlvblZhbHVlKG1f ZGF0YSwgZG9jdW1lbnQoKSk7CisgICAgcmV0dXJuIE9wdGlvbkVsZW1lbnQ6OmNvbGxlY3RPcHRp b25WYWx1ZShtX2RhdGEsIHRoaXMpOwogfQogCiB2b2lkIEhUTUxPcHRpb25FbGVtZW50OjpzZXRW YWx1ZShjb25zdCBTdHJpbmcmIHZhbHVlKQpAQCAtMTU1LDcgKzE1NCw3IEBAIHZvaWQgSFRNTE9w dGlvbkVsZW1lbnQ6OnNldFNlbGVjdGVkKGJvb2wKICAgICBpZiAobV9kYXRhLnNlbGVjdGVkKCkg PT0gc2VsZWN0ZWQpCiAgICAgICAgIHJldHVybjsKIAotICAgIE9wdGlvbkVsZW1lbnQ6OnNldFNl bGVjdGVkU3RhdGUobV9kYXRhLCBzZWxlY3RlZCk7CisgICAgT3B0aW9uRWxlbWVudDo6c2V0U2Vs ZWN0ZWRTdGF0ZShtX2RhdGEsIHRoaXMsIHNlbGVjdGVkKTsKIAogICAgIGlmIChIVE1MU2VsZWN0 RWxlbWVudCogc2VsZWN0ID0gb3duZXJTZWxlY3RFbGVtZW50KCkpCiAgICAgICAgIHNlbGVjdC0+ c2V0U2VsZWN0ZWRJbmRleChzZWxlY3RlZCA/IGluZGV4KCkgOiAtMSwgZmFsc2UpOwpAQCAtMTYz LDcgKzE2Miw3IEBAIHZvaWQgSFRNTE9wdGlvbkVsZW1lbnQ6OnNldFNlbGVjdGVkKGJvb2wKIAog dm9pZCBIVE1MT3B0aW9uRWxlbWVudDo6c2V0U2VsZWN0ZWRTdGF0ZShib29sIHNlbGVjdGVkKQog ewotICAgIE9wdGlvbkVsZW1lbnQ6OnNldFNlbGVjdGVkU3RhdGUobV9kYXRhLCBzZWxlY3RlZCk7 CisgICAgT3B0aW9uRWxlbWVudDo6c2V0U2VsZWN0ZWRTdGF0ZShtX2RhdGEsIHRoaXMsIHNlbGVj dGVkKTsKIH0KIAogdm9pZCBIVE1MT3B0aW9uRWxlbWVudDo6Y2hpbGRyZW5DaGFuZ2VkKGJvb2wg Y2hhbmdlZEJ5UGFyc2VyLCBOb2RlKiBiZWZvcmVDaGFuZ2UsIE5vZGUqIGFmdGVyQ2hhbmdlLCBp bnQgY2hpbGRDb3VudERlbHRhKQpAQCAtMjE4LDcgKzIxNyw3IEBAIFJlbmRlclN0eWxlKiBIVE1M T3B0aW9uRWxlbWVudDo6bm9uUmVuZGUKIAogU3RyaW5nIEhUTUxPcHRpb25FbGVtZW50Ojp0ZXh0 SW5kZW50ZWRUb1Jlc3BlY3RHcm91cExhYmVsKCkgY29uc3QKIHsKLSAgICByZXR1cm4gT3B0aW9u RWxlbWVudDo6Y29sbGVjdE9wdGlvblRleHRSZXNwZWN0aW5nR3JvdXBMYWJlbChtX2RhdGEsIGRv Y3VtZW50KCkpOworICAgIHJldHVybiBPcHRpb25FbGVtZW50Ojpjb2xsZWN0T3B0aW9uVGV4dFJl c3BlY3RpbmdHcm91cExhYmVsKG1fZGF0YSwgdGhpcyk7CiB9CiAKIGJvb2wgSFRNTE9wdGlvbkVs ZW1lbnQ6OmRpc2FibGVkKCkgY29uc3QK