130573 2014-03-21 02:16:01 -0700 [WK2] Refine WebKit2 BatteryStatus code 2014-03-23 21:38:26 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jinwoo7.song jinwoo7.song bunhere cdumez commit-queue gyuyoung.kim sergio oldest_to_newest 992988 0 jinwoo7.song 2014-03-21 02:16:01 -0700 Refinements - Return PassRef instead of PassRefPtr in create methods - Use auto instead of iterator 992995 1 227405 jinwoo7.song 2014-03-21 02:44:51 -0700 Created attachment 227405 Patch 993653 2 227405 andersca 2014-03-23 08:18:36 -0700 Comment on attachment 227405 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=227405&action=review > Source/WebKit2/WebProcess/Battery/WebBatteryManager.cpp:80 > + for (auto it = m_pageSet.begin(), end = m_pageSet.end(); it != end; ++it) { This can just use the range for syntax, for (auto* page : m_pageSet) > Source/WebKit2/WebProcess/Battery/WebBatteryManager.cpp:91 > + for (auto it = m_pageSet.begin(), end = m_pageSet.end(); it != end; ++it) { Ditto. 993707 3 227621 jinwoo7.song 2014-03-23 21:00:35 -0700 Created attachment 227621 Patch Applied Andersca's comments. 993710 4 227621 commit-queue 2014-03-23 21:38:22 -0700 Comment on attachment 227621 Patch Clearing flags on attachment: 227621 Committed r166148: <http://trac.webkit.org/changeset/166148> 993711 5 commit-queue 2014-03-23 21:38:26 -0700 All reviewed patches have been landed. Closing bug. 227405 2014-03-21 02:44:51 -0700 2014-03-23 21:00:17 -0700 Patch bug-130573-20140321184428.patch text/plain 5790 jinwoo7.song U3VidmVyc2lvbiBSZXZpc2lvbjogMTY1OTI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYzQ4MjcyYWQ5M2RlZjU4 ODUwYzkyMDZiYWZhOTg2NzRmOGQxMDhlMS4uYzYzZGMwNDhhYjZhYTNmZjg5OTY5YWRiNDNlOWM0 NTM5YjNkMjJlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTAzLTIxICBKaW53 b28gU29uZyAgPGppbndvbzcuc29uZ0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbV0syXSBSZWZp bmUgV2ViS2l0MiBCYXR0ZXJ5U3RhdHVzIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMDU3MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFJlZmluZW1lbnRzCisgICAgICAgICAtIFJldHVybiBQYXNz UmVmIGluc3RlYWQgb2YgUGFzc1JlZlB0ciBpbiBjcmVhdGUgbWV0aG9kcworICAgICAgICAgLSBV c2UgYXV0byBpbnN0ZWFkIG9mIGl0ZXJhdG9yCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQmF0 dGVyeU1hbmFnZXJQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkJhdHRlcnlNYW5hZ2Vy UHJveHk6OmNyZWF0ZSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkJhdHRlcnlNYW5hZ2VyUHJv eHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvZWZsL0JhdHRlcnlQcm92aWRlci5jcHA6CisgICAg ICAgIChCYXR0ZXJ5UHJvdmlkZXI6OmNyZWF0ZSk6CisgICAgICAgICogVUlQcm9jZXNzL2VmbC9C YXR0ZXJ5UHJvdmlkZXIuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL0JhdHRlcnkvV2ViQmF0dGVy eU1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJCYXR0ZXJ5TWFuYWdlcjo6ZGlkQ2hh bmdlQmF0dGVyeVN0YXR1cyk6CisgICAgICAgIChXZWJLaXQ6OldlYkJhdHRlcnlNYW5hZ2VyOjp1 cGRhdGVCYXR0ZXJ5U3RhdHVzKToKKwogMjAxNC0wMy0xOSAgQmVuamFtaW4gUG91bGFpbiAgPGJw b3VsYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXVtXSzJdIFJlZHVjZSB0aGUgZXh0ZW5k ZWQgYmFja2dyb3VuZCdzIG9wYWNpdHkgd2hlbiBXS0NvbnRlbnRWaWV3IGlzIHNtYWxsZXIgdGhh biBpdHMgV0tXZWJWaWV3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi QmF0dGVyeU1hbmFnZXJQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQmF0 dGVyeU1hbmFnZXJQcm94eS5jcHAKaW5kZXggMDAwNzVkYWFlY2U3NWRkNGI0MDMwYzNkNzg2M2M3 Zjg4OTViZTYxZS4uZGQ2ZmJhYjdjNzBmYzFiZmRiZWMzNWY4YzU0ZmIzYjM2NGU1NmUzMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkJhdHRlcnlNYW5hZ2VyUHJveHku Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJCYXR0ZXJ5TWFuYWdlclByb3h5 LmNwcApAQCAtMzksOSArMzksOSBAQCBjb25zdCBjaGFyKiBXZWJCYXR0ZXJ5TWFuYWdlclByb3h5 OjpzdXBwbGVtZW50TmFtZSgpCiAgICAgcmV0dXJuICJXZWJCYXR0ZXJ5TWFuYWdlclByb3h5IjsK IH0KIAotUGFzc1JlZlB0cjxXZWJCYXR0ZXJ5TWFuYWdlclByb3h5PiBXZWJCYXR0ZXJ5TWFuYWdl clByb3h5OjpjcmVhdGUoV2ViQ29udGV4dCogY29udGV4dCkKK1Bhc3NSZWY8V2ViQmF0dGVyeU1h bmFnZXJQcm94eT4gV2ViQmF0dGVyeU1hbmFnZXJQcm94eTo6Y3JlYXRlKFdlYkNvbnRleHQqIGNv bnRleHQpCiB7Ci0gICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBXZWJCYXR0ZXJ5TWFuYWdlclByb3h5 KGNvbnRleHQpKTsKKyAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBXZWJCYXR0ZXJ5TWFuYWdlclBy b3h5KGNvbnRleHQpKTsKIH0KIAogV2ViQmF0dGVyeU1hbmFnZXJQcm94eTo6V2ViQmF0dGVyeU1h bmFnZXJQcm94eShXZWJDb250ZXh0KiBjb250ZXh0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYkJhdHRlcnlNYW5hZ2VyUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJCYXR0ZXJ5TWFuYWdlclByb3h5LmgKaW5kZXggYjcxODcyMzI5Zjk1ZDdkYmYy MWI2NGY2ODRjNWQ1NWY2ZGNkOWIyMC4uMmI4MjA5YWEzZDFkYmE5Y2IxN2Q2MDg0Y2Q1YzVmMDk0 OWFkZGVjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkJhdHRlcnlN YW5hZ2VyUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQmF0dGVyeU1h bmFnZXJQcm94eS5oCkBAIC00Myw3ICs0Myw3IEBAIGNsYXNzIFdlYkJhdHRlcnlNYW5hZ2VyUHJv eHkgOiBwdWJsaWMgQVBJOjpPYmplY3RJbXBsPEFQSTo6T2JqZWN0OjpUeXBlOjpCYXR0ZXJ5CiBw dWJsaWM6CiAgICAgc3RhdGljIGNvbnN0IGNoYXIqIHN1cHBsZW1lbnROYW1lKCk7CiAKLSAgICBz dGF0aWMgUGFzc1JlZlB0cjxXZWJCYXR0ZXJ5TWFuYWdlclByb3h5PiBjcmVhdGUoV2ViQ29udGV4 dCopOworICAgIHN0YXRpYyBQYXNzUmVmPFdlYkJhdHRlcnlNYW5hZ2VyUHJveHk+IGNyZWF0ZShX ZWJDb250ZXh0Kik7CiAgICAgdmlydHVhbCB+V2ViQmF0dGVyeU1hbmFnZXJQcm94eSgpOwogCiAg ICAgdm9pZCBpbml0aWFsaXplUHJvdmlkZXIoY29uc3QgV0tCYXR0ZXJ5UHJvdmlkZXJCYXNlKik7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL0JhdHRlcnlQcm92aWRl ci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL0JhdHRlcnlQcm92aWRlci5jcHAK aW5kZXggZTBjNGY3MDUwM2IyYzYyOWIzODNmYTMxYmI2MjgwODlkMTYzMmU2OC4uNjQ1MDU3N2Q5 YmMyYmVlZDJjZjRkMGVlZDJiYjQ1MDJhMWM2ZTEyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL2VmbC9CYXR0ZXJ5UHJvdmlkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9lZmwvQmF0dGVyeVByb3ZpZGVyLmNwcApAQCAtNTcsMTAgKzU3LDEwIEBAIEJh dHRlcnlQcm92aWRlcjo6fkJhdHRlcnlQcm92aWRlcigpCiAgICAgV0tCYXR0ZXJ5TWFuYWdlclNl dFByb3ZpZGVyKG1fYmF0dGVyeU1hbmFnZXIuZ2V0KCksIDApOwogfQogCi1QYXNzUmVmUHRyPEJh dHRlcnlQcm92aWRlcj4gQmF0dGVyeVByb3ZpZGVyOjpjcmVhdGUoV0tDb250ZXh0UmVmIGNvbnRl eHQpCitQYXNzUmVmPEJhdHRlcnlQcm92aWRlcj4gQmF0dGVyeVByb3ZpZGVyOjpjcmVhdGUoV0tD b250ZXh0UmVmIGNvbnRleHQpCiB7CiAgICAgQVNTRVJUKGNvbnRleHQpOwotICAgIHJldHVybiBh ZG9wdFJlZihuZXcgQmF0dGVyeVByb3ZpZGVyKGNvbnRleHQpKTsKKyAgICByZXR1cm4gYWRvcHRS ZWYoKm5ldyBCYXR0ZXJ5UHJvdmlkZXIoY29udGV4dCkpOwogfQogCiBCYXR0ZXJ5UHJvdmlkZXI6 OkJhdHRlcnlQcm92aWRlcihXS0NvbnRleHRSZWYgY29udGV4dCkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvQmF0dGVyeVByb3ZpZGVyLmggYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvZWZsL0JhdHRlcnlQcm92aWRlci5oCmluZGV4IDg5M2QwZjhlYTRlZDcwN2Q5 NGY4ZDdjZGY0MGNmMGI1OWQ4NDdjYTguLjc5ODhjZDk5ODRjMDkxZWI3NjJkYzViYzk5NDM1OTFh ZjYyOWE5YTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvQmF0dGVy eVByb3ZpZGVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9CYXR0ZXJ5UHJv dmlkZXIuaApAQCAtNDAsNyArNDAsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIGNsYXNzIEJhdHRl cnlQcm92aWRlciA6IHB1YmxpYyBSZWZDb3VudGVkPEJhdHRlcnlQcm92aWRlcj4sIHB1YmxpYyBX ZWJDb3JlOjpCYXR0ZXJ5UHJvdmlkZXJFZmxDbGllbnQgewogcHVibGljOgogICAgIHZpcnR1YWwg fkJhdHRlcnlQcm92aWRlcigpOwotICAgIHN0YXRpYyBQYXNzUmVmUHRyPEJhdHRlcnlQcm92aWRl cj4gY3JlYXRlKFdLQ29udGV4dFJlZik7CisgICAgc3RhdGljIFBhc3NSZWY8QmF0dGVyeVByb3Zp ZGVyPiBjcmVhdGUoV0tDb250ZXh0UmVmKTsKIAogICAgIHZvaWQgc3RhcnRVcGRhdGluZygpOwog ICAgIHZvaWQgc3RvcFVwZGF0aW5nKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL0JhdHRlcnkvV2ViQmF0dGVyeU1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9CYXR0ZXJ5L1dlYkJhdHRlcnlNYW5hZ2VyLmNwcAppbmRleCA2NDdhOTgyZTJjYTE5 YzNjYjYxODJhNTVhODRhZjJhNjkxNTRjNTgzLi41NTZmNjk2OWU2NDY0ZjJhODdmMGZlYmU5MWQ3 NzA3ODFmZWJjYWNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0JhdHRl cnkvV2ViQmF0dGVyeU1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv QmF0dGVyeS9XZWJCYXR0ZXJ5TWFuYWdlci5jcHAKQEAgLTc3LDkgKzc3LDcgQEAgdm9pZCBXZWJC YXR0ZXJ5TWFuYWdlcjo6ZGlkQ2hhbmdlQmF0dGVyeVN0YXR1cyhjb25zdCBXVEY6OkF0b21pY1N0 cmluZyYgZXZlbnRUeXAKIHsKICAgICBSZWZQdHI8QmF0dGVyeVN0YXR1cz4gc3RhdHVzID0gQmF0 dGVyeVN0YXR1czo6Y3JlYXRlKGRhdGEuaXNDaGFyZ2luZywgZGF0YS5jaGFyZ2luZ1RpbWUsIGRh dGEuZGlzY2hhcmdpbmdUaW1lLCBkYXRhLmxldmVsKTsKIAotICAgIEhhc2hTZXQ8V2ViUGFnZSo+ Ojpjb25zdF9pdGVyYXRvciBpdCA9IG1fcGFnZVNldC5iZWdpbigpOwotICAgIEhhc2hTZXQ8V2Vi UGFnZSo+Ojpjb25zdF9pdGVyYXRvciBlbmQgPSBtX3BhZ2VTZXQuZW5kKCk7Ci0gICAgZm9yICg7 IGl0ICE9IGVuZDsgKytpdCkgeworICAgIGZvciAoYXV0byBpdCA9IG1fcGFnZVNldC5iZWdpbigp LCBlbmQgPSBtX3BhZ2VTZXQuZW5kKCk7IGl0ICE9IGVuZDsgKytpdCkgewogICAgICAgICBXZWJQ YWdlKiBwYWdlID0gKml0OwogICAgICAgICBpZiAocGFnZS0+Y29yZVBhZ2UoKSkKICAgICAgICAg ICAgIEJhdHRlcnlDb250cm9sbGVyOjpmcm9tKHBhZ2UtPmNvcmVQYWdlKCkpLT5kaWRDaGFuZ2VC YXR0ZXJ5U3RhdHVzKGV2ZW50VHlwZSwgc3RhdHVzLmdldCgpKTsKQEAgLTkwLDkgKzg4LDcgQEAg dm9pZCBXZWJCYXR0ZXJ5TWFuYWdlcjo6dXBkYXRlQmF0dGVyeVN0YXR1cyhjb25zdCBXZWJCYXR0 ZXJ5U3RhdHVzOjpEYXRhJiBkYXRhKQogewogICAgIFJlZlB0cjxCYXR0ZXJ5U3RhdHVzPiBzdGF0 dXMgPSBCYXR0ZXJ5U3RhdHVzOjpjcmVhdGUoZGF0YS5pc0NoYXJnaW5nLCBkYXRhLmNoYXJnaW5n VGltZSwgZGF0YS5kaXNjaGFyZ2luZ1RpbWUsIGRhdGEubGV2ZWwpOwogCi0gICAgSGFzaFNldDxX ZWJQYWdlKj46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbV9wYWdlU2V0LmJlZ2luKCk7Ci0gICAgSGFz aFNldDxXZWJQYWdlKj46OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IG1fcGFnZVNldC5lbmQoKTsKLSAg ICBmb3IgKDsgaXQgIT0gZW5kOyArK2l0KSB7CisgICAgZm9yIChhdXRvIGl0ID0gbV9wYWdlU2V0 LmJlZ2luKCksIGVuZCA9IG1fcGFnZVNldC5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KSB7CiAgICAg ICAgIFdlYlBhZ2UqIHBhZ2UgPSAqaXQ7CiAgICAgICAgIGlmIChwYWdlLT5jb3JlUGFnZSgpKQog ICAgICAgICAgICAgQmF0dGVyeUNvbnRyb2xsZXI6OmZyb20ocGFnZS0+Y29yZVBhZ2UoKSktPnVw ZGF0ZUJhdHRlcnlTdGF0dXMoc3RhdHVzLmdldCgpKTsK 227621 2014-03-23 21:00:35 -0700 2014-03-23 21:38:22 -0700 Patch bug-130573-20140324130011.patch text/plain 5652 jinwoo7.song U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2MTQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOTdmNDc4OWZkM2Q5NWI1 MzYwODc0ZjQ2OTU0ODY1ZWQ0YWRiNGMxNS4uZGE1YmU2ZGY5MTZlYjQ0NmU1YzRjMWFiZTZjZGVk ZDU0N2U2N2NjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTAzLTIzICBKaW53 b28gU29uZyAgPGppbndvbzcuc29uZ0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbV0syXSBSZWZp bmUgV2ViS2l0MiBCYXR0ZXJ5U3RhdHVzIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMDU3MworCisgICAgICAgIFJldmlld2VkIGJ5IEFuZGVy cyBDYXJsc3Nvbi4KKworICAgICAgICBSZWZpbmVtZW50cworICAgICAgICAgLSBSZXR1cm4gUGFz c1JlZiBpbnN0ZWFkIG9mIFBhc3NSZWZQdHIgaW4gY3JlYXRlIG1ldGhvZHMKKyAgICAgICAgIC0g VXNlIGF1dG8gaW5zdGVhZCBvZiBpdGVyYXRvcgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYkJh dHRlcnlNYW5hZ2VyUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJCYXR0ZXJ5TWFuYWdl clByb3h5OjpjcmVhdGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJCYXR0ZXJ5TWFuYWdlclBy b3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL2VmbC9CYXR0ZXJ5UHJvdmlkZXIuY3BwOgorICAg ICAgICAoQmF0dGVyeVByb3ZpZGVyOjpjcmVhdGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9lZmwv QmF0dGVyeVByb3ZpZGVyLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9CYXR0ZXJ5L1dlYkJhdHRl cnlNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQmF0dGVyeU1hbmFnZXI6OmRpZENo YW5nZUJhdHRlcnlTdGF0dXMpOgorICAgICAgICAoV2ViS2l0OjpXZWJCYXR0ZXJ5TWFuYWdlcjo6 dXBkYXRlQmF0dGVyeVN0YXR1cyk6CisKIDIwMTQtMDMtMjMgIFNhbSBXZWluaWcgIDxzYW1Ad2Vi a2l0Lm9yZz4KIAogICAgICAgICBTaW1wbGlmeSB0aGUgSFRNTENvbnZlcnRlciBpbnRlcmZhY2Ug KFBhcnQgMikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJCYXR0ZXJ5 TWFuYWdlclByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJCYXR0ZXJ5TWFu YWdlclByb3h5LmNwcAppbmRleCAwMDA3NWRhYWVjZTc1ZGQ0YjQwMzBjM2Q3ODYzYzdmODg5NWJl NjFlLi5kZDZmYmFiN2M3MGZjMWJmZGJlYzM1ZjhjNTRmYjNiMzY0ZTU2ZTMyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQmF0dGVyeU1hbmFnZXJQcm94eS5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkJhdHRlcnlNYW5hZ2VyUHJveHkuY3BwCkBA IC0zOSw5ICszOSw5IEBAIGNvbnN0IGNoYXIqIFdlYkJhdHRlcnlNYW5hZ2VyUHJveHk6OnN1cHBs ZW1lbnROYW1lKCkKICAgICByZXR1cm4gIldlYkJhdHRlcnlNYW5hZ2VyUHJveHkiOwogfQogCi1Q YXNzUmVmUHRyPFdlYkJhdHRlcnlNYW5hZ2VyUHJveHk+IFdlYkJhdHRlcnlNYW5hZ2VyUHJveHk6 OmNyZWF0ZShXZWJDb250ZXh0KiBjb250ZXh0KQorUGFzc1JlZjxXZWJCYXR0ZXJ5TWFuYWdlclBy b3h5PiBXZWJCYXR0ZXJ5TWFuYWdlclByb3h5OjpjcmVhdGUoV2ViQ29udGV4dCogY29udGV4dCkK IHsKLSAgICByZXR1cm4gYWRvcHRSZWYobmV3IFdlYkJhdHRlcnlNYW5hZ2VyUHJveHkoY29udGV4 dCkpOworICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFdlYkJhdHRlcnlNYW5hZ2VyUHJveHkoY29u dGV4dCkpOwogfQogCiBXZWJCYXR0ZXJ5TWFuYWdlclByb3h5OjpXZWJCYXR0ZXJ5TWFuYWdlclBy b3h5KFdlYkNvbnRleHQqIGNvbnRleHQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViQmF0dGVyeU1hbmFnZXJQcm94eS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYkJhdHRlcnlNYW5hZ2VyUHJveHkuaAppbmRleCBiNzE4NzIzMjlmOTVkN2RiZjIxYjY0ZjY4 NGM1ZDU1ZjZkY2Q5YjIwLi4yYjgyMDlhYTNkMWRiYTljYjE3ZDYwODRjZDVjNWYwOTQ5YWRkZWMz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQmF0dGVyeU1hbmFnZXJQ cm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJCYXR0ZXJ5TWFuYWdlclBy b3h5LmgKQEAgLTQzLDcgKzQzLDcgQEAgY2xhc3MgV2ViQmF0dGVyeU1hbmFnZXJQcm94eSA6IHB1 YmxpYyBBUEk6Ok9iamVjdEltcGw8QVBJOjpPYmplY3Q6OlR5cGU6OkJhdHRlcnkKIHB1YmxpYzoK ICAgICBzdGF0aWMgY29uc3QgY2hhciogc3VwcGxlbWVudE5hbWUoKTsKIAotICAgIHN0YXRpYyBQ YXNzUmVmUHRyPFdlYkJhdHRlcnlNYW5hZ2VyUHJveHk+IGNyZWF0ZShXZWJDb250ZXh0Kik7Cisg ICAgc3RhdGljIFBhc3NSZWY8V2ViQmF0dGVyeU1hbmFnZXJQcm94eT4gY3JlYXRlKFdlYkNvbnRl eHQqKTsKICAgICB2aXJ0dWFsIH5XZWJCYXR0ZXJ5TWFuYWdlclByb3h5KCk7CiAKICAgICB2b2lk IGluaXRpYWxpemVQcm92aWRlcihjb25zdCBXS0JhdHRlcnlQcm92aWRlckJhc2UqKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvQmF0dGVyeVByb3ZpZGVyLmNwcCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvQmF0dGVyeVByb3ZpZGVyLmNwcAppbmRleCBl MGM0ZjcwNTAzYjJjNjI5YjM4M2ZhMzFiYjYyODA4OWQxNjMyZTY4Li42NDUwNTc3ZDliYzJiZWVk MmNmNGQwZWVkMmJiNDUwMmExYzZlMTJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvZWZsL0JhdHRlcnlQcm92aWRlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL2VmbC9CYXR0ZXJ5UHJvdmlkZXIuY3BwCkBAIC01NywxMCArNTcsMTAgQEAgQmF0dGVyeVBy b3ZpZGVyOjp+QmF0dGVyeVByb3ZpZGVyKCkKICAgICBXS0JhdHRlcnlNYW5hZ2VyU2V0UHJvdmlk ZXIobV9iYXR0ZXJ5TWFuYWdlci5nZXQoKSwgMCk7CiB9CiAKLVBhc3NSZWZQdHI8QmF0dGVyeVBy b3ZpZGVyPiBCYXR0ZXJ5UHJvdmlkZXI6OmNyZWF0ZShXS0NvbnRleHRSZWYgY29udGV4dCkKK1Bh c3NSZWY8QmF0dGVyeVByb3ZpZGVyPiBCYXR0ZXJ5UHJvdmlkZXI6OmNyZWF0ZShXS0NvbnRleHRS ZWYgY29udGV4dCkKIHsKICAgICBBU1NFUlQoY29udGV4dCk7Ci0gICAgcmV0dXJuIGFkb3B0UmVm KG5ldyBCYXR0ZXJ5UHJvdmlkZXIoY29udGV4dCkpOworICAgIHJldHVybiBhZG9wdFJlZigqbmV3 IEJhdHRlcnlQcm92aWRlcihjb250ZXh0KSk7CiB9CiAKIEJhdHRlcnlQcm92aWRlcjo6QmF0dGVy eVByb3ZpZGVyKFdLQ29udGV4dFJlZiBjb250ZXh0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL2VmbC9CYXR0ZXJ5UHJvdmlkZXIuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9lZmwvQmF0dGVyeVByb3ZpZGVyLmgKaW5kZXggODkzZDBmOGVhNGVkNzA3ZDk0ZjhkN2Nk ZjQwY2YwYjU5ZDg0N2NhOC4uNzk4OGNkOTk4NGMwOTFlYjc2MmRjNWJjOTk0MzU5MWFmNjI5YTlh OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9CYXR0ZXJ5UHJvdmlk ZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL0JhdHRlcnlQcm92aWRlci5o CkBAIC00MCw3ICs0MCw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogY2xhc3MgQmF0dGVyeVByb3Zp ZGVyIDogcHVibGljIFJlZkNvdW50ZWQ8QmF0dGVyeVByb3ZpZGVyPiwgcHVibGljIFdlYkNvcmU6 OkJhdHRlcnlQcm92aWRlckVmbENsaWVudCB7CiBwdWJsaWM6CiAgICAgdmlydHVhbCB+QmF0dGVy eVByb3ZpZGVyKCk7Ci0gICAgc3RhdGljIFBhc3NSZWZQdHI8QmF0dGVyeVByb3ZpZGVyPiBjcmVh dGUoV0tDb250ZXh0UmVmKTsKKyAgICBzdGF0aWMgUGFzc1JlZjxCYXR0ZXJ5UHJvdmlkZXI+IGNy ZWF0ZShXS0NvbnRleHRSZWYpOwogCiAgICAgdm9pZCBzdGFydFVwZGF0aW5nKCk7CiAgICAgdm9p ZCBzdG9wVXBkYXRpbmcoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv QmF0dGVyeS9XZWJCYXR0ZXJ5TWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L0JhdHRlcnkvV2ViQmF0dGVyeU1hbmFnZXIuY3BwCmluZGV4IDY0N2E5ODJlMmNhMTljM2NiNjE4 MmE1NWE4NGFmMmE2OTE1NGM1ODMuLmRhZTUyM2JiYmEzYjE5ZDBiZTQzY2U1ZDdmZTZlMjg1ZWUx MzMxYTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvQmF0dGVyeS9XZWJC YXR0ZXJ5TWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9CYXR0ZXJ5 L1dlYkJhdHRlcnlNYW5hZ2VyLmNwcApAQCAtNzcsMTAgKzc3LDcgQEAgdm9pZCBXZWJCYXR0ZXJ5 TWFuYWdlcjo6ZGlkQ2hhbmdlQmF0dGVyeVN0YXR1cyhjb25zdCBXVEY6OkF0b21pY1N0cmluZyYg ZXZlbnRUeXAKIHsKICAgICBSZWZQdHI8QmF0dGVyeVN0YXR1cz4gc3RhdHVzID0gQmF0dGVyeVN0 YXR1czo6Y3JlYXRlKGRhdGEuaXNDaGFyZ2luZywgZGF0YS5jaGFyZ2luZ1RpbWUsIGRhdGEuZGlz Y2hhcmdpbmdUaW1lLCBkYXRhLmxldmVsKTsKIAotICAgIEhhc2hTZXQ8V2ViUGFnZSo+Ojpjb25z dF9pdGVyYXRvciBpdCA9IG1fcGFnZVNldC5iZWdpbigpOwotICAgIEhhc2hTZXQ8V2ViUGFnZSo+ Ojpjb25zdF9pdGVyYXRvciBlbmQgPSBtX3BhZ2VTZXQuZW5kKCk7Ci0gICAgZm9yICg7IGl0ICE9 IGVuZDsgKytpdCkgewotICAgICAgICBXZWJQYWdlKiBwYWdlID0gKml0OworICAgIGZvciAoYXV0 byogcGFnZSA6IG1fcGFnZVNldCkgewogICAgICAgICBpZiAocGFnZS0+Y29yZVBhZ2UoKSkKICAg ICAgICAgICAgIEJhdHRlcnlDb250cm9sbGVyOjpmcm9tKHBhZ2UtPmNvcmVQYWdlKCkpLT5kaWRD aGFuZ2VCYXR0ZXJ5U3RhdHVzKGV2ZW50VHlwZSwgc3RhdHVzLmdldCgpKTsKICAgICB9CkBAIC05 MCwxMCArODcsNyBAQCB2b2lkIFdlYkJhdHRlcnlNYW5hZ2VyOjp1cGRhdGVCYXR0ZXJ5U3RhdHVz KGNvbnN0IFdlYkJhdHRlcnlTdGF0dXM6OkRhdGEmIGRhdGEpCiB7CiAgICAgUmVmUHRyPEJhdHRl cnlTdGF0dXM+IHN0YXR1cyA9IEJhdHRlcnlTdGF0dXM6OmNyZWF0ZShkYXRhLmlzQ2hhcmdpbmcs IGRhdGEuY2hhcmdpbmdUaW1lLCBkYXRhLmRpc2NoYXJnaW5nVGltZSwgZGF0YS5sZXZlbCk7CiAK LSAgICBIYXNoU2V0PFdlYlBhZ2UqPjo6Y29uc3RfaXRlcmF0b3IgaXQgPSBtX3BhZ2VTZXQuYmVn aW4oKTsKLSAgICBIYXNoU2V0PFdlYlBhZ2UqPjo6Y29uc3RfaXRlcmF0b3IgZW5kID0gbV9wYWdl U2V0LmVuZCgpOwotICAgIGZvciAoOyBpdCAhPSBlbmQ7ICsraXQpIHsKLSAgICAgICAgV2ViUGFn ZSogcGFnZSA9ICppdDsKKyAgICBmb3IgKGF1dG8qIHBhZ2UgOiBtX3BhZ2VTZXQpIHsKICAgICAg ICAgaWYgKHBhZ2UtPmNvcmVQYWdlKCkpCiAgICAgICAgICAgICBCYXR0ZXJ5Q29udHJvbGxlcjo6 ZnJvbShwYWdlLT5jb3JlUGFnZSgpKS0+dXBkYXRlQmF0dGVyeVN0YXR1cyhzdGF0dXMuZ2V0KCkp OwogICAgIH0K