163556 2016-10-17 11:34:39 -0700 UIProcess should determine throttle state for WebContent process 2016-10-17 13:21:23 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough barraclough oldest_to_newest 1241061 0 barraclough 2016-10-17 11:34:39 -0700 This is a step towards merging page/process throttling code for mac & iOS. Previously WebPage determined whether to start a UserActivity based on page activity, visibility and the preference to disable. Now WebPage passes the activity state across to WebPageProxy, which makes the decision & explicitly instructs WebPage to start/stop the UserActivity. 1241079 1 291851 barraclough 2016-10-17 11:56:06 -0700 Created attachment 291851 Fix 1241119 2 barraclough 2016-10-17 13:21:23 -0700 Committed revision 207424. 291851 2016-10-17 11:56:06 -0700 2016-10-17 13:17:42 -0700 Fix 163556.1.patch text/plain 14072 barraclough SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwNzQxOCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDU5IEBACisyMDE2LTEwLTE3ICBHYXZpbiBC YXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBVSVByb2Nlc3Mg c2hvdWxkIGRldGVybWluZSB0aHJvdHRsZSBzdGF0ZSBmb3IgV2ViQ29udGVudCBwcm9jZXNzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjM1NTYKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGEg c3RlcCB0b3dhcmRzIG1lcmdpbmcgcGFnZS9wcm9jZXNzIHRocm90dGxpbmcgY29kZSBmb3IgbWFj ICYgaU9TLgorCisgICAgICAgIFByZXZpb3VzbHkgV2ViUGFnZSBkZXRlcm1pbmVkIHdoZXRoZXIg dG8gc3RhcnQgYSBVc2VyQWN0aXZpdHkgYmFzZWQgb24gcGFnZSBhY3Rpdml0eSwKKyAgICAgICAg dmlzaWJpbGl0eSBhbmQgdGhlIHByZWZlcmVuY2UgdG8gZGlzYWJsZS4gTm93IFdlYlBhZ2UgcGFz c2VzIHRoZSBhY3Rpdml0eSBzdGF0ZSBhY3Jvc3MKKyAgICAgICAgdG8gV2ViUGFnZVByb3h5LCB3 aGljaCBtYWtlcyB0aGUgZGVjaXNpb24gJiBleHBsaWNpdGx5IGluc3RydWN0cyBXZWJQYWdlIHRv IHN0YXJ0L3N0b3AKKyAgICAgICAgdGhlIFVzZXJBY3Rpdml0eS4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6Oldl YlBhZ2VQcm94eSk6CisgICAgICAgICAgICAtIHVwZGF0ZUFjdGl2aXR5VG9rZW4gKyB1cGRhdGVQ cm9jY2Vzc1N1cHByZXNzaW9uU3RhdGUgLT4gdXBkYXRlVGhyb3R0bGVTdGF0ZQorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlUHJveHk6OnJlYXR0YWNoVG9XZWJQcm9jZXNzKToKKyAgICAgICAgICAg IC0gdXBkYXRlQWN0aXZpdHlUb2tlbiAtPiB1cGRhdGVUaHJvdHRsZVN0YXRlCisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlzcGF0Y2hWaWV3U3RhdGVDaGFuZ2UpOgorICAgICAgICAg ICAgLSB1cGRhdGVBY3Rpdml0eVRva2VuIC0+IHVwZGF0ZVRocm90dGxlU3RhdGUKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5OjpzZXRQYWdlQWN0aXZpdHlTdGF0ZSk6CisgICAgICAgICAg ICAtIFJlY29yZCBhY3Rpdml0eSBzdGF0ZSBwYXNzZWQgZnJvbSBXZWJQYWdlLCBhbmQgdXBkYXRl LgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnByZWZlcmVuY2VzRGlkQ2hhbmdlKToK KyAgICAgICAgICAgIC0gdXBkYXRlUHJvY2Nlc3NTdXBwcmVzc2lvblN0YXRlIC0+IHVwZGF0ZVRo cm90dGxlU3RhdGUKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp1cGRhdGVBY3Rpdml0 eVRva2VuKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp1cGRhdGVQ cm9jY2Vzc1N1cHByZXNzaW9uU3RhdGUpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OnVwZGF0ZVRocm90dGxlU3RhdGUpOgorICAgICAgICAgICAgLSBNZXJnZWQgZXhp c3RpbmcgdXBkYXRlQWN0aXZpdHlUb2tlbi91cGRhdGVQcm9jY2Vzc1N1cHByZXNzaW9uU3RhdGUg dG8gdW5pZmllZCB1cGRhdGVUaHJvdHRsZVN0YXRlLgorICAgICAgICAgICAgLSBDb21wdXRlIHdo ZXRoZXIgcGFnZSBzaG91bGQgYmUgc3VwcHJlc3NlZCwgYW5kIHNlbmQgU2V0UGFnZVN1cHByZXNz ZWQgbWVzc2FnZSBhY2NvcmRpbmdseS4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5 Lmg6CisgICAgICAgICAgICAtIE1lcmdlZCBleGlzdGluZyB1cGRhdGVBY3Rpdml0eVRva2VuL3Vw ZGF0ZVByb2NjZXNzU3VwcHJlc3Npb25TdGF0ZSB0byB1bmlmaWVkIHVwZGF0ZVRocm90dGxlU3Rh dGUuCisgICAgICAgICAgICAtIEFkZGVkIHNldFBhZ2VBY3Rpdml0eVN0YXRlL21fYWN0aXZpdHlT dGF0ZSB0byByZXBvcnQvcmVjb3JkIHBhZ2UgYWN0aXZpdHkuCisgICAgICAgICAgICAtIEFkZGVk IG1fcGFnZVN1cHByZXNzZWQgdG8gcHJldmVudCByZWR1bmRhbnQgbWVzc2FnZSBzZW5kcy4KKyAg ICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluOgorICAgICAgICAgICAg LSBFeHBvc2UgU2V0UGFnZUFjdGl2aXR5U3RhdGUgbWVzc2FnZSAoY2FsbGVkIGJ5IFdlYlBhZ2Up LgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZTo6V2ViUGFnZSk6CisgICAgICAgICAgICAtIHJlbW92ZWQgbV9wcm9jZXNz U3VwcHJlc3Npb25FbmFibGVkCisgICAgICAgICAgICAtIHVwZGF0ZVVzZXJBY3Rpdml0eSAtPiBz ZXRQYWdlU3VwcHJlc3NlZCAtIGV4cGxpY2l0bHkgc2V0IHRoZSBwYWdlIHRvIG5vdCBiZSBzdXBw cmVzc2VkLCB1bnRpbCBXZWJQYWdlUHJveHkgdGVsbHMgdXMgdG8gZG8gc28uCisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2U6OnNldFBhZ2VBY3Rpdml0eVN0YXRlKToKKyAgICAgICAgICAgIC0gcG9z dCBhY3Rpdml0eSBzdGF0ZSBvbiB0byBXZWJQYWdlUHJveHkuCisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2U6OnNldFBhZ2VTdXBwcmVzc2VkKToKKyAgICAgICAgICAgIC0gU3RhcnQvc3RvcCBVU2Vy QWN0aXZpdHkgYWNjb3JkaW5nbHkuCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNldFZpZXdT dGF0ZSk6CisgICAgICAgICAgICAtIE5vIGxvbmdlciBuZWVkIHRvIG1vbml0b3IgVmlld1N0YXRl IGNoYW5nZXMgb24gdGhlIFdlYlByb2Nlc3Mgc2lkZS4KKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZTo6dXBkYXRlUHJlZmVyZW5jZXMpOgorICAgICAgICAgICAgLSBObyBsb25nZXIgbmVlZCB0byBt b25pdG9yIHByZWZlcmVuY2UgY2hhbmdlcyBvbiB0aGUgV2ViUHJvY2VzcyBzaWRlLgorICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlOjp1cGRhdGVVc2VyQWN0aXZpdHkpOiBEZWxldGVkLgorICAgICAg ICAgICAgLSBPbmx5IHVwZGF0ZWQgb24gcmVjaWVwdCBvZiBzZXRQYWdlU3VwcHJlc3NlZCBtZXNz YWdlLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6CisgICAgICAgICAg ICAtIFJlbW92ZWQgbV9hY3Rpdml0eVN0YXRlLCBtX3Byb2Nlc3NTdXBwcmVzc2lvbkVuYWJsZWQs IHVwZGF0ZVVzZXJBY3Rpdml0eS4KKyAgICAgICAgICAgIC0gQWRkZWQgc2V0UGFnZVN1cHByZXNz ZWQgbWVzc2FnZS4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdl cy5pbjoKKyAgICAgICAgICAgIC0gQWRkZWQgU2V0UGFnZVN1cHByZXNzZWQgbWVzc2FnZS4KKwog MjAxNi0xMC0xNyAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGlnYWxpYS5jb20+CiAK ICAgICAgICAgUkVHUkVTU0lPTihyMjA2MTg5KTogbG9ncyBlcnJvciBzdGF0ZW1lbnRzIHdoZW4g QVBJOjpVUkxSZXF1ZXN0IGlzIGNhbmNlbGVkCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcAkocmV2aXNpb24gMjA3Mzg3KQorKysgU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ1Nyw4ICs0NTcs NyBAQCBXZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94eShQYWdlQ2xpZW50JiBwCiAgICAgbV93ZWJQ cm9jZXNzTGlmZXRpbWVUcmFja2VyLmFkZE9ic2VydmVyKG1fd2Vic2l0ZURhdGFTdG9yZSk7CiAK ICAgICB1cGRhdGVWaWV3U3RhdGUoKTsKLSAgICB1cGRhdGVBY3Rpdml0eVRva2VuKCk7Ci0gICAg dXBkYXRlUHJvY2Nlc3NTdXBwcmVzc2lvblN0YXRlKCk7CisgICAgdXBkYXRlVGhyb3R0bGVTdGF0 ZSgpOwogICAgIHVwZGF0ZUhpZGRlblBhZ2VUaHJvdHRsaW5nQXV0b0luY3JlYXNlcygpOwogICAg IAogI2lmIEhBVkUoT1VUX09GX1BST0NFU1NfTEFZRVJfSE9TVElORykKQEAgLTcxNSw3ICs3MTQs NyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cmVhdHRhY2hUb1dlYlByb2Nlc3MoCiAgICAgbV9wcm9j ZXNzLT5hZGRNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJl Y2VpdmVyTmFtZSgpLCBtX3BhZ2VJRCwgKnRoaXMpOwogCiAgICAgdXBkYXRlVmlld1N0YXRlKCk7 Ci0gICAgdXBkYXRlQWN0aXZpdHlUb2tlbigpOworICAgIHVwZGF0ZVRocm90dGxlU3RhdGUoKTsK IAogICAgIG1faW5zcGVjdG9yID0gV2ViSW5zcGVjdG9yUHJveHk6OmNyZWF0ZSh0aGlzKTsKICNp ZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkpCkBAIC0xNTM4LDcgKzE1MzcsNyBAQCB2b2lkIFdlYlBh Z2VQcm94eTo6ZGlzcGF0Y2hWaWV3U3RhdGVDaGFuCiAgICAgbV9uZXh0Vmlld1N0YXRlQ2hhbmdl Q2FsbGJhY2tzLmNsZWFyKCk7CiAKICAgICAvLyBUaGlzIG11c3QgaGFwcGVuIGFmdGVyIHRoZSBT ZXRWaWV3U3RhdGUgbWVzc2FnZSBpcyBzZW50LCB0byBlbnN1cmUgdGhlIHBhZ2UgdmlzaWJpbGl0 eSBldmVudCBjYW4gZmlyZS4KLSAgICB1cGRhdGVBY3Rpdml0eVRva2VuKCk7CisgICAgdXBkYXRl VGhyb3R0bGVTdGF0ZSgpOwogCiAgICAgLy8gSWYgd2UndmUgc3RhcnRlZCB0aGUgcmVzcG9uc2l2 ZW5lc3MgdGltZXIgYXMgcGFydCBvZiB0ZWxsaW5nIHRoZSB3ZWIgcHJvY2VzcyB0byB1cGRhdGUg dGhlIGJhY2tpbmcgc3RvcmUKICAgICAvLyBzdGF0ZSwgaXQgbWlnaHQgbm90IHNlbmQgYmFjayBh IHJlcGx5IChzaW5jZSBpdCB3b24ndCBwYWludCBhbnl0aGluZyBpZiB0aGUgd2ViIHBhZ2UgaXMg aGlkZGVuKSBzbyB3ZQpAQCAtMTU2MywxMyArMTU2MiwzNCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6 ZGlzcGF0Y2hWaWV3U3RhdGVDaGFuCiAgICAgbV92aWV3V2FzRXZlckluV2luZG93IHw9IGlzTm93 SW5XaW5kb3c7CiB9CiAKK3ZvaWQgV2ViUGFnZVByb3h5OjpzZXRQYWdlQWN0aXZpdHlTdGF0ZShX ZWJDb3JlOjpQYWdlQWN0aXZpdHlTdGF0ZTo6RmxhZ3MgYWN0aXZpdHlTdGF0ZSkKK3sKKyAgICBt X2FjdGl2aXR5U3RhdGUgPSBhY3Rpdml0eVN0YXRlOworICAgIHVwZGF0ZVRocm90dGxlU3RhdGUo KTsKK30KKwogYm9vbCBXZWJQYWdlUHJveHk6OmlzQWx3YXlzT25Mb2dnaW5nQWxsb3dlZCgpIGNv bnN0CiB7CiAgICAgcmV0dXJuIHNlc3Npb25JRCgpLmlzQWx3YXlzT25Mb2dnaW5nQWxsb3dlZCgp OwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6dXBkYXRlQWN0aXZpdHlUb2tlbigpCit2b2lkIFdl YlBhZ2VQcm94eTo6dXBkYXRlVGhyb3R0bGVTdGF0ZSgpCiB7CisgICAgYm9vbCBwcm9jZXNzU3Vw cHJlc3Npb25FbmFibGVkID0gbV9wcmVmZXJlbmNlcy0+cGFnZVZpc2liaWxpdHlCYXNlZFByb2Nl c3NTdXBwcmVzc2lvbkVuYWJsZWQoKTsKKworICAgIC8vIElmIHByb2Nlc3Mgc3VwcHJlc3Npb24g aXMgbm90IGVuYWJsZWQgdGFrZSBhIHRva2VuIG9uIHRoZSBwcm9jZXNzIHBvb2wgdG8gZGlzYWJs ZSBzdXBwcmVzc2lvbiBvZiBzdXBwb3J0IHByb2Nlc3Nlcy4KKyAgICBpZiAoIXByb2Nlc3NTdXBw cmVzc2lvbkVuYWJsZWQpCisgICAgICAgIG1fcHJldmVudFByb2Nlc3NTdXBwcmVzc2lvbkNvdW50 ID0gbV9wcm9jZXNzLT5wcm9jZXNzUG9vbCgpLnByb2Nlc3NTdXBwcmVzc2lvbkRpc2FibGVkRm9y UGFnZUNvdW50KCk7CisgICAgZWxzZSBpZiAoIW1fcHJldmVudFByb2Nlc3NTdXBwcmVzc2lvbkNv dW50KQorICAgICAgICBtX3ByZXZlbnRQcm9jZXNzU3VwcHJlc3Npb25Db3VudCA9IG51bGxwdHI7 CisKKyAgICAvLyBXZSBzaG91bGQgc3VwcHJlc3MgaWYgdGhlIHBhZ2UgaXMgbm90IGFjdGl2ZSwg aXMgdmlzdWFsbHkgaWRsZSwgYW5kIHN1cHJlc3Npb24gaXMgZW5hYmxlZC4KKyAgICBib29sIHBh Z2VTaG91bGRCZVN1cHByZXNzZWQgPSAhbV9hY3Rpdml0eVN0YXRlICYmIHByb2Nlc3NTdXBwcmVz c2lvbkVuYWJsZWQgJiYgKG1fdmlld1N0YXRlICYgVmlld1N0YXRlOjpJc1Zpc3VhbGx5SWRsZSk7 CisgICAgaWYgKG1fcGFnZVN1cHByZXNzZWQgIT0gcGFnZVNob3VsZEJlU3VwcHJlc3NlZCkgewor ICAgICAgICBtX3BhZ2VTdXBwcmVzc2VkID0gcGFnZVNob3VsZEJlU3VwcHJlc3NlZDsKKyAgICAg ICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRQYWdlU3VwcHJlc3NlZCht X3BhZ2VTdXBwcmVzc2VkKSwgbV9wYWdlSUQpOworICAgIH0KKwogICAgIGlmIChtX3ZpZXdTdGF0 ZSAmIFZpZXdTdGF0ZTo6SXNWaXN1YWxseUlkbGUpCiAgICAgICAgIG1fcGFnZUlzVXNlck9ic2Vy dmFibGVDb3VudCA9IG51bGxwdHI7CiAgICAgZWxzZSBpZiAoIW1fcGFnZUlzVXNlck9ic2VydmFi bGVDb3VudCkKQEAgLTE1OTEsMTQgKzE2MTEsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6dXBkYXRl QWN0aXZpdHlUb2tlbigpCiAjZW5kaWYKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OnVwZGF0ZVBy b2NjZXNzU3VwcHJlc3Npb25TdGF0ZSgpCi17Ci0gICAgaWYgKG1fcHJlZmVyZW5jZXMtPnBhZ2VW aXNpYmlsaXR5QmFzZWRQcm9jZXNzU3VwcHJlc3Npb25FbmFibGVkKCkpCi0gICAgICAgIG1fcHJl dmVudFByb2Nlc3NTdXBwcmVzc2lvbkNvdW50ID0gbnVsbHB0cjsKLSAgICBlbHNlIGlmICghbV9w cmV2ZW50UHJvY2Vzc1N1cHByZXNzaW9uQ291bnQpCi0gICAgICAgIG1fcHJldmVudFByb2Nlc3NT dXBwcmVzc2lvbkNvdW50ID0gbV9wcm9jZXNzLT5wcm9jZXNzUG9vbCgpLnByb2Nlc3NTdXBwcmVz c2lvbkRpc2FibGVkRm9yUGFnZUNvdW50KCk7Ci19Ci0KIHZvaWQgV2ViUGFnZVByb3h5Ojp1cGRh dGVIaWRkZW5QYWdlVGhyb3R0bGluZ0F1dG9JbmNyZWFzZXMoKQogewogICAgIGlmICghbV9wcmVm ZXJlbmNlcy0+aGlkZGVuUGFnZURPTVRpbWVyVGhyb3R0bGluZ0F1dG9JbmNyZWFzZXMoKSkKQEAg LTMwMTIsNyArMzAyNCw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpwcmVmZXJlbmNlc0RpZENoYW5n ZSgKICAgICAgICAgaW5zcGVjdG9yKCktPmVuYWJsZVJlbW90ZUluc3BlY3Rpb24oKTsKICNlbmRp ZgogCi0gICAgdXBkYXRlUHJvY2Nlc3NTdXBwcmVzc2lvblN0YXRlKCk7CisgICAgdXBkYXRlVGhy b3R0bGVTdGF0ZSgpOwogICAgIHVwZGF0ZUhpZGRlblBhZ2VUaHJvdHRsaW5nQXV0b0luY3JlYXNl cygpOwogCiAgICAgbV9wYWdlQ2xpZW50LnByZWZlcmVuY2VzRGlkQ2hhbmdlKCk7CkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCShyZXZpc2lvbiAyMDczODcpCisr KyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdvcmtpbmcgY29weSkK QEAgLTExMzcsOCArMTEzNyw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBwbGF0Zm9ybUluaXRpYWxp emUoKTsKIAogICAgIHZvaWQgdXBkYXRlVmlld1N0YXRlKFdlYkNvcmU6OlZpZXdTdGF0ZTo6Rmxh Z3MgZmxhZ3NUb1VwZGF0ZSA9IFdlYkNvcmU6OlZpZXdTdGF0ZTo6QWxsRmxhZ3MpOwotICAgIHZv aWQgdXBkYXRlQWN0aXZpdHlUb2tlbigpOwotICAgIHZvaWQgdXBkYXRlUHJvY2Nlc3NTdXBwcmVz c2lvblN0YXRlKCk7CisgICAgdm9pZCB1cGRhdGVUaHJvdHRsZVN0YXRlKCk7CiAgICAgdm9pZCB1 cGRhdGVIaWRkZW5QYWdlVGhyb3R0bGluZ0F1dG9JbmNyZWFzZXMoKTsKIAogICAgIGVudW0gY2xh c3MgUmVzZXRTdGF0ZVJlYXNvbiB7CkBAIC0xNTIwLDYgKzE1MTksNyBAQCBwcml2YXRlOgogICAg IHZvaWQgZGlzcGF0Y2hWaWV3U3RhdGVDaGFuZ2UoKTsKICAgICB2b2lkIHZpZXdEaWRMZWF2ZVdp bmRvdygpOwogICAgIHZvaWQgdmlld0RpZEVudGVyV2luZG93KCk7CisgICAgdm9pZCBzZXRQYWdl QWN0aXZpdHlTdGF0ZShXZWJDb3JlOjpQYWdlQWN0aXZpdHlTdGF0ZTo6RmxhZ3MpOwogCiAjaWYg UExBVEZPUk0oTUFDKQogICAgIHZvaWQgZGlkUGVyZm9ybUltbWVkaWF0ZUFjdGlvbkhpdFRlc3Qo Y29uc3QgV2ViSGl0VGVzdFJlc3VsdERhdGEmLCBib29sIGNvbnRlbnRQcmV2ZW50c0RlZmF1bHQs IGNvbnN0IFVzZXJEYXRhJik7CkBAIC0xNzEzLDYgKzE3MTMsOCBAQCBwcml2YXRlOgogICAgIFdl YkNvcmU6OlBvbGljeUFjdGlvbiBtX3N5bmNOYXZpZ2F0aW9uQWN0aW9uUG9saWN5QWN0aW9uOwog ICAgIERvd25sb2FkSUQgbV9zeW5jTmF2aWdhdGlvbkFjdGlvblBvbGljeURvd25sb2FkSUQ7CiAg ICAgYm9vbCBtX3Nob3VsZFN1cHByZXNzQXBwTGlua3NJbk5leHROYXZpZ2F0aW9uUG9saWN5RGVj aXNpb24geyBmYWxzZSB9OworICAgIFdlYkNvcmU6OlBhZ2VBY3Rpdml0eVN0YXRlOjpGbGFncyBt X2FjdGl2aXR5U3RhdGUgeyBXZWJDb3JlOjpQYWdlQWN0aXZpdHlTdGF0ZTo6Tm9GbGFncyB9Owor ICAgIGJvb2wgbV9wYWdlU3VwcHJlc3NlZCB7IGZhbHNlIH07CiAKICAgICBEZXF1ZTxOYXRpdmVX ZWJLZXlib2FyZEV2ZW50PiBtX2tleUV2ZW50UXVldWU7CiAgICAgRGVxdWU8TmF0aXZlV2ViV2hl ZWxFdmVudD4gbV93aGVlbEV2ZW50UXVldWU7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4JKHJldmlzaW9uIDIwNzM4NykKKysr IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4JKHdvcmtp bmcgY29weSkKQEAgLTQwOCw3ICs0MDgsOCBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlUHJveHkgewog I2VuZGlmCiAKICAgICBEaWRVcGRhdGVWaWV3U3RhdGUoKQotICAgIAorICAgIFNldFBhZ2VBY3Rp dml0eVN0YXRlKGludDMyX3QgcGFnZUFjdGl2aXR5U3RhdGUpCisKICAgICBEaWRTYXZlVG9QYWdl Q2FjaGUoKQogCiAjaWYgRU5BQkxFKFNVQlRMRV9DUllQVE8pCkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCShyZXZpc2lvbiAyMDczODcpCisr KyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTM3Niw3ICszNzYsNiBAQCBXZWJQYWdlOjpXZWJQYWdlKHVpbnQ2NF90IHBhZ2VJ RCwgY29uc3QgCiAgICAgLCBtX3Njcm9sbFBpbm5pbmdCZWhhdmlvcihEb05vdFBpbikKICAgICAs IG1fdXNlQXN5bmNTY3JvbGxpbmcoZmFsc2UpCiAgICAgLCBtX3ZpZXdTdGF0ZShwYXJhbWV0ZXJz LnZpZXdTdGF0ZSkKLSAgICAsIG1fcHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZCh0cnVlKQogICAg ICwgbV91c2VyQWN0aXZpdHkoIlByb2Nlc3Mgc3VwcHJlc3Npb24gZGlzYWJsZWQgZm9yIHBhZ2Uu IikKICAgICAsIG1fcGVuZGluZ05hdmlnYXRpb25JRCgwKQogI2lmIEVOQUJMRShXRUJHTCkKQEAg LTQ5NSw3ICs0OTQsNyBAQCBXZWJQYWdlOjpXZWJQYWdlKHVpbnQ2NF90IHBhZ2VJRCwgY29uc3Qg CiAgICAgbV9wYWdlLT5zZXRWaWV3U3RhdGUobV92aWV3U3RhdGUpOwogICAgIGlmICghaXNWaXNp YmxlKCkpCiAgICAgICAgIG1fcGFnZS0+c2V0SXNQcmVyZW5kZXIoKTsKLSAgICB1cGRhdGVVc2Vy QWN0aXZpdHkoKTsKKyAgICBzZXRQYWdlU3VwcHJlc3NlZChmYWxzZSk7CiAKICAgICB1cGRhdGVJ c0luV2luZG93KHRydWUpOwogCkBAIC01ODIsMjEgKzU4MSwxNyBAQCB2b2lkIFdlYlBhZ2U6OnJl aW5pdGlhbGl6ZVdlYlBhZ2UoY29uc3QgCiAKIHZvaWQgV2ViUGFnZTo6c2V0UGFnZUFjdGl2aXR5 U3RhdGUoUGFnZUFjdGl2aXR5U3RhdGU6OkZsYWdzIGFjdGl2aXR5U3RhdGUpCiB7Ci0gICAgUGFn ZUFjdGl2aXR5U3RhdGU6OkZsYWdzIGNoYW5nZWQgPSBtX2FjdGl2aXR5U3RhdGUgXiBhY3Rpdml0 eVN0YXRlOwotICAgIG1fYWN0aXZpdHlTdGF0ZSA9IGFjdGl2aXR5U3RhdGU7Ci0KLSAgICBpZiAo Y2hhbmdlZCkKLSAgICAgICAgdXBkYXRlVXNlckFjdGl2aXR5KCk7CisgICAgc2VuZChNZXNzYWdl czo6V2ViUGFnZVByb3h5OjpTZXRQYWdlQWN0aXZpdHlTdGF0ZShhY3Rpdml0eVN0YXRlKSk7CiB9 CiAKLXZvaWQgV2ViUGFnZTo6dXBkYXRlVXNlckFjdGl2aXR5KCkKK3ZvaWQgV2ViUGFnZTo6c2V0 UGFnZVN1cHByZXNzZWQoYm9vbCBwYWdlU3VwcHJlc3NlZCkKIHsKLSAgICAvLyBTdGFydCB0aGUg YWN0aXZpdHkgdG8gcHJldmVudCBBcHBOYXAgaWYgdGhlIHBhZ2UgYWN0aXZpdHkgaXMgaW4gcHJv Z3Jlc3MsCi0gICAgLy8gdGhlIHBhZ2UgaXMgdmlzaWJsZSBhbmQgbm9uLWlkbGUsIG9yIHByb2Nl c3Mgc3VwcHJlc3Npb24gaXMgZGlzYWJsZWQuCi0gICAgaWYgKG1fYWN0aXZpdHlTdGF0ZSB8fCAh KG1fdmlld1N0YXRlICYgVmlld1N0YXRlOjpJc1Zpc3VhbGx5SWRsZSkgfHwgIW1fcHJvY2Vzc1N1 cHByZXNzaW9uRW5hYmxlZCkKLSAgICAgICAgbV91c2VyQWN0aXZpdHkuc3RhcnQoKTsKLSAgICBl bHNlCisgICAgLy8gVGhlIFVzZXJBY3Rpdml0eSBrZWVwcyB0aGUgcHJvY2Vzc2VzIHJ1bm5hYmxl LiBTbyBpZiB0aGUgcGFnZSBzaG91bGQgYmUgc3VwcHJlc3NlZCwgc3RvcCB0aGUgYWN0aXZpdHku CisgICAgLy8gSWYgdGhlIHBhZ2Ugc2hvdWxkIG5vdCBiZSBzdXByZXNzZWQsIHN0YXJ0IGl0Lgor ICAgIGlmIChwYWdlU3VwcHJlc3NlZCkKICAgICAgICAgbV91c2VyQWN0aXZpdHkuc3RvcCgpOwor ICAgIGVsc2UKKyAgICAgICAgbV91c2VyQWN0aXZpdHkuc3RhcnQoKTsKIH0KIAogV2ViUGFnZTo6 fldlYlBhZ2UoKQpAQCAtMjU5NSw5ICsyNTkwLDYgQEAgdm9pZCBXZWJQYWdlOjpzZXRWaWV3U3Rh dGUoVmlld1N0YXRlOjpGbAogICAgIFZpZXdTdGF0ZTo6RmxhZ3MgY2hhbmdlZCA9IG1fdmlld1N0 YXRlIF4gdmlld1N0YXRlOwogICAgIG1fdmlld1N0YXRlID0gdmlld1N0YXRlOwogCi0gICAgaWYg KGNoYW5nZWQpCi0gICAgICAgIHVwZGF0ZVVzZXJBY3Rpdml0eSgpOwotCiAgICAgbV9wYWdlLT5z ZXRWaWV3U3RhdGUodmlld1N0YXRlKTsKICAgICBmb3IgKGF1dG8qIHBsdWdpblZpZXcgOiBtX3Bs dWdpblZpZXdzKQogICAgICAgICBwbHVnaW5WaWV3LT52aWV3U3RhdGVEaWRDaGFuZ2UoY2hhbmdl ZCk7CkBAIC0zMjMzLDEyICszMjI1LDYgQEAgdm9pZCBXZWJQYWdlOjp1cGRhdGVQcmVmZXJlbmNl cyhjb25zdCBXZQogCiAgICAgUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMo KS5zZXRNb2Rlcm5NZWRpYUNvbnRyb2xzRW5hYmxlZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXko V2ViUHJlZmVyZW5jZXNLZXk6Om1vZGVybk1lZGlhQ29udHJvbHNFbmFibGVkS2V5KCkpKTsKIAot ICAgIGJvb2wgcHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZCA9IHN0b3JlLmdldEJvb2xWYWx1ZUZv cktleShXZWJQcmVmZXJlbmNlc0tleTo6cGFnZVZpc2liaWxpdHlCYXNlZFByb2Nlc3NTdXBwcmVz c2lvbkVuYWJsZWRLZXkoKSk7Ci0gICAgaWYgKG1fcHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZCAh PSBwcm9jZXNzU3VwcHJlc3Npb25FbmFibGVkKSB7Ci0gICAgICAgIG1fcHJvY2Vzc1N1cHByZXNz aW9uRW5hYmxlZCA9IHByb2Nlc3NTdXBwcmVzc2lvbkVuYWJsZWQ7Ci0gICAgICAgIHVwZGF0ZVVz ZXJBY3Rpdml0eSgpOwotICAgIH0KLQogICAgIHBsYXRmb3JtUHJlZmVyZW5jZXNEaWRDaGFuZ2Uo c3RvcmUpOwogCiAgICAgaWYgKG1fZHJhd2luZ0FyZWEpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJKHJldmlzaW9uIDIwNzM4NykKKysrIFNvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJKHdvcmtpbmcgY29weSkKQEAg LTkyNiw2ICs5MjYsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBzaG91bGREaXNwYXRjaEZha2VNb3Vz ZU1vdmVFdmVudHMoKSBjb25zdCB7IHJldHVybiBtX3Nob3VsZERpc3BhdGNoRmFrZU1vdXNlTW92 ZUV2ZW50czsgfQogCiAgICAgdm9pZCBzZXRQYWdlQWN0aXZpdHlTdGF0ZShXZWJDb3JlOjpQYWdl QWN0aXZpdHlTdGF0ZTo6RmxhZ3MpOworICAgIHZvaWQgc2V0UGFnZVN1cHByZXNzZWQoYm9vbCk7 CiAKICAgICB2b2lkIHBvc3RNZXNzYWdlKGNvbnN0IFN0cmluZyYgbWVzc2FnZU5hbWUsIEFQSTo6 T2JqZWN0KiBtZXNzYWdlQm9keSk7CiAgICAgdm9pZCBwb3N0U3luY2hyb25vdXNNZXNzYWdlRm9y VGVzdGluZyhjb25zdCBTdHJpbmcmIG1lc3NhZ2VOYW1lLCBBUEk6Ok9iamVjdCogbWVzc2FnZUJv ZHksIFJlZlB0cjxBUEk6Ok9iamVjdD4mIHJldHVybkRhdGEpOwpAQCAtMTAzOSw4ICsxMDQwLDYg QEAgcHJpdmF0ZToKICAgICB2b2lkIGV4ZWN1dGVFZGl0Q29tbWFuZChjb25zdCBTdHJpbmcmLCBj b25zdCBTdHJpbmcmKTsKICAgICB2b2lkIHNldEVkaXRhYmxlKGJvb2wpOwogCi0gICAgdm9pZCB1 cGRhdGVVc2VyQWN0aXZpdHkoKTsKLQogICAgIHZvaWQgbW91c2VFdmVudChjb25zdCBXZWJNb3Vz ZUV2ZW50Jik7CiAgICAgdm9pZCBrZXlFdmVudChjb25zdCBXZWJLZXlib2FyZEV2ZW50Jik7CiAj aWYgRU5BQkxFKElPU19UT1VDSF9FVkVOVFMpCkBAIC0xNDc2LDkgKzE0NzUsNyBAQCBwcml2YXRl OgogICAgIGJvb2wgbV91c2VBc3luY1Njcm9sbGluZzsKIAogICAgIFdlYkNvcmU6OlZpZXdTdGF0 ZTo6RmxhZ3MgbV92aWV3U3RhdGU7Ci0gICAgV2ViQ29yZTo6UGFnZUFjdGl2aXR5U3RhdGU6OkZs YWdzIG1fYWN0aXZpdHlTdGF0ZTsKIAotICAgIGJvb2wgbV9wcm9jZXNzU3VwcHJlc3Npb25FbmFi bGVkOwogICAgIFVzZXJBY3Rpdml0eSBtX3VzZXJBY3Rpdml0eTsKIAogICAgIHVpbnQ2NF90IG1f cGVuZGluZ05hdmlnYXRpb25JRDsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCShyZXZpc2lvbiAyMDczODcpCisr KyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgko d29ya2luZyBjb3B5KQpAQCAtMjQsNiArMjQsNyBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlIExlZ2Fj eVJlY2VpdmVyIHsKICAgICBTZXRJbml0aWFsRm9jdXMoYm9vbCBmb3J3YXJkLCBib29sIGlzS2V5 Ym9hcmRFdmVudFZhbGlkLCBXZWJLaXQ6OldlYktleWJvYXJkRXZlbnQgZXZlbnQsIHVpbnQ2NF90 IGNhbGxiYWNrSUQpCiAgICAgU2V0Vmlld1N0YXRlKHVuc2lnbmVkIHZpZXdTdGF0ZSwgYm9vbCB3 YW50c0RpZFVwZGF0ZVZpZXdTdGF0ZSwgVmVjdG9yPHVpbnQ2NF90PiBjYWxsYmFja0lEcykKICAg ICBTZXRMYXllckhvc3RpbmdNb2RlKGVudW0gV2ViS2l0OjpMYXllckhvc3RpbmdNb2RlIGxheWVy SG9zdGluZ01vZGUpCisgICAgU2V0UGFnZVN1cHByZXNzZWQoYm9vbCBwYWdlU3VwcHJlc3NlZCkK IAogICAgIFNldERyYXdzQmFja2dyb3VuZChib29sIGRyYXdzQmFja2dyb3VuZCkKIAo=