43711 2010-08-09 02:19:09 -0700 Web Inspector: eliminate showPanel from InspectorFrontend and panels' enum from InspectorController 2010-08-09 04:45:37 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 loislo loislo bweinstein joepeck keishi pfeldman pmuellr rik timothy yurys oldest_to_newest 262035 0 loislo 2010-08-09 02:19:09 -0700 %subj% 262042 1 63876 loislo 2010-08-09 02:30:22 -0700 Created attachment 63876 [patch] initial version. 262050 2 63876 yurys 2010-08-09 02:40:32 -0700 Comment on attachment 63876 [patch] initial version. WebCore/inspector/InspectorController.cpp:  + if (panelName == "storage" || panelName == "databases") Please make sure that Storage panel will still be restored after your change. 262094 3 loislo 2010-08-09 04:45:37 -0700 Committed r64973 M WebCore/WebCore.exp.in M WebCore/ChangeLog M WebCore/inspector/InspectorFrontend.cpp M WebCore/inspector/InspectorController.cpp M WebCore/inspector/Inspector.idl M WebCore/inspector/InspectorFrontend.h M WebCore/inspector/front-end/ElementsTreeOutline.js M WebCore/inspector/front-end/inspector.js M WebCore/inspector/front-end/ExtensionServer.js M WebCore/inspector/InspectorController.h M LayoutTests/inspector/debugger-no-nested-pause.html M LayoutTests/inspector/debugger-proto-property.html M LayoutTests/inspector/elements-panel-limited-children.html M LayoutTests/inspector/debugger-pause-in-eval-script.html M LayoutTests/inspector/debugger-pause-on-debugger-statement.html M LayoutTests/inspector/debugger-breakpoints-not-activated-on-reload.html M LayoutTests/inspector/debugger-eval-while-paused.html M LayoutTests/inspector/debugger-cyclic-ref.html M LayoutTests/ChangeLog r64973 = acb548e8bc8abaa405557882efc6483576321376 (refs/remotes/trunk) 63876 2010-08-09 02:30:22 -0700 2010-08-09 02:40:32 -0700 [patch] initial version. patch text/plain 21391 loislo ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxNDMxNjY4Li5hYWM3YzkyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTAtMDgt MDkgIElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYkluc3BlY3RvcjogQ3VycmVu dCBpbXBsZW1lbnRhdGlvbiBvZiBzaG93UGFuZWwgaXMgYSBiaXQgY29tcGxpY2F0ZWQuCisgICAg ICAgIEl0IGlzIHVzaW5nIGludGVybmFsIGVudW0gZm9yIGFsbCB0aGUgcGFuZWxzIGFuZCB0aGlz IGlzIHRoZSBwcm9ibGVtIGJlY2F1c2UKKyAgICAgICAgd2Ugc2hvdWxkIGNoYW5nZSBhIGxvdCBv ZiBjb2RlIGZvciBhIG5ldyBwYW5lbC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTQzNzExCisgICAgICAgIAorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1 Z2dlci1icmVha3BvaW50cy1ub3QtYWN0aXZhdGVkLW9uLXJlbG9hZC5odG1sOgorICAgICAgICAq IGluc3BlY3Rvci9kZWJ1Z2dlci1jeWNsaWMtcmVmLmh0bWw6CisgICAgICAgICogaW5zcGVjdG9y L2RlYnVnZ2VyLWV2YWwtd2hpbGUtcGF1c2VkLmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL2Rl YnVnZ2VyLW5vLW5lc3RlZC1wYXVzZS5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dl ci1wYXVzZS1pbi1ldmFsLXNjcmlwdC5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dl ci1wYXVzZS1vbi1kZWJ1Z2dlci1zdGF0ZW1lbnQuaHRtbDoKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZGVidWdnZXItcHJvdG8tcHJvcGVydHkuaHRtbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZWxlbWVu dHMtcGFuZWwtbGltaXRlZC1jaGlsZHJlbi5odG1sOgorCiAyMDEwLTA4LTA1ICBNT1JJVEEgSGFq aW1lICA8bW9ycml0YUBnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFRvbnkgQ2hh bmcuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXItYnJlYWtwb2lu dHMtbm90LWFjdGl2YXRlZC1vbi1yZWxvYWQuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9k ZWJ1Z2dlci1icmVha3BvaW50cy1ub3QtYWN0aXZhdGVkLW9uLXJlbG9hZC5odG1sCmluZGV4IGM4 NzE4ZDguLjU2Mjc2OWMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dl ci1icmVha3BvaW50cy1ub3QtYWN0aXZhdGVkLW9uLXJlbG9hZC5odG1sCisrKyBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9kZWJ1Z2dlci1icmVha3BvaW50cy1ub3QtYWN0aXZhdGVkLW9uLXJlbG9h ZC5odG1sCkBAIC0yMSw3ICsyMSw3IEBAIGZ1bmN0aW9uIGZyb250ZW5kX3Rlc3RCcmVha3BvaW50 c05vdEFjdGl2YXRlZE9uUmVsb2FkKHRlc3RDb250cm9sbGVyKQogCiAgICAgdGVzdENvbnRyb2xs ZXIud2FpdFVudGlsRG9uZSgpOwogCi0gICAgV2ViSW5zcGVjdG9yLnNob3dTY3JpcHRzUGFuZWwo KTsKKyAgICBXZWJJbnNwZWN0b3Iuc2hvd1BhbmVsKCJzY3JpcHRzIik7CiAgICAgZnJvbnRlbmRf ZW5zdXJlRGVidWdnZXJFbmFibGVkKGRlYnVnZ2VyV2FzRW5hYmxlZENhbGxiYWNrKTsKIAogICAg IGZ1bmN0aW9uIGRlYnVnZ2VyV2FzRW5hYmxlZENhbGxiYWNrKCkKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci1jeWNsaWMtcmVmLmh0bWwgYi9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvZGVidWdnZXItY3ljbGljLXJlZi5odG1sCmluZGV4IGZjODI5NDMuLmIzZmE2NjAg MTAwNzU1Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci1jeWNsaWMtcmVmLmh0 bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyLWN5Y2xpYy1yZWYuaHRtbApA QCAtMjEsNyArMjEsNyBAQCBmdW5jdGlvbiBmcm9udGVuZF90ZXN0RGVidWdPYmplY3RXaXRoQ3lj bGljUmVmKHRlc3RDb250cm9sbGVyKQogewogICAgIHRlc3RDb250cm9sbGVyLndhaXRVbnRpbERv bmUoKTsKIAotICAgIFdlYkluc3BlY3Rvci5zaG93U2NyaXB0c1BhbmVsKCk7CisgICAgV2ViSW5z cGVjdG9yLnNob3dQYW5lbCgic2NyaXB0cyIpOwogICAgIGZyb250ZW5kX2Vuc3VyZURlYnVnZ2Vy RW5hYmxlZChkZWJ1Z2dlcldhc0VuYWJsZWRDYWxsYmFjayk7CiAKICAgICBmdW5jdGlvbiBkZWJ1 Z2dlcldhc0VuYWJsZWRDYWxsYmFjaygpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvZGVidWdnZXItZXZhbC13aGlsZS1wYXVzZWQuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rv ci9kZWJ1Z2dlci1ldmFsLXdoaWxlLXBhdXNlZC5odG1sCmluZGV4IDJkNGE1MDQuLjIzZWFhZDgg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci1ldmFsLXdoaWxlLXBh dXNlZC5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci1ldmFsLXdoaWxl LXBhdXNlZC5odG1sCkBAIC0yNSw3ICsyNSw3IEBAIGZ1bmN0aW9uIGZyb250ZW5kX3Rlc3RQYXVz ZU9uRGVidWdnZXJTdGF0ZW1lbnQodGVzdENvbnRyb2xsZXIpCiB7CiAgICAgdGVzdENvbnRyb2xs ZXIud2FpdFVudGlsRG9uZSgpOwogCi0gICAgV2ViSW5zcGVjdG9yLnNob3dTY3JpcHRzUGFuZWwo KTsKKyAgICBXZWJJbnNwZWN0b3Iuc2hvd1BhbmVsKCJzY3JpcHRzIik7CiAgICAgZnJvbnRlbmRf ZW5zdXJlRGVidWdnZXJFbmFibGVkKGRlYnVnZ2VyV2FzRW5hYmxlZENhbGxiYWNrKTsKIAogICAg IGZ1bmN0aW9uIGRlYnVnZ2VyV2FzRW5hYmxlZENhbGxiYWNrKCkKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci1uby1uZXN0ZWQtcGF1c2UuaHRtbCBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9kZWJ1Z2dlci1uby1uZXN0ZWQtcGF1c2UuaHRtbAppbmRleCAxZjM1YmE1 Li5mMTgzMTA1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXItbm8t bmVzdGVkLXBhdXNlLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyLW5v LW5lc3RlZC1wYXVzZS5odG1sCkBAIC0yMCw3ICsyMCw3IEBAIGZ1bmN0aW9uIGZyb250ZW5kX3Rl c3ROb05lc3RlZFBhdXNlKHRlc3RDb250cm9sbGVyKQogewogICAgIHRlc3RDb250cm9sbGVyLndh aXRVbnRpbERvbmUoKTsKIAotICAgIFdlYkluc3BlY3Rvci5zaG93U2NyaXB0c1BhbmVsKCk7Cisg ICAgV2ViSW5zcGVjdG9yLnNob3dQYW5lbCgic2NyaXB0cyIpOwogICAgIGZyb250ZW5kX2Vuc3Vy ZURlYnVnZ2VyRW5hYmxlZChkZWJ1Z2dlcldhc0VuYWJsZWRDYWxsYmFjayk7CiAKICAgICBmdW5j dGlvbiBkZWJ1Z2dlcldhc0VuYWJsZWRDYWxsYmFjaygpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvZGVidWdnZXItcGF1c2UtaW4tZXZhbC1zY3JpcHQuaHRtbCBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9kZWJ1Z2dlci1wYXVzZS1pbi1ldmFsLXNjcmlwdC5odG1sCmluZGV4IDJh ZjAxM2MuLmNhZTJhOTQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dl ci1wYXVzZS1pbi1ldmFsLXNjcmlwdC5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9k ZWJ1Z2dlci1wYXVzZS1pbi1ldmFsLXNjcmlwdC5odG1sCkBAIC0xMyw3ICsxMyw3IEBAIGZ1bmN0 aW9uIGZyb250ZW5kX3Rlc3RQYXVzZU9uRGVidWdnZXJTdGF0ZW1lbnQodGVzdENvbnRyb2xsZXIp CiB7CiAgICAgdGVzdENvbnRyb2xsZXIud2FpdFVudGlsRG9uZSgpOwogCi0gICAgV2ViSW5zcGVj dG9yLnNob3dTY3JpcHRzUGFuZWwoKTsKKyAgICBXZWJJbnNwZWN0b3Iuc2hvd1BhbmVsKCJzY3Jp cHRzIik7CiAKICAgICB2YXIgc2NyaXB0VG9FdmFsdWF0ZSA9ICJmdW5jdGlvbiB0ZXN0RnVuY3Rp b24oKSB7XG4iICsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICIgICAgZGVidWdnZXI7XG4i ICsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci1wYXVzZS1vbi1k ZWJ1Z2dlci1zdGF0ZW1lbnQuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci1w YXVzZS1vbi1kZWJ1Z2dlci1zdGF0ZW1lbnQuaHRtbAppbmRleCAxZWE2ZDdjLi4yNDJjMjg3IDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXItcGF1c2Utb24tZGVidWdn ZXItc3RhdGVtZW50Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyLXBh dXNlLW9uLWRlYnVnZ2VyLXN0YXRlbWVudC5odG1sCkBAIC0xNyw3ICsxNyw3IEBAIGZ1bmN0aW9u IGZyb250ZW5kX3Rlc3RQYXVzZU9uRGVidWdnZXJTdGF0ZW1lbnQodGVzdENvbnRyb2xsZXIpCiB7 CiAgICAgdGVzdENvbnRyb2xsZXIud2FpdFVudGlsRG9uZSgpOwogCi0gICAgV2ViSW5zcGVjdG9y LnNob3dTY3JpcHRzUGFuZWwoKTsKKyAgICBXZWJJbnNwZWN0b3Iuc2hvd1BhbmVsKCJzY3JpcHRz Iik7CiAgICAgZnJvbnRlbmRfZW5zdXJlRGVidWdnZXJFbmFibGVkKGRlYnVnZ2VyV2FzRW5hYmxl ZENhbGxiYWNrKTsKIAogICAgIGZ1bmN0aW9uIGRlYnVnZ2VyV2FzRW5hYmxlZENhbGxiYWNrKCkK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci1wcm90by1wcm9wZXJ0 eS5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyLXByb3RvLXByb3BlcnR5Lmh0 bWwKaW5kZXggODZhN2QyOC4uNGQxMWIwMCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL2RlYnVnZ2VyLXByb3RvLXByb3BlcnR5Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL2RlYnVnZ2VyLXByb3RvLXByb3BlcnR5Lmh0bWwKQEAgLTI1LDcgKzI1LDcgQEAgZnVuY3Rp b24gZnJvbnRlbmRfdGVzdFByb3RvUHJvcGVydHlPblBhdXNlKHRlc3RDb250cm9sbGVyKQogewog ICAgIHRlc3RDb250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsKIAotICAgIFdlYkluc3BlY3Rvci5z aG93U2NyaXB0c1BhbmVsKCk7CisgICAgV2ViSW5zcGVjdG9yLnNob3dQYW5lbCgic2NyaXB0cyIp OwogICAgIGZyb250ZW5kX2Vuc3VyZURlYnVnZ2VyRW5hYmxlZChkZWJ1Z2dlcldhc0VuYWJsZWRD YWxsYmFjayk7CiAKICAgICBmdW5jdGlvbiBkZWJ1Z2dlcldhc0VuYWJsZWRDYWxsYmFjaygpCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMtcGFuZWwtbGltaXRlZC1j aGlsZHJlbi5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzLXBhbmVsLWxpbWl0 ZWQtY2hpbGRyZW4uaHRtbAppbmRleCA1Y2QwOTcwLi5iYjMwMzVlIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMtcGFuZWwtbGltaXRlZC1jaGlsZHJlbi5odG1sCisr KyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50cy1wYW5lbC1saW1pdGVkLWNoaWxkcmVu Lmh0bWwKQEAgLTEyNSw2ICsxMjUsNyBAQCBmdW5jdGlvbiBmcm9udGVuZF9yZXZlYWxBbmRFeHBh bmREYXRhTm9kZUluRWxlbWVudHNQYW5lbCh0ZXN0Q29udHJvbGxlcikKIAogZnVuY3Rpb24gZnJv bnRlbmRfbG9hZERPTSh0ZXN0Q29udHJvbGxlcikKIHsKKyAgICBXZWJJbnNwZWN0b3Iuc2hvd1Bh bmVsKCJlbGVtZW50cyIpOwogICAgIHRlc3RDb250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsKICAg ICAvLyBOZWVkIHRlc3QgdG8gYmUgYXN5bmMgdG8gZXhwYW5kIHdob2xlIHRoZSB0cmVlIGZpcnN0 LgogICAgIHRyeSB7CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IDcwNGJkYzguLmZmMWI5NmQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTAtMDgtMDkg IElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYkluc3BlY3RvcjogQ3VycmVudCBp bXBsZW1lbnRhdGlvbiBvZiBzaG93UGFuZWwgaXMgYSBiaXQgY29tcGxpY2F0ZWQuCisgICAgICAg IEl0IGlzIHVzaW5nIGludGVybmFsIGVudW0gZm9yIGFsbCB0aGUgcGFuZWxzIGFuZCB0aGlzIGlz IHRoZSBwcm9ibGVtIGJlY2F1c2UKKyAgICAgICAgd2Ugc2hvdWxkIGNoYW5nZSBhIGxvdCBvZiBj b2RlIGZvciBhIG5ldyBwYW5lbC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTQzNzExCisgICAgICAgIAorICAgICAgICAqIFdlYkNvcmUuZXhwLmluOgor ICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3IuaWRsOgorICAgICAgICAqIGluc3BlY3Rvci9J bnNwZWN0b3JDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRy b2xsZXI6Okluc3BlY3RvckNvbnRyb2xsZXIpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y Q29udHJvbGxlcjo6c3RvcmVMYXN0QWN0aXZlUGFuZWwpOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9yQ29udHJvbGxlcjo6Y29ubmVjdEZyb250ZW5kKToKKyAgICAgICAgKFdlYkNvcmU6Oklu c3BlY3RvckNvbnRyb2xsZXI6OnNob3dQYW5lbCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JDb250cm9sbGVyOjpkaXNjb25uZWN0RnJvbnRlbmQpOgorICAgICAgICAqIGluc3BlY3Rvci9J bnNwZWN0b3JDb250cm9sbGVyLmg6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckZyb250 ZW5kLmNwcDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmQuaDoKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVudC5wcm90b3R5cGUuc2VsZWN0T25Nb3Vz ZURvd24pOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uU2VydmVyLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkV4dGVuc2lvblNlcnZlci5wcm90b3R5cGUuX29uUmV2 ZWFsQW5kU2VsZWN0UmVzb3VyY2UpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5z cGVjdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmRvY3VtZW50Q2xpY2suZm9sbG93TGlu ayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuZG9jdW1lbnRDbGljayk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IudG9nZ2xlU2VhcmNoaW5nRm9yTm9kZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu c2hvd1BhbmVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5zZWxlY3REYXRhYmFzZSk6CisgICAg ICAgIChXZWJJbnNwZWN0b3Iuc2VsZWN0RE9NU3RvcmFnZSk6CisgICAgICAgIChXZWJJbnNwZWN0 b3Iuc2hvd1Byb2ZpbGVGb3JVUkwpOgorCiAyMDEwLTA4LTA4ICBLZXZpbiBPbGxpdmllciAgPGtl dmlub0B0aGVvbGxpdmllcnMuY29tPgogCiAgICAgICAgIFt3eF0gQnVpbGQgZml4LCBhZGQgbWVt YmVyIG5lZWRlZCB0byBjb21waWxlIE1hYy1zcGVjaWZpYyBmb250IGNvZGUuCmRpZmYgLS1naXQg YS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgppbmRleCBh OTZiMTkwLi4yNTc4YWVhIDEwMDY0NAotLS0gYS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCisrKyBi L1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KQEAgLTQyMiw3ICs0MjIsMTEgQEAgX19aTjdXZWJDb3Jl MTlBbmltYXRpb25Db250cm9sbGVyMjBwYXVzZUFuaW1hdGlvbkF0VGltZUVQTlNfMTJSZW5kZXJP YmplY3RFUktOU18KIF9fWk43V2ViQ29yZTE5QW5pbWF0aW9uQ29udHJvbGxlcjIxcGF1c2VUcmFu c2l0aW9uQXRUaW1lRVBOU18xMlJlbmRlck9iamVjdEVSS05TXzZTdHJpbmdFZAogX19aTjdXZWJD b3JlMTlCYWNrRm9yd2FyZExpc3RJbXBsQzFFUE5TXzRQYWdlRQogX19aTjdXZWJDb3JlMTlDU1NT dHlsZURlY2xhcmF0aW9uMTFzZXRQcm9wZXJ0eUVSS05TXzZTdHJpbmdFUzNfUmkKK19fWk43V2Vi Q29yZTE5SW5zcGVjdG9yQ29udHJvbGxlcjEyQ29uc29sZVBhbmVsRQorX19aTjdXZWJDb3JlMTlJ bnNwZWN0b3JDb250cm9sbGVyMTJTY3JpcHRzUGFuZWxFCitfX1pON1dlYkNvcmUxOUluc3BlY3Rv ckNvbnRyb2xsZXIxM1Byb2ZpbGVzUGFuZWxFCiBfX1pON1dlYkNvcmUxOUluc3BlY3RvckNvbnRy b2xsZXIzNGluc3BlY3RvclN0YXJ0c0F0dGFjaGVkU2V0dGluZ05hbWVFdgorX19aTjdXZWJDb3Jl MTlJbnNwZWN0b3JDb250cm9sbGVyOXNob3dQYW5lbEVSS05TXzZTdHJpbmdFCiBfX1pON1dlYkNv cmUxOVJlc291cmNlUmVxdWVzdEJhc2UxMXNldEhUVFBCb2R5RU4zV1RGMTBQYXNzUmVmUHRySU5T XzhGb3JtRGF0YUVFRQogX19aTjdXZWJDb3JlMTlSZXNvdXJjZVJlcXVlc3RCYXNlMTNzZXRIVFRQ TWV0aG9kRVJLTlNfNlN0cmluZ0UKIF9fWk43V2ViQ29yZTE5UmVzb3VyY2VSZXF1ZXN0QmFzZTE5 YWRkSFRUUEhlYWRlckZpZWxkc0VSS05TXzEzSFRUUEhlYWRlck1hcEUKQEAgLTExOTksNyArMTIw Myw2IEBAIF9fWk43V2ViQ29yZTE5SW5zcGVjdG9yQ29udHJvbGxlcjI3c3RhcnRVc2VySW5pdGlh dGVkUHJvZmlsaW5nRVBOU181VGltZXJJUzBfRUUKIF9fWk43V2ViQ29yZTE5SW5zcGVjdG9yQ29u dHJvbGxlcjRzaG93RXYKIF9fWk43V2ViQ29yZTE5SW5zcGVjdG9yQ29udHJvbGxlcjVjbG9zZUV2 CiBfX1pON1dlYkNvcmUxOUluc3BlY3RvckNvbnRyb2xsZXI3aW5zcGVjdEVQTlNfNE5vZGVFCi1f X1pON1dlYkNvcmUxOUluc3BlY3RvckNvbnRyb2xsZXI5c2hvd1BhbmVsRU5TMF8xM1NwZWNpYWxQ YW5lbHNFCiBfX1pON1dlYkNvcmUyOEluc3BlY3RvckZyb250ZW5kQ2xpZW50TG9jYWwxMm1vdmVX aW5kb3dCeUVmZgogX19aTjdXZWJDb3JlMjhJbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsMTRm cm9udGVuZExvYWRlZEV2CiBfX1pON1dlYkNvcmUyOEluc3BlY3RvckZyb250ZW5kQ2xpZW50TG9j YWwxNWNhbkF0dGFjaFdpbmRvd0V2CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3IuaWRsIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmlkbAppbmRleCA4ZDExMGFk Li40ZjY0M2EyIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuaWRsCisr KyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5pZGwKQEAgLTYwLDYgKzYwLDcgQEAgbW9k dWxlIGNvcmUgewogICAgICAgICBbbm90aWZ5XSB2b2lkIHNldENoaWxkTm9kZXMob3V0IGxvbmcg cGFyZW50SWQsIG91dCBBcnJheSBub2Rlcyk7CiAgICAgICAgIFtub3RpZnldIHZvaWQgc2V0RGV0 YWNoZWRSb290KG91dCBPYmplY3Qgcm9vdCk7CiAgICAgICAgIFtub3RpZnldIHZvaWQgc2V0RG9j dW1lbnQob3V0IFZhbHVlIHJvb3QpOworICAgICAgICBbbm90aWZ5XSB2b2lkIHNob3dQYW5lbChv dXQgU3RyaW5nIHBhbmVsKTsKICAgICAgICAgW25vdGlmeV0gdm9pZCB0aW1lbGluZVByb2ZpbGVy V2FzU3RhcnRlZCgpOwogICAgICAgICBbbm90aWZ5XSB2b2lkIHRpbWVsaW5lUHJvZmlsZXJXYXNT dG9wcGVkKCk7CiAgICAgICAgIFtub3RpZnldIHZvaWQgdXBkYXRlQ29uc29sZU1lc3NhZ2VFeHBp cmVkQ291bnQob3V0IHVuc2lnbmVkIGxvbmcgY291bnQpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JDb250cm9sbGVyLmNwcAppbmRleCA2OGZjYWVjLi41N2Q2ZmUxIDEwMDY0NAotLS0gYS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAorKysgYi9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcApAQCAtMTE5LDcgKzExOSwxMiBAQCBzdGF0 aWMgY29uc3QgY2hhciogY29uc3QgcmVzb3VyY2VUcmFja2luZ0VuYWJsZWRTZXR0aW5nTmFtZSA9 ICJyZXNvdXJjZVRyYWNraW5nRQogc3RhdGljIGNvbnN0IGNoYXIqIGNvbnN0IGRlYnVnZ2VyRW5h YmxlZFNldHRpbmdOYW1lID0gImRlYnVnZ2VyRW5hYmxlZCI7CiBzdGF0aWMgY29uc3QgY2hhciog Y29uc3QgcHJvZmlsZXJFbmFibGVkU2V0dGluZ05hbWUgPSAicHJvZmlsZXJFbmFibGVkIjsKIHN0 YXRpYyBjb25zdCBjaGFyKiBjb25zdCBpbnNwZWN0b3JBdHRhY2hlZEhlaWdodE5hbWUgPSAiaW5z cGVjdG9yQXR0YWNoZWRIZWlnaHQiOwotc3RhdGljIGNvbnN0IGNoYXIqIGNvbnN0IGxhc3RBY3Rp dmVQYW5lbFNldHRpbmdOYW1lID0gImxhc3RBY3RpdmVQYW5lbCI7CitzdGF0aWMgY29uc3QgY2hh ciogY29uc3QgbGFzdEFjdGl2ZVBhbmVsID0gImxhc3RBY3RpdmVQYW5lbCI7Citjb25zdCBjaGFy KiBjb25zdCBJbnNwZWN0b3JDb250cm9sbGVyOjpFbGVtZW50c1BhbmVsID0gImVsZW1lbnRzIjsK K2NvbnN0IGNoYXIqIGNvbnN0IEluc3BlY3RvckNvbnRyb2xsZXI6OkNvbnNvbGVQYW5lbCA9ICJj b25zb2xlIjsKK2NvbnN0IGNoYXIqIGNvbnN0IEluc3BlY3RvckNvbnRyb2xsZXI6OlNjcmlwdHNQ YW5lbCA9ICJzY3JpcHRzIjsKK2NvbnN0IGNoYXIqIGNvbnN0IEluc3BlY3RvckNvbnRyb2xsZXI6 OlByb2ZpbGVzUGFuZWwgPSAicHJvZmlsZXMiOworCiBzdGF0aWMgY29uc3QgY2hhciogY29uc3Qg bW9uaXRvcmluZ1hIUlNldHRpbmdOYW1lID0gInhock1vbml0b3IiOwogCiBpbnQgY29ubmVjdGVk RnJvbnRlbmRDb3VudCA9IDA7CkBAIC0xNTAsNyArMTU1LDcgQEAgSW5zcGVjdG9yQ29udHJvbGxl cjo6SW5zcGVjdG9yQ29udHJvbGxlcihQYWdlKiBwYWdlLCBJbnNwZWN0b3JDbGllbnQqIGNsaWVu dCkKICAgICAsIG1fb3BlbmluZ0Zyb250ZW5kKGZhbHNlKQogICAgICwgbV9jc3NTdG9yZShuZXcg SW5zcGVjdG9yQ1NTU3RvcmUodGhpcykpCiAgICAgLCBtX2V4cGlyZWRDb25zb2xlTWVzc2FnZUNv dW50KDApCi0gICAgLCBtX3Nob3dBZnRlclZpc2libGUoQ3VycmVudFBhbmVsKQorICAgICwgbV9z aG93QWZ0ZXJWaXNpYmxlKGxhc3RBY3RpdmVQYW5lbCkKICAgICAsIG1fc2Vzc2lvblNldHRpbmdz KEluc3BlY3Rvck9iamVjdDo6Y3JlYXRlKCkpCiAgICAgLCBtX2dyb3VwTGV2ZWwoMCkKICAgICAs IG1fc2VhcmNoaW5nRm9yTm9kZShmYWxzZSkKQEAgLTM4MSw3ICszODYsNyBAQCB2b2lkIEluc3Bl Y3RvckNvbnRyb2xsZXI6Om1hcmtUaW1lbGluZShjb25zdCBTdHJpbmcmIG1lc3NhZ2UpCiAKIHZv aWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6c3RvcmVMYXN0QWN0aXZlUGFuZWwoY29uc3QgU3RyaW5n JiBwYW5lbE5hbWUpCiB7Ci0gICAgc2V0U2V0dGluZyhsYXN0QWN0aXZlUGFuZWxTZXR0aW5nTmFt ZSwgcGFuZWxOYW1lKTsKKyAgICBzZXRTZXR0aW5nKGxhc3RBY3RpdmVQYW5lbCwgcGFuZWxOYW1l KTsKIH0KIAogdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjptb3VzZURpZE1vdmVPdmVyRWxlbWVu dChjb25zdCBIaXRUZXN0UmVzdWx0JiByZXN1bHQsIHVuc2lnbmVkKQpAQCAtNDk3LDEwICs1MDIs OCBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmNvbm5lY3RGcm9udGVuZChjb25zdCBTY3Jp cHRPYmplY3QmIHdlYkluc3BlY3RvcikKICAgICB9CiAjZW5kaWYKIAotICAgIGlmIChtX3Nob3dB ZnRlclZpc2libGUgPT0gQ3VycmVudFBhbmVsKSB7Ci0gICAgICAgIFN0cmluZyBsYXN0QWN0aXZl UGFuZWxTZXR0aW5nID0gc2V0dGluZyhsYXN0QWN0aXZlUGFuZWxTZXR0aW5nTmFtZSk7Ci0gICAg ICAgIG1fc2hvd0FmdGVyVmlzaWJsZSA9IHNwZWNpYWxQYW5lbEZvckpTTmFtZShsYXN0QWN0aXZl UGFuZWxTZXR0aW5nKTsKLSAgICB9CisgICAgaWYgKG1fc2hvd0FmdGVyVmlzaWJsZSA9PSBsYXN0 QWN0aXZlUGFuZWwpCisgICAgICAgIG1fc2hvd0FmdGVyVmlzaWJsZSA9IHNldHRpbmcobGFzdEFj dGl2ZVBhbmVsKTsKIAogICAgIGlmIChtX25vZGVUb0ZvY3VzKQogICAgICAgICBmb2N1c05vZGUo KTsKQEAgLTUzMSw3ICs1MzQsNyBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OnNob3coKQog ICAgIH0KIH0KIAotdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpzaG93UGFuZWwoU3BlY2lhbFBh bmVscyBwYW5lbCkKK3ZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6c2hvd1BhbmVsKGNvbnN0IFN0 cmluZyYgcGFuZWwpCiB7CiAgICAgaWYgKCFlbmFibGVkKCkpCiAgICAgICAgIHJldHVybjsKQEAg LTU0MywxMCArNTQ2LDEwIEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6c2hvd1BhbmVsKFNw ZWNpYWxQYW5lbHMgcGFuZWwpCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAocGFu ZWwgPT0gQ3VycmVudFBhbmVsKQorICAgIGlmIChwYW5lbCA9PSBsYXN0QWN0aXZlUGFuZWwpCiAg ICAgICAgIHJldHVybjsKIAotICAgIG1fZnJvbnRlbmQtPnNob3dQYW5lbChwYW5lbCk7CisgICAg bV9yZW1vdGVGcm9udGVuZC0+c2hvd1BhbmVsKHBhbmVsKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JD b250cm9sbGVyOjpjbG9zZSgpCkBAIC01NzksNyArNTgyLDcgQEAgdm9pZCBJbnNwZWN0b3JDb250 cm9sbGVyOjpkaXNjb25uZWN0RnJvbnRlbmQoKQogICAgIHVuYmluZEFsbFJlc291cmNlcygpOwog ICAgIHN0b3BUaW1lbGluZVByb2ZpbGVyKCk7CiAKLSAgICBtX3Nob3dBZnRlclZpc2libGUgPSBD dXJyZW50UGFuZWw7CisgICAgbV9zaG93QWZ0ZXJWaXNpYmxlID0gbGFzdEFjdGl2ZVBhbmVsOwog CiAgICAgaGlkZUhpZ2hsaWdodCgpOwogCkBAIC0xODkyLDI3ICsxODk1LDYgQEAgYm9vbCBJbnNw ZWN0b3JDb250cm9sbGVyOjpzdG9wVGltaW5nKGNvbnN0IFN0cmluZyYgdGl0bGUsIGRvdWJsZSYg ZWxhcHNlZCkKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotSW5zcGVjdG9yQ29udHJvbGxlcjo6U3Bl Y2lhbFBhbmVscyBJbnNwZWN0b3JDb250cm9sbGVyOjpzcGVjaWFsUGFuZWxGb3JKU05hbWUoY29u c3QgU3RyaW5nJiBwYW5lbE5hbWUpCi17Ci0gICAgaWYgKHBhbmVsTmFtZSA9PSAiZWxlbWVudHMi KQotICAgICAgICByZXR1cm4gRWxlbWVudHNQYW5lbDsKLSAgICBpZiAocGFuZWxOYW1lID09ICJy ZXNvdXJjZXMiKQotICAgICAgICByZXR1cm4gUmVzb3VyY2VzUGFuZWw7Ci0gICAgaWYgKHBhbmVs TmFtZSA9PSAic2NyaXB0cyIpCi0gICAgICAgIHJldHVybiBTY3JpcHRzUGFuZWw7Ci0gICAgaWYg KHBhbmVsTmFtZSA9PSAidGltZWxpbmUiKQotICAgICAgICByZXR1cm4gVGltZWxpbmVQYW5lbDsK LSAgICBpZiAocGFuZWxOYW1lID09ICJwcm9maWxlcyIpCi0gICAgICAgIHJldHVybiBQcm9maWxl c1BhbmVsOwotICAgIGlmIChwYW5lbE5hbWUgPT0gInN0b3JhZ2UiIHx8IHBhbmVsTmFtZSA9PSAi ZGF0YWJhc2VzIikKLSAgICAgICAgcmV0dXJuIFN0b3JhZ2VQYW5lbDsKLSAgICBpZiAocGFuZWxO YW1lID09ICJhdWRpdHMiKQotICAgICAgICByZXR1cm4gQXVkaXRzUGFuZWw7Ci0gICAgaWYgKHBh bmVsTmFtZSA9PSAiY29uc29sZSIpCi0gICAgICAgIHJldHVybiBDb25zb2xlUGFuZWw7Ci0gICAg cmV0dXJuIEVsZW1lbnRzUGFuZWw7Ci19Ci0KIEluamVjdGVkU2NyaXB0IEluc3BlY3RvckNvbnRy b2xsZXI6OmluamVjdGVkU2NyaXB0Rm9yTm9kZUlkKGxvbmcgaWQpCiB7CiAKZGlmZiAtLWdpdCBh L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaCBiL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaAppbmRleCA4ZGJhYjZhLi4xNTY4N2QxIDEwMDY0NAot LS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgKKysrIGIvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5oCkBAIC05NCwxNyArOTQsMTAgQEAgcHVi bGljOgogICAgIHR5cGVkZWYgSGFzaE1hcDxpbnQsIFJlZlB0cjxJbnNwZWN0b3JEYXRhYmFzZVJl c291cmNlPiA+IERhdGFiYXNlUmVzb3VyY2VzTWFwOwogICAgIHR5cGVkZWYgSGFzaE1hcDxpbnQs IFJlZlB0cjxJbnNwZWN0b3JET01TdG9yYWdlUmVzb3VyY2U+ID4gRE9NU3RvcmFnZVJlc291cmNl c01hcDsKIAotICAgIHR5cGVkZWYgZW51bSB7Ci0gICAgICAgIEF1ZGl0c1BhbmVsLAotICAgICAg ICBDdXJyZW50UGFuZWwsCi0gICAgICAgIENvbnNvbGVQYW5lbCwKLSAgICAgICAgRWxlbWVudHNQ YW5lbCwKLSAgICAgICAgUmVzb3VyY2VzUGFuZWwsCi0gICAgICAgIFNjcmlwdHNQYW5lbCwKLSAg ICAgICAgVGltZWxpbmVQYW5lbCwKLSAgICAgICAgUHJvZmlsZXNQYW5lbCwKLSAgICAgICAgU3Rv cmFnZVBhbmVsCi0gICAgfSBTcGVjaWFsUGFuZWxzOworICAgIHN0YXRpYyBjb25zdCBjaGFyKiBj b25zdCBDb25zb2xlUGFuZWw7CisgICAgc3RhdGljIGNvbnN0IGNoYXIqIGNvbnN0IEVsZW1lbnRz UGFuZWw7CisgICAgc3RhdGljIGNvbnN0IGNoYXIqIGNvbnN0IFByb2ZpbGVzUGFuZWw7CisgICAg c3RhdGljIGNvbnN0IGNoYXIqIGNvbnN0IFNjcmlwdHNQYW5lbDsKIAogICAgIEluc3BlY3RvckNv bnRyb2xsZXIoUGFnZSosIEluc3BlY3RvckNsaWVudCopOwogICAgIH5JbnNwZWN0b3JDb250cm9s bGVyKCk7CkBAIC0xMzQsNyArMTI3LDcgQEAgcHVibGljOgogICAgIHZvaWQgaGlkZURPTU5vZGVI aWdobGlnaHQoKSB7IGhpZGVIaWdobGlnaHQoKTsgfQogCiAgICAgdm9pZCBzaG93KCk7Ci0gICAg dm9pZCBzaG93UGFuZWwoU3BlY2lhbFBhbmVscyk7CisgICAgdm9pZCBzaG93UGFuZWwoY29uc3Qg U3RyaW5nJik7CiAgICAgdm9pZCBjbG9zZSgpOwogCiAgICAgLy8gV2UgYXJlIGluIHRyYW5zaXRp b24gZnJvbSBKUyB0cmFuc3BvcnQgdmlhIHdlYkluc3BlY3RvciB0byBuYXRpdmUKQEAgLTMyMyw4 ICszMTYsNiBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBpc01haW5SZXNvdXJjZUxvYWRlcihEb2N1 bWVudExvYWRlciogbG9hZGVyLCBjb25zdCBLVVJMJiByZXF1ZXN0VXJsKTsKIAotICAgIFNwZWNp YWxQYW5lbHMgc3BlY2lhbFBhbmVsRm9ySlNOYW1lKGNvbnN0IFN0cmluZyYgcGFuZWxOYW1lKTsK LQogICAgIHZvaWQgZGlkRXZhbHVhdGVGb3JUZXN0SW5Gcm9udGVuZChsb25nIGNhbGxJZCwgY29u c3QgU3RyaW5nJiBqc29uUmVzdWx0KTsKIAogI2lmIEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VS KQpAQCAtMzYzLDcgKzM1NCw3IEBAIHByaXZhdGU6CiAjaWYgRU5BQkxFKERPTV9TVE9SQUdFKQog ICAgIERPTVN0b3JhZ2VSZXNvdXJjZXNNYXAgbV9kb21TdG9yYWdlUmVzb3VyY2VzOwogI2VuZGlm Ci0gICAgU3BlY2lhbFBhbmVscyBtX3Nob3dBZnRlclZpc2libGU7CisgICAgU3RyaW5nIG1fc2hv d0FmdGVyVmlzaWJsZTsKICAgICBSZWZQdHI8Tm9kZT4gbV9oaWdobGlnaHRlZE5vZGU7CiAjaWYg RU5BQkxFKElOU1BFQ1RPUikKICAgICBSZWZQdHI8SW5zcGVjdG9yVmFsdWU+IG1fc2Vzc2lvblNl dHRpbmdzOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmQu Y3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmQuY3BwCmluZGV4IGJjMTA1 ZDAuLjE4NmEyODkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250 ZW5kLmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZC5jcHAKQEAg LTU3LDQzICs1Nyw2IEBAIHZvaWQgSW5zcGVjdG9yRnJvbnRlbmQ6OmNsb3NlKCkKICAgICBmdW5j dGlvbi5jYWxsKCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yRnJvbnRlbmQ6OnNob3dQYW5lbChpbnQg cGFuZWwpCi17Ci0gICAgY29uc3QgY2hhciogc2hvd0Z1bmN0aW9uTmFtZTsKLSAgICBzd2l0Y2gg KHBhbmVsKSB7Ci0gICAgICAgIGNhc2UgSW5zcGVjdG9yQ29udHJvbGxlcjo6QXVkaXRzUGFuZWw6 Ci0gICAgICAgICAgICBzaG93RnVuY3Rpb25OYW1lID0gInNob3dBdWRpdHNQYW5lbCI7Ci0gICAg ICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBJbnNwZWN0b3JDb250cm9sbGVyOjpDb25zb2xl UGFuZWw6Ci0gICAgICAgICAgICBzaG93RnVuY3Rpb25OYW1lID0gInNob3dDb25zb2xlUGFuZWwi OwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgSW5zcGVjdG9yQ29udHJvbGxlcjo6 RWxlbWVudHNQYW5lbDoKLSAgICAgICAgICAgIHNob3dGdW5jdGlvbk5hbWUgPSAic2hvd0VsZW1l bnRzUGFuZWwiOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgSW5zcGVjdG9yQ29u dHJvbGxlcjo6UmVzb3VyY2VzUGFuZWw6Ci0gICAgICAgICAgICBzaG93RnVuY3Rpb25OYW1lID0g InNob3dSZXNvdXJjZXNQYW5lbCI7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBJ bnNwZWN0b3JDb250cm9sbGVyOjpUaW1lbGluZVBhbmVsOgotICAgICAgICAgICAgc2hvd0Z1bmN0 aW9uTmFtZSA9ICJzaG93VGltZWxpbmVQYW5lbCI7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAg ICAgY2FzZSBJbnNwZWN0b3JDb250cm9sbGVyOjpQcm9maWxlc1BhbmVsOgotICAgICAgICAgICAg c2hvd0Z1bmN0aW9uTmFtZSA9ICJzaG93UHJvZmlsZXNQYW5lbCI7Ci0gICAgICAgICAgICBicmVh azsKLSAgICAgICAgY2FzZSBJbnNwZWN0b3JDb250cm9sbGVyOjpTY3JpcHRzUGFuZWw6Ci0gICAg ICAgICAgICBzaG93RnVuY3Rpb25OYW1lID0gInNob3dTY3JpcHRzUGFuZWwiOwotICAgICAgICAg ICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgSW5zcGVjdG9yQ29udHJvbGxlcjo6U3RvcmFnZVBhbmVs OgotICAgICAgICAgICAgc2hvd0Z1bmN0aW9uTmFtZSA9ICJzaG93U3RvcmFnZVBhbmVsIjsKLSAg ICAgICAgICAgIGJyZWFrOwotICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7Ci0gICAgICAgICAgICBzaG93RnVuY3Rpb25OYW1lID0gMDsKLSAgICB9Ci0K LSAgICBpZiAoc2hvd0Z1bmN0aW9uTmFtZSkKLSAgICAgICAgY2FsbFNpbXBsZUZ1bmN0aW9uKHNo b3dGdW5jdGlvbk5hbWUpOwotfQotCiB2b2lkIEluc3BlY3RvckZyb250ZW5kOjpjYWxsU2ltcGxl RnVuY3Rpb24oY29uc3QgU3RyaW5nJiBmdW5jdGlvbk5hbWUpCiB7CiAgICAgU2NyaXB0RnVuY3Rp b25DYWxsIGZ1bmN0aW9uKG1fd2ViSW5zcGVjdG9yLCAiZGlzcGF0Y2giKTsKZGlmZiAtLWdpdCBh L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmggYi9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JGcm9udGVuZC5oCmluZGV4IDIxNTc5NmUuLjJmMDRhYzIgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmgKKysrIGIvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmQuaApAQCAtNDcsNyArNDcsNiBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAgICAgICAgIH5JbnNwZWN0b3JGcm9udGVuZCgpOwogCiAgICAgICAgIHZvaWQgY2xv c2UoKTsKLSAgICAgICAgdm9pZCBzaG93UGFuZWwoaW50IHBhbmVsKTsKICAgICAgICAgU2NyaXB0 U3RhdGUqIHNjcmlwdFN0YXRlKCkgY29uc3QgeyByZXR1cm4gbV93ZWJJbnNwZWN0b3Iuc2NyaXB0 U3RhdGUoKTsgfQogICAgIHByaXZhdGU6CiAgICAgICAgIHZvaWQgY2FsbFNpbXBsZUZ1bmN0aW9u KGNvbnN0IFN0cmluZyYgZnVuY3Rpb25OYW1lKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMKaW5kZXggM2NkMjJhZS4uODdkODVjMSAx MDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxp bmUuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxp bmUuanMKQEAgLTY4Myw3ICs2ODMsNyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVu dC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgaWYgKHRoaXMu dHJlZU91dGxpbmUuc2hvd0luRWxlbWVudHNQYW5lbEVuYWJsZWQpIHsKLSAgICAgICAgICAgIFdl Ykluc3BlY3Rvci5zaG93RWxlbWVudHNQYW5lbCgpOworICAgICAgICAgICAgV2ViSW5zcGVjdG9y LnNob3dQYW5lbCgiZWxlbWVudHMiKTsKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMu ZWxlbWVudHMuZm9jdXNlZERPTU5vZGUgPSB0aGlzLnJlcHJlc2VudGVkT2JqZWN0OwogICAgICAg ICB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25T ZXJ2ZXIuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uU2VydmVyLmpz CmluZGV4IDViNWExNjkuLjJhYmUxZGIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9FeHRlbnNpb25TZXJ2ZXIuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0V4dGVuc2lvblNlcnZlci5qcwpAQCAtMjEzLDcgKzIxMyw3IEBAIFdlYkluc3BlY3Rvci5F eHRlbnNpb25TZXJ2ZXIucHJvdG90eXBlID0gewogICAgICAgICBpZiAoIXJlc291cmNlKQogICAg ICAgICAgICAgcmV0dXJuIHRoaXMuX3N0YXR1cy5FX05PVEZPVU5EKHR5cGVvZiBpZCArICI6ICIg KyBpZCk7CiAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMucmVzb3VyY2VzLnNob3dSZXNvdXJj ZShyZXNvdXJjZSwgbWVzc2FnZS5saW5lKTsKLSAgICAgICAgV2ViSW5zcGVjdG9yLnNob3dSZXNv dXJjZXNQYW5lbCgpOworICAgICAgICBXZWJJbnNwZWN0b3Iuc2hvd1BhbmVsKCJyZXNvdXJjZXMi KTsKICAgICB9LAogCiAgICAgX2Rpc3BhdGNoQ2FsbGJhY2s6IGZ1bmN0aW9uKHJlcXVlc3RJZCwg cG9ydCwgcmVzdWx0KQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2lu c3BlY3Rvci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5k ZXggOGViZTIzYi4uMjMxZTA5NSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL2luc3BlY3Rvci5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVj dG9yLmpzCkBAIC02OTEsNyArNjkxLDcgQEAgV2ViSW5zcGVjdG9yLmRvY3VtZW50Q2xpY2sgPSBm dW5jdGlvbihldmVudCkKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAg IFdlYkluc3BlY3Rvci5zaG93UmVzb3VyY2VzUGFuZWwoKTsKKyAgICAgICAgV2ViSW5zcGVjdG9y LnNob3dQYW5lbCgicmVzb3VyY2VzIik7CiAgICAgfQogCiAgICAgaWYgKFdlYkluc3BlY3Rvci5m b2xsb3dMaW5rVGltZW91dCkKQEAgLTEwODEsNyArMTA4MSw3IEBAIFdlYkluc3BlY3Rvci5lbGVt ZW50RHJhZ0VuZCA9IGZ1bmN0aW9uKGV2ZW50KQogV2ViSW5zcGVjdG9yLnRvZ2dsZVNlYXJjaGlu Z0Zvck5vZGUgPSBmdW5jdGlvbigpCiB7CiAgICAgaWYgKHRoaXMucGFuZWxzLmVsZW1lbnRzKSB7 Ci0gICAgICAgIHRoaXMuc2hvd0VsZW1lbnRzUGFuZWwoKTsKKyAgICAgICAgdGhpcy5zaG93UGFu ZWwoImVsZW1lbnRzIik7CiAgICAgICAgIHRoaXMucGFuZWxzLmVsZW1lbnRzLnRvZ2dsZVNlYXJj aGluZ0Zvck5vZGUoKTsKICAgICB9CiB9CkBAIC0xMDk2LDU1ICsxMDk2LDI0IEBAIFdlYkluc3Bl Y3Rvci5zaG93Q2hhbmdlcyA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLmRyYXdlci5zaG93Vmlldyh0 aGlzLmNoYW5nZXMpOwogfQogCi1XZWJJbnNwZWN0b3Iuc2hvd0VsZW1lbnRzUGFuZWwgPSBmdW5j dGlvbigpCitXZWJJbnNwZWN0b3Iuc2hvd1BhbmVsID0gZnVuY3Rpb24ocGFuZWwpCiB7Ci0gICAg dGhpcy5jdXJyZW50UGFuZWwgPSB0aGlzLnBhbmVscy5lbGVtZW50czsKLX0KLQotV2ViSW5zcGVj dG9yLnNob3dSZXNvdXJjZXNQYW5lbCA9IGZ1bmN0aW9uKCkKLXsKLSAgICB0aGlzLmN1cnJlbnRQ YW5lbCA9IHRoaXMucGFuZWxzLnJlc291cmNlczsKLX0KLQotV2ViSW5zcGVjdG9yLnNob3dTY3Jp cHRzUGFuZWwgPSBmdW5jdGlvbigpCi17Ci0gICAgdGhpcy5jdXJyZW50UGFuZWwgPSB0aGlzLnBh bmVscy5zY3JpcHRzOwotfQotCi1XZWJJbnNwZWN0b3Iuc2hvd1RpbWVsaW5lUGFuZWwgPSBmdW5j dGlvbigpCi17Ci0gICAgdGhpcy5jdXJyZW50UGFuZWwgPSB0aGlzLnBhbmVscy50aW1lbGluZTsK LX0KLQotV2ViSW5zcGVjdG9yLnNob3dQcm9maWxlc1BhbmVsID0gZnVuY3Rpb24oKQotewotICAg IHRoaXMuY3VycmVudFBhbmVsID0gdGhpcy5wYW5lbHMucHJvZmlsZXM7Ci19Ci0KLVdlYkluc3Bl Y3Rvci5zaG93U3RvcmFnZVBhbmVsID0gZnVuY3Rpb24oKQotewotICAgIHRoaXMuY3VycmVudFBh bmVsID0gdGhpcy5wYW5lbHMuc3RvcmFnZTsKLX0KLQotV2ViSW5zcGVjdG9yLnNob3dDb25zb2xl UGFuZWwgPSBmdW5jdGlvbigpCi17Ci0gICAgdGhpcy5jdXJyZW50UGFuZWwgPSB0aGlzLnBhbmVs cy5jb25zb2xlOwotfQotCi1XZWJJbnNwZWN0b3Iuc2hvd0F1ZGl0c1BhbmVsID0gZnVuY3Rpb24o KQotewotICAgIHRoaXMuY3VycmVudFBhbmVsID0gdGhpcy5wYW5lbHMuYXVkaXRzOworICAgIGlm ICghKHBhbmVsIGluIHRoaXMucGFuZWxzKSkgeworICAgICAgICBjb25zb2xlLmVycm9yKCJVbmFi bGUgdG8gc2hvdyAlcyBwYW5lbC4iLCBwYW5lbCk7CisgICAgICAgIHBhbmVsID0gImVsZW1lbnRz IjsKKyAgICB9CisgICAgdGhpcy5jdXJyZW50UGFuZWwgPSB0aGlzLnBhbmVsc1twYW5lbF07CiB9 CiAKIFdlYkluc3BlY3Rvci5zZWxlY3REYXRhYmFzZSA9IGZ1bmN0aW9uKG8pCiB7Ci0gICAgV2Vi SW5zcGVjdG9yLnNob3dTdG9yYWdlUGFuZWwoKTsKKyAgICBXZWJJbnNwZWN0b3Iuc2hvd1BhbmVs KCJzdG9yYWdlIik7CiAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5zdG9yYWdlLnNlbGVjdERhdGFi YXNlKG8pOwogfQogCiBXZWJJbnNwZWN0b3Iuc2VsZWN0RE9NU3RvcmFnZSA9IGZ1bmN0aW9uKG8p CiB7Ci0gICAgV2ViSW5zcGVjdG9yLnNob3dTdG9yYWdlUGFuZWwoKTsKKyAgICBXZWJJbnNwZWN0 b3Iuc2hvd1BhbmVsKCJzdG9yYWdlIik7CiAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5zdG9yYWdl LnNlbGVjdERPTVN0b3JhZ2Uobyk7CiB9CiAKQEAgLTE3NDIsNyArMTcxMSw3IEBAIFdlYkluc3Bl Y3Rvci5saW5raWZ5U3RyaW5nQXNGcmFnbWVudCA9IGZ1bmN0aW9uKHN0cmluZykKIAogV2ViSW5z cGVjdG9yLnNob3dQcm9maWxlRm9yVVJMID0gZnVuY3Rpb24odXJsKQogewotICAgIFdlYkluc3Bl Y3Rvci5zaG93UHJvZmlsZXNQYW5lbCgpOworICAgIFdlYkluc3BlY3Rvci5zaG93UGFuZWwoInBy b2ZpbGVzIik7CiAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5wcm9maWxlcy5zaG93UHJvZmlsZUZv clVSTCh1cmwpOwogfQogCg==