73757 2011-12-03 20:06:01 -0800 Use HashMap<unique_ptr> and Vector<unique_ptr> instead of deprecatedDeleteAllValues 2014-04-17 10:00:47 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 73758 73759 73778 73780 73781 73783 73784 73785 75734 96469 115652 115653 115655 115670 115678 115729 115730 115731 121082 122492 122495 122496 122499 131631 1 darin darin andersca benjamin bfulgham cmarcelo commit-queue nick.diego oldest_to_newest 514613 0 darin 2011-12-03 20:06:01 -0800 Now that HashMap works with OwnPtr mapped values, we want to go through all the sites using deleteAllValues on a HashMap and change them to use OwnPtr instead. Once we’ve done that, we may decide to remove the deleteAllValues function. 919172 1 darin 2013-08-20 12:45:52 -0700 Anders, did you finish the job on this? Should I mark it as resolved? 919187 2 andersca 2013-08-20 13:18:34 -0700 Looks like there’s a handful of uses left. 939052 3 darin 2013-10-11 21:21:06 -0700 Here’s all that’s left: Source/WebCore/platform/blackberry/CookieMap.cpp: deleteAllValues(m_subdomains); Source/WebCore/platform/network/blackberry/rss/RSSParserBase.cpp: deleteAllValues(m_items); Source/WebCore/platform/win/WCDataObject.cpp: WTF::deleteAllValues(m_formats); Source/WebKit/blackberry/WebKitSupport/InPageSearchManager.cpp: deleteAllValues(m_deferredScopingWork); Source/WebKit2/Shared/Plugins/NPRemoteObjectMap.cpp: deleteAllValues(messageReceivers); Tools/DumpRenderTree/win/DRTDataObject.cpp: WTF::deleteAllValues(m_formats); Tools/DumpRenderTree/win/UIDelegate.cpp: ~DRTUndoStack() { deleteAllValues(m_undoVector); } Tools/DumpRenderTree/win/UIDelegate.cpp: void clear() { deleteAllValues(m_undoVector); m_undoVector.clear(); } And then we are done. 1000378 4 darin 2014-04-13 21:31:22 -0700 We are now down to 5 uses of this. One in NPRemoteObjectMap.cpp, and the other 4 all in Windows-specific code. 1000382 5 bfulgham 2014-04-13 21:58:46 -0700 (In reply to comment #4) > We are now down to 5 uses of this. One in NPRemoteObjectMap.cpp, and the other 4 all in Windows-specific code. I'll see about those Windows files ASAP. 1001480 6 229519 darin 2014-04-16 20:38:49 -0700 Created attachment 229519 Patch 1001539 7 229542 darin 2014-04-17 07:15:58 -0700 Created attachment 229542 Patch 1001569 8 bfulgham 2014-04-17 09:15:06 -0700 The build failure on Windows EWS looks like the bot has a zombie build process holding onto a file. I'll ask Lucas to reboot the bot. 1001571 9 229542 bfulgham 2014-04-17 09:18:33 -0700 Comment on attachment 229542 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=229542&action=review r=me > Source/WTF/wtf/Vector.h:-1216 > -} Yay! 1001593 10 darin 2014-04-17 10:00:47 -0700 Committed r167432: <http://trac.webkit.org/changeset/167432> 229519 2014-04-16 20:38:49 -0700 2014-04-17 07:15:52 -0700 Patch bug-73757-20140416203834.patch text/plain 4956 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3NDEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGM5NWE5ZTAzZDJhMjJhMjY1ODY1NmU4 N2JiMDAxYjBkNzNhYjljYmYuLjYzMjBjNjM3NWQ0MTQwNGFhNWJlNjU3NGRhYjRiMWUyMWFiMDUy MjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTQtMDQtMTYgIERhcmluIEFkbGVyICA8ZGFyaW5A YXBwbGUuY29tPgorCisgICAgICAgIFVzZSBIYXNoTWFwPHVuaXF1ZV9wdHI+IGFuZCBWZWN0b3I8 dW5pcXVlX3B0cj4gaW5zdGVhZCBvZiBkZXByZWNhdGVkRGVsZXRlQWxsVmFsdWVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03Mzc1NworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd3RmL1ZlY3Rvci5oOgor ICAgICAgICAoV1RGOjpkZXByZWNhdGVkRGVsZXRlQWxsVmFsdWVzKTogRGVsZXRlZC4KKwogMjAx NC0wNC0xNiAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAg ICBEb24ndCBpbmNsdWRlIENyeXB0b2dyYXBoaWNhbGx5UmFuZG9tTnVtYmVyLmggaW4gU3RyaW5n SW1wbC5oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDEzNzgxMTI0Y2M0ODI0MjdlMGM4MzM2MzkyM2UwYzBiNzli ZDU1OC4uNDZkMjExNGJkOTA0MTJjYTVhNDEzMjFhYWZhNDE0YzU3ZTk3MDg1OSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE2IEBACisyMDE0LTA0LTE2ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxl LmNvbT4KKworICAgICAgICBVc2UgSGFzaE1hcDx1bmlxdWVfcHRyPiBhbmQgVmVjdG9yPHVuaXF1 ZV9wdHI+IGluc3RlYWQgb2YgZGVwcmVjYXRlZERlbGV0ZUFsbFZhbHVlcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzM3NTcKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNoYXJlZC9QbHVnaW5zL05QUmVt b3RlT2JqZWN0TWFwLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TlBSZW1vdGVPYmplY3RNYXA6OnBs dWdpbkRlc3Ryb3llZCk6IFVzZSBuZXctc3R5bGUgY29kZSBhbmQgd3JpdGUgdGhlCisgICAgICAg IGRlcHJlY2F0ZWREZWxldGVBbGxWYWx1ZXMgZnVuY3Rpb24gb3V0IHVzaW5nIGEgbG9vcC4gTWln aHQgYmUgbmljZSB0byByZXR1cm4gaGVyZQorICAgICAgICBhbmQgdXNlIHVuaXF1ZV9wdHIgaW5z dGVhZCBzb21lIGRheSwgYnV0IEkgdHJpZWQgdGhhdCBiZWZvcmUgYW5kIGdvdCBpdCB3cm9uZywg c28KKyAgICAgICAgbGV0cyBkbyB0aGF0IGFub3RoZXIgdGltZS4KKwogMjAxNC0wNC0xNiAgQmVu amFtaW4gUG91bGFpbiAgPGJwb3VsYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXVtXSzJd IEZpeCB0aGUgRGlkQ29tbWl0TG9hZCBpbml0aWFsIHNjcm9sbGluZyBwb3NpdGlvbgpkaWZmIC0t Z2l0IGEvU291cmNlL1dURi93dGYvVmVjdG9yLmggYi9Tb3VyY2UvV1RGL3d0Zi9WZWN0b3IuaApp bmRleCAwM2VjYTBkYzg1MWJkM2IwNDEyZGQxNDJlMzE2NzA5MWU5ZDY5ZGIzLi4yZTQ0YTdmZDZh NTliODdhMDgyMWJmZjg4MTRhMzBlYzM2NTg4ODU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0 Zi9WZWN0b3IuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9WZWN0b3IuaApAQCAtMTIwNywxNSArMTIw Nyw2IEBAIGlubGluZSB2b2lkIFZlY3RvcjxULCBpbmxpbmVDYXBhY2l0eSwgT3ZlcmZsb3dIYW5k bGVyPjo6Y2hlY2tDb25zaXN0ZW5jeSgpCiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFQsIHNpemVf dCBpbmxpbmVDYXBhY2l0eSwgdHlwZW5hbWUgT3ZlcmZsb3dIYW5kbGVyPgotdm9pZCBkZXByZWNh dGVkRGVsZXRlQWxsVmFsdWVzKGNvbnN0IFZlY3RvcjxULCBpbmxpbmVDYXBhY2l0eSwgT3ZlcmZs b3dIYW5kbGVyPiYgY29sbGVjdGlvbikKLXsKLSAgICB0eXBlZGVmIHR5cGVuYW1lIFZlY3RvcjxU LCBpbmxpbmVDYXBhY2l0eSwgT3ZlcmZsb3dIYW5kbGVyPjo6Y29uc3RfaXRlcmF0b3IgaXRlcmF0 b3I7Ci0gICAgaXRlcmF0b3IgZW5kID0gY29sbGVjdGlvbi5lbmQoKTsKLSAgICBmb3IgKGl0ZXJh dG9yIGl0ID0gY29sbGVjdGlvbi5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpCi0gICAgICAgIGRl bGV0ZSAqaXQ7Ci19Ci0KLXRlbXBsYXRlPHR5cGVuYW1lIFQsIHNpemVfdCBpbmxpbmVDYXBhY2l0 eSwgdHlwZW5hbWUgT3ZlcmZsb3dIYW5kbGVyPgogaW5saW5lIHZvaWQgc3dhcChWZWN0b3I8VCwg aW5saW5lQ2FwYWNpdHksIE92ZXJmbG93SGFuZGxlcj4mIGEsIFZlY3RvcjxULCBpbmxpbmVDYXBh Y2l0eSwgT3ZlcmZsb3dIYW5kbGVyPiYgYikKIHsKICAgICBhLnN3YXAoYik7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OUFJlbW90ZU9iamVjdE1hcC5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OUFJlbW90ZU9iamVjdE1hcC5jcHAKaW5kZXgg ODEzOGMyZmY3YjBkMTRlNjUzMmVhYjkwMmM4YjI4M2QxZTA1YTM1MS4uMTI0MTEyNGIwYzkyYTVk NTNmZjM3MTE3ZjFhMzNkZGMyMDc1ODlhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hh cmVkL1BsdWdpbnMvTlBSZW1vdGVPYmplY3RNYXAuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9QbHVnaW5zL05QUmVtb3RlT2JqZWN0TWFwLmNwcApAQCAtMTk2LDM0ICsxOTYsMjUgQEAg TlBWYXJpYW50IE5QUmVtb3RlT2JqZWN0TWFwOjpucFZhcmlhbnREYXRhVG9OUFZhcmlhbnQoY29u c3QgTlBWYXJpYW50RGF0YSYgbnBWYXIKIAogdm9pZCBOUFJlbW90ZU9iamVjdE1hcDo6cGx1Z2lu RGVzdHJveWVkKFBsdWdpbiogcGx1Z2luKQogewotICAgIFZlY3RvcjxOUE9iamVjdE1lc3NhZ2VS ZWNlaXZlcio+IG1lc3NhZ2VSZWNlaXZlcnM7Ci0KLSAgICAvLyBHYXRoZXIgdGhlIHJlY2VpdmVy cyBhc3NvY2lhdGVkIHdpdGggdGhpcyBwbHVnLWluLgotICAgIGZvciAoSGFzaE1hcDx1aW50NjRf dCwgTlBPYmplY3RNZXNzYWdlUmVjZWl2ZXIqPjo6Y29uc3RfaXRlcmF0b3IgaXQgPSBtX3JlZ2lz dGVyZWROUE9iamVjdHMuYmVnaW4oKSwgZW5kID0gbV9yZWdpc3RlcmVkTlBPYmplY3RzLmVuZCgp OyBpdCAhPSBlbmQ7ICsraXQpIHsKLSAgICAgICAgTlBPYmplY3RNZXNzYWdlUmVjZWl2ZXIqIG5w T2JqZWN0TWVzc2FnZVJlY2VpdmVyID0gaXQtPnZhbHVlOwotICAgICAgICBpZiAobnBPYmplY3RN ZXNzYWdlUmVjZWl2ZXItPnBsdWdpbigpID09IHBsdWdpbikKLSAgICAgICAgICAgIG1lc3NhZ2VS ZWNlaXZlcnMuYXBwZW5kKG5wT2JqZWN0TWVzc2FnZVJlY2VpdmVyKTsKLSAgICB9Ci0KLSAgICAv LyBOb3cgZGVsZXRlIGFsbCB0aGUgcmVjZWl2ZXJzLgotICAgIGRlcHJlY2F0ZWREZWxldGVBbGxW YWx1ZXMobWVzc2FnZVJlY2VpdmVycyk7Ci0KLSAgICBWZWN0b3I8TlBPYmplY3RQcm94eSo+IG9i amVjdFByb3hpZXM7Ci0gICAgZm9yIChIYXNoU2V0PE5QT2JqZWN0UHJveHkqPjo6Y29uc3RfaXRl cmF0b3IgaXQgPSBtX25wT2JqZWN0UHJveGllcy5iZWdpbigpLCBlbmQgPSBtX25wT2JqZWN0UHJv eGllcy5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgIE5QT2JqZWN0UHJveHkqIG5w T2JqZWN0UHJveHkgPSAqaXQ7Ci0KLSAgICAgICAgaWYgKG5wT2JqZWN0UHJveHktPnBsdWdpbigp ID09IHBsdWdpbikKLSAgICAgICAgICAgIG9iamVjdFByb3hpZXMuYXBwZW5kKG5wT2JqZWN0UHJv eHkpOworICAgIC8vIEdhdGhlciBhbmQgZGVsZXRlIHRoZSByZWNlaXZlcnMgYXNzb2NpYXRlZCB3 aXRoIHRoaXMgcGx1Zy1pbi4KKyAgICBWZWN0b3I8TlBPYmplY3RNZXNzYWdlUmVjZWl2ZXIqPiBy ZWNlaXZlcnM7CisgICAgZm9yIChhdXRvKiByZWNlaXZlciA6IG1fcmVnaXN0ZXJlZE5QT2JqZWN0 cy52YWx1ZXMoKSkgeworICAgICAgICBpZiAocmVjZWl2ZXItPnBsdWdpbigpID09IHBsdWdpbikK KyAgICAgICAgICAgIHJlY2VpdmVycy5hcHBlbmQocmVjZWl2ZXIpOwogICAgIH0KKyAgICBmb3Ig KGF1dG8qIHJlY2VpdmVyIDogcmVjZWl2ZXJzKQorICAgICAgICBkZWxldGUgcmVjZWl2ZXI7CiAK ICAgICAvLyBJbnZhbGlkYXRlIGFuZCByZW1vdmUgYWxsIHByb3hpZXMgYXNzb2NpYXRlZCB3aXRo IHRoaXMgcGx1Zy1pbi4KLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG9iamVjdFByb3hpZXMu c2l6ZSgpOyArK2kpIHsKLSAgICAgICAgTlBPYmplY3RQcm94eSogbnBPYmplY3RQcm94eSA9IG9i amVjdFByb3hpZXNbaV07Ci0KLSAgICAgICAgbnBPYmplY3RQcm94eS0+aW52YWxpZGF0ZSgpOwot Ci0gICAgICAgIEFTU0VSVChtX25wT2JqZWN0UHJveGllcy5jb250YWlucyhucE9iamVjdFByb3h5 KSk7Ci0gICAgICAgIG1fbnBPYmplY3RQcm94aWVzLnJlbW92ZShucE9iamVjdFByb3h5KTsKKyAg ICBWZWN0b3I8TlBPYmplY3RQcm94eSo+IHByb3hpZXM7CisgICAgZm9yIChhdXRvKiBwcm94eSA6 IG1fbnBPYmplY3RQcm94aWVzKSB7CisgICAgICAgIGlmIChwcm94eS0+cGx1Z2luKCkgPT0gcGx1 Z2luKQorICAgICAgICAgICAgb2JqZWN0UHJveGllcy5hcHBlbmQocHJveHkpOworICAgIH0KKyAg ICBmb3IgKGF1dG8qIHByb3h5IDogcHJveGllcykgeworICAgICAgICBwcm94eS0+aW52YWxpZGF0 ZSgpOworICAgICAgICBBU1NFUlQobV9ucE9iamVjdFByb3hpZXMuY29udGFpbnMocHJveHkpKTsK KyAgICAgICAgbV9ucE9iamVjdFByb3hpZXMucmVtb3ZlKHByb3h5KTsKICAgICB9CiB9CiAK 229542 2014-04-17 07:15:58 -0700 2014-04-17 09:18:33 -0700 Patch bug-73757-20140417071545.patch text/plain 4950 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3NDEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGM5NWE5ZTAzZDJhMjJhMjY1ODY1NmU4 N2JiMDAxYjBkNzNhYjljYmYuLjYzMjBjNjM3NWQ0MTQwNGFhNWJlNjU3NGRhYjRiMWUyMWFiMDUy MjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTQtMDQtMTYgIERhcmluIEFkbGVyICA8ZGFyaW5A YXBwbGUuY29tPgorCisgICAgICAgIFVzZSBIYXNoTWFwPHVuaXF1ZV9wdHI+IGFuZCBWZWN0b3I8 dW5pcXVlX3B0cj4gaW5zdGVhZCBvZiBkZXByZWNhdGVkRGVsZXRlQWxsVmFsdWVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03Mzc1NworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd3RmL1ZlY3Rvci5oOgor ICAgICAgICAoV1RGOjpkZXByZWNhdGVkRGVsZXRlQWxsVmFsdWVzKTogRGVsZXRlZC4KKwogMjAx NC0wNC0xNiAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAg ICBEb24ndCBpbmNsdWRlIENyeXB0b2dyYXBoaWNhbGx5UmFuZG9tTnVtYmVyLmggaW4gU3RyaW5n SW1wbC5oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDEzNzgxMTI0Y2M0ODI0MjdlMGM4MzM2MzkyM2UwYzBiNzli ZDU1OC4uNDZkMjExNGJkOTA0MTJjYTVhNDEzMjFhYWZhNDE0YzU3ZTk3MDg1OSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE2IEBACisyMDE0LTA0LTE2ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxl LmNvbT4KKworICAgICAgICBVc2UgSGFzaE1hcDx1bmlxdWVfcHRyPiBhbmQgVmVjdG9yPHVuaXF1 ZV9wdHI+IGluc3RlYWQgb2YgZGVwcmVjYXRlZERlbGV0ZUFsbFZhbHVlcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzM3NTcKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNoYXJlZC9QbHVnaW5zL05QUmVt b3RlT2JqZWN0TWFwLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TlBSZW1vdGVPYmplY3RNYXA6OnBs dWdpbkRlc3Ryb3llZCk6IFVzZSBuZXctc3R5bGUgY29kZSBhbmQgd3JpdGUgdGhlCisgICAgICAg IGRlcHJlY2F0ZWREZWxldGVBbGxWYWx1ZXMgZnVuY3Rpb24gb3V0IHVzaW5nIGEgbG9vcC4gTWln aHQgYmUgbmljZSB0byByZXR1cm4gaGVyZQorICAgICAgICBhbmQgdXNlIHVuaXF1ZV9wdHIgaW5z dGVhZCBzb21lIGRheSwgYnV0IEkgdHJpZWQgdGhhdCBiZWZvcmUgYW5kIGdvdCBpdCB3cm9uZywg c28KKyAgICAgICAgbGV0cyBkbyB0aGF0IGFub3RoZXIgdGltZS4KKwogMjAxNC0wNC0xNiAgQmVu amFtaW4gUG91bGFpbiAgPGJwb3VsYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXVtXSzJd IEZpeCB0aGUgRGlkQ29tbWl0TG9hZCBpbml0aWFsIHNjcm9sbGluZyBwb3NpdGlvbgpkaWZmIC0t Z2l0IGEvU291cmNlL1dURi93dGYvVmVjdG9yLmggYi9Tb3VyY2UvV1RGL3d0Zi9WZWN0b3IuaApp bmRleCAwM2VjYTBkYzg1MWJkM2IwNDEyZGQxNDJlMzE2NzA5MWU5ZDY5ZGIzLi4yZTQ0YTdmZDZh NTliODdhMDgyMWJmZjg4MTRhMzBlYzM2NTg4ODU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0 Zi9WZWN0b3IuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9WZWN0b3IuaApAQCAtMTIwNywxNSArMTIw Nyw2IEBAIGlubGluZSB2b2lkIFZlY3RvcjxULCBpbmxpbmVDYXBhY2l0eSwgT3ZlcmZsb3dIYW5k bGVyPjo6Y2hlY2tDb25zaXN0ZW5jeSgpCiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFQsIHNpemVf dCBpbmxpbmVDYXBhY2l0eSwgdHlwZW5hbWUgT3ZlcmZsb3dIYW5kbGVyPgotdm9pZCBkZXByZWNh dGVkRGVsZXRlQWxsVmFsdWVzKGNvbnN0IFZlY3RvcjxULCBpbmxpbmVDYXBhY2l0eSwgT3ZlcmZs b3dIYW5kbGVyPiYgY29sbGVjdGlvbikKLXsKLSAgICB0eXBlZGVmIHR5cGVuYW1lIFZlY3RvcjxU LCBpbmxpbmVDYXBhY2l0eSwgT3ZlcmZsb3dIYW5kbGVyPjo6Y29uc3RfaXRlcmF0b3IgaXRlcmF0 b3I7Ci0gICAgaXRlcmF0b3IgZW5kID0gY29sbGVjdGlvbi5lbmQoKTsKLSAgICBmb3IgKGl0ZXJh dG9yIGl0ID0gY29sbGVjdGlvbi5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpCi0gICAgICAgIGRl bGV0ZSAqaXQ7Ci19Ci0KLXRlbXBsYXRlPHR5cGVuYW1lIFQsIHNpemVfdCBpbmxpbmVDYXBhY2l0 eSwgdHlwZW5hbWUgT3ZlcmZsb3dIYW5kbGVyPgogaW5saW5lIHZvaWQgc3dhcChWZWN0b3I8VCwg aW5saW5lQ2FwYWNpdHksIE92ZXJmbG93SGFuZGxlcj4mIGEsIFZlY3RvcjxULCBpbmxpbmVDYXBh Y2l0eSwgT3ZlcmZsb3dIYW5kbGVyPiYgYikKIHsKICAgICBhLnN3YXAoYik7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OUFJlbW90ZU9iamVjdE1hcC5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OUFJlbW90ZU9iamVjdE1hcC5jcHAKaW5kZXgg ODEzOGMyZmY3YjBkMTRlNjUzMmVhYjkwMmM4YjI4M2QxZTA1YTM1MS4uOTcxMTAyMzZiOWUyY2Yz YWRjMjY1MzQ5MzYyZWEwZTcyOTU1MTdiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hh cmVkL1BsdWdpbnMvTlBSZW1vdGVPYmplY3RNYXAuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9QbHVnaW5zL05QUmVtb3RlT2JqZWN0TWFwLmNwcApAQCAtMTk2LDM0ICsxOTYsMjUgQEAg TlBWYXJpYW50IE5QUmVtb3RlT2JqZWN0TWFwOjpucFZhcmlhbnREYXRhVG9OUFZhcmlhbnQoY29u c3QgTlBWYXJpYW50RGF0YSYgbnBWYXIKIAogdm9pZCBOUFJlbW90ZU9iamVjdE1hcDo6cGx1Z2lu RGVzdHJveWVkKFBsdWdpbiogcGx1Z2luKQogewotICAgIFZlY3RvcjxOUE9iamVjdE1lc3NhZ2VS ZWNlaXZlcio+IG1lc3NhZ2VSZWNlaXZlcnM7Ci0KLSAgICAvLyBHYXRoZXIgdGhlIHJlY2VpdmVy cyBhc3NvY2lhdGVkIHdpdGggdGhpcyBwbHVnLWluLgotICAgIGZvciAoSGFzaE1hcDx1aW50NjRf dCwgTlBPYmplY3RNZXNzYWdlUmVjZWl2ZXIqPjo6Y29uc3RfaXRlcmF0b3IgaXQgPSBtX3JlZ2lz dGVyZWROUE9iamVjdHMuYmVnaW4oKSwgZW5kID0gbV9yZWdpc3RlcmVkTlBPYmplY3RzLmVuZCgp OyBpdCAhPSBlbmQ7ICsraXQpIHsKLSAgICAgICAgTlBPYmplY3RNZXNzYWdlUmVjZWl2ZXIqIG5w T2JqZWN0TWVzc2FnZVJlY2VpdmVyID0gaXQtPnZhbHVlOwotICAgICAgICBpZiAobnBPYmplY3RN ZXNzYWdlUmVjZWl2ZXItPnBsdWdpbigpID09IHBsdWdpbikKLSAgICAgICAgICAgIG1lc3NhZ2VS ZWNlaXZlcnMuYXBwZW5kKG5wT2JqZWN0TWVzc2FnZVJlY2VpdmVyKTsKLSAgICB9Ci0KLSAgICAv LyBOb3cgZGVsZXRlIGFsbCB0aGUgcmVjZWl2ZXJzLgotICAgIGRlcHJlY2F0ZWREZWxldGVBbGxW YWx1ZXMobWVzc2FnZVJlY2VpdmVycyk7Ci0KLSAgICBWZWN0b3I8TlBPYmplY3RQcm94eSo+IG9i amVjdFByb3hpZXM7Ci0gICAgZm9yIChIYXNoU2V0PE5QT2JqZWN0UHJveHkqPjo6Y29uc3RfaXRl cmF0b3IgaXQgPSBtX25wT2JqZWN0UHJveGllcy5iZWdpbigpLCBlbmQgPSBtX25wT2JqZWN0UHJv eGllcy5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgIE5QT2JqZWN0UHJveHkqIG5w T2JqZWN0UHJveHkgPSAqaXQ7Ci0KLSAgICAgICAgaWYgKG5wT2JqZWN0UHJveHktPnBsdWdpbigp ID09IHBsdWdpbikKLSAgICAgICAgICAgIG9iamVjdFByb3hpZXMuYXBwZW5kKG5wT2JqZWN0UHJv eHkpOworICAgIC8vIEdhdGhlciBhbmQgZGVsZXRlIHRoZSByZWNlaXZlcnMgYXNzb2NpYXRlZCB3 aXRoIHRoaXMgcGx1Zy1pbi4KKyAgICBWZWN0b3I8TlBPYmplY3RNZXNzYWdlUmVjZWl2ZXIqPiBy ZWNlaXZlcnM7CisgICAgZm9yIChhdXRvKiByZWNlaXZlciA6IG1fcmVnaXN0ZXJlZE5QT2JqZWN0 cy52YWx1ZXMoKSkgeworICAgICAgICBpZiAocmVjZWl2ZXItPnBsdWdpbigpID09IHBsdWdpbikK KyAgICAgICAgICAgIHJlY2VpdmVycy5hcHBlbmQocmVjZWl2ZXIpOwogICAgIH0KKyAgICBmb3Ig KGF1dG8qIHJlY2VpdmVyIDogcmVjZWl2ZXJzKQorICAgICAgICBkZWxldGUgcmVjZWl2ZXI7CiAK ICAgICAvLyBJbnZhbGlkYXRlIGFuZCByZW1vdmUgYWxsIHByb3hpZXMgYXNzb2NpYXRlZCB3aXRo IHRoaXMgcGx1Zy1pbi4KLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG9iamVjdFByb3hpZXMu c2l6ZSgpOyArK2kpIHsKLSAgICAgICAgTlBPYmplY3RQcm94eSogbnBPYmplY3RQcm94eSA9IG9i amVjdFByb3hpZXNbaV07Ci0KLSAgICAgICAgbnBPYmplY3RQcm94eS0+aW52YWxpZGF0ZSgpOwot Ci0gICAgICAgIEFTU0VSVChtX25wT2JqZWN0UHJveGllcy5jb250YWlucyhucE9iamVjdFByb3h5 KSk7Ci0gICAgICAgIG1fbnBPYmplY3RQcm94aWVzLnJlbW92ZShucE9iamVjdFByb3h5KTsKKyAg ICBWZWN0b3I8TlBPYmplY3RQcm94eSo+IHByb3hpZXM7CisgICAgZm9yIChhdXRvKiBwcm94eSA6 IG1fbnBPYmplY3RQcm94aWVzKSB7CisgICAgICAgIGlmIChwcm94eS0+cGx1Z2luKCkgPT0gcGx1 Z2luKQorICAgICAgICAgICAgcHJveGllcy5hcHBlbmQocHJveHkpOworICAgIH0KKyAgICBmb3Ig KGF1dG8qIHByb3h5IDogcHJveGllcykgeworICAgICAgICBwcm94eS0+aW52YWxpZGF0ZSgpOwor ICAgICAgICBBU1NFUlQobV9ucE9iamVjdFByb3hpZXMuY29udGFpbnMocHJveHkpKTsKKyAgICAg ICAgbV9ucE9iamVjdFByb3hpZXMucmVtb3ZlKHByb3h5KTsKICAgICB9CiB9CiAK