215963 2020-08-28 17:58:48 -0700 Move PerformanceMonitor related DeprecatedGlobalSettings to Settings 2023-01-06 14:26:09 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 250192 1 sam sam andersca webkit-bug-importer oldest_to_newest 1683846 0 sam 2020-08-28 17:58:48 -0700 The PerformanceMonitor related uses of DeprecatedGlobalSettings can easily be moved to Settings, as PerformanceMonitor has a Page reference. None of these are actually settings in the traditional sense right now, as they are immutable, so we could just make them #defines, but given how easy it is move them to Settings, I think that makes the most sense here. 1683850 1 407521 sam 2020-08-28 18:46:56 -0700 Created attachment 407521 Patch 1683916 2 407540 sam 2020-08-29 08:51:40 -0700 Created attachment 407540 Patch 1683957 3 ews-feeder 2020-08-29 17:05:08 -0700 Committed r266328: <https://trac.webkit.org/changeset/266328> All reviewed patches have been landed. Closing bug and clearing flags on attachment 407540. 1683958 4 webkit-bug-importer 2020-08-29 17:06:15 -0700 <rdar://problem/68009122> 407521 2020-08-28 18:46:56 -0700 2020-08-29 08:51:39 -0700 Patch bug-215963-20200828184655.patch text/plain 11129 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2NjMxNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDIwLTA4LTI4ICBTYW0gV2Vp bmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIFBlcmZvcm1hbmNlTW9uaXRv ciByZWxhdGVkIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5ncyB0byBTZXR0aW5ncworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE1OTYzCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIFBlcmZvcm1hbmNlTW9u aXRvciByZWxhdGVkIHVzZXMgb2YgRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzIGNhbiBlYXNpbHkg YmUgbW92ZWQgdG8gU2V0dGluZ3MsIGFzIFBlcmZvcm1hbmNlTW9uaXRvciAKKyAgICAgICAgaGFz IGEgUGFnZSByZWZlcmVuY2UuIAorCisgICAgICAgICogcGFnZS9EZXByZWNhdGVkR2xvYmFsU2V0 dGluZ3MuaDoKKyAgICAgICAgKFdlYkNvcmU6OkRlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6aXNQ b3N0TG9hZENQVVVzYWdlTWVhc3VyZW1lbnRFbmFibGVkKTogRGVsZXRlZC4KKyAgICAgICAgKFdl YkNvcmU6OkRlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6aXNQb3N0QmFja2dyb3VuZGluZ0NQVVVz YWdlTWVhc3VyZW1lbnRFbmFibGVkKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkRlcHJl Y2F0ZWRHbG9iYWxTZXR0aW5nczo6aXNQZXJBY3Rpdml0eVN0YXRlQ1BVVXNhZ2VNZWFzdXJlbWVu dEVuYWJsZWQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6RGVwcmVjYXRlZEdsb2JhbFNl dHRpbmdzOjppc1Bvc3RMb2FkTWVtb3J5VXNhZ2VNZWFzdXJlbWVudEVuYWJsZWQpOiBEZWxldGVk LgorICAgICAgICAoV2ViQ29yZTo6RGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzOjppc1Bvc3RCYWNr Z3JvdW5kaW5nTWVtb3J5VXNhZ2VNZWFzdXJlbWVudEVuYWJsZWQpOiBEZWxldGVkLgorICAgICAg ICAqIHBhZ2UvU2V0dGluZ3MueWFtbDoKKyAgICAgICAgKiBwYWdlL1NldHRpbmdzRGVmYXVsdFZh bHVlcy5oOgorICAgICAgICBNb3ZlZCBzZXR0aW5ncyBmcm9tIERlcHJlY2F0ZWRHbG9iYWxTZXR0 aW5ncy5oIHRvIFNldHRpbmdzLnlhbWwuIERlZmF1bHQgdmFsdWVzIGVuY29kZWQgaW4gU2V0dGlu Z3NEZWZhdWx0VmFsdWVzLmgKKworICAgICAgICAqIHBhZ2UvUGVyZm9ybWFuY2VNb25pdG9yLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlBlcmZvcm1hbmNlTW9uaXRvcjo6UGVyZm9ybWFuY2VNb25p dG9yKToKKyAgICAgICAgKFdlYkNvcmU6OlBlcmZvcm1hbmNlTW9uaXRvcjo6ZGlkRmluaXNoTG9h ZCk6CisgICAgICAgIChXZWJDb3JlOjpQZXJmb3JtYW5jZU1vbml0b3I6OmFjdGl2aXR5U3RhdGVD aGFuZ2VkKToKKyAgICAgICAgQWNjZXNzIHRoZSBzZXR0aW5ncyB2aWEgbV9wYWdlLnNldHRpbmdz KCkuIFVwZGF0ZSBjb25zdGFudHMgdG8gdXNlIGNvbnN0ZXhwci4KKwogMjAyMC0wOC0yOCAgU2lt b24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBEZWJ1ZyBldmVu dCByZWdpb25zIHNob3VsZCBwYWludCB0aGUgaW50ZXJhY3RpdmUgcmVnaW9uCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wYWdlL0RlcHJlY2F0ZWRHbG9iYWxTZXR0aW5ncy5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3BhZ2UvRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzLmgJKHJldmlzaW9u IDI2NjMxMikKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdz LmgJKHdvcmtpbmcgY29weSkKQEAgLTM5LDEzICszOSw2IEBAIHB1YmxpYzoKICAgICBzdGF0aWMg Ym9vbCBzaG91bGRVc2VIaWdoUmVzb2x1dGlvblRpbWVycygpIHsgcmV0dXJuIGdTaG91bGRVc2VI aWdoUmVzb2x1dGlvblRpbWVyczsgfQogI2VuZGlmCiAKLSAgICBzdGF0aWMgYm9vbCBpc1Bvc3RM b2FkQ1BVVXNhZ2VNZWFzdXJlbWVudEVuYWJsZWQoKTsKLSAgICBzdGF0aWMgYm9vbCBpc1Bvc3RC YWNrZ3JvdW5kaW5nQ1BVVXNhZ2VNZWFzdXJlbWVudEVuYWJsZWQoKTsKLSAgICBzdGF0aWMgYm9v bCBpc1BlckFjdGl2aXR5U3RhdGVDUFVVc2FnZU1lYXN1cmVtZW50RW5hYmxlZCgpOwotCi0gICAg c3RhdGljIGJvb2wgaXNQb3N0TG9hZE1lbW9yeVVzYWdlTWVhc3VyZW1lbnRFbmFibGVkKCk7Ci0g ICAgc3RhdGljIGJvb2wgaXNQb3N0QmFja2dyb3VuZGluZ01lbW9yeVVzYWdlTWVhc3VyZW1lbnRF bmFibGVkKCk7Ci0KICAgICBzdGF0aWMgYm9vbCBnbG9iYWxDb25zdFJlZGVjbGFyYXRpb25TaG91 bGRUaHJvdygpOwogCiAjaWYgVVNFKEFWRk9VTkRBVElPTikKQEAgLTEzOCw0OSArMTMxLDQgQEAg cHJpdmF0ZToKICAgICBzdGF0aWMgYm9vbCBnQWxsb3dzQW55U1NMQ2VydGlmaWNhdGU7CiB9Owog Ci1pbmxpbmUgYm9vbCBEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6OmlzUG9zdExvYWRDUFVVc2Fn ZU1lYXN1cmVtZW50RW5hYmxlZCgpCi17Ci0jaWYgUExBVEZPUk0oQ09DT0EpCi0gICAgcmV0dXJu IHRydWU7Ci0jZWxzZQotICAgIHJldHVybiBmYWxzZTsKLSNlbmRpZgotfQotCi1pbmxpbmUgYm9v bCBEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6OmlzUG9zdEJhY2tncm91bmRpbmdDUFVVc2FnZU1l YXN1cmVtZW50RW5hYmxlZCgpCi17Ci0jaWYgUExBVEZPUk0oTUFDKQotICAgIHJldHVybiB0cnVl OwotI2Vsc2UKLSAgICByZXR1cm4gZmFsc2U7Ci0jZW5kaWYKLX0KLQotaW5saW5lIGJvb2wgRGVw cmVjYXRlZEdsb2JhbFNldHRpbmdzOjppc1BlckFjdGl2aXR5U3RhdGVDUFVVc2FnZU1lYXN1cmVt ZW50RW5hYmxlZCgpCi17Ci0jaWYgUExBVEZPUk0oTUFDKQotICAgIHJldHVybiB0cnVlOwotI2Vs c2UKLSAgICByZXR1cm4gZmFsc2U7Ci0jZW5kaWYKLX0KLQotaW5saW5lIGJvb2wgRGVwcmVjYXRl ZEdsb2JhbFNldHRpbmdzOjppc1Bvc3RMb2FkTWVtb3J5VXNhZ2VNZWFzdXJlbWVudEVuYWJsZWQo KQotewotI2lmIFBMQVRGT1JNKENPQ09BKQotICAgIHJldHVybiB0cnVlOwotI2Vsc2UKLSAgICBy ZXR1cm4gZmFsc2U7Ci0jZW5kaWYKLX0KLQotaW5saW5lIGJvb2wgRGVwcmVjYXRlZEdsb2JhbFNl dHRpbmdzOjppc1Bvc3RCYWNrZ3JvdW5kaW5nTWVtb3J5VXNhZ2VNZWFzdXJlbWVudEVuYWJsZWQo KQotewotI2lmIFBMQVRGT1JNKE1BQykKLSAgICByZXR1cm4gdHJ1ZTsKLSNlbHNlCi0gICAgcmV0 dXJuIGZhbHNlOwotI2VuZGlmCi19Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2VNb25pdG9yLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNlTW9uaXRvci5jcHAJKHJldmlzaW9uIDI2NjMx MikKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2VNb25pdG9yLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMjgsNyArMjgsNiBAQAogCiAjaW5jbHVkZSAiQ2hyb21lLmgiCiAjaW5jbHVk ZSAiQ2hyb21lQ2xpZW50LmgiCi0jaW5jbHVkZSAiRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzLmgi CiAjaW5jbHVkZSAiRGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQuaCIKICNpbmNsdWRlICJEaWFnbm9z dGljTG9nZ2luZ0tleXMuaCIKICNpbmNsdWRlICJGcmFtZS5oIgpAQCAtMzYsMjMgKzM1LDI0IEBA CiAjaW5jbHVkZSAiUGFnZS5oIgogI2luY2x1ZGUgIlBlcmZvcm1hbmNlTG9nZ2luZy5oIgogI2lu Y2x1ZGUgIlJlZ2lzdHJhYmxlRG9tYWluLmgiCisjaW5jbHVkZSAiU2V0dGluZ3MuaCIKIAogbmFt ZXNwYWNlIFdlYkNvcmUgewogCiAjZGVmaW5lIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoY2hhbm5l bCwgZm10LCAuLi4pIFJFTEVBU0VfTE9HX0lGKG1fcGFnZS5pc0Fsd2F5c09uTG9nZ2luZ0FsbG93 ZWQoKSwgY2hhbm5lbCwgIiVwIC0gUGVyZm9ybWFuY2VNb25pdG9yOjoiIGZtdCwgdGhpcywgIyNf X1ZBX0FSR1NfXykKIAotc3RhdGljIGNvbnN0IFNlY29uZHMgY3B1VXNhZ2VNZWFzdXJlbWVudERl bGF5IHsgNV9zIH07Ci1zdGF0aWMgY29uc3QgU2Vjb25kcyBwb3N0TG9hZENQVVVzYWdlTWVhc3Vy ZW1lbnREdXJhdGlvbiB7IDEwX3MgfTsKLXN0YXRpYyBjb25zdCBTZWNvbmRzIGJhY2tncm91bmRD UFVVc2FnZU1lYXN1cmVtZW50RHVyYXRpb24geyA1X21pbiB9Owotc3RhdGljIGNvbnN0IFNlY29u ZHMgY3B1VXNhZ2VTYW1wbGluZ0ludGVydmFsIHsgMTBfbWluIH07CitzdGF0aWMgY29uc3RleHBy IGNvbnN0IFNlY29uZHMgY3B1VXNhZ2VNZWFzdXJlbWVudERlbGF5IHsgNV9zIH07CitzdGF0aWMg Y29uc3RleHByIGNvbnN0IFNlY29uZHMgcG9zdExvYWRDUFVVc2FnZU1lYXN1cmVtZW50RHVyYXRp b24geyAxMF9zIH07CitzdGF0aWMgY29uc3RleHByIGNvbnN0IFNlY29uZHMgYmFja2dyb3VuZENQ VVVzYWdlTWVhc3VyZW1lbnREdXJhdGlvbiB7IDVfbWluIH07CitzdGF0aWMgY29uc3RleHByIGNv bnN0IFNlY29uZHMgY3B1VXNhZ2VTYW1wbGluZ0ludGVydmFsIHsgMTBfbWluIH07CiAKLXN0YXRp YyBjb25zdCBTZWNvbmRzIG1lbW9yeVVzYWdlTWVhc3VyZW1lbnREZWxheSB7IDEwX3MgfTsKK3N0 YXRpYyBjb25zdGV4cHIgY29uc3QgU2Vjb25kcyBtZW1vcnlVc2FnZU1lYXN1cmVtZW50RGVsYXkg eyAxMF9zIH07CiAKLXN0YXRpYyBjb25zdCBTZWNvbmRzIGRlbGF5QmVmb3JlUHJvY2Vzc01heUJl Y29tZUluYWN0aXZlIHsgOF9taW4gfTsKK3N0YXRpYyBjb25zdGV4cHIgY29uc3QgU2Vjb25kcyBk ZWxheUJlZm9yZVByb2Nlc3NNYXlCZWNvbWVJbmFjdGl2ZSB7IDhfbWluIH07CiAKLXN0YXRpYyBj b25zdCBkb3VibGUgcG9zdFBhZ2VMb2FkQ1BVVXNhZ2VEb21haW5SZXBvcnRpbmdUaHJlc2hvbGQg eyAyMC4wIH07IC8vIFJlcG9ydGluZyBwYWdlcyB1c2luZyBvdmVyIDIwJSBDUFUgaXMgcm91Z2hs eSBlcXVpdmFsZW50IHRvIHJlcG9ydGluZyB0aGUgMTAlIHdvcnN0IHBhZ2VzLgorc3RhdGljIGNv bnN0ZXhwciBjb25zdCBkb3VibGUgcG9zdFBhZ2VMb2FkQ1BVVXNhZ2VEb21haW5SZXBvcnRpbmdU aHJlc2hvbGQgeyAyMC4wIH07IC8vIFJlcG9ydGluZyBwYWdlcyB1c2luZyBvdmVyIDIwJSBDUFUg aXMgcm91Z2hseSBlcXVpdmFsZW50IHRvIHJlcG9ydGluZyB0aGUgMTAlIHdvcnN0IHBhZ2VzLgog I2lmICFQTEFURk9STShJT1NfRkFNSUxZKQotc3RhdGljIGNvbnN0IHVpbnQ2NF90IHBvc3RQYWdl TG9hZE1lbW9yeVVzYWdlRG9tYWluUmVwb3J0aW5nVGhyZXNob2xkIHsgMjA0OCAqIE1CIH07Citz dGF0aWMgY29uc3RleHByIGNvbnN0IHVpbnQ2NF90IHBvc3RQYWdlTG9hZE1lbW9yeVVzYWdlRG9t YWluUmVwb3J0aW5nVGhyZXNob2xkIHsgMjA0OCAqIE1CIH07CiAjZW5kaWYKIAogc3RhdGljIGlu bGluZSBBY3Rpdml0eVN0YXRlRm9yQ1BVU2FtcGxpbmcgYWN0aXZpdHlTdGF0ZUZvckNQVVNhbXBs aW5nKE9wdGlvblNldDxBY3Rpdml0eVN0YXRlOjpGbGFnPiBzdGF0ZSkKQEAgLTc1LDcgKzc1LDcg QEAgUGVyZm9ybWFuY2VNb25pdG9yOjpQZXJmb3JtYW5jZU1vbml0b3IoUAogewogICAgIEFTU0VS VCghcGFnZS5pc1V0aWxpdHlQYWdlKCkpOwogCi0gICAgaWYgKERlcHJlY2F0ZWRHbG9iYWxTZXR0 aW5nczo6aXNQZXJBY3Rpdml0eVN0YXRlQ1BVVXNhZ2VNZWFzdXJlbWVudEVuYWJsZWQoKSkgewor ICAgIGlmIChwYWdlLnNldHRpbmdzKCkuaXNQZXJBY3Rpdml0eVN0YXRlQ1BVVXNhZ2VNZWFzdXJl bWVudEVuYWJsZWQoKSkgewogICAgICAgICBtX3BlckFjdGl2aXR5U3RhdGVDUFVUaW1lID0gQ1BV VGltZTo6Z2V0KCk7CiAgICAgICAgIG1fcGVyQWN0aXZpdHlTdGF0ZUNQVVVzYWdlVGltZXIuc3Rh cnRSZXBlYXRpbmcoY3B1VXNhZ2VTYW1wbGluZ0ludGVydmFsKTsKICAgICB9CkBAIC05MSwxMyAr OTEsMTMgQEAgdm9pZCBQZXJmb3JtYW5jZU1vbml0b3I6OmRpZFN0YXJ0UHJvdmlzaQogdm9pZCBQ ZXJmb3JtYW5jZU1vbml0b3I6OmRpZEZpbmlzaExvYWQoKQogewogICAgIC8vIE9ubHkgZG8gcG9z dC1sb2FkIENQVSB1c2FnZSBtZWFzdXJlbWVudCBpZiB0aGVyZSBpcyBhIHNpbmdsZSBQYWdlIGlu IHRoZSBwcm9jZXNzIGluIG9yZGVyIHRvIHJlZHVjZSBub2lzZS4KLSAgICBpZiAoRGVwcmVjYXRl ZEdsb2JhbFNldHRpbmdzOjppc1Bvc3RMb2FkQ1BVVXNhZ2VNZWFzdXJlbWVudEVuYWJsZWQoKSAm JiBtX3BhZ2UuaXNPbmx5Tm9uVXRpbGl0eVBhZ2UoKSkgeworICAgIGlmIChtX3BhZ2Uuc2V0dGlu Z3MoKS5pc1Bvc3RMb2FkQ1BVVXNhZ2VNZWFzdXJlbWVudEVuYWJsZWQoKSAmJiBtX3BhZ2UuaXNP bmx5Tm9uVXRpbGl0eVBhZ2UoKSkgewogICAgICAgICBtX3Bvc3RMb2FkQ1BVVGltZSA9IFdURjo6 bnVsbG9wdDsKICAgICAgICAgbV9wb3N0UGFnZUxvYWRDUFVVc2FnZVRpbWVyLnN0YXJ0T25lU2hv dChjcHVVc2FnZU1lYXN1cmVtZW50RGVsYXkpOwogICAgIH0KIAogICAgIC8vIExpa2V3aXNlIGZv ciBwb3N0LWxvYWQgbWVtb3J5IHVzYWdlIG1lYXN1cmVtZW50LgotICAgIGlmIChEZXByZWNhdGVk R2xvYmFsU2V0dGluZ3M6OmlzUG9zdExvYWRNZW1vcnlVc2FnZU1lYXN1cmVtZW50RW5hYmxlZCgp ICYmIG1fcGFnZS5pc09ubHlOb25VdGlsaXR5UGFnZSgpKQorICAgIGlmIChtX3BhZ2Uuc2V0dGlu Z3MoKS5pc1Bvc3RMb2FkTWVtb3J5VXNhZ2VNZWFzdXJlbWVudEVuYWJsZWQoKSAmJiBtX3BhZ2Uu aXNPbmx5Tm9uVXRpbGl0eVBhZ2UoKSkKICAgICAgICAgbV9wb3N0UGFnZUxvYWRNZW1vcnlVc2Fn ZVRpbWVyLnN0YXJ0T25lU2hvdChtZW1vcnlVc2FnZU1lYXN1cmVtZW50RGVsYXkpOwogfQogCkBA IC0xMDcsNyArMTA3LDcgQEAgdm9pZCBQZXJmb3JtYW5jZU1vbml0b3I6OmFjdGl2aXR5U3RhdGVD aAogICAgIGJvb2wgdmlzaWJpbGl0eUNoYW5nZWQgPSBjaGFuZ2VkLmNvbnRhaW5zKEFjdGl2aXR5 U3RhdGU6OklzVmlzaWJsZSk7CiAKICAgICAvLyBNZWFzdXJlIENQVSB1c2FnZSBvZiBwYWdlcyB3 aGVuIHRoZXkgYXJlIG5vIGxvbmdlciB2aXNpYmxlLgotICAgIGlmIChEZXByZWNhdGVkR2xvYmFs U2V0dGluZ3M6OmlzUG9zdEJhY2tncm91bmRpbmdDUFVVc2FnZU1lYXN1cmVtZW50RW5hYmxlZCgp ICYmIHZpc2liaWxpdHlDaGFuZ2VkKSB7CisgICAgaWYgKG1fcGFnZS5zZXR0aW5ncygpLmlzUG9z dEJhY2tncm91bmRpbmdDUFVVc2FnZU1lYXN1cmVtZW50RW5hYmxlZCgpICYmIHZpc2liaWxpdHlD aGFuZ2VkKSB7CiAgICAgICAgIG1fcG9zdEJhY2tncm91bmRpbmdDUFVUaW1lID0gV1RGOjpudWxs b3B0OwogICAgICAgICBpZiAobmV3U3RhdGUgJiBBY3Rpdml0eVN0YXRlOjpJc1Zpc2libGUpCiAg ICAgICAgICAgICBtX3Bvc3RCYWNrZ3JvdW5kaW5nQ1BVVXNhZ2VUaW1lci5zdG9wKCk7CkBAIC0x MTUsNyArMTE1LDcgQEAgdm9pZCBQZXJmb3JtYW5jZU1vbml0b3I6OmFjdGl2aXR5U3RhdGVDaAog ICAgICAgICAgICAgbV9wb3N0QmFja2dyb3VuZGluZ0NQVVVzYWdlVGltZXIuc3RhcnRPbmVTaG90 KGNwdVVzYWdlTWVhc3VyZW1lbnREZWxheSk7CiAgICAgfQogCi0gICAgaWYgKERlcHJlY2F0ZWRH bG9iYWxTZXR0aW5nczo6aXNQZXJBY3Rpdml0eVN0YXRlQ1BVVXNhZ2VNZWFzdXJlbWVudEVuYWJs ZWQoKSkgeworICAgIGlmIChtX3BhZ2Uuc2V0dGluZ3MoKS5pc1BlckFjdGl2aXR5U3RhdGVDUFVV c2FnZU1lYXN1cmVtZW50RW5hYmxlZCgpKSB7CiAgICAgICAgIC8vIElmIHZpc2liaWxpdHkgY2hh bmdlZCB0aGVuIHJlcG9ydCBDUFUgdXNhZ2UgcmlnaHQgYXdheSBiZWNhdXNlIENQVSB1c2FnZSBp cyBjb25uZWN0ZWQgdG8gdmlzaWJpbGl0eSBzdGF0ZS4KICAgICAgICAgYXV0byBvbGRBY3Rpdml0 eVN0YXRlRm9yQ1BVU2FtcGxpbmcgPSBhY3Rpdml0eVN0YXRlRm9yQ1BVU2FtcGxpbmcob2xkU3Rh dGUpOwogICAgICAgICBpZiAob2xkQWN0aXZpdHlTdGF0ZUZvckNQVVNhbXBsaW5nICE9IGFjdGl2 aXR5U3RhdGVGb3JDUFVTYW1wbGluZyhuZXdTdGF0ZSkpIHsKQEAgLTEyNCw3ICsxMjQsNyBAQCB2 b2lkIFBlcmZvcm1hbmNlTW9uaXRvcjo6YWN0aXZpdHlTdGF0ZUNoCiAgICAgICAgIH0KICAgICB9 CiAKLSAgICBpZiAoRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzOjppc1Bvc3RCYWNrZ3JvdW5kaW5n TWVtb3J5VXNhZ2VNZWFzdXJlbWVudEVuYWJsZWQoKSAmJiB2aXNpYmlsaXR5Q2hhbmdlZCkgewor ICAgIGlmIChtX3BhZ2Uuc2V0dGluZ3MoKS5pc1Bvc3RCYWNrZ3JvdW5kaW5nTWVtb3J5VXNhZ2VN ZWFzdXJlbWVudEVuYWJsZWQoKSAmJiB2aXNpYmlsaXR5Q2hhbmdlZCkgewogICAgICAgICBpZiAo bmV3U3RhdGUgJiBBY3Rpdml0eVN0YXRlOjpJc1Zpc2libGUpCiAgICAgICAgICAgICBtX3Bvc3RC YWNrZ3JvdW5kaW5nTWVtb3J5VXNhZ2VUaW1lci5zdG9wKCk7CiAgICAgICAgIGVsc2UgaWYgKG1f cGFnZS5pc09ubHlOb25VdGlsaXR5UGFnZSgpKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9T ZXR0aW5ncy55YW1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3Mu eWFtbAkocmV2aXNpb24gMjY2MzEyKQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy55 YW1sCSh3b3JraW5nIGNvcHkpCkBAIC05ODMsNiArOTgzLDIxIEBAIGRhdGVUaW1lSW5wdXRzRWRp dGFibGVDb21wb25lbnRzRW5hYmxlZDoKICAgaW5pdGlhbDogZmFsc2UKICAgY29uZGl0aW9uYWw6 IERBVEVfQU5EX1RJTUVfSU5QVVRfVFlQRVMKIAoraXNQb3N0TG9hZENQVVVzYWdlTWVhc3VyZW1l bnRFbmFibGVkOgorICBpbml0aWFsOiBkZWZhdWx0UG9zdExvYWRDUFVVc2FnZU1lYXN1cmVtZW50 RW5hYmxlZAorCitpc1Bvc3RMb2FkTWVtb3J5VXNhZ2VNZWFzdXJlbWVudEVuYWJsZWQ6CisgIGlu aXRpYWw6IGRlZmF1bHRQb3N0TG9hZE1lbW9yeVVzYWdlTWVhc3VyZW1lbnRFbmFibGVkCisKK2lz UG9zdEJhY2tncm91bmRpbmdDUFVVc2FnZU1lYXN1cmVtZW50RW5hYmxlZDoKKyAgaW5pdGlhbDog ZGVmYXVsdFBvc3RCYWNrZ3JvdW5kaW5nQ1BVVXNhZ2VNZWFzdXJlbWVudEVuYWJsZWQKKworaXNQ b3N0QmFja2dyb3VuZGluZ01lbW9yeVVzYWdlTWVhc3VyZW1lbnRFbmFibGVkOgorICBpbml0aWFs OiBkZWZhdWx0UG9zdEJhY2tncm91bmRpbmdNZW1vcnlVc2FnZU1lYXN1cmVtZW50RW5hYmxlZAor Citpc1BlckFjdGl2aXR5U3RhdGVDUFVVc2FnZU1lYXN1cmVtZW50RW5hYmxlZDoKKyAgaW5pdGlh bDogZGVmYXVsdFBlckFjdGl2aXR5U3RhdGVDUFVVc2FnZU1lYXN1cmVtZW50RW5hYmxlZAorCiAj IERlcHJlY2F0ZWQKIAogaWNlQ2FuZGlkYXRlRmlsdGVyaW5nRW5hYmxlZDoKQEAgLTEwMDYsNCAr MTAyMSw1IEBAIHNob3VsZFVzZVNlcnZpY2VXb3JrZXJTaG9ydFRpbWVvdXQ6CiAKICMgQ2xpZW50 cyBzaG91bGQgdXNlIHBlci1uYXZpZ2F0aW9uICJhbGxvd3NDb250ZW50SmF2YVNjcmlwdCIgcG9s aWNpZXMgaW5zdGVhZAogc2NyaXB0TWFya3VwRW5hYmxlZDoKLSAgICBpbml0aWFsOiB0cnVlCisg IGluaXRpYWw6IHRydWUKKwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5nc0RlZmF1 bHRWYWx1ZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzRGVm YXVsdFZhbHVlcy5oCShyZXZpc2lvbiAyNjYzMTIpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1Nl dHRpbmdzRGVmYXVsdFZhbHVlcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMTgsNCArMTE4LDIzIEBA IHN0YXRpYyBjb25zdCBib29sIGRlZmF1bHRBcHBsZVBheUVuYWJsZWQKIHN0YXRpYyBjb25zdCBi b29sIGRlZmF1bHRBcHBsZVBheUVuYWJsZWQgPSBmYWxzZTsKICNlbmRpZgogCisKKyNpZiBQTEFU Rk9STShDT0NPQSkKK3N0YXRpYyBjb25zdGV4cHIgY29uc3QgYm9vbCBkZWZhdWx0UG9zdExvYWRD UFVVc2FnZU1lYXN1cmVtZW50RW5hYmxlZCA9IHRydWU7CitzdGF0aWMgY29uc3RleHByIGNvbnN0 IGJvb2wgZGVmYXVsdFBvc3RMb2FkTWVtb3J5VXNhZ2VNZWFzdXJlbWVudEVuYWJsZWQgPSB0cnVl OworI2Vsc2UKK3N0YXRpYyBjb25zdGV4cHIgY29uc3QgYm9vbCBkZWZhdWx0UG9zdExvYWRDUFVV c2FnZU1lYXN1cmVtZW50RW5hYmxlZCA9IGZhbHNlOworc3RhdGljIGNvbnN0ZXhwciBjb25zdCBi b29sIGRlZmF1bHRQb3N0TG9hZE1lbW9yeVVzYWdlTWVhc3VyZW1lbnRFbmFibGVkID0gZmFsc2U7 CisjZW5kaWYKKworI2lmIFBMQVRGT1JNKE1BQykKK3N0YXRpYyBjb25zdGV4cHIgY29uc3QgYm9v bCBkZWZhdWx0UG9zdEJhY2tncm91bmRpbmdDUFVVc2FnZU1lYXN1cmVtZW50RW5hYmxlZCA9IHRy dWU7CitzdGF0aWMgY29uc3RleHByIGNvbnN0IGJvb2wgZGVmYXVsdFBlckFjdGl2aXR5U3RhdGVD UFVVc2FnZU1lYXN1cmVtZW50RW5hYmxlZCA9IHRydWU7CitzdGF0aWMgY29uc3RleHByIGNvbnN0 IGJvb2wgZGVmYXVsdFBvc3RCYWNrZ3JvdW5kaW5nTWVtb3J5VXNhZ2VNZWFzdXJlbWVudEVuYWJs ZWQgPSB0cnVlOworI2Vsc2UKK3N0YXRpYyBjb25zdGV4cHIgY29uc3QgYm9vbCBkZWZhdWx0UG9z dEJhY2tncm91bmRpbmdDUFVVc2FnZU1lYXN1cmVtZW50RW5hYmxlZCA9IGZhbHNlCitzdGF0aWMg Y29uc3RleHByIGNvbnN0IGJvb2wgZGVmYXVsdFBlckFjdGl2aXR5U3RhdGVDUFVVc2FnZU1lYXN1 cmVtZW50RW5hYmxlZCA9IGZhbHNlOworc3RhdGljIGNvbnN0ZXhwciBjb25zdCBib29sIGRlZmF1 bHRQb3N0QmFja2dyb3VuZGluZ01lbW9yeVVzYWdlTWVhc3VyZW1lbnRFbmFibGVkID0gZmFsc2U7 CisjZW5kaWYKKwogfQo= 407540 2020-08-29 08:51:40 -0700 2020-08-29 17:05:09 -0700 Patch bug-215963-20200829085139.patch text/plain 11133 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2NjMyNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDIwLTA4LTI5ICBTYW0gV2Vp bmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIFBlcmZvcm1hbmNlTW9uaXRv ciByZWxhdGVkIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5ncyB0byBTZXR0aW5ncworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE1OTYzCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIFBlcmZvcm1hbmNlTW9u aXRvciByZWxhdGVkIHVzZXMgb2YgRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzIGNhbiBlYXNpbHkg YmUgbW92ZWQgdG8gU2V0dGluZ3MsIGFzIFBlcmZvcm1hbmNlTW9uaXRvciAKKyAgICAgICAgaGFz IGEgUGFnZSByZWZlcmVuY2UuIAorCisgICAgICAgICogcGFnZS9EZXByZWNhdGVkR2xvYmFsU2V0 dGluZ3MuaDoKKyAgICAgICAgKFdlYkNvcmU6OkRlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6aXNQ b3N0TG9hZENQVVVzYWdlTWVhc3VyZW1lbnRFbmFibGVkKTogRGVsZXRlZC4KKyAgICAgICAgKFdl YkNvcmU6OkRlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6aXNQb3N0QmFja2dyb3VuZGluZ0NQVVVz YWdlTWVhc3VyZW1lbnRFbmFibGVkKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkRlcHJl Y2F0ZWRHbG9iYWxTZXR0aW5nczo6aXNQZXJBY3Rpdml0eVN0YXRlQ1BVVXNhZ2VNZWFzdXJlbWVu dEVuYWJsZWQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6RGVwcmVjYXRlZEdsb2JhbFNl dHRpbmdzOjppc1Bvc3RMb2FkTWVtb3J5VXNhZ2VNZWFzdXJlbWVudEVuYWJsZWQpOiBEZWxldGVk LgorICAgICAgICAoV2ViQ29yZTo6RGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzOjppc1Bvc3RCYWNr Z3JvdW5kaW5nTWVtb3J5VXNhZ2VNZWFzdXJlbWVudEVuYWJsZWQpOiBEZWxldGVkLgorICAgICAg ICAqIHBhZ2UvU2V0dGluZ3MueWFtbDoKKyAgICAgICAgKiBwYWdlL1NldHRpbmdzRGVmYXVsdFZh bHVlcy5oOgorICAgICAgICBNb3ZlZCBzZXR0aW5ncyBmcm9tIERlcHJlY2F0ZWRHbG9iYWxTZXR0 aW5ncy5oIHRvIFNldHRpbmdzLnlhbWwuIERlZmF1bHQgdmFsdWVzIGVuY29kZWQgaW4gU2V0dGlu Z3NEZWZhdWx0VmFsdWVzLmgKKworICAgICAgICAqIHBhZ2UvUGVyZm9ybWFuY2VNb25pdG9yLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlBlcmZvcm1hbmNlTW9uaXRvcjo6UGVyZm9ybWFuY2VNb25p dG9yKToKKyAgICAgICAgKFdlYkNvcmU6OlBlcmZvcm1hbmNlTW9uaXRvcjo6ZGlkRmluaXNoTG9h ZCk6CisgICAgICAgIChXZWJDb3JlOjpQZXJmb3JtYW5jZU1vbml0b3I6OmFjdGl2aXR5U3RhdGVD aGFuZ2VkKToKKyAgICAgICAgQWNjZXNzIHRoZSBzZXR0aW5ncyB2aWEgbV9wYWdlLnNldHRpbmdz KCkuIFVwZGF0ZSBjb25zdGFudHMgdG8gdXNlIGNvbnN0ZXhwci4KKwogMjAyMC0wOC0yOCAgQ2hy aXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFVwZGF0ZSBQYW5uZXJOb2Rl IHRvIHN1cHBvcnQgay1yYXRlIGF1dG9tYXRpb24gb2YgaXRzIEF1ZGlvUGFyYW1zCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wYWdlL0RlcHJlY2F0ZWRHbG9iYWxTZXR0aW5ncy5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzLmgJKHJldmlz aW9uIDI2NjMxMikKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRGVwcmVjYXRlZEdsb2JhbFNldHRp bmdzLmgJKHdvcmtpbmcgY29weSkKQEAgLTM5LDEzICszOSw2IEBAIHB1YmxpYzoKICAgICBzdGF0 aWMgYm9vbCBzaG91bGRVc2VIaWdoUmVzb2x1dGlvblRpbWVycygpIHsgcmV0dXJuIGdTaG91bGRV c2VIaWdoUmVzb2x1dGlvblRpbWVyczsgfQogI2VuZGlmCiAKLSAgICBzdGF0aWMgYm9vbCBpc1Bv c3RMb2FkQ1BVVXNhZ2VNZWFzdXJlbWVudEVuYWJsZWQoKTsKLSAgICBzdGF0aWMgYm9vbCBpc1Bv c3RCYWNrZ3JvdW5kaW5nQ1BVVXNhZ2VNZWFzdXJlbWVudEVuYWJsZWQoKTsKLSAgICBzdGF0aWMg Ym9vbCBpc1BlckFjdGl2aXR5U3RhdGVDUFVVc2FnZU1lYXN1cmVtZW50RW5hYmxlZCgpOwotCi0g ICAgc3RhdGljIGJvb2wgaXNQb3N0TG9hZE1lbW9yeVVzYWdlTWVhc3VyZW1lbnRFbmFibGVkKCk7 Ci0gICAgc3RhdGljIGJvb2wgaXNQb3N0QmFja2dyb3VuZGluZ01lbW9yeVVzYWdlTWVhc3VyZW1l bnRFbmFibGVkKCk7Ci0KICAgICBzdGF0aWMgYm9vbCBnbG9iYWxDb25zdFJlZGVjbGFyYXRpb25T aG91bGRUaHJvdygpOwogCiAjaWYgVVNFKEFWRk9VTkRBVElPTikKQEAgLTEzOCw0OSArMTMxLDQg QEAgcHJpdmF0ZToKICAgICBzdGF0aWMgYm9vbCBnQWxsb3dzQW55U1NMQ2VydGlmaWNhdGU7CiB9 OwogCi1pbmxpbmUgYm9vbCBEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6OmlzUG9zdExvYWRDUFVV c2FnZU1lYXN1cmVtZW50RW5hYmxlZCgpCi17Ci0jaWYgUExBVEZPUk0oQ09DT0EpCi0gICAgcmV0 dXJuIHRydWU7Ci0jZWxzZQotICAgIHJldHVybiBmYWxzZTsKLSNlbmRpZgotfQotCi1pbmxpbmUg Ym9vbCBEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6OmlzUG9zdEJhY2tncm91bmRpbmdDUFVVc2Fn ZU1lYXN1cmVtZW50RW5hYmxlZCgpCi17Ci0jaWYgUExBVEZPUk0oTUFDKQotICAgIHJldHVybiB0 cnVlOwotI2Vsc2UKLSAgICByZXR1cm4gZmFsc2U7Ci0jZW5kaWYKLX0KLQotaW5saW5lIGJvb2wg RGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzOjppc1BlckFjdGl2aXR5U3RhdGVDUFVVc2FnZU1lYXN1 cmVtZW50RW5hYmxlZCgpCi17Ci0jaWYgUExBVEZPUk0oTUFDKQotICAgIHJldHVybiB0cnVlOwot I2Vsc2UKLSAgICByZXR1cm4gZmFsc2U7Ci0jZW5kaWYKLX0KLQotaW5saW5lIGJvb2wgRGVwcmVj YXRlZEdsb2JhbFNldHRpbmdzOjppc1Bvc3RMb2FkTWVtb3J5VXNhZ2VNZWFzdXJlbWVudEVuYWJs ZWQoKQotewotI2lmIFBMQVRGT1JNKENPQ09BKQotICAgIHJldHVybiB0cnVlOwotI2Vsc2UKLSAg ICByZXR1cm4gZmFsc2U7Ci0jZW5kaWYKLX0KLQotaW5saW5lIGJvb2wgRGVwcmVjYXRlZEdsb2Jh bFNldHRpbmdzOjppc1Bvc3RCYWNrZ3JvdW5kaW5nTWVtb3J5VXNhZ2VNZWFzdXJlbWVudEVuYWJs ZWQoKQotewotI2lmIFBMQVRGT1JNKE1BQykKLSAgICByZXR1cm4gdHJ1ZTsKLSNlbHNlCi0gICAg cmV0dXJuIGZhbHNlOwotI2VuZGlmCi19Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2VNb25pdG9yLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNlTW9uaXRvci5jcHAJKHJldmlzaW9uIDI2 NjMxMikKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2VNb25pdG9yLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMjgsNyArMjgsNiBAQAogCiAjaW5jbHVkZSAiQ2hyb21lLmgiCiAjaW5j bHVkZSAiQ2hyb21lQ2xpZW50LmgiCi0jaW5jbHVkZSAiRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdz LmgiCiAjaW5jbHVkZSAiRGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQuaCIKICNpbmNsdWRlICJEaWFn bm9zdGljTG9nZ2luZ0tleXMuaCIKICNpbmNsdWRlICJGcmFtZS5oIgpAQCAtMzYsMjMgKzM1LDI0 IEBACiAjaW5jbHVkZSAiUGFnZS5oIgogI2luY2x1ZGUgIlBlcmZvcm1hbmNlTG9nZ2luZy5oIgog I2luY2x1ZGUgIlJlZ2lzdHJhYmxlRG9tYWluLmgiCisjaW5jbHVkZSAiU2V0dGluZ3MuaCIKIAog bmFtZXNwYWNlIFdlYkNvcmUgewogCiAjZGVmaW5lIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoY2hh bm5lbCwgZm10LCAuLi4pIFJFTEVBU0VfTE9HX0lGKG1fcGFnZS5pc0Fsd2F5c09uTG9nZ2luZ0Fs bG93ZWQoKSwgY2hhbm5lbCwgIiVwIC0gUGVyZm9ybWFuY2VNb25pdG9yOjoiIGZtdCwgdGhpcywg IyNfX1ZBX0FSR1NfXykKIAotc3RhdGljIGNvbnN0IFNlY29uZHMgY3B1VXNhZ2VNZWFzdXJlbWVu dERlbGF5IHsgNV9zIH07Ci1zdGF0aWMgY29uc3QgU2Vjb25kcyBwb3N0TG9hZENQVVVzYWdlTWVh c3VyZW1lbnREdXJhdGlvbiB7IDEwX3MgfTsKLXN0YXRpYyBjb25zdCBTZWNvbmRzIGJhY2tncm91 bmRDUFVVc2FnZU1lYXN1cmVtZW50RHVyYXRpb24geyA1X21pbiB9Owotc3RhdGljIGNvbnN0IFNl Y29uZHMgY3B1VXNhZ2VTYW1wbGluZ0ludGVydmFsIHsgMTBfbWluIH07CitzdGF0aWMgY29uc3Rl eHByIGNvbnN0IFNlY29uZHMgY3B1VXNhZ2VNZWFzdXJlbWVudERlbGF5IHsgNV9zIH07CitzdGF0 aWMgY29uc3RleHByIGNvbnN0IFNlY29uZHMgcG9zdExvYWRDUFVVc2FnZU1lYXN1cmVtZW50RHVy YXRpb24geyAxMF9zIH07CitzdGF0aWMgY29uc3RleHByIGNvbnN0IFNlY29uZHMgYmFja2dyb3Vu ZENQVVVzYWdlTWVhc3VyZW1lbnREdXJhdGlvbiB7IDVfbWluIH07CitzdGF0aWMgY29uc3RleHBy IGNvbnN0IFNlY29uZHMgY3B1VXNhZ2VTYW1wbGluZ0ludGVydmFsIHsgMTBfbWluIH07CiAKLXN0 YXRpYyBjb25zdCBTZWNvbmRzIG1lbW9yeVVzYWdlTWVhc3VyZW1lbnREZWxheSB7IDEwX3MgfTsK K3N0YXRpYyBjb25zdGV4cHIgY29uc3QgU2Vjb25kcyBtZW1vcnlVc2FnZU1lYXN1cmVtZW50RGVs YXkgeyAxMF9zIH07CiAKLXN0YXRpYyBjb25zdCBTZWNvbmRzIGRlbGF5QmVmb3JlUHJvY2Vzc01h eUJlY29tZUluYWN0aXZlIHsgOF9taW4gfTsKK3N0YXRpYyBjb25zdGV4cHIgY29uc3QgU2Vjb25k cyBkZWxheUJlZm9yZVByb2Nlc3NNYXlCZWNvbWVJbmFjdGl2ZSB7IDhfbWluIH07CiAKLXN0YXRp YyBjb25zdCBkb3VibGUgcG9zdFBhZ2VMb2FkQ1BVVXNhZ2VEb21haW5SZXBvcnRpbmdUaHJlc2hv bGQgeyAyMC4wIH07IC8vIFJlcG9ydGluZyBwYWdlcyB1c2luZyBvdmVyIDIwJSBDUFUgaXMgcm91 Z2hseSBlcXVpdmFsZW50IHRvIHJlcG9ydGluZyB0aGUgMTAlIHdvcnN0IHBhZ2VzLgorc3RhdGlj IGNvbnN0ZXhwciBjb25zdCBkb3VibGUgcG9zdFBhZ2VMb2FkQ1BVVXNhZ2VEb21haW5SZXBvcnRp bmdUaHJlc2hvbGQgeyAyMC4wIH07IC8vIFJlcG9ydGluZyBwYWdlcyB1c2luZyBvdmVyIDIwJSBD UFUgaXMgcm91Z2hseSBlcXVpdmFsZW50IHRvIHJlcG9ydGluZyB0aGUgMTAlIHdvcnN0IHBhZ2Vz LgogI2lmICFQTEFURk9STShJT1NfRkFNSUxZKQotc3RhdGljIGNvbnN0IHVpbnQ2NF90IHBvc3RQ YWdlTG9hZE1lbW9yeVVzYWdlRG9tYWluUmVwb3J0aW5nVGhyZXNob2xkIHsgMjA0OCAqIE1CIH07 CitzdGF0aWMgY29uc3RleHByIGNvbnN0IHVpbnQ2NF90IHBvc3RQYWdlTG9hZE1lbW9yeVVzYWdl RG9tYWluUmVwb3J0aW5nVGhyZXNob2xkIHsgMjA0OCAqIE1CIH07CiAjZW5kaWYKIAogc3RhdGlj IGlubGluZSBBY3Rpdml0eVN0YXRlRm9yQ1BVU2FtcGxpbmcgYWN0aXZpdHlTdGF0ZUZvckNQVVNh bXBsaW5nKE9wdGlvblNldDxBY3Rpdml0eVN0YXRlOjpGbGFnPiBzdGF0ZSkKQEAgLTc1LDcgKzc1 LDcgQEAgUGVyZm9ybWFuY2VNb25pdG9yOjpQZXJmb3JtYW5jZU1vbml0b3IoUAogewogICAgIEFT U0VSVCghcGFnZS5pc1V0aWxpdHlQYWdlKCkpOwogCi0gICAgaWYgKERlcHJlY2F0ZWRHbG9iYWxT ZXR0aW5nczo6aXNQZXJBY3Rpdml0eVN0YXRlQ1BVVXNhZ2VNZWFzdXJlbWVudEVuYWJsZWQoKSkg eworICAgIGlmIChwYWdlLnNldHRpbmdzKCkuaXNQZXJBY3Rpdml0eVN0YXRlQ1BVVXNhZ2VNZWFz dXJlbWVudEVuYWJsZWQoKSkgewogICAgICAgICBtX3BlckFjdGl2aXR5U3RhdGVDUFVUaW1lID0g Q1BVVGltZTo6Z2V0KCk7CiAgICAgICAgIG1fcGVyQWN0aXZpdHlTdGF0ZUNQVVVzYWdlVGltZXIu c3RhcnRSZXBlYXRpbmcoY3B1VXNhZ2VTYW1wbGluZ0ludGVydmFsKTsKICAgICB9CkBAIC05MSwx MyArOTEsMTMgQEAgdm9pZCBQZXJmb3JtYW5jZU1vbml0b3I6OmRpZFN0YXJ0UHJvdmlzaQogdm9p ZCBQZXJmb3JtYW5jZU1vbml0b3I6OmRpZEZpbmlzaExvYWQoKQogewogICAgIC8vIE9ubHkgZG8g cG9zdC1sb2FkIENQVSB1c2FnZSBtZWFzdXJlbWVudCBpZiB0aGVyZSBpcyBhIHNpbmdsZSBQYWdl IGluIHRoZSBwcm9jZXNzIGluIG9yZGVyIHRvIHJlZHVjZSBub2lzZS4KLSAgICBpZiAoRGVwcmVj YXRlZEdsb2JhbFNldHRpbmdzOjppc1Bvc3RMb2FkQ1BVVXNhZ2VNZWFzdXJlbWVudEVuYWJsZWQo KSAmJiBtX3BhZ2UuaXNPbmx5Tm9uVXRpbGl0eVBhZ2UoKSkgeworICAgIGlmIChtX3BhZ2Uuc2V0 dGluZ3MoKS5pc1Bvc3RMb2FkQ1BVVXNhZ2VNZWFzdXJlbWVudEVuYWJsZWQoKSAmJiBtX3BhZ2Uu aXNPbmx5Tm9uVXRpbGl0eVBhZ2UoKSkgewogICAgICAgICBtX3Bvc3RMb2FkQ1BVVGltZSA9IFdU Rjo6bnVsbG9wdDsKICAgICAgICAgbV9wb3N0UGFnZUxvYWRDUFVVc2FnZVRpbWVyLnN0YXJ0T25l U2hvdChjcHVVc2FnZU1lYXN1cmVtZW50RGVsYXkpOwogICAgIH0KIAogICAgIC8vIExpa2V3aXNl IGZvciBwb3N0LWxvYWQgbWVtb3J5IHVzYWdlIG1lYXN1cmVtZW50LgotICAgIGlmIChEZXByZWNh dGVkR2xvYmFsU2V0dGluZ3M6OmlzUG9zdExvYWRNZW1vcnlVc2FnZU1lYXN1cmVtZW50RW5hYmxl ZCgpICYmIG1fcGFnZS5pc09ubHlOb25VdGlsaXR5UGFnZSgpKQorICAgIGlmIChtX3BhZ2Uuc2V0 dGluZ3MoKS5pc1Bvc3RMb2FkTWVtb3J5VXNhZ2VNZWFzdXJlbWVudEVuYWJsZWQoKSAmJiBtX3Bh Z2UuaXNPbmx5Tm9uVXRpbGl0eVBhZ2UoKSkKICAgICAgICAgbV9wb3N0UGFnZUxvYWRNZW1vcnlV c2FnZVRpbWVyLnN0YXJ0T25lU2hvdChtZW1vcnlVc2FnZU1lYXN1cmVtZW50RGVsYXkpOwogfQog CkBAIC0xMDcsNyArMTA3LDcgQEAgdm9pZCBQZXJmb3JtYW5jZU1vbml0b3I6OmFjdGl2aXR5U3Rh dGVDaAogICAgIGJvb2wgdmlzaWJpbGl0eUNoYW5nZWQgPSBjaGFuZ2VkLmNvbnRhaW5zKEFjdGl2 aXR5U3RhdGU6OklzVmlzaWJsZSk7CiAKICAgICAvLyBNZWFzdXJlIENQVSB1c2FnZSBvZiBwYWdl cyB3aGVuIHRoZXkgYXJlIG5vIGxvbmdlciB2aXNpYmxlLgotICAgIGlmIChEZXByZWNhdGVkR2xv YmFsU2V0dGluZ3M6OmlzUG9zdEJhY2tncm91bmRpbmdDUFVVc2FnZU1lYXN1cmVtZW50RW5hYmxl ZCgpICYmIHZpc2liaWxpdHlDaGFuZ2VkKSB7CisgICAgaWYgKG1fcGFnZS5zZXR0aW5ncygpLmlz UG9zdEJhY2tncm91bmRpbmdDUFVVc2FnZU1lYXN1cmVtZW50RW5hYmxlZCgpICYmIHZpc2liaWxp dHlDaGFuZ2VkKSB7CiAgICAgICAgIG1fcG9zdEJhY2tncm91bmRpbmdDUFVUaW1lID0gV1RGOjpu dWxsb3B0OwogICAgICAgICBpZiAobmV3U3RhdGUgJiBBY3Rpdml0eVN0YXRlOjpJc1Zpc2libGUp CiAgICAgICAgICAgICBtX3Bvc3RCYWNrZ3JvdW5kaW5nQ1BVVXNhZ2VUaW1lci5zdG9wKCk7CkBA IC0xMTUsNyArMTE1LDcgQEAgdm9pZCBQZXJmb3JtYW5jZU1vbml0b3I6OmFjdGl2aXR5U3RhdGVD aAogICAgICAgICAgICAgbV9wb3N0QmFja2dyb3VuZGluZ0NQVVVzYWdlVGltZXIuc3RhcnRPbmVT aG90KGNwdVVzYWdlTWVhc3VyZW1lbnREZWxheSk7CiAgICAgfQogCi0gICAgaWYgKERlcHJlY2F0 ZWRHbG9iYWxTZXR0aW5nczo6aXNQZXJBY3Rpdml0eVN0YXRlQ1BVVXNhZ2VNZWFzdXJlbWVudEVu YWJsZWQoKSkgeworICAgIGlmIChtX3BhZ2Uuc2V0dGluZ3MoKS5pc1BlckFjdGl2aXR5U3RhdGVD UFVVc2FnZU1lYXN1cmVtZW50RW5hYmxlZCgpKSB7CiAgICAgICAgIC8vIElmIHZpc2liaWxpdHkg Y2hhbmdlZCB0aGVuIHJlcG9ydCBDUFUgdXNhZ2UgcmlnaHQgYXdheSBiZWNhdXNlIENQVSB1c2Fn ZSBpcyBjb25uZWN0ZWQgdG8gdmlzaWJpbGl0eSBzdGF0ZS4KICAgICAgICAgYXV0byBvbGRBY3Rp dml0eVN0YXRlRm9yQ1BVU2FtcGxpbmcgPSBhY3Rpdml0eVN0YXRlRm9yQ1BVU2FtcGxpbmcob2xk U3RhdGUpOwogICAgICAgICBpZiAob2xkQWN0aXZpdHlTdGF0ZUZvckNQVVNhbXBsaW5nICE9IGFj dGl2aXR5U3RhdGVGb3JDUFVTYW1wbGluZyhuZXdTdGF0ZSkpIHsKQEAgLTEyNCw3ICsxMjQsNyBA QCB2b2lkIFBlcmZvcm1hbmNlTW9uaXRvcjo6YWN0aXZpdHlTdGF0ZUNoCiAgICAgICAgIH0KICAg ICB9CiAKLSAgICBpZiAoRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzOjppc1Bvc3RCYWNrZ3JvdW5k aW5nTWVtb3J5VXNhZ2VNZWFzdXJlbWVudEVuYWJsZWQoKSAmJiB2aXNpYmlsaXR5Q2hhbmdlZCkg eworICAgIGlmIChtX3BhZ2Uuc2V0dGluZ3MoKS5pc1Bvc3RCYWNrZ3JvdW5kaW5nTWVtb3J5VXNh Z2VNZWFzdXJlbWVudEVuYWJsZWQoKSAmJiB2aXNpYmlsaXR5Q2hhbmdlZCkgewogICAgICAgICBp ZiAobmV3U3RhdGUgJiBBY3Rpdml0eVN0YXRlOjpJc1Zpc2libGUpCiAgICAgICAgICAgICBtX3Bv c3RCYWNrZ3JvdW5kaW5nTWVtb3J5VXNhZ2VUaW1lci5zdG9wKCk7CiAgICAgICAgIGVsc2UgaWYg KG1fcGFnZS5pc09ubHlOb25VdGlsaXR5UGFnZSgpKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGFn ZS9TZXR0aW5ncy55YW1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGlu Z3MueWFtbAkocmV2aXNpb24gMjY2MzEyKQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5n cy55YW1sCSh3b3JraW5nIGNvcHkpCkBAIC05ODMsNiArOTgzLDIxIEBAIGRhdGVUaW1lSW5wdXRz RWRpdGFibGVDb21wb25lbnRzRW5hYmxlZDoKICAgaW5pdGlhbDogZmFsc2UKICAgY29uZGl0aW9u YWw6IERBVEVfQU5EX1RJTUVfSU5QVVRfVFlQRVMKIAoraXNQb3N0TG9hZENQVVVzYWdlTWVhc3Vy ZW1lbnRFbmFibGVkOgorICBpbml0aWFsOiBkZWZhdWx0UG9zdExvYWRDUFVVc2FnZU1lYXN1cmVt ZW50RW5hYmxlZAorCitpc1Bvc3RMb2FkTWVtb3J5VXNhZ2VNZWFzdXJlbWVudEVuYWJsZWQ6Cisg IGluaXRpYWw6IGRlZmF1bHRQb3N0TG9hZE1lbW9yeVVzYWdlTWVhc3VyZW1lbnRFbmFibGVkCisK K2lzUG9zdEJhY2tncm91bmRpbmdDUFVVc2FnZU1lYXN1cmVtZW50RW5hYmxlZDoKKyAgaW5pdGlh bDogZGVmYXVsdFBvc3RCYWNrZ3JvdW5kaW5nQ1BVVXNhZ2VNZWFzdXJlbWVudEVuYWJsZWQKKwor aXNQb3N0QmFja2dyb3VuZGluZ01lbW9yeVVzYWdlTWVhc3VyZW1lbnRFbmFibGVkOgorICBpbml0 aWFsOiBkZWZhdWx0UG9zdEJhY2tncm91bmRpbmdNZW1vcnlVc2FnZU1lYXN1cmVtZW50RW5hYmxl ZAorCitpc1BlckFjdGl2aXR5U3RhdGVDUFVVc2FnZU1lYXN1cmVtZW50RW5hYmxlZDoKKyAgaW5p dGlhbDogZGVmYXVsdFBlckFjdGl2aXR5U3RhdGVDUFVVc2FnZU1lYXN1cmVtZW50RW5hYmxlZAor CiAjIERlcHJlY2F0ZWQKIAogaWNlQ2FuZGlkYXRlRmlsdGVyaW5nRW5hYmxlZDoKQEAgLTEwMDYs NCArMTAyMSw1IEBAIHNob3VsZFVzZVNlcnZpY2VXb3JrZXJTaG9ydFRpbWVvdXQ6CiAKICMgQ2xp ZW50cyBzaG91bGQgdXNlIHBlci1uYXZpZ2F0aW9uICJhbGxvd3NDb250ZW50SmF2YVNjcmlwdCIg cG9saWNpZXMgaW5zdGVhZAogc2NyaXB0TWFya3VwRW5hYmxlZDoKLSAgICBpbml0aWFsOiB0cnVl CisgIGluaXRpYWw6IHRydWUKKwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5nc0Rl ZmF1bHRWYWx1ZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdz RGVmYXVsdFZhbHVlcy5oCShyZXZpc2lvbiAyNjYzMTIpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdl L1NldHRpbmdzRGVmYXVsdFZhbHVlcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMTgsNCArMTE4LDIz IEBAIHN0YXRpYyBjb25zdCBib29sIGRlZmF1bHRBcHBsZVBheUVuYWJsZWQKIHN0YXRpYyBjb25z dCBib29sIGRlZmF1bHRBcHBsZVBheUVuYWJsZWQgPSBmYWxzZTsKICNlbmRpZgogCisKKyNpZiBQ TEFURk9STShDT0NPQSkKK3N0YXRpYyBjb25zdGV4cHIgY29uc3QgYm9vbCBkZWZhdWx0UG9zdExv YWRDUFVVc2FnZU1lYXN1cmVtZW50RW5hYmxlZCA9IHRydWU7CitzdGF0aWMgY29uc3RleHByIGNv bnN0IGJvb2wgZGVmYXVsdFBvc3RMb2FkTWVtb3J5VXNhZ2VNZWFzdXJlbWVudEVuYWJsZWQgPSB0 cnVlOworI2Vsc2UKK3N0YXRpYyBjb25zdGV4cHIgY29uc3QgYm9vbCBkZWZhdWx0UG9zdExvYWRD UFVVc2FnZU1lYXN1cmVtZW50RW5hYmxlZCA9IGZhbHNlOworc3RhdGljIGNvbnN0ZXhwciBjb25z dCBib29sIGRlZmF1bHRQb3N0TG9hZE1lbW9yeVVzYWdlTWVhc3VyZW1lbnRFbmFibGVkID0gZmFs c2U7CisjZW5kaWYKKworI2lmIFBMQVRGT1JNKE1BQykKK3N0YXRpYyBjb25zdGV4cHIgY29uc3Qg Ym9vbCBkZWZhdWx0UG9zdEJhY2tncm91bmRpbmdDUFVVc2FnZU1lYXN1cmVtZW50RW5hYmxlZCA9 IHRydWU7CitzdGF0aWMgY29uc3RleHByIGNvbnN0IGJvb2wgZGVmYXVsdFBlckFjdGl2aXR5U3Rh dGVDUFVVc2FnZU1lYXN1cmVtZW50RW5hYmxlZCA9IHRydWU7CitzdGF0aWMgY29uc3RleHByIGNv bnN0IGJvb2wgZGVmYXVsdFBvc3RCYWNrZ3JvdW5kaW5nTWVtb3J5VXNhZ2VNZWFzdXJlbWVudEVu YWJsZWQgPSB0cnVlOworI2Vsc2UKK3N0YXRpYyBjb25zdGV4cHIgY29uc3QgYm9vbCBkZWZhdWx0 UG9zdEJhY2tncm91bmRpbmdDUFVVc2FnZU1lYXN1cmVtZW50RW5hYmxlZCA9IGZhbHNlOworc3Rh dGljIGNvbnN0ZXhwciBjb25zdCBib29sIGRlZmF1bHRQZXJBY3Rpdml0eVN0YXRlQ1BVVXNhZ2VN ZWFzdXJlbWVudEVuYWJsZWQgPSBmYWxzZTsKK3N0YXRpYyBjb25zdGV4cHIgY29uc3QgYm9vbCBk ZWZhdWx0UG9zdEJhY2tncm91bmRpbmdNZW1vcnlVc2FnZU1lYXN1cmVtZW50RW5hYmxlZCA9IGZh bHNlOworI2VuZGlmCisKIH0K