80920 2012-03-12 18:16:28 -0700 [V8][Refactoring] Remove getExistingWrapper() and getExistingWrapperSlow() 2012-03-12 19:27:05 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 haraken haraken abarth arv japhet webkit.review.bot oldest_to_newest 576847 0 haraken 2012-03-12 18:16:28 -0700 Now getExistingWrapper() is the same as getWrapper(). getExistingWrapperSlow() is the same as getWrapperSlow(). We can remove getExistingWrapper() and getExistingWrapperSlow(). 576850 1 131481 haraken 2012-03-12 18:19:43 -0700 Created attachment 131481 Patch 576866 2 131481 abarth 2012-03-12 18:29:46 -0700 Comment on attachment 131481 Patch Can we call this getExistingWrapper since it doesn't create a wrapper? 576868 3 131485 haraken 2012-03-12 18:35:52 -0700 Created attachment 131485 patch for landing 576870 4 haraken 2012-03-12 18:36:42 -0700 (In reply to comment #2) > (From update of attachment 131481 [details]) > Can we call this getExistingWrapper since it doesn't create a wrapper? I renamed it to getCachedWrapper(), following JSC's getCachedWrapper(). 576875 5 haraken 2012-03-12 18:39:10 -0700 Committed r110525: <http://trac.webkit.org/changeset/110525> 576882 6 abarth 2012-03-12 18:45:03 -0700 > I renamed it to getCachedWrapper(), following JSC's getCachedWrapper(). Perfect. 131481 2012-03-12 18:19:43 -0700 2012-03-12 18:39:27 -0700 Patch bug-80920-20120313101941.patch text/plain 4820 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwNTE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWM3YmQ2ZmE2N2UyNjlh NDFjY2Y4YzYxNTIxNmI2NmY0M2RkMGQ4ZS4uNTk1NDM4ZWI1ZjcxMjkxNjkwZWE3MmMyYmU3YTI5 NTY4YjllMWNkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDEyLTAzLTEyICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAorICAgICAgICBbVjhdW1JlZmFjdG9y aW5nXSBSZW1vdmUgZ2V0RXhpc3RpbmdXcmFwcGVyKCkgYW5kIGdldEV4aXN0aW5nV3JhcHBlclNs b3coKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODA5 MjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOb3cg Z2V0RXhpc3RpbmdXcmFwcGVyKCkgaXMgdGhlIHNhbWUgYXMgZ2V0V3JhcHBlcigpLgorICAgICAg ICBnZXRFeGlzdGluZ1dyYXBwZXJTbG93KCkgaXMgdGhlIHNhbWUgYXMgZ2V0V3JhcHBlclNsb3co KS4KKyAgICAgICAgVGhpcyBwYXRjaCByZW1vdmVzIGdldEV4aXN0aW5nV3JhcHBlcigpIGFuZCBn ZXRFeGlzdGluZ1dyYXBwZXJTbG93KCkuCisKKyAgICAgICAgTm8gdGVzdHMuIE5vIGNoYW5nZSBp biBiZWhhdmlvci4KKworICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4 LnBtOgorICAgICAgICAoR2VuZXJhdGVIZWFkZXIpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4 RE9NV3JhcHBlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWOERPTVdyYXBwZXI6OmdldFdyYXBw ZXJTbG93KToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOERPTVdyYXBwZXIuaDoKKyAgICAgICAg KFdlYkNvcmU6OlY4RE9NV3JhcHBlcjo6Z2V0V3JhcHBlcik6CisgICAgICAgIChWOERPTVdyYXBw ZXIpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOE5vZGVDdXN0b20uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6dG9WOFNsb3cpOgorCisyMDEyLTAzLTEyICBLZW50YXJvIEhhcmEgIDxo YXJha2VuQGNocm9taXVtLm9yZz4KKwogICAgICAgICBbVjhdW1JlZmFjdG9yaW5nXSBNYWtlIGdl dFdyYXBwZXJTbG93KCkgYW5kIGdldEV4aXN0aW5nV3JhcHBlclNsb3coKSBzYW1lCiAgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDkxNgogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbSBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCmluZGV4 IGIzYmNlODYwZmQxOTI4NzdjYTUxZmYzMGNlMDI3N2QxMWI5YzEzOGEuLjUzMjhhZDgwNWJmZGI3 MzhlYTRkNTNlMTI0OGE2ZjMxZWVhZjkyMWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCkBAIC00MzUsNyArNDM1LDcgQEAgRU5E CiBBTFdBWVNfSU5MSU5FIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gJHtjbGFzc05hbWV9OjpleGlz dGluZ1dyYXBwZXIoJHtuYXRpdmVUeXBlfSogaW1wbCkKIHsKIEVORAotICAgIG15ICRnZXRXcmFw cGVyID0gSXNOb2RlU3ViVHlwZSgkZGF0YU5vZGUpID8gIlY4RE9NV3JhcHBlcjo6Z2V0RXhpc3Rp bmdXcmFwcGVyKGltcGwpIiA6ICIke2RvbU1hcEZ1bmN0aW9ufS5nZXQoaW1wbCkiOworICAgIG15 ICRnZXRXcmFwcGVyID0gSXNOb2RlU3ViVHlwZSgkZGF0YU5vZGUpID8gIlY4RE9NV3JhcHBlcjo6 Z2V0V3JhcHBlcihpbXBsKSIgOiAiJHtkb21NYXBGdW5jdGlvbn0uZ2V0KGltcGwpIjsKICAgICBw dXNoKEBoZWFkZXJDb250ZW50LCA8PEVORCk7CiAgICAgcmV0dXJuICR7Z2V0V3JhcHBlcn07CiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdyYXBwZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XcmFwcGVyLmNwcAppbmRleCA4ZTVj YmEwM2ZkZDZkNzQ3ZDZhOGFkMjc2NDVkMmMwODJhNzMzMGYwLi4yZWVlNDRkNDk1MjMzODk4NGEy YmQ5NDI5YzExZGM0OGRjODA0NGVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy92OC9WOERPTVdyYXBwZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4 RE9NV3JhcHBlci5jcHAKQEAgLTMwMywxMiArMzAzLDcgQEAgYm9vbCBWOERPTVdyYXBwZXI6Omlz V3JhcHBlck9mVHlwZSh2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdmFsdWUsIFdyYXBwZXJUeXBlSW5m byoKICAgICByZXR1cm4gdHlwZUluZm8gPT0gdHlwZTsKIH0KIAotdjg6OkhhbmRsZTx2ODo6T2Jq ZWN0PiBWOERPTVdyYXBwZXI6OmdldEV4aXN0aW5nV3JhcHBlclNsb3coTm9kZSogbm9kZSkKLXsK LSAgICByZXR1cm4gZ2V0RXhpc3RpbmdXcmFwcGVySW5saW5lKG5vZGUpOwotfQotCi12ODo6SGFu ZGxlPHY4OjpWYWx1ZT4gVjhET01XcmFwcGVyOjpnZXRXcmFwcGVyU2xvdyhOb2RlKiBub2RlKQor djg6OkhhbmRsZTx2ODo6T2JqZWN0PiBWOERPTVdyYXBwZXI6OmdldFdyYXBwZXJTbG93KE5vZGUq IG5vZGUpCiB7CiAgICAgcmV0dXJuIGdldEV4aXN0aW5nV3JhcHBlcklubGluZShub2RlKTsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NV3JhcHBlci5oIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XcmFwcGVyLmgKaW5kZXggZDNjYTUxZTA2 OWMyMDc1ZjRkYjIzOWJiYjU3Mzk1NGZhNzIxY2Q4Ni4uNjVlZjgxMzhjMzM4YWNhNzBkOWRmNDYw YmYzNTU3Y2MzMWQ1MGIwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvdjgv VjhET01XcmFwcGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XcmFw cGVyLmgKQEAgLTEyNCwxOCArMTI0LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAg IHN0YXRpYyB2ODo6TG9jYWw8djg6Ok9iamVjdD4gaW5zdGFudGlhdGVWOE9iamVjdChWOFByb3h5 KiBwcm94eSwgV3JhcHBlclR5cGVJbmZvKiwgdm9pZCogaW1wbCk7CiAKLSAgICAgICAgc3RhdGlj IHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gZ2V0RXhpc3RpbmdXcmFwcGVyKE5vZGUqIG5vZGUpCi0g ICAgICAgIHsKLSAgICAgICAgICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7Ci0gICAgICAgICAg ICBpZiAoTElLRUxZKCFJc29sYXRlZFdvcmxkOjpjb3VudCgpKSkgewotICAgICAgICAgICAgICAg IHY4OjpQZXJzaXN0ZW50PHY4OjpPYmplY3Q+KiB3cmFwcGVyID0gbm9kZS0+d3JhcHBlcigpOwot ICAgICAgICAgICAgICAgIGlmIChMSUtFTFkoISF3cmFwcGVyKSkKLSAgICAgICAgICAgICAgICAg ICAgcmV0dXJuICp3cmFwcGVyOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgcmV0dXJuIGdl dEV4aXN0aW5nV3JhcHBlclNsb3cobm9kZSk7Ci0gICAgICAgIH0KLQotICAgICAgICBzdGF0aWMg djg6OkhhbmRsZTx2ODo6VmFsdWU+IGdldFdyYXBwZXIoTm9kZSogbm9kZSkKKyAgICAgICAgc3Rh dGljIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gZ2V0V3JhcHBlcihOb2RlKiBub2RlKQogICAgICAg ICB7CiAgICAgICAgICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwogICAgICAgICAgICAgaWYg KExJS0VMWSghSXNvbGF0ZWRXb3JsZDo6Y291bnQoKSkpIHsKQEAgLTE0Nyw4ICsxMzYsNyBAQCBu YW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIH0KIAogICAgIHByaXZhdGU6Ci0gICAgICAgIHN0 YXRpYyB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IGdldEV4aXN0aW5nV3JhcHBlclNsb3coTm9kZSop OwotICAgICAgICBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGdldFdyYXBwZXJTbG93KE5v ZGUqKTsKKyAgICAgICAgc3RhdGljIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gZ2V0V3JhcHBlclNs b3coTm9kZSopOwogICAgIH07CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3Y4L2N1c3RvbS9WOE5vZGVDdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv djgvY3VzdG9tL1Y4Tm9kZUN1c3RvbS5jcHAKaW5kZXggMjQyNzExMzQ0NzdmYjAxMjY3MWY1YjY5 MWUwZWM0ZjA2ZWEyYmZhMi4uM2MxMGZhODE5NTBjN2I2NTRhZmIyZGY4MTNhMmUzNjkzMjA0ODlj MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Tm9kZUN1 c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Tm9kZUN1 c3RvbS5jcHAKQEAgLTE0Miw3ICsxNDIsNyBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdG9WOFNs b3coTm9kZSogaW1wbCwgYm9vbCBmb3JjZU5ld09iamVjdCkKICAgICAgICAgcmV0dXJuIHY4OjpO dWxsKCk7CiAKICAgICBpZiAoIWZvcmNlTmV3T2JqZWN0KSB7Ci0gICAgICAgIHY4OjpIYW5kbGU8 djg6OlZhbHVlPiB3cmFwcGVyID0gVjhET01XcmFwcGVyOjpnZXRFeGlzdGluZ1dyYXBwZXIoaW1w bCk7CisgICAgICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiB3cmFwcGVyID0gVjhET01XcmFwcGVy OjpnZXRXcmFwcGVyKGltcGwpOwogICAgICAgICBpZiAoIXdyYXBwZXIuSXNFbXB0eSgpKQogICAg ICAgICAgICAgcmV0dXJuIHdyYXBwZXI7CiAgICAgfQo= 131485 2012-03-12 18:35:52 -0700 2012-03-12 18:35:52 -0700 patch for landing bug-80920-20120313103550.patch text/plain 5915 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwNTE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWM3YmQ2ZmE2N2UyNjlh NDFjY2Y4YzYxNTIxNmI2NmY0M2RkMGQ4ZS4uYTY4MzhmZDJkYjQ4ZDg3NTAzNjc4Yzg0NWE3ZDNh NmU5N2NjM2NjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5IEBACiAyMDEyLTAzLTEyICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAorICAgICAgICBbVjhdW1JlZmFjdG9y aW5nXSBSZW1vdmUgZ2V0V3JhcHBlcigpIGFuZCBnZXRXcmFwcGVyU2xvdygpCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDkyMAorCisgICAgICAgIFJl dmlld2VkIGJ5IEFkYW0gQmFydGguCisKKyAgICAgICAgTm93IGdldFdyYXBwZXIoKSBpcyB0aGUg c2FtZSBhcyBnZXRFeGlzdGluZ1dyYXBwZXIoKS4KKyAgICAgICAgZ2V0V3JhcHBlclNsb3coKSBp cyB0aGUgc2FtZSBhcyBnZXRFeGlzdGluZ1dyYXBwZXJTbG93KCkuCisgICAgICAgIFRoaXMgcGF0 Y2ggcmVtb3ZlcyBnZXRXcmFwcGVyKCkgYW5kIGdldFdyYXBwZXJTbG93KCkuCisgICAgICAgIEFs c28gdGhpcyBwYXRjaCByZW5hbWVzIGdldEV4aXN0aW5nV3JhcHBlcigpIHRvIGdldENhY2hlZFdy YXBwZXIoKS4KKworICAgICAgICBObyB0ZXN0cy4gTm8gY2hhbmdlIGluIGJlaGF2aW9yLgorCisg ICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG06CisgICAgICAgIChH ZW5lcmF0ZUhlYWRlcik6CisgICAgICAgICogYmluZGluZ3MvdjgvVjhET01XcmFwcGVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlY4RE9NV3JhcHBlcjo6Z2V0V3JhcHBlclNsb3cpOgorICAgICAg ICAqIGJpbmRpbmdzL3Y4L1Y4RE9NV3JhcHBlci5oOgorICAgICAgICAoV2ViQ29yZTo6VjhET01X cmFwcGVyOjpnZXRXcmFwcGVyKToKKyAgICAgICAgKFY4RE9NV3JhcHBlcik6CisgICAgICAgICog YmluZGluZ3MvdjgvY3VzdG9tL1Y4Tm9kZUN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjp0 b1Y4U2xvdyk6CisKKzIwMTItMDMtMTIgIEtlbnRhcm8gSGFyYSAgPGhhcmFrZW5AY2hyb21pdW0u b3JnPgorCiAgICAgICAgIFtWOF1bUmVmYWN0b3JpbmddIE1ha2UgZ2V0V3JhcHBlclNsb3coKSBh bmQgZ2V0RXhpc3RpbmdXcmFwcGVyU2xvdygpIHNhbWUKICAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgwOTE2CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtIGIvU291cmNlL1dlYkNvcmUv YmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0KaW5kZXggYjNiY2U4NjBmZDE5Mjg3 N2NhNTFmZjMwY2UwMjc3ZDExYjljMTM4YS4uOThlYmIyMzIzMDhjNzMxMmIwMDk4YTA4NTM3ZmVh NmFkYWNmYmExNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9D b2RlR2VuZXJhdG9yVjgucG0KKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9D b2RlR2VuZXJhdG9yVjgucG0KQEAgLTQzNSw3ICs0MzUsNyBAQCBFTkQKIEFMV0FZU19JTkxJTkUg djg6OkhhbmRsZTx2ODo6T2JqZWN0PiAke2NsYXNzTmFtZX06OmV4aXN0aW5nV3JhcHBlcigke25h dGl2ZVR5cGV9KiBpbXBsKQogewogRU5ECi0gICAgbXkgJGdldFdyYXBwZXIgPSBJc05vZGVTdWJU eXBlKCRkYXRhTm9kZSkgPyAiVjhET01XcmFwcGVyOjpnZXRFeGlzdGluZ1dyYXBwZXIoaW1wbCki IDogIiR7ZG9tTWFwRnVuY3Rpb259LmdldChpbXBsKSI7CisgICAgbXkgJGdldFdyYXBwZXIgPSBJ c05vZGVTdWJUeXBlKCRkYXRhTm9kZSkgPyAiVjhET01XcmFwcGVyOjpnZXRDYWNoZWRXcmFwcGVy KGltcGwpIiA6ICIke2RvbU1hcEZ1bmN0aW9ufS5nZXQoaW1wbCkiOwogICAgIHB1c2goQGhlYWRl ckNvbnRlbnQsIDw8RU5EKTsKICAgICByZXR1cm4gJHtnZXRXcmFwcGVyfTsKIH0KQEAgLTQ4Myw3 ICs0ODMsNyBAQCBpbmxpbmUgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHRvVjgoTm9kZSogaW1wbCwg Ym9vbCBmb3JjZU5ld09iamVjdCA9IGZhbHNlKQogICAgICAgICByZXR1cm4gdjg6Ok51bGwoKTsK ICAgICBpZiAoVU5MSUtFTFkoZm9yY2VOZXdPYmplY3QpKQogICAgICAgICByZXR1cm4gdG9WOFNs b3coaW1wbCwgZm9yY2VOZXdPYmplY3QpOwotICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiB3cmFw cGVyID0gVjhET01XcmFwcGVyOjpnZXRXcmFwcGVyKGltcGwpOworICAgIHY4OjpIYW5kbGU8djg6 OlZhbHVlPiB3cmFwcGVyID0gVjhET01XcmFwcGVyOjpnZXRDYWNoZWRXcmFwcGVyKGltcGwpOwog ICAgIGlmICghd3JhcHBlci5Jc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiB3cmFwcGVyOwogICAg IHJldHVybiB0b1Y4U2xvdyhpbXBsLCBmYWxzZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy92OC9WOERPTVdyYXBwZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv djgvVjhET01XcmFwcGVyLmNwcAppbmRleCA4ZTVjYmEwM2ZkZDZkNzQ3ZDZhOGFkMjc2NDVkMmMw ODJhNzMzMGYwLi45ZDBmYjdjNWQ2ODU4ZWM5YWJhOGIzYjQwY2I1ZjMwZjZmYTA1ZjY4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdyYXBwZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NV3JhcHBlci5jcHAKQEAgLTY5LDcgKzY5 LDcgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1zdGF0aWMgQUxXQVlTX0lOTElORSB2ODo6 SGFuZGxlPHY4OjpPYmplY3Q+IGdldEV4aXN0aW5nV3JhcHBlcklubGluZShOb2RlKiBub2RlKQor c3RhdGljIEFMV0FZU19JTkxJTkUgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBnZXRDYWNoZWRXcmFw cGVySW5saW5lKE5vZGUqIG5vZGUpCiB7CiAgICAgVjhJc29sYXRlZENvbnRleHQqIGNvbnRleHQg PSBWOElzb2xhdGVkQ29udGV4dDo6Z2V0RW50ZXJlZCgpOwogICAgIGlmIChMSUtFTFkoIWNvbnRl eHQpKSB7CkBAIC0zMDMsMTQgKzMwMyw5IEBAIGJvb2wgVjhET01XcmFwcGVyOjppc1dyYXBwZXJP ZlR5cGUodjg6OkhhbmRsZTx2ODo6VmFsdWU+IHZhbHVlLCBXcmFwcGVyVHlwZUluZm8qCiAgICAg cmV0dXJuIHR5cGVJbmZvID09IHR5cGU7CiB9CiAKLXY4OjpIYW5kbGU8djg6Ok9iamVjdD4gVjhE T01XcmFwcGVyOjpnZXRFeGlzdGluZ1dyYXBwZXJTbG93KE5vZGUqIG5vZGUpCit2ODo6SGFuZGxl PHY4OjpPYmplY3Q+IFY4RE9NV3JhcHBlcjo6Z2V0Q2FjaGVkV3JhcHBlclNsb3coTm9kZSogbm9k ZSkKIHsKLSAgICByZXR1cm4gZ2V0RXhpc3RpbmdXcmFwcGVySW5saW5lKG5vZGUpOwotfQotCi12 ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhET01XcmFwcGVyOjpnZXRXcmFwcGVyU2xvdyhOb2RlKiBu b2RlKQotewotICAgIHJldHVybiBnZXRFeGlzdGluZ1dyYXBwZXJJbmxpbmUobm9kZSk7CisgICAg cmV0dXJuIGdldENhY2hlZFdyYXBwZXJJbmxpbmUobm9kZSk7CiB9CiAKICNkZWZpbmUgVFJZX1RP X1dSQVBfV0lUSF9JTlRFUkZBQ0UoaW50ZXJmYWNlTmFtZSkgXApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XcmFwcGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy92OC9WOERPTVdyYXBwZXIuaAppbmRleCBkM2NhNTFlMDY5YzIwNzVmNGRiMjM5YmJiNTcz OTU0ZmE3MjFjZDg2Li40ZWQzODUxYTI0MGNhMDNmZDdiODE2MDA5ODVjY2JjY2U2MTkyMzMxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdyYXBwZXIuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdyYXBwZXIuaApAQCAtMTI0LDcgKzEy NCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICBzdGF0aWMgdjg6OkxvY2FsPHY4 OjpPYmplY3Q+IGluc3RhbnRpYXRlVjhPYmplY3QoVjhQcm94eSogcHJveHksIFdyYXBwZXJUeXBl SW5mbyosIHZvaWQqIGltcGwpOwogCi0gICAgICAgIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpPYmpl Y3Q+IGdldEV4aXN0aW5nV3JhcHBlcihOb2RlKiBub2RlKQorICAgICAgICBzdGF0aWMgdjg6Okhh bmRsZTx2ODo6T2JqZWN0PiBnZXRDYWNoZWRXcmFwcGVyKE5vZGUqIG5vZGUpCiAgICAgICAgIHsK ICAgICAgICAgICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CiAgICAgICAgICAgICBpZiAoTElL RUxZKCFJc29sYXRlZFdvcmxkOjpjb3VudCgpKSkgewpAQCAtMTMyLDIzICsxMzIsMTEgQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAgICAgIGlmIChMSUtFTFkoISF3cmFwcGVyKSkK ICAgICAgICAgICAgICAgICAgICAgcmV0dXJuICp3cmFwcGVyOwogICAgICAgICAgICAgfQotICAg ICAgICAgICAgcmV0dXJuIGdldEV4aXN0aW5nV3JhcHBlclNsb3cobm9kZSk7Ci0gICAgICAgIH0K LQotICAgICAgICBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGdldFdyYXBwZXIoTm9kZSog bm9kZSkKLSAgICAgICAgewotICAgICAgICAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKLSAg ICAgICAgICAgIGlmIChMSUtFTFkoIUlzb2xhdGVkV29ybGQ6OmNvdW50KCkpKSB7Ci0gICAgICAg ICAgICAgICAgdjg6OlBlcnNpc3RlbnQ8djg6Ok9iamVjdD4qIHdyYXBwZXIgPSBub2RlLT53cmFw cGVyKCk7Ci0gICAgICAgICAgICAgICAgaWYgKExJS0VMWSghIXdyYXBwZXIpKQotICAgICAgICAg ICAgICAgICAgICByZXR1cm4gKndyYXBwZXI7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBy ZXR1cm4gZ2V0V3JhcHBlclNsb3cobm9kZSk7CisgICAgICAgICAgICByZXR1cm4gZ2V0Q2FjaGVk V3JhcHBlclNsb3cobm9kZSk7CiAgICAgICAgIH0KIAogICAgIHByaXZhdGU6Ci0gICAgICAgIHN0 YXRpYyB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IGdldEV4aXN0aW5nV3JhcHBlclNsb3coTm9kZSop OwotICAgICAgICBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGdldFdyYXBwZXJTbG93KE5v ZGUqKTsKKyAgICAgICAgc3RhdGljIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gZ2V0Q2FjaGVkV3Jh cHBlclNsb3coTm9kZSopOwogICAgIH07CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL3Y4L2N1c3RvbS9WOE5vZGVDdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvdjgvY3VzdG9tL1Y4Tm9kZUN1c3RvbS5jcHAKaW5kZXggMjQyNzExMzQ0NzdmYjAxMjY3 MWY1YjY5MWUwZWM0ZjA2ZWEyYmZhMi4uZDZmNGJiZWYzOTg2MWU5Yjc4MGJmNDFlOTFmZjE1MTli MzQ1ODVkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4 Tm9kZUN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4 Tm9kZUN1c3RvbS5jcHAKQEAgLTE0Miw3ICsxNDIsNyBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4g dG9WOFNsb3coTm9kZSogaW1wbCwgYm9vbCBmb3JjZU5ld09iamVjdCkKICAgICAgICAgcmV0dXJu IHY4OjpOdWxsKCk7CiAKICAgICBpZiAoIWZvcmNlTmV3T2JqZWN0KSB7Ci0gICAgICAgIHY4OjpI YW5kbGU8djg6OlZhbHVlPiB3cmFwcGVyID0gVjhET01XcmFwcGVyOjpnZXRFeGlzdGluZ1dyYXBw ZXIoaW1wbCk7CisgICAgICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiB3cmFwcGVyID0gVjhET01X cmFwcGVyOjpnZXRDYWNoZWRXcmFwcGVyKGltcGwpOwogICAgICAgICBpZiAoIXdyYXBwZXIuSXNF bXB0eSgpKQogICAgICAgICAgICAgcmV0dXJuIHdyYXBwZXI7CiAgICAgfQo=