217682 2020-10-13 16:46:06 -0700 Web Inspector: REGRESSION(r267148): new Big Sur styles are not used 2020-10-14 10:51:00 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi bburg ews-watchlist hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1697498 0 hi 2020-10-13 16:46:06 -0700 # STEPS TO REPRODUCE 1. inspect any page 2. detach/undock Web Inspector # EXPECTED Title bar is white and the close/minimize/fullscreen buttons are vertically centered. # ACTUAL Title bar uses macOS Catalina styling. 1697499 1 hi 2020-10-13 16:46:21 -0700 <rdar://problem/70269030> 1697500 2 411279 hi 2020-10-13 16:51:29 -0700 Created attachment 411279 Patch I'm not sure what the best/right way to go about doing this is, but this is my initial thought of how to do it 1697525 3 411279 bburg 2020-10-13 17:24:50 -0700 Comment on attachment 411279 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=411279&action=review The approach is sane, and I couldn't find any mistakes. > Source/WebCore/inspector/InspectorFrontendHost.cpp:392 > +String InspectorFrontendHost::platformVersionName() const Reminder to future self, we need to update this every year. =) > Source/WebInspectorUI/UserInterface/Views/Popover.js:238 > + var titleBarOffset = WI.undockedTitleAreaHeight(); Yikes, this is definitely an improvement in clarity. 1697595 4 411296 hi 2020-10-13 20:04:58 -0700 Created attachment 411296 Patch apparently `classList.add("")` throws an error :| ... and here I thought I'd seen it all 1697782 5 ews-feeder 2020-10-14 10:50:59 -0700 Committed r268473: <https://trac.webkit.org/changeset/268473> All reviewed patches have been landed. Closing bug and clearing flags on attachment 411296. 411279 2020-10-13 16:51:29 -0700 2020-10-13 20:04:56 -0700 Patch bug-217682-20201013165128.patch text/plain 11719 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0MGJkOGVlNTYxYzlmYzg0Njk0OTkzNjQzMjUyMzZjYTVjM2YyOWQ3Li5m NmFjZmRhMmRlNDlhYmE0OWQyYWFkYzU2OTBkOWViNWY5YTMzYzY5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjEgQEAKKzIwMjAtMTAtMTMgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJFR1JFU1NJT04ocjI2NzE0OCk6IG5ldyBCaWcg U3VyIHN0eWxlcyBhcmUgbm90IHVzZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIxNzY4MgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzAyNjkwMzA+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgcjI2NzE0 OCBjaGFuZ2VkIGBuYXZpZ2F0b3IudXNlckFnZW50YCBmcm9tIGAxMV8wYCB0byBgMTBfMTVfN2Au IFRoaXMgYnJlYWtzIFdlYiBJbnNwZWN0b3IKKyAgICAgICAgc3R5bGluZywgd2hpY2ggcmVsaWVk IG9uIHRoaXMgdmFsdWUgdG8ga25vdyB3aGF0IE9TIHZlcnNpb24gaXQgd2FzIHJ1bm5pbmcgb24g aW4gb3JkZXIgdG8KKyAgICAgICAga25vdyB3aGljaCBzdHlsZXMgdG8gdXNlLgorCisgICAgICAg ICogaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5pZGw6CisgICAgICAgICogaW5zcGVj dG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5oOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0 b3JGcm9udGVuZEhvc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRnJvbnRlbmRI b3N0OjpwbGF0Zm9ybVZlcnNpb25OYW1lIGNvbnN0KTogQWRkZWQuCisgICAgICAgIERlcml2ZSBh IGxvd2VyY2FzZWQga2VrYWItY2FzZWQgcGxhdGZvcm0gdmVyc2lvbiBuYW1lIGZyb20gYF9fTUFD X09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRURgLgorCiAyMDIwLTEwLTEyICBaYWxhbiBCdWp0YXMg IDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjI2ODI5NCk6IFsgaU9T IHdrMiBdIGltcG9ydGVkL2JsaW5rL2Zhc3QvY3NzL3pvb21lZC1pbnRyaW5zaWMtd2lkdGguaHRt bCBpcyBhIGNvbnN0YW50IGltYWdlIGZhaWx1cmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4 IDQwM2E1NGZlMzZlZDIwMmM1ZGRkY2EyM2I4MzYzNzRmYjYyNTJjYWUuLjAzNzBkN2U2N2M5ZDQy ZDkzZjgzMjNiNzlkMDNkN2FlNWFlZGU3NzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAt MSwzICsxLDMzIEBACisyMDIwLTEwLTEzICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNv bT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBSRUdSRVNTSU9OKHIyNjcxNDgpOiBuZXcgQmln IFN1ciBzdHlsZXMgYXJlIG5vdCB1c2VkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMTc2ODIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcwMjY5MDMw PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHIyNjcx NDggY2hhbmdlZCBgbmF2aWdhdG9yLnVzZXJBZ2VudGAgZnJvbSBgMTFfMGAgdG8gYDEwXzE1Xzdg LiBUaGlzIGJyZWFrcyBXZWIgSW5zcGVjdG9yCisgICAgICAgIHN0eWxpbmcsIHdoaWNoIHJlbGll ZCBvbiB0aGlzIHZhbHVlIHRvIGtub3cgd2hhdCBPUyB2ZXJzaW9uIGl0IHdhcyBydW5uaW5nIG9u IGluIG9yZGVyIHRvCisgICAgICAgIGtub3cgd2hpY2ggc3R5bGVzIHRvIHVzZS4KKworICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9QbGF0Zm9ybS5qczoKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL1ZhcmlhYmxlcy5jc3M6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybSk6IEFk ZGVkLgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm06bm90KC5zaWVycmEsIC5oaWdoLXNpZXJy YSkpOiBEZWxldGVkLgorICAgICAgICBVc2UgYEluc3BlY3RvckZyb250ZW5kSG9zdC5wbGF0Zm9y bVZlcnNpb25OYW1lYCBpbnN0ZWFkIG9mIGBuYXZpZ2F0b3IudXNlckFnZW50YC4gUmVtb3ZlCisg ICAgICAgIHVubmVjZXNzYXJ5IHBsYXRmb3JtIHZlcnNpb24gbmFtZXMgYW5kIG90aGVyIHVudXNl ZCBkYXRhLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL01haW4uanM6CisgICAgICAg IChXSS5jb250ZW50TG9hZGVkKToKKyAgICAgICAgKFdJLnVuZG9ja2VkVGl0bGVBcmVhSGVpZ2h0 KTogQWRkZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Qb3BvdmVyLmpzOgorICAg ICAgICAoV0kuUG9wb3Zlci5wcm90b3R5cGUuX3VwZGF0ZSk6CisgICAgICAgIFByb3ZpZGUgYSB3 YXkgdG8gZ2V0IHRoZSB1bmRvY2tlZCB0aXRsZSBhcmVhIGhlaWdodCBmb3IgdXNlIGluIEphdmFT Y3JpcHQgY2FsY3VsYXRpb25zLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVy cy9IQVJCdWlsZGVyLmpzOgorICAgICAgICAoV0kuSEFSQnVpbGRlci5jcmVhdG9yKToKKyAgICAg ICAgVGhlIGBXSS5QbGF0Zm9ybS52ZXJzaW9uLmJ1aWxkYCBoYXNuJ3QgY2hhbmdlZCBpbiBhIGxv bmcgdGltZSwgc28ganVzdCByZW1vdmUgaXQuCisKIDIwMjAtMTAtMTIgIEx1bWluZyBZaW4gIDxs dW1pbmdfeWluQGFwcGxlLmNvbT4KIAogICAgICAgICBbbWFjT1NdIFdvcmthcm91bmQgZm9yIE1B Q19PU19YX1ZFUlNJT05fTUFKT1IgaW5jb3JyZWN0bHkgaW5jbHVkaW5nIG1pbm9yIHZlcnNpb24g d2hlbiBidWlsZGluZyAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JGcm9udGVuZEhvc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckZyb250ZW5kSG9zdC5jcHAKaW5kZXggODRmNzlkMThmOTI2YTBiNTE3MGE5MWUzODY4ZTEwYTBj Yjg4MDcwNC4uZDdhYmQ1ZGE1ZDFjMzk3MDhlYzQ4YzEwYzlmNmUxMjMxMjc2MmRmMSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5jcHAK QEAgLTM4OSw2ICszODksMTkgQEAgU3RyaW5nIEluc3BlY3RvckZyb250ZW5kSG9zdDo6cGxhdGZv cm0oKSBjb25zdAogI2VuZGlmCiB9CiAKK1N0cmluZyBJbnNwZWN0b3JGcm9udGVuZEhvc3Q6OnBs YXRmb3JtVmVyc2lvbk5hbWUoKSBjb25zdAoreworI2lmIFBMQVRGT1JNKE1BQykgJiYgX19NQUNf T1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMTAwMDAKKyAgICByZXR1cm4gImJpZy1zdXIi X3M7CisjZWxpZiBQTEFURk9STShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlS RUQgPj0gMTAxNTAwCisgICAgcmV0dXJuICJjYXRhbGluYSJfczsKKyNlbGlmIFBMQVRGT1JNKE1B QykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDE0MDAKKyAgICByZXR1 cm4gIm1vamF2ZSJfczsKKyNlbHNlCisgICAgcmV0dXJuIGVtcHR5U3RyaW5nKCk7CisjZW5kaWYK K30KKwogU3RyaW5nIEluc3BlY3RvckZyb250ZW5kSG9zdDo6cG9ydCgpIGNvbnN0CiB7CiAjaWYg UExBVEZPUk0oR1RLKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckZyb250ZW5kSG9zdC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZy b250ZW5kSG9zdC5oCmluZGV4IGUxMGI0NjZkZTUzOWQ3MzQ3Yzk1MDNiZTE2NzU1ZDcxOTZjYzFm ODUuLmUyOTg5M2JiMzU1M2FkNTQ2ODI4Zjc2YjU0MGJlYjhjNmNlZDIzNWQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmgKQEAgLTg5LDYg Kzg5LDcgQEAgcHVibGljOgogICAgIHVuc2lnbmVkIGluc3BlY3Rpb25MZXZlbCgpIGNvbnN0Owog CiAgICAgU3RyaW5nIHBsYXRmb3JtKCkgY29uc3Q7CisgICAgU3RyaW5nIHBsYXRmb3JtVmVyc2lv bk5hbWUoKSBjb25zdDsKICAgICBTdHJpbmcgcG9ydCgpIGNvbnN0OwogCiAgICAgc3RydWN0IERl YnVnZ2FibGVJbmZvIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JGcm9udGVuZEhvc3QuaWRsIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckZyb250ZW5kSG9zdC5pZGwKaW5kZXggMmIyM2VlMjQzMzM2ZDBmYjIwZTE3Njk1NWI4ZmFhMjAz ZDRhYzI2NS4uMTdlOGY1YjhkMmFlYzg1N2RjNmY1NzE2NGFkZTdhMTQ3Zjk3NDc2MiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5pZGwK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5pZGwK QEAgLTc5LDYgKzc5LDcgQEAKIAogICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBET01TdHJpbmcgcG9y dDsKICAgICByZWFkb25seSBhdHRyaWJ1dGUgRE9NU3RyaW5nIHBsYXRmb3JtOworICAgIHJlYWRv bmx5IGF0dHJpYnV0ZSBET01TdHJpbmcgcGxhdGZvcm1WZXJzaW9uTmFtZTsKIAogICAgIHVuZGVm aW5lZCBzaG93Q29udGV4dE1lbnUoRXZlbnQgZXZlbnQsIHNlcXVlbmNlPENvbnRleHRNZW51SXRl bT4gaXRlbXMpOwogICAgIHVuZGVmaW5lZCBkaXNwYXRjaEV2ZW50QXNDb250ZXh0TWVudUV2ZW50 KEV2ZW50IGV2ZW50KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0Jhc2UvTWFpbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0Jhc2UvTWFpbi5qcwppbmRleCBmNjJmMDc1ZTczOGM4NjZjZGQ0ZGYyZDQ3Y2IwY2VjNzNjZmFl MDdkLi40M2IzM2I1M2EyODgxYmJlMzEzMmFmNzE3NmI1MGQyYWNiMWExYzY2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCkBAIC0yMTks MTIgKzIxOSw3IEBAIFdJLmNvbnRlbnRMb2FkZWQgPSBmdW5jdGlvbigpCiAgICAgd2luZG93LmFk ZEV2ZW50TGlzdGVuZXIoImNvbnRleHRtZW51IiwgV0kuX2NvbnRleHRNZW51UmVxdWVzdGVkKTsK IAogICAgIC8vIEFkZCBwbGF0Zm9ybSBzdHlsZSBjbGFzc2VzIHNvIHRoZSBVSSBjYW4gYmUgdHdl YWtlZCBwZXItcGxhdGZvcm0uCi0gICAgZG9jdW1lbnQuYm9keS5jbGFzc0xpc3QuYWRkKFdJLlBs YXRmb3JtLm5hbWUgKyAiLXBsYXRmb3JtIik7Ci0gICAgaWYgKFdJLlBsYXRmb3JtLmlzTmlnaHRs eUJ1aWxkKQotICAgICAgICBkb2N1bWVudC5ib2R5LmNsYXNzTGlzdC5hZGQoIm5pZ2h0bHktYnVp bGQiKTsKLQotICAgIGlmIChXSS5QbGF0Zm9ybS5uYW1lID09PSAibWFjIikKLSAgICAgICAgZG9j dW1lbnQuYm9keS5jbGFzc0xpc3QuYWRkKFdJLlBsYXRmb3JtLnZlcnNpb24ubmFtZSk7CisgICAg ZG9jdW1lbnQuYm9keS5jbGFzc0xpc3QuYWRkKFdJLlBsYXRmb3JtLm5hbWUgKyAiLXBsYXRmb3Jt IiwgV0kuUGxhdGZvcm0udmVyc2lvbi5uYW1lKTsKIAogICAgIGRvY3VtZW50LmJvZHkuY2xhc3NM aXN0LmFkZChXSS5zaGFyZWRBcHAuZGVidWdnYWJsZVR5cGUpOwogICAgIGRvY3VtZW50LmJvZHku c2V0QXR0cmlidXRlKCJkaXIiLCBXSS5yZXNvbHZlZExheW91dERpcmVjdGlvbigpKTsKQEAgLTI3 NzMsNiArMjc2OCwyNyBAQCBXSS5zZXRMYXlvdXREaXJlY3Rpb24gPSBmdW5jdGlvbih2YWx1ZSkK ICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3QucmVvcGVuKCk7CiB9OwogCitXSS51bmRvY2tlZFRp dGxlQXJlYUhlaWdodCA9IGZ1bmN0aW9uKCkKK3sKKyAgICBpZiAoV0kuZG9ja0NvbmZpZ3VyYXRp b24gIT09IFdJLkRvY2tDb25maWd1cmF0aW9uLlVuZG9ja2VkKQorICAgICAgICByZXR1cm4gMDsK KworICAgIGlmIChXSS5QbGF0Zm9ybS5uYW1lID09PSAibWFjIikgeworICAgICAgICBzd2l0Y2gg KFdJLlBsYXRmb3JtLnZlcnNpb24ubmFtZSkgeworICAgICAgICBjYXNlICJiaWctc3VyIjoKKyAg ICAgICAgICAgIC8qIGtlZXAgaW4gc3luYyB3aXRoIGBib2R5Lm1hYy1wbGF0Zm9ybS5iaWctc3Vy Om5vdCguZG9ja2VkKWAgKi8KKyAgICAgICAgICAgIHJldHVybiAyNyAvIFdJLmdldFpvb21GYWN0 b3IoKTsKKworICAgICAgICBjYXNlICJjYXRhbGluYSI6CisgICAgICAgIGNhc2UgIm1vamF2ZSI6 CisgICAgICAgICAgICAvKiBrZWVwIGluIHN5bmMgd2l0aCBgYm9keS5tYWMtcGxhdGZvcm06bm90 KC5iaWctc3VyKTpub3QoLmRvY2tlZClgICovCisgICAgICAgICAgICByZXR1cm4gMjIgLyBXSS5n ZXRab29tRmFjdG9yKCk7CisgICAgICAgIH0KKyAgICB9CisKKyAgICByZXR1cm4gMDsKK307CisK IFdJLl9zaG93VGFiQXRJbmRleEZyb21TaG9ydGN1dCA9IGZ1bmN0aW9uKGkpCiB7CiAgICAgaWYg KGkgPD0gV0kudGFiQmFyLnRhYkNvdW50KSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1BsYXRmb3JtLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQmFzZS9QbGF0Zm9ybS5qcwppbmRleCBiNzhjY2JmOThiN2M2OWE5 NDU4ODkzMmQ5NTYzNWZhNWZkZjRlOTAxLi44MTYxMTkzYTEyM2Q1MTgxYWFmYzQ2NzcyOGY5YTMz ZmFjMWNlY2FlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9CYXNlL1BsYXRmb3JtLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0Jhc2UvUGxhdGZvcm0uanMKQEAgLTI1LDYxICsyNSw3IEBACiAKIFdJLlBsYXRmb3JtID0g ewogICAgIG5hbWU6IEluc3BlY3RvckZyb250ZW5kSG9zdC5wbGF0Zm9ybSwKLSAgICBpc05pZ2h0 bHlCdWlsZDogZmFsc2UsCiAgICAgdmVyc2lvbjogewotICAgICAgICBiYXNlOiAwLAotICAgICAg ICByZWxlYXNlOiAwLAotICAgICAgICBuYW1lOiAiIiwKLSAgICAgICAgYnVpbGQ6ICIiLAorICAg ICAgICBuYW1lOiBJbnNwZWN0b3JGcm9udGVuZEhvc3QucGxhdGZvcm1WZXJzaW9uTmFtZSwKICAg ICB9CiB9OwotCi0oZnVuY3Rpb24gKCkgewotICAgIGxldCB2ZXJzaW9uTWF0Y2ggPSAvIEFwcGxl V2ViS2l0XC8oW14gXSspLy5leGVjKG5hdmlnYXRvci51c2VyQWdlbnQpOwotICAgIGlmICh2ZXJz aW9uTWF0Y2gpIHsKLSAgICAgICAgV0kuUGxhdGZvcm0udmVyc2lvbi5idWlsZCA9IHZlcnNpb25N YXRjaFsxXTsKLQotICAgICAgICAvLyBDaGVjayBmb3IgYSBuaWdodGx5IGJ1aWxkIGJ5IGxvb2tp bmcgZm9yIGEgcGx1cyBpbiB0aGUgdmVyc2lvbiBudW1iZXIgYW5kIGEgc21hbGwgbnVtYmVyIG9m IHN0eWxlc2hlZXRzIChpbmRpY2F0aW5nIGNvbWJpbmVkIHJlc291cmNlcykuCi0gICAgICAgIGlm ICh2ZXJzaW9uTWF0Y2hbMV0uaW5kZXhPZigiKyIpICE9PSAtMSAmJiBkb2N1bWVudC5zdHlsZVNo ZWV0cy5sZW5ndGggPCAxMCkKLSAgICAgICAgICAgIFdJLlBsYXRmb3JtLmlzTmlnaHRseUJ1aWxk ID0gdHJ1ZTsKLSAgICB9Ci0KLSAgICBsZXQgb3NWZXJzaW9uTWF0Y2ggPSAvIE1hYyBPUyBYIChc ZCspXyhcZCspLy5leGVjKG5hdmlnYXRvci5hcHBWZXJzaW9uKTsKLSAgICBpZiAob3NWZXJzaW9u TWF0Y2gpIHsKLSAgICAgICAgV0kuUGxhdGZvcm0udmVyc2lvbi5iYXNlID0gcGFyc2VJbnQob3NW ZXJzaW9uTWF0Y2hbMV0pOwotICAgICAgICBXSS5QbGF0Zm9ybS52ZXJzaW9uLnJlbGVhc2UgPSBw YXJzZUludChvc1ZlcnNpb25NYXRjaFsyXSk7Ci0KLSAgICAgICAgc3dpdGNoIChXSS5QbGF0Zm9y bS52ZXJzaW9uLmJhc2UpIHsKLSAgICAgICAgY2FzZSAxMDoKLSAgICAgICAgICAgIHN3aXRjaCAo V0kuUGxhdGZvcm0udmVyc2lvbi5yZWxlYXNlKSB7Ci0gICAgICAgICAgICBjYXNlIDE1OgotICAg ICAgICAgICAgICAgIFdJLlBsYXRmb3JtLnZlcnNpb24ubmFtZSA9ICJjYXRhbGluYSI7Ci0gICAg ICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIDE0OgotICAgICAgICAgICAgICAg IFdJLlBsYXRmb3JtLnZlcnNpb24ubmFtZSA9ICJtb2phdmUiOwotICAgICAgICAgICAgICAgIGJy ZWFrOwotICAgICAgICAgICAgY2FzZSAxMzoKLSAgICAgICAgICAgICAgICBXSS5QbGF0Zm9ybS52 ZXJzaW9uLm5hbWUgPSAiaGlnaC1zaWVycmEiOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAg ICAgICAgICAgY2FzZSAxMjoKLSAgICAgICAgICAgICAgICBXSS5QbGF0Zm9ybS52ZXJzaW9uLm5h bWUgPSAic2llcnJhIjsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGRlZmF1 bHQ6Ci0gICAgICAgICAgICAgICAgV0kuUGxhdGZvcm0udmVyc2lvbi5uYW1lID0gInVua25vd24t bWFjIjsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAg IGJyZWFrOwotCi0gICAgICAgIGNhc2UgMTE6Ci0gICAgICAgICAgICBzd2l0Y2ggKFdJLlBsYXRm b3JtLnZlcnNpb24ucmVsZWFzZSkgewotICAgICAgICAgICAgY2FzZSAwOgotICAgICAgICAgICAg ICAgIFdJLlBsYXRmb3JtLnZlcnNpb24ubmFtZSA9ICJiaWctc3VyIjsKLSAgICAgICAgICAgICAg ICBicmVhazsKLSAgICAgICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICAgICAgV0kuUGxhdGZv cm0udmVyc2lvbi5uYW1lID0gInVua25vd24tbWFjIjsKLSAgICAgICAgICAgICAgICBicmVhazsK LSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0gICAgfQotfSko KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRy b2xsZXJzL0hBUkJ1aWxkZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Db250cm9sbGVycy9IQVJCdWlsZGVyLmpzCmluZGV4IDY1ZTQwNjVjOTA2Mzk1NGIxZjU0ZTA1 YzY5Y2QxOGM1ZmU4YTYzMDMuLjUwZmM1ZWI2NzU1YWIwYzZjYWNmNzhlMTk1MWY0MmE1M2NmNTBl OWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRy b2xsZXJzL0hBUkJ1aWxkZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQ29udHJvbGxlcnMvSEFSQnVpbGRlci5qcwpAQCAtNjAsNyArNjAsNyBAQCBXSS5IQVJC dWlsZGVyID0gY2xhc3MgSEFSQnVpbGRlcgogICAgIHsKICAgICAgICAgcmV0dXJuIHsKICAgICAg ICAgICAgIG5hbWU6ICJXZWJLaXQgV2ViIEluc3BlY3RvciIsCi0gICAgICAgICAgICB2ZXJzaW9u OiBXSS5QbGF0Zm9ybS52ZXJzaW9uLmJ1aWxkIHx8ICIxLjAiLAorICAgICAgICAgICAgdmVyc2lv bjogIjEuMCIsCiAgICAgICAgIH07CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qb3BvdmVyLmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUG9wb3Zlci5qcwppbmRleCA0ZmMzN2JmM2ZkYTgy NzExMDcxZDQ0MmQwMDQ3NmRkMGM3MDY3ZDYwLi40NTg5MDY4YWFiYWNlM2UyZWExNTM5MWVkZTFi Yzk1YTM0ZmI2YmM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9Qb3BvdmVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1BvcG92ZXIuanMKQEAgLTIzNSw3ICsyMzUsNyBAQCBXSS5Qb3BvdmVyID0g Y2xhc3MgUG9wb3ZlciBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICAgICAgdGhpcy5fcHJlZmVy cmVkU2l6ZSA9IG5ldyBXSS5TaXplKE1hdGguY2VpbChwb3BvdmVyQm91bmRzLndpZHRoKSwgTWF0 aC5jZWlsKHBvcG92ZXJCb3VuZHMuaGVpZ2h0KSk7CiAgICAgICAgIH0KIAotICAgICAgICB2YXIg dGl0bGVCYXJPZmZzZXQgPSBXSS5QbGF0Zm9ybS5uYW1lID09PSAibWFjIiA/IDIyIDogMDsKKyAg ICAgICAgdmFyIHRpdGxlQmFyT2Zmc2V0ID0gV0kudW5kb2NrZWRUaXRsZUFyZWFIZWlnaHQoKTsK ICAgICAgICAgdmFyIGNvbnRhaW5lckZyYW1lID0gbmV3IFdJLlJlY3QoMCwgdGl0bGVCYXJPZmZz ZXQsIHdpbmRvdy5pbm5lcldpZHRoLCB3aW5kb3cuaW5uZXJIZWlnaHQgLSB0aXRsZUJhck9mZnNl dCk7CiAgICAgICAgIC8vIFRoZSBmcmFtZSBvZiB0aGUgd2luZG93IHdpdGggYSBsaXR0bGUgaW5z ZXQgdG8gbWFrZSBzdXJlIHdlIGhhdmUgcm9vbSBmb3Igc2hhZG93cy4KICAgICAgICAgY29udGFp bmVyRnJhbWUgPSBjb250YWluZXJGcmFtZS5pbnNldChXSS5Qb3BvdmVyLlNoYWRvd0VkZ2VJbnNl dHMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVmFyaWFibGVzLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1ZhcmlhYmxlcy5jc3MKaW5kZXggYzY4MWI3MzQwYjNhMjg3Y2NhN2Y1ZWM1MWM5YzliMjZi ZWNiZjRkZi4uMGY1MmQzM2QwYzUxNzZlZTVjM2VhZmNkZDE5ZDI1Y2MwYTdmODQ3OCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmFyaWFibGVz LmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WYXJp YWJsZXMuY3NzCkBAIC0yNDUsMTAgKzI0NSwxMiBAQCBib2R5LmJpZy1zdXIgewogfQogCiBib2R5 Lm1hYy1wbGF0Zm9ybTpub3QoLmJpZy1zdXIpOm5vdCguZG9ja2VkKSB7CisgICAgLyoga2VlcCBp biBzeW5jIHdpdGggYFdJLnVuZG9ja2VkVGl0bGVBcmVhSGVpZ2h0YCAqLwogICAgIC0tdW5kb2Nr ZWQtdGl0bGUtYXJlYS1oZWlnaHQ6IGNhbGMoMjJweCAvIHZhcigtLXpvb20tZmFjdG9yKSk7CiB9 CiAKIGJvZHkubWFjLXBsYXRmb3JtLmJpZy1zdXI6bm90KC5kb2NrZWQpIHsKKyAgICAvKiBrZWVw IGluIHN5bmMgd2l0aCBgV0kudW5kb2NrZWRUaXRsZUFyZWFIZWlnaHRgICovCiAgICAgLS11bmRv Y2tlZC10aXRsZS1hcmVhLWhlaWdodDogY2FsYygyN3B4IC8gdmFyKC0tem9vbS1mYWN0b3IpKTsK IH0KIApAQCAtNDEyLDcgKzQxNCw3IEBAIGJvZHkubWFjLXBsYXRmb3JtLmJpZy1zdXI6bm90KC5k b2NrZWQpIHsKICAgICB9CiB9CiAKLWJvZHkubWFjLXBsYXRmb3JtOm5vdCguc2llcnJhLCAuaGln aC1zaWVycmEpIHsKK2JvZHkubWFjLXBsYXRmb3JtIHsKICAgICAtLXNlbGVjdGVkLWZvcmVncm91 bmQtY29sb3I6IC1hcHBsZS1zeXN0ZW0tYWx0ZXJuYXRlLXNlbGVjdGVkLXRleHQ7CiAgICAgLS1z ZWxlY3RlZC1iYWNrZ3JvdW5kLWNvbG9yOiAtYXBwbGUtc3lzdGVtLXNlbGVjdGVkLWNvbnRlbnQt YmFja2dyb3VuZDsKICAgICAtLXNlbGVjdGVkLXRleHQtYmFja2dyb3VuZC1jb2xvcjogLWFwcGxl LXN5c3RlbS1zZWxlY3RlZC10ZXh0LWJhY2tncm91bmQ7Cg== 411296 2020-10-13 20:04:58 -0700 2020-10-14 10:50:59 -0700 Patch bug-217682-20201013200457.patch text/plain 11419 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0YTQwMDI3ZTBiNjcxODQzYzUxYjZmNmU2OWM1NzdkNGJkZWYxNWRmLi4w ZTA3YTJmMmI4N2JjMDAzYjU2NTU1NzY5ZmIzMjljNzQ1MWRiNTVmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjEgQEAKKzIwMjAtMTAtMTMgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJFR1JFU1NJT04ocjI2NzE0OCk6IG5ldyBCaWcg U3VyIHN0eWxlcyBhcmUgbm90IHVzZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIxNzY4MgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzAyNjkwMzA+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQnJpYW4gQnVyZy4KKworICAgICAgICByMjY3MTQ4IGNo YW5nZWQgYG5hdmlnYXRvci51c2VyQWdlbnRgIGZyb20gYDExXzBgIHRvIGAxMF8xNV83YC4gVGhp cyBicmVha3MgV2ViIEluc3BlY3RvcgorICAgICAgICBzdHlsaW5nLCB3aGljaCByZWxpZWQgb24g dGhpcyB2YWx1ZSB0byBrbm93IHdoYXQgT1MgdmVyc2lvbiBpdCB3YXMgcnVubmluZyBvbiBpbiBv cmRlciB0bworICAgICAgICBrbm93IHdoaWNoIHN0eWxlcyB0byB1c2UuCisKKyAgICAgICAgKiBp bnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmlkbDoKKyAgICAgICAgKiBpbnNwZWN0b3Iv SW5zcGVjdG9yRnJvbnRlbmRIb3N0Lmg6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckZy b250ZW5kSG9zdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JGcm9udGVuZEhvc3Q6 OnBsYXRmb3JtVmVyc2lvbk5hbWUgY29uc3QpOiBBZGRlZC4KKyAgICAgICAgRGVyaXZlIGEgbG93 ZXJjYXNlZCBrZWthYi1jYXNlZCBwbGF0Zm9ybSB2ZXJzaW9uIG5hbWUgZnJvbSBgX19NQUNfT1Nf WF9WRVJTSU9OX01JTl9SRVFVSVJFRGAuCisKIDIwMjAtMTAtMTMgIE1lZ2FuIEdhcmRuZXIgIDxt ZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KIAogICAgICAgICBQYWludCBDU1MgaGlnaGxpZ2h0cyBv dmVyIGltYWdlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKaW5kZXggNTYxNWU2MmZmNGEzMjUxMWMw MWMxMmVhZDM1ZTgzYzZiMTRiZDUwMy4uYWMxMGVlZjVlYjcwYTE3MDUzMDNmODJjODZlNDZhM2Q4 MDIwZDM2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMjAt MTAtMTMgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJ bnNwZWN0b3I6IFJFR1JFU1NJT04ocjI2NzE0OCk6IG5ldyBCaWcgU3VyIHN0eWxlcyBhcmUgbm90 IHVzZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx NzY4MgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzAyNjkwMzA+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgQnJpYW4gQnVyZy4KKworICAgICAgICByMjY3MTQ4IGNoYW5nZWQgYG5hdmlnYXRvci51 c2VyQWdlbnRgIGZyb20gYDExXzBgIHRvIGAxMF8xNV83YC4gVGhpcyBicmVha3MgV2ViIEluc3Bl Y3RvcgorICAgICAgICBzdHlsaW5nLCB3aGljaCByZWxpZWQgb24gdGhpcyB2YWx1ZSB0byBrbm93 IHdoYXQgT1MgdmVyc2lvbiBpdCB3YXMgcnVubmluZyBvbiBpbiBvcmRlciB0bworICAgICAgICBr bm93IHdoaWNoIHN0eWxlcyB0byB1c2UuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2Uv UGxhdGZvcm0uanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9WYXJpYWJsZXMuY3Nz OgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0pOiBBZGRlZC4KKyAgICAgICAgKGJvZHkubWFj LXBsYXRmb3JtOm5vdCguc2llcnJhLCAuaGlnaC1zaWVycmEpKTogRGVsZXRlZC4KKyAgICAgICAg VXNlIGBJbnNwZWN0b3JGcm9udGVuZEhvc3QucGxhdGZvcm1WZXJzaW9uTmFtZWAgaW5zdGVhZCBv ZiBgbmF2aWdhdG9yLnVzZXJBZ2VudGAuIFJlbW92ZQorICAgICAgICB1bm5lY2Vzc2FyeSBwbGF0 Zm9ybSB2ZXJzaW9uIG5hbWVzIGFuZCBvdGhlciB1bnVzZWQgZGF0YS4KKworICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzOgorICAgICAgICAoV0kuY29udGVudExvYWRlZCk6Cisg ICAgICAgIChXSS51bmRvY2tlZFRpdGxlQXJlYUhlaWdodCk6IEFkZGVkLgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvUG9wb3Zlci5qczoKKyAgICAgICAgKFdJLlBvcG92ZXIucHJvdG90 eXBlLl91cGRhdGUpOgorICAgICAgICBQcm92aWRlIGEgd2F5IHRvIGdldCB0aGUgdW5kb2NrZWQg dGl0bGUgYXJlYSBoZWlnaHQgZm9yIHVzZSBpbiBKYXZhU2NyaXB0IGNhbGN1bGF0aW9ucy4KKwor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvSEFSQnVpbGRlci5qczoKKyAgICAg ICAgKFdJLkhBUkJ1aWxkZXIuY3JlYXRvcik6CisgICAgICAgIFRoZSBgV0kuUGxhdGZvcm0udmVy c2lvbi5idWlsZGAgaGFzbid0IGNoYW5nZWQgaW4gYSBsb25nIHRpbWUsIHNvIGp1c3QgcmVtb3Zl IGl0LgorCiAyMDIwLTEwLTEzICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAog ICAgICAgICBXZWIgSW5zcGVjdG9yOiBTb3VyY2VzOiB0YWIgaGFzIHdyb25nIGljb24gd2hlbiBw YXVzZWQgaWYgYWRkZWQgYWZ0ZXIgcGF1c2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5jcHAKaW5kZXggODRmNzlkMThmOTI2YTBiNTE3MGE5 MWUzODY4ZTEwYTBjYjg4MDcwNC4uZDdhYmQ1ZGE1ZDFjMzk3MDhlYzQ4YzEwYzlmNmUxMjMxMjc2 MmRmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250 ZW5kSG9zdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250 ZW5kSG9zdC5jcHAKQEAgLTM4OSw2ICszODksMTkgQEAgU3RyaW5nIEluc3BlY3RvckZyb250ZW5k SG9zdDo6cGxhdGZvcm0oKSBjb25zdAogI2VuZGlmCiB9CiAKK1N0cmluZyBJbnNwZWN0b3JGcm9u dGVuZEhvc3Q6OnBsYXRmb3JtVmVyc2lvbk5hbWUoKSBjb25zdAoreworI2lmIFBMQVRGT1JNKE1B QykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMTAwMDAKKyAgICByZXR1 cm4gImJpZy1zdXIiX3M7CisjZWxpZiBQTEFURk9STShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lP Tl9NSU5fUkVRVUlSRUQgPj0gMTAxNTAwCisgICAgcmV0dXJuICJjYXRhbGluYSJfczsKKyNlbGlm IFBMQVRGT1JNKE1BQykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDE0 MDAKKyAgICByZXR1cm4gIm1vamF2ZSJfczsKKyNlbHNlCisgICAgcmV0dXJuIGVtcHR5U3RyaW5n KCk7CisjZW5kaWYKK30KKwogU3RyaW5nIEluc3BlY3RvckZyb250ZW5kSG9zdDo6cG9ydCgpIGNv bnN0CiB7CiAjaWYgUExBVEZPUk0oR1RLKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckZyb250ZW5kSG9zdC5oCmluZGV4IGUxMGI0NjZkZTUzOWQ3MzQ3Yzk1MDNiZTE2 NzU1ZDcxOTZjYzFmODUuLmUyOTg5M2JiMzU1M2FkNTQ2ODI4Zjc2YjU0MGJlYjhjNmNlZDIzNWQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhv c3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRIb3N0 LmgKQEAgLTg5LDYgKzg5LDcgQEAgcHVibGljOgogICAgIHVuc2lnbmVkIGluc3BlY3Rpb25MZXZl bCgpIGNvbnN0OwogCiAgICAgU3RyaW5nIHBsYXRmb3JtKCkgY29uc3Q7CisgICAgU3RyaW5nIHBs YXRmb3JtVmVyc2lvbk5hbWUoKSBjb25zdDsKICAgICBTdHJpbmcgcG9ydCgpIGNvbnN0OwogCiAg ICAgc3RydWN0IERlYnVnZ2FibGVJbmZvIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuaWRsIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5pZGwKaW5kZXggMmIyM2VlMjQzMzM2ZDBmYjIwZTE3 Njk1NWI4ZmFhMjAzZDRhYzI2NS4uMTdlOGY1YjhkMmFlYzg1N2RjNmY1NzE2NGFkZTdhMTQ3Zjk3 NDc2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250 ZW5kSG9zdC5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250 ZW5kSG9zdC5pZGwKQEAgLTc5LDYgKzc5LDcgQEAKIAogICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBE T01TdHJpbmcgcG9ydDsKICAgICByZWFkb25seSBhdHRyaWJ1dGUgRE9NU3RyaW5nIHBsYXRmb3Jt OworICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBET01TdHJpbmcgcGxhdGZvcm1WZXJzaW9uTmFtZTsK IAogICAgIHVuZGVmaW5lZCBzaG93Q29udGV4dE1lbnUoRXZlbnQgZXZlbnQsIHNlcXVlbmNlPENv bnRleHRNZW51SXRlbT4gaXRlbXMpOwogICAgIHVuZGVmaW5lZCBkaXNwYXRjaEV2ZW50QXNDb250 ZXh0TWVudUV2ZW50KEV2ZW50IGV2ZW50KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwppbmRleCBmNjJmMDc1ZTczOGM4NjZjZGQ0ZGYyZDQ3 Y2IwY2VjNzNjZmFlMDdkLi5jMTM3MTUzOWMxNzdiMzI2MjE3MzFiYWNiODM2MDZmYmZkNjI3OGEw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01h aW4uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWlu LmpzCkBAIC0yMjAsMTAgKzIyMCw3IEBAIFdJLmNvbnRlbnRMb2FkZWQgPSBmdW5jdGlvbigpCiAK ICAgICAvLyBBZGQgcGxhdGZvcm0gc3R5bGUgY2xhc3NlcyBzbyB0aGUgVUkgY2FuIGJlIHR3ZWFr ZWQgcGVyLXBsYXRmb3JtLgogICAgIGRvY3VtZW50LmJvZHkuY2xhc3NMaXN0LmFkZChXSS5QbGF0 Zm9ybS5uYW1lICsgIi1wbGF0Zm9ybSIpOwotICAgIGlmIChXSS5QbGF0Zm9ybS5pc05pZ2h0bHlC dWlsZCkKLSAgICAgICAgZG9jdW1lbnQuYm9keS5jbGFzc0xpc3QuYWRkKCJuaWdodGx5LWJ1aWxk Iik7Ci0KLSAgICBpZiAoV0kuUGxhdGZvcm0ubmFtZSA9PT0gIm1hYyIpCisgICAgaWYgKFdJLlBs YXRmb3JtLnZlcnNpb24ubmFtZSkKICAgICAgICAgZG9jdW1lbnQuYm9keS5jbGFzc0xpc3QuYWRk KFdJLlBsYXRmb3JtLnZlcnNpb24ubmFtZSk7CiAKICAgICBkb2N1bWVudC5ib2R5LmNsYXNzTGlz dC5hZGQoV0kuc2hhcmVkQXBwLmRlYnVnZ2FibGVUeXBlKTsKQEAgLTI3NzMsNiArMjc3MCwyNyBA QCBXSS5zZXRMYXlvdXREaXJlY3Rpb24gPSBmdW5jdGlvbih2YWx1ZSkKICAgICBJbnNwZWN0b3JG cm9udGVuZEhvc3QucmVvcGVuKCk7CiB9OwogCitXSS51bmRvY2tlZFRpdGxlQXJlYUhlaWdodCA9 IGZ1bmN0aW9uKCkKK3sKKyAgICBpZiAoV0kuZG9ja0NvbmZpZ3VyYXRpb24gIT09IFdJLkRvY2tD b25maWd1cmF0aW9uLlVuZG9ja2VkKQorICAgICAgICByZXR1cm4gMDsKKworICAgIGlmIChXSS5Q bGF0Zm9ybS5uYW1lID09PSAibWFjIikgeworICAgICAgICBzd2l0Y2ggKFdJLlBsYXRmb3JtLnZl cnNpb24ubmFtZSkgeworICAgICAgICBjYXNlICJiaWctc3VyIjoKKyAgICAgICAgICAgIC8qIGtl ZXAgaW4gc3luYyB3aXRoIGBib2R5Lm1hYy1wbGF0Zm9ybS5iaWctc3VyOm5vdCguZG9ja2VkKWAg Ki8KKyAgICAgICAgICAgIHJldHVybiAyNyAvIFdJLmdldFpvb21GYWN0b3IoKTsKKworICAgICAg ICBjYXNlICJjYXRhbGluYSI6CisgICAgICAgIGNhc2UgIm1vamF2ZSI6CisgICAgICAgICAgICAv KiBrZWVwIGluIHN5bmMgd2l0aCBgYm9keS5tYWMtcGxhdGZvcm06bm90KC5iaWctc3VyKTpub3Qo LmRvY2tlZClgICovCisgICAgICAgICAgICByZXR1cm4gMjIgLyBXSS5nZXRab29tRmFjdG9yKCk7 CisgICAgICAgIH0KKyAgICB9CisKKyAgICByZXR1cm4gMDsKK307CisKIFdJLl9zaG93VGFiQXRJ bmRleEZyb21TaG9ydGN1dCA9IGZ1bmN0aW9uKGkpCiB7CiAgICAgaWYgKGkgPD0gV0kudGFiQmFy LnRhYkNvdW50KSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9CYXNlL1BsYXRmb3JtLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQmFzZS9QbGF0Zm9ybS5qcwppbmRleCBiNzhjY2JmOThiN2M2OWE5NDU4ODkzMmQ5NTYzNWZh NWZkZjRlOTAxLi44MTYxMTkzYTEyM2Q1MTgxYWFmYzQ2NzcyOGY5YTMzZmFjMWNlY2FlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1BsYXRmb3Jt LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvUGxhdGZv cm0uanMKQEAgLTI1LDYxICsyNSw3IEBACiAKIFdJLlBsYXRmb3JtID0gewogICAgIG5hbWU6IElu c3BlY3RvckZyb250ZW5kSG9zdC5wbGF0Zm9ybSwKLSAgICBpc05pZ2h0bHlCdWlsZDogZmFsc2Us CiAgICAgdmVyc2lvbjogewotICAgICAgICBiYXNlOiAwLAotICAgICAgICByZWxlYXNlOiAwLAot ICAgICAgICBuYW1lOiAiIiwKLSAgICAgICAgYnVpbGQ6ICIiLAorICAgICAgICBuYW1lOiBJbnNw ZWN0b3JGcm9udGVuZEhvc3QucGxhdGZvcm1WZXJzaW9uTmFtZSwKICAgICB9CiB9OwotCi0oZnVu Y3Rpb24gKCkgewotICAgIGxldCB2ZXJzaW9uTWF0Y2ggPSAvIEFwcGxlV2ViS2l0XC8oW14gXSsp Ly5leGVjKG5hdmlnYXRvci51c2VyQWdlbnQpOwotICAgIGlmICh2ZXJzaW9uTWF0Y2gpIHsKLSAg ICAgICAgV0kuUGxhdGZvcm0udmVyc2lvbi5idWlsZCA9IHZlcnNpb25NYXRjaFsxXTsKLQotICAg ICAgICAvLyBDaGVjayBmb3IgYSBuaWdodGx5IGJ1aWxkIGJ5IGxvb2tpbmcgZm9yIGEgcGx1cyBp biB0aGUgdmVyc2lvbiBudW1iZXIgYW5kIGEgc21hbGwgbnVtYmVyIG9mIHN0eWxlc2hlZXRzIChp bmRpY2F0aW5nIGNvbWJpbmVkIHJlc291cmNlcykuCi0gICAgICAgIGlmICh2ZXJzaW9uTWF0Y2hb MV0uaW5kZXhPZigiKyIpICE9PSAtMSAmJiBkb2N1bWVudC5zdHlsZVNoZWV0cy5sZW5ndGggPCAx MCkKLSAgICAgICAgICAgIFdJLlBsYXRmb3JtLmlzTmlnaHRseUJ1aWxkID0gdHJ1ZTsKLSAgICB9 Ci0KLSAgICBsZXQgb3NWZXJzaW9uTWF0Y2ggPSAvIE1hYyBPUyBYIChcZCspXyhcZCspLy5leGVj KG5hdmlnYXRvci5hcHBWZXJzaW9uKTsKLSAgICBpZiAob3NWZXJzaW9uTWF0Y2gpIHsKLSAgICAg ICAgV0kuUGxhdGZvcm0udmVyc2lvbi5iYXNlID0gcGFyc2VJbnQob3NWZXJzaW9uTWF0Y2hbMV0p OwotICAgICAgICBXSS5QbGF0Zm9ybS52ZXJzaW9uLnJlbGVhc2UgPSBwYXJzZUludChvc1ZlcnNp b25NYXRjaFsyXSk7Ci0KLSAgICAgICAgc3dpdGNoIChXSS5QbGF0Zm9ybS52ZXJzaW9uLmJhc2Up IHsKLSAgICAgICAgY2FzZSAxMDoKLSAgICAgICAgICAgIHN3aXRjaCAoV0kuUGxhdGZvcm0udmVy c2lvbi5yZWxlYXNlKSB7Ci0gICAgICAgICAgICBjYXNlIDE1OgotICAgICAgICAgICAgICAgIFdJ LlBsYXRmb3JtLnZlcnNpb24ubmFtZSA9ICJjYXRhbGluYSI7Ci0gICAgICAgICAgICAgICAgYnJl YWs7Ci0gICAgICAgICAgICBjYXNlIDE0OgotICAgICAgICAgICAgICAgIFdJLlBsYXRmb3JtLnZl cnNpb24ubmFtZSA9ICJtb2phdmUiOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAg ICAgY2FzZSAxMzoKLSAgICAgICAgICAgICAgICBXSS5QbGF0Zm9ybS52ZXJzaW9uLm5hbWUgPSAi aGlnaC1zaWVycmEiOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2FzZSAx MjoKLSAgICAgICAgICAgICAgICBXSS5QbGF0Zm9ybS52ZXJzaW9uLm5hbWUgPSAic2llcnJhIjsK LSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAg ICAgICAgV0kuUGxhdGZvcm0udmVyc2lvbi5uYW1lID0gInVua25vd24tbWFjIjsKLSAgICAgICAg ICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGJyZWFrOwotCi0gICAg ICAgIGNhc2UgMTE6Ci0gICAgICAgICAgICBzd2l0Y2ggKFdJLlBsYXRmb3JtLnZlcnNpb24ucmVs ZWFzZSkgewotICAgICAgICAgICAgY2FzZSAwOgotICAgICAgICAgICAgICAgIFdJLlBsYXRmb3Jt LnZlcnNpb24ubmFtZSA9ICJiaWctc3VyIjsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAg ICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICAgICAgV0kuUGxhdGZvcm0udmVyc2lvbi5uYW1l ID0gInVua25vd24tbWFjIjsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0K LSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0gICAgfQotfSkoKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0hBUkJ1aWxk ZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9I QVJCdWlsZGVyLmpzCmluZGV4IDY1ZTQwNjVjOTA2Mzk1NGIxZjU0ZTA1YzY5Y2QxOGM1ZmU4YTYz MDMuLjUwZmM1ZWI2NzU1YWIwYzZjYWNmNzhlMTk1MWY0MmE1M2NmNTBlOWQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0hBUkJ1aWxk ZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxl cnMvSEFSQnVpbGRlci5qcwpAQCAtNjAsNyArNjAsNyBAQCBXSS5IQVJCdWlsZGVyID0gY2xhc3Mg SEFSQnVpbGRlcgogICAgIHsKICAgICAgICAgcmV0dXJuIHsKICAgICAgICAgICAgIG5hbWU6ICJX ZWJLaXQgV2ViIEluc3BlY3RvciIsCi0gICAgICAgICAgICB2ZXJzaW9uOiBXSS5QbGF0Zm9ybS52 ZXJzaW9uLmJ1aWxkIHx8ICIxLjAiLAorICAgICAgICAgICAgdmVyc2lvbjogIjEuMCIsCiAgICAg ICAgIH07CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9Qb3BvdmVyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvUG9wb3Zlci5qcwppbmRleCA0ZmMzN2JmM2ZkYTgyNzExMDcxZDQ0MmQwMDQ3 NmRkMGM3MDY3ZDYwLi40NTg5MDY4YWFiYWNlM2UyZWExNTM5MWVkZTFiYzk1YTM0ZmI2YmM5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qb3Bv dmVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Bv cG92ZXIuanMKQEAgLTIzNSw3ICsyMzUsNyBAQCBXSS5Qb3BvdmVyID0gY2xhc3MgUG9wb3ZlciBl eHRlbmRzIFdJLk9iamVjdAogICAgICAgICAgICAgdGhpcy5fcHJlZmVycmVkU2l6ZSA9IG5ldyBX SS5TaXplKE1hdGguY2VpbChwb3BvdmVyQm91bmRzLndpZHRoKSwgTWF0aC5jZWlsKHBvcG92ZXJC b3VuZHMuaGVpZ2h0KSk7CiAgICAgICAgIH0KIAotICAgICAgICB2YXIgdGl0bGVCYXJPZmZzZXQg PSBXSS5QbGF0Zm9ybS5uYW1lID09PSAibWFjIiA/IDIyIDogMDsKKyAgICAgICAgdmFyIHRpdGxl QmFyT2Zmc2V0ID0gV0kudW5kb2NrZWRUaXRsZUFyZWFIZWlnaHQoKTsKICAgICAgICAgdmFyIGNv bnRhaW5lckZyYW1lID0gbmV3IFdJLlJlY3QoMCwgdGl0bGVCYXJPZmZzZXQsIHdpbmRvdy5pbm5l cldpZHRoLCB3aW5kb3cuaW5uZXJIZWlnaHQgLSB0aXRsZUJhck9mZnNldCk7CiAgICAgICAgIC8v IFRoZSBmcmFtZSBvZiB0aGUgd2luZG93IHdpdGggYSBsaXR0bGUgaW5zZXQgdG8gbWFrZSBzdXJl IHdlIGhhdmUgcm9vbSBmb3Igc2hhZG93cy4KICAgICAgICAgY29udGFpbmVyRnJhbWUgPSBjb250 YWluZXJGcmFtZS5pbnNldChXSS5Qb3BvdmVyLlNoYWRvd0VkZ2VJbnNldHMpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmFyaWFibGVzLmNz cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1ZhcmlhYmxlcy5j c3MKaW5kZXggYzY4MWI3MzQwYjNhMjg3Y2NhN2Y1ZWM1MWM5YzliMjZiZWNiZjRkZi4uMGY1MmQz M2QwYzUxNzZlZTVjM2VhZmNkZDE5ZDI1Y2MwYTdmODQ3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmFyaWFibGVzLmNzcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WYXJpYWJsZXMuY3NzCkBAIC0y NDUsMTAgKzI0NSwxMiBAQCBib2R5LmJpZy1zdXIgewogfQogCiBib2R5Lm1hYy1wbGF0Zm9ybTpu b3QoLmJpZy1zdXIpOm5vdCguZG9ja2VkKSB7CisgICAgLyoga2VlcCBpbiBzeW5jIHdpdGggYFdJ LnVuZG9ja2VkVGl0bGVBcmVhSGVpZ2h0YCAqLwogICAgIC0tdW5kb2NrZWQtdGl0bGUtYXJlYS1o ZWlnaHQ6IGNhbGMoMjJweCAvIHZhcigtLXpvb20tZmFjdG9yKSk7CiB9CiAKIGJvZHkubWFjLXBs YXRmb3JtLmJpZy1zdXI6bm90KC5kb2NrZWQpIHsKKyAgICAvKiBrZWVwIGluIHN5bmMgd2l0aCBg V0kudW5kb2NrZWRUaXRsZUFyZWFIZWlnaHRgICovCiAgICAgLS11bmRvY2tlZC10aXRsZS1hcmVh LWhlaWdodDogY2FsYygyN3B4IC8gdmFyKC0tem9vbS1mYWN0b3IpKTsKIH0KIApAQCAtNDEyLDcg KzQxNCw3IEBAIGJvZHkubWFjLXBsYXRmb3JtLmJpZy1zdXI6bm90KC5kb2NrZWQpIHsKICAgICB9 CiB9CiAKLWJvZHkubWFjLXBsYXRmb3JtOm5vdCguc2llcnJhLCAuaGlnaC1zaWVycmEpIHsKK2Jv ZHkubWFjLXBsYXRmb3JtIHsKICAgICAtLXNlbGVjdGVkLWZvcmVncm91bmQtY29sb3I6IC1hcHBs ZS1zeXN0ZW0tYWx0ZXJuYXRlLXNlbGVjdGVkLXRleHQ7CiAgICAgLS1zZWxlY3RlZC1iYWNrZ3Jv dW5kLWNvbG9yOiAtYXBwbGUtc3lzdGVtLXNlbGVjdGVkLWNvbnRlbnQtYmFja2dyb3VuZDsKICAg ICAtLXNlbGVjdGVkLXRleHQtYmFja2dyb3VuZC1jb2xvcjogLWFwcGxlLXN5c3RlbS1zZWxlY3Rl ZC10ZXh0LWJhY2tncm91bmQ7Cg==