167019 2017-01-13 14:09:48 -0800 Report CPU usage of tabs after they become non-visible using diagnostic logging 2017-01-14 23:00:58 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=166950 InRadar P2 Normal --- 1 cdumez cdumez barraclough commit-queue webkit-bug-importer oldest_to_newest 1266584 0 cdumez 2017-01-13 14:09:48 -0800 Report CPU usage of tabs after they become non-visible using diagnostic logging. 1266585 1 webkit-bug-importer 2017-01-13 14:10:35 -0800 <rdar://problem/30019773> 1266590 2 298787 cdumez 2017-01-13 14:27:09 -0800 Created attachment 298787 Patch 1266938 3 298787 commit-queue 2017-01-14 23:00:54 -0800 Comment on attachment 298787 Patch Clearing flags on attachment: 298787 Committed r210774: <http://trac.webkit.org/changeset/210774> 1266939 4 commit-queue 2017-01-14 23:00:58 -0800 All reviewed patches have been landed. Closing bug. 298787 2017-01-13 14:27:09 -0800 2017-01-14 23:00:54 -0800 Patch bug-167019-20170113142532.patch text/plain 10502 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjEwNzMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWQ0YWM3YjY1MTQ3NTgw Njc1MjcwOTdmYWE3NTVjZWZkZWY2YjZkMy4uMDVlMTdkYmRmMTg5MTk3MzNmOWZjMTcyMDBkZTg5 OWNhNmQyYzg4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM2IEBACiAyMDE3LTAxLTEzICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgUmVwb3J0IENQVSB1c2FnZSBv ZiB0YWJzIGFmdGVyIHRoZXkgYmVjb21lIG5vbi12aXNpYmxlIHVzaW5nIGRpYWdub3N0aWMgbG9n Z2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY3 MDE5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMDAxOTc3Mz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXBvcnQgQ1BVIHVzYWdlIG9mIHRhYnMg YWZ0ZXIgdGhleSBiZWNvbWUgbm9uLXZpc2libGUgdXNpbmcgZGlhZ25vc3RpYyBsb2dnaW5nLgor ICAgICAgICBXZSBzdGFydCBtZWFzdXJlIENQVSB1c2FnZSA1IHNlY29uZHMgYWZ0ZXIgYSB0YWIg Z29lcyB0byB0aGUgYmFja2dyb3VuZCwgZm9yIDUKKyAgICAgICAgbWludXRlcyBhbmQgcmVwb3J0 IGhvdyBtdWNoIENQVSB0aGUgdGFiIHVzZWQgZHVyaW5nIHRob3NlIDUgbWludXRlcy4gV2Ugd2ls bAorICAgICAgICBub3QgbG9nIGlmIHRoZSB0YWIgZ2V0cyBjbG9zZWQgb3IgbW92ZWQgdG8gdGhl IGZvcmVncm91bmQgZHVyaW5nIHRob3NlIDUKKyAgICAgICAgbWludXRlcy4KKworICAgICAgICAq IHBhZ2UvRGlhZ25vc3RpY0xvZ2dpbmdLZXlzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRpYWdu b3N0aWNMb2dnaW5nS2V5czo6cG9zdFBhZ2VCYWNrZ3JvdW5kaW5nS2V5KToKKyAgICAgICAgKiBw YWdlL0RpYWdub3N0aWNMb2dnaW5nS2V5cy5oOgorICAgICAgICAqIHBhZ2UvUGFnZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpQYWdlOjpQYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OmRp ZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OmRpZEZpbmlz aExvYWQpOgorICAgICAgICAoV2ViQ29yZTo6Zm9yZWdyb3VuZENQVVVzYWdlVG9EaWFnbm9zdGlj TG9nZ2luS2V5KToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6Om1lYXN1cmVQb3N0TG9hZENQVVVz YWdlKToKKyAgICAgICAgKFdlYkNvcmU6OmJhY2tncm91bmRDUFVVc2FnZVRvRGlhZ25vc3RpY0xv Z2dpbktleSk6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjptZWFzdXJlUG9zdEJhY2tncm91bmRp bmdDUFVVc2FnZSk6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpzZXRJc1Zpc2libGVJbnRlcm5h bCk6CisgICAgICAgICogcGFnZS9QYWdlLmg6CisgICAgICAgICogcGFnZS9TZXR0aW5ncy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTZXR0aW5nczo6aXNQb3N0QmFja2dyb3VuZGluZ0NQVVVzYWdl TWVhc3VyZW1lbnRFbmFibGVkKToKKyAgICAgICAgKiBwYWdlL1NldHRpbmdzLmg6CisKKzIwMTct MDEtMTMgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKwogICAgICAgICBSZXBvcnQg cG9zdC1wYWdlIGxvYWQgQ1BVIHVzYWdlIHVzaW5nIGRpYWdub3N0aWMgbG9nZ2luZwogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY2OTUwCiAgICAgICAg IDxyZGFyOi8vcHJvYmxlbS8zMDAxNDQ5Nj4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRGlhZ25vc3RpY0xvZ2dpbmdLZXlzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGlhZ25v c3RpY0xvZ2dpbmdLZXlzLmNwcAppbmRleCAwZmEyNjY0OGI3ODk3NjNiODhhZDFmNmMzYzRjYzJl N2FjN2ZkZGMxLi43NmUyZGM1MjIxMmNiNDU2MjExNDFiZTRmNzIzODczMWUzODM4NTczIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RpYWdub3N0aWNMb2dnaW5nS2V5cy5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGFnZS9EaWFnbm9zdGljTG9nZ2luZ0tleXMuY3BwCkBAIC01Myw2 ICs1MywxMSBAQCBTdHJpbmcgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpwbHVnaW5Mb2FkaW5nRmFp bGVkS2V5KCkKICAgICByZXR1cm4gQVNDSUlMaXRlcmFsKCJwbHVnaW5GYWlsZWRMb2FkaW5nIik7 CiB9CiAKK1N0cmluZyBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OnBvc3RQYWdlQmFja2dyb3VuZGlu Z0tleSgpCit7CisgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgicG9zdFBhZ2VCYWNrZ3JvdW5kaW5n Iik7Cit9CisKIFN0cmluZyBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OnBvc3RQYWdlTG9hZEtleSgp CiB7CiAgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgicG9zdFBhZ2VMb2FkIik7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RpYWdub3N0aWNMb2dnaW5nS2V5cy5oIGIvU291cmNlL1dl YkNvcmUvcGFnZS9EaWFnbm9zdGljTG9nZ2luZ0tleXMuaAppbmRleCBjNzUzMWM2ZGMyNjU4MDg5 Mjg3ODRkM2IwM2I0ZWM2ODkwM2EwMjM4Li5jODNkMTNlN2FlODdmMzNiNDIzNmIzN2UzY2EzMDIx ZWQ3ZjJiN2VlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RpYWdub3N0aWNMb2dn aW5nS2V5cy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGlhZ25vc3RpY0xvZ2dpbmdLZXlz LmgKQEAgLTk4LDYgKzk4LDcgQEAgcHVibGljOgogICAgIHN0YXRpYyBTdHJpbmcgcGxheWVkS2V5 KCk7CiAgICAgc3RhdGljIFN0cmluZyBwbHVnaW5Mb2FkZWRLZXkoKTsKICAgICBzdGF0aWMgU3Ry aW5nIHBsdWdpbkxvYWRpbmdGYWlsZWRLZXkoKTsKKyAgICBzdGF0aWMgU3RyaW5nIHBvc3RQYWdl QmFja2dyb3VuZGluZ0tleSgpOwogICAgIHN0YXRpYyBTdHJpbmcgcG9zdFBhZ2VMb2FkS2V5KCk7 CiAgICAgc3RhdGljIFN0cmluZyBwcm92aXNpb25hbExvYWRLZXkoKTsKICAgICBzdGF0aWMgU3Ry aW5nIHBydW5lZER1ZVRvTWF4U2l6ZVJlYWNoZWQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvUGFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCmluZGV4IGM3 OTE5NGFjY2VlOWFjMzg0NTJkMmY4MGEwNjhlOWY1NjM0MzZmNmYuLjA1ODQ3ZGZiOWVjM2QyYTky ZGE4ZTM2ZTZlOGYzNDg0ZGE5MzdlMzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv UGFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcApAQCAtMTMxLDcgKzEz MSw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIHN0YXRpYyBIYXNoU2V0PFBhZ2UqPiogYWxsUGFn ZXM7CiAKIHN0YXRpYyBjb25zdCBzdGQ6OmNocm9ubzo6c2Vjb25kcyBjcHVVc2FnZU1lYXN1cmVt ZW50RGVsYXkgeyA1IH07Ci1zdGF0aWMgY29uc3Qgc3RkOjpjaHJvbm86OnNlY29uZHMgY3B1VXNh Z2VNZWFzdXJlbWVudER1cmF0aW9uIHsgMTAgfTsKK3N0YXRpYyBjb25zdCBzdGQ6OmNocm9ubzo6 c2Vjb25kcyBwb3N0TG9hZENQVVVzYWdlTWVhc3VyZW1lbnREdXJhdGlvbiB7IDEwIH07CitzdGF0 aWMgY29uc3Qgc3RkOjpjaHJvbm86Om1pbnV0ZXMgYmFja2dyb3VuZENQVVVzYWdlTWVhc3VyZW1l bnREdXJhdGlvbiB7IDUgfTsKIAogREVGSU5FX0RFQlVHX09OTFlfR0xPQkFMKFdURjo6UmVmQ291 bnRlZExlYWtDb3VudGVyLCBwYWdlQ291bnRlciwgKCJQYWdlIikpOwogCkBAIC0yNTEsNyArMjUy LDggQEAgUGFnZTo6UGFnZShQYWdlQ29uZmlndXJhdGlvbiYmIHBhZ2VDb25maWd1cmF0aW9uKQog ICAgICwgbV92aXNpdGVkTGlua1N0b3JlKCpXVEZNb3ZlKHBhZ2VDb25maWd1cmF0aW9uLnZpc2l0 ZWRMaW5rU3RvcmUpKQogICAgICwgbV9zZXNzaW9uSUQoU2Vzc2lvbklEOjpkZWZhdWx0U2Vzc2lv bklEKCkpCiAgICAgLCBtX2lzQ2xvc2luZyhmYWxzZSkKLSAgICAsIG1fY3B1VXNhZ2VNZWFzdXJl bWVudFRpbWVyKCp0aGlzLCAmUGFnZTo6bWVhc3VyZVBvc3RMb2FkQ1BVVXNhZ2UpCisgICAgLCBt X3Bvc3RQYWdlTG9hZENQVVVzYWdlVGltZXIoKnRoaXMsICZQYWdlOjptZWFzdXJlUG9zdExvYWRD UFVVc2FnZSkKKyAgICAsIG1fcG9zdEJhY2tncm91bmRpbmdDUFVVc2FnZVRpbWVyKCp0aGlzLCAm UGFnZTo6bWVhc3VyZVBvc3RCYWNrZ3JvdW5kaW5nQ1BVVXNhZ2UpCiB7CiAgICAgdXBkYXRlVGlt ZXJUaHJvdHRsaW5nU3RhdGUoKTsKIApAQCAtOTMxLDcgKzkzMyw3IEBAIHZvaWQgUGFnZTo6c2V0 VXNlckludGVyZmFjZUxheW91dERpcmVjdGlvbihVc2VySW50ZXJmYWNlTGF5b3V0RGlyZWN0aW9u IHVzZXJJbnRlCiB2b2lkIFBhZ2U6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKCkKIHsKICAgICBt X3Bvc3RMb2FkQ1BVVGltZSA9IHN0ZDo6bnVsbG9wdDsKLSAgICBtX2NwdVVzYWdlTWVhc3VyZW1l bnRUaW1lci5zdG9wKCk7CisgICAgbV9wb3N0UGFnZUxvYWRDUFVVc2FnZVRpbWVyLnN0b3AoKTsK IH0KIAogdm9pZCBQYWdlOjpkaWRGaW5pc2hMb2FkKCkKQEAgLTk0MSwxMSArOTQzLDExIEBAIHZv aWQgUGFnZTo6ZGlkRmluaXNoTG9hZCgpCiAgICAgLy8gT25seSBkbyBwb3N0LWxvYWQgQ1BVIHVz YWdlIG1lYXN1cmVtZW50IGlmIHRoZXJlIGlzIGEgc2luZ2xlIFBhZ2UgaW4gdGhlIHByb2Nlc3Mg aW4gb3JkZXIgdG8gcmVkdWNlIG5vaXNlLgogICAgIGlmIChTZXR0aW5nczo6aXNQb3N0TG9hZENQ VVVzYWdlTWVhc3VyZW1lbnRFbmFibGVkKCkgJiYgYWxsUGFnZXMtPnNpemUoKSA9PSAxKSB7CiAg ICAgICAgIG1fcG9zdExvYWRDUFVUaW1lID0gc3RkOjpudWxsb3B0OwotICAgICAgICBtX2NwdVVz YWdlTWVhc3VyZW1lbnRUaW1lci5zdGFydE9uZVNob3QoY3B1VXNhZ2VNZWFzdXJlbWVudERlbGF5 KTsKKyAgICAgICAgbV9wb3N0UGFnZUxvYWRDUFVVc2FnZVRpbWVyLnN0YXJ0T25lU2hvdChjcHVV c2FnZU1lYXN1cmVtZW50RGVsYXkpOwogICAgIH0KIH0KIAotc3RhdGljIFN0cmluZyBjcHVVc2Fn ZVRvRGlhZ25vc3RpY0xvZ2dpbktleShkb3VibGUgY3B1VXNhZ2UpCitzdGF0aWMgU3RyaW5nIGZv cmVncm91bmRDUFVVc2FnZVRvRGlhZ25vc3RpY0xvZ2dpbktleShkb3VibGUgY3B1VXNhZ2UpCiB7 CiAgICAgaWYgKGNwdVVzYWdlIDwgMTApCiAgICAgICAgIHJldHVybiBBU0NJSUxpdGVyYWwoIkJl bG93MTAiKTsKQEAgLTk2MiwxMCArOTY0LDEzIEBAIHN0YXRpYyBTdHJpbmcgY3B1VXNhZ2VUb0Rp YWdub3N0aWNMb2dnaW5LZXkoZG91YmxlIGNwdVVzYWdlKQogCiB2b2lkIFBhZ2U6Om1lYXN1cmVQ b3N0TG9hZENQVVVzYWdlKCkKIHsKKyAgICBpZiAoYWxsUGFnZXMtPnNpemUoKSAhPSAxKQorICAg ICAgICByZXR1cm47CisKICAgICBpZiAoIW1fcG9zdExvYWRDUFVUaW1lKSB7CiAgICAgICAgIG1f cG9zdExvYWRDUFVUaW1lID0gZ2V0Q1BVVGltZSgpOwogICAgICAgICBpZiAobV9wb3N0TG9hZENQ VVRpbWUpCi0gICAgICAgICAgICBtX2NwdVVzYWdlTWVhc3VyZW1lbnRUaW1lci5zdGFydE9uZVNo b3QoY3B1VXNhZ2VNZWFzdXJlbWVudER1cmF0aW9uKTsKKyAgICAgICAgICAgIG1fcG9zdFBhZ2VM b2FkQ1BVVXNhZ2VUaW1lci5zdGFydE9uZVNob3QocG9zdExvYWRDUFVVc2FnZU1lYXN1cmVtZW50 RHVyYXRpb24pOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIHN0ZDo6b3B0aW9uYWw8Q1BV VGltZT4gY3B1VGltZSA9IGdldENQVVRpbWUoKTsKQEAgLTk3NCw3ICs5NzksNDQgQEAgdm9pZCBQ YWdlOjptZWFzdXJlUG9zdExvYWRDUFVVc2FnZSgpCiAKICAgICBkb3VibGUgY3B1VXNhZ2UgPSBj cHVUaW1lLnZhbHVlKCkucGVyY2VudGFnZUNQVVVzYWdlU2luY2UoKm1fcG9zdExvYWRDUFVUaW1l KTsKICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFBlcmZvcm1hbmNlTG9nZ2luZywgIm1lYXN1 cmVQb3N0TG9hZENQVVVzYWdlOiBQcm9jZXNzIHdhcyB1c2luZyAlLjFmJSUgcGVyY2VudCBDUFUg YWZ0ZXIgdGhlIHBhZ2UgbG9hZC4iLCBjcHVVc2FnZSk7Ci0gICAgZGlhZ25vc3RpY0xvZ2dpbmdD bGllbnQoKS5sb2dEaWFnbm9zdGljTWVzc2FnZVdpdGhWYWx1ZShEaWFnbm9zdGljTG9nZ2luZ0tl eXM6OnBvc3RQYWdlTG9hZEtleSgpLCBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OmNwdVVzYWdlS2V5 KCksIGNwdVVzYWdlVG9EaWFnbm9zdGljTG9nZ2luS2V5KGNwdVVzYWdlKSwgU2hvdWxkU2FtcGxl OjpObyk7CisgICAgZGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQoKS5sb2dEaWFnbm9zdGljTWVzc2Fn ZVdpdGhWYWx1ZShEaWFnbm9zdGljTG9nZ2luZ0tleXM6OnBvc3RQYWdlTG9hZEtleSgpLCBEaWFn bm9zdGljTG9nZ2luZ0tleXM6OmNwdVVzYWdlS2V5KCksIGZvcmVncm91bmRDUFVVc2FnZVRvRGlh Z25vc3RpY0xvZ2dpbktleShjcHVVc2FnZSksIFNob3VsZFNhbXBsZTo6Tm8pOworfQorCitzdGF0 aWMgU3RyaW5nIGJhY2tncm91bmRDUFVVc2FnZVRvRGlhZ25vc3RpY0xvZ2dpbktleShkb3VibGUg Y3B1VXNhZ2UpCit7CisgICAgaWYgKGNwdVVzYWdlIDwgMSkKKyAgICAgICAgcmV0dXJuIEFTQ0lJ TGl0ZXJhbCgiQmVsb3cxIik7CisgICAgaWYgKGNwdVVzYWdlIDwgNSkKKyAgICAgICAgcmV0dXJu IEFTQ0lJTGl0ZXJhbCgiMXRvNSIpOworICAgIGlmIChjcHVVc2FnZSA8IDEwKQorICAgICAgICBy ZXR1cm4gQVNDSUlMaXRlcmFsKCI1dG8xMCIpOworICAgIGlmIChjcHVVc2FnZSA8IDMwKQorICAg ICAgICByZXR1cm4gQVNDSUlMaXRlcmFsKCIxMHRvMzAiKTsKKyAgICBpZiAoY3B1VXNhZ2UgPCA1 MCkKKyAgICAgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgiMzB0bzUwIik7CisgICAgaWYgKGNwdVVz YWdlIDwgNzApCisgICAgICAgIHJldHVybiBBU0NJSUxpdGVyYWwoIjUwdG83MCIpOworICAgIHJl dHVybiBBU0NJSUxpdGVyYWwoIm92ZXI3MCIpOworfQorCit2b2lkIFBhZ2U6Om1lYXN1cmVQb3N0 QmFja2dyb3VuZGluZ0NQVVVzYWdlKCkKK3sKKyAgICBpZiAoYWxsUGFnZXMtPnNpemUoKSAhPSAx KQorICAgICAgICByZXR1cm47CisKKyAgICBpZiAoIW1fcG9zdEJhY2tncm91bmRpbmdDUFVUaW1l KSB7CisgICAgICAgIG1fcG9zdEJhY2tncm91bmRpbmdDUFVUaW1lID0gZ2V0Q1BVVGltZSgpOwor ICAgICAgICBpZiAobV9wb3N0QmFja2dyb3VuZGluZ0NQVVRpbWUpCisgICAgICAgICAgICBtX3Bv c3RCYWNrZ3JvdW5kaW5nQ1BVVXNhZ2VUaW1lci5zdGFydE9uZVNob3QoYmFja2dyb3VuZENQVVVz YWdlTWVhc3VyZW1lbnREdXJhdGlvbik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgc3Rk OjpvcHRpb25hbDxDUFVUaW1lPiBjcHVUaW1lID0gZ2V0Q1BVVGltZSgpOworICAgIGlmICghY3B1 VGltZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgZG91YmxlIGNwdVVzYWdlID0gY3B1VGltZS52 YWx1ZSgpLnBlcmNlbnRhZ2VDUFVVc2FnZVNpbmNlKCptX3Bvc3RCYWNrZ3JvdW5kaW5nQ1BVVGlt ZSk7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQZXJmb3JtYW5jZUxvZ2dpbmcsICJtZWFz dXJlUG9zdEJhY2tncm91bmRpbmdDUFVVc2FnZTogUHJvY2VzcyB3YXMgdXNpbmcgJS4xZiUlIHBl cmNlbnQgQ1BVIGFmdGVyIGJlY29taW5nIG5vbiB2aXNpYmxlLiIsIGNwdVVzYWdlKTsKKyAgICBk aWFnbm9zdGljTG9nZ2luZ0NsaWVudCgpLmxvZ0RpYWdub3N0aWNNZXNzYWdlV2l0aFZhbHVlKERp YWdub3N0aWNMb2dnaW5nS2V5czo6cG9zdFBhZ2VCYWNrZ3JvdW5kaW5nS2V5KCksIERpYWdub3N0 aWNMb2dnaW5nS2V5czo6Y3B1VXNhZ2VLZXkoKSwgYmFja2dyb3VuZENQVVVzYWdlVG9EaWFnbm9z dGljTG9nZ2luS2V5KGNwdVVzYWdlKSwgU2hvdWxkU2FtcGxlOjpObyk7CiB9CiAKIHZvaWQgUGFn ZTo6c2V0VG9wQ29udGVudEluc2V0KGZsb2F0IGNvbnRlbnRJbnNldCkKQEAgLTE1ODUsNiArMTYy NywxMyBAQCB2b2lkIFBhZ2U6OnNldElzVmlzaWJsZUludGVybmFsKGJvb2wgaXNWaXNpYmxlKQog ICAgICAgICBpZiAoRnJhbWVWaWV3KiB2aWV3ID0gbWFpbkZyYW1lKCkudmlldygpKQogICAgICAg ICAgICAgdmlldy0+aGlkZSgpOwogICAgIH0KKworICAgIC8vIE1lYXN1cmUgQ1BVIHVzYWdlIG9m IHBhZ2VzIHdoZW4gdGhleSBhcmUgbm8gbG9uZ2VyIHZpc2libGUuCisgICAgbV9wb3N0QmFja2dy b3VuZGluZ0NQVVRpbWUgPSBzdGQ6Om51bGxvcHQ7CisgICAgaWYgKGlzVmlzaWJsZSkKKyAgICAg ICAgbV9wb3N0QmFja2dyb3VuZGluZ0NQVVVzYWdlVGltZXIuc3RvcCgpOworICAgIGVsc2UgaWYg KFNldHRpbmdzOjppc1Bvc3RCYWNrZ3JvdW5kaW5nQ1BVVXNhZ2VNZWFzdXJlbWVudEVuYWJsZWQo KSAmJiBhbGxQYWdlcy0+c2l6ZSgpID09IDEpCisgICAgICAgIG1fcG9zdEJhY2tncm91bmRpbmdD UFVVc2FnZVRpbWVyLnN0YXJ0T25lU2hvdChjcHVVc2FnZU1lYXN1cmVtZW50RGVsYXkpOwogfQog CiB2b2lkIFBhZ2U6OnNldElzUHJlcmVuZGVyKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvUGFnZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgKaW5kZXggMTgxNjRkMzE1 ZjEyMjgxMDM1NjQ0NWJiZjY0ZTZhODFjODAwM2NkNy4uN2UzOGM2MGZiZWE1MmMzYmQwNzVmYTg0 YzYxNDAzMGI1ODllNTVhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgKQEAgLTU2Niw2ICs1NjYsNyBAQCBwcml2 YXRlOgogI2VuZGlmCiAKICAgICB2b2lkIG1lYXN1cmVQb3N0TG9hZENQVVVzYWdlKCk7CisgICAg dm9pZCBtZWFzdXJlUG9zdEJhY2tncm91bmRpbmdDUFVVc2FnZSgpOwogCiAgICAgZW51bSBTaG91 bGRIaWdobGlnaHRNYXRjaGVzIHsgRG9Ob3RIaWdobGlnaHRNYXRjaGVzLCBIaWdobGlnaHRNYXRj aGVzIH07CiAgICAgZW51bSBTaG91bGRNYXJrTWF0Y2hlcyB7IERvTm90TWFya01hdGNoZXMsIE1h cmtNYXRjaGVzIH07CkBAIC03NDksOCArNzUwLDEwIEBAIHByaXZhdGU6CiAgICAgLy8gRm9yIHRl c3RpbmcuCiAgICAgc3RkOjpvcHRpb25hbDxFdmVudFRocm90dGxpbmdCZWhhdmlvcj4gbV9ldmVu dFRocm90dGxpbmdCZWhhdmlvck92ZXJyaWRlOwogCi0gICAgVGltZXIgbV9jcHVVc2FnZU1lYXN1 cmVtZW50VGltZXI7CisgICAgVGltZXIgbV9wb3N0UGFnZUxvYWRDUFVVc2FnZVRpbWVyOwogICAg IHN0ZDo6b3B0aW9uYWw8Q1BVVGltZT4gbV9wb3N0TG9hZENQVVRpbWU7CisgICAgVGltZXIgbV9w b3N0QmFja2dyb3VuZGluZ0NQVVVzYWdlVGltZXI7CisgICAgc3RkOjpvcHRpb25hbDxDUFVUaW1l PiBtX3Bvc3RCYWNrZ3JvdW5kaW5nQ1BVVGltZTsKIH07CiAKIGlubGluZSBQYWdlR3JvdXAmIFBh Z2U6Omdyb3VwKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAKaW5kZXggYjRiMDczZTA3YjJlMDIz YWVjYjQ0Y2RhODU3NjM1Zjk2ZGFjNTMyNy4uNzU5Nzk2YWZiYTAwN2E2NzFjMzM1NjVhYWE1NzI4 NjUwODEwNzVkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAKQEAgLTc4Nyw2ICs3ODcsMTUg QEAgYm9vbCBTZXR0aW5nczo6aXNQb3N0TG9hZENQVVVzYWdlTWVhc3VyZW1lbnRFbmFibGVkKCkK ICNlbmRpZgogfQogCitib29sIFNldHRpbmdzOjppc1Bvc3RCYWNrZ3JvdW5kaW5nQ1BVVXNhZ2VN ZWFzdXJlbWVudEVuYWJsZWQoKQoreworI2lmIFBMQVRGT1JNKE1BQykKKyAgICByZXR1cm4gdHJ1 ZTsKKyNlbHNlCisgICAgcmV0dXJuIGZhbHNlOworI2VuZGlmCit9CisKIHZvaWQgU2V0dGluZ3M6 OnNldEFsbG93c0FueVNTTENlcnRpZmljYXRlKGJvb2wgYWxsb3dBbnlTU0xDZXJ0aWZpY2F0ZSkK IHsKICAgICBnQWxsb3dzQW55U1NMQ2VydGlmaWNhdGUgPSBhbGxvd0FueVNTTENlcnRpZmljYXRl OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5oIGIvU291cmNlL1dl YkNvcmUvcGFnZS9TZXR0aW5ncy5oCmluZGV4IGE2ZmQxYjhmMWI0OGFkNzVlMzljYzU0NzQwMDQy NGUzZmY1ODUxYzcuLmE5NzQwMjE2ZTU2YWQxNzc0ZDY5ZmI2Y2U4NTBlOGViMTY4ZWZiNTUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL1NldHRpbmdzLmgKQEAgLTIwMCw2ICsyMDAsNyBAQCBwdWJsaWM6CiAjZW5kaWYK IAogICAgIHN0YXRpYyBib29sIGlzUG9zdExvYWRDUFVVc2FnZU1lYXN1cmVtZW50RW5hYmxlZCgp OworICAgIHN0YXRpYyBib29sIGlzUG9zdEJhY2tncm91bmRpbmdDUFVVc2FnZU1lYXN1cmVtZW50 RW5hYmxlZCgpOwogCiAgICAgc3RhdGljIGJvb2wgZ2xvYmFsQ29uc3RSZWRlY2xhcmF0aW9uU2hv dWxkVGhyb3coKTsKIAo=