163821 2016-10-21 17:12:20 -0700 WebPageProxy should not need PageActivityState 2016-10-21 23:10:17 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough barraclough oldest_to_newest 1243171 0 barraclough 2016-10-21 17:12:20 -0700 The PageActivityState is currently plumbed back from WebCore up to the UI process, to determine whether to enabled process suppression. However the information it contains (whether a page load is ongoing, whether audio is playing) is already available via other means. Remove this use of PageActivityState. 1243178 1 292436 barraclough 2016-10-21 17:18:50 -0700 Created attachment 292436 Fix 1243182 2 292436 ggaren 2016-10-21 17:27:16 -0700 Comment on attachment 292436 Fix r=me It scares me a little how distributed this stuff is throughout the codebase. 1243299 3 barraclough 2016-10-21 23:10:17 -0700 Committed revision 207706. 292436 2016-10-21 17:18:50 -0700 2016-10-21 17:27:16 -0700 Fix 163821.1.patch text/plain 13969 barraclough SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwNzcwMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDE2LTEwLTIxICBHYXZpbiBC YXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJQYWdlUHJv eHkgc2hvdWxkIG5vdCBuZWVkIFBhZ2VBY3Rpdml0eVN0YXRlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjM4MjEKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgUGFnZUFjdGl2aXR5U3RhdGUgaXMgY3Vy cmVudGx5IHBsdW1iZWQgYmFjayBmcm9tIFdlYkNvcmUgdXAgdG8gdGhlIFVJIHByb2Nlc3MsIHRv CisgICAgICAgIGRldGVybWluZSB3aGV0aGVyIHRvIGVuYWJsZWQgcHJvY2VzcyBzdXBwcmVzc2lv bi4gSG93ZXZlciB0aGUgaW5mb3JtYXRpb24gaXQgY29udGFpbnMKKyAgICAgICAgKHdoZXRoZXIg YSBwYWdlIGxvYWQgaXMgb25nb2luZywgd2hldGhlciBhdWRpbyBpcyBwbGF5aW5nKSBpcyBhbHJl YWR5IGF2YWlsYWJsZSB2aWEKKyAgICAgICAgb3RoZXIgbWVhbnMuIFJlbW92ZSB0aGlzIHVzZSBv ZiBQYWdlQWN0aXZpdHlTdGF0ZS4KKworICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjptZWRpYVN0YXRlKToKKyAg ICAgICAgICAgIC0gRml4IGEgYnVnIGluIGhvdyB3ZSBjb21wdXRlIElzUGxheWluZ0F1ZGlvIC0g aWYgdGhlIHZvbHVtZSBvZiB0aGUgTWVkaWFFbGVtZW50IGlzCisgICAgICAgICAgICAgIHNldCB0 byB6ZXJvLCB0aGVuIGF1ZGlvIGlzIG5vdCBwbGF5aW5nICh3ZSB3ZXJlIGFscmVhZHkgY2hlY2tp bmcgbXV0ZWQpLgorICAgICAgICAqIHBhZ2UvQ2hyb21lQ2xpZW50Lmg6CisgICAgICAgICAgICAt IHJlbW92ZWQgc2V0UGFnZUFjdGl2aXR5U3RhdGUKKyAgICAgICAgKiBwYWdlL1BhZ2UuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UGFnZTo6c2V0UGFnZUFjdGl2aXR5U3RhdGUpOiBEZWxldGVkLgor ICAgICAgICAgICAgLSBzZXRQYWdlQWN0aXZpdHlTdGF0ZSAtPiBwYWdlQWN0aXZpdHlTdGF0ZUNo YW5nZWQsIHJlbW92ZSBjYWxsIHRvIENocm9tZUNsaWVudAorICAgICAgICAqIHBhZ2UvUGFnZS5o OgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6cGFnZUFjdGl2aXR5U3RhdGVDaGFuZ2VkKToKKyAg ICAgICAgICAgIC0gc2V0UGFnZUFjdGl2aXR5U3RhdGUgLT4gcGFnZUFjdGl2aXR5U3RhdGVDaGFu Z2VkCisgICAgICAgICogcGFnZS9QYWdlVGhyb3R0bGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlBhZ2VUaHJvdHRsZXI6OnNldEFjdGl2aXR5RmxhZyk6CisgICAgICAgICAgICAtIHNldFBhZ2VB Y3Rpdml0eVN0YXRlIC0+IHBhZ2VBY3Rpdml0eVN0YXRlQ2hhbmdlZAorCiAyMDE2LTEwLTIxICBD b21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmll d2VkLCByb2xsaW5nIG91dCByMjA3NTgyLgpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M TWVkaWFFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxN ZWRpYUVsZW1lbnQuY3BwCShyZXZpc2lvbiAyMDc2OTkpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxNZWRpYUVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02OTkxLDcgKzY5OTEsNyBA QCBNZWRpYVByb2R1Y2VyOjpNZWRpYVN0YXRlRmxhZ3MgSFRNTE1lZGlhCiAgICAgaWYgKCFpc1Bs YXlpbmcoKSkKICAgICAgICAgcmV0dXJuIHN0YXRlOwogCi0gICAgaWYgKGhhc0F1ZGlvICYmICFt dXRlZCgpKQorICAgIGlmIChoYXNBdWRpbyAmJiAhbXV0ZWQoKSAmJiB2b2x1bWUoKSkKICAgICAg ICAgc3RhdGUgfD0gSXNQbGF5aW5nQXVkaW87CiAKICAgICBpZiAoaGFzQWN0aXZlVmlkZW8pCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0Nocm9tZUNsaWVudC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BhZ2UvQ2hyb21lQ2xpZW50LmgJKHJldmlzaW9uIDIwNzY5OSkKKysrIFNv dXJjZS9XZWJDb3JlL3BhZ2UvQ2hyb21lQ2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTQzMiw4 ICs0MzIsNiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGZvY3VzZWRDb250ZW50TWVkaWFF bGVtZW50RGlkQ2hhbmdlKHVpbnQ2NF90KSB7IH0KICNlbmRpZgogCi0gICAgdmlydHVhbCB2b2lk IHNldFBhZ2VBY3Rpdml0eVN0YXRlKFBhZ2VBY3Rpdml0eVN0YXRlOjpGbGFncykgeyB9Ci0KICNp ZiBFTkFCTEUoU1VCVExFX0NSWVBUTykKICAgICB2aXJ0dWFsIGJvb2wgd3JhcENyeXB0b0tleShj b25zdCBWZWN0b3I8dWludDhfdD4mLCBWZWN0b3I8dWludDhfdD4mKSBjb25zdCB7IHJldHVybiBm YWxzZTsgfQogICAgIHZpcnR1YWwgYm9vbCB1bndyYXBDcnlwdG9LZXkoY29uc3QgVmVjdG9yPHVp bnQ4X3Q+JiwgVmVjdG9yPHVpbnQ4X3Q+JikgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGFnZS9QYWdlLmNwcAkocmV2aXNpb24gMjA3Njk5KQorKysgU291cmNlL1dlYkNvcmUvcGFn ZS9QYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ3NCwxMiArMTQ3NCw2IEBAIGJvb2wgUGFn ZTo6aXNWaXNpYmxlQW5kQWN0aXZlKCkgY29uc3QKICAgICByZXR1cm4gKG1fdmlld1N0YXRlICYg Vmlld1N0YXRlOjpJc1Zpc2libGUpICYmIChtX3ZpZXdTdGF0ZSAmIFZpZXdTdGF0ZTo6V2luZG93 SXNBY3RpdmUpOwogfQogCi12b2lkIFBhZ2U6OnNldFBhZ2VBY3Rpdml0eVN0YXRlKFBhZ2VBY3Rp dml0eVN0YXRlOjpGbGFncyBhY3Rpdml0eVN0YXRlKQotewotICAgIGNocm9tZSgpLmNsaWVudCgp LnNldFBhZ2VBY3Rpdml0eVN0YXRlKGFjdGl2aXR5U3RhdGUpOwotICAgIHVwZGF0ZVRpbWVyVGhy b3R0bGluZ1N0YXRlKCk7Ci19Ci0KIHZvaWQgUGFnZTo6c2V0SXNWaXNpYmxlKGJvb2wgaXNWaXNp YmxlKQogewogICAgIGlmIChpc1Zpc2libGUpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1Bh Z2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAkocmV2aXNpb24g MjA3Njk5KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgJKHdvcmtpbmcgY29weSkKQEAg LTMzNiw3ICszMzYsNyBAQCBwdWJsaWM6CiAgICAgLy8gTm90aWZpY2F0aW9ucyB3aGVuIHRoZSBQ YWdlIHN0YXJ0cyBhbmQgc3RvcHMgYmVpbmcgcHJlc2VudGVkIHZpYSBhIG5hdGl2ZSB3aW5kb3cu CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRWaWV3U3RhdGUoVmlld1N0YXRlOjpGbGFncyk7 CiAgICAgYm9vbCBpc1Zpc2libGVBbmRBY3RpdmUoKSBjb25zdDsKLSAgICB2b2lkIHNldFBhZ2VB Y3Rpdml0eVN0YXRlKFBhZ2VBY3Rpdml0eVN0YXRlOjpGbGFncyk7CisgICAgdm9pZCBwYWdlQWN0 aXZpdHlTdGF0ZUNoYW5nZWQoKSB7IHVwZGF0ZVRpbWVyVGhyb3R0bGluZ1N0YXRlKCk7IH0KICAg ICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldElzVmlzaWJsZShib29sKTsKICAgICBXRUJDT1JFX0VY UE9SVCB2b2lkIHNldElzUHJlcmVuZGVyKCk7CiAgICAgYm9vbCBpc1Zpc2libGUoKSBjb25zdCB7 IHJldHVybiBtX3ZpZXdTdGF0ZSAmIFZpZXdTdGF0ZTo6SXNWaXNpYmxlOyB9CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wYWdlL1BhZ2VUaHJvdHRsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BhZ2UvUGFnZVRocm90dGxlci5jcHAJKHJldmlzaW9uIDIwNzY5OSkKKysrIFNvdXJj ZS9XZWJDb3JlL3BhZ2UvUGFnZVRocm90dGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc5LDcg Kzc5LDcgQEAgdm9pZCBQYWdlVGhyb3R0bGVyOjpzZXRBY3Rpdml0eUZsYWcoUGFnZQogICAgICAg ICByZXR1cm47CiAgICAgbV9hY3Rpdml0eVN0YXRlID0gYWN0aXZpdHlTdGF0ZTsKIAotICAgIG1f cGFnZS5zZXRQYWdlQWN0aXZpdHlTdGF0ZShtX2FjdGl2aXR5U3RhdGUpOworICAgIG1fcGFnZS5w YWdlQWN0aXZpdHlTdGF0ZUNoYW5nZWQoKTsKIH0KIAogfQpJbmRleDogU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkocmV2aXNp b24gMjA3Njk5KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNDIgQEAKKzIwMTYtMTAtMjEgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91 Z2hAYXBwbGUuY29tPgorCisgICAgICAgIFdlYlBhZ2VQcm94eSBzaG91bGQgbm90IG5lZWQgUGFn ZUFjdGl2aXR5U3RhdGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE2MzgyMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoZSBQYWdlQWN0aXZpdHlTdGF0ZSBpcyBjdXJyZW50bHkgcGx1bWJlZCBiYWNrIGZy b20gV2ViQ29yZSB1cCB0byB0aGUgVUkgcHJvY2VzcywgdG8KKyAgICAgICAgZGV0ZXJtaW5lIHdo ZXRoZXIgdG8gZW5hYmxlZCBwcm9jZXNzIHN1cHByZXNzaW9uLiBIb3dldmVyIHRoZSBpbmZvcm1h dGlvbiBpdCBjb250YWlucworICAgICAgICAod2hldGhlciBhIHBhZ2UgbG9hZCBpcyBvbmdvaW5n LCB3aGV0aGVyIGF1ZGlvIGlzIHBsYXlpbmcpIGlzIGFscmVhZHkgYXZhaWxhYmxlIHZpYQorICAg ICAgICBvdGhlciBtZWFucy4gUmVtb3ZlIHRoaXMgdXNlIG9mIFBhZ2VBY3Rpdml0eVN0YXRlLgor CisgICAgICAgICogVUlQcm9jZXNzL1BhZ2VMb2FkU3RhdGUuY3BwOgorICAgICAgICAoV2ViS2l0 OjpQYWdlTG9hZFN0YXRlOjpjb21taXRDaGFuZ2VzKToKKyAgICAgICAgICAgIC0gUGFnZUxvYWRT dGF0ZSBub3RpZmllcyBXZWJQYWdlUHJveHkgd2hlbiBsb2FkaW5nIHN0YXRlIGNoYW5nZXMuCisg ICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2VQcm94eTo6dXBkYXRlVGhyb3R0bGVTdGF0ZSk6CisgICAgICAgICAgICAtIE5vdyByZWxp ZXMgb24gaW5mbyBmcm9tIFBhZ2VMb2FkU3RhdGUsIHNldE11dGVkLCBpc1BsYXlpbmdNZWRpYURp ZENoYW5nZS4KKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzZXRNdXRlZCk6CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6aXNQbGF5aW5nTWVkaWFEaWRDaGFuZ2UpOgorICAg ICAgICAgICAgLSBJZiBhdWRpbyBwbGF5YmFjayBzdGF0ZSBjaGFuZ2VzIHdlIG1heSBuZWVkIHRv IHVwZGF0ZSB0aGUgdGhyb3R0bGUgc3RhdGUuCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94 eTo6c2V0UGFnZUFjdGl2aXR5U3RhdGUpOiBEZWxldGVkLgorICAgICAgICAgICAgLSByZW1vdmVk IFBhZ2VBY3Rpdml0eVN0YXRlIGZyb20gV0syLgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdl UHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojppc0xvYWRpbmdDaGFuZ2Vk KToKKyAgICAgICAgICAgIC0gUGFnZUxvYWRTdGF0ZSBub3RpZmllcyBXZWJQYWdlUHJveHkgd2hl biBsb2FkaW5nIHN0YXRlIGNoYW5nZXMuCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5tZXNzYWdlcy5pbjoKKyAgICAgICAgICAgIC0gcmVtb3ZlZCBQYWdlQWN0aXZpdHlTdGF0ZSBm cm9tIFdLMi4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNs aWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNocm9tZUNsaWVudDo6c2V0UGFnZUFjdGl2 aXR5U3RhdGUpOiBEZWxldGVkLgorICAgICAgICAgICAgLSByZW1vdmVkIFBhZ2VBY3Rpdml0eVN0 YXRlIGZyb20gV0syLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hy b21lQ2xpZW50Lmg6CisgICAgICAgICAgICAtIHJlbW92ZWQgUGFnZUFjdGl2aXR5U3RhdGUgZnJv bSBXSzIuCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlOjpzZXRQYWdlQWN0aXZpdHlTdGF0ZSk6IERlbGV0ZWQuCisgICAg ICAgICAgICAtIHJlbW92ZWQgUGFnZUFjdGl2aXR5U3RhdGUgZnJvbSBXSzIuCisgICAgICAgICog V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKyAgICAgICAgICAgIC0gcmVtb3ZlZCBQYWdl QWN0aXZpdHlTdGF0ZSBmcm9tIFdLMi4KKwogMjAxNi0xMC0yMSAgR2F2aW4gQmFycmFjbG91Z2gg IDxiYXJyYWNsb3VnaEBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViUGFnZSBzaG91bGQgdGFrZSBV c2VyQWN0aXZpdHkgZGlyZWN0bHkgZm9yIHVzZXIgaW5wdXQKSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9QYWdlTG9hZFN0YXRlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvUGFnZUxvYWRTdGF0ZS5jcHAJKHJldmlzaW9uIDIwNzY5OSkKKysrIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlTG9hZFN0YXRlLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTI0LDYgKzEyNCw4IEBAIHZvaWQgUGFnZUxvYWRTdGF0ZTo6Y29tbWl0Q2hhbmdlcygpCiAKICAg ICBtX2NvbW1pdHRlZFN0YXRlID0gbV91bmNvbW1pdHRlZFN0YXRlOwogCisgICAgbV93ZWJQYWdl UHJveHkuaXNMb2FkaW5nQ2hhbmdlZCgpOworCiAgICAgLy8gVGhlICJkaWQiIG9yZGVyaW5nIGlz IHRoZSByZXZlcnNlIG9mIHRoZSAid2lsbCIuIFRoaXMgaXMgYSByZXF1aXJlbWVudCBvZiBDb2Nv YSBLZXktVmFsdWUgT2JzZXJ2aW5nLgogICAgIGlmIChjZXJ0aWZpY2F0ZUluZm9DaGFuZ2VkKQog ICAgICAgICBjYWxsT2JzZXJ2ZXJDYWxsYmFjaygmT2JzZXJ2ZXI6OmRpZENoYW5nZUNlcnRpZmlj YXRlSW5mbyk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cAkocmV2aXNpb24gMjA3Njk5KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE1NzEsMTIgKzE1NzEsNiBAQCB2b2lkIFdlYlBh Z2VQcm94eTo6ZGlzcGF0Y2hWaWV3U3RhdGVDaGFuCiAgICAgbV92aWV3V2FzRXZlckluV2luZG93 IHw9IGlzTm93SW5XaW5kb3c7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpzZXRQYWdlQWN0aXZp dHlTdGF0ZShXZWJDb3JlOjpQYWdlQWN0aXZpdHlTdGF0ZTo6RmxhZ3MgYWN0aXZpdHlTdGF0ZSkK LXsKLSAgICBtX2FjdGl2aXR5U3RhdGUgPSBhY3Rpdml0eVN0YXRlOwotICAgIHVwZGF0ZVRocm90 dGxlU3RhdGUoKTsKLX0KLQogYm9vbCBXZWJQYWdlUHJveHk6OmlzQWx3YXlzT25Mb2dnaW5nQWxs b3dlZCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIHNlc3Npb25JRCgpLmlzQWx3YXlzT25Mb2dnaW5n QWxsb3dlZCgpOwpAQCAtMTU5Myw3ICsxNTg3LDkgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnVwZGF0 ZVRocm90dGxlU3RhdGUoKQogICAgICAgICBtX3ByZXZlbnRQcm9jZXNzU3VwcHJlc3Npb25Db3Vu dCA9IG51bGxwdHI7CiAKICAgICAvLyBXZSBzaG91bGQgc3VwcHJlc3MgaWYgdGhlIHBhZ2UgaXMg bm90IGFjdGl2ZSwgaXMgdmlzdWFsbHkgaWRsZSwgYW5kIHN1cHJlc3Npb24gaXMgZW5hYmxlZC4K LSAgICBib29sIHBhZ2VTaG91bGRCZVN1cHByZXNzZWQgPSAhbV9hY3Rpdml0eVN0YXRlICYmIHBy b2Nlc3NTdXBwcmVzc2lvbkVuYWJsZWQgJiYgKG1fdmlld1N0YXRlICYgVmlld1N0YXRlOjpJc1Zp c3VhbGx5SWRsZSk7CisgICAgYm9vbCBpc0xvYWRpbmcgPSBtX3BhZ2VMb2FkU3RhdGUuaXNMb2Fk aW5nKCk7CisgICAgYm9vbCBpc1BsYXlpbmdBdWRpbyA9IG1fbWVkaWFTdGF0ZSAmIE1lZGlhUHJv ZHVjZXI6OklzUGxheWluZ0F1ZGlvICYmICFtX211dGVkOworICAgIGJvb2wgcGFnZVNob3VsZEJl U3VwcHJlc3NlZCA9ICFpc0xvYWRpbmcgJiYgIWlzUGxheWluZ0F1ZGlvICYmIHByb2Nlc3NTdXBw cmVzc2lvbkVuYWJsZWQgJiYgKG1fdmlld1N0YXRlICYgVmlld1N0YXRlOjpJc1Zpc3VhbGx5SWRs ZSk7CiAgICAgaWYgKG1fcGFnZVN1cHByZXNzZWQgIT0gcGFnZVNob3VsZEJlU3VwcHJlc3NlZCkg ewogICAgICAgICBtX3BhZ2VTdXBwcmVzc2VkID0gcGFnZVNob3VsZEJlU3VwcHJlc3NlZDsKICAg ICAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRQYWdlU3VwcHJlc3Nl ZChtX3BhZ2VTdXBwcmVzc2VkKSwgbV9wYWdlSUQpOwpAQCAtNDE2Nyw2ICs0MTYzLDggQEAgdm9p ZCBXZWJQYWdlUHJveHk6OnNldE11dGVkKGJvb2wgbXV0ZWQpCiAgICAgICAgIHJldHVybjsKIAog ICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0TXV0ZWQobXV0ZWQpLCBt X3BhZ2VJRCk7CisKKyAgICB1cGRhdGVUaHJvdHRsZVN0YXRlKCk7CiB9CiAKICNpZiBFTkFCTEUo TUVESUFfU0VTU0lPTikKQEAgLTYzNTMsNiArNjM1MSw4IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpp c1BsYXlpbmdNZWRpYURpZENoYW4KICAgICBNZWRpYVByb2R1Y2VyOjpNZWRpYVN0YXRlRmxhZ3Mg b2xkU3RhdGUgPSBtX21lZGlhU3RhdGU7CiAgICAgbV9tZWRpYVN0YXRlID0gc3RhdGU7CiAKKyAg ICB1cGRhdGVUaHJvdHRsZVN0YXRlKCk7CisKICAgICBwbGF5aW5nTWVkaWFNYXNrIHw9IE1lZGlh UHJvZHVjZXI6Okhhc0FjdGl2ZU1lZGlhQ2FwdHVyZURldmljZTsKICAgICBpZiAoKG9sZFN0YXRl ICYgcGxheWluZ01lZGlhTWFzaykgIT0gKG1fbWVkaWFTdGF0ZSAmIHBsYXlpbmdNZWRpYU1hc2sp KQogICAgICAgICBtX3VpQ2xpZW50LT5pc1BsYXlpbmdBdWRpb0RpZENoYW5nZSgqdGhpcyk7Cklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCShyZXZpc2lvbiAyMDc2 OTkpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdvcmtpbmcg Y29weSkKQEAgLTExMzgsNiArMTEzOCw4IEBAIHB1YmxpYzoKICAgICAgICAgCiAgICAgV2Vha1B0 cjxXZWJQYWdlUHJveHk+IGNyZWF0ZVdlYWtQdHIoKSBjb25zdCB7IHJldHVybiBtX3dlYWtQdHJG YWN0b3J5LmNyZWF0ZVdlYWtQdHIoKTsgfQogCisgICAgdm9pZCBpc0xvYWRpbmdDaGFuZ2VkKCkg eyB1cGRhdGVUaHJvdHRsZVN0YXRlKCk7IH0KKwogcHJpdmF0ZToKICAgICBXZWJQYWdlUHJveHko UGFnZUNsaWVudCYsIFdlYlByb2Nlc3NQcm94eSYsIHVpbnQ2NF90IHBhZ2VJRCwgUmVmPEFQSTo6 UGFnZUNvbmZpZ3VyYXRpb24+JiYpOwogICAgIHZvaWQgcGxhdGZvcm1Jbml0aWFsaXplKCk7CkBA IC0xNTMwLDcgKzE1MzIsNiBAQCBwcml2YXRlOgogICAgIHZvaWQgZGlzcGF0Y2hWaWV3U3RhdGVD aGFuZ2UoKTsKICAgICB2b2lkIHZpZXdEaWRMZWF2ZVdpbmRvdygpOwogICAgIHZvaWQgdmlld0Rp ZEVudGVyV2luZG93KCk7Ci0gICAgdm9pZCBzZXRQYWdlQWN0aXZpdHlTdGF0ZShXZWJDb3JlOjpQ YWdlQWN0aXZpdHlTdGF0ZTo6RmxhZ3MpOwogCiAjaWYgUExBVEZPUk0oTUFDKQogICAgIHZvaWQg ZGlkUGVyZm9ybUltbWVkaWF0ZUFjdGlvbkhpdFRlc3QoY29uc3QgV2ViSGl0VGVzdFJlc3VsdERh dGEmLCBib29sIGNvbnRlbnRQcmV2ZW50c0RlZmF1bHQsIGNvbnN0IFVzZXJEYXRhJik7CkBAIC0x NzI0LDcgKzE3MjUsNiBAQCBwcml2YXRlOgogICAgIFdlYkNvcmU6OlBvbGljeUFjdGlvbiBtX3N5 bmNOYXZpZ2F0aW9uQWN0aW9uUG9saWN5QWN0aW9uOwogICAgIERvd25sb2FkSUQgbV9zeW5jTmF2 aWdhdGlvbkFjdGlvblBvbGljeURvd25sb2FkSUQ7CiAgICAgYm9vbCBtX3Nob3VsZFN1cHByZXNz QXBwTGlua3NJbk5leHROYXZpZ2F0aW9uUG9saWN5RGVjaXNpb24geyBmYWxzZSB9OwotICAgIFdl YkNvcmU6OlBhZ2VBY3Rpdml0eVN0YXRlOjpGbGFncyBtX2FjdGl2aXR5U3RhdGUgeyBXZWJDb3Jl OjpQYWdlQWN0aXZpdHlTdGF0ZTo6Tm9GbGFncyB9OwogICAgIGJvb2wgbV9wYWdlU3VwcHJlc3Nl ZCB7IGZhbHNlIH07CiAKICAgICBEZXF1ZTxOYXRpdmVXZWJLZXlib2FyZEV2ZW50PiBtX2tleUV2 ZW50UXVldWU7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1l c3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkubWVzc2FnZXMuaW4JKHJldmlzaW9uIDIwNzY5OSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTQwOCw3 ICs0MDgsNiBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlUHJveHkgewogI2VuZGlmCiAKICAgICBEaWRV cGRhdGVWaWV3U3RhdGUoKQotICAgIFNldFBhZ2VBY3Rpdml0eVN0YXRlKGludDMyX3QgcGFnZUFj dGl2aXR5U3RhdGUpCiAKICAgICBEaWRTYXZlVG9QYWdlQ2FjaGUoKQogCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJD aHJvbWVDbGllbnQuY3BwCShyZXZpc2lvbiAyMDc2OTkpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTEwNjgsMTEgKzEwNjgsNiBAQCB2b2lkIFdlYkNocm9tZUNsaWVudDo6Zm9jdXNlZENvbnRl bnRNZWRpCiB9CiAjZW5kaWYKIAotdm9pZCBXZWJDaHJvbWVDbGllbnQ6OnNldFBhZ2VBY3Rpdml0 eVN0YXRlKFBhZ2VBY3Rpdml0eVN0YXRlOjpGbGFncyBhY3Rpdml0eVN0YXRlKQotewotICAgIG1f cGFnZS0+c2V0UGFnZUFjdGl2aXR5U3RhdGUoYWN0aXZpdHlTdGF0ZSk7Ci19Ci0KICNpZiBFTkFC TEUoU1VCVExFX0NSWVBUTykKIGJvb2wgV2ViQ2hyb21lQ2xpZW50Ojp3cmFwQ3J5cHRvS2V5KGNv bnN0IFZlY3Rvcjx1aW50OF90PiYga2V5LCBWZWN0b3I8dWludDhfdD4mIHdyYXBwZWRLZXkpIGNv bnN0CiB7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dl YkNocm9tZUNsaWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmgJKHJldmlzaW9uIDIwNzY5OSkKKysrIFNv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmgJ KHdvcmtpbmcgY29weSkKQEAgLTI5OSw3ICsyOTksNiBAQCBwcml2YXRlOgogICAgIGJvb2wgc2hv dWxkVXNlVGlsZWRCYWNraW5nRm9yRnJhbWVWaWV3KGNvbnN0IFdlYkNvcmU6OkZyYW1lVmlldyop IGNvbnN0IG92ZXJyaWRlOwogCiAgICAgdm9pZCBpc1BsYXlpbmdNZWRpYURpZENoYW5nZShXZWJD b3JlOjpNZWRpYVByb2R1Y2VyOjpNZWRpYVN0YXRlRmxhZ3MsIHVpbnQ2NF90KSBvdmVycmlkZTsK LSAgICB2b2lkIHNldFBhZ2VBY3Rpdml0eVN0YXRlKFdlYkNvcmU6OlBhZ2VBY3Rpdml0eVN0YXRl OjpGbGFncykgb3ZlcnJpZGU7CiAKICNpZiBFTkFCTEUoTUVESUFfU0VTU0lPTikKICAgICB2b2lk IGhhc01lZGlhU2Vzc2lvbldpdGhBY3RpdmVNZWRpYUVsZW1lbnRzRGlkQ2hhbmdlKGJvb2wpIG92 ZXJyaWRlOwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcAkocmV2aXNpb24gMjA3Njk5KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01ODEsMTEgKzU4MSw2IEBAIHZv aWQgV2ViUGFnZTo6cmVpbml0aWFsaXplV2ViUGFnZShjb25zdCAKICAgICAgICAgc2V0TGF5ZXJI b3N0aW5nTW9kZShwYXJhbWV0ZXJzLmxheWVySG9zdGluZ01vZGUpOwogfQogCi12b2lkIFdlYlBh Z2U6OnNldFBhZ2VBY3Rpdml0eVN0YXRlKFBhZ2VBY3Rpdml0eVN0YXRlOjpGbGFncyBhY3Rpdml0 eVN0YXRlKQotewotICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6U2V0UGFnZUFjdGl2 aXR5U3RhdGUoYWN0aXZpdHlTdGF0ZSkpOwotfQotCiB2b2lkIFdlYlBhZ2U6OnNldFBhZ2VTdXBw cmVzc2VkKGJvb2wgcGFnZVN1cHByZXNzZWQpCiB7CiAgICAgLy8gVGhlIFVzZXJBY3Rpdml0eSBr ZWVwcyB0aGUgcHJvY2Vzc2VzIHJ1bm5hYmxlLiBTbyBpZiB0aGUgcGFnZSBzaG91bGQgYmUgc3Vw cHJlc3NlZCwgc3RvcCB0aGUgYWN0aXZpdHkuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJKHJldmlzaW9uIDIwNzY5OSkKKysrIFNvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTkyNCw3 ICs5MjQsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRNYWluRnJhbWVQcm9ncmVzc0NvbXBsZXRl ZChib29sIGNvbXBsZXRlZCkgeyBtX21haW5GcmFtZVByb2dyZXNzQ29tcGxldGVkID0gY29tcGxl dGVkOyB9CiAgICAgYm9vbCBzaG91bGREaXNwYXRjaEZha2VNb3VzZU1vdmVFdmVudHMoKSBjb25z dCB7IHJldHVybiBtX3Nob3VsZERpc3BhdGNoRmFrZU1vdXNlTW92ZUV2ZW50czsgfQogCi0gICAg dm9pZCBzZXRQYWdlQWN0aXZpdHlTdGF0ZShXZWJDb3JlOjpQYWdlQWN0aXZpdHlTdGF0ZTo6Rmxh Z3MpOwogICAgIHZvaWQgc2V0UGFnZVN1cHByZXNzZWQoYm9vbCk7CiAKICAgICB2b2lkIHBvc3RN ZXNzYWdlKGNvbnN0IFN0cmluZyYgbWVzc2FnZU5hbWUsIEFQSTo6T2JqZWN0KiBtZXNzYWdlQm9k eSk7Cg==