103002 2012-11-21 18:24:38 -0800 [V8] WebCoreStringResourceBase should be located in V8StringResource.h 2012-11-22 01:29:22 -0800 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 haraken haraken abarth japhet webkit.review.bot oldest_to_newest 773466 0 haraken 2012-11-21 18:24:38 -0800 Currently WebCoreStringResourceBase is mis-located in V8ValueCache.h. It should be in V8StringResource.h. 773468 1 175559 haraken 2012-11-21 18:26:22 -0800 Created attachment 175559 Patch 773621 2 175559 webkit.review.bot 2012-11-21 23:35:51 -0800 Comment on attachment 175559 Patch Clearing flags on attachment: 175559 Committed r135482: <http://trac.webkit.org/changeset/135482> 773622 3 webkit.review.bot 2012-11-21 23:35:54 -0800 All reviewed patches have been landed. Closing bug. 773668 4 haraken 2012-11-22 00:13:53 -0800 Reverted r135482 for reason: It broke Chrome/Linux Debug build Committed r135488: <http://trac.webkit.org/changeset/135488> 773723 5 haraken 2012-11-22 01:29:22 -0800 Committed r135494: <http://trac.webkit.org/changeset/135494> 175559 2012-11-21 18:26:22 -0800 2012-11-21 23:35:50 -0800 Patch bug-103002-20121122112408.patch text/plain 13378 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1NDU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGMzNjY0NjI1NTUwZmI5 MjQ4NjEyNDQ3MGExNzFkNGY5MmFmYjk2OC4uMWRkZDE5YWM1YmFlMzc0ZjM5N2JmOTNkZjY0ZDQ1 ODdjODBiZmIxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEyLTExLTIxICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdIFdlYkNvcmVT dHJpbmdSZXNvdXJjZUJhc2Ugc2hvdWxkIGJlIGxvY2F0ZWQgaW4gVjhTdHJpbmdSZXNvdXJjZS5o CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDMwMDIK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDdXJyZW50 bHkgV2ViQ29yZVN0cmluZ1Jlc291cmNlQmFzZSBpcyBtaXMtbG9jYXRlZCBpbiBWOFZhbHVlQ2Fj aGUuaC4KKyAgICAgICAgSXQgc2hvdWxkIGJlIGluIFY4U3RyaW5nUmVzb3VyY2UuaC4KKworICAg ICAgICBObyB0ZXN0cy4gTm8gY2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAgICAgICogYmluZGlu Z3MvdjgvVjhTdHJpbmdSZXNvdXJjZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJDb3JlU3Ry aW5nUmVzb3VyY2VCYXNlOjp0b1dlYkNvcmVTdHJpbmdSZXNvdXJjZUJhc2UpOgorICAgICAgICAo V2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpXZWJDb3JlU3RyaW5nUmVzb3VyY2VCYXNlOjp2 aXNpdFN0cmluZ3MpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4U3RyaW5nUmVzb3VyY2UuaDoK KyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZVN0cmluZ1Jlc291cmNlQmFzZSk6 CisgICAgICAgIChXZWJDb3JlOjpXZWJDb3JlU3RyaW5nUmVzb3VyY2VCYXNlOjpXZWJDb3JlU3Ry aW5nUmVzb3VyY2VCYXNlKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkNvcmVTdHJpbmdSZXNvdXJj ZUJhc2U6On5XZWJDb3JlU3RyaW5nUmVzb3VyY2VCYXNlKToKKyAgICAgICAgKFdlYkNvcmU6Oldl YkNvcmVTdHJpbmdSZXNvdXJjZUJhc2U6OndlYmNvcmVTdHJpbmcpOgorICAgICAgICAoV2ViQ29y ZTo6V2ViQ29yZVN0cmluZ1Jlc291cmNlQmFzZTo6YXRvbWljU3RyaW5nKToKKyAgICAgICAgKFdl YkNvcmU6OldlYkNvcmVTdHJpbmdSZXNvdXJjZUJhc2U6Om1lbW9yeUNvbnN1bXB0aW9uKToKKyAg ICAgICAgKFdlYkNvcmVTdHJpbmdSZXNvdXJjZTE2KToKKyAgICAgICAgKFdlYkNvcmU6OldlYkNv cmVTdHJpbmdSZXNvdXJjZTE2OjpXZWJDb3JlU3RyaW5nUmVzb3VyY2UxNik6CisgICAgICAgIChX ZWJDb3JlU3RyaW5nUmVzb3VyY2U4KToKKyAgICAgICAgKFdlYkNvcmU6OldlYkNvcmVTdHJpbmdS ZXNvdXJjZTg6OldlYkNvcmVTdHJpbmdSZXNvdXJjZTgpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4 L1Y4VmFsdWVDYWNoZS5jcHA6CisgICAgICAgICogYmluZGluZ3MvdjgvVjhWYWx1ZUNhY2hlLmg6 CisgICAgICAgIChXZWJDb3JlKToKKwogMjAxMi0xMS0yMSAgSGFqaW1lIE1vcnJpdGEgIDxtb3Jy aXRhQGdvb2dsZS5jb20+CiAKICAgICAgICAgW1NoYWRvdyBET01dW1Y4XSBBc3NlcnRpb24gZmFp bHVyZSB3aGVuIHNoYWRvdyBob3N0IGlzIHJlY2xhaW1lZCBiZWZvcmUgU2hhZG93Um9vdApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhTdHJpbmdSZXNvdXJjZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFN0cmluZ1Jlc291cmNlLmNwcAppbmRleCBh YTIyMDQ4MmU2YjIxYmJiMWZjNzA4NGFlOTk0M2NjZTIzOTQzODQwLi4zNzEzOTFkMmI5NThjOWNh NzhkYTdmZDM2ZTgwNGM1NzYxNjhmNDk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy92OC9WOFN0cmluZ1Jlc291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy92OC9WOFN0cmluZ1Jlc291cmNlLmNwcApAQCAtMjYsMTAgKzI2LDI5IEBACiAjaW5jbHVkZSAi Y29uZmlnLmgiCiAjaW5jbHVkZSAiVjhTdHJpbmdSZXNvdXJjZS5oIgogCisjaW5jbHVkZSAiQmlu ZGluZ1Zpc2l0b3JzLmgiCiAjaW5jbHVkZSAiVjhCaW5kaW5nLmgiCiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAorV2ViQ29yZVN0cmluZ1Jlc291cmNlQmFzZSogV2ViQ29yZVN0cmluZ1Jlc291cmNl QmFzZTo6dG9XZWJDb3JlU3RyaW5nUmVzb3VyY2VCYXNlKHY4OjpIYW5kbGU8djg6OlN0cmluZz4g c3RyaW5nKQoreworICAgIHY4OjpTdHJpbmc6OkVuY29kaW5nIGVuY29kaW5nOworICAgIHY4OjpT dHJpbmc6OkV4dGVybmFsU3RyaW5nUmVzb3VyY2VCYXNlKiByZXNvdXJjZSA9IHN0cmluZy0+R2V0 RXh0ZXJuYWxTdHJpbmdSZXNvdXJjZUJhc2UoJmVuY29kaW5nKTsKKyAgICBpZiAoIXJlc291cmNl KQorICAgICAgICByZXR1cm4gMDsKKyAgICBpZiAoZW5jb2RpbmcgPT0gdjg6OlN0cmluZzo6QVND SUlfRU5DT0RJTkcpCisgICAgICAgIHJldHVybiBzdGF0aWNfY2FzdDxXZWJDb3JlU3RyaW5nUmVz b3VyY2U4Kj4ocmVzb3VyY2UpOworICAgIHJldHVybiBzdGF0aWNfY2FzdDxXZWJDb3JlU3RyaW5n UmVzb3VyY2UxNio+KHJlc291cmNlKTsKK30KKwordm9pZCBXZWJDb3JlU3RyaW5nUmVzb3VyY2VC YXNlOjp2aXNpdFN0cmluZ3MoRXh0ZXJuYWxTdHJpbmdWaXNpdG9yKiB2aXNpdG9yKQoreworICAg IHZpc2l0b3ItPnZpc2l0SlNFeHRlcm5hbFN0cmluZyhtX3BsYWluU3RyaW5nLmltcGwoKSk7Cisg ICAgaWYgKG1fcGxhaW5TdHJpbmcuaW1wbCgpICE9IG1fYXRvbWljU3RyaW5nLmltcGwoKSAmJiAh bV9hdG9taWNTdHJpbmcuaXNOdWxsKCkpCisgICAgICAgIHZpc2l0b3ItPnZpc2l0SlNFeHRlcm5h bFN0cmluZyhtX2F0b21pY1N0cmluZy5pbXBsKCkpOworfQorCiB0ZW1wbGF0ZTxjbGFzcyBTdHJp bmdDbGFzcz4gc3RydWN0IFN0cmluZ1RyYWl0cyB7CiAgICAgc3RhdGljIGNvbnN0IFN0cmluZ0Ns YXNzJiBmcm9tU3RyaW5nUmVzb3VyY2UoV2ViQ29yZVN0cmluZ1Jlc291cmNlQmFzZSopOwogICAg IHN0YXRpYyBib29sIGlzMTZCaXRBdG9taWNTdHJpbmcoU3RyaW5nQ2xhc3MmKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4U3RyaW5nUmVzb3VyY2UuaCBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4U3RyaW5nUmVzb3VyY2UuaAppbmRleCAxYTcwN2RiNjI4 Nzg4ZDIzZWM5YmYyYzU1MzU2MzU1ODJkODQxY2Q2Li44YTJiOGY2ZGE2ZjAwZGMyODM1YmFhZGU4 N2IyMDIxYzcyOTJlNjczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9W OFN0cmluZ1Jlc291cmNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhTdHJp bmdSZXNvdXJjZS5oCkBAIC0zMiw2ICszMiwxMDggQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewog CitjbGFzcyBFeHRlcm5hbFN0cmluZ1Zpc2l0b3I7CisKKy8vIFdlYkNvcmVTdHJpbmdSZXNvdXJj ZSBpcyBhIGhlbHBlciBjbGFzcyBmb3IgdjhFeHRlcm5hbFN0cmluZy4gSXQgaXMgdXNlZAorLy8g dG8gbWFuYWdlIHRoZSBsaWZlLWN5Y2xlIG9mIHRoZSB1bmRlcmx5aW5nIGJ1ZmZlciBvZiB0aGUg ZXh0ZXJuYWwgc3RyaW5nLgorY2xhc3MgV2ViQ29yZVN0cmluZ1Jlc291cmNlQmFzZSB7CitwdWJs aWM6CisgICAgc3RhdGljIFdlYkNvcmVTdHJpbmdSZXNvdXJjZUJhc2UqIHRvV2ViQ29yZVN0cmlu Z1Jlc291cmNlQmFzZSh2ODo6SGFuZGxlPHY4OjpTdHJpbmc+KTsKKworICAgIGV4cGxpY2l0IFdl YkNvcmVTdHJpbmdSZXNvdXJjZUJhc2UoY29uc3QgU3RyaW5nJiBzdHJpbmcpCisgICAgICAgIDog bV9wbGFpblN0cmluZyhzdHJpbmcpCisgICAgeworI2lmbmRlZiBOREVCVUcKKyAgICAgICAgbV90 aHJlYWRJZCA9IFdURjo6Y3VycmVudFRocmVhZCgpOworI2VuZGlmCisgICAgICAgIEFTU0VSVCgh c3RyaW5nLmlzTnVsbCgpKTsKKyAgICAgICAgdjg6OlY4OjpBZGp1c3RBbW91bnRPZkV4dGVybmFs QWxsb2NhdGVkTWVtb3J5KG1lbW9yeUNvbnN1bXB0aW9uKHN0cmluZykpOworICAgIH0KKworICAg IGV4cGxpY2l0IFdlYkNvcmVTdHJpbmdSZXNvdXJjZUJhc2UoY29uc3QgQXRvbWljU3RyaW5nJiBz dHJpbmcpCisgICAgICAgIDogbV9wbGFpblN0cmluZyhzdHJpbmcuc3RyaW5nKCkpCisgICAgICAg ICwgbV9hdG9taWNTdHJpbmcoc3RyaW5nKQorICAgIHsKKyNpZm5kZWYgTkRFQlVHCisgICAgICAg IG1fdGhyZWFkSWQgPSBXVEY6OmN1cnJlbnRUaHJlYWQoKTsKKyNlbmRpZgorICAgICAgICBBU1NF UlQoIXN0cmluZy5pc051bGwoKSk7CisgICAgICAgIHY4OjpWODo6QWRqdXN0QW1vdW50T2ZFeHRl cm5hbEFsbG9jYXRlZE1lbW9yeShtZW1vcnlDb25zdW1wdGlvbihzdHJpbmcpKTsKKyAgICB9CisK KyAgICB2aXJ0dWFsIH5XZWJDb3JlU3RyaW5nUmVzb3VyY2VCYXNlKCkKKyAgICB7CisjaWZuZGVm IE5ERUJVRworICAgICAgICBBU1NFUlQobV90aHJlYWRJZCA9PSBXVEY6OmN1cnJlbnRUaHJlYWQo KSk7CisjZW5kaWYKKyAgICAgICAgaW50IHJlZHVjZWRFeHRlcm5hbE1lbW9yeSA9IC1tZW1vcnlD b25zdW1wdGlvbihtX3BsYWluU3RyaW5nKTsKKyAgICAgICAgaWYgKG1fcGxhaW5TdHJpbmcuaW1w bCgpICE9IG1fYXRvbWljU3RyaW5nLmltcGwoKSAmJiAhbV9hdG9taWNTdHJpbmcuaXNOdWxsKCkp CisgICAgICAgICAgICByZWR1Y2VkRXh0ZXJuYWxNZW1vcnkgLT0gbWVtb3J5Q29uc3VtcHRpb24o bV9hdG9taWNTdHJpbmcuc3RyaW5nKCkpOworICAgICAgICB2ODo6Vjg6OkFkanVzdEFtb3VudE9m RXh0ZXJuYWxBbGxvY2F0ZWRNZW1vcnkocmVkdWNlZEV4dGVybmFsTWVtb3J5KTsKKyAgICB9CisK KyAgICBjb25zdCBTdHJpbmcmIHdlYmNvcmVTdHJpbmcoKSB7IHJldHVybiBtX3BsYWluU3RyaW5n OyB9CisKKyAgICBjb25zdCBBdG9taWNTdHJpbmcmIGF0b21pY1N0cmluZygpCisgICAgeworI2lm bmRlZiBOREVCVUcKKyAgICAgICAgQVNTRVJUKG1fdGhyZWFkSWQgPT0gV1RGOjpjdXJyZW50VGhy ZWFkKCkpOworI2VuZGlmCisgICAgICAgIGlmIChtX2F0b21pY1N0cmluZy5pc051bGwoKSkgewor ICAgICAgICAgICAgbV9hdG9taWNTdHJpbmcgPSBBdG9taWNTdHJpbmcobV9wbGFpblN0cmluZyk7 CisgICAgICAgICAgICBBU1NFUlQoIW1fYXRvbWljU3RyaW5nLmlzTnVsbCgpKTsKKyAgICAgICAg ICAgIGlmIChtX3BsYWluU3RyaW5nLmltcGwoKSAhPSBtX2F0b21pY1N0cmluZy5pbXBsKCkpCisg ICAgICAgICAgICAgICAgdjg6OlY4OjpBZGp1c3RBbW91bnRPZkV4dGVybmFsQWxsb2NhdGVkTWVt b3J5KG1lbW9yeUNvbnN1bXB0aW9uKG1fYXRvbWljU3RyaW5nLnN0cmluZygpKSk7CisgICAgICAg IH0KKyAgICAgICAgcmV0dXJuIG1fYXRvbWljU3RyaW5nOworICAgIH0KKworICAgIHZvaWQgdmlz aXRTdHJpbmdzKEV4dGVybmFsU3RyaW5nVmlzaXRvciopOworCitwcm90ZWN0ZWQ6CisgICAgLy8g QSBzaGFsbG93IGNvcHkgb2YgdGhlIHN0cmluZy4gS2VlcHMgdGhlIHN0cmluZyBidWZmZXIgYWxp dmUgdW50aWwgdGhlIFY4IGVuZ2luZSBnYXJiYWdlIGNvbGxlY3RzIGl0LgorICAgIFN0cmluZyBt X3BsYWluU3RyaW5nOworICAgIC8vIElmIHRoaXMgc3RyaW5nIGlzIGF0b21pYyBvciBoYXMgYmVl biBtYWRlIGF0b21pYyBlYXJsaWVyIHRoZQorICAgIC8vIGF0b21pYyBzdHJpbmcgaXMgaGVsZCBo ZXJlLiBJbiB0aGUgY2FzZSB3aGVyZSB0aGUgc3RyaW5nIHN0YXJ0cworICAgIC8vIG9mZiBub24t YXRvbWljIGFuZCBiZWNvbWVzIGF0b21pYyBsYXRlciBpdCBpcyBuZWNlc3NhcnkgdG8ga2VlcAor ICAgIC8vIHRoZSBvcmlnaW5hbCBzdHJpbmcgYWxpdmUgYmVjYXVzZSB2OCBtYXkga2VlcCBkZXJp dmVkIHBvaW50ZXJzCisgICAgLy8gaW50byB0aGF0IHN0cmluZy4KKyAgICBBdG9taWNTdHJpbmcg bV9hdG9taWNTdHJpbmc7CisKK3ByaXZhdGU6CisgICAgc3RhdGljIGludCBtZW1vcnlDb25zdW1w dGlvbihjb25zdCBTdHJpbmcmIHN0cmluZykKKyAgICB7CisgICAgICAgIHJldHVybiBzdHJpbmcu bGVuZ3RoKCkgKiAoc3RyaW5nLmlzOEJpdCgpID8gc2l6ZW9mKExDaGFyKSA6IHNpemVvZihVQ2hh cikpOworICAgIH0KKyNpZm5kZWYgTkRFQlVHCisgICAgV1RGOjpUaHJlYWRJZGVudGlmaWVyIG1f dGhyZWFkSWQ7CisjZW5kaWYKK307CisKK2NsYXNzIFdlYkNvcmVTdHJpbmdSZXNvdXJjZTE2IDog cHVibGljIFdlYkNvcmVTdHJpbmdSZXNvdXJjZUJhc2UsIHB1YmxpYyB2ODo6U3RyaW5nOjpFeHRl cm5hbFN0cmluZ1Jlc291cmNlIHsKK3B1YmxpYzoKKyAgICBleHBsaWNpdCBXZWJDb3JlU3RyaW5n UmVzb3VyY2UxNihjb25zdCBTdHJpbmcmIHN0cmluZykgOiBXZWJDb3JlU3RyaW5nUmVzb3VyY2VC YXNlKHN0cmluZykgeyB9CisgICAgZXhwbGljaXQgV2ViQ29yZVN0cmluZ1Jlc291cmNlMTYoY29u c3QgQXRvbWljU3RyaW5nJiBzdHJpbmcpIDogV2ViQ29yZVN0cmluZ1Jlc291cmNlQmFzZShzdHJp bmcpIHsgfQorCisgICAgdmlydHVhbCBzaXplX3QgbGVuZ3RoKCkgY29uc3QgT1ZFUlJJREUgeyBy ZXR1cm4gbV9wbGFpblN0cmluZy5pbXBsKCktPmxlbmd0aCgpOyB9CisgICAgdmlydHVhbCBjb25z dCB1aW50MTZfdCogZGF0YSgpIGNvbnN0IE9WRVJSSURFCisgICAgeworICAgICAgICByZXR1cm4g cmVpbnRlcnByZXRfY2FzdDxjb25zdCB1aW50MTZfdCo+KG1fcGxhaW5TdHJpbmcuaW1wbCgpLT5j aGFyYWN0ZXJzKCkpOworICAgIH0KK307CisKK2NsYXNzIFdlYkNvcmVTdHJpbmdSZXNvdXJjZTgg OiBwdWJsaWMgV2ViQ29yZVN0cmluZ1Jlc291cmNlQmFzZSwgcHVibGljIHY4OjpTdHJpbmc6OkV4 dGVybmFsQXNjaWlTdHJpbmdSZXNvdXJjZSB7CitwdWJsaWM6CisgICAgZXhwbGljaXQgV2ViQ29y ZVN0cmluZ1Jlc291cmNlOChjb25zdCBTdHJpbmcmIHN0cmluZykgOiBXZWJDb3JlU3RyaW5nUmVz b3VyY2VCYXNlKHN0cmluZykgeyB9CisgICAgZXhwbGljaXQgV2ViQ29yZVN0cmluZ1Jlc291cmNl OChjb25zdCBBdG9taWNTdHJpbmcmIHN0cmluZykgOiBXZWJDb3JlU3RyaW5nUmVzb3VyY2VCYXNl KHN0cmluZykgeyB9CisKKyAgICB2aXJ0dWFsIHNpemVfdCBsZW5ndGgoKSBjb25zdCBPVkVSUklE RSB7IHJldHVybiBtX3BsYWluU3RyaW5nLmltcGwoKS0+bGVuZ3RoKCk7IH0KKyAgICB2aXJ0dWFs IGNvbnN0IGNoYXIqIGRhdGEoKSBjb25zdCBPVkVSUklERQorICAgIHsKKyAgICAgICAgcmV0dXJu IHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hhcio+KG1fcGxhaW5TdHJpbmcuaW1wbCgpLT5jaGFy YWN0ZXJzOCgpKTsKKyAgICB9Cit9OworCiBlbnVtIEV4dGVybmFsTW9kZSB7CiAgICAgRXh0ZXJu YWxpemUsCiAgICAgRG9Ob3RFeHRlcm5hbGl6ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvdjgvVjhWYWx1ZUNhY2hlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1Y4VmFsdWVDYWNoZS5jcHAKaW5kZXggMTFjMDkwOGExYTY3Y2RlZDFlMzBlMThjMGQyOTkxMTRh MmZiZGQxYS4uNjQ2ODMyM2NlMjkyNzk1MTQwNGNjZDA0ODY2N2FhYzJjZWE3YmZhMCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhWYWx1ZUNhY2hlLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFZhbHVlQ2FjaGUuY3BwCkBAIC0yNiw3ICsyNiw2 IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiVjhWYWx1ZUNhY2hlLmgiCiAKLSNp bmNsdWRlICJCaW5kaW5nVmlzaXRvcnMuaCIKICNpbmNsdWRlICJWOEJpbmRpbmcuaCIKIAogbmFt ZXNwYWNlIFdlYkNvcmUgewpAQCAtMTAxLDI0ICsxMDAsNiBAQCB2ODo6TG9jYWw8djg6OlN0cmlu Zz4gU3RyaW5nQ2FjaGU6OnY4RXh0ZXJuYWxTdHJpbmdTbG93KFN0cmluZ0ltcGwqIHN0cmluZ0lt cGwsCiAgICAgcmV0dXJuIG5ld1N0cmluZzsKIH0KIAotV2ViQ29yZVN0cmluZ1Jlc291cmNlQmFz ZSogV2ViQ29yZVN0cmluZ1Jlc291cmNlQmFzZTo6dG9XZWJDb3JlU3RyaW5nUmVzb3VyY2VCYXNl KHY4OjpIYW5kbGU8djg6OlN0cmluZz4gc3RyaW5nKQotewotICAgIHY4OjpTdHJpbmc6OkVuY29k aW5nIGVuY29kaW5nOwotICAgIHY4OjpTdHJpbmc6OkV4dGVybmFsU3RyaW5nUmVzb3VyY2VCYXNl KiByZXNvdXJjZSA9IHN0cmluZy0+R2V0RXh0ZXJuYWxTdHJpbmdSZXNvdXJjZUJhc2UoJmVuY29k aW5nKTsKLSAgICBpZiAoIXJlc291cmNlKQotICAgICAgICByZXR1cm4gMDsKLSAgICBpZiAoZW5j b2RpbmcgPT0gdjg6OlN0cmluZzo6QVNDSUlfRU5DT0RJTkcpCi0gICAgICAgIHJldHVybiBzdGF0 aWNfY2FzdDxXZWJDb3JlU3RyaW5nUmVzb3VyY2U4Kj4ocmVzb3VyY2UpOwotICAgIHJldHVybiBz dGF0aWNfY2FzdDxXZWJDb3JlU3RyaW5nUmVzb3VyY2UxNio+KHJlc291cmNlKTsKLX0KLQotdm9p ZCBXZWJDb3JlU3RyaW5nUmVzb3VyY2VCYXNlOjp2aXNpdFN0cmluZ3MoRXh0ZXJuYWxTdHJpbmdW aXNpdG9yKiB2aXNpdG9yKQotewotICAgIHZpc2l0b3ItPnZpc2l0SlNFeHRlcm5hbFN0cmluZyht X3BsYWluU3RyaW5nLmltcGwoKSk7Ci0gICAgaWYgKG1fcGxhaW5TdHJpbmcuaW1wbCgpICE9IG1f YXRvbWljU3RyaW5nLmltcGwoKSAmJiAhbV9hdG9taWNTdHJpbmcuaXNOdWxsKCkpCi0gICAgICAg IHZpc2l0b3ItPnZpc2l0SlNFeHRlcm5hbFN0cmluZyhtX2F0b21pY1N0cmluZy5pbXBsKCkpOwot fQotCiB2b2lkIEludGVnZXJDYWNoZTo6Y3JlYXRlU21hbGxJbnRlZ2Vycyh2ODo6SXNvbGF0ZSog aXNvbGF0ZSkKIHsKICAgICBBU1NFUlQoIW1faW5pdGlhbGl6ZWQpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhWYWx1ZUNhY2hlLmggYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9WOFZhbHVlQ2FjaGUuaAppbmRleCBjMjhkNTQyM2EyMGE4N2U5ODU3NDJkNjIy MTkwZmZkYTQ2NDViMzJhLi4wYjE0YTJhMGQzNjg4NTdmMzE0YjdiODdmNjMxZTEwNWE1ZDBjNTgw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFZhbHVlQ2FjaGUuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFZhbHVlQ2FjaGUuaApAQCAtMzQsOCAr MzQsNiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWNsYXNzIEV4dGVybmFsU3RyaW5nVmlz aXRvcjsKLQogY2xhc3MgU3RyaW5nQ2FjaGUgewogcHVibGljOgogICAgIFN0cmluZ0NhY2hlKCkg eyB9CkBAIC03MCwxMDYgKzY4LDYgQEAgcHJpdmF0ZToKIAogY29uc3QgaW50IG51bWJlck9mQ2Fj aGVkU21hbGxJbnRlZ2VycyA9IDY0OwogCi0vLyBXZWJDb3JlU3RyaW5nUmVzb3VyY2UgaXMgYSBo ZWxwZXIgY2xhc3MgZm9yIHY4RXh0ZXJuYWxTdHJpbmcuIEl0IGlzIHVzZWQKLS8vIHRvIG1hbmFn ZSB0aGUgbGlmZS1jeWNsZSBvZiB0aGUgdW5kZXJseWluZyBidWZmZXIgb2YgdGhlIGV4dGVybmFs IHN0cmluZy4KLWNsYXNzIFdlYkNvcmVTdHJpbmdSZXNvdXJjZUJhc2UgewotcHVibGljOgotICAg IHN0YXRpYyBXZWJDb3JlU3RyaW5nUmVzb3VyY2VCYXNlKiB0b1dlYkNvcmVTdHJpbmdSZXNvdXJj ZUJhc2Uodjg6OkhhbmRsZTx2ODo6U3RyaW5nPik7Ci0KLSAgICBleHBsaWNpdCBXZWJDb3JlU3Ry aW5nUmVzb3VyY2VCYXNlKGNvbnN0IFN0cmluZyYgc3RyaW5nKQotICAgICAgICA6IG1fcGxhaW5T dHJpbmcoc3RyaW5nKQotICAgIHsKLSNpZm5kZWYgTkRFQlVHCi0gICAgICAgIG1fdGhyZWFkSWQg PSBXVEY6OmN1cnJlbnRUaHJlYWQoKTsKLSNlbmRpZgotICAgICAgICBBU1NFUlQoIXN0cmluZy5p c051bGwoKSk7Ci0gICAgICAgIHY4OjpWODo6QWRqdXN0QW1vdW50T2ZFeHRlcm5hbEFsbG9jYXRl ZE1lbW9yeShtZW1vcnlDb25zdW1wdGlvbihzdHJpbmcpKTsKLSAgICB9Ci0KLSAgICBleHBsaWNp dCBXZWJDb3JlU3RyaW5nUmVzb3VyY2VCYXNlKGNvbnN0IEF0b21pY1N0cmluZyYgc3RyaW5nKQot ICAgICAgICA6IG1fcGxhaW5TdHJpbmcoc3RyaW5nLnN0cmluZygpKQotICAgICAgICAsIG1fYXRv bWljU3RyaW5nKHN0cmluZykKLSAgICB7Ci0jaWZuZGVmIE5ERUJVRwotICAgICAgICBtX3RocmVh ZElkID0gV1RGOjpjdXJyZW50VGhyZWFkKCk7Ci0jZW5kaWYKLSAgICAgICAgQVNTRVJUKCFzdHJp bmcuaXNOdWxsKCkpOwotICAgICAgICB2ODo6Vjg6OkFkanVzdEFtb3VudE9mRXh0ZXJuYWxBbGxv Y2F0ZWRNZW1vcnkobWVtb3J5Q29uc3VtcHRpb24oc3RyaW5nKSk7Ci0gICAgfQotCi0gICAgdmly dHVhbCB+V2ViQ29yZVN0cmluZ1Jlc291cmNlQmFzZSgpCi0gICAgewotI2lmbmRlZiBOREVCVUcK LSAgICAgICAgQVNTRVJUKG1fdGhyZWFkSWQgPT0gV1RGOjpjdXJyZW50VGhyZWFkKCkpOwotI2Vu ZGlmCi0gICAgICAgIGludCByZWR1Y2VkRXh0ZXJuYWxNZW1vcnkgPSAtbWVtb3J5Q29uc3VtcHRp b24obV9wbGFpblN0cmluZyk7Ci0gICAgICAgIGlmIChtX3BsYWluU3RyaW5nLmltcGwoKSAhPSBt X2F0b21pY1N0cmluZy5pbXBsKCkgJiYgIW1fYXRvbWljU3RyaW5nLmlzTnVsbCgpKQotICAgICAg ICAgICAgcmVkdWNlZEV4dGVybmFsTWVtb3J5IC09IG1lbW9yeUNvbnN1bXB0aW9uKG1fYXRvbWlj U3RyaW5nLnN0cmluZygpKTsKLSAgICAgICAgdjg6OlY4OjpBZGp1c3RBbW91bnRPZkV4dGVybmFs QWxsb2NhdGVkTWVtb3J5KHJlZHVjZWRFeHRlcm5hbE1lbW9yeSk7Ci0gICAgfQotCi0gICAgY29u c3QgU3RyaW5nJiB3ZWJjb3JlU3RyaW5nKCkgeyByZXR1cm4gbV9wbGFpblN0cmluZzsgfQotCi0g ICAgY29uc3QgQXRvbWljU3RyaW5nJiBhdG9taWNTdHJpbmcoKQotICAgIHsKLSNpZm5kZWYgTkRF QlVHCi0gICAgICAgIEFTU0VSVChtX3RocmVhZElkID09IFdURjo6Y3VycmVudFRocmVhZCgpKTsK LSNlbmRpZgotICAgICAgICBpZiAobV9hdG9taWNTdHJpbmcuaXNOdWxsKCkpIHsKLSAgICAgICAg ICAgIG1fYXRvbWljU3RyaW5nID0gQXRvbWljU3RyaW5nKG1fcGxhaW5TdHJpbmcpOwotICAgICAg ICAgICAgQVNTRVJUKCFtX2F0b21pY1N0cmluZy5pc051bGwoKSk7Ci0gICAgICAgICAgICBpZiAo bV9wbGFpblN0cmluZy5pbXBsKCkgIT0gbV9hdG9taWNTdHJpbmcuaW1wbCgpKQotICAgICAgICAg ICAgICAgIHY4OjpWODo6QWRqdXN0QW1vdW50T2ZFeHRlcm5hbEFsbG9jYXRlZE1lbW9yeShtZW1v cnlDb25zdW1wdGlvbihtX2F0b21pY1N0cmluZy5zdHJpbmcoKSkpOwotICAgICAgICB9Ci0gICAg ICAgIHJldHVybiBtX2F0b21pY1N0cmluZzsKLSAgICB9Ci0KLSAgICB2b2lkIHZpc2l0U3RyaW5n cyhFeHRlcm5hbFN0cmluZ1Zpc2l0b3IqKTsKLQotcHJvdGVjdGVkOgotICAgIC8vIEEgc2hhbGxv dyBjb3B5IG9mIHRoZSBzdHJpbmcuIEtlZXBzIHRoZSBzdHJpbmcgYnVmZmVyIGFsaXZlIHVudGls IHRoZSBWOCBlbmdpbmUgZ2FyYmFnZSBjb2xsZWN0cyBpdC4KLSAgICBTdHJpbmcgbV9wbGFpblN0 cmluZzsKLSAgICAvLyBJZiB0aGlzIHN0cmluZyBpcyBhdG9taWMgb3IgaGFzIGJlZW4gbWFkZSBh dG9taWMgZWFybGllciB0aGUKLSAgICAvLyBhdG9taWMgc3RyaW5nIGlzIGhlbGQgaGVyZS4gSW4g dGhlIGNhc2Ugd2hlcmUgdGhlIHN0cmluZyBzdGFydHMKLSAgICAvLyBvZmYgbm9uLWF0b21pYyBh bmQgYmVjb21lcyBhdG9taWMgbGF0ZXIgaXQgaXMgbmVjZXNzYXJ5IHRvIGtlZXAKLSAgICAvLyB0 aGUgb3JpZ2luYWwgc3RyaW5nIGFsaXZlIGJlY2F1c2UgdjggbWF5IGtlZXAgZGVyaXZlZCBwb2lu dGVycwotICAgIC8vIGludG8gdGhhdCBzdHJpbmcuCi0gICAgQXRvbWljU3RyaW5nIG1fYXRvbWlj U3RyaW5nOwotCi1wcml2YXRlOgotICAgIHN0YXRpYyBpbnQgbWVtb3J5Q29uc3VtcHRpb24oY29u c3QgU3RyaW5nJiBzdHJpbmcpCi0gICAgewotICAgICAgICByZXR1cm4gc3RyaW5nLmxlbmd0aCgp ICogKHN0cmluZy5pczhCaXQoKSA/IHNpemVvZihMQ2hhcikgOiBzaXplb2YoVUNoYXIpKTsKLSAg ICB9Ci0jaWZuZGVmIE5ERUJVRwotICAgIFdURjo6VGhyZWFkSWRlbnRpZmllciBtX3RocmVhZElk OwotI2VuZGlmCi19OwotCi1jbGFzcyBXZWJDb3JlU3RyaW5nUmVzb3VyY2UxNiA6IHB1YmxpYyBX ZWJDb3JlU3RyaW5nUmVzb3VyY2VCYXNlLCBwdWJsaWMgdjg6OlN0cmluZzo6RXh0ZXJuYWxTdHJp bmdSZXNvdXJjZSB7Ci1wdWJsaWM6Ci0gICAgZXhwbGljaXQgV2ViQ29yZVN0cmluZ1Jlc291cmNl MTYoY29uc3QgU3RyaW5nJiBzdHJpbmcpIDogV2ViQ29yZVN0cmluZ1Jlc291cmNlQmFzZShzdHJp bmcpIHsgfQotICAgIGV4cGxpY2l0IFdlYkNvcmVTdHJpbmdSZXNvdXJjZTE2KGNvbnN0IEF0b21p Y1N0cmluZyYgc3RyaW5nKSA6IFdlYkNvcmVTdHJpbmdSZXNvdXJjZUJhc2Uoc3RyaW5nKSB7IH0K LQotICAgIHZpcnR1YWwgc2l6ZV90IGxlbmd0aCgpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIG1f cGxhaW5TdHJpbmcuaW1wbCgpLT5sZW5ndGgoKTsgfQotICAgIHZpcnR1YWwgY29uc3QgdWludDE2 X3QqIGRhdGEoKSBjb25zdCBPVkVSUklERQotICAgIHsKLSAgICAgICAgcmV0dXJuIHJlaW50ZXJw cmV0X2Nhc3Q8Y29uc3QgdWludDE2X3QqPihtX3BsYWluU3RyaW5nLmltcGwoKS0+Y2hhcmFjdGVy cygpKTsKLSAgICB9Ci19OwotCi1jbGFzcyBXZWJDb3JlU3RyaW5nUmVzb3VyY2U4IDogcHVibGlj IFdlYkNvcmVTdHJpbmdSZXNvdXJjZUJhc2UsIHB1YmxpYyB2ODo6U3RyaW5nOjpFeHRlcm5hbEFz Y2lpU3RyaW5nUmVzb3VyY2UgewotcHVibGljOgotICAgIGV4cGxpY2l0IFdlYkNvcmVTdHJpbmdS ZXNvdXJjZTgoY29uc3QgU3RyaW5nJiBzdHJpbmcpIDogV2ViQ29yZVN0cmluZ1Jlc291cmNlQmFz ZShzdHJpbmcpIHsgfQotICAgIGV4cGxpY2l0IFdlYkNvcmVTdHJpbmdSZXNvdXJjZTgoY29uc3Qg QXRvbWljU3RyaW5nJiBzdHJpbmcpIDogV2ViQ29yZVN0cmluZ1Jlc291cmNlQmFzZShzdHJpbmcp IHsgfQotCi0gICAgdmlydHVhbCBzaXplX3QgbGVuZ3RoKCkgY29uc3QgT1ZFUlJJREUgeyByZXR1 cm4gbV9wbGFpblN0cmluZy5pbXBsKCktPmxlbmd0aCgpOyB9Ci0gICAgdmlydHVhbCBjb25zdCBj aGFyKiBkYXRhKCkgY29uc3QgT1ZFUlJJREUKLSAgICB7Ci0gICAgICAgIHJldHVybiByZWludGVy cHJldF9jYXN0PGNvbnN0IGNoYXIqPihtX3BsYWluU3RyaW5nLmltcGwoKS0+Y2hhcmFjdGVyczgo KSk7Ci0gICAgfQotfTsKLQogY2xhc3MgSW50ZWdlckNhY2hlIHsKIHB1YmxpYzoKICAgICAgSW50 ZWdlckNhY2hlKCkgOiBtX2luaXRpYWxpemVkKGZhbHNlKSB7IH07Cg==