115625 2013-05-06 01:08:27 -0700 [WK2] Make the WebBatteryManagerProxy a supplement to the WebContext 2013-05-06 09:16:54 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zan zan oldest_to_newest 884858 0 zan 2013-05-06 01:08:27 -0700 [WK2] Make the WebBatteryManagerProxy a supplement to the WebContext 884870 1 200646 zan 2013-05-06 01:26:47 -0700 Created attachment 200646 Patch 884919 2 200646 kling 2013-05-06 06:22:57 -0700 Comment on attachment 200646 Patch Very nice! r=me 885049 3 200646 zan 2013-05-06 09:16:49 -0700 Comment on attachment 200646 Patch Clearing flags on attachment: 200646 Committed r149600: <http://trac.webkit.org/changeset/149600> 885050 4 zan 2013-05-06 09:16:54 -0700 All reviewed patches have been landed. Closing bug. 200646 2013-05-06 01:26:47 -0700 2013-05-06 09:16:49 -0700 Patch bug-115625-20130506102552.patch text/plain 11995 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5NTg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOTI3NTFiYmQ4MzIyMjQz YzQ4ODdiNmVmYmNlOTVlNTU2NTRiNzFlMC4uNGI5MjJiMzczMzVmNjAwNGYwOGQ3NjUyZTQ3Y2Qz NDY1NjJiNDI2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDEzLTA1LTA2ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbV0syXSBNYWtlIHRo ZSBXZWJCYXR0ZXJ5TWFuYWdlclByb3h5IGEgc3VwcGxlbWVudCB0byB0aGUgV2ViQ29udGV4dAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE1NjI1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmF0aGVyIHRo YW4gaG9sZGluZyBhIFJlZlB0ciB0byB0aGUgV2ViQmF0dGVyeU1hbmFnZXJQcm94eSBvYmplY3Qg aW4gV2ViQ29udGV4dCwgY2hhbmdlIHRoZSBXZWJCYXR0ZXJ5TWFuYWdlclByb3h5CisgICAgICAg IHRvIGltcGxlbWVudCB0aGUgV2ViQ29udGV4dFN1cHBsZW1lbnQgaW50ZXJmYWNlIGFuZCBoYW5k bGUgdGhlIG9iamVjdCBhcyBzdWNoIGluIFdlYkNvbnRleHQsIHNpbXBsaWZ5aW5nIGl0cworICAg ICAgICBjb25zdHJ1Y3Rpb24gYW5kIGNsZWFudXAsIHJlbW92aW5nIHRoZSBzcGVjaWZpYyBSZWZQ dHIgbWVtYmVyIHZhcmlhYmxlIGFuZCBpdHMgY29ycmVsYXRpbmcgZ2V0dGVyIG1ldGhvZC4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHQuY3BwOgorICAgICAgICAoV0tDb250 ZXh0R2V0QmF0dGVyeU1hbmFnZXIpOiBSZXRyaWV2ZSB0aGUgV2ViQmF0dGVyeU1hbmFnZXJQcm94 eSBvYmplY3QgZnJvbSB0aGUgc3VwcGxlbWVudHMgb2YgdGhlIFdlYkNvbnRleHQuCisgICAgICAg ICogVUlQcm9jZXNzL1dlYkJhdHRlcnlNYW5hZ2VyUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJCYXR0ZXJ5TWFuYWdlclByb3h5OjpzdXBwbGVtZW50TmFtZSk6IFNwZWNpZnkgdGhlIHN1 cHBsZW1lbnQncyBuYW1lLgorICAgICAgICAoV2ViS2l0OjpXZWJCYXR0ZXJ5TWFuYWdlclByb3h5 OjpXZWJCYXR0ZXJ5TWFuYWdlclByb3h5KTogSW5pdGlhbGl6ZSBhcyBhIFdlYkNvbnRleHRTdXBw bGVtZW50YWJsZS4KKyAgICAgICAgKFdlYktpdDo6V2ViQmF0dGVyeU1hbmFnZXJQcm94eTo6cHJv dmlkZXJEaWRDaGFuZ2VCYXR0ZXJ5U3RhdHVzKTogQWRqdXN0IHRvIHVzZSB0aGUgY29udGV4dCgp IG1ldGhvZCBpbnN0ZWFkIG9mIGFjY2Vzc2luZworICAgICAgICB0aGUgcHJpdmF0ZSBtX2NvbnRl eHQgZGlyZWN0bHkuCisgICAgICAgIChXZWJLaXQ6OldlYkJhdHRlcnlNYW5hZ2VyUHJveHk6OnBy b3ZpZGVyVXBkYXRlQmF0dGVyeVN0YXR1cyk6IERpdHRvLgorICAgICAgICAoV2ViS2l0OjpXZWJC YXR0ZXJ5TWFuYWdlclByb3h5Ojpjb250ZXh0RGVzdHJveWVkKTogU3RvcCB1cGRhdGluZyB3aGVu IGludm9rZWQuCisgICAgICAgIChXZWJLaXQ6OldlYkJhdHRlcnlNYW5hZ2VyUHJveHk6OnByb2Nl c3NEaWRDbG9zZSk6IERpdHRvLgorICAgICAgICAoV2ViS2l0OjpXZWJCYXR0ZXJ5TWFuYWdlclBy b3h5OjpyZWZXZWJDb250ZXh0U3VwcGxlbWVudCk6IENhbGwgQVBJT2JqZWN0OjpyZWYuCisgICAg ICAgIChXZWJLaXQ6OldlYkJhdHRlcnlNYW5hZ2VyUHJveHk6OmRlcmVmV2ViQ29udGV4dFN1cHBs ZW1lbnQpOiBDYWxsIEFQSU9iamVjdDo6ZGVyZWYuCisgICAgICAgIChXZWJLaXQ6OldlYkJhdHRl cnlNYW5hZ2VyUHJveHk6OnN0YXJ0VXBkYXRpbmcpOiBGaXJlIHVwIHRoZSBwcm92aWRlciBpZiBu b3QgeWV0IHVwZGF0aW5nLgorICAgICAgICAoV2ViS2l0OjpXZWJCYXR0ZXJ5TWFuYWdlclByb3h5 OjpzdG9wVXBkYXRpbmcpOiBXaW5kIGRvd24gdGhlIHByb3ZpZGVyIGlmIHVwZGF0aW5nLgorICAg ICAgICAqIFVJUHJvY2Vzcy9XZWJCYXR0ZXJ5TWFuYWdlclByb3h5Lmg6CisgICAgICAgIChXZWJC YXR0ZXJ5TWFuYWdlclByb3h5KTogSW5oZXJpdCBmcm9tIFdlYkNvbnRleHRTdXBwbGVtZW50LCBk ZWNsYXJlIHRoZSBuZXdseS1pbmhlcml0ZWQgbWV0aG9kcy4KKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHQ6OldlYkNvbnRleHQp OiBBZGQgdGhlIFdlYkJhdHRlcnlNYW5hZ2VyUHJveHkgb2JqZWN0IGFzIGEgc3VwcGxlbWVudCBp bnN0ZWFkIG9mIGFzc2lnbmluZyBpdCB0bworICAgICAgICB0aGUgbm93LXJlbW92ZWQgbWVtYmVy IHZhcmlhYmxlLgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0Ojp+V2ViQ29udGV4dCk6IE5v IG5lZWQgZm9yIHRoZSBzcGVjaWZpYyBjbGVhbnVwLCB0aGUgZXF1aXZhbGVudCBpcyBhY2hpZXZl ZCB3aGVuIGl0ZXJhdGluZyB0aHJvdWdoIHRoZQorICAgICAgICBzdXBwbGVtZW50cyB2ZWN0b3Iu CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHQ6OmRpc2Nvbm5lY3RQcm9jZXNzKTogRGl0dG8u CisgICAgICAgICogVUlQcm9jZXNzL1dlYkNvbnRleHQuaDoKKyAgICAgICAgKFdlYkNvbnRleHQp OiBSZW1vdmUgdGhlIFdlYkJhdHRlcnlNYW5hZ2VyUHJveHkgUmVmUHRyIG1lbWJlciB2YXJpYWJs ZSBhbmQgaXRzIGdldHRlciBtZXRob2QuCisKIDIwMTMtMDUtMDUgIENocmlzIEZsZWl6YWNoICA8 Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KIAogICAgICAgICBXRUIgU1BFRUNIOiBkZW55IGZpbGUtcmVh ZC1kYXRhIC9MaWJyYXJ5L1NwZWVjaC9TeW50aGVzaXplcnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9DL1dLQ29udGV4dC5jcHAKaW5kZXggZmFlZjRmN2E3ZjdhMTYwZjkxMDQxY2M0 OWRmMzg1YjlmNGM4OTNjZS4uZjAyZWY3ZTlmYjYzY2VkMjVkYjNiYjMwOTI5OWU3YmYwZTAzZTQ1 NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dC5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dC5jcHAKQEAg LTQ2LDYgKzQ2LDkgQEAKICNpZiBFTkFCTEUoU1FMX0RBVEFCQVNFKQogI2luY2x1ZGUgIldlYkRh dGFiYXNlTWFuYWdlclByb3h5LmgiCiAjZW5kaWYKKyNpZiBFTkFCTEUoQkFUVEVSWV9TVEFUVVMp CisjaW5jbHVkZSAiV2ViQmF0dGVyeU1hbmFnZXJQcm94eS5oIgorI2VuZGlmCiAKIHVzaW5nIG5h bWVzcGFjZSBXZWJLaXQ7CiAKQEAgLTIwNiw3ICsyMDksNyBAQCBXS0FwcGxpY2F0aW9uQ2FjaGVN YW5hZ2VyUmVmIFdLQ29udGV4dEdldEFwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyKFdLQ29udGV4dFJl ZiBjbwogV0tCYXR0ZXJ5TWFuYWdlclJlZiBXS0NvbnRleHRHZXRCYXR0ZXJ5TWFuYWdlcihXS0Nv bnRleHRSZWYgY29udGV4dFJlZikKIHsKICNpZiBFTkFCTEUoQkFUVEVSWV9TVEFUVVMpCi0gICAg cmV0dXJuIHRvQVBJKHRvSW1wbChjb250ZXh0UmVmKS0+YmF0dGVyeU1hbmFnZXJQcm94eSgpKTsK KyAgICByZXR1cm4gdG9BUEkodG9JbXBsKGNvbnRleHRSZWYpLT5zdXBwbGVtZW50PFdlYkJhdHRl cnlNYW5hZ2VyUHJveHk+KCkpOwogI2Vsc2UKICAgICByZXR1cm4gMDsKICNlbmRpZgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkJhdHRlcnlNYW5hZ2VyUHJveHkuY3Bw IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkJhdHRlcnlNYW5hZ2VyUHJveHkuY3BwCmlu ZGV4IDViY2E5MWZhNDhlNTViNGUyMjQ0MDMwMTk5NGJlNWY3ZmIyYzBjZjUuLjQzZTU0Zjc5NjYx OWIwZTZjNDk0MWQ5NDA3YzFjY2YyMDU4MTI0NjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJCYXR0ZXJ5TWFuYWdlclByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViQmF0dGVyeU1hbmFnZXJQcm94eS5jcHAKQEAgLTM0LDY0ICszNCw4NyBA QAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAorY29uc3QgY2hhciogV2ViQmF0dGVyeU1hbmFnZXJQ cm94eTo6c3VwcGxlbWVudE5hbWUoKQoreworICAgIHJldHVybiAiV2ViQmF0dGVyeU1hbmFnZXJQ cm94eSI7Cit9CisKIFBhc3NSZWZQdHI8V2ViQmF0dGVyeU1hbmFnZXJQcm94eT4gV2ViQmF0dGVy eU1hbmFnZXJQcm94eTo6Y3JlYXRlKFdlYkNvbnRleHQqIGNvbnRleHQpCiB7CiAgICAgcmV0dXJu IGFkb3B0UmVmKG5ldyBXZWJCYXR0ZXJ5TWFuYWdlclByb3h5KGNvbnRleHQpKTsKIH0KIAogV2Vi QmF0dGVyeU1hbmFnZXJQcm94eTo6V2ViQmF0dGVyeU1hbmFnZXJQcm94eShXZWJDb250ZXh0KiBj b250ZXh0KQotICAgIDogbV9pc1VwZGF0aW5nKGZhbHNlKQotICAgICwgbV9jb250ZXh0KGNvbnRl eHQpCisgICAgOiBXZWJDb250ZXh0U3VwcGxlbWVudChjb250ZXh0KQorICAgICwgbV9pc1VwZGF0 aW5nKGZhbHNlKQogewotICAgIG1fY29udGV4dC0+YWRkTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2Vz OjpXZWJCYXR0ZXJ5TWFuYWdlclByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIHRoaXMpOwor ICAgIFdlYkNvbnRleHRTdXBwbGVtZW50Ojpjb250ZXh0KCktPmFkZE1lc3NhZ2VSZWNlaXZlcihN ZXNzYWdlczo6V2ViQmF0dGVyeU1hbmFnZXJQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCB0 aGlzKTsKIH0KIAogV2ViQmF0dGVyeU1hbmFnZXJQcm94eTo6fldlYkJhdHRlcnlNYW5hZ2VyUHJv eHkoKQogewogfQogCi12b2lkIFdlYkJhdHRlcnlNYW5hZ2VyUHJveHk6OmludmFsaWRhdGUoKQot ewotICAgIHN0b3BVcGRhdGluZygpOwotfQotCiB2b2lkIFdlYkJhdHRlcnlNYW5hZ2VyUHJveHk6 OmluaXRpYWxpemVQcm92aWRlcihjb25zdCBXS0JhdHRlcnlQcm92aWRlciogcHJvdmlkZXIpCiB7 CiAgICAgbV9wcm92aWRlci5pbml0aWFsaXplKHByb3ZpZGVyKTsKIH0KIAotdm9pZCBXZWJCYXR0 ZXJ5TWFuYWdlclByb3h5OjpzdGFydFVwZGF0aW5nKCkKKwordm9pZCBXZWJCYXR0ZXJ5TWFuYWdl clByb3h5Ojpwcm92aWRlckRpZENoYW5nZUJhdHRlcnlTdGF0dXMoY29uc3QgV1RGOjpBdG9taWNT dHJpbmcmIGV2ZW50VHlwZSwgV2ViQmF0dGVyeVN0YXR1cyogc3RhdHVzKQogewotICAgIGlmICht X2lzVXBkYXRpbmcpCisgICAgaWYgKCFjb250ZXh0KCkpCiAgICAgICAgIHJldHVybjsKIAotICAg IG1fcHJvdmlkZXIuc3RhcnRVcGRhdGluZyh0aGlzKTsKLSAgICBtX2lzVXBkYXRpbmcgPSB0cnVl OworICAgIGNvbnRleHQoKS0+c2VuZFRvQWxsUHJvY2Vzc2VzKE1lc3NhZ2VzOjpXZWJCYXR0ZXJ5 TWFuYWdlcjo6RGlkQ2hhbmdlQmF0dGVyeVN0YXR1cyhldmVudFR5cGUsIHN0YXR1cy0+ZGF0YSgp KSk7CiB9CiAKLXZvaWQgV2ViQmF0dGVyeU1hbmFnZXJQcm94eTo6c3RvcFVwZGF0aW5nKCkKK3Zv aWQgV2ViQmF0dGVyeU1hbmFnZXJQcm94eTo6cHJvdmlkZXJVcGRhdGVCYXR0ZXJ5U3RhdHVzKFdl YkJhdHRlcnlTdGF0dXMqIHN0YXR1cykKIHsKLSAgICBpZiAoIW1faXNVcGRhdGluZykKKyAgICBp ZiAoIWNvbnRleHQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9wcm92aWRlci5zdG9wVXBk YXRpbmcodGhpcyk7Ci0gICAgbV9pc1VwZGF0aW5nID0gZmFsc2U7CisgICAgY29udGV4dCgpLT5z ZW5kVG9BbGxQcm9jZXNzZXMoTWVzc2FnZXM6OldlYkJhdHRlcnlNYW5hZ2VyOjpVcGRhdGVCYXR0 ZXJ5U3RhdHVzKHN0YXR1cy0+ZGF0YSgpKSk7CiB9CiAKLXZvaWQgV2ViQmF0dGVyeU1hbmFnZXJQ cm94eTo6cHJvdmlkZXJEaWRDaGFuZ2VCYXR0ZXJ5U3RhdHVzKGNvbnN0IFdURjo6QXRvbWljU3Ry aW5nJiBldmVudFR5cGUsIFdlYkJhdHRlcnlTdGF0dXMqIHN0YXR1cykKKy8vIFdlYkNvbnRleHRT dXBwbGVtZW50CisKK3ZvaWQgV2ViQmF0dGVyeU1hbmFnZXJQcm94eTo6Y29udGV4dERlc3Ryb3ll ZCgpCiB7Ci0gICAgaWYgKCFtX2NvbnRleHQpCisgICAgc3RvcFVwZGF0aW5nKCk7Cit9CisKK3Zv aWQgV2ViQmF0dGVyeU1hbmFnZXJQcm94eTo6cHJvY2Vzc0RpZENsb3NlKFdlYlByb2Nlc3NQcm94 eSopCit7CisgICAgc3RvcFVwZGF0aW5nKCk7Cit9CisKK3ZvaWQgV2ViQmF0dGVyeU1hbmFnZXJQ cm94eTo6cmVmV2ViQ29udGV4dFN1cHBsZW1lbnQoKQoreworICAgIEFQSU9iamVjdDo6cmVmKCk7 Cit9CisKK3ZvaWQgV2ViQmF0dGVyeU1hbmFnZXJQcm94eTo6ZGVyZWZXZWJDb250ZXh0U3VwcGxl bWVudCgpCit7CisgICAgQVBJT2JqZWN0OjpkZXJlZigpOworfQorCit2b2lkIFdlYkJhdHRlcnlN YW5hZ2VyUHJveHk6OnN0YXJ0VXBkYXRpbmcoKQoreworICAgIGlmIChtX2lzVXBkYXRpbmcpCiAg ICAgICAgIHJldHVybjsKIAotICAgIG1fY29udGV4dC0+c2VuZFRvQWxsUHJvY2Vzc2VzKE1lc3Nh Z2VzOjpXZWJCYXR0ZXJ5TWFuYWdlcjo6RGlkQ2hhbmdlQmF0dGVyeVN0YXR1cyhldmVudFR5cGUs IHN0YXR1cy0+ZGF0YSgpKSk7CisgICAgbV9wcm92aWRlci5zdGFydFVwZGF0aW5nKHRoaXMpOwor ICAgIG1faXNVcGRhdGluZyA9IHRydWU7CiB9CiAKLXZvaWQgV2ViQmF0dGVyeU1hbmFnZXJQcm94 eTo6cHJvdmlkZXJVcGRhdGVCYXR0ZXJ5U3RhdHVzKFdlYkJhdHRlcnlTdGF0dXMqIHN0YXR1cykK K3ZvaWQgV2ViQmF0dGVyeU1hbmFnZXJQcm94eTo6c3RvcFVwZGF0aW5nKCkKIHsKLSAgICBpZiAo IW1fY29udGV4dCkKKyAgICBpZiAoIW1faXNVcGRhdGluZykKICAgICAgICAgcmV0dXJuOwogCi0g ICAgbV9jb250ZXh0LT5zZW5kVG9BbGxQcm9jZXNzZXMoTWVzc2FnZXM6OldlYkJhdHRlcnlNYW5h Z2VyOjpVcGRhdGVCYXR0ZXJ5U3RhdHVzKHN0YXR1cy0+ZGF0YSgpKSk7CisgICAgbV9wcm92aWRl ci5zdG9wVXBkYXRpbmcodGhpcyk7CisgICAgbV9pc1VwZGF0aW5nID0gZmFsc2U7CiB9CiAKIH0g Ly8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYkJhdHRlcnlNYW5hZ2VyUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJC YXR0ZXJ5TWFuYWdlclByb3h5LmgKaW5kZXggZjRjNDlmNjcxOWMwYTk2YjJlMmM4ZDI4Y2RlMDEz NWFhYTk2MmI5Yi4uY2JhZWQxMDUwMmQ0YTYxZjU5NGI1OWY4OGZhMjJjNmU4YmQ2ODMwNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkJhdHRlcnlNYW5hZ2VyUHJveHku aAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQmF0dGVyeU1hbmFnZXJQcm94eS5o CkBAIC0zMSwyOSArMzEsMzggQEAKICNpbmNsdWRlICJBUElPYmplY3QuaCIKICNpbmNsdWRlICJN ZXNzYWdlUmVjZWl2ZXIuaCIKICNpbmNsdWRlICJXZWJCYXR0ZXJ5UHJvdmlkZXIuaCIKKyNpbmNs dWRlICJXZWJDb250ZXh0U3VwcGxlbWVudC5oIgogI2luY2x1ZGUgPHd0Zi9Gb3J3YXJkLmg+CiAK IG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBXZWJDb250ZXh0OwogY2xhc3MgV2ViQmF0dGVy eVN0YXR1czsKLWNsYXNzIFdlYkJhdHRlcnlNYW5hZ2VyUHJveHkgOiBwdWJsaWMgVHlwZWRBUElP YmplY3Q8QVBJT2JqZWN0OjpUeXBlQmF0dGVyeU1hbmFnZXI+LCBwcml2YXRlIENvcmVJUEM6Ok1l c3NhZ2VSZWNlaXZlciB7CiAKK2NsYXNzIFdlYkJhdHRlcnlNYW5hZ2VyUHJveHkgOiBwdWJsaWMg VHlwZWRBUElPYmplY3Q8QVBJT2JqZWN0OjpUeXBlQmF0dGVyeU1hbmFnZXI+LCBwdWJsaWMgV2Vi Q29udGV4dFN1cHBsZW1lbnQsIHByaXZhdGUgQ29yZUlQQzo6TWVzc2FnZVJlY2VpdmVyIHsKIHB1 YmxpYzoKKyAgICBzdGF0aWMgY29uc3QgY2hhciogc3VwcGxlbWVudE5hbWUoKTsKKwogICAgIHN0 YXRpYyBQYXNzUmVmUHRyPFdlYkJhdHRlcnlNYW5hZ2VyUHJveHk+IGNyZWF0ZShXZWJDb250ZXh0 Kik7CiAgICAgdmlydHVhbCB+V2ViQmF0dGVyeU1hbmFnZXJQcm94eSgpOwogCi0gICAgdm9pZCBp bnZhbGlkYXRlKCk7Ci0gICAgdm9pZCBjbGVhckNvbnRleHQoKSB7IG1fY29udGV4dCA9IDA7IH0K LQogICAgIHZvaWQgaW5pdGlhbGl6ZVByb3ZpZGVyKGNvbnN0IFdLQmF0dGVyeVByb3ZpZGVyKik7 CiAKICAgICB2b2lkIHByb3ZpZGVyRGlkQ2hhbmdlQmF0dGVyeVN0YXR1cyhjb25zdCBXVEY6OkF0 b21pY1N0cmluZyYsIFdlYkJhdHRlcnlTdGF0dXMqKTsKICAgICB2b2lkIHByb3ZpZGVyVXBkYXRl QmF0dGVyeVN0YXR1cyhXZWJCYXR0ZXJ5U3RhdHVzKik7CiAKKyAgICB1c2luZyBBUElPYmplY3Q6 OnJlZjsKKyAgICB1c2luZyBBUElPYmplY3Q6OmRlcmVmOworCiBwcml2YXRlOgogICAgIGV4cGxp Y2l0IFdlYkJhdHRlcnlNYW5hZ2VyUHJveHkoV2ViQ29udGV4dCopOwogCisgICAgLy8gV2ViQ29u dGV4dFN1cHBsZW1lbnQKKyAgICB2aXJ0dWFsIHZvaWQgY29udGV4dERlc3Ryb3llZCgpIE9WRVJS SURFOworICAgIHZpcnR1YWwgdm9pZCBwcm9jZXNzRGlkQ2xvc2UoV2ViUHJvY2Vzc1Byb3h5Kikg T1ZFUlJJREU7CisgICAgdmlydHVhbCB2b2lkIHJlZldlYkNvbnRleHRTdXBwbGVtZW50KCkgT1ZF UlJJREU7CisgICAgdmlydHVhbCB2b2lkIGRlcmVmV2ViQ29udGV4dFN1cHBsZW1lbnQoKSBPVkVS UklERTsKKwogICAgIC8vIENvcmVJUEM6Ok1lc3NhZ2VSZWNlaXZlcgogICAgIHZpcnR1YWwgdm9p ZCBkaWRSZWNlaXZlTWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiwgQ29yZUlQQzo6TWVzc2Fn ZURlY29kZXImKSBPVkVSUklERTsKIApAQCAtNjIsNyArNzEsNiBAQCBwcml2YXRlOgogCiAgICAg Ym9vbCBtX2lzVXBkYXRpbmc7CiAKLSAgICBXZWJDb250ZXh0KiBtX2NvbnRleHQ7CiAgICAgV2Vi QmF0dGVyeVByb3ZpZGVyIG1fcHJvdmlkZXI7CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViQ29udGV4dC5jcHAKaW5kZXggM2NmOTgxOGRlYjQxYzMwNWVmMWVkN2QyMDgxYzdmMWZjMDk5 Y2QzNi4uNWNlMTM1OWFjZGU3Y2Y0NGQwNjhmMTI1MGFjOGJjMjNjMjI2YzUzMSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmNwcApAQCAtMTU1LDkgKzE1NSw2IEBAIFdlYkNv bnRleHQ6OldlYkNvbnRleHQoUHJvY2Vzc01vZGVsIHByb2Nlc3NNb2RlbCwgY29uc3QgU3RyaW5n JiBpbmplY3RlZEJ1bmRsZVBhCiAgICAgYWRkTWVzc2FnZVJlY2VpdmVyKFdlYkNvbnRleHRMZWdh Y3lNZXNzYWdlczo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCB0aGlzKTsKIAogICAgIC8vIE5PVEU6 IFRoZXNlIHN1Yi1vYmplY3RzIG11c3QgYmUgaW5pdGlhbGl6ZWQgYWZ0ZXIgbV9tZXNzYWdlUmVj ZWl2ZXJNYXAuLgotI2lmIEVOQUJMRShCQVRURVJZX1NUQVRVUykKLSAgICBtX2JhdHRlcnlNYW5h Z2VyUHJveHkgPSBXZWJCYXR0ZXJ5TWFuYWdlclByb3h5OjpjcmVhdGUodGhpcyk7Ci0jZW5kaWYK ICAgICBtX2ljb25EYXRhYmFzZSA9IFdlYkljb25EYXRhYmFzZTo6Y3JlYXRlKHRoaXMpOwogI2lm IEVOQUJMRShORVRXT1JLX0lORk8pCiAgICAgbV9uZXR3b3JrSW5mb01hbmFnZXJQcm94eSA9IFdl Yk5ldHdvcmtJbmZvTWFuYWdlclByb3h5OjpjcmVhdGUodGhpcyk7CkBAIC0xNzksNiArMTc2LDkg QEAgV2ViQ29udGV4dDo6V2ViQ29udGV4dChQcm9jZXNzTW9kZWwgcHJvY2Vzc01vZGVsLCBjb25z dCBTdHJpbmcmIGluamVjdGVkQnVuZGxlUGEKICNpZiBVU0UoU09VUCkKICAgICBhZGRTdXBwbGVt ZW50PFdlYlNvdXBSZXF1ZXN0TWFuYWdlclByb3h5PigpOwogI2VuZGlmCisjaWYgRU5BQkxFKEJB VFRFUllfU1RBVFVTKQorICAgIGFkZFN1cHBsZW1lbnQ8V2ViQmF0dGVyeU1hbmFnZXJQcm94eT4o KTsKKyNlbmRpZgogCiAgICAgY29udGV4dHMoKS5hcHBlbmQodGhpcyk7CiAKQEAgLTIyMiwxMSAr MjIyLDYgQEAgV2ViQ29udGV4dDo6fldlYkNvbnRleHQoKQogICAgICAgICBpdC0+dmFsdWUtPmNs ZWFyQ29udGV4dCgpOwogICAgIH0KIAotI2lmIEVOQUJMRShCQVRURVJZX1NUQVRVUykKLSAgICBt X2JhdHRlcnlNYW5hZ2VyUHJveHktPmludmFsaWRhdGUoKTsKLSAgICBtX2JhdHRlcnlNYW5hZ2Vy UHJveHktPmNsZWFyQ29udGV4dCgpOwotI2VuZGlmCi0KICAgICBtX2ljb25EYXRhYmFzZS0+aW52 YWxpZGF0ZSgpOwogICAgIG1faWNvbkRhdGFiYXNlLT5jbGVhckNvbnRleHQoKTsKICAgICAKQEAg LTY3Niw5ICs2NzEsNiBAQCB2b2lkIFdlYkNvbnRleHQ6OmRpc2Nvbm5lY3RQcm9jZXNzKFdlYlBy b2Nlc3NQcm94eSogcHJvY2VzcykKICAgICBmb3IgKDsgaXQgIT0gZW5kOyArK2l0KQogICAgICAg ICBpdC0+dmFsdWUtPnByb2Nlc3NEaWRDbG9zZShwcm9jZXNzKTsKIAotI2lmIEVOQUJMRShCQVRU RVJZX1NUQVRVUykKLSAgICBtX2JhdHRlcnlNYW5hZ2VyUHJveHktPmludmFsaWRhdGUoKTsKLSNl bmRpZgogI2lmIEVOQUJMRShORVRXT1JLX0lORk8pCiAgICAgbV9uZXR3b3JrSW5mb01hbmFnZXJQ cm94eS0+aW52YWxpZGF0ZSgpOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViQ29udGV4dC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRl eHQuaAppbmRleCBjMmVkOGI1YjkwNjZjYjlkODdlZTYwZmI4ZmE4ZmIxZDNkMDc5YmRjLi43Zjg3 MzkwNDU1Y2ZiNjAyNTE3ZDM5YWIwYzdmNzkyMmMwNGNjYmY0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJDb250ZXh0LmgKQEAgLTc1LDkgKzc1LDYgQEAgc3RydWN0IFdlYlByb2Nlc3NDcmVh dGlvblBhcmFtZXRlcnM7CiAgICAgCiB0eXBlZGVmIEdlbmVyaWNDYWxsYmFjazxXS0RpY3Rpb25h cnlSZWY+IERpY3Rpb25hcnlDYWxsYmFjazsKIAotI2lmIEVOQUJMRShCQVRURVJZX1NUQVRVUykK LWNsYXNzIFdlYkJhdHRlcnlNYW5hZ2VyUHJveHk7Ci0jZW5kaWYKICNpZiBFTkFCTEUoTkVUV09S S19JTkZPKQogY2xhc3MgV2ViTmV0d29ya0luZm9NYW5hZ2VyUHJveHk7CiAjZW5kaWYKQEAgLTIx Myw5ICsyMTAsNiBAQCBwdWJsaWM6CiAgICAgV2ViSGlzdG9yeUNsaWVudCYgaGlzdG9yeUNsaWVu dCgpIHsgcmV0dXJuIG1faGlzdG9yeUNsaWVudDsgfQogICAgIFdlYkNvbnRleHRDbGllbnQmIGNs aWVudCgpIHsgcmV0dXJuIG1fY2xpZW50OyB9CiAKLSNpZiBFTkFCTEUoQkFUVEVSWV9TVEFUVVMp Ci0gICAgV2ViQmF0dGVyeU1hbmFnZXJQcm94eSogYmF0dGVyeU1hbmFnZXJQcm94eSgpIGNvbnN0 IHsgcmV0dXJuIG1fYmF0dGVyeU1hbmFnZXJQcm94eS5nZXQoKTsgfQotI2VuZGlmCiAgICAgV2Vi SWNvbkRhdGFiYXNlKiBpY29uRGF0YWJhc2UoKSBjb25zdCB7IHJldHVybiBtX2ljb25EYXRhYmFz ZS5nZXQoKTsgfQogI2lmIEVOQUJMRShORVRXT1JLX0lORk8pCiAgICAgV2ViTmV0d29ya0luZm9N YW5hZ2VyUHJveHkqIG5ldHdvcmtJbmZvTWFuYWdlclByb3h5KCkgY29uc3QgeyByZXR1cm4gbV9u ZXR3b3JrSW5mb01hbmFnZXJQcm94eS5nZXQoKTsgfQpAQCAtNDM0LDkgKzQyOCw2IEBAIHByaXZh dGU6CiAgICAgYm9vbCBtX21lbW9yeVNhbXBsZXJFbmFibGVkOwogICAgIGRvdWJsZSBtX21lbW9y eVNhbXBsZXJJbnRlcnZhbDsKIAotI2lmIEVOQUJMRShCQVRURVJZX1NUQVRVUykKLSAgICBSZWZQ dHI8V2ViQmF0dGVyeU1hbmFnZXJQcm94eT4gbV9iYXR0ZXJ5TWFuYWdlclByb3h5OwotI2VuZGlm CiAgICAgUmVmUHRyPFdlYkljb25EYXRhYmFzZT4gbV9pY29uRGF0YWJhc2U7CiAjaWYgRU5BQkxF KE5FVFdPUktfSU5GTykKICAgICBSZWZQdHI8V2ViTmV0d29ya0luZm9NYW5hZ2VyUHJveHk+IG1f bmV0d29ya0luZm9NYW5hZ2VyUHJveHk7Cg==