186308 2018-06-05 09:49:55 -0700 Web Inspector: allow use of dark mode theme independently from system-wide theme 2020-03-03 00:07:34 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 169511 208503 1 bburg hi bburg commit-queue ews-watchlist hi inspector-bugzilla-changes joepeck timothy webkit-bug-importer oldest_to_newest 1430120 0 bburg 2018-06-05 09:49:55 -0700 Requested by Chris Chiera in https://bugs.webkit.org/show_bug.cgi?id=169511 1430121 1 webkit-bug-importer 2018-06-05 09:50:15 -0700 <rdar://problem/40811344> 1453108 2 bburg 2018-08-23 10:21:07 -0700 <rdar://problem/40785895> 1623889 3 391963 hi 2020-02-27 22:55:45 -0800 Created attachment 391963 Patch 1623895 4 391963 commit-queue 2020-02-27 23:56:54 -0800 Comment on attachment 391963 Patch Clearing flags on attachment: 391963 Committed r257620: <https://trac.webkit.org/changeset/257620> 1623896 5 commit-queue 2020-02-27 23:56:56 -0800 All reviewed patches have been landed. Closing bug. 391963 2020-02-27 22:55:45 -0800 2020-02-27 23:56:54 -0800 Patch bug-186308-20200227225544.patch text/plain 12565 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmMDQwMTdmYzJiMDA1M2U4YjQyZDMyNDAwZjY1MmNlMGIzYzZjOWM2Li43 OGVmMTliOTE1MjgxODE4ZWM0ZjE0MjdiZDJiMmYwMDQ1ZDdkNGMzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTcgQEAKKzIwMjAtMDItMjcgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGFsbG93IHVzZSBvZiBkYXJrIG1vZGUgdGhlbWUg aW5kZXBlbmRlbnRseSBmcm9tIHN5c3RlbS13aWRlIHRoZW1lCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODYzMDgKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzQwNzg1ODk1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5pZGw6CisgICAgICAgICog aW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5oOgorICAgICAgICAqIGluc3BlY3Rvci9J bnNwZWN0b3JGcm9udGVuZEhvc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRnJv bnRlbmRIb3N0OjpzZXRGb3JjZWRBcHBlYXJhbmNlKTogQWRkZWQuCisgICAgICAgIEV4cG9zZSBh IHdheSB0byBjYWxsIGBQYWdlOjpzZXRVc2VEYXJrQXBwZWFyYW5jZU92ZXJyaWRlYCBmcm9tIHRo ZSBXZWIgSW5zcGVjdG9yIGZyb250ZW5kLgorCiAyMDIwLTAyLTI3ICBSb2IgQnVpcyAgPHJidWlz QGlnYWxpYS5jb20+CiAKICAgICAgICAgQWRkIHJlZmVycmVycG9saWN5IGF0dHJpYnV0ZSBzdXBw b3J0IGZvciBpbWFnZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGM4NDAzMTNjNzk0MmU3 NjEyZDNhYWEzNjM0ZDdkMDZjY2VkZDNmNDcuLmMwOWZhYjVkOTQ4ZjBjZjliODU2YWQ2YzEwMGEx MWYxMTE4YmJmMTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisy MDIwLTAyLTI3ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBX ZWIgSW5zcGVjdG9yOiBhbGxvdyB1c2Ugb2YgZGFyayBtb2RlIHRoZW1lIGluZGVwZW5kZW50bHkg ZnJvbSBzeXN0ZW0td2lkZSB0aGVtZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTg2MzA4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80MDc4NTg5NT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv U2V0dGluZ3NUYWJDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLlNldHRpbmdzVGFiQ29udGVu dFZpZXcucHJvdG90eXBlLl9jcmVhdGVHZW5lcmFsU2V0dGluZ3NWaWV3KToKKyAgICAgICAgQ3Jl YXRlIGEgc2V0dGluZyBmb3IgY29udHJvbGxpbmcvcHJlc2VydmluZyB0aGUgdGhlbWUgb2YgdGhl IGZyb250ZW5kIFVJLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL01haW4uanM6Cisg ICAgICAgIChXSS5sb2FkZWQpOgorICAgICAgICAoV0kuY29udGVudExvYWRlZCk6CisgICAgICAg IEFwcGx5IHRoZSBjcmVhdGVkIHNldHRpbmcgd2hlbiBXZWIgSW5zcGVjdG9yIGlzIG9wZW5lZCBv ciBpZiBpdHMgdmFsdWUgY2hhbmdlcy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv U2V0dGluZ0VkaXRvci5qczoKKyAgICAgICAgKFdJLlNldHRpbmdFZGl0b3IucHJvdG90eXBlLl9j cmVhdGVFZGl0b3JFbGVtZW50KToKKyAgICAgICAgQWxsb3cgaG9yaXpvbnRhbCBkaXZpZGVycyBp biBgPHNlbGVjdD5gIHNldHRpbmcgZWRpdG9ycy4KKworICAgICAgICAqIExvY2FsaXphdGlvbnMv ZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKwogMjAyMC0wMi0yNyAgRGV2aW4gUm91c3Nv ICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogbG9jYWxpemUg dGhlIHBsYWNlaG9sZGVyICJIZWFkZXIiIGFuZCAidmFsdWUiIHdoZW4gZWRpdGluZyBhIGxvY2Fs IG92ZXJyaWRlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y RnJvbnRlbmRIb3N0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9u dGVuZEhvc3QuY3BwCmluZGV4IDQxNjgzODllNDU0OTBjMjEzZWNkOWI2YTkzNjU0YjI0YTM0Njk4 ZTMuLjkzYzFiNTdhZGZmNGM1OWQyMjQwZTliYzI4ZDBmZDVmOThlNDg0MzQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuY3BwCkBAIC0y MzIsNiArMjMyLDE5IEBAIGZsb2F0IEluc3BlY3RvckZyb250ZW5kSG9zdDo6em9vbUZhY3Rvcigp CiAgICAgcmV0dXJuIDEuMDsKIH0KIAordm9pZCBJbnNwZWN0b3JGcm9udGVuZEhvc3Q6OnNldEZv cmNlZEFwcGVhcmFuY2UoU3RyaW5nIGFwcGVhcmFuY2UpCit7CisgICAgaWYgKCFtX2Zyb250ZW5k UGFnZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYgKGFwcGVhcmFuY2UgPT0gImxpZ2h0Il9z KQorICAgICAgICBtX2Zyb250ZW5kUGFnZS0+c2V0VXNlRGFya0FwcGVhcmFuY2VPdmVycmlkZShm YWxzZSk7CisgICAgZWxzZSBpZiAoYXBwZWFyYW5jZSA9PSAiZGFyayJfcykKKyAgICAgICAgbV9m cm9udGVuZFBhZ2UtPnNldFVzZURhcmtBcHBlYXJhbmNlT3ZlcnJpZGUodHJ1ZSk7CisgICAgZWxz ZQorICAgICAgICBtX2Zyb250ZW5kUGFnZS0+c2V0VXNlRGFya0FwcGVhcmFuY2VPdmVycmlkZShX VEY6Om51bGxvcHQpOworfQorCiBTdHJpbmcgSW5zcGVjdG9yRnJvbnRlbmRIb3N0Ojp1c2VySW50 ZXJmYWNlTGF5b3V0RGlyZWN0aW9uKCkKIHsKICAgICBpZiAobV9jbGllbnQgJiYgbV9jbGllbnQt PnVzZXJJbnRlcmZhY2VMYXlvdXREaXJlY3Rpb24oKSA9PSBVc2VySW50ZXJmYWNlTGF5b3V0RGly ZWN0aW9uOjpSVEwpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yRnJvbnRlbmRIb3N0LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJv bnRlbmRIb3N0LmgKaW5kZXggOTgwNjk4NDU4NDUwMzNkZGQ0ZDFmOTdjZjNjM2U5NDA0MmEyODg1 NC4uNTFmYTUwNWQ2NjBjMDIwOTA5YTA4NGFjMTJmNmEyMjM4ODM4YzBkZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuaApAQCAtNjgsNiAr NjgsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRab29tRmFjdG9yKGZsb2F0KTsKICAgICBmbG9h dCB6b29tRmFjdG9yKCk7CiAKKyAgICB2b2lkIHNldEZvcmNlZEFwcGVhcmFuY2UoU3RyaW5nKTsK KwogICAgIFN0cmluZyB1c2VySW50ZXJmYWNlTGF5b3V0RGlyZWN0aW9uKCk7CiAKICAgICB2b2lk IHJlcXVlc3RTZXREb2NrU2lkZShjb25zdCBTdHJpbmcmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuaWRsIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5pZGwKaW5kZXggZDZjMDhlZTBmMzQy ZTJhNWZiNGUyYmEyZDc4MGM3ZTJlNTZjZDk5Mi4uZDVhOWUxZWRhMzk2NDI0MjNkYmQ2MDg3OTk4 NzVlOTM1NWE3YWIwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckZyb250ZW5kSG9zdC5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckZyb250ZW5kSG9zdC5pZGwKQEAgLTQ4LDYgKzQ4LDggQEAKICAgICB2b2lkIHNldFpvb21G YWN0b3IodW5yZXN0cmljdGVkIGZsb2F0IHpvb20pOwogICAgIGZsb2F0IHpvb21GYWN0b3IoKTsK IAorICAgIHZvaWQgc2V0Rm9yY2VkQXBwZWFyYW5jZShET01TdHJpbmcgYXBwZWFyYW5jZSk7CisK ICAgICBET01TdHJpbmcgdXNlckludGVyZmFjZUxheW91dERpcmVjdGlvbigpOwogCiAgICAgdm9p ZCByZXF1ZXN0U2V0RG9ja1NpZGUoRE9NU3RyaW5nIHNpZGUpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXpl ZFN0cmluZ3MuanMKaW5kZXggM2IzMjc1Nzk2MGNhZDg2YjUyYzMzYzg4YjUyMTgzYmY3NDQ3NTBh Yi4uYzkyMDViMDQ5OTU2MGIzZTk4MDlkM2M5YjVmZDVhODg3NzdiNTBjYyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3Ry aW5ncy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJv ai9sb2NhbGl6ZWRTdHJpbmdzLmpzCkBAIC0xMzgsNiArMTM4LDcgQEAgbG9jYWxpemVkU3RyaW5n c1siQW5vbnltb3VzIFNjcmlwdCAlZCJdID0gIkFub255bW91cyBTY3JpcHQgJWQiOwogbG9jYWxp emVkU3RyaW5nc1siQW5vbnltb3VzIFNjcmlwdHMiXSA9ICJBbm9ueW1vdXMgU2NyaXB0cyI7CiBs b2NhbGl6ZWRTdHJpbmdzWyJBbm9ueW1vdXMgU3R5bGUgU2hlZXQgJWQiXSA9ICJBbm9ueW1vdXMg U3R5bGUgU2hlZXQgJWQiOwogbG9jYWxpemVkU3RyaW5nc1siQW5vbnltb3VzIFN0eWxlIFNoZWV0 cyJdID0gIkFub255bW91cyBTdHlsZSBTaGVldHMiOworbG9jYWxpemVkU3RyaW5nc1siQXBwZWFy YW5jZToiXSA9ICJBcHBlYXJhbmNlOiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJBcHBsaWNhdGlvbiBD YWNoZSJdID0gIkFwcGxpY2F0aW9uIENhY2hlIjsKIC8qIEFwcHJveGltYXRlIGNvdW50IG9mIGV2 ZW50cyAqLwogbG9jYWxpemVkU3RyaW5nc1siQXBwcm94aW1hdGUgTnVtYmVyIl0gPSAifiVzIjsK QEAgLTM0OCw2ICszNDksOCBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJET00gRXZlbnQgXHUyMDFDJXNc dTIwMUQiXSA9ICJET00gRXZlbnQgXHUyMDFDJXNcdTIwMUQiOwogbG9jYWxpemVkU3RyaW5nc1si RE9NIEV2ZW50cyJdID0gIkRPTSBFdmVudHMiOwogbG9jYWxpemVkU3RyaW5nc1siRE9NIE5vZGVz OiJdID0gIkRPTSBOb2RlczoiOwogbG9jYWxpemVkU3RyaW5nc1siRGFtcGluZyJdID0gIkRhbXBp bmciOworLyogTGFiZWwgb2YgZHJvcGRvd24gaXRlbSB1c2VkIGZvciBmb3JjaW5nIFdlYiBJbnNw ZWN0b3IgdG8gYmUgc2hvd24gdXNpbmcgYSBkYXJrIHRoZW1lICovCitsb2NhbGl6ZWRTdHJpbmdz WyJEYXJrIEAgU2V0dGluZ3MgR2VuZXJhbCBBcHBlYXJhbmNlIl0gPSAiRGFyayI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJEYXRhIl0gPSAiRGF0YSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJEYXRhIEJpbmRp bmdzIl0gPSAiRGF0YSBCaW5kaW5ncyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJEYXRhIHJldHVybmVk IGZyb20gdGhlIGRhdGFiYXNlIGlzIHRvbyBsYXJnZS4iXSA9ICJEYXRhIHJldHVybmVkIGZyb20g dGhlIGRhdGFiYXNlIGlzIHRvbyBsYXJnZS4iOwpAQCAtNjkyLDYgKzY5NSw4IEBAIGxvY2FsaXpl ZFN0cmluZ3NbIkxheW91dCAmIFJlbmRlcmluZyJdID0gIkxheW91dCAmIFJlbmRlcmluZyI7CiAv KiBMYXlvdXQgcGhhc2UgdGltZWxpbmUgcmVjb3JkcyAqLwogbG9jYWxpemVkU3RyaW5nc1siTGF5 b3V0IEAgVGltZWxpbmUgcmVjb3JkIl0gPSAiTGF5b3V0IjsKIGxvY2FsaXplZFN0cmluZ3NbIkxh eW91dCBJbnZhbGlkYXRlZCJdID0gIkxheW91dCBJbnZhbGlkYXRlZCI7CisvKiBMYWJlbCBvZiBk cm9wZG93biBpdGVtIHVzZWQgZm9yIGZvcmNpbmcgV2ViIEluc3BlY3RvciB0byBiZSBzaG93biB1 c2luZyBhIGxpZ2h0IHRoZW1lICovCitsb2NhbGl6ZWRTdHJpbmdzWyJMaWdodCBAIFNldHRpbmdz IEdlbmVyYWwgQXBwZWFyYW5jZSJdID0gIkxpZ2h0IjsKIGxvY2FsaXplZFN0cmluZ3NbIkxpbmUg JWQiXSA9ICJMaW5lICVkIjsKIGxvY2FsaXplZFN0cmluZ3NbIkxpbmUgJWQ6JWQiXSA9ICJMaW5l ICVkOiVkIjsKIGxvY2FsaXplZFN0cmluZ3NbIkxpbmUgTnVtYmVyIl0gPSAiTGluZSBOdW1iZXIi OwpAQCAtMTE2Myw2ICsxMTY4LDggQEAgbG9jYWxpemVkU3RyaW5nc1siU3ViamVjdCJdID0gIlN1 YmplY3QiOwogLyogQSBzdWJtZW51IGl0ZW0gb2YgJ0JyZWFrIE9uJyB0aGF0IGJyZWFrcyAocGF1 c2VzKSBiZWZvcmUgY2hpbGQgRE9NIG5vZGUgaXMgbW9kaWZpZWQgKi8KIGxvY2FsaXplZFN0cmlu Z3NbIlN1YnRyZWUgTW9kaWZpZWQiXSA9ICJTdWJ0cmVlIE1vZGlmaWVkIjsKIGxvY2FsaXplZFN0 cmluZ3NbIlN1bW1hcnkiXSA9ICJTdW1tYXJ5IjsKKy8qIExhYmVsIG9mIGRyb3Bkb3duIGl0ZW0g dXNlZCBmb3IgZm9yY2luZyBXZWIgSW5zcGVjdG9yIHRvIGJlIHNob3duIHVzaW5nIHRoZSBzeXN0 ZW0ncyB0aGVtZSAqLworbG9jYWxpemVkU3RyaW5nc1siU3lzdGVtIEAgU2V0dGluZ3MgR2VuZXJh bCBBcHBlYXJhbmNlIl0gPSAiU3lzdGVtIjsKIGxvY2FsaXplZFN0cmluZ3NbIlRDUCJdID0gIlRD UCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJUSUZGIl0gPSAiVElGRiI7CiBsb2NhbGl6ZWRTdHJpbmdz WyJUYWIgd2lkdGg6Il0gPSAiVGFiIHdpZHRoOiI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKaW5kZXggMjgzNTM3NjM4MzFkNDNiNDdmOTlj MDkwZWNhNWFhZjcxZWQ4OWFhYS4uNDJlN2E1MjlhZWQxMTIyNTU2MDljYTgxY2UwYjkxZTgwYzI2 NjhiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFz ZS9NYWluLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2Uv TWFpbi5qcwpAQCAtMTg4LDYgKzE4OCw3IEBAIFdJLmxvYWRlZCA9IGZ1bmN0aW9uKCkKICAgICAv LyBTdGF0ZS4KICAgICBXSS5wcmludFN0eWxlc0VuYWJsZWQgPSBmYWxzZTsKICAgICBXSS5zZXRa b29tRmFjdG9yKFdJLnNldHRpbmdzLnpvb21GYWN0b3IudmFsdWUpOworICAgIEluc3BlY3RvckZy b250ZW5kSG9zdC5zZXRGb3JjZWRBcHBlYXJhbmNlKFdJLnNldHRpbmdzLmZyb250ZW5kQXBwZWFy YW5jZS52YWx1ZSk7CiAgICAgV0kubW91c2VDb29yZHMgPSB7eDogMCwgeTogMH07CiAgICAgV0ku bW9kaWZpZXJLZXlzID0ge2FsdEtleTogZmFsc2UsIG1ldGFLZXk6IGZhbHNlLCBzaGlmdEtleTog ZmFsc2V9OwogICAgIFdJLnZpc2libGUgPSBmYWxzZTsKQEAgLTU0MCw2ICs1NDEsMTAgQEAgV0ku Y29udGVudExvYWRlZCA9IGZ1bmN0aW9uKCkKICAgICBXSS5zZXR0aW5ncy5jb25zb2xlU2F2ZWRS ZXN1bHRBbGlhcy5hZGRFdmVudExpc3RlbmVyKFdJLlNldHRpbmcuRXZlbnQuQ2hhbmdlZCwgdXBk YXRlQ29uc29sZVNhdmVkUmVzdWx0UHJlZml4Q1NTVmFyaWFibGUpOwogICAgIHVwZGF0ZUNvbnNv bGVTYXZlZFJlc3VsdFByZWZpeENTU1ZhcmlhYmxlKCk7CiAKKyAgICBXSS5zZXR0aW5ncy5mcm9u dGVuZEFwcGVhcmFuY2UuYWRkRXZlbnRMaXN0ZW5lcihXSS5TZXR0aW5nLkV2ZW50LkNoYW5nZWQs IChldmVudCkgPT4geworICAgICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3Quc2V0Rm9yY2VkQXBw ZWFyYW5jZShXSS5zZXR0aW5ncy5mcm9udGVuZEFwcGVhcmFuY2UudmFsdWUpOworICAgIH0sIFdJ KTsKKwogICAgIC8vIFNpZ25hbCB0aGF0IHRoZSBmcm9udGVuZCBpcyBub3cgcmVhZHkgdG8gcmVj ZWl2ZSBtZXNzYWdlcy4KICAgICBXSS5fYmFja2VuZFRhcmdldEF2YWlsYWJsZVByb21pc2UucHJv bWlzZS50aGVuKCgpID0+IHsKICAgICAgICAgSW5zcGVjdG9yRnJvbnRlbmRBUEkubG9hZENvbXBs ZXRlZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv QmFzZS9TZXR0aW5nLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFz ZS9TZXR0aW5nLmpzCmluZGV4IDg2OTFlM2VhN2QwMTBjNWMwZDA2YmFmNThiOWFiMTk3ZjY2YjMw MDIuLjIxMzA1YjdkZGYwZDYyYjRmNTg1MjBiOTYyZDU2NTE0ZWU0OTE0ZTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvU2V0dGluZy5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMKQEAg LTE4Nyw2ICsxODcsNyBAQCBXSS5zZXR0aW5ncyA9IHsKICAgICBlbXVsYXRlSW5Vc2VyR2VzdHVy ZTogbmV3IFdJLlNldHRpbmcoImVtdWxhdGUtaW4tdXNlci1nZXN0dXJlIiwgZmFsc2UpLAogICAg IGVuYWJsZUNvbnRyb2xGbG93UHJvZmlsZXI6IG5ldyBXSS5TZXR0aW5nKCJlbmFibGUtY29udHJv bC1mbG93LXByb2ZpbGVyIiwgZmFsc2UpLAogICAgIGVuYWJsZUxpbmVXcmFwcGluZzogbmV3IFdJ LlNldHRpbmcoImVuYWJsZS1saW5lLXdyYXBwaW5nIiwgdHJ1ZSksCisgICAgZnJvbnRlbmRBcHBl YXJhbmNlOiBuZXcgV0kuU2V0dGluZygiZnJvbnRlbmQtYXBwZWFyYW5jZSIsICJzeXN0ZW0iKSwK ICAgICBncm91cE1lZGlhUmVxdWVzdHNCeURPTU5vZGU6IG5ldyBXSS5TZXR0aW5nKCJncm91cC1t ZWRpYS1yZXF1ZXN0cy1ieS1kb20tbm9kZSIsIFdJLlNldHRpbmcubWlncmF0ZVZhbHVlKCJncm91 cC1ieS1kb20tbm9kZSIpIHx8IGZhbHNlKSwKICAgICBpbmRlbnRVbml0OiBuZXcgV0kuU2V0dGlu ZygiaW5kZW50LXVuaXQiLCA0KSwKICAgICBpbmRlbnRXaXRoVGFiczogbmV3IFdJLlNldHRpbmco ImluZGVudC13aXRoLXRhYnMiLCBmYWxzZSksCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nRWRpdG9yLmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ0VkaXRvci5qcwppbmRleCA2NDhi YWE2YjE0YWJhMzc2ODRmZTQ2MTc3YjIxMjRlYjMxYmNkODJhLi4zZDQ1MWMyZmFjN2M0YWIyZjlj MGFhZTgzY2I3OWNhZDQ3NmJjNWFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nRWRpdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdFZGl0b3IuanMKQEAgLTE1OSw2ICsx NTksMTEgQEAgV0kuU2V0dGluZ0VkaXRvciA9IGNsYXNzIFNldHRpbmdFZGl0b3IgZXh0ZW5kcyBX SS5PYmplY3QKICAgICAgICAgICAgICAgICBrZXlWYWx1ZVBhaXJzID0gb3B0aW9ucy52YWx1ZXMu bWFwKCh2YWx1ZSkgPT4gW3ZhbHVlLCB2YWx1ZV0pOwogCiAgICAgICAgICAgICBmb3IgKGxldCBb a2V5LCB2YWx1ZV0gb2Yga2V5VmFsdWVQYWlycykgeworICAgICAgICAgICAgICAgIGlmIChrZXkg PT09IFdJLlNldHRpbmdFZGl0b3IuU2VsZWN0U3BhY2VyS2V5KSB7CisgICAgICAgICAgICAgICAg ICAgIGVkaXRvckVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaHIi KSk7CisgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgICAgIH0KKwog ICAgICAgICAgICAgICAgIGxldCBvcHRpb25FbGVtZW50ID0gZWRpdG9yRWxlbWVudC5hcHBlbmRD aGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJvcHRpb24iKSk7CiAgICAgICAgICAgICAgICAg b3B0aW9uRWxlbWVudC52YWx1ZSA9IGtleTsKICAgICAgICAgICAgICAgICBvcHRpb25FbGVtZW50 LnRleHRDb250ZW50ID0gdmFsdWU7CkBAIC0xODMsNiArMTg4LDggQEAgV0kuU2V0dGluZ0VkaXRv ci5UeXBlID0gewogICAgIFNlbGVjdDogInNldHRpbmctZWRpdG9yLXR5cGUtc2VsZWN0IiwKIH07 CiAKK1dJLlNldHRpbmdFZGl0b3IuU2VsZWN0U3BhY2VyS2V5ID0gU3ltYm9sKCJzZXR0aW5nLWVk aXRvci1zZWxlY3Qtc3BhY2VyLWtleSIpOworCiBXSS5TZXR0aW5nRWRpdG9yLkV2ZW50ID0gewog ICAgIFZhbHVlRGlkQ2hhbmdlOiAidmFsdWUtZGlkLWNoYW5nZSIsCiB9OwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250 ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Nl dHRpbmdzVGFiQ29udGVudFZpZXcuanMKaW5kZXggNGExY2M0NTcyMDE4MDM1ZTcyZWFhZTk0OTM5 YTQyYjE3MTk5ZjQ3Yy4uZjgxNjEyMDU5YjFlNzkwMTZjMDk5MmJhMGZlOGQ3NzUzOGY2MzhlMiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0 dGluZ3NUYWJDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LmpzCkBAIC0yMDIsNiArMjAyLDIy IEBAIFdJLlNldHRpbmdzVGFiQ29udGVudFZpZXcgPSBjbGFzcyBTZXR0aW5nc1RhYkNvbnRlbnRW aWV3IGV4dGVuZHMgV0kuVGFiQ29udGVudFZpCiAgICAgewogICAgICAgICBsZXQgZ2VuZXJhbFNl dHRpbmdzVmlldyA9IG5ldyBXSS5TZXR0aW5nc1ZpZXcoImdlbmVyYWwiLCBXSS5VSVN0cmluZygi R2VuZXJhbCIpKTsKIAorICAgICAgICBpZiAoQ1NTLnN1cHBvcnRzKCJjb2xvci1zY2hlbWUiLCAi bGlnaHQiKSAmJiBDU1Muc3VwcG9ydHMoImNvbG9yLXNjaGVtZSIsICJkYXJrIikpIHsKKyAgICAg ICAgICAgIGNvbnN0IGFwcGVhcmFuY2VWYWx1ZXMgPSBbCisgICAgICAgICAgICAgICAgWyJzeXN0 ZW0iLCBXSS5VSVN0cmluZygiU3lzdGVtIiwgIlN5c3RlbSBAIFNldHRpbmdzIEdlbmVyYWwgQXBw ZWFyYW5jZSIsICJMYWJlbCBvZiBkcm9wZG93biBpdGVtIHVzZWQgZm9yIGZvcmNpbmcgV2ViIElu c3BlY3RvciB0byBiZSBzaG93biB1c2luZyB0aGUgc3lzdGVtJ3MgdGhlbWUiKV0sCisgICAgICAg ICAgICAgICAgW1dJLlNldHRpbmdFZGl0b3IuU2VsZWN0U3BhY2VyS2V5LCBudWxsXSwKKyAgICAg ICAgICAgICAgICBbImxpZ2h0IiwgV0kuVUlTdHJpbmcoIkxpZ2h0IiwgIkxpZ2h0IEAgU2V0dGlu Z3MgR2VuZXJhbCBBcHBlYXJhbmNlIiwgIkxhYmVsIG9mIGRyb3Bkb3duIGl0ZW0gdXNlZCBmb3Ig Zm9yY2luZyBXZWIgSW5zcGVjdG9yIHRvIGJlIHNob3duIHVzaW5nIGEgbGlnaHQgdGhlbWUiKV0s CisgICAgICAgICAgICAgICAgWyJkYXJrIiwgV0kuVUlTdHJpbmcoIkRhcmsiLCAiRGFyayBAIFNl dHRpbmdzIEdlbmVyYWwgQXBwZWFyYW5jZSIsICJMYWJlbCBvZiBkcm9wZG93biBpdGVtIHVzZWQg Zm9yIGZvcmNpbmcgV2ViIEluc3BlY3RvciB0byBiZSBzaG93biB1c2luZyBhIGRhcmsgdGhlbWUi KV0sCisgICAgICAgICAgICBdOworICAgICAgICAgICAgbGV0IGFwcGVhcmFuY2VFZGl0b3IgPSBn ZW5lcmFsU2V0dGluZ3NWaWV3LmFkZEdyb3VwV2l0aEN1c3RvbVNldHRpbmcoV0kuVUlTdHJpbmco IkFwcGVhcmFuY2U6IiksIFdJLlNldHRpbmdFZGl0b3IuVHlwZS5TZWxlY3QsIHt2YWx1ZXM6IGFw cGVhcmFuY2VWYWx1ZXN9KTsKKyAgICAgICAgICAgIGFwcGVhcmFuY2VFZGl0b3IudmFsdWUgPSBX SS5zZXR0aW5ncy5mcm9udGVuZEFwcGVhcmFuY2UudmFsdWU7CisgICAgICAgICAgICBhcHBlYXJh bmNlRWRpdG9yLmFkZEV2ZW50TGlzdGVuZXIoV0kuU2V0dGluZ0VkaXRvci5FdmVudC5WYWx1ZURp ZENoYW5nZSwgKCkgPT4geworICAgICAgICAgICAgICAgIFdJLnNldHRpbmdzLmZyb250ZW5kQXBw ZWFyYW5jZS52YWx1ZSA9IGFwcGVhcmFuY2VFZGl0b3IudmFsdWU7CisgICAgICAgICAgICB9LCBX SS5zZXR0aW5ncy5mcm9udGVuZEFwcGVhcmFuY2UpOworCisgICAgICAgICAgICBnZW5lcmFsU2V0 dGluZ3NWaWV3LmFkZFNlcGFyYXRvcigpOworICAgICAgICB9CisKICAgICAgICAgY29uc3QgaW5k ZW50VmFsdWVzID0gW1dJLlVJU3RyaW5nKCJUYWJzIiksIFdJLlVJU3RyaW5nKCJTcGFjZXMiKV07 CiAgICAgICAgIGxldCBpbmRlbnRFZGl0b3IgPSBnZW5lcmFsU2V0dGluZ3NWaWV3LmFkZEdyb3Vw V2l0aEN1c3RvbVNldHRpbmcoV0kuVUlTdHJpbmcoIlByZWZlciBpbmRlbnQgdXNpbmc6IiksIFdJ LlNldHRpbmdFZGl0b3IuVHlwZS5TZWxlY3QsIHt2YWx1ZXM6IGluZGVudFZhbHVlc30pOwogICAg ICAgICBpbmRlbnRFZGl0b3IudmFsdWUgPSBpbmRlbnRWYWx1ZXNbV0kuc2V0dGluZ3MuaW5kZW50 V2l0aFRhYnMudmFsdWUgPyAwIDogMV07Cg==