144886 2015-05-11 15:40:54 -0700 Make {Network, Web}ProcessProxy inherit from ProcessThrottleClient privately 2015-05-12 15:08:13 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dbates dbates andersca barraclough darin oldest_to_newest 1093917 0 dbates 2015-05-11 15:40:54 -0700 It is sufficient to make {Network, Web}ProcessProxy inherit from ProcessThrottleClient privately instead of publicly. The callbacks described by ProcessThrottleClient should only be called by ProcessThrottler. 1093919 1 252897 dbates 2015-05-11 15:41:43 -0700 Created attachment 252897 Patch 1094290 2 252897 dbates 2015-05-12 15:08:08 -0700 Comment on attachment 252897 Patch Clearing flags on attachment: 252897 Committed r184223: <http://trac.webkit.org/changeset/184223> 1094291 3 dbates 2015-05-12 15:08:13 -0700 All reviewed patches have been landed. Closing bug. 252897 2015-05-11 15:41:43 -0700 2015-05-12 15:08:08 -0700 Patch bug-144886-20150511154022.patch text/plain 15378 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMTg0MTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDlkYzk1YmUwYmM2NDU0 MTJhNDJiNjA4ZTZlZDdkNDc0MDk2NWJjYi4uZTg1YzMxNjA3YTZjOGE2NDFlYWU4NmUzMzY4NDdl ZGJjYzJkZjBjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDUxIEBACiAyMDE1LTA1LTExICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAorICAgICAgICBNYWtlIHtOZXR3b3JrLCBX ZWJ9UHJvY2Vzc1Byb3h5IGluaGVyaXQgZnJvbSBQcm9jZXNzVGhyb3R0bGVDbGllbnQgcHJpdmF0 ZWx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDQ4 ODYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICB7TmV0 d29yaywgV2VifVByb2Nlc3NQcm94eSBhcmUgaW1wbGVtZW50ZWQgaW4gdGVybXMgb2YgUHJvY2Vz c1Rocm90dGxlQ2xpZW50LCBhbgorICAgICAgICBpbnRlcmZhY2UgdGhhdCBkZWZpbmVzIHRoZSBj YWxsYmFja3MgdGhhdCBQcm9jZXNzVGhyb3R0bGVyIG1ha2VzIHRvIGEgY2xpZW50LiBXZQorICAg ICAgICBkbyBub3Qgd2FudCB0byBhbGxvdyBhcmJpdHJhcnkgY2FsbGVycyB0byBtYWtlIHVzZSBv ZiB0aGUgaW50ZXJmYWNlIFByb2Nlc3NUaHJvdHRsZUNsaWVudC4KKyAgICAgICAgU28sIHdlIHNo b3VsZCB1c2UgcHJpdmF0ZSBpbmhlcml0YW5jZSB0byByZXByZXNlbnQgdGhlIHJlbGF0aW9uc2hp cCBiZXR3ZWVuCisgICAgICAgIHtOZXR3b3JrLCBXZWJ9UHJvY2Vzc1Byb3h5IGFuZCBQcm9jZXNz VGhyb3R0bGVDbGllbnQgaW5zdGVhZCBvZiBwdWJsaWMgaW5oZXJpdGFuY2UuCisKKyAgICAgICAg QWRkaXRpb25hbGx5IG1ha2UgUHJvY2Vzc1Rocm90dGxlciBhIGluc3RhbmNlIHZhcmlhYmxlIG9m IHtOZXR3b3JrLCBXZWJ9UHJvY2Vzc1Byb3h5IGluc3RlYWQKKyAgICAgICAgb2YgaG9sZGluZyBh IHNtYXJ0IHBvaW50ZXIgdG8gYSBQcm9jZXNzVGhyb3R0bGVyIGluc3RhbmNlIGJlY2F1c2Ugd2Ug YWx3YXlzIHdhbnQgdG8KKyAgICAgICAgaGF2ZSBhIFByb2Nlc3NUaHJvdHRsZXIgZm9yIGVhY2gg aW5zdGFuY2Ugb2Yge05ldHdvcmssIFdlYn1Qcm9jZXNzUHJveHkuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6 TmV0d29ya1Byb2Nlc3NQcm94eTo6TmV0d29ya1Byb2Nlc3NQcm94eSk6IFVwZGF0ZSBjb2RlIHRv IHdvcmsgbm93IHRoYXQgbV90aHJvdHRsZXIKKyAgICAgICAgaXMgYW4gaW5zdGFuY2Ugb2YgUHJv Y2Vzc1Rocm90dGxlciBpbnN0ZWFkIG9mIGEgc21hcnQgcG9pbnRlciB0byBhIFByb2Nlc3NUaHJv dHRsZXIgaW5zdGFuY2UuCisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzUHJveHk6OmRp ZEZpbmlzaExhdW5jaGluZyk6IFVwZGF0ZSBjb2RlIHRvIGFjY2VzcyBmdW5jdGlvbnMgb2YKKyAg ICAgICAgbV90aHJvdHRsZXIgYnkgcmVmZXJlbmNlIGluc3RlYWQgb2YgYnkgcG9pbnRlci4KKyAg ICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3NQcm94eTo6ZGlkQ2FuY2VsUHJvY2Vzc1N1c3Bl bnNpb24pOiBEaXR0by4KKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3NQcm94eTo6cHJv Y2Vzc1JlYWR5VG9TdXNwZW5kKTogRGl0dG8uCisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9j ZXNzUHJveHk6OnNldElzSG9sZGluZ0xvY2tlZEZpbGVzKTogRGl0dG8uCisgICAgICAgICogVUlQ cm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5oOiBJbmhlcml0IGZyb20gUHJvY2Vz c1Rocm90dGxlQ2xpZW50IHByaXZhdGVseS4KKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nl c3NQcm94eTo6dGhyb3R0bGVyKTogVXBkYXRlIGNvZGUgdG8gd29yayBub3cgdGhhdCBtX3Rocm90 dGxlciBpcyBhbgorICAgICAgICBpbnN0YW5jZSBvZiBQcm9jZXNzVGhyb3R0bGVyIGluc3RlYWQg b2YgYSBzbWFydCBwb2ludGVyIHRvIGEgUHJvY2Vzc1Rocm90dGxlciBpbnN0YW5jZS4KKyAgICAg ICAgKiBVSVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBy b2Nlc3NUaHJvdHRsZXI6OlByb2Nlc3NUaHJvdHRsZXIpOiBVcGRhdGUgY29kZSB0byB3b3JrIG5v dyB0aGF0IG1fcHJvY2VzcyBpcworICAgICAgICBhIGx2YWx1ZSByZWZlcmVuY2UgaW5zdGVhZCBv ZiBhIHBvaW50ZXIuCisgICAgICAgIChXZWJLaXQ6OlByb2Nlc3NUaHJvdHRsZXI6OnVwZGF0ZUFz c2VydGlvbik6IERpdHRvLgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzVGhyb3R0bGVyOjphc3Nl cnRpb25XaWxsRXhwaXJlSW1taW5lbnRseSk6IERpdHRvLgorICAgICAgICAqIFVJUHJvY2Vzcy9Q cm9jZXNzVGhyb3R0bGVyLmg6IERpdHRvLgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNz UHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OldlYlByb2Nlc3NQ cm94eSk6IFVwZGF0ZSBjb2RlIHRvIHdvcmsgbm93IHRoYXQgbV90aHJvdHRsZXIgaXMgYW4KKyAg ICAgICAgaW5zdGFuY2Ugb2YgUHJvY2Vzc1Rocm90dGxlciBpbnN0ZWFkIG9mIGEgc21hcnQgcG9p bnRlciB0byBhIFByb2Nlc3NUaHJvdHRsZXIgaW5zdGFuY2UuIAorICAgICAgICAoV2ViS2l0OjpX ZWJQcm9jZXNzUHJveHk6OmRpZEZpbmlzaExhdW5jaGluZyk6IFVwZGF0ZSBjb2RlIHRvIGFjY2Vz cyBmdW5jdGlvbnMgb2YKKyAgICAgICAgbV90aHJvdHRsZXIgYnkgcmVmZXJlbmNlIGluc3RlYWQg b2YgYnkgcG9pbnRlci4KKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5Ojpwcm9jZXNz UmVhZHlUb1N1c3BlbmQpOiBEaXR0by4KKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5 OjpkaWRDYW5jZWxQcm9jZXNzU3VzcGVuc2lvbik6IERpdHRvLgorICAgICAgICAoV2ViS2l0OjpX ZWJQcm9jZXNzUHJveHk6OnNldElzSG9sZGluZ0xvY2tlZEZpbGVzKTogRGl0dG8uCisgICAgICAg ICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oOiBJbmhlcml0IGZyb20gUHJvY2Vzc1Rocm90 dGxlQ2xpZW50IHByaXZhdGVseS4KKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5Ojp0 aHJvdHRsZXIpOiBVcGRhdGUgY29kZSB0byB3b3JrIG5vdyB0aGF0IG1fdGhyb3R0bGVyIGlzIGFu CisgICAgICAgIGluc3RhbmNlIG9mIFByb2Nlc3NUaHJvdHRsZXIgaW5zdGVhZCBvZiBhIHNtYXJ0 IHBvaW50ZXIgdG8gYSBQcm9jZXNzVGhyb3R0bGVyIGluc3RhbmNlLgorCisyMDE1LTA1LTExICBE YW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKwogICAgICAgICBbaU9TXSBEaXNwYXRj aCBQcm9jZXNzQXNzZXJ0aW9uQ2xpZW50Ojphc3NlcnRpb25XaWxsRXhwaXJlSW1taW5lbnRseSgp IHRvIHZhbGlkIGNsaWVudHMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE0NDg4MAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv TmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuY3BwCmluZGV4IDMzNGMyYjYxYTIzMTczZTRh ZjI5N2YzNjk5NDUyMWM2NWMxMTcwOWEuLmEwYWNjMzRiN2Y0ZmRhZmIxOTMzZTU4MDBmNTdjMGJj NmRjYWEyYjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9OZXR3b3JrL05l dHdvcmtQcm9jZXNzUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9OZXR3 b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuY3BwCkBAIC02OCw3ICs2OCw3IEBAIE5ldHdvcmtQcm9j ZXNzUHJveHk6Ok5ldHdvcmtQcm9jZXNzUHJveHkoV2ViUHJvY2Vzc1Bvb2wmIHByb2Nlc3NQb29s KQogICAgIDogbV9wcm9jZXNzUG9vbChwcm9jZXNzUG9vbCkKICAgICAsIG1fbnVtUGVuZGluZ0Nv bm5lY3Rpb25SZXF1ZXN0cygwKQogICAgICwgbV9jdXN0b21Qcm90b2NvbE1hbmFnZXJQcm94eSh0 aGlzLCBwcm9jZXNzUG9vbCkKLSAgICAsIG1fdGhyb3R0bGVyKHN0ZDo6bWFrZV91bmlxdWU8UHJv Y2Vzc1Rocm90dGxlcj4odGhpcykpCisgICAgLCBtX3Rocm90dGxlcigqdGhpcykKIHsKICAgICBj b25uZWN0KCk7CiB9CkBAIC0yNzYsNyArMjc2LDcgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzc1Byb3h5 OjpkaWRGaW5pc2hMYXVuY2hpbmcoUHJvY2Vzc0xhdW5jaGVyKiBsYXVuY2hlciwgSVBDOjpDb24K ICAgICAKICNpZiBQTEFURk9STShJT1MpCiAgICAgaWYgKHhwY19jb25uZWN0aW9uX3QgY29ubmVj dGlvbiA9IHRoaXMtPmNvbm5lY3Rpb24oKS0+eHBjQ29ubmVjdGlvbigpKQotICAgICAgICBtX3Ro cm90dGxlci0+ZGlkQ29ubmVjdFRvUHJvY2Vzcyh4cGNfY29ubmVjdGlvbl9nZXRfcGlkKGNvbm5l Y3Rpb24pKTsKKyAgICAgICAgbV90aHJvdHRsZXIuZGlkQ29ubmVjdFRvUHJvY2Vzcyh4cGNfY29u bmVjdGlvbl9nZXRfcGlkKGNvbm5lY3Rpb24pKTsKICNlbmRpZgogfQogCkBAIC0zMzcsNyArMzM3 LDcgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzc1Byb3h5OjpzZW5kQ2FuY2VsUHJvY2Vzc1dpbGxTdXNw ZW5kKCkKIAogdm9pZCBOZXR3b3JrUHJvY2Vzc1Byb3h5OjpkaWRDYW5jZWxQcm9jZXNzU3VzcGVu c2lvbigpCiB7Ci0gICAgbV90aHJvdHRsZXItPmRpZENhbmNlbFByb2Nlc3NTdXNwZW5zaW9uKCk7 CisgICAgbV90aHJvdHRsZXIuZGlkQ2FuY2VsUHJvY2Vzc1N1c3BlbnNpb24oKTsKIH0KIAogdm9p ZCBOZXR3b3JrUHJvY2Vzc1Byb3h5OjpzZW5kUHJvY2Vzc0RpZFJlc3VtZSgpCkBAIC0zNDgsNyAr MzQ4LDcgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzc1Byb3h5OjpzZW5kUHJvY2Vzc0RpZFJlc3VtZSgp CiAKIHZvaWQgTmV0d29ya1Byb2Nlc3NQcm94eTo6cHJvY2Vzc1JlYWR5VG9TdXNwZW5kKCkKIHsK LSAgICBtX3Rocm90dGxlci0+cHJvY2Vzc1JlYWR5VG9TdXNwZW5kKCk7CisgICAgbV90aHJvdHRs ZXIucHJvY2Vzc1JlYWR5VG9TdXNwZW5kKCk7CiB9CiAKIHZvaWQgTmV0d29ya1Byb2Nlc3NQcm94 eTo6c2V0SXNIb2xkaW5nTG9ja2VkRmlsZXMoYm9vbCBpc0hvbGRpbmdMb2NrZWRGaWxlcykKQEAg LTM1OCw3ICszNTgsNyBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzUHJveHk6OnNldElzSG9sZGluZ0xv Y2tlZEZpbGVzKGJvb2wgaXNIb2xkaW5nTG9ja2VkRmlsZXMpCiAgICAgICAgIHJldHVybjsKICAg ICB9CiAgICAgaWYgKCFtX3Rva2VuRm9ySG9sZGluZ0xvY2tlZEZpbGVzKQotICAgICAgICBtX3Rv a2VuRm9ySG9sZGluZ0xvY2tlZEZpbGVzID0gbV90aHJvdHRsZXItPmJhY2tncm91bmRBY3Rpdml0 eVRva2VuKCk7CisgICAgICAgIG1fdG9rZW5Gb3JIb2xkaW5nTG9ja2VkRmlsZXMgPSBtX3Rocm90 dGxlci5iYWNrZ3JvdW5kQWN0aXZpdHlUb2tlbigpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJL aXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQ cm9jZXNzUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQ cm9jZXNzUHJveHkuaAppbmRleCBkYWQ0NzllNWFhOWRkODhkYjMwMjYzOWJiMzRhNTczZTM0MTFk MGUzLi5iZDU2MGNjYWYzNGM4Y2IyOWRlN2E1Y2FkMDhlNWQxMGIwY2I5ZTkxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmgK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94 eS5oCkBAIC01Miw3ICs1Miw3IEBAIGNsYXNzIERvd25sb2FkUHJveHlNYXA7CiBjbGFzcyBXZWJQ cm9jZXNzUG9vbDsKIHN0cnVjdCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczsKIAot Y2xhc3MgTmV0d29ya1Byb2Nlc3NQcm94eSA6IHB1YmxpYyBDaGlsZFByb2Nlc3NQcm94eSwgcHVi bGljIFByb2Nlc3NUaHJvdHRsZXJDbGllbnQgeworY2xhc3MgTmV0d29ya1Byb2Nlc3NQcm94eSA6 IHB1YmxpYyBDaGlsZFByb2Nlc3NQcm94eSwgcHJpdmF0ZSBQcm9jZXNzVGhyb3R0bGVyQ2xpZW50 IHsKIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxOZXR3b3JrUHJvY2Vzc1Byb3h5PiBj cmVhdGUoV2ViUHJvY2Vzc1Bvb2wmKTsKICAgICB+TmV0d29ya1Byb2Nlc3NQcm94eSgpOwpAQCAt NjksMTUgKzY5LDEyIEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFByb2Nlc3NTdXBwcmVzc2lvbkVu YWJsZWQoYm9vbCk7CiAjZW5kaWYKIAotICAgIHZvaWQgc2VuZFByb2Nlc3NXaWxsU3VzcGVuZElt bWluZW50bHkoKSBvdmVycmlkZTsKLSAgICB2b2lkIHNlbmRQcm9jZXNzV2lsbFN1c3BlbmQoKSBv dmVycmlkZTsKLSAgICB2b2lkIHNlbmRDYW5jZWxQcm9jZXNzV2lsbFN1c3BlbmQoKSBvdmVycmlk ZTsKICAgICB2b2lkIGRpZENhbmNlbFByb2Nlc3NTdXNwZW5zaW9uKCk7CiAgICAgdm9pZCBwcm9j ZXNzUmVhZHlUb1N1c3BlbmQoKTsKLSAgICB2b2lkIHNlbmRQcm9jZXNzRGlkUmVzdW1lKCkgb3Zl cnJpZGU7CisKICAgICB2b2lkIHNldElzSG9sZGluZ0xvY2tlZEZpbGVzKGJvb2wpOwogCi0gICAg UHJvY2Vzc1Rocm90dGxlciYgdGhyb3R0bGVyKCkgeyByZXR1cm4gKm1fdGhyb3R0bGVyOyB9Cisg ICAgUHJvY2Vzc1Rocm90dGxlciYgdGhyb3R0bGVyKCkgeyByZXR1cm4gbV90aHJvdHRsZXI7IH0K IAogcHJpdmF0ZToKICAgICBOZXR3b3JrUHJvY2Vzc1Byb3h5KFdlYlByb2Nlc3NQb29sJik7CkBA IC04OSw2ICs4NiwxMiBAQCBwcml2YXRlOgogICAgIHZvaWQgcGxhdGZvcm1HZXRMYXVuY2hPcHRp b25zKFByb2Nlc3NMYXVuY2hlcjo6TGF1bmNoT3B0aW9ucyYpOwogICAgIHZvaWQgbmV0d29ya1By b2Nlc3NDcmFzaGVkT3JGYWlsZWRUb0xhdW5jaCgpOwogCisgICAgLy8gUHJvY2Vzc1Rocm90dGxl ckNsaWVudAorICAgIHZvaWQgc2VuZFByb2Nlc3NXaWxsU3VzcGVuZEltbWluZW50bHkoKSBvdmVy cmlkZTsKKyAgICB2b2lkIHNlbmRQcm9jZXNzV2lsbFN1c3BlbmQoKSBvdmVycmlkZTsKKyAgICB2 b2lkIHNlbmRDYW5jZWxQcm9jZXNzV2lsbFN1c3BlbmQoKSBvdmVycmlkZTsKKyAgICB2b2lkIHNl bmRQcm9jZXNzRGlkUmVzdW1lKCkgb3ZlcnJpZGU7CisKICAgICAvLyBJUEM6OkNvbm5lY3Rpb246 OkNsaWVudAogICAgIHZpcnR1YWwgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5lY3Rp b24mLCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJikgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIGRp ZFJlY2VpdmVTeW5jTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6Ok1lc3NhZ2VEZWNvZGVy Jiwgc3RkOjp1bmlxdWVfcHRyPElQQzo6TWVzc2FnZUVuY29kZXI+Jikgb3ZlcnJpZGU7CkBAIC0x MjIsNyArMTI1LDcgQEAgcHJpdmF0ZToKIAogICAgIHN0ZDo6dW5pcXVlX3B0cjxEb3dubG9hZFBy b3h5TWFwPiBtX2Rvd25sb2FkUHJveHlNYXA7CiAgICAgQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyUHJv eHkgbV9jdXN0b21Qcm90b2NvbE1hbmFnZXJQcm94eTsKLSAgICBzdGQ6OnVuaXF1ZV9wdHI8UHJv Y2Vzc1Rocm90dGxlcj4gbV90aHJvdHRsZXI7CisgICAgUHJvY2Vzc1Rocm90dGxlciBtX3Rocm90 dGxlcjsKICAgICBQcm9jZXNzVGhyb3R0bGVyOjpCYWNrZ3JvdW5kQWN0aXZpdHlUb2tlbiBtX3Rv a2VuRm9ySG9sZGluZ0xvY2tlZEZpbGVzOwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRsZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1Byb2Nlc3NUaHJvdHRsZXIuY3BwCmluZGV4IDgxNGVjMDk0Y2QzMTdkNThhMDZkMmE4Yjlj ZmIzOGRlZmE4ODdlOTkuLjM2Y2EwYWEyNWZiNTQyYWYzNmE1YjZiMTFmMDhlMTQwMGUxN2MxZmUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlci5jcHAKQEAg LTMyLDcgKzMyLDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAgICAgCiBzdGF0aWMgY29uc3QgdW5z aWduZWQgcHJvY2Vzc1N1c3BlbnNpb25UaW1lb3V0ID0gMzA7CiAgICAgCi1Qcm9jZXNzVGhyb3R0 bGVyOjpQcm9jZXNzVGhyb3R0bGVyKFByb2Nlc3NUaHJvdHRsZXJDbGllbnQqIHByb2Nlc3MpCitQ cm9jZXNzVGhyb3R0bGVyOjpQcm9jZXNzVGhyb3R0bGVyKFByb2Nlc3NUaHJvdHRsZXJDbGllbnQm IHByb2Nlc3MpCiAgICAgOiBtX3Byb2Nlc3MocHJvY2VzcykKICAgICAsIG1fc3VzcGVuZFRpbWVy KFJ1bkxvb3A6Om1haW4oKSwgdGhpcywgJlByb2Nlc3NUaHJvdHRsZXI6OnN1c3BlbmRUaW1lckZp cmVkKQogICAgICwgbV9mb3JlZ3JvdW5kQ291bnRlcihbdGhpc10oYm9vbCkgeyB1cGRhdGVBc3Nl cnRpb24oKTsgfSkKQEAgLTY2LDcgKzY2LDcgQEAgdm9pZCBQcm9jZXNzVGhyb3R0bGVyOjp1cGRh dGVBc3NlcnRpb24oKQogICAgIC8vIGluIHRoZSBiYWNrZ3JvdW5kIGZvciB0b28gbG9uZy4KICAg ICBpZiAobV9hc3NlcnRpb24gJiYgbV9hc3NlcnRpb24tPnN0YXRlKCkgIT0gQXNzZXJ0aW9uU3Rh dGU6OlN1c3BlbmRlZCAmJiAhbV9mb3JlZ3JvdW5kQ291bnRlci52YWx1ZSgpICYmICFtX2JhY2tn cm91bmRDb3VudGVyLnZhbHVlKCkpIHsKICAgICAgICAgKyttX3N1c3BlbmRNZXNzYWdlQ291bnQ7 Ci0gICAgICAgIG1fcHJvY2Vzcy0+c2VuZFByb2Nlc3NXaWxsU3VzcGVuZCgpOworICAgICAgICBt X3Byb2Nlc3Muc2VuZFByb2Nlc3NXaWxsU3VzcGVuZCgpOwogICAgICAgICBtX3N1c3BlbmRUaW1l ci5zdGFydE9uZVNob3QocHJvY2Vzc1N1c3BlbnNpb25UaW1lb3V0KTsKICAgICAgICAgbV9hc3Nl cnRpb24tPnNldFN0YXRlKEFzc2VydGlvblN0YXRlOjpCYWNrZ3JvdW5kKTsKICAgICAgICAgcmV0 dXJuOwpAQCAtNzYsMTAgKzc2LDEwIEBAIHZvaWQgUHJvY2Vzc1Rocm90dGxlcjo6dXBkYXRlQXNz ZXJ0aW9uKCkKIAogICAgIC8vIElmIHdlJ3JlIGN1cnJlbnRseSB3YWl0aW5nIGZvciB0aGUgV2Vi IHByb2Nlc3MgdG8gZG8gc3VzcGVuc2lvbiBjbGVhbnVwLCBidXQgbm8gbG9uZ2VyIG5lZWQgdG8g YmUgc3VzcGVuZGVkLCB0ZWxsIHRoZSBXZWIgcHJvY2VzcyB0byBjYW5jZWwgdGhlIGNsZWFudXAu CiAgICAgaWYgKG1fc3VzcGVuZFRpbWVyLmlzQWN0aXZlKCkgJiYgc2hvdWxkQmVSdW5uYWJsZSkK LSAgICAgICAgbV9wcm9jZXNzLT5zZW5kQ2FuY2VsUHJvY2Vzc1dpbGxTdXNwZW5kKCk7CisgICAg ICAgIG1fcHJvY2Vzcy5zZW5kQ2FuY2VsUHJvY2Vzc1dpbGxTdXNwZW5kKCk7CiAgICAgCiAgICAg aWYgKG1fYXNzZXJ0aW9uICYmIG1fYXNzZXJ0aW9uLT5zdGF0ZSgpID09IEFzc2VydGlvblN0YXRl OjpTdXNwZW5kZWQgJiYgc2hvdWxkQmVSdW5uYWJsZSkKLSAgICAgICAgbV9wcm9jZXNzLT5zZW5k UHJvY2Vzc0RpZFJlc3VtZSgpOworICAgICAgICBtX3Byb2Nlc3Muc2VuZFByb2Nlc3NEaWRSZXN1 bWUoKTsKIAogICAgIHVwZGF0ZUFzc2VydGlvbk5vdygpOwogfQpAQCAtMTEyLDcgKzExMiw3IEBA IHZvaWQgUHJvY2Vzc1Rocm90dGxlcjo6ZGlkQ2FuY2VsUHJvY2Vzc1N1c3BlbnNpb24oKQogCiB2 b2lkIFByb2Nlc3NUaHJvdHRsZXI6OmFzc2VydGlvbldpbGxFeHBpcmVJbW1pbmVudGx5KCkKIHsK LSAgICBtX3Byb2Nlc3MtPnNlbmRQcm9jZXNzV2lsbFN1c3BlbmRJbW1pbmVudGx5KCk7CisgICAg bV9wcm9jZXNzLnNlbmRQcm9jZXNzV2lsbFN1c3BlbmRJbW1pbmVudGx5KCk7CiB9CiAKIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmggYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlci5oCmluZGV4IGNkMWJiMTIw YmJhNzcxOTBhZDVjOGJjOWM1YWVkZDYzNTNiMjE1OGIuLjM4NzhkMGFlOGYxMTY5YjlmZjY0MmYw M2QzNDAwOGU0MDJkNDE3ZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Q cm9jZXNzVGhyb3R0bGVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Byb2Nlc3NU aHJvdHRsZXIuaApAQCAtNDgsNyArNDgsNyBAQCBwdWJsaWM6CiAgICAgZW51bSBCYWNrZ3JvdW5k QWN0aXZpdHlUb2tlblR5cGUgeyB9OwogICAgIHR5cGVkZWYgUmVmQ291bnRlcjo6VG9rZW48QmFj a2dyb3VuZEFjdGl2aXR5VG9rZW5UeXBlPiBCYWNrZ3JvdW5kQWN0aXZpdHlUb2tlbjsKIAotICAg IFByb2Nlc3NUaHJvdHRsZXIoUHJvY2Vzc1Rocm90dGxlckNsaWVudCopOworICAgIFByb2Nlc3NU aHJvdHRsZXIoUHJvY2Vzc1Rocm90dGxlckNsaWVudCYpOwogCiAgICAgaW5saW5lIEZvcmVncm91 bmRBY3Rpdml0eVRva2VuIGZvcmVncm91bmRBY3Rpdml0eVRva2VuKCkgY29uc3Q7CiAgICAgaW5s aW5lIEJhY2tncm91bmRBY3Rpdml0eVRva2VuIGJhY2tncm91bmRBY3Rpdml0eVRva2VuKCkgY29u c3Q7CkBAIC02Niw3ICs2Niw3IEBAIHByaXZhdGU6CiAgICAgLy8gUHJvY2Vzc0Fzc2VydGlvbkNs aWVudAogICAgIHZvaWQgYXNzZXJ0aW9uV2lsbEV4cGlyZUltbWluZW50bHkoKSBvdmVycmlkZTsK IAotICAgIFByb2Nlc3NUaHJvdHRsZXJDbGllbnQqIG1fcHJvY2VzczsKKyAgICBQcm9jZXNzVGhy b3R0bGVyQ2xpZW50JiBtX3Byb2Nlc3M7CiAgICAgc3RkOjp1bmlxdWVfcHRyPFByb2Nlc3NBbmRV SUFzc2VydGlvbj4gbV9hc3NlcnRpb247CiAgICAgUnVuTG9vcDo6VGltZXI8UHJvY2Vzc1Rocm90 dGxlcj4gbV9zdXNwZW5kVGltZXI7CiAgICAgUmVmQ291bnRlciBtX2ZvcmVncm91bmRDb3VudGVy OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAppbmRleCBm MDFlZjdjOTllNzMwMzA0NjlhYTQ4Zjc3NTVkMzZkMGQ3ODg3MzUzLi45YTgxY2Y3ZjQwNDQ5NDMz MDNiZmRmZjJhZGQ1Yzc0OWJmYTJmMTc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUHJvY2Vzc1Byb3h5LmNwcApAQCAtMTA2LDcgKzEwNiw3IEBAIFdlYlByb2Nlc3NQcm94eTo6 V2ViUHJvY2Vzc1Byb3h5KFdlYlByb2Nlc3NQb29sJiBwcm9jZXNzUG9vbCkKICAgICAsIG1fbWF5 SGF2ZVVuaXZlcnNhbEZpbGVSZWFkU2FuZGJveEV4dGVuc2lvbihmYWxzZSkKICAgICAsIG1fY3Vz dG9tUHJvdG9jb2xNYW5hZ2VyUHJveHkodGhpcywgcHJvY2Vzc1Bvb2wpCiAgICAgLCBtX251bWJl ck9mVGltZXNTdWRkZW5UZXJtaW5hdGlvbldhc0Rpc2FibGVkKDApCi0gICAgLCBtX3Rocm90dGxl cihzdGQ6Om1ha2VfdW5pcXVlPFByb2Nlc3NUaHJvdHRsZXI+KHRoaXMpKQorICAgICwgbV90aHJv dHRsZXIoKnRoaXMpCiB7CiAgICAgV2ViUGFzdGVib2FyZFByb3h5OjpzaW5nbGV0b24oKS5hZGRX ZWJQcm9jZXNzUHJveHkoKnRoaXMpOwogCkBAIC01ODgsNyArNTg4LDcgQEAgdm9pZCBXZWJQcm9j ZXNzUHJveHk6OmRpZEZpbmlzaExhdW5jaGluZyhQcm9jZXNzTGF1bmNoZXIqIGxhdW5jaGVyLCBJ UEM6OkNvbm5lY3QKICNpZiBQTEFURk9STShJT1MpCiAgICAgeHBjX2Nvbm5lY3Rpb25fdCB4cGND b25uZWN0aW9uID0gY29ubmVjdGlvbigpLT54cGNDb25uZWN0aW9uKCk7CiAgICAgQVNTRVJUKHhw Y0Nvbm5lY3Rpb24pOwotICAgIG1fdGhyb3R0bGVyLT5kaWRDb25uZWN0VG9Qcm9jZXNzKHhwY19j b25uZWN0aW9uX2dldF9waWQoeHBjQ29ubmVjdGlvbikpOworICAgIG1fdGhyb3R0bGVyLmRpZENv bm5lY3RUb1Byb2Nlc3MoeHBjX2Nvbm5lY3Rpb25fZ2V0X3BpZCh4cGNDb25uZWN0aW9uKSk7CiAj ZW5kaWYKIAogICAgIGluaXRpYWxpemVOZXR3b3JrUHJvY2Vzc0FjdGl2aXR5VG9rZW4oKTsKQEAg LTkyOSw3ICs5MjksNyBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6c2VuZFByb2Nlc3NEaWRSZXN1 bWUoKQogICAgIAogdm9pZCBXZWJQcm9jZXNzUHJveHk6OnByb2Nlc3NSZWFkeVRvU3VzcGVuZCgp CiB7Ci0gICAgbV90aHJvdHRsZXItPnByb2Nlc3NSZWFkeVRvU3VzcGVuZCgpOworICAgIG1fdGhy b3R0bGVyLnByb2Nlc3NSZWFkeVRvU3VzcGVuZCgpOwogI2lmIFBMQVRGT1JNKElPUykgJiYgRU5B QkxFKE5FVFdPUktfUFJPQ0VTUykKICAgICBtX3Rva2VuRm9yTmV0d29ya1Byb2Nlc3MgPSBudWxs cHRyOwogI2VuZGlmCkBAIC05MzcsNyArOTM3LDcgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6OnBy b2Nlc3NSZWFkeVRvU3VzcGVuZCgpCiAKIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpkaWRDYW5jZWxQ cm9jZXNzU3VzcGVuc2lvbigpCiB7Ci0gICAgbV90aHJvdHRsZXItPmRpZENhbmNlbFByb2Nlc3NT dXNwZW5zaW9uKCk7CisgICAgbV90aHJvdHRsZXIuZGlkQ2FuY2VsUHJvY2Vzc1N1c3BlbnNpb24o KTsKIH0KIAogdm9pZCBXZWJQcm9jZXNzUHJveHk6OnNldElzSG9sZGluZ0xvY2tlZEZpbGVzKGJv b2wgaXNIb2xkaW5nTG9ja2VkRmlsZXMpCkBAIC05NDcsNyArOTQ3LDcgQEAgdm9pZCBXZWJQcm9j ZXNzUHJveHk6OnNldElzSG9sZGluZ0xvY2tlZEZpbGVzKGJvb2wgaXNIb2xkaW5nTG9ja2VkRmls ZXMpCiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgaWYgKCFtX3Rva2VuRm9ySG9sZGluZ0xv Y2tlZEZpbGVzKQotICAgICAgICBtX3Rva2VuRm9ySG9sZGluZ0xvY2tlZEZpbGVzID0gbV90aHJv dHRsZXItPmJhY2tncm91bmRBY3Rpdml0eVRva2VuKCk7CisgICAgICAgIG1fdG9rZW5Gb3JIb2xk aW5nTG9ja2VkRmlsZXMgPSBtX3Rocm90dGxlci5iYWNrZ3JvdW5kQWN0aXZpdHlUb2tlbigpOwog fQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ cm9jZXNzUHJveHkuaAppbmRleCBhYWFjYTUzMmE1MjA5ZWQzM2EyNDkyOWQ0OGE2ZDU1NzM0ZDJk YjAyLi5hYmQzOWIwNDA0M2Q4MzU2ZjA5NzRlNWE1MTI2ZmY5ZGYxYjUzOTZkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oCkBAIC02NCw3ICs2NCw3IEBAIGNs YXNzIFdlYlBhZ2VHcm91cDsKIGNsYXNzIFdlYlByb2Nlc3NQb29sOwogc3RydWN0IFdlYk5hdmln YXRpb25EYXRhU3RvcmU7CiAgICAgCi1jbGFzcyBXZWJQcm9jZXNzUHJveHkgOiBwdWJsaWMgQ2hp bGRQcm9jZXNzUHJveHksIFJlc3BvbnNpdmVuZXNzVGltZXI6OkNsaWVudCwgcHVibGljIFByb2Nl c3NUaHJvdHRsZXJDbGllbnQgeworY2xhc3MgV2ViUHJvY2Vzc1Byb3h5IDogcHVibGljIENoaWxk UHJvY2Vzc1Byb3h5LCBSZXNwb25zaXZlbmVzc1RpbWVyOjpDbGllbnQsIHByaXZhdGUgUHJvY2Vz c1Rocm90dGxlckNsaWVudCB7CiBwdWJsaWM6CiAgICAgdHlwZWRlZiBIYXNoTWFwPHVpbnQ2NF90 LCBSZWZQdHI8V2ViQmFja0ZvcndhcmRMaXN0SXRlbT4+IFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW1N YXA7CiAgICAgdHlwZWRlZiBIYXNoTWFwPHVpbnQ2NF90LCBSZWZQdHI8V2ViRnJhbWVQcm94eT4+ IFdlYkZyYW1lUHJveHlNYXA7CkBAIC0xNDMsMTYgKzE0MywxMiBAQCBwdWJsaWM6CiAKICAgICB2 b2lkIHdpbmRvd1NlcnZlckNvbm5lY3Rpb25TdGF0ZUNoYW5nZWQoKTsKIAotICAgIHZvaWQgc2Vu ZFByb2Nlc3NXaWxsU3VzcGVuZEltbWluZW50bHkoKSBvdmVycmlkZTsKLSAgICB2b2lkIHNlbmRQ cm9jZXNzV2lsbFN1c3BlbmQoKSBvdmVycmlkZTsKICAgICB2b2lkIHByb2Nlc3NSZWFkeVRvU3Vz cGVuZCgpOwotICAgIHZvaWQgc2VuZENhbmNlbFByb2Nlc3NXaWxsU3VzcGVuZCgpIG92ZXJyaWRl OwogICAgIHZvaWQgZGlkQ2FuY2VsUHJvY2Vzc1N1c3BlbnNpb24oKTsKLSAgICB2b2lkIHNlbmRQ cm9jZXNzRGlkUmVzdW1lKCkgb3ZlcnJpZGU7CiAKICAgICB2b2lkIHNldElzSG9sZGluZ0xvY2tl ZEZpbGVzKGJvb2wpOwogCi0gICAgUHJvY2Vzc1Rocm90dGxlciYgdGhyb3R0bGVyKCkgeyByZXR1 cm4gKm1fdGhyb3R0bGVyOyB9CisgICAgUHJvY2Vzc1Rocm90dGxlciYgdGhyb3R0bGVyKCkgeyBy ZXR1cm4gbV90aHJvdHRsZXI7IH0KIAogcHJpdmF0ZToKICAgICBleHBsaWNpdCBXZWJQcm9jZXNz UHJveHkoV2ViUHJvY2Vzc1Bvb2wmKTsKQEAgLTIwOSw2ICsyMDUsMTIgQEAgcHJpdmF0ZToKICAg ICB2b2lkIGludGVyYWN0aW9uT2NjdXJyZWRXaGlsZVVucmVzcG9uc2l2ZShSZXNwb25zaXZlbmVz c1RpbWVyKikgb3ZlcnJpZGU7CiAgICAgdm9pZCBkaWRCZWNvbWVSZXNwb25zaXZlKFJlc3BvbnNp dmVuZXNzVGltZXIqKSBvdmVycmlkZTsKIAorICAgIC8vIFByb2Nlc3NUaHJvdHRsZXJDbGllbnQK KyAgICB2b2lkIHNlbmRQcm9jZXNzV2lsbFN1c3BlbmRJbW1pbmVudGx5KCkgb3ZlcnJpZGU7Cisg ICAgdm9pZCBzZW5kUHJvY2Vzc1dpbGxTdXNwZW5kKCkgb3ZlcnJpZGU7CisgICAgdm9pZCBzZW5k Q2FuY2VsUHJvY2Vzc1dpbGxTdXNwZW5kKCkgb3ZlcnJpZGU7CisgICAgdm9pZCBzZW5kUHJvY2Vz c0RpZFJlc3VtZSgpIG92ZXJyaWRlOworCiAgICAgLy8gUHJvY2Vzc0xhdW5jaGVyOjpDbGllbnQK ICAgICB2aXJ0dWFsIHZvaWQgZGlkRmluaXNoTGF1bmNoaW5nKFByb2Nlc3NMYXVuY2hlciosIElQ Qzo6Q29ubmVjdGlvbjo6SWRlbnRpZmllcikgb3ZlcnJpZGU7CiAKQEAgLTI0Myw3ICsyNDUsNyBA QCBwcml2YXRlOgogICAgIEhhc2hNYXA8dWludDY0X3QsIHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4+ IG1fcGVuZGluZ0RlbGV0ZVdlYnNpdGVEYXRhRm9yT3JpZ2luc0NhbGxiYWNrczsKIAogICAgIGlu dCBtX251bWJlck9mVGltZXNTdWRkZW5UZXJtaW5hdGlvbldhc0Rpc2FibGVkOwotICAgIHN0ZDo6 dW5pcXVlX3B0cjxQcm9jZXNzVGhyb3R0bGVyPiBtX3Rocm90dGxlcjsKKyAgICBQcm9jZXNzVGhy b3R0bGVyIG1fdGhyb3R0bGVyOwogICAgIFByb2Nlc3NUaHJvdHRsZXI6OkJhY2tncm91bmRBY3Rp dml0eVRva2VuIG1fdG9rZW5Gb3JIb2xkaW5nTG9ja2VkRmlsZXM7CiAjaWYgUExBVEZPUk0oSU9T KSAmJiBFTkFCTEUoTkVUV09SS19QUk9DRVNTKQogICAgIFByb2Nlc3NUaHJvdHRsZXI6OkZvcmVn cm91bmRBY3Rpdml0eVRva2VuIG1fdG9rZW5Gb3JOZXR3b3JrUHJvY2VzczsK