55083 2011-02-23 14:14:02 -0800 SegmentedString does not need an m_composite member 2011-02-24 08:57:52 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric eric abarth aroben commit-queue eric yurys oldest_to_newest 356410 0 eric 2011-02-23 14:14:02 -0800 SegmentedString does not need an m_composite member 356413 1 83548 eric 2011-02-23 14:15:32 -0800 Created attachment 83548 Patch 356414 2 eric 2011-02-23 14:16:05 -0800 I ran at least the parser perf tests and saw no change. I would not expect any perf or functional difference from this change. 357035 3 83548 commit-queue 2011-02-24 08:44:48 -0800 Comment on attachment 83548 Patch Clearing flags on attachment: 83548 Committed r79572: <http://trac.webkit.org/changeset/79572> 357036 4 commit-queue 2011-02-24 08:44:54 -0800 All reviewed patches have been landed. Closing bug. 357047 5 aroben 2011-02-24 08:57:18 -0800 Committed r79572: <http://trac.webkit.org/changeset/79572> 357048 6 aroben 2011-02-24 08:57:52 -0800 (In reply to comment #5) > Committed r79572: <http://trac.webkit.org/changeset/79572> Whoops, got a little trigger-happy with webkit-patch mark-bug-fixed. Please disregard. 83548 2011-02-23 14:15:32 -0800 2011-02-24 08:44:48 -0800 Patch bug-55083-20110223141530.patch text/plain 10725 eric U3VidmVyc2lvbiBSZXZpc2lvbjogNzk0NzkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3NDRlOGYwYzYwMGVhYWVj ZTdkZDAzY2M1ZTMzMWI4MWY5NWEwMDI5Li4wNzcxMDI2YWQ3NTUyOGYyMzlmZGQzOTA3Y2JmYmQz ZTZjYjg1YTA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTEtMDItMjMgIEVyaWMg U2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFNlZ21lbnRlZFN0cmluZyBkb2VzIG5vdCBuZWVkIGFuIG1fY29t cG9zaXRlIG1lbWJlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NTUwODMKKworICAgICAgICBTdG9yaW5nIG1fY29tcG9zaXRlIGFzIGRpc3RpbmN0IGZy b20gbV9zdWJzdHJpbmdzLmlzRW1wdHkoKQorICAgICAgICB3YXMganVzdCBlcnJvciBwcm9uZSBh bmQgZXZlbnR1YWxseSBnb2luZyB0byBnZXQgdXMgaW4gdHJvdWJsZS4KKworICAgICAgICBJIGFs c28gY2xlYW5lZCB1cCBzb21lIG9mIHRoZSBzdHlsZSBpbiBTZWdlbWVudGVkU3RyaW5nLioKKyAg ICAgICAgc2luY2UgdGhpcyBmaWxlIGxvbmcgcHJlZGF0ZXMgY2hlY2std2Via2l0LXN0eWxlLgor CisgICAgICAgICogcGxhdGZvcm0vdGV4dC9TZWdtZW50ZWRTdHJpbmcuY3BwOgorICAgICAgICAo V2ViQ29yZTo6U2VnbWVudGVkU3RyaW5nOjpTZWdtZW50ZWRTdHJpbmcpOgorICAgICAgICAoV2Vi Q29yZTo6U2VnbWVudGVkU3RyaW5nOjpvcGVyYXRvcj0pOgorICAgICAgICAoV2ViQ29yZTo6U2Vn bWVudGVkU3RyaW5nOjpsZW5ndGgpOgorICAgICAgICAoV2ViQ29yZTo6U2VnbWVudGVkU3RyaW5n OjpzZXRFeGNsdWRlTGluZU51bWJlcnMpOgorICAgICAgICAoV2ViQ29yZTo6U2VnbWVudGVkU3Ry aW5nOjpjbGVhcik6CisgICAgICAgIChXZWJDb3JlOjpTZWdtZW50ZWRTdHJpbmc6OmFwcGVuZCk6 CisgICAgICAgIChXZWJDb3JlOjpTZWdtZW50ZWRTdHJpbmc6OnByZXBlbmQpOgorICAgICAgICAo V2ViQ29yZTo6U2VnbWVudGVkU3RyaW5nOjphZHZhbmNlU3Vic3RyaW5nKToKKyAgICAgICAgKFdl YkNvcmU6OlNlZ21lbnRlZFN0cmluZzo6dG9TdHJpbmcpOgorICAgICAgICAqIHBsYXRmb3JtL3Rl eHQvU2VnbWVudGVkU3RyaW5nLmg6CisgICAgICAgIChXZWJDb3JlOjpTZWdtZW50ZWRTdWJzdHJp bmc6OlNlZ21lbnRlZFN1YnN0cmluZyk6CisgICAgICAgIChXZWJDb3JlOjpTZWdtZW50ZWRTdWJz dHJpbmc6OmFwcGVuZFRvKToKKyAgICAgICAgKFdlYkNvcmU6OlNlZ21lbnRlZFN0cmluZzo6U2Vn bWVudGVkU3RyaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OlNlZ21lbnRlZFN0cmluZzo6aXNDb21w b3NpdGUpOgorCiAyMDExLTAyLTIzICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZXZpZXdlZCBieSBBbGV4ZXkgUHJvc2t1cnlha292LgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9TZWdtZW50ZWRTdHJpbmcuY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vdGV4dC9TZWdtZW50ZWRTdHJpbmcuY3BwCmluZGV4IDdjODU5ZGM2OGFi NzVhMjJjZjRhMjQ0MzUyNTFhOWJmMmQ3ZGZiZjcuLjE1MTVmZThjYWRhNTMwNDVkOWExMWJkNTVj NmI3N2U2YjRlNDJhMjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQv U2VnbWVudGVkU3RyaW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L1Nl Z21lbnRlZFN0cmluZy5jcHAKQEAgLTIyLDEyICsyMiwxMSBAQAogCiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKLVNlZ21lbnRlZFN0cmluZzo6U2VnbWVudGVkU3RyaW5nKGNvbnN0IFNlZ21lbnRlZFN0 cmluZyAmb3RoZXIpCitTZWdtZW50ZWRTdHJpbmc6OlNlZ21lbnRlZFN0cmluZyhjb25zdCBTZWdt ZW50ZWRTdHJpbmcmIG90aGVyKQogICAgIDogbV9wdXNoZWRDaGFyMShvdGhlci5tX3B1c2hlZENo YXIxKQogICAgICwgbV9wdXNoZWRDaGFyMihvdGhlci5tX3B1c2hlZENoYXIyKQogICAgICwgbV9j dXJyZW50U3RyaW5nKG90aGVyLm1fY3VycmVudFN0cmluZykKICAgICAsIG1fc3Vic3RyaW5ncyhv dGhlci5tX3N1YnN0cmluZ3MpCi0gICAgLCBtX2NvbXBvc2l0ZShvdGhlci5tX2NvbXBvc2l0ZSkK ICAgICAsIG1fY2xvc2VkKG90aGVyLm1fY2xvc2VkKQogewogICAgIGlmIChvdGhlci5tX2N1cnJl bnRDaGFyID09ICZvdGhlci5tX3B1c2hlZENoYXIxKQpAQCAtMzgsMTMgKzM3LDEyIEBAIFNlZ21l bnRlZFN0cmluZzo6U2VnbWVudGVkU3RyaW5nKGNvbnN0IFNlZ21lbnRlZFN0cmluZyAmb3RoZXIp CiAgICAgICAgIG1fY3VycmVudENoYXIgPSBvdGhlci5tX2N1cnJlbnRDaGFyOwogfQogCi1jb25z dCBTZWdtZW50ZWRTdHJpbmcmIFNlZ21lbnRlZFN0cmluZzo6b3BlcmF0b3I9KGNvbnN0IFNlZ21l bnRlZFN0cmluZyAmb3RoZXIpCitjb25zdCBTZWdtZW50ZWRTdHJpbmcmIFNlZ21lbnRlZFN0cmlu Zzo6b3BlcmF0b3I9KGNvbnN0IFNlZ21lbnRlZFN0cmluZyYgb3RoZXIpCiB7CiAgICAgbV9wdXNo ZWRDaGFyMSA9IG90aGVyLm1fcHVzaGVkQ2hhcjE7CiAgICAgbV9wdXNoZWRDaGFyMiA9IG90aGVy Lm1fcHVzaGVkQ2hhcjI7CiAgICAgbV9jdXJyZW50U3RyaW5nID0gb3RoZXIubV9jdXJyZW50U3Ry aW5nOwogICAgIG1fc3Vic3RyaW5ncyA9IG90aGVyLm1fc3Vic3RyaW5nczsKLSAgICBtX2NvbXBv c2l0ZSA9IG90aGVyLm1fY29tcG9zaXRlOwogICAgIGlmIChvdGhlci5tX2N1cnJlbnRDaGFyID09 ICZvdGhlci5tX3B1c2hlZENoYXIxKQogICAgICAgICBtX2N1cnJlbnRDaGFyID0gJm1fcHVzaGVk Q2hhcjE7CiAgICAgZWxzZSBpZiAob3RoZXIubV9jdXJyZW50Q2hhciA9PSAmb3RoZXIubV9wdXNo ZWRDaGFyMikKQEAgLTY3LDcgKzY1LDcgQEAgdW5zaWduZWQgU2VnbWVudGVkU3RyaW5nOjpsZW5n dGgoKSBjb25zdAogICAgICAgICBpZiAobV9wdXNoZWRDaGFyMikKICAgICAgICAgICAgICsrbGVu Z3RoOwogICAgIH0KLSAgICBpZiAobV9jb21wb3NpdGUpIHsKKyAgICBpZiAoaXNDb21wb3NpdGUo KSkgewogICAgICAgICBEZXF1ZTxTZWdtZW50ZWRTdWJzdHJpbmc+Ojpjb25zdF9pdGVyYXRvciBp dCA9IG1fc3Vic3RyaW5ncy5iZWdpbigpOwogICAgICAgICBEZXF1ZTxTZWdtZW50ZWRTdWJzdHJp bmc+Ojpjb25zdF9pdGVyYXRvciBlID0gbV9zdWJzdHJpbmdzLmVuZCgpOwogICAgICAgICBmb3Ig KDsgaXQgIT0gZTsgKytpdCkKQEAgLTc5LDcgKzc3LDcgQEAgdW5zaWduZWQgU2VnbWVudGVkU3Ry aW5nOjpsZW5ndGgoKSBjb25zdAogdm9pZCBTZWdtZW50ZWRTdHJpbmc6OnNldEV4Y2x1ZGVMaW5l TnVtYmVycygpCiB7CiAgICAgbV9jdXJyZW50U3RyaW5nLnNldEV4Y2x1ZGVMaW5lTnVtYmVycygp OwotICAgIGlmIChtX2NvbXBvc2l0ZSkgeworICAgIGlmIChpc0NvbXBvc2l0ZSgpKSB7CiAgICAg ICAgIERlcXVlPFNlZ21lbnRlZFN1YnN0cmluZz46Oml0ZXJhdG9yIGl0ID0gbV9zdWJzdHJpbmdz LmJlZ2luKCk7CiAgICAgICAgIERlcXVlPFNlZ21lbnRlZFN1YnN0cmluZz46Oml0ZXJhdG9yIGUg PSBtX3N1YnN0cmluZ3MuZW5kKCk7CiAgICAgICAgIGZvciAoOyBpdCAhPSBlOyArK2l0KQpAQCAt OTQsNDQgKzkyLDQyIEBAIHZvaWQgU2VnbWVudGVkU3RyaW5nOjpjbGVhcigpCiAgICAgbV9jdXJy ZW50Q2hhciA9IDA7CiAgICAgbV9jdXJyZW50U3RyaW5nLmNsZWFyKCk7CiAgICAgbV9zdWJzdHJp bmdzLmNsZWFyKCk7Ci0gICAgbV9jb21wb3NpdGUgPSBmYWxzZTsKICAgICBtX2Nsb3NlZCA9IGZh bHNlOwogfQogCi12b2lkIFNlZ21lbnRlZFN0cmluZzo6YXBwZW5kKGNvbnN0IFNlZ21lbnRlZFN1 YnN0cmluZyAmcykKK3ZvaWQgU2VnbWVudGVkU3RyaW5nOjphcHBlbmQoY29uc3QgU2VnbWVudGVk U3Vic3RyaW5nJiBzKQogewogICAgIEFTU0VSVCghbV9jbG9zZWQpOwotICAgIGlmIChzLm1fbGVu Z3RoKSB7Ci0gICAgICAgIGlmICghbV9jdXJyZW50U3RyaW5nLm1fbGVuZ3RoKSB7Ci0gICAgICAg ICAgICBtX251bWJlck9mQ2hhcmFjdGVyc0NvbnN1bWVkUHJpb3JUb0N1cnJlbnRTdHJpbmcgKz0g bV9jdXJyZW50U3RyaW5nLm51bWJlck9mQ2hhcmFjdGVyc0NvbnN1bWVkKCk7Ci0gICAgICAgICAg ICBtX2N1cnJlbnRTdHJpbmcgPSBzOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgbV9z dWJzdHJpbmdzLmFwcGVuZChzKTsKLSAgICAgICAgICAgIG1fY29tcG9zaXRlID0gdHJ1ZTsKLSAg ICAgICAgfQotICAgIH0KKyAgICBpZiAoIXMubV9sZW5ndGgpCisgICAgICAgIHJldHVybjsKKwor ICAgIGlmICghbV9jdXJyZW50U3RyaW5nLm1fbGVuZ3RoKSB7CisgICAgICAgIG1fbnVtYmVyT2ZD aGFyYWN0ZXJzQ29uc3VtZWRQcmlvclRvQ3VycmVudFN0cmluZyArPSBtX2N1cnJlbnRTdHJpbmcu bnVtYmVyT2ZDaGFyYWN0ZXJzQ29uc3VtZWQoKTsKKyAgICAgICAgbV9jdXJyZW50U3RyaW5nID0g czsKKyAgICB9IGVsc2UKKyAgICAgICAgbV9zdWJzdHJpbmdzLmFwcGVuZChzKTsKIH0KIAotdm9p ZCBTZWdtZW50ZWRTdHJpbmc6OnByZXBlbmQoY29uc3QgU2VnbWVudGVkU3Vic3RyaW5nICZzKQor dm9pZCBTZWdtZW50ZWRTdHJpbmc6OnByZXBlbmQoY29uc3QgU2VnbWVudGVkU3Vic3RyaW5nJiBz KQogewogICAgIEFTU0VSVCghZXNjYXBlZCgpKTsKICAgICBBU1NFUlQoIXMubnVtYmVyT2ZDaGFy YWN0ZXJzQ29uc3VtZWQoKSk7Ci0gICAgaWYgKHMubV9sZW5ndGgpIHsKLSAgICAgICAgLy8gRklY TUU6IFdlJ3JlIGFzc3VtaW5nIHRoYXQgdGhlIHByZXBlbmQgd2VyZSBvcmlnaW5hbGx5IGNvbnN1 bWVkIGJ5Ci0gICAgICAgIC8vICAgICAgICB0aGlzIFNlZ21lbnRlZFN0cmluZy4gIFdlJ3JlIGFs c28gQVNTRVJUaW5nIHRoYXQgcyBpcyBhIGZyZXNoCi0gICAgICAgIC8vICAgICAgICBTZWdtZW50 ZWRTdWJzdHJpbmcuICBUaGVzZSBhc3N1bXB0aW9ucyBhcmUgc3VmZmljaWVudCBmb3Igb3VyCi0g ICAgICAgIC8vICAgICAgICBjdXJyZW50IHVzZSwgYnV0IHdlIG1pZ2h0IG5lZWQgdG8gaGFuZGxl IHRoZSBtb3JlIGVsYWJvcmF0ZQotICAgICAgICAvLyAgICAgICAgY2FzZXMgaW4gdGhlIGZ1dHVy ZS4KLSAgICAgICAgbV9udW1iZXJPZkNoYXJhY3RlcnNDb25zdW1lZFByaW9yVG9DdXJyZW50U3Ry aW5nICs9IG1fY3VycmVudFN0cmluZy5udW1iZXJPZkNoYXJhY3RlcnNDb25zdW1lZCgpOwotICAg ICAgICBtX251bWJlck9mQ2hhcmFjdGVyc0NvbnN1bWVkUHJpb3JUb0N1cnJlbnRTdHJpbmcgLT0g cy5tX2xlbmd0aDsKLSAgICAgICAgaWYgKCFtX2N1cnJlbnRTdHJpbmcubV9sZW5ndGgpCi0gICAg ICAgICAgICBtX2N1cnJlbnRTdHJpbmcgPSBzOwotICAgICAgICBlbHNlIHsKLSAgICAgICAgICAg IC8vIFNoaWZ0IG91ciBtX2N1cnJlbnRTdHJpbmcgaW50byBvdXIgbGlzdC4KLSAgICAgICAgICAg IG1fc3Vic3RyaW5ncy5wcmVwZW5kKG1fY3VycmVudFN0cmluZyk7Ci0gICAgICAgICAgICBtX2N1 cnJlbnRTdHJpbmcgPSBzOwotICAgICAgICAgICAgbV9jb21wb3NpdGUgPSB0cnVlOwotICAgICAg ICB9CisgICAgaWYgKCFzLm1fbGVuZ3RoKQorICAgICAgICByZXR1cm47CisKKyAgICAvLyBGSVhN RTogV2UncmUgYXNzdW1pbmcgdGhhdCB0aGUgcHJlcGVuZCB3ZXJlIG9yaWdpbmFsbHkgY29uc3Vt ZWQgYnkKKyAgICAvLyAgICAgICAgdGhpcyBTZWdtZW50ZWRTdHJpbmcuICBXZSdyZSBhbHNvIEFT U0VSVGluZyB0aGF0IHMgaXMgYSBmcmVzaAorICAgIC8vICAgICAgICBTZWdtZW50ZWRTdWJzdHJp bmcuICBUaGVzZSBhc3N1bXB0aW9ucyBhcmUgc3VmZmljaWVudCBmb3Igb3VyCisgICAgLy8gICAg ICAgIGN1cnJlbnQgdXNlLCBidXQgd2UgbWlnaHQgbmVlZCB0byBoYW5kbGUgdGhlIG1vcmUgZWxh Ym9yYXRlCisgICAgLy8gICAgICAgIGNhc2VzIGluIHRoZSBmdXR1cmUuCisgICAgbV9udW1iZXJP ZkNoYXJhY3RlcnNDb25zdW1lZFByaW9yVG9DdXJyZW50U3RyaW5nICs9IG1fY3VycmVudFN0cmlu Zy5udW1iZXJPZkNoYXJhY3RlcnNDb25zdW1lZCgpOworICAgIG1fbnVtYmVyT2ZDaGFyYWN0ZXJz Q29uc3VtZWRQcmlvclRvQ3VycmVudFN0cmluZyAtPSBzLm1fbGVuZ3RoOworICAgIGlmICghbV9j dXJyZW50U3RyaW5nLm1fbGVuZ3RoKQorICAgICAgICBtX2N1cnJlbnRTdHJpbmcgPSBzOworICAg IGVsc2UgeworICAgICAgICAvLyBTaGlmdCBvdXIgbV9jdXJyZW50U3RyaW5nIGludG8gb3VyIGxp c3QuCisgICAgICAgIG1fc3Vic3RyaW5ncy5wcmVwZW5kKG1fY3VycmVudFN0cmluZyk7CisgICAg ICAgIG1fY3VycmVudFN0cmluZyA9IHM7CiAgICAgfQogfQogCkBAIC0xNDIsMTIgKzEzOCwxMiBA QCB2b2lkIFNlZ21lbnRlZFN0cmluZzo6Y2xvc2UoKQogICAgIG1fY2xvc2VkID0gdHJ1ZTsKIH0K IAotdm9pZCBTZWdtZW50ZWRTdHJpbmc6OmFwcGVuZChjb25zdCBTZWdtZW50ZWRTdHJpbmcgJnMp Cit2b2lkIFNlZ21lbnRlZFN0cmluZzo6YXBwZW5kKGNvbnN0IFNlZ21lbnRlZFN0cmluZyYgcykK IHsKICAgICBBU1NFUlQoIW1fY2xvc2VkKTsKICAgICBBU1NFUlQoIXMuZXNjYXBlZCgpKTsKICAg ICBhcHBlbmQocy5tX2N1cnJlbnRTdHJpbmcpOwotICAgIGlmIChzLm1fY29tcG9zaXRlKSB7Cisg ICAgaWYgKHMuaXNDb21wb3NpdGUoKSkgewogICAgICAgICBEZXF1ZTxTZWdtZW50ZWRTdWJzdHJp bmc+Ojpjb25zdF9pdGVyYXRvciBpdCA9IHMubV9zdWJzdHJpbmdzLmJlZ2luKCk7CiAgICAgICAg IERlcXVlPFNlZ21lbnRlZFN1YnN0cmluZz46OmNvbnN0X2l0ZXJhdG9yIGUgPSBzLm1fc3Vic3Ry aW5ncy5lbmQoKTsKICAgICAgICAgZm9yICg7IGl0ICE9IGU7ICsraXQpCkBAIC0xNTYsMTEgKzE1 MiwxMSBAQCB2b2lkIFNlZ21lbnRlZFN0cmluZzo6YXBwZW5kKGNvbnN0IFNlZ21lbnRlZFN0cmlu ZyAmcykKICAgICBtX2N1cnJlbnRDaGFyID0gbV9wdXNoZWRDaGFyMSA/ICZtX3B1c2hlZENoYXIx IDogbV9jdXJyZW50U3RyaW5nLm1fY3VycmVudDsKIH0KIAotdm9pZCBTZWdtZW50ZWRTdHJpbmc6 OnByZXBlbmQoY29uc3QgU2VnbWVudGVkU3RyaW5nICZzKQordm9pZCBTZWdtZW50ZWRTdHJpbmc6 OnByZXBlbmQoY29uc3QgU2VnbWVudGVkU3RyaW5nJiBzKQogewogICAgIEFTU0VSVCghZXNjYXBl ZCgpKTsKICAgICBBU1NFUlQoIXMuZXNjYXBlZCgpKTsKLSAgICBpZiAocy5tX2NvbXBvc2l0ZSkg eworICAgIGlmIChzLmlzQ29tcG9zaXRlKCkpIHsKICAgICAgICAgRGVxdWU8U2VnbWVudGVkU3Vi c3RyaW5nPjo6Y29uc3RfcmV2ZXJzZV9pdGVyYXRvciBpdCA9IHMubV9zdWJzdHJpbmdzLnJiZWdp bigpOwogICAgICAgICBEZXF1ZTxTZWdtZW50ZWRTdWJzdHJpbmc+Ojpjb25zdF9yZXZlcnNlX2l0 ZXJhdG9yIGUgPSBzLm1fc3Vic3RyaW5ncy5yZW5kKCk7CiAgICAgICAgIGZvciAoOyBpdCAhPSBl OyArK2l0KQpAQCAtMTcyLDE4ICsxNjgsMTUgQEAgdm9pZCBTZWdtZW50ZWRTdHJpbmc6OnByZXBl bmQoY29uc3QgU2VnbWVudGVkU3RyaW5nICZzKQogCiB2b2lkIFNlZ21lbnRlZFN0cmluZzo6YWR2 YW5jZVN1YnN0cmluZygpCiB7Ci0gICAgaWYgKG1fY29tcG9zaXRlKSB7CisgICAgaWYgKGlzQ29t cG9zaXRlKCkpIHsKICAgICAgICAgbV9udW1iZXJPZkNoYXJhY3RlcnNDb25zdW1lZFByaW9yVG9D dXJyZW50U3RyaW5nICs9IG1fY3VycmVudFN0cmluZy5udW1iZXJPZkNoYXJhY3RlcnNDb25zdW1l ZCgpOwogICAgICAgICBtX2N1cnJlbnRTdHJpbmcgPSBtX3N1YnN0cmluZ3MudGFrZUZpcnN0KCk7 CiAgICAgICAgIC8vIElmIHdlJ3ZlIHByZXZpb3VzbHkgY29uc3VtZWQgc29tZSBjaGFyYWN0ZXJz IG9mIHRoZSBub24tY3VycmVudAogICAgICAgICAvLyBzdHJpbmcsIHdlIG5vdyBhY2NvdW50IGZv ciB0aG9zZSBjaGFyYWN0ZXJzIGFzIHBhcnQgb2YgdGhlIGN1cnJlbnQKICAgICAgICAgLy8gc3Ry aW5nLCBub3QgYXMgcGFydCBvZiAicHJpb3IgdG8gY3VycmVudCBzdHJpbmcuIgogICAgICAgICBt X251bWJlck9mQ2hhcmFjdGVyc0NvbnN1bWVkUHJpb3JUb0N1cnJlbnRTdHJpbmcgLT0gbV9jdXJy ZW50U3RyaW5nLm51bWJlck9mQ2hhcmFjdGVyc0NvbnN1bWVkKCk7Ci0gICAgICAgIGlmIChtX3N1 YnN0cmluZ3MuaXNFbXB0eSgpKQotICAgICAgICAgICAgbV9jb21wb3NpdGUgPSBmYWxzZTsKLSAg ICB9IGVsc2UgeworICAgIH0gZWxzZQogICAgICAgICBtX2N1cnJlbnRTdHJpbmcuY2xlYXIoKTsK LSAgICB9CiB9CiAKIFN0cmluZyBTZWdtZW50ZWRTdHJpbmc6OnRvU3RyaW5nKCkgY29uc3QKQEAg LTE5NSw3ICsxODgsNyBAQCBTdHJpbmcgU2VnbWVudGVkU3RyaW5nOjp0b1N0cmluZygpIGNvbnN0 CiAgICAgICAgICAgICByZXN1bHQuYXBwZW5kKG1fcHVzaGVkQ2hhcjIpOwogICAgIH0KICAgICBt X2N1cnJlbnRTdHJpbmcuYXBwZW5kVG8ocmVzdWx0KTsKLSAgICBpZiAobV9jb21wb3NpdGUpIHsK KyAgICBpZiAoaXNDb21wb3NpdGUoKSkgewogICAgICAgICBEZXF1ZTxTZWdtZW50ZWRTdWJzdHJp bmc+Ojpjb25zdF9pdGVyYXRvciBpdCA9IG1fc3Vic3RyaW5ncy5iZWdpbigpOwogICAgICAgICBE ZXF1ZTxTZWdtZW50ZWRTdWJzdHJpbmc+Ojpjb25zdF9pdGVyYXRvciBlID0gbV9zdWJzdHJpbmdz LmVuZCgpOwogICAgICAgICBmb3IgKDsgaXQgIT0gZTsgKytpdCkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvU2VnbWVudGVkU3RyaW5nLmggYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS90ZXh0L1NlZ21lbnRlZFN0cmluZy5oCmluZGV4IDM3ODRiNTA3Njc4NWU5OTFk YmM2MjE5MjcwYzM0ZTExNjFmNDFlZjcuLjQ4MzExNjZmYTE0YzQxNzRlMjFhYmMyZmNjZGY5MjVm NTg2MjJjYjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvU2VnbWVu dGVkU3RyaW5nLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9TZWdtZW50ZWRT dHJpbmcuaApAQCAtMzAsNyArMzAsMTMgQEAgY2xhc3MgU2VnbWVudGVkU3RyaW5nOwogCiBjbGFz cyBTZWdtZW50ZWRTdWJzdHJpbmcgewogcHVibGljOgotICAgIFNlZ21lbnRlZFN1YnN0cmluZygp IDogbV9sZW5ndGgoMCksIG1fY3VycmVudCgwKSwgbV9kb05vdEV4Y2x1ZGVMaW5lTnVtYmVycyh0 cnVlKSB7fQorICAgIFNlZ21lbnRlZFN1YnN0cmluZygpCisgICAgICAgIDogbV9sZW5ndGgoMCkK KyAgICAgICAgLCBtX2N1cnJlbnQoMCkKKyAgICAgICAgLCBtX2RvTm90RXhjbHVkZUxpbmVOdW1i ZXJzKHRydWUpCisgICAgeworICAgIH0KKwogICAgIFNlZ21lbnRlZFN1YnN0cmluZyhjb25zdCBT dHJpbmcmIHN0cikKICAgICAgICAgOiBtX2xlbmd0aChzdHIubGVuZ3RoKCkpCiAgICAgICAgICwg bV9jdXJyZW50KHN0ci5pc0VtcHR5KCkgPyAwIDogc3RyLmNoYXJhY3RlcnMoKSkKQEAgLTU1LDkg KzYxLDggQEAgcHVibGljOgogICAgICAgICAgICAgICAgIHN0ciA9IG1fc3RyaW5nOwogICAgICAg ICAgICAgZWxzZQogICAgICAgICAgICAgICAgIHN0ci5hcHBlbmQobV9zdHJpbmcpOwotICAgICAg ICB9IGVsc2UgeworICAgICAgICB9IGVsc2UKICAgICAgICAgICAgIHN0ci5hcHBlbmQoU3RyaW5n KG1fY3VycmVudCwgbV9sZW5ndGgpKTsKLSAgICAgICAgfQogICAgIH0KIAogcHVibGljOgpAQCAt NzgsNyArODMsNiBAQCBwdWJsaWM6CiAgICAgICAgICwgbV9udW1iZXJPZkNoYXJhY3RlcnNDb25z dW1lZFByaW9yVG9DdXJyZW50U3RyaW5nKDApCiAgICAgICAgICwgbV9udW1iZXJPZkNoYXJhY3Rl cnNDb25zdW1lZFByaW9yVG9DdXJyZW50TGluZSgwKQogICAgICAgICAsIG1fY3VycmVudExpbmUo MCkKLSAgICAgICAgLCBtX2NvbXBvc2l0ZShmYWxzZSkKICAgICAgICAgLCBtX2Nsb3NlZChmYWxz ZSkKICAgICB7CiAgICAgfQpAQCAtOTEsNyArOTUsNiBAQCBwdWJsaWM6CiAgICAgICAgICwgbV9u dW1iZXJPZkNoYXJhY3RlcnNDb25zdW1lZFByaW9yVG9DdXJyZW50U3RyaW5nKDApCiAgICAgICAg ICwgbV9udW1iZXJPZkNoYXJhY3RlcnNDb25zdW1lZFByaW9yVG9DdXJyZW50TGluZSgwKQogICAg ICAgICAsIG1fY3VycmVudExpbmUoMCkKLSAgICAgICAgLCBtX2NvbXBvc2l0ZShmYWxzZSkKICAg ICAgICAgLCBtX2Nsb3NlZChmYWxzZSkKICAgICB7CiAgICAgfQpAQCAtMjY3LDYgKzI3MCw4IEBA IHByaXZhdGU6CiAgICAgICAgIHJldHVybiByZXN1bHQ7CiAgICAgfQogCisgICAgYm9vbCBpc0Nv bXBvc2l0ZSgpIGNvbnN0IHsgcmV0dXJuICFtX3N1YnN0cmluZ3MuaXNFbXB0eSgpOyB9CisKICAg ICBVQ2hhciBtX3B1c2hlZENoYXIxOwogICAgIFVDaGFyIG1fcHVzaGVkQ2hhcjI7CiAgICAgU2Vn bWVudGVkU3Vic3RyaW5nIG1fY3VycmVudFN0cmluZzsKQEAgLTI3NSw3ICsyODAsNiBAQCBwcml2 YXRlOgogICAgIGludCBtX251bWJlck9mQ2hhcmFjdGVyc0NvbnN1bWVkUHJpb3JUb0N1cnJlbnRM aW5lOwogICAgIGludCBtX2N1cnJlbnRMaW5lOwogICAgIERlcXVlPFNlZ21lbnRlZFN1YnN0cmlu Zz4gbV9zdWJzdHJpbmdzOwotICAgIGJvb2wgbV9jb21wb3NpdGU7CiAgICAgYm9vbCBtX2Nsb3Nl ZDsKIH07CiAK