93822 2012-08-13 04:55:33 -0700 [V8] Remove v8ValueToWebCoreString() 2012-08-13 19:25:07 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 93095 1 haraken haraken abarth japhet webkit.review.bot oldest_to_newest 693540 0 haraken 2012-08-13 04:55:33 -0700 There are two equivalent ways to convert a V8 value to a WebCore String; i.e. v8ValueToWebCoreString() and toWebCoreString(). We can remove the former. In a follow-up patch, I will replace v8ValueToAtomicWebCoreString() with toWebCoreAtomicString(), for consistency with toWebCoreString(). 693541 1 157962 haraken 2012-08-13 04:57:02 -0700 Created attachment 157962 Patch 694297 2 haraken 2012-08-13 17:50:07 -0700 Committed r125481: <http://trac.webkit.org/changeset/125481> 157962 2012-08-13 04:57:02 -0700 2012-08-13 19:25:07 -0700 Patch bug-93822-20120813205630.patch text/plain 10298 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1MzgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWMzZjExMGM1YTc4Mzcx MmQ4NjQ4NTI2ODg2ZGNmMjc5ZTM5M2MyNy4uMWFlNDFmZTY0Nzc0ODcxYzM1MWIyY2Q0NjM5MTg2 ZmI0NGFlNzU2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTA4LTEzICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdIFJlbW92ZSB2 OFZhbHVlVG9XZWJDb3JlU3RyaW5nKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTkzODIyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhlcmUgYXJlIHR3byBlcXVpdmFsZW50IHdheXMgdG8gY29udmVydCBh IFY4IHZhbHVlIHRvIGEgV2ViQ29yZSBTdHJpbmc7CisgICAgICAgIGkuZS4gdjhWYWx1ZVRvV2Vi Q29yZVN0cmluZygpIGFuZCB0b1dlYkNvcmVTdHJpbmcoKS4gV2UgY2FuIHJlbW92ZSB0aGUgZm9y bWVyLgorCisgICAgICAgIEluIGEgZm9sbG93LXVwIHBhdGNoLCBJIHdpbGwgcmVwbGFjZSB2OFZh bHVlVG9BdG9taWNXZWJDb3JlU3RyaW5nKCkKKyAgICAgICAgd2l0aCB0b1dlYkNvcmVBdG9taWNT dHJpbmcoKSwgZm9yIGNvbnNpc3RlbmN5IHdpdGggdG9XZWJDb3JlU3RyaW5nKCkuCisKKyAgICAg ICAgTm8gdGVzdHMuIE5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAqIGJpbmRpbmdz L3Y4L0RpY3Rpb25hcnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RGljdGlvbmFyeTo6Z2V0KToK KyAgICAgICAgKFdlYkNvcmU6OkRpY3Rpb25hcnk6OmdldFdpdGhVbmRlZmluZWRPck51bGxDaGVj ayk6CisgICAgICAgIChXZWJDb3JlOjpEaWN0aW9uYXJ5OjpnZXRPd25Qcm9wZXJ0aWVzQXNTdHJp bmdIYXNoTWFwKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9JREJCaW5kaW5nVXRpbGl0aWVzLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZUlEQktleUZyb21WYWx1ZSk6CisgICAgICAgICog YmluZGluZ3MvdjgvU2NyaXB0RGVidWdTZXJ2ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Ny aXB0RGVidWdTZXJ2ZXI6OnNldEJyZWFrcG9pbnQpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4 QmluZGluZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjp0b1dlYkNvcmVTdHJpbmcpOgorICAgICAg ICAoV2ViQ29yZTo6djhWYWx1ZVRvV2ViQ29yZURPTVN0cmluZ0xpc3QpOgorICAgICAgICAqIGJp bmRpbmdzL3Y4L1Y4QmluZGluZy5oOgorICAgICAgICAoV2ViQ29yZTo6dG9XZWJDb3JlU3RyaW5n V2l0aE51bGxDaGVjayk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4TWVzc2FnZUV2 ZW50Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4TWVzc2FnZUV2ZW50Ojppbml0TWVz c2FnZUV2ZW50Q2FsbGJhY2spOgorCiAyMDEyLTA4LTEyICBQcmF2aW4gRCAgPHByYXZpbmQuMms0 QGdtYWlsLmNvbT4KIAogICAgICAgICB0YWJsZSBjZWxsLmNlbGxJbmRleCBzaG91bGQgcmV0dXJu IC0xIGlmIHRoZXJlIGlzIG5vIHBhcmVudCB0YWJsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvRGljdGlvbmFyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92 OC9EaWN0aW9uYXJ5LmNwcAppbmRleCAyNjI1ZmE1Yjk5ZDIzNWFhMjY3ZGU4ZWE4MWVhOTBlYzZi ZmMxZGEzLi4xNWRhMmZmZTgxOTc0YTdmZjYwMjhkOWU1ZjRjMmIxYmFmMDBhN2FiIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9EaWN0aW9uYXJ5LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy92OC9EaWN0aW9uYXJ5LmNwcApAQCAtMTYwLDcgKzE2MCw3IEBA IGJvb2wgRGljdGlvbmFyeTo6Z2V0KGNvbnN0IFN0cmluZyYga2V5LCBTdHJpbmcmIHZhbHVlKSBj b25zdAogICAgIC8vICAgICAgICBhbiBlbXB0eSBzdHJpbmcgYW5kIHJldHVybmluZyB0cnVlIHdo ZW4gd2Ugc2hvdWxkIGJlIHJldHVybmluZyBmYWxzZS4KICAgICAvLyAgICAgICAgU2VlIGZhc3Qv ZG9tL0dlb2xvY2F0aW9uL3NjcmlwdC10ZXN0cy9hcmd1bWVudC10eXBlcy5qcyBmb3IgYSBzaW1p bGFyCiAgICAgLy8gICAgICAgIGV4YW1wbGUuCi0gICAgdmFsdWUgPSB2OFZhbHVlVG9XZWJDb3Jl U3RyaW5nKHY4VmFsdWUpOworICAgIHZhbHVlID0gdG9XZWJDb3JlU3RyaW5nKHY4VmFsdWUpOwog ICAgIHJldHVybiB0cnVlOwogfQogCkBAIC0yODUsNyArMjg1LDcgQEAgYm9vbCBEaWN0aW9uYXJ5 OjpnZXQoY29uc3QgU3RyaW5nJiBrZXksIEhhc2hTZXQ8QXRvbWljU3RyaW5nPiYgdmFsdWUpIGNv bnN0CiAgICAgdjg6OkxvY2FsPHY4OjpBcnJheT4gdjhBcnJheSA9IHY4OjpMb2NhbDx2ODo6QXJy YXk+OjpDYXN0KHY4VmFsdWUpOwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgdjhBcnJheS0+ TGVuZ3RoKCk7ICsraSkgewogICAgICAgICB2ODo6TG9jYWw8djg6OlZhbHVlPiBpbmRleGVkVmFs dWUgPSB2OEFycmF5LT5HZXQodjhJbnRlZ2VyKGkpKTsKLSAgICAgICAgdmFsdWUuYWRkKHY4VmFs dWVUb1dlYkNvcmVTdHJpbmcoaW5kZXhlZFZhbHVlKSk7CisgICAgICAgIHZhbHVlLmFkZCh0b1dl YkNvcmVTdHJpbmcoaW5kZXhlZFZhbHVlKSk7CiAgICAgfQogCiAgICAgcmV0dXJuIHRydWU7CkBA IC0zMDEsNyArMzAxLDcgQEAgYm9vbCBEaWN0aW9uYXJ5OjpnZXRXaXRoVW5kZWZpbmVkT3JOdWxs Q2hlY2soY29uc3QgU3RyaW5nJiBrZXksIFN0cmluZyYgdmFsdWUpIGMKICAgICAvLyAgICAgICAg YW4gZW1wdHkgc3RyaW5nIGFuZCByZXR1cm5pbmcgdHJ1ZSB3aGVuIHdlIHNob3VsZCBiZSByZXR1 cm5pbmcgZmFsc2UuCiAgICAgLy8gICAgICAgIFNlZSBmYXN0L2RvbS9HZW9sb2NhdGlvbi9zY3Jp cHQtdGVzdHMvYXJndW1lbnQtdHlwZXMuanMgZm9yIGEgc2ltaWxhcgogICAgIC8vICAgICAgICBl eGFtcGxlLgotICAgIHZhbHVlID0gV2ViQ29yZTo6aXNVbmRlZmluZWRPck51bGwodjhWYWx1ZSkg PyBTdHJpbmcoKSA6IHY4VmFsdWVUb1dlYkNvcmVTdHJpbmcodjhWYWx1ZSk7CisgICAgdmFsdWUg PSBXZWJDb3JlOjppc1VuZGVmaW5lZE9yTnVsbCh2OFZhbHVlKSA/IFN0cmluZygpIDogdG9XZWJD b3JlU3RyaW5nKHY4VmFsdWUpOwogICAgIHJldHVybiB0cnVlOwogfQogCkBAIC00NDYsNyArNDQ2 LDcgQEAgYm9vbCBEaWN0aW9uYXJ5OjpnZXQoY29uc3QgU3RyaW5nJiBrZXksIFZlY3RvcjxTdHJp bmc+JiB2YWx1ZSkgY29uc3QKICAgICB2ODo6TG9jYWw8djg6OkFycmF5PiB2OEFycmF5ID0gdjg6 OkxvY2FsPHY4OjpBcnJheT46OkNhc3QodjhWYWx1ZSk7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7 IGkgPCB2OEFycmF5LT5MZW5ndGgoKTsgKytpKSB7CiAgICAgICAgIHY4OjpMb2NhbDx2ODo6VmFs dWU+IGluZGV4ZWRWYWx1ZSA9IHY4QXJyYXktPkdldCh2ODo6VWludDMyOjpOZXcoaSkpOwotICAg ICAgICB2YWx1ZS5hcHBlbmQodjhWYWx1ZVRvV2ViQ29yZVN0cmluZyhpbmRleGVkVmFsdWUpKTsK KyAgICAgICAgdmFsdWUuYXBwZW5kKHRvV2ViQ29yZVN0cmluZyhpbmRleGVkVmFsdWUpKTsKICAg ICB9CiAKICAgICByZXR1cm4gdHJ1ZTsKQEAgLTQ4NSw4ICs0ODUsOCBAQCBib29sIERpY3Rpb25h cnk6OmdldE93blByb3BlcnRpZXNBc1N0cmluZ0hhc2hNYXAoV1RGOjpIYXNoTWFwPFN0cmluZywg U3RyaW5nPiYgaAogICAgICAgICAgICAgY29udGludWU7CiAKICAgICAgICAgdjg6OkxvY2FsPHY4 OjpWYWx1ZT4gdmFsdWUgPSBvcHRpb25zLT5HZXQoa2V5KTsKLSAgICAgICAgU3RyaW5nIHN0cmlu Z0tleSA9IHY4VmFsdWVUb1dlYkNvcmVTdHJpbmcoa2V5KTsKLSAgICAgICAgU3RyaW5nIHN0cmlu Z1ZhbHVlID0gdjhWYWx1ZVRvV2ViQ29yZVN0cmluZyh2YWx1ZSk7CisgICAgICAgIFN0cmluZyBz dHJpbmdLZXkgPSB0b1dlYkNvcmVTdHJpbmcoa2V5KTsKKyAgICAgICAgU3RyaW5nIHN0cmluZ1Zh bHVlID0gdG9XZWJDb3JlU3RyaW5nKHZhbHVlKTsKICAgICAgICAgaWYgKCFzdHJpbmdLZXkuaXNF bXB0eSgpKQogICAgICAgICAgICAgaGFzaE1hcC5zZXQoc3RyaW5nS2V5LCBzdHJpbmdWYWx1ZSk7 CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvSURCQmluZGlu Z1V0aWxpdGllcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9JREJCaW5kaW5nVXRp bGl0aWVzLmNwcAppbmRleCBjYzFlYWZiMDRmNmU4OTgyMGUzMzk3ZTJkODI3ZTkzZGM5ZmEyMmZj Li4xOWZkOTFkOTAwOTM1ZGVkYmM4MTE1ZGQ5NDE0NWE2OGY0OWU3MDE2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9JREJCaW5kaW5nVXRpbGl0aWVzLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9JREJCaW5kaW5nVXRpbGl0aWVzLmNwcApAQCAtNDcs NyArNDcsNyBAQCBzdGF0aWMgUGFzc1JlZlB0cjxJREJLZXk+IGNyZWF0ZUlEQktleUZyb21WYWx1 ZSh2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdmFsdWUsIFZlYwogICAgIGlmICh2YWx1ZS0+SXNOdW1i ZXIoKSAmJiAhaXNuYW4odmFsdWUtPk51bWJlclZhbHVlKCkpKQogICAgICAgICByZXR1cm4gSURC S2V5OjpjcmVhdGVOdW1iZXIodmFsdWUtPk51bWJlclZhbHVlKCkpOwogICAgIGlmICh2YWx1ZS0+ SXNTdHJpbmcoKSkKLSAgICAgICAgcmV0dXJuIElEQktleTo6Y3JlYXRlU3RyaW5nKHY4VmFsdWVU b1dlYkNvcmVTdHJpbmcodmFsdWUpKTsKKyAgICAgICAgcmV0dXJuIElEQktleTo6Y3JlYXRlU3Ry aW5nKHRvV2ViQ29yZVN0cmluZyh2YWx1ZSkpOwogICAgIGlmICh2YWx1ZS0+SXNEYXRlKCkgJiYg IWlzbmFuKHZhbHVlLT5OdW1iZXJWYWx1ZSgpKSkKICAgICAgICAgcmV0dXJuIElEQktleTo6Y3Jl YXRlRGF0ZSh2YWx1ZS0+TnVtYmVyVmFsdWUoKSk7CiAgICAgaWYgKHZhbHVlLT5Jc0FycmF5KCkp IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdERlYnVnU2Vy dmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdERlYnVnU2VydmVyLmNw cAppbmRleCA3N2Q2OGQwMTdmYzYxY2JlNTViOGJkNTkxZmFkNTlhMDdlOGYxNDdmLi4xNDU1YWFl YzRmZjQ3MjM1ZjllNjFkZTNlNGRiOThmYjhmMDEyNGRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy92OC9TY3JpcHREZWJ1Z1NlcnZlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvU2NyaXB0RGVidWdTZXJ2ZXIuY3BwCkBAIC04OSw3ICs4OSw3IEBAIFN0 cmluZyBTY3JpcHREZWJ1Z1NlcnZlcjo6c2V0QnJlYWtwb2ludChjb25zdCBTdHJpbmcmIHNvdXJj ZUlELCBjb25zdCBTY3JpcHRCcmVhCiAgICAgICAgIHJldHVybiAiIjsKICAgICAqYWN0dWFsTGlu ZU51bWJlciA9IGFyZ3MtPkdldCh2ODo6U3RyaW5nOjpOZXcoImxpbmVOdW1iZXIiKSktPkludDMy VmFsdWUoKTsKICAgICAqYWN0dWFsQ29sdW1uTnVtYmVyID0gYXJncy0+R2V0KHY4OjpTdHJpbmc6 Ok5ldygiY29sdW1uTnVtYmVyIikpLT5JbnQzMlZhbHVlKCk7Ci0gICAgcmV0dXJuIHY4VmFsdWVU b1dlYkNvcmVTdHJpbmcoYnJlYWtwb2ludElkLT5Ub1N0cmluZygpKTsKKyAgICByZXR1cm4gdG9X ZWJDb3JlU3RyaW5nKGJyZWFrcG9pbnRJZC0+VG9TdHJpbmcoKSk7CiB9CiAKIHZvaWQgU2NyaXB0 RGVidWdTZXJ2ZXI6OnJlbW92ZUJyZWFrcG9pbnQoY29uc3QgU3RyaW5nJiBicmVha3BvaW50SWQp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOEJpbmRpbmcuY3BwIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhCaW5kaW5nLmNwcAppbmRleCBhNWU5NWE4N2Jm YzA1OWNjNTA0OWFmODMwYzc2ZWQxZmMzYzZjNTdjLi5mNDE5MzkyZjJmMWQyZGNiYmRiZWJlMGRj MTg2Yzg3YmQ5MTQ3MjBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9W OEJpbmRpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4QmluZGluZy5j cHAKQEAgLTEwMiw3ICsxMDIsNyBAQCBzdGF0aWMgQXRvbWljU3RyaW5nIHY4Tm9uU3RyaW5nVmFs dWVUb0F0b21pY1dlYkNvcmVTdHJpbmcodjg6OkhhbmRsZTx2ODo6VmFsdWU+CiAgICAgcmV0dXJu IEF0b21pY1N0cmluZyh2OE5vblN0cmluZ1ZhbHVlVG9XZWJDb3JlU3RyaW5nKG9iamVjdCkpOwog fQogCi1TdHJpbmcgdjhWYWx1ZVRvV2ViQ29yZVN0cmluZyh2ODo6SGFuZGxlPHY4OjpWYWx1ZT4g dmFsdWUpCitTdHJpbmcgdG9XZWJDb3JlU3RyaW5nKHY4OjpIYW5kbGU8djg6OlZhbHVlPiB2YWx1 ZSkKIHsKICAgICBpZiAodmFsdWUtPklzU3RyaW5nKCkpCiAgICAgICAgIHJldHVybiB2OFN0cmlu Z1RvV2ViQ29yZVN0cmluZzxTdHJpbmc+KHY4OjpIYW5kbGU8djg6OlN0cmluZz46OkNhc3QodmFs dWUpLCBFeHRlcm5hbGl6ZSk7CkBAIC0zNzEsNyArMzcxLDcgQEAgUGFzc1JlZlB0cjxET01TdHJp bmdMaXN0PiB2OFZhbHVlVG9XZWJDb3JlRE9NU3RyaW5nTGlzdCh2ODo6SGFuZGxlPHY4OjpWYWx1 ZT4gdmEKICAgICB2ODo6TG9jYWw8djg6OkFycmF5PiB2OEFycmF5ID0gdjg6OkxvY2FsPHY4OjpB cnJheT46OkNhc3QodjhWYWx1ZSk7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCB2OEFycmF5 LT5MZW5ndGgoKTsgKytpKSB7CiAgICAgICAgIHY4OjpMb2NhbDx2ODo6VmFsdWU+IGluZGV4ZWRW YWx1ZSA9IHY4QXJyYXktPkdldCh2OEludGVnZXIoaSkpOwotICAgICAgICByZXQtPmFwcGVuZCh2 OFZhbHVlVG9XZWJDb3JlU3RyaW5nKGluZGV4ZWRWYWx1ZSkpOworICAgICAgICByZXQtPmFwcGVu ZCh0b1dlYkNvcmVTdHJpbmcoaW5kZXhlZFZhbHVlKSk7CiAgICAgfQogICAgIHJldHVybiByZXQu cmVsZWFzZSgpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhC aW5kaW5nLmggYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOEJpbmRpbmcuaAppbmRleCBj YTNhZmI2NDliNjY2ZGUyYTRlZGIxMzk5MTU5NTY2OTQxOTE0OWVjLi5lNGJlMjk5MGFkYjNkYTEw MGJkMDkyMzhmZmEwZTQ0MDg5OTE4ZDg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy92OC9WOEJpbmRpbmcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOEJp bmRpbmcuaApAQCAtMTI0LDcgKzEyNCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAvLyBD b252ZXJ0IHY4IHR5cGVzIHRvIGEgV1RGOjpTdHJpbmcuIElmIHRoZSBWOCBzdHJpbmcgaXMgbm90 IGFscmVhZHkKICAgICAvLyBhbiBleHRlcm5hbCBzdHJpbmcgdGhlbiBpdCBpcyB0cmFuc2Zvcm1l ZCBpbnRvIGFuIGV4dGVybmFsIHN0cmluZyBhdCB0aGlzCiAgICAgLy8gcG9pbnQgdG8gYXZvaWQg cmVwZWF0ZWQgY29udmVyc2lvbnMuCi0gICAgU3RyaW5nIHY4VmFsdWVUb1dlYkNvcmVTdHJpbmco djg6OkhhbmRsZTx2ODo6VmFsdWU+KTsKKyAgICBTdHJpbmcgdG9XZWJDb3JlU3RyaW5nKHY4OjpI YW5kbGU8djg6OlZhbHVlPik7CiAKICAgICAvLyBDb252ZXJ0IGEgVjggdmFsdWUgdG8gYSBXVEY6 OkF0b21pY1N0cmluZy4KICAgICBBdG9taWNTdHJpbmcgdjhWYWx1ZVRvQXRvbWljV2ViQ29yZVN0 cmluZyh2ODo6SGFuZGxlPHY4OjpWYWx1ZT4pOwpAQCAtMjI1LDcgKzIyNSw3IEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKICAgICBzdHJ1Y3QgTmF0aXZlVmFsdWVUcmFpdHM8U3RyaW5nPiB7CiAgICAg ICAgIHN0YXRpYyBpbmxpbmUgU3RyaW5nIGFycmF5TmF0aXZlVmFsdWUoY29uc3Qgdjg6OkxvY2Fs PHY4OjpBcnJheT4mIGFycmF5LCBzaXplX3QgaSkKICAgICAgICAgewotICAgICAgICAgICAgcmV0 dXJuIHY4VmFsdWVUb1dlYkNvcmVTdHJpbmcoYXJyYXktPkdldChpKSk7CisgICAgICAgICAgICBy ZXR1cm4gdG9XZWJDb3JlU3RyaW5nKGFycmF5LT5HZXQoaSkpOwogICAgICAgICB9CiAgICAgfTsK IApAQCAtMzI0LDE3ICszMjQsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHJldHVy biBzdGF0aWNfY2FzdDxsb25nIGxvbmc+KHZhbHVlLT5JbnRlZ2VyVmFsdWUoKSk7CiAgICAgfQog Ci0gICAgLy8gRklYTUU6IERyb3AgdGhpcyBpbiBmYXZvciBvZiB0aGUgdHlwZSBzcGVjaWZpYyB2 OFZhbHVlVG9XZWJDb3JlU3RyaW5nIHdoZW4gd2UgcmV3b3JrIHRoZSBjb2RlIGdlbmVyYXRpb24u Ci0gICAgaW5saW5lIFN0cmluZyB0b1dlYkNvcmVTdHJpbmcodjg6OkhhbmRsZTx2ODo6VmFsdWU+ IG9iamVjdCkKLSAgICB7Ci0gICAgICAgIHJldHVybiB2OFZhbHVlVG9XZWJDb3JlU3RyaW5nKG9i amVjdCk7Ci0gICAgfQotCi0gICAgaW5saW5lIFN0cmluZyB0b1dlYkNvcmVTdHJpbmcoY29uc3Qg djg6OkFyZ3VtZW50cyYgYXJncywgaW50IGluZGV4KQotICAgIHsKLSAgICAgICAgcmV0dXJuIHY4 VmFsdWVUb1dlYkNvcmVTdHJpbmcoYXJnc1tpbmRleF0pOwotICAgIH0KLQogICAgIC8vIFRoZSBz dHJpbmcgcmV0dXJuZWQgYnkgdGhpcyBmdW5jdGlvbiBpcyBzdGlsbCBvd25lZCBieSB0aGUgYXJn dW1lbnQKICAgICAvLyBhbmQgd2lsbCBiZSBkZWFsbG9jYXRlZCB3aGVuIHRoZSBhcmd1bWVudCBp cyBkZWFsbG9jYXRlZC4KICAgICBpbmxpbmUgY29uc3QgdWludDE2X3QqIGZyb21XZWJDb3JlU3Ry aW5nKGNvbnN0IFN0cmluZyYgc3RyKQpAQCAtMzc5LDcgKzM2OCw3IEBAIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAogICAgIGlubGluZSBTdHJpbmcgdG9XZWJDb3JlU3RyaW5nV2l0aE51bGxDaGVjayh2 ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdmFsdWUpCiAgICAgewotICAgICAgICByZXR1cm4gdmFsdWUt PklzTnVsbCgpID8gU3RyaW5nKCkgOiB2OFZhbHVlVG9XZWJDb3JlU3RyaW5nKHZhbHVlKTsKKyAg ICAgICAgcmV0dXJuIHZhbHVlLT5Jc051bGwoKSA/IFN0cmluZygpIDogdG9XZWJDb3JlU3RyaW5n KHZhbHVlKTsKICAgICB9CiAKICAgICBpbmxpbmUgQXRvbWljU3RyaW5nIHRvQXRvbWljV2ViQ29y ZVN0cmluZ1dpdGhOdWxsQ2hlY2sodjg6OkhhbmRsZTx2ODo6VmFsdWU+IHZhbHVlKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4TWVzc2FnZUV2ZW50Q3Vz dG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOE1lc3NhZ2VFdmVu dEN1c3RvbS5jcHAKaW5kZXggNmFmZDg3MjMxNjYyODA0M2YzMjUzNGVhN2Y3NDlkMjEwNWM5YTA5 MC4uMmMwMjA5YTQ2MDFlOTY3Mjg1MmY5ZDI1Y2ZjMzE3YmFkMDY1YmY5MCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4TWVzc2FnZUV2ZW50Q3VzdG9tLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhNZXNzYWdlRXZlbnRD dXN0b20uY3BwCkBAIC0xMTAsMTIgKzExMCwxMiBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhN ZXNzYWdlRXZlbnQ6OmluaXRNZXNzYWdlRXZlbnRDYWxsYmFjayhjb25zdCB2ODo6QXJndW1lbgog ewogICAgIElOQ19TVEFUUygiRE9NLk1lc3NhZ2VFdmVudC5pbml0TWVzc2FnZUV2ZW50Iik7CiAg ICAgTWVzc2FnZUV2ZW50KiBldmVudCA9IFY4TWVzc2FnZUV2ZW50Ojp0b05hdGl2ZShhcmdzLkhv bGRlcigpKTsKLSAgICBTdHJpbmcgdHlwZUFyZyA9IHY4VmFsdWVUb1dlYkNvcmVTdHJpbmcoYXJn c1swXSk7CisgICAgU3RyaW5nIHR5cGVBcmcgPSB0b1dlYkNvcmVTdHJpbmcoYXJnc1swXSk7CiAg ICAgYm9vbCBjYW5CdWJibGVBcmcgPSBhcmdzWzFdLT5Cb29sZWFuVmFsdWUoKTsKICAgICBib29s IGNhbmNlbGFibGVBcmcgPSBhcmdzWzJdLT5Cb29sZWFuVmFsdWUoKTsKICAgICBTY3JpcHRWYWx1 ZSBkYXRhQXJnID0gU2NyaXB0VmFsdWUoYXJnc1szXSk7Ci0gICAgU3RyaW5nIG9yaWdpbkFyZyA9 IHY4VmFsdWVUb1dlYkNvcmVTdHJpbmcoYXJnc1s0XSk7Ci0gICAgU3RyaW5nIGxhc3RFdmVudElk QXJnID0gdjhWYWx1ZVRvV2ViQ29yZVN0cmluZyhhcmdzWzVdKTsKKyAgICBTdHJpbmcgb3JpZ2lu QXJnID0gdG9XZWJDb3JlU3RyaW5nKGFyZ3NbNF0pOworICAgIFN0cmluZyBsYXN0RXZlbnRJZEFy ZyA9IHRvV2ViQ29yZVN0cmluZyhhcmdzWzVdKTsKIAogICAgIERPTVdpbmRvdyogc291cmNlQXJn ID0gMDsKICAgICBpZiAoYXJnc1s2XS0+SXNPYmplY3QoKSkgewo=