139705 2014-12-16 14:06:08 -0800 Move Mac process suppression from WebCore to WebKit2 2014-12-16 14:30:54 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough barraclough oldest_to_newest 1056135 0 barraclough 2014-12-16 14:06:08 -0800 Currently PageThrottler constructs the PageActivityState, holds a copy of the ViewState, and an optional UserActivity. Instead, still construct the PageActivityState but just pass this out via the Page to WebPage. Logic From PageThrottler::updateUserActivity merged into WebPage::updateUserActivity. 1056140 1 243393 barraclough 2014-12-16 14:16:34 -0800 Created attachment 243393 Fix 1056145 2 243393 ggaren 2014-12-16 14:21:25 -0800 Comment on attachment 243393 Fix View in context: https://bugs.webkit.org/attachment.cgi?id=243393&action=review r=me > Source/WebCore/page/Page.h:294 > + void setPageActivityState(PageActivityState::Flags); Seems like this should just be named "setActivityState" and "ActivityState". 1056146 3 barraclough 2014-12-16 14:30:54 -0800 PageThrottler needs a new name too (since it no longer throttles!), will rename in a follow up. Transmitting file data ............ Committed revision 177396. 243393 2014-12-16 14:16:34 -0800 2014-12-16 14:21:25 -0800 Fix 139705.1.patch text/plain 16375 barraclough SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NzM5NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ1IEBACisyMDE0LTEyLTE2ICBHYXZpbiBC YXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIE1hYyBw cm9jZXNzIHN1cHByZXNzaW9uIGZyb20gV2ViQ29yZSB0byBXZWJLaXQyCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk3MDUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDdXJyZW50bHkgUGFnZVRocm90dGxl ciBjb25zdHJ1Y3RzIHRoZSBQYWdlQWN0aXZpdHlTdGF0ZSwgaG9sZHMgYSBjb3B5IG9mIHRoZSBW aWV3U3RhdGUsCisgICAgICAgIGFuZCBhbiBvcHRpb25hbCBVc2VyQWN0aXZpdHkuCisKKyAgICAg ICAgSW5zdGVhZCwgc3RpbGwgY29uc3RydWN0IHRoZSBQYWdlQWN0aXZpdHlTdGF0ZSBidXQganVz dCBwYXNzIHRoaXMgb3V0IHZpYSB0aGUgUGFnZSB0byBXZWJQYWdlLgorICAgICAgICBMb2dpYyBG cm9tIFBhZ2VUaHJvdHRsZXI6OnVwZGF0ZVVzZXJBY3Rpdml0eSBtZXJnZWQgaW50byBXZWJQYWdl Ojp1cGRhdGVVc2VyQWN0aXZpdHkuCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAgICAg ICAgICAgIC0gcmVtb3ZlZCBjcmVhdGVVc2VyQWN0aXZpdHkuCisgICAgICAgICogcGFnZS9DaHJv bWVDbGllbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkNocm9tZUNsaWVudDo6c2V0UGFnZUFjdGl2 aXR5U3RhdGUpOgorICAgICAgICAgICAgLSBhZGRlZCB0byBwcm9wYWdhdGUgUGFnZUFjdGl2aXR5 U3RhdGUgdG8gV2ViUGFnZS4KKyAgICAgICAgKiBwYWdlL1BhZ2UuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UGFnZTo6UGFnZSk6CisgICAgICAgICAgICAtIFBhZ2VUaHJvdHRsZXIgY29uc3RydWN0 b3Igbm93IHRha2VzIGEgUGFnZSYuCisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpzZXRWaWV3U3Rh dGUpOgorICAgICAgICAgICAgLSBubyBsb25nZXIgbmVjZXNzYXJ5IHRvIHBhc3MgdGhpcyB0byBQ YWdlVGhyb3R0bGVyLgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6c2V0UGFnZUFjdGl2aXR5U3Rh dGUpOgorICAgICAgICAgICAgLSBhZGRlZCB0byBwcm9wYWdhdGUgUGFnZUFjdGl2aXR5U3RhdGUg dG8gV2ViUGFnZS4KKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OmVuYWJsZVBhZ2VUaHJvdHRsZXIp OiBEZWxldGVkLgorICAgICAgICAgICAgLSBQYWdlVGhyb3R0bGVyIG5vIGxvbmdlciBoYXMgYSBV c2VyQWN0aXZpdHkuCisgICAgICAgICogcGFnZS9QYWdlLmg6CisgICAgICAgIChXZWJDb3JlOjpQ YWdlOjpwYWdlVGhyb3R0bGVyKToKKyAgICAgICAgICAgIC0gYWRkZWQgc2V0UGFnZUFjdGl2aXR5 U3RhdGUsIHJlbW92ZWQgZW5hYmxlUGFnZVRocm90dGxlci4KKyAgICAgICAgKiBwYWdlL1BhZ2VU aHJvdHRsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZVRocm90dGxlcjo6UGFnZVRocm90 dGxlcik6CisgICAgICAgICAgICAtIHJlbW92ZWQgbV92aWV3U3RhdGUsIGFkZGVkIG1fcGFnZS4K KyAgICAgICAgKFdlYkNvcmU6OlBhZ2VUaHJvdHRsZXI6OnNldEFjdGl2aXR5RmxhZyk6CisgICAg ICAgICAgICAtIHByb3BhZ2F0ZSBQYWdlQWN0aXZpdHlTdGF0ZSB2aWEgUGFnZSB0byBXZWJQYWdl LgorICAgICAgICAoV2ViQ29yZTo6UGFnZVRocm90dGxlcjo6Y3JlYXRlVXNlckFjdGl2aXR5KTog RGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VUaHJvdHRsZXI6OnVwZGF0ZVVzZXJBY3Rp dml0eSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpQYWdlVGhyb3R0bGVyOjpzZXRWaWV3 U3RhdGUpOiBEZWxldGVkLgorICAgICAgICAgICAgLSByZW1vdmVkOyBQYWdlVGhyb3R0bGVyIG5v IGxvbmdlciBoYXMgYSBQYWdlVGhyb3R0bGVyIG9yIFVzZXJBY3Rpdml0eS4KKyAgICAgICAgKiBw YWdlL1BhZ2VUaHJvdHRsZXIuaDoKKyAgICAgICAgICAgIC0gcmVtb3ZlZCBjcmVhdGVVc2VyQWN0 aXZpdHksIHNldFZpZXdTdGF0ZSwgbV92aWV3U3RhdGUsIG1fYWN0aXZpdHk7IGFkZGVkIG1fcGFn ZS4KKwogMjAxNC0xMi0xNiAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAg ICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeCBhZnRlciByMTc3Mzc1OyBleHBsaWNpdGx5IGNhc3Qg dG8gTlNVSW50ZWdlci4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCShyZXZpc2lvbiAxNzczMzMp CisrKyBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgkod29ya2luZyBjb3B5KQpAQCAtMTE1 OSw3ICsxMTU5LDYgQEAgX19aTjdXZWJDb3JlNFBhZ2UxOHJlbW92ZVNjaGVkdWxlUGFpckVOMwog X19aTjdXZWJDb3JlNFBhZ2UxOHNldFBhZ2VTY2FsZUZhY3RvckVmUktOU184SW50UG9pbnRFYgog X19aTjdXZWJDb3JlNFBhZ2UxOHNldFRvcENvbnRlbnRJbnNldEVmCiBfX1pON1dlYkNvcmU0UGFn ZTE5YWRkTGF5b3V0TWlsZXN0b25lc0VqCi1fX1pON1dlYkNvcmU0UGFnZTE5ZW5hYmxlUGFnZVRo cm90dGxlckV2CiBfX1pON1dlYkNvcmU0UGFnZTE5c2V0VmlzaXRlZExpbmtTdG9yZUVPTjNXVEYz UmVmSU5TXzE2VmlzaXRlZExpbmtTdG9yZUVFRQogX19aTjdXZWJDb3JlNFBhZ2UyMHNjcm9sbGlu Z0Nvb3JkaW5hdG9yRXYKIF9fWk43V2ViQ29yZTRQYWdlMjBzZXREZXZpY2VTY2FsZUZhY3RvckVm CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0Nocm9tZUNsaWVudC5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3BhZ2UvQ2hyb21lQ2xpZW50LmgJKHJldmlzaW9uIDE3NzMzMykKKysr IFNvdXJjZS9XZWJDb3JlL3BhZ2UvQ2hyb21lQ2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTMx LDYgKzMxLDcgQEAKICNpbmNsdWRlICJIVE1MTWVkaWFFbGVtZW50LmgiCiAjaW5jbHVkZSAiSG9z dFdpbmRvdy5oIgogI2luY2x1ZGUgIkxheWVyRmx1c2hUaHJvdHRsZVN0YXRlLmgiCisjaW5jbHVk ZSAiUGFnZVRocm90dGxlci5oIgogI2luY2x1ZGUgIlBvcHVwTWVudS5oIgogI2luY2x1ZGUgIlBv cHVwTWVudUNsaWVudC5oIgogI2luY2x1ZGUgIlJlbmRlckVtYmVkZGVkT2JqZWN0LmgiCkBAIC00 MzIsNiArNDMzLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBzaG91bGRVc2VUaWxlZEJh Y2tpbmdGb3JGcmFtZVZpZXcoY29uc3QgRnJhbWVWaWV3KikgY29uc3QgeyByZXR1cm4gZmFsc2U7 IH0KIAogICAgIHZpcnR1YWwgdm9pZCBpc1BsYXlpbmdBdWRpb0RpZENoYW5nZShib29sKSB7IH0K KyAgICB2aXJ0dWFsIHZvaWQgc2V0UGFnZUFjdGl2aXR5U3RhdGUoUGFnZUFjdGl2aXR5U3RhdGU6 OkZsYWdzKSB7IH0KIAogI2lmIEVOQUJMRShTVUJUTEVfQ1JZUFRPKQogICAgIHZpcnR1YWwgYm9v bCB3cmFwQ3J5cHRvS2V5KGNvbnN0IFZlY3Rvcjx1aW50OF90PiYsIFZlY3Rvcjx1aW50OF90PiYp IGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2Uu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAJKHJldmlzaW9u IDE3NzMzMykKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTE5Niw3ICsxOTYsNyBAQCBQYWdlOjpQYWdlKFBhZ2VDb25maWd1cmF0aW9uJiBwYWdlQ29u ZmlnCiAjZW5kaWYKICAgICAsIG1fYWx0ZXJuYXRpdmVUZXh0Q2xpZW50KHBhZ2VDb25maWd1cmF0 aW9uLmFsdGVybmF0aXZlVGV4dENsaWVudCkKICAgICAsIG1fc2NyaXB0ZWRBbmltYXRpb25zU3Vz cGVuZGVkKGZhbHNlKQotICAgICwgbV9wYWdlVGhyb3R0bGVyKG1fdmlld1N0YXRlKQorICAgICwg bV9wYWdlVGhyb3R0bGVyKCp0aGlzKQogICAgICwgbV9jb25zb2xlQ2xpZW50KHN0ZDo6bWFrZV91 bmlxdWU8UGFnZUNvbnNvbGVDbGllbnQ+KCp0aGlzKSkKICNpZiBFTkFCTEUoUkVNT1RFX0lOU1BF Q1RPUikKICAgICAsIG1faW5zcGVjdG9yRGVidWdnYWJsZShzdGQ6Om1ha2VfdW5pcXVlPFBhZ2VE ZWJ1Z2dhYmxlPigqdGhpcykpCkBAIC0xMjYwLDExICsxMjYwLDYgQEAgdm9pZCBQYWdlOjpyZXN1 bWVBbmltYXRpbmdJbWFnZXMoKQogICAgICAgICB2aWV3LT5yZXN1bWVWaXNpYmxlSW1hZ2VBbmlt YXRpb25zSW5jbHVkaW5nU3ViZnJhbWVzKCk7CiB9CiAKLXZvaWQgUGFnZTo6ZW5hYmxlUGFnZVRo cm90dGxlcigpCi17Ci0gICAgbV9wYWdlVGhyb3R0bGVyLmNyZWF0ZVVzZXJBY3Rpdml0eSgpOwot fQotCiB2b2lkIFBhZ2U6OnNldFZpZXdTdGF0ZShWaWV3U3RhdGU6OkZsYWdzIHZpZXdTdGF0ZSkK IHsKICAgICBWaWV3U3RhdGU6OkZsYWdzIGNoYW5nZWQgPSBtX3ZpZXdTdGF0ZSBeIHZpZXdTdGF0 ZTsKQEAgLTEyNzUsNyArMTI3MCw2IEBAIHZvaWQgUGFnZTo6c2V0Vmlld1N0YXRlKFZpZXdTdGF0 ZTo6RmxhZ3MKIAogICAgIG1fdmlld1N0YXRlID0gdmlld1N0YXRlOwogICAgIG1fZm9jdXNDb250 cm9sbGVyLT5zZXRWaWV3U3RhdGUodmlld1N0YXRlKTsKLSAgICBtX3BhZ2VUaHJvdHRsZXIuc2V0 Vmlld1N0YXRlKHZpZXdTdGF0ZSk7CiAKICAgICBpZiAoY2hhbmdlZCAmIFZpZXdTdGF0ZTo6SXNW aXNpYmxlKQogICAgICAgICBzZXRJc1Zpc2libGVJbnRlcm5hbCh2aWV3U3RhdGUgJiBWaWV3U3Rh dGU6OklzVmlzaWJsZSk7CkBAIC0xMjg4LDYgKzEyODIsMTEgQEAgdm9pZCBQYWdlOjpzZXRWaWV3 U3RhdGUoVmlld1N0YXRlOjpGbGFncwogICAgICAgICBvYnNlcnZlci0+dmlld1N0YXRlRGlkQ2hh bmdlKG9sZFZpZXdTdGF0ZSwgbV92aWV3U3RhdGUpOwogfQogCit2b2lkIFBhZ2U6OnNldFBhZ2VB Y3Rpdml0eVN0YXRlKFBhZ2VBY3Rpdml0eVN0YXRlOjpGbGFncyBhY3Rpdml0eVN0YXRlKQorewor ICAgIGNocm9tZSgpLmNsaWVudCgpLnNldFBhZ2VBY3Rpdml0eVN0YXRlKGFjdGl2aXR5U3RhdGUp OworfQorCiB2b2lkIFBhZ2U6OnNldElzVmlzaWJsZShib29sIGlzVmlzaWJsZSkKIHsKICAgICBp ZiAoaXNWaXNpYmxlKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgJKHJldmlzaW9uIDE3NzMzMykKKysrIFNv dXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOTEsNiArMjkxLDcg QEAgcHVibGljOgogCiAgICAgLy8gTm90aWZpY2F0aW9ucyB3aGVuIHRoZSBQYWdlIHN0YXJ0cyBh bmQgc3RvcHMgYmVpbmcgcHJlc2VudGVkIHZpYSBhIG5hdGl2ZSB3aW5kb3cuCiAgICAgV0VCQ09S RV9FWFBPUlQgdm9pZCBzZXRWaWV3U3RhdGUoVmlld1N0YXRlOjpGbGFncyk7CisgICAgdm9pZCBz ZXRQYWdlQWN0aXZpdHlTdGF0ZShQYWdlQWN0aXZpdHlTdGF0ZTo6RmxhZ3MpOwogICAgIFdFQkNP UkVfRVhQT1JUIHZvaWQgc2V0SXNWaXNpYmxlKGJvb2wpOwogICAgIFdFQkNPUkVfRVhQT1JUIHZv aWQgc2V0SXNQcmVyZW5kZXIoKTsKICAgICBib29sIGlzVmlzaWJsZSgpIGNvbnN0IHsgcmV0dXJu IG1fdmlld1N0YXRlICYgVmlld1N0YXRlOjpJc1Zpc2libGU7IH0KQEAgLTM4Miw3ICszODMsNiBA QCBwdWJsaWM6CiAgICAgdm9pZCByZXNldFNlZW5NZWRpYUVuZ2luZXMoKTsKIAogICAgIFBhZ2VU aHJvdHRsZXImIHBhZ2VUaHJvdHRsZXIoKSB7IHJldHVybiBtX3BhZ2VUaHJvdHRsZXI7IH0KLSAg ICBXRUJDT1JFX0VYUE9SVCB2b2lkIGVuYWJsZVBhZ2VUaHJvdHRsZXIoKTsKIAogICAgIFBhZ2VD b25zb2xlQ2xpZW50JiBjb25zb2xlKCkgeyByZXR1cm4gKm1fY29uc29sZUNsaWVudDsgfQogCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VUaHJvdHRsZXIuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZVRocm90dGxlci5jcHAJKHJldmlzaW9uIDE3NzM3OCkK KysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZVRocm90dGxlci5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTI2LDEwICsyNiwxMiBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlBhZ2VU aHJvdHRsZXIuaCIKIAorI2luY2x1ZGUgIlBhZ2UuaCIKKwogbmFtZXNwYWNlIFdlYkNvcmUgewog Ci1QYWdlVGhyb3R0bGVyOjpQYWdlVGhyb3R0bGVyKFZpZXdTdGF0ZTo6RmxhZ3Mgdmlld1N0YXRl KQotICAgIDogbV92aWV3U3RhdGUodmlld1N0YXRlKQorUGFnZVRocm90dGxlcjo6UGFnZVRocm90 dGxlcihQYWdlJiBwYWdlKQorICAgIDogbV9wYWdlKHBhZ2UpCiAgICAgLCBtX3VzZXJJbnB1dEh5 c3RlcmVzaXMoW3RoaXNdKEh5c3RlcmVzaXNTdGF0ZSBzdGF0ZSkgeyBzZXRBY3Rpdml0eUZsYWco UGFnZUFjdGl2aXR5U3RhdGU6OlVzZXJJbnB1dEFjdGl2aXR5LCBzdGF0ZSA9PSBIeXN0ZXJlc2lz U3RhdGU6OlN0YXJ0ZWQpOyB9KQogICAgICwgbV9hdWRpYmxlUGx1Z2luSHlzdGVyZXNpcyhbdGhp c10oSHlzdGVyZXNpc1N0YXRlIHN0YXRlKSB7IHNldEFjdGl2aXR5RmxhZyhQYWdlQWN0aXZpdHlT dGF0ZTo6QXVkaWJsZVBsdWdpbiwgc3RhdGUgPT0gSHlzdGVyZXNpc1N0YXRlOjpTdGFydGVkKTsg fSkKICAgICAsIG1fbWVkaWFBY3Rpdml0eUNvdW50ZXIoW3RoaXNdKCkgeyBzZXRBY3Rpdml0eUZs YWcoUGFnZUFjdGl2aXR5U3RhdGU6Ok1lZGlhQWN0aXZpdHksIG1fbWVkaWFBY3Rpdml0eUNvdW50 ZXIudmFsdWUoKSk7IH0pCkBAIC0zNywxMyArMzksNiBAQCBQYWdlVGhyb3R0bGVyOjpQYWdlVGhy b3R0bGVyKFZpZXdTdGF0ZTo6CiB7CiB9CiAKLXZvaWQgUGFnZVRocm90dGxlcjo6Y3JlYXRlVXNl ckFjdGl2aXR5KCkKLXsKLSAgICBBU1NFUlQoIW1fYWN0aXZpdHkpOwotICAgIG1fYWN0aXZpdHkg PSBzdGQ6Om1ha2VfdW5pcXVlPFVzZXJBY3Rpdml0eT4oIlBhZ2UgaXMgYWN0aXZlLiIpOwotICAg IHVwZGF0ZVVzZXJBY3Rpdml0eSgpOwotfQotCiBQYWdlQWN0aXZpdHlBc3NlcnRpb25Ub2tlbiBQ YWdlVGhyb3R0bGVyOjptZWRpYUFjdGl2aXR5VG9rZW4oKQogewogICAgIHJldHVybiBtX21lZGlh QWN0aXZpdHlDb3VudGVyLmNvdW50KCk7CkBAIC01NCwxOCArNDksNiBAQCBQYWdlQWN0aXZpdHlB c3NlcnRpb25Ub2tlbiBQYWdlVGhyb3R0bGVyCiAgICAgcmV0dXJuIG1fcGFnZUxvYWRBY3Rpdml0 eUNvdW50ZXIuY291bnQoKTsKIH0KIAotdm9pZCBQYWdlVGhyb3R0bGVyOjp1cGRhdGVVc2VyQWN0 aXZpdHkoKQotewotICAgIGlmICghbV9hY3Rpdml0eSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAg Ly8gQWxsb3cgdGhyb3R0bGluZyBpZiB0aGVyZSBpcyBubyBwYWdlIGFjdGl2aXR5LCBhbmQgdGhl IHBhZ2UgaXMgdmlzdWFsbHkgaWRsZS4KLSAgICBpZiAoIW1fYWN0aXZpdHlTdGF0ZSAmJiBtX3Zp ZXdTdGF0ZSAmIFZpZXdTdGF0ZTo6SXNWaXN1YWxseUlkbGUpCi0gICAgICAgIG1fYWN0aXZpdHkt PnN0b3AoKTsKLSAgICBlbHNlCi0gICAgICAgIG1fYWN0aXZpdHktPnN0YXJ0KCk7Ci19Ci0KIHZv aWQgUGFnZVRocm90dGxlcjo6c2V0QWN0aXZpdHlGbGFnKFBhZ2VBY3Rpdml0eVN0YXRlOjpGbGFn cyBmbGFnLCBib29sIHZhbHVlKQogewogICAgIFBhZ2VBY3Rpdml0eVN0YXRlOjpGbGFncyBhY3Rp dml0eVN0YXRlID0gbV9hY3Rpdml0eVN0YXRlOwpAQCAtNzgsMTYgKzYxLDcgQEAgdm9pZCBQYWdl VGhyb3R0bGVyOjpzZXRBY3Rpdml0eUZsYWcoUGFnZQogICAgICAgICByZXR1cm47CiAgICAgbV9h Y3Rpdml0eVN0YXRlID0gYWN0aXZpdHlTdGF0ZTsKIAotICAgIHVwZGF0ZVVzZXJBY3Rpdml0eSgp OwotfQotCi12b2lkIFBhZ2VUaHJvdHRsZXI6OnNldFZpZXdTdGF0ZShWaWV3U3RhdGU6OkZsYWdz IHZpZXdTdGF0ZSkKLXsKLSAgICBWaWV3U3RhdGU6OkZsYWdzIGNoYW5nZWQgPSBtX3ZpZXdTdGF0 ZSBeIHZpZXdTdGF0ZTsKLSAgICBtX3ZpZXdTdGF0ZSA9IHZpZXdTdGF0ZTsKLQotICAgIGlmIChj aGFuZ2VkICYgVmlld1N0YXRlOjpJc1Zpc3VhbGx5SWRsZSkKLSAgICAgICAgdXBkYXRlVXNlckFj dGl2aXR5KCk7CisgICAgbV9wYWdlLnNldFBhZ2VBY3Rpdml0eVN0YXRlKG1fYWN0aXZpdHlTdGF0 ZSk7CiB9CiAKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZVRocm90dGxlci5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZVRocm90dGxlci5oCShyZXZpc2lv biAxNzczNzgpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VUaHJvdHRsZXIuaAkod29ya2lu ZyBjb3B5KQpAQCAtMzQsNiArMzQsOCBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2NsYXNz IFBhZ2U7CisKIHR5cGVkZWYgUmVmUHRyPFJlZkNvdW50ZXI6OkNvdW50PiBQYWdlQWN0aXZpdHlB c3NlcnRpb25Ub2tlbjsKIAogc3RydWN0IFBhZ2VBY3Rpdml0eVN0YXRlIHsKQEAgLTUzLDEwICs1 NSw3IEBAIHN0cnVjdCBQYWdlQWN0aXZpdHlTdGF0ZSB7CiBjbGFzcyBQYWdlVGhyb3R0bGVyIHsK ICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKLSAgICBQYWdlVGhyb3R0bGVy KFZpZXdTdGF0ZTo6RmxhZ3MpOwotCi0gICAgdm9pZCBjcmVhdGVVc2VyQWN0aXZpdHkoKTsKLSAg ICB2b2lkIHNldFZpZXdTdGF0ZShWaWV3U3RhdGU6OkZsYWdzKTsKKyAgICBQYWdlVGhyb3R0bGVy KFBhZ2UmKTsKIAogICAgIHZvaWQgZGlkUmVjZWl2ZVVzZXJJbnB1dCgpIHsgbV91c2VySW5wdXRI eXN0ZXJlc2lzLmltcHVsc2UoKTsgfQogICAgIHZvaWQgcGx1Z2luRGlkRXZhbHVhdGVXaGlsZUF1 ZGlvSXNQbGF5aW5nKCkgeyBtX2F1ZGlibGVQbHVnaW5IeXN0ZXJlc2lzLmltcHVsc2UoKTsgfQpA QCAtNjQsMTYgKzYzLDE0IEBAIHB1YmxpYzoKICAgICBQYWdlQWN0aXZpdHlBc3NlcnRpb25Ub2tl biBwYWdlTG9hZEFjdGl2aXR5VG9rZW4oKTsKIAogcHJpdmF0ZToKLSAgICB2b2lkIHVwZGF0ZVVz ZXJBY3Rpdml0eSgpOwogICAgIHZvaWQgc2V0QWN0aXZpdHlGbGFnKFBhZ2VBY3Rpdml0eVN0YXRl OjpGbGFncywgYm9vbCk7CiAKLSAgICBWaWV3U3RhdGU6OkZsYWdzIG1fdmlld1N0YXRlOworICAg IFBhZ2UmIG1fcGFnZTsKICAgICBQYWdlQWN0aXZpdHlTdGF0ZTo6RmxhZ3MgbV9hY3Rpdml0eVN0 YXRlIHsgUGFnZUFjdGl2aXR5U3RhdGU6Ok5vRmxhZ3MgfTsKICAgICBIeXN0ZXJlc2lzQWN0aXZp dHkgbV91c2VySW5wdXRIeXN0ZXJlc2lzOwogICAgIEh5c3RlcmVzaXNBY3Rpdml0eSBtX2F1ZGli bGVQbHVnaW5IeXN0ZXJlc2lzOwogICAgIFJlZkNvdW50ZXIgbV9tZWRpYUFjdGl2aXR5Q291bnRl cjsKICAgICBSZWZDb3VudGVyIG1fcGFnZUxvYWRBY3Rpdml0eUNvdW50ZXI7Ci0gICAgc3RkOjp1 bmlxdWVfcHRyPFVzZXJBY3Rpdml0eT4gbV9hY3Rpdml0eTsKIH07CiAKIH0KSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cJKHJldmlzaW9uIDE3NzM5NCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACisyMDE0LTEyLTE2ICBHYXZpbiBCYXJyYWNsb3VnaCAg PGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIE1hYyBwcm9jZXNzIHN1cHBy ZXNzaW9uIGZyb20gV2ViQ29yZSB0byBXZWJLaXQyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk3MDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBDdXJyZW50bHkgUGFnZVRocm90dGxlciBjb25zdHJ1Y3Rz IHRoZSBQYWdlQWN0aXZpdHlTdGF0ZSwgaG9sZHMgYSBjb3B5IG9mIHRoZSBWaWV3U3RhdGUsCisg ICAgICAgIGFuZCBhbiBvcHRpb25hbCBVc2VyQWN0aXZpdHkuCisKKyAgICAgICAgSW5zdGVhZCwg c3RpbGwgY29uc3RydWN0IHRoZSBQYWdlQWN0aXZpdHlTdGF0ZSBidXQganVzdCBwYXNzIHRoaXMg b3V0IHZpYSB0aGUgUGFnZSB0byBXZWJQYWdlLgorICAgICAgICBMb2dpYyBGcm9tIFBhZ2VUaHJv dHRsZXI6OnVwZGF0ZVVzZXJBY3Rpdml0eSBtZXJnZWQgaW50byBXZWJQYWdlOjp1cGRhdGVVc2Vy QWN0aXZpdHkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9t ZUNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNocm9tZUNsaWVudDo6c2V0UGFnZUFj dGl2aXR5U3RhdGUpOgorICAgICAgICAgICAgLSBhZGRlZCB0byBwcm9wYWdhdGUgUGFnZUFjdGl2 aXR5U3RhdGUgdG8gV2ViUGFnZS4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0 L1dlYkNocm9tZUNsaWVudC5oOgorICAgICAgICAgICAgLSBhZGRlZCBzZXRQYWdlQWN0aXZpdHlT dGF0ZSB0byBwcm9wYWdhdGUgUGFnZUFjdGl2aXR5U3RhdGUgdG8gV2ViUGFnZS4KKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2U6OldlYlBhZ2UpOgorICAgICAgICAgICAgLSBjYWxscyB0byB1cGRhdGVVc2VyQWN0aXZpdHku CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNldFBhZ2VBY3Rpdml0eVN0YXRlKToKKyAgICAg ICAgICAgIC0gY2FsbHMgdG8gdXBkYXRlVXNlckFjdGl2aXR5LgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlOjp1cGRhdGVVc2VyQWN0aXZpdHkpOgorICAgICAgICAgICAgLSBpbmNvcnBvcmF0ZSBs b2dpYyBmcm9tIFBhZ2VUaHJvdHRsZXI6OnVwZGF0ZVVzZXJBY3Rpdml0eS4KKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZTo6c2V0Vmlld1N0YXRlKToKKyAgICAgICAgICAgIC0gY2FsbHMgdG8gdXBk YXRlVXNlckFjdGl2aXR5LgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjp1cGRhdGVQcmVmZXJl bmNlcyk6CisgICAgICAgICAgICAtIGNhbGxzIHRvIHVwZGF0ZVVzZXJBY3Rpdml0eS4KKyAgICAg ICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorICAgICAgICAgICAgLSBhZGRlZCBz ZXRQYWdlQWN0aXZpdHlTdGF0ZSwgbV9hY3Rpdml0eVN0YXRlLgorCiAyMDE0LTEyLTE2ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgVXNlIFJlZiBpbiBh bm90aGVyIFN0b3JhZ2VNYW5hZ2VyIGZ1bmN0aW9uCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQu Y3BwCShyZXZpc2lvbiAxNzczMzMpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNv cmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwNDUsNiAr MTA0NSwxMSBAQCB2b2lkIFdlYkNocm9tZUNsaWVudDo6aXNQbGF5aW5nQXVkaW9EaWRDCiAgICAg bV9wYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OklzUGxheWluZ0F1ZGlvRGlkQ2hh bmdlKG5ld0lzUGxheWluZ0F1ZGlvKSk7CiB9CiAKK3ZvaWQgV2ViQ2hyb21lQ2xpZW50OjpzZXRQ YWdlQWN0aXZpdHlTdGF0ZShQYWdlQWN0aXZpdHlTdGF0ZTo6RmxhZ3MgYWN0aXZpdHlTdGF0ZSkK K3sKKyAgICBtX3BhZ2UtPnNldFBhZ2VBY3Rpdml0eVN0YXRlKGFjdGl2aXR5U3RhdGUpOworfQor CiAjaWYgRU5BQkxFKFNVQlRMRV9DUllQVE8pCiBib29sIFdlYkNocm9tZUNsaWVudDo6d3JhcENy eXB0b0tleShjb25zdCBWZWN0b3I8dWludDhfdD4mIGtleSwgVmVjdG9yPHVpbnQ4X3Q+JiB3cmFw cGVkS2V5KSBjb25zdAogewpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3Jl U3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5oCShyZXZpc2lvbiAxNzcz MzMpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9t ZUNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOTUsNiArMjk1LDcgQEAgcHJpdmF0ZToKICAg ICB2aXJ0dWFsIGJvb2wgc2hvdWxkVXNlVGlsZWRCYWNraW5nRm9yRnJhbWVWaWV3KGNvbnN0IFdl YkNvcmU6OkZyYW1lVmlldyopIGNvbnN0IG92ZXJyaWRlOwogCiAgICAgdmlydHVhbCB2b2lkIGlz UGxheWluZ0F1ZGlvRGlkQ2hhbmdlKGJvb2wpIG92ZXJyaWRlOworICAgIHZpcnR1YWwgdm9pZCBz ZXRQYWdlQWN0aXZpdHlTdGF0ZShXZWJDb3JlOjpQYWdlQWN0aXZpdHlTdGF0ZTo6RmxhZ3MpIG92 ZXJyaWRlOwogCiAjaWYgRU5BQkxFKFNVQlRMRV9DUllQVE8pCiAgICAgdmlydHVhbCBib29sIHdy YXBDcnlwdG9LZXkoY29uc3QgVmVjdG9yPHVpbnQ4X3Q+JiwgVmVjdG9yPHVpbnQ4X3Q+JikgY29u c3Qgb3ZlcnJpZGU7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UuY3BwCShyZXZpc2lvbiAxNzczODUpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ0MCw3ICs0NDAsNyBA QCBXZWJQYWdlOjpXZWJQYWdlKHVpbnQ2NF90IHBhZ2VJRCwgY29uc3QgCiAgICAgbV9wYWdlLT5z ZXRWaWV3U3RhdGUobV92aWV3U3RhdGUpOwogICAgIGlmICghaXNWaXNpYmxlKCkpCiAgICAgICAg IG1fcGFnZS0+c2V0SXNQcmVyZW5kZXIoKTsKLSAgICBtX3BhZ2UtPmVuYWJsZVBhZ2VUaHJvdHRs ZXIoKTsKKyAgICB1cGRhdGVVc2VyQWN0aXZpdHkoKTsKIAogICAgIHVwZGF0ZUlzSW5XaW5kb3co dHJ1ZSk7CiAKQEAgLTUxMiwxMCArNTEyLDIwIEBAIHZvaWQgV2ViUGFnZTo6cmVpbml0aWFsaXpl V2ViUGFnZShjb25zdCAKICAgICAgICAgc2V0TGF5ZXJIb3N0aW5nTW9kZShzdGF0aWNfY2FzdDx1 bnNpZ25lZD4ocGFyYW1ldGVycy5sYXllckhvc3RpbmdNb2RlKSk7CiB9CiAKK3ZvaWQgV2ViUGFn ZTo6c2V0UGFnZUFjdGl2aXR5U3RhdGUoUGFnZUFjdGl2aXR5U3RhdGU6OkZsYWdzIGFjdGl2aXR5 U3RhdGUpCit7CisgICAgUGFnZUFjdGl2aXR5U3RhdGU6OkZsYWdzIGNoYW5nZWQgPSBtX2FjdGl2 aXR5U3RhdGUgXiBhY3Rpdml0eVN0YXRlOworICAgIG1fYWN0aXZpdHlTdGF0ZSA9IGFjdGl2aXR5 U3RhdGU7CisKKyAgICBpZiAoY2hhbmdlZCkKKyAgICAgICAgdXBkYXRlVXNlckFjdGl2aXR5KCk7 Cit9CisKIHZvaWQgV2ViUGFnZTo6dXBkYXRlVXNlckFjdGl2aXR5KCkKIHsKLSAgICAvLyBJZiBw cm9jZXNzIHN1cHByZXNzaW9uIGlzIGRpc2FibGVkLCB0aGVuIHN0YXJ0IHRoZSBhY3Rpdml0eSB0 byBwcmV2ZW50IEFwcE5hcC4KLSAgICBpZiAoIW1fcHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZCkK KyAgICAvLyBTdGFydCB0aGUgYWN0aXZpdHkgdG8gcHJldmVudCBBcHBOYXAgaWYgdGhlIHBhZ2Ug YWN0aXZpdHkgaXMgaW4gcHJvZ3Jlc3MsCisgICAgLy8gdGhlIHBhZ2UgaXMgdmlzaWJsZSBhbmQg bm9uLWlkbGUsIG9yIHByb2Nlc3Mgc3VwcHJlc3Npb24gaXMgZGlzYWJsZWQuCisgICAgaWYgKG1f YWN0aXZpdHlTdGF0ZSB8fCAhKG1fdmlld1N0YXRlICYgVmlld1N0YXRlOjpJc1Zpc3VhbGx5SWRs ZSkgfHwgIW1fcHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZCkKICAgICAgICAgbV91c2VyQWN0aXZp dHkuc3RhcnQoKTsKICAgICBlbHNlCiAgICAgICAgIG1fdXNlckFjdGl2aXR5LnN0b3AoKTsKQEAg LTIzMjgsNiArMjMzOCw5IEBAIHZvaWQgV2ViUGFnZTo6c2V0Vmlld1N0YXRlKFZpZXdTdGF0ZTo6 RmwKICAgICBWaWV3U3RhdGU6OkZsYWdzIGNoYW5nZWQgPSBtX3ZpZXdTdGF0ZSBeIHZpZXdTdGF0 ZTsKICAgICBtX3ZpZXdTdGF0ZSA9IHZpZXdTdGF0ZTsKIAorICAgIGlmIChjaGFuZ2VkKQorICAg ICAgICB1cGRhdGVVc2VyQWN0aXZpdHkoKTsKKwogICAgIG1fcGFnZS0+c2V0Vmlld1N0YXRlKHZp ZXdTdGF0ZSk7CiAgICAgZm9yIChhdXRvKiBwbHVnaW5WaWV3IDogbV9wbHVnaW5WaWV3cykKICAg ICAgICAgcGx1Z2luVmlldy0+dmlld1N0YXRlRGlkQ2hhbmdlKGNoYW5nZWQpOwpAQCAtMjg4OCw4 ICsyOTAxLDExIEBAIHZvaWQgV2ViUGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMoY29uc3QgV2UKICAg ICBzZXR0aW5ncy5zZXRTZXJ2aWNlQ29udHJvbHNFbmFibGVkKHN0b3JlLmdldEJvb2xWYWx1ZUZv cktleShXZWJQcmVmZXJlbmNlc0tleTo6c2VydmljZUNvbnRyb2xzRW5hYmxlZEtleSgpKSk7CiAj ZW5kaWYKIAotICAgIG1fcHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZCA9IHN0b3JlLmdldEJvb2xW YWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6cGFnZVZpc2liaWxpdHlCYXNlZFByb2Nlc3NT dXBwcmVzc2lvbkVuYWJsZWRLZXkoKSk7Ci0gICAgdXBkYXRlVXNlckFjdGl2aXR5KCk7CisgICAg Ym9vbCBwcm9jZXNzU3VwcHJlc3Npb25FbmFibGVkID0gc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5 KFdlYlByZWZlcmVuY2VzS2V5OjpwYWdlVmlzaWJpbGl0eUJhc2VkUHJvY2Vzc1N1cHByZXNzaW9u RW5hYmxlZEtleSgpKTsKKyAgICBpZiAobV9wcm9jZXNzU3VwcHJlc3Npb25FbmFibGVkICE9IHBy b2Nlc3NTdXBwcmVzc2lvbkVuYWJsZWQpIHsKKyAgICAgICAgbV9wcm9jZXNzU3VwcHJlc3Npb25F bmFibGVkID0gcHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZDsKKyAgICAgICAgdXBkYXRlVXNlckFj dGl2aXR5KCk7CisgICAgfQogCiAgICAgcGxhdGZvcm1QcmVmZXJlbmNlc0RpZENoYW5nZShzdG9y ZSk7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu aAkocmV2aXNpb24gMTc3Mzg1KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtODYxLDYgKzg2MSw4IEBAIHB1YmxpYzoKICAg ICB2b2lkIHNldE1haW5GcmFtZVByb2dyZXNzQ29tcGxldGVkKGJvb2wgY29tcGxldGVkKSB7IG1f bWFpbkZyYW1lUHJvZ3Jlc3NDb21wbGV0ZWQgPSBjb21wbGV0ZWQ7IH0KICAgICBib29sIHNob3Vs ZERpc3BhdGNoRmFrZU1vdXNlTW92ZUV2ZW50cygpIGNvbnN0IHsgcmV0dXJuIG1fc2hvdWxkRGlz cGF0Y2hGYWtlTW91c2VNb3ZlRXZlbnRzOyB9CiAKKyAgICB2b2lkIHNldFBhZ2VBY3Rpdml0eVN0 YXRlKFdlYkNvcmU6OlBhZ2VBY3Rpdml0eVN0YXRlOjpGbGFncyk7CisKIHByaXZhdGU6CiAgICAg V2ViUGFnZSh1aW50NjRfdCBwYWdlSUQsIGNvbnN0IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMm KTsKIApAQCAtMTMxNSw2ICsxMzE3LDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1fdXNlQXN5bmNT Y3JvbGxpbmc7CiAKICAgICBXZWJDb3JlOjpWaWV3U3RhdGU6OkZsYWdzIG1fdmlld1N0YXRlOwor ICAgIFdlYkNvcmU6OlBhZ2VBY3Rpdml0eVN0YXRlOjpGbGFncyBtX2FjdGl2aXR5U3RhdGU7CiAK ICAgICBib29sIG1fcHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZDsKICAgICBVc2VyQWN0aXZpdHkg bV91c2VyQWN0aXZpdHk7Cg==