163813 2016-10-21 15:01:20 -0700 WebPage should take UserActivity directly for user input 2016-10-21 16:23:03 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough barraclough oldest_to_newest 1243116 0 barraclough 2016-10-21 15:01:20 -0700 When we receive mouse/keyboard events in a page, we want to prevent AppNap. We currently do so via the PageThrottler. This patch is to just make the WebPage drive the UserActivity directly. Two reasons to do so: (1) to cleanup & simplify for further refactoring. (2) The current code isn't really achieving the desired effect. The page setting the flag in the throttler to get the activity to be set is now a less effective way of achieving this goal, since the PageActivityState bounces back across to the UI process & then messages back to the WebContent process to take the UserActivity. These extra hops defeat the purpose of making sure the boost from the initial message isn't lost. 1243118 1 292418 barraclough 2016-10-21 15:05:57 -0700 Created attachment 292418 Fix 1243145 2 barraclough 2016-10-21 16:23:03 -0700 Committed revision 207699. 292418 2016-10-21 15:05:57 -0700 2016-10-21 15:07:50 -0700 Fix 163813.1.patch text/plain 8792 barraclough SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwNzM4NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE2LTEwLTIxICBHYXZpbiBC YXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJQYWdlIHNo b3VsZCB0YWtlIFVzZXJBY3Rpdml0eSBkaXJlY3RseSBmb3IgdXNlciBpbnB1dAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYzODEzCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiB3ZSByZWNlaXZlIG1v dXNlL2tleWJvYXJkIGV2ZW50cyBpbiBhIHBhZ2UsIHdlIHdhbnQgdG8gcHJldmVudCBBcHBOYXAu IFdlIGN1cnJlbnRseSBkbyBzbworICAgICAgICB2aWEgdGhlIFBhZ2VUaHJvdHRsZXIuIFRoaXMg cGF0Y2ggaXMgdG8ganVzdCBtYWtlIHRoZSBXZWJQYWdlIGRyaXZlIHRoZSBVc2VyQWN0aXZpdHkg ZGlyZWN0bHkuCisKKyAgICAgICAgVHdvIHJlYXNvbnMgdG8gZG8gc286ICgxKSB0byBjbGVhbnVw ICYgc2ltcGxpZnkgZm9yIGZ1cnRoZXIgcmVmYWN0b3JpbmcuICgyKSBUaGUgY3VycmVudCBjb2Rl CisgICAgICAgIGlzbid0IHJlYWxseSBhY2hpZXZpbmcgdGhlIGRlc2lyZWQgZWZmZWN0LiBUaGUg cGFnZSBzZXR0aW5nIHRoZSBmbGFnIGluIHRoZSB0aHJvdHRsZXIgdG8gZ2V0CisgICAgICAgIHRo ZSBhY3Rpdml0eSB0byBiZSBzZXQgaXMgbm93IGEgbGVzcyBlZmZlY3RpdmUgd2F5IG9mIGFjaGll dmluZyB0aGlzIGdvYWwsIHNpbmNlIHRoZQorICAgICAgICBQYWdlQWN0aXZpdHlTdGF0ZSBib3Vu Y2VzIGJhY2sgYWNyb3NzIHRvIHRoZSBVSSBwcm9jZXNzICYgdGhlbiBtZXNzYWdlcyBiYWNrIHRv IHRoZSBXZWJDb250ZW50CisgICAgICAgIHByb2Nlc3MgdG8gdGFrZSB0aGUgVXNlckFjdGl2aXR5 LiBUaGVzZSBleHRyYSBob3BzIGRlZmVhdCB0aGUgcHVycG9zZSBvZiBtYWtpbmcgc3VyZSB0aGUg Ym9vc3QKKyAgICAgICAgZnJvbSB0aGUgaW5pdGlhbCBtZXNzYWdlIGlzbid0IGxvc3QuCisKKyAg ICAgICAgKiBwYWdlL1BhZ2VUaHJvdHRsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZVRo cm90dGxlcjo6UGFnZVRocm90dGxlcik6CisgICAgICAgIChXZWJDb3JlOjptX3VzZXJJbnB1dEh5 c3RlcmVzaXMpOiBEZWxldGVkLgorICAgICAgICAqIHBhZ2UvUGFnZVRocm90dGxlci5oOgorICAg ICAgICAoV2ViQ29yZTo6UGFnZVRocm90dGxlcjo6ZGlkUmVjZWl2ZVVzZXJJbnB1dCk6IERlbGV0 ZWQuCisgICAgICAgICAgICAtIHJlbW92ZWQgUGFnZUFjdGl2aXR5U3RhdGU6OlVzZXJJbnB1dEFj dGl2aXR5LCBkaWRSZWNlaXZlVXNlcklucHV0LCBtX3VzZXJJbnB1dEh5c3RlcmVzaXMuCisKIDIw MTYtMTAtMTUgIFNhaWQgQWJvdS1IYWxsYXdhICA8c2Fib3VoYWxsYXdhQGFwcGxlLmNvbT4KIAog ICAgICAgICBEZWxldGUgdGhlIGFuaW1hdGVkIGltYWdlIGNhdGNodXAgY29kZQpJbmRleDogU291 cmNlL1dlYkNvcmUvcGFnZS9QYWdlVGhyb3R0bGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wYWdlL1BhZ2VUaHJvdHRsZXIuY3BwCShyZXZpc2lvbiAyMDczODcpCisrKyBTb3Vy Y2UvV2ViQ29yZS9wYWdlL1BhZ2VUaHJvdHRsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNCw3 ICszNCw2IEBAIHN0YXRpYyBjb25zdCBkb3VibGUgUGFnZUxvYWRIeXN0ZXJlc2lzU2UKIAogUGFn ZVRocm90dGxlcjo6UGFnZVRocm90dGxlcihQYWdlJiBwYWdlKQogICAgIDogbV9wYWdlKHBhZ2Up Ci0gICAgLCBtX3VzZXJJbnB1dEh5c3RlcmVzaXMoW3RoaXNdKEh5c3RlcmVzaXNTdGF0ZSBzdGF0 ZSkgeyBzZXRBY3Rpdml0eUZsYWcoUGFnZUFjdGl2aXR5U3RhdGU6OlVzZXJJbnB1dEFjdGl2aXR5 LCBzdGF0ZSA9PSBIeXN0ZXJlc2lzU3RhdGU6OlN0YXJ0ZWQpOyB9KQogICAgICwgbV9tZWRpYUFj dGl2aXR5SHlzdGVyZXNpcyhbdGhpc10oSHlzdGVyZXNpc1N0YXRlIHN0YXRlKSB7IHNldEFjdGl2 aXR5RmxhZyhQYWdlQWN0aXZpdHlTdGF0ZTo6TWVkaWFBY3Rpdml0eSwgc3RhdGUgPT0gSHlzdGVy ZXNpc1N0YXRlOjpTdGFydGVkKTsgfSkKICAgICAsIG1fcGFnZUxvYWRBY3Rpdml0eUh5c3RlcmVz aXMoW3RoaXNdKEh5c3RlcmVzaXNTdGF0ZSBzdGF0ZSkgeyBzZXRBY3Rpdml0eUZsYWcoUGFnZUFj dGl2aXR5U3RhdGU6OlBhZ2VMb2FkQWN0aXZpdHksIHN0YXRlID09IEh5c3RlcmVzaXNTdGF0ZTo6 U3RhcnRlZCk7IH0sIFBhZ2VMb2FkSHlzdGVyZXNpc1NlY29uZHMpCiAgICAgLCBtX21lZGlhQWN0 aXZpdHlDb3VudGVyKFt0aGlzXShSZWZDb3VudGVyRXZlbnQpIHsgbWVkaWFBY3Rpdml0eUNvdW50 ZXJDaGFuZ2VkKCk7IH0pCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VUaHJvdHRsZXIu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VUaHJvdHRsZXIuaAkocmV2 aXNpb24gMjA3Mzg3KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlVGhyb3R0bGVyLmgJKHdv cmtpbmcgY29weSkKQEAgLTQyLDE1ICs0MiwxNCBAQCB0eXBlZGVmIFBhZ2VBY3Rpdml0eUNvdW50 ZXI6OlRva2VuIFBhZ2VBCiAKIHN0cnVjdCBQYWdlQWN0aXZpdHlTdGF0ZSB7CiAgICAgZW51bSB7 Ci0gICAgICAgIFVzZXJJbnB1dEFjdGl2aXR5ID0gMSA8PCAwLAotICAgICAgICBNZWRpYUFjdGl2 aXR5ID0gMSA8PCAxLAotICAgICAgICBQYWdlTG9hZEFjdGl2aXR5ID0gMSA8PCAyLAorICAgICAg ICBNZWRpYUFjdGl2aXR5ID0gMSA8PCAwLAorICAgICAgICBQYWdlTG9hZEFjdGl2aXR5ID0gMSA8 PCAxLAogICAgIH07CiAKICAgICB0eXBlZGVmIHVuc2lnbmVkIEZsYWdzOwogCiAgICAgc3RhdGlj IGNvbnN0IEZsYWdzIE5vRmxhZ3MgPSAwOwotICAgIHN0YXRpYyBjb25zdCBGbGFncyBBbGxGbGFn cyA9IFVzZXJJbnB1dEFjdGl2aXR5IHwgTWVkaWFBY3Rpdml0eSB8IFBhZ2VMb2FkQWN0aXZpdHk7 CisgICAgc3RhdGljIGNvbnN0IEZsYWdzIEFsbEZsYWdzID0gTWVkaWFBY3Rpdml0eSB8IFBhZ2VM b2FkQWN0aXZpdHk7CiB9OwogCiBjbGFzcyBQYWdlVGhyb3R0bGVyIHsKQEAgLTU4LDcgKzU3LDYg QEAgY2xhc3MgUGFnZVRocm90dGxlciB7CiBwdWJsaWM6CiAgICAgUGFnZVRocm90dGxlcihQYWdl Jik7CiAKLSAgICB2b2lkIGRpZFJlY2VpdmVVc2VySW5wdXQoKSB7IG1fdXNlcklucHV0SHlzdGVy ZXNpcy5pbXB1bHNlKCk7IH0KICAgICBQYWdlQWN0aXZpdHlTdGF0ZTo6RmxhZ3MgYWN0aXZpdHlT dGF0ZSgpIHsgcmV0dXJuIG1fYWN0aXZpdHlTdGF0ZTsgfQogICAgIHZvaWQgcGx1Z2luRGlkRXZh bHVhdGVXaGlsZUF1ZGlvSXNQbGF5aW5nKCkgeyBtX21lZGlhQWN0aXZpdHlIeXN0ZXJlc2lzLmlt cHVsc2UoKTsgfQogICAgIFBhZ2VBY3Rpdml0eUFzc2VydGlvblRva2VuIG1lZGlhQWN0aXZpdHlU b2tlbigpOwpAQCAtNzEsNyArNjksNiBAQCBwcml2YXRlOgogCiAgICAgUGFnZSYgbV9wYWdlOwog ICAgIFBhZ2VBY3Rpdml0eVN0YXRlOjpGbGFncyBtX2FjdGl2aXR5U3RhdGUgeyBQYWdlQWN0aXZp dHlTdGF0ZTo6Tm9GbGFncyB9OwotICAgIEh5c3RlcmVzaXNBY3Rpdml0eSBtX3VzZXJJbnB1dEh5 c3RlcmVzaXM7CiAgICAgSHlzdGVyZXNpc0FjdGl2aXR5IG1fbWVkaWFBY3Rpdml0eUh5c3RlcmVz aXM7CiAgICAgSHlzdGVyZXNpc0FjdGl2aXR5IG1fcGFnZUxvYWRBY3Rpdml0eUh5c3RlcmVzaXM7 CiAgICAgUGFnZUFjdGl2aXR5Q291bnRlciBtX21lZGlhQWN0aXZpdHlDb3VudGVyOwpJbmRleDog U291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwkocmV2aXNpb24gMjA3Njk1KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCSh3 b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTYtMTAtMjEgIEdhdmluIEJhcnJhY2xv dWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgorCisgICAgICAgIFdlYlBhZ2Ugc2hvdWxkIHRh a2UgVXNlckFjdGl2aXR5IGRpcmVjdGx5IGZvciB1c2VyIGlucHV0CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjM4MTMKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHdlIHJlY2VpdmUgbW91c2Uva2V5 Ym9hcmQgZXZlbnRzIGluIGEgcGFnZSwgd2Ugd2FudCB0byBwcmV2ZW50IEFwcE5hcC4gV2UgY3Vy cmVudGx5IGRvIHNvCisgICAgICAgIHZpYSB0aGUgUGFnZVRocm90dGxlci4gVGhpcyBwYXRjaCBp cyB0byBqdXN0IG1ha2UgdGhlIFdlYlBhZ2UgZHJpdmUgdGhlIFVzZXJBY3Rpdml0eSBkaXJlY3Rs eS4KKworICAgICAgICBUd28gcmVhc29ucyB0byBkbyBzbzogKDEpIHRvIGNsZWFudXAgJiBzaW1w bGlmeSBmb3IgZnVydGhlciByZWZhY3RvcmluZy4gKDIpIFRoZSBjdXJyZW50IGNvZGUKKyAgICAg ICAgaXNuJ3QgcmVhbGx5IGFjaGlldmluZyB0aGUgZGVzaXJlZCBlZmZlY3QuIFRoZSBwYWdlIHNl dHRpbmcgdGhlIGZsYWcgaW4gdGhlIHRocm90dGxlciB0byBnZXQKKyAgICAgICAgdGhlIGFjdGl2 aXR5IHRvIGJlIHNldCBpcyBub3cgYSBsZXNzIGVmZmVjdGl2ZSB3YXkgb2YgYWNoaWV2aW5nIHRo aXMgZ29hbCwgc2luY2UgdGhlCisgICAgICAgIFBhZ2VBY3Rpdml0eVN0YXRlIGJvdW5jZXMgYmFj ayBhY3Jvc3MgdG8gdGhlIFVJIHByb2Nlc3MgJiB0aGVuIG1lc3NhZ2VzIGJhY2sgdG8gdGhlIFdl YkNvbnRlbnQKKyAgICAgICAgcHJvY2VzcyB0byB0YWtlIHRoZSBVc2VyQWN0aXZpdHkuIFRoZXNl IGV4dHJhIGhvcHMgZGVmZWF0IHRoZSBwdXJwb3NlIG9mIG1ha2luZyBzdXJlIHRoZSBib29zdAor ICAgICAgICBmcm9tIHRoZSBpbml0aWFsIG1lc3NhZ2UgaXNuJ3QgbG9zdC4KKworICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6bV91c2Vy QWN0aXZpdHlIeXN0ZXJlc2lzKToKKyAgICAgICAgICAgIC0gbV91c2VyQWN0aXZpdHlIeXN0ZXJl c2lzIHRyaWdnZXJzIHVwZGF0ZVVzZXJBY3Rpdml0eS4KKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZTo6c2V0UGFnZVN1cHByZXNzZWQpOgorICAgICAgICAgICAgLSBzZXRQYWdlU3VwcHJlc3NlZCBz dGFydHMvc3RvcHMgbV91c2VyQWN0aXZpdHlIeXN0ZXJlc2lzLgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlOjp1cGRhdGVVc2VyQWN0aXZpdHkpOgorICAgICAgICAgICAgLSB1cGRhdGUgVXNlckFj dGl2aXR5IGJhc2VkIG9uIHN0YXRlIG9mIG1fdXNlckFjdGl2aXR5SHlzdGVyZXNpcy4KKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZTo6bW91c2VFdmVudCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2U6OndoZWVsRXZlbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjprZXlFdmVudCk6Cisg ICAgICAgICAgICAtIGlucHV0IGV2ZW50cyBpbXB1bHNlIG1fdXNlckFjdGl2aXR5SHlzdGVyZXNp cy4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorCiAyMDE2LTEwLTIx ICBKZXJlbXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQg YmFzaWMgcG9pbnRlciBsb2NrIGJlaGF2aW9yIGZvciBXZWJLaXQgYW5kIFdlYktpdDIuCkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCShyZXZp c2lvbiAyMDc0MjQpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM3Nyw2ICszNzcsNyBAQCBXZWJQYWdlOjpXZWJQYWdl KHVpbnQ2NF90IHBhZ2VJRCwgY29uc3QgCiAgICAgLCBtX3VzZUFzeW5jU2Nyb2xsaW5nKGZhbHNl KQogICAgICwgbV92aWV3U3RhdGUocGFyYW1ldGVycy52aWV3U3RhdGUpCiAgICAgLCBtX3VzZXJB Y3Rpdml0eSgiUHJvY2VzcyBzdXBwcmVzc2lvbiBkaXNhYmxlZCBmb3IgcGFnZS4iKQorICAgICwg bV91c2VyQWN0aXZpdHlIeXN0ZXJlc2lzKFt0aGlzXShIeXN0ZXJlc2lzU3RhdGUpIHsgdXBkYXRl VXNlckFjdGl2aXR5KCk7IH0pCiAgICAgLCBtX3BlbmRpbmdOYXZpZ2F0aW9uSUQoMCkKICNpZiBF TkFCTEUoV0VCR0wpCiAgICAgLCBtX3N5c3RlbVdlYkdMUG9saWN5KFdlYkdMQWxsb3dDcmVhdGlv bikKQEAgLTU4OSw5ICs1OTAsMTcgQEAgdm9pZCBXZWJQYWdlOjpzZXRQYWdlU3VwcHJlc3NlZChi b29sIHBhZwogICAgIC8vIFRoZSBVc2VyQWN0aXZpdHkga2VlcHMgdGhlIHByb2Nlc3NlcyBydW5u YWJsZS4gU28gaWYgdGhlIHBhZ2Ugc2hvdWxkIGJlIHN1cHByZXNzZWQsIHN0b3AgdGhlIGFjdGl2 aXR5LgogICAgIC8vIElmIHRoZSBwYWdlIHNob3VsZCBub3QgYmUgc3VwcmVzc2VkLCBzdGFydCBp dC4KICAgICBpZiAocGFnZVN1cHByZXNzZWQpCi0gICAgICAgIG1fdXNlckFjdGl2aXR5LnN0b3Ao KTsKKyAgICAgICAgbV91c2VyQWN0aXZpdHlIeXN0ZXJlc2lzLnN0b3AoKTsKICAgICBlbHNlCisg ICAgICAgIG1fdXNlckFjdGl2aXR5SHlzdGVyZXNpcy5zdGFydCgpOworfQorCit2b2lkIFdlYlBh Z2U6OnVwZGF0ZVVzZXJBY3Rpdml0eSgpCit7CisgICAgaWYgKG1fdXNlckFjdGl2aXR5SHlzdGVy ZXNpcy5zdGF0ZSgpID09IEh5c3RlcmVzaXNTdGF0ZTo6U3RhcnRlZCkKICAgICAgICAgbV91c2Vy QWN0aXZpdHkuc3RhcnQoKTsKKyAgICBlbHNlCisgICAgICAgIG1fdXNlckFjdGl2aXR5LnN0b3Ao KTsKIH0KIAogV2ViUGFnZTo6fldlYlBhZ2UoKQpAQCAtMjIzNyw3ICsyMjQ2LDcgQEAgdm9pZCBX ZWJQYWdlOjptb3VzZUV2ZW50KGNvbnN0IFdlYk1vdXNlRQogewogICAgIFRlbXBvcmFyeUNoYW5n ZTxib29sPiB1c2VySXNJbnRlcmFjdGluZ0NoYW5nZSB7IG1fdXNlcklzSW50ZXJhY3RpbmcsIHRy dWUgfTsKIAotICAgIG1fcGFnZS0+cGFnZVRocm90dGxlcigpLmRpZFJlY2VpdmVVc2VySW5wdXQo KTsKKyAgICBtX3VzZXJBY3Rpdml0eUh5c3RlcmVzaXMuaW1wdWxzZSgpOwogCiAgICAgYm9vbCBz aG91bGRIYW5kbGVFdmVudCA9IHRydWU7CiAKQEAgLTIyOTIsNyArMjMwMSw3IEBAIHN0YXRpYyBi b29sIGhhbmRsZVdoZWVsRXZlbnQoY29uc3QgV2ViV2gKIAogdm9pZCBXZWJQYWdlOjp3aGVlbEV2 ZW50KGNvbnN0IFdlYldoZWVsRXZlbnQmIHdoZWVsRXZlbnQpCiB7Ci0gICAgbV9wYWdlLT5wYWdl VGhyb3R0bGVyKCkuZGlkUmVjZWl2ZVVzZXJJbnB1dCgpOworICAgIG1fdXNlckFjdGl2aXR5SHlz dGVyZXNpcy5pbXB1bHNlKCk7CiAKICAgICBDdXJyZW50RXZlbnQgY3VycmVudEV2ZW50KHdoZWVs RXZlbnQpOwogCkBAIC0yMzE1LDcgKzIzMjQsNyBAQCB2b2lkIFdlYlBhZ2U6OmtleUV2ZW50KGNv bnN0IFdlYktleWJvYXJkCiB7CiAgICAgVGVtcG9yYXJ5Q2hhbmdlPGJvb2w+IHVzZXJJc0ludGVy YWN0aW5nQ2hhbmdlIHsgbV91c2VySXNJbnRlcmFjdGluZywgdHJ1ZSB9OwogCi0gICAgbV9wYWdl LT5wYWdlVGhyb3R0bGVyKCkuZGlkUmVjZWl2ZVVzZXJJbnB1dCgpOworICAgIG1fdXNlckFjdGl2 aXR5SHlzdGVyZXNpcy5pbXB1bHNlKCk7CiAKICAgICBDdXJyZW50RXZlbnQgY3VycmVudEV2ZW50 KGtleWJvYXJkRXZlbnQpOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmgJKHJldmlzaW9uIDIwNzQyNCkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTk2Niw2ICs5NjYsOCBA QCBwdWJsaWM6CiBwcml2YXRlOgogICAgIFdlYlBhZ2UodWludDY0X3QgcGFnZUlELCBjb25zdCBX ZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJik7CiAKKyAgICB2b2lkIHVwZGF0ZVVzZXJBY3Rpdml0 eSgpOworCiAgICAgLy8gSVBDOjpNZXNzYWdlU2VuZGVyCiAgICAgSVBDOjpDb25uZWN0aW9uKiBt ZXNzYWdlU2VuZGVyQ29ubmVjdGlvbigpIG92ZXJyaWRlOwogICAgIHVpbnQ2NF90IG1lc3NhZ2VT ZW5kZXJEZXN0aW5hdGlvbklEKCkgb3ZlcnJpZGU7CkBAIC0xNDc3LDYgKzE0NzksNyBAQCBwcml2 YXRlOgogICAgIFdlYkNvcmU6OlZpZXdTdGF0ZTo6RmxhZ3MgbV92aWV3U3RhdGU7CiAKICAgICBV c2VyQWN0aXZpdHkgbV91c2VyQWN0aXZpdHk7CisgICAgV2ViQ29yZTo6SHlzdGVyZXNpc0FjdGl2 aXR5IG1fdXNlckFjdGl2aXR5SHlzdGVyZXNpczsKIAogICAgIHVpbnQ2NF90IG1fcGVuZGluZ05h dmlnYXRpb25JRDsKIAo=