44607 2010-08-25 06:26:25 -0700 Web Inspector: lazily request frontend settings instead of pushing them on connect 2010-08-25 07:19:39 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 yurys yurys bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 269207 0 yurys 2010-08-25 06:26:25 -0700 Web Inspector: lazily request frontend settings instead of pushing them on connect. This is the first step to having all panels populated lazily. We will need this to keep remote debugging protocol clean so that remote client can request only the data it needs instead of processing tons of them after connecting to the backend. 269210 1 65410 yurys 2010-08-25 06:30:14 -0700 Created attachment 65410 Patch 269219 2 65410 pfeldman 2010-08-25 06:58:40 -0700 Comment on attachment 65410 Patch WebCore/inspector/front-end/ProfilesPanel.js:204 + this._requestedProfiles = false; this._profilesWereRequested; WebCore/inspector/Inspector.idl:102 + [handler=Controller] void populateScriptObjects(); Please comment that it should be further split into the parts. 269233 3 yurys 2010-08-25 07:19:39 -0700 (In reply to comment #2) > (From update of attachment 65410 [details]) > WebCore/inspector/front-end/ProfilesPanel.js:204 > + this._requestedProfiles = false; > this._profilesWereRequested; > WebCore/inspector/Inspector.idl:102 > + [handler=Controller] void populateScriptObjects(); > Please comment that it should be further split into the parts. All done. Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/html/HTMLDocument.cpp M WebCore/inspector/Inspector.idl M WebCore/inspector/InspectorController.cpp M WebCore/inspector/InspectorController.h M WebCore/inspector/front-end/ProfilesPanel.js M WebCore/inspector/front-end/Settings.js M WebCore/inspector/front-end/inspector.js Committed r66012 65410 2010-08-25 06:30:14 -0700 2010-08-25 06:58:40 -0700 Patch bug-44607-20100825173010.patch text/plain 14674 yurys ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NDAzNjZjOTM1YzI2ZDY2MGQ0Y2Q4NDkwOTE2ZTUyNTliYjgzMTUxNS4uN2U5Nzg1NGRhZGM4MDZk YmUyZDc5YjY2YTFlY2ViOTYwZjVjYWI3YSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMSBAQAorMjAxMC0wOC0yNSAgWXVy eSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBsYXppbHkgcmVxdWVz dCBmcm9udGVuZCBzZXR0aW5ncyBpbnN0ZWFkIG9mIHB1c2hpbmcgdGhlbSBvbiBjb25uZWN0Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NDYwNworCisg ICAgICAgICogaHRtbC9IVE1MRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTERv Y3VtZW50OjpjcmVhdGVQYXJzZXIpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3IuaWRs OgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmdldFNldHRpbmdzKToKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmNvbm5lY3RGcm9udGVuZCk6CisgICAgICAgIChX ZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpwb3B1bGF0ZVNjcmlwdE9iamVjdHMpOiB0aGlz IG1ldGhvZCBpcyBub3cgY2FsbGVkIGV4cGxpY2l0ZWx5IGZyb20gdGhlIGZyb250ZW5kLAorICAg ICAgICBpdCBzaG91bGQgYmUgZ29uZSBldmVudHVhbGx5IG9uY2UgYWxsIHBhbmVscyByZXF1ZXN0 IGluaXRpYWwgZGF0YSBsYXppbHkuCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRy b2xsZXIuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUuc2hvdyk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUucHJvZmlsZXJXYXNF bmFibGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZS5f cmVzZXQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU2V0dGluZ3MpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNldHRp bmdzLmluaXRpYWxpemUucG9wdWxhdGVBcHBsaWNhdGlvblNldHRpbmdzKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5TZXR0aW5ncy5pbml0aWFsaXplLnBvcHVsYXRlU2Vzc2lvblNldHRpbmdzKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5TZXR0aW5ncy5pbml0aWFsaXplKToKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5k b0xvYWRlZERvbmUpOgorCiAyMDEwLTA4LTI1ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5v cmc+CiAKICAgICAgICAgU2Vjb25kIGF0dGVtcHQgdG8gZml4IFF0IGJ1aWxkCmRpZmYgLS1naXQg YS9XZWJDb3JlL2h0bWwvSFRNTERvY3VtZW50LmNwcCBiL1dlYkNvcmUvaHRtbC9IVE1MRG9jdW1l bnQuY3BwCmluZGV4IGNkMjY4YWU3YTBmZmVmY2VhNjBlNDk4YTFlMDUzMGJhN2MyZDRhY2YuLjdj ZWVhM2VmNDliMjExNDA3MTA0YmQyZjAyYjMxZGQzYmUzMzUwMGIgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvaHRtbC9IVE1MRG9jdW1lbnQuY3BwCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MRG9jdW1lbnQu Y3BwCkBAIC0yODcsNyArMjg3LDcgQEAgUGFzc1JlZlB0cjxEb2N1bWVudFBhcnNlcj4gSFRNTERv Y3VtZW50OjpjcmVhdGVQYXJzZXIoKQogICAgIGJvb2wgcmVwb3J0RXJyb3JzID0gZmFsc2U7CiAj aWYgRU5BQkxFKElOU1BFQ1RPUikKICAgICBpZiAoUGFnZSogcGFnZSA9IHRoaXMtPnBhZ2UoKSkK LSAgICAgICAgcmVwb3J0RXJyb3JzID0gcGFnZS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLT53aW5k b3dWaXNpYmxlKCk7CisgICAgICAgIHJlcG9ydEVycm9ycyA9IHBhZ2UtPmluc3BlY3RvckNvbnRy b2xsZXIoKS0+aGFzRnJvbnRlbmQoKTsKICNlbmRpZgogICAgIHJldHVybiBIVE1MRG9jdW1lbnRQ YXJzZXI6OmNyZWF0ZSh0aGlzLCByZXBvcnRFcnJvcnMpOwogfQpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmlkbCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5p ZGwKaW5kZXggYzQwZTNkN2M0ZTE2YTNiODdkZGQ3Yzc0NjIzNDhkYjM4Yzc1MTRlNS4uNmMzYTI5 OGE5OGZlNWUwOGM5NjU4NTg4YjY1NmFjMjFmZmE5ZDRmYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yLmlkbAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3Iu aWRsCkBAIC00Nyw5ICs0Nyw2IEBAIG1vZHVsZSBjb3JlIHsKICAgICAgICAgW25vdGlmeV0gdm9p ZCBpbnNwZWN0ZWRVUkxDaGFuZ2VkKG91dCBTdHJpbmcgdXJsKTsKICAgICAgICAgW25vdGlmeV0g dm9pZCBtb25pdG9yaW5nWEhSV2FzRW5hYmxlZCgpOwogICAgICAgICBbbm90aWZ5XSB2b2lkIG1v bml0b3JpbmdYSFJXYXNEaXNhYmxlZCgpOwotICAgICAgICBbbm90aWZ5XSB2b2lkIHBvcHVsYXRl QXBwbGljYXRpb25TZXR0aW5ncyhvdXQgU3RyaW5nIHNldHRpbmdzKTsKLSAgICAgICAgW25vdGlm eV0gdm9pZCBwb3B1bGF0ZUludGVyZmFjZSgpOwotICAgICAgICBbbm90aWZ5XSB2b2lkIHBvcHVs YXRlU2Vzc2lvblNldHRpbmdzKG91dCBTdHJpbmcgc2V0dGluZ3MpOwogICAgICAgICBbbm90aWZ5 XSB2b2lkIHJlbW92ZVJlc291cmNlKG91dCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIpOwogICAg ICAgICBbbm90aWZ5XSB2b2lkIHJlc2V0KCk7CiAgICAgICAgIFtub3RpZnldIHZvaWQgcmVzZXRQ cm9maWxlc1BhbmVsKCk7CkBAIC0xMDIsNiArOTksOSBAQCBtb2R1bGUgY29yZSB7CiAgICAgICAg IFtub3RpZnldIHZvaWQgZGlkRGVzdHJveVdvcmtlcihvdXQgbG9uZyBpZCk7CiAjZW5kaWYKIAor ICAgICAgICBbaGFuZGxlcj1Db250cm9sbGVyXSB2b2lkIHBvcHVsYXRlU2NyaXB0T2JqZWN0cygp OworCisgICAgICAgIFtoYW5kbGVyPUNvbnRyb2xsZXJdIHZvaWQgZ2V0U2V0dGluZ3MoaW4gbG9u ZyBjYWxsSWQsIG91dCBPYmplY3Qgc2V0dGluZ3MpOwogICAgICAgICBbaGFuZGxlcj1Db250cm9s bGVyXSB2b2lkIHN0b3JlTGFzdEFjdGl2ZVBhbmVsKGluIFN0cmluZyBwYW5lbE5hbWUpOwogCiAg ICAgICAgIFtoYW5kbGVyPUNvbnRyb2xsZXJdIHZvaWQgc2F2ZUFwcGxpY2F0aW9uU2V0dGluZ3Mo aW4gU3RyaW5nIHNldHRpbmdzKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckNvbnRyb2xsZXIuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxl ci5jcHAKaW5kZXggOTAwMmQ1M2MyYmVhMjk3ODdiZDc4YTVlMzQ4NWY5MDMzMGUwNzU2OS4uZjQ3 YjMyMTc0OTY3Y2U2ZmFmZjRmMDA4YTJkZjYxM2Y5YjkyNTI3MiAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKQEAgLTI0Nyw2ICsyNDcsMTMgQEAgdm9pZCBJbnNw ZWN0b3JDb250cm9sbGVyOjpzYXZlU2Vzc2lvblNldHRpbmdzKGNvbnN0IFN0cmluZyYgc2V0dGlu Z3NKU09OKQogICAgIG1fc2Vzc2lvblNldHRpbmdzID0gSW5zcGVjdG9yVmFsdWU6OnBhcnNlSlNP TihzZXR0aW5nc0pTT04pOwogfQogCit2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmdldFNldHRp bmdzKFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiBzZXR0aW5ncykKK3sKKyAgICAqc2V0dGluZ3Mg PSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOworICAgICgqc2V0dGluZ3MpLT5zZXRTdHJpbmco ImFwcGxpY2F0aW9uIiwgc2V0dGluZyhmcm9udGVuZFNldHRpbmdzU2V0dGluZ05hbWUoKSkpOwor ICAgICgqc2V0dGluZ3MpLT5zZXRTdHJpbmcoInNlc3Npb24iLCBtX3Nlc3Npb25TZXR0aW5ncy0+ dG9KU09OU3RyaW5nKCkpOworfQorCiB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6Omluc3BlY3Qo Tm9kZSogbm9kZSkKIHsKICAgICBpZiAoIWVuYWJsZWQoKSkKQEAgLTMwMywxMSArMzEwLDYgQEAg dm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpoaWRlSGlnaGxpZ2h0KCkKICAgICBtX2NsaWVudC0+ aGlkZUhpZ2hsaWdodCgpOwogfQogCi1ib29sIEluc3BlY3RvckNvbnRyb2xsZXI6OndpbmRvd1Zp c2libGUoKQotewotICAgIHJldHVybiBtX2Zyb250ZW5kOwotfQotCiB2b2lkIEluc3BlY3RvckNv bnRyb2xsZXI6OmFkZE1lc3NhZ2VUb0NvbnNvbGUoTWVzc2FnZVNvdXJjZSBzb3VyY2UsIE1lc3Nh Z2VUeXBlIHR5cGUsIE1lc3NhZ2VMZXZlbCBsZXZlbCwgU2NyaXB0Q2FsbFN0YWNrKiBjYWxsU3Rh Y2ssIGNvbnN0IFN0cmluZyYgbWVzc2FnZSkKIHsKICAgICBpZiAoIWVuYWJsZWQoKSkKQEAgLTQ4 OCw4ICs0OTAsNiBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmNvbm5lY3RGcm9udGVuZCgp CiAgICAgLy8gSW5pdGlhbGl6ZSBXZWIgSW5zcGVjdG9yIHRpdGxlLgogICAgIG1fZnJvbnRlbmQt Pmluc3BlY3RlZFVSTENoYW5nZWQobV9pbnNwZWN0ZWRQYWdlLT5tYWluRnJhbWUoKS0+bG9hZGVy KCktPnVybCgpLnN0cmluZygpKTsKIAotICAgIHBvcHVsYXRlU2NyaXB0T2JqZWN0cygpOwotCiAj aWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpCiAgICAgaWYgKEluc3BlY3RvckRlYnVnZ2Vy QWdlbnQ6OmlzRGVidWdnZXJBbHdheXNFbmFibGVkKCkpIHsKICAgICAgICAgLy8gRklYTUUgKDQw MzY0KTogVGhpcyB3aWxsIGZvcmNlIHB1c2hpbmcgc2NyaXB0IHNvdXJjZXMgdG8gZnJvbnRlbmQg ZXZlbiBpZiBzY3JpcHQKQEAgLTUwOCwxMyArNTA4LDYgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9s bGVyOjpjb25uZWN0RnJvbnRlbmQoKQogICAgIH0KICNlbmRpZgogCi0gICAgaWYgKG1fc2hvd0Fm dGVyVmlzaWJsZSA9PSBsYXN0QWN0aXZlUGFuZWwpCi0gICAgICAgIG1fc2hvd0FmdGVyVmlzaWJs ZSA9IHNldHRpbmcobGFzdEFjdGl2ZVBhbmVsKTsKLQotICAgIGlmIChtX25vZGVUb0ZvY3VzKQot ICAgICAgICBmb2N1c05vZGUoKTsKLSAgICBzaG93UGFuZWwobV9zaG93QWZ0ZXJWaXNpYmxlKTsK LQogI2lmIEVOQUJMRShPRkZMSU5FX1dFQl9BUFBMSUNBVElPTlMpCiAgICAgbV9hcHBsaWNhdGlv bkNhY2hlQWdlbnQgPSBuZXcgSW5zcGVjdG9yQXBwbGljYXRpb25DYWNoZUFnZW50KHRoaXMsIG1f ZnJvbnRlbmQuZ2V0KCkpOwogI2VuZGlmCkBAIC02MjUsNyArNjE4LDExIEBAIHZvaWQgSW5zcGVj dG9yQ29udHJvbGxlcjo6cG9wdWxhdGVTY3JpcHRPYmplY3RzKCkKICAgICBpZiAoIW1fZnJvbnRl bmQpCiAgICAgICAgIHJldHVybjsKIAotICAgIG1fZnJvbnRlbmQtPnBvcHVsYXRlQXBwbGljYXRp b25TZXR0aW5ncyhzZXR0aW5nKGZyb250ZW5kU2V0dGluZ3NTZXR0aW5nTmFtZSgpKSk7CisgICAg aWYgKG1fc2hvd0FmdGVyVmlzaWJsZSA9PSBsYXN0QWN0aXZlUGFuZWwpCisgICAgICAgIG1fc2hv d0FmdGVyVmlzaWJsZSA9IHNldHRpbmcobGFzdEFjdGl2ZVBhbmVsKTsKKyAgICBpZiAobV9ub2Rl VG9Gb2N1cykKKyAgICAgICAgZm9jdXNOb2RlKCk7CisgICAgc2hvd1BhbmVsKG1fc2hvd0FmdGVy VmlzaWJsZSk7CiAKICAgICBpZiAobV9yZXNvdXJjZVRyYWNraW5nRW5hYmxlZCkKICAgICAgICAg bV9mcm9udGVuZC0+cmVzb3VyY2VUcmFja2luZ1dhc0VuYWJsZWQoKTsKQEAgLTY3NSw5ICs2NzIs NiBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OnBvcHVsYXRlU2NyaXB0T2JqZWN0cygpCiAg ICAgfQogI2VuZGlmCiAKLSAgICBtX2Zyb250ZW5kLT5wb3B1bGF0ZVNlc3Npb25TZXR0aW5ncyht X3Nlc3Npb25TZXR0aW5ncy0+dG9KU09OU3RyaW5nKCkpOwotICAgIG1fZnJvbnRlbmQtPnBvcHVs YXRlSW50ZXJmYWNlKCk7Ci0KICAgICAvLyBEaXNwYXRjaCBwZW5kaW5nIGZyb250ZW5kIGNvbW1h bmRzCiAgICAgZm9yIChWZWN0b3I8cGFpcjxsb25nLCBTdHJpbmc+ID46Oml0ZXJhdG9yIGl0ID0g bV9wZW5kaW5nRXZhbHVhdGVUZXN0Q29tbWFuZHMuYmVnaW4oKTsgaXQgIT0gbV9wZW5kaW5nRXZh bHVhdGVUZXN0Q29tbWFuZHMuZW5kKCk7ICsraXQpCiAgICAgICAgIG1fZnJvbnRlbmQtPmV2YWx1 YXRlRm9yVGVzdEluRnJvbnRlbmQoKCppdCkuZmlyc3QsICgqaXQpLnNlY29uZCk7CmRpZmYgLS1n aXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmggYi9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgKaW5kZXggN2NkMTg5YmI5ODI5ZGYxYTg5ZDAw MGYwMmMyMjUzY2RkNzEwMTRhMy4uN2VkMjU0OTBkZTJlN2FmMWM3NjQ2ZTczOWNmNWM0OWZjZjhh YmQxYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5o CisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaApAQCAtMTE4LDcg KzExOCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFNldHRpbmcoY29uc3QgU3RyaW5nJiBrZXks IGNvbnN0IFN0cmluZyYgdmFsdWUpOwogICAgIHZvaWQgc2F2ZUFwcGxpY2F0aW9uU2V0dGluZ3Mo Y29uc3QgU3RyaW5nJiBzZXR0aW5ncyk7CiAgICAgdm9pZCBzYXZlU2Vzc2lvblNldHRpbmdzKGNv bnN0IFN0cmluZyYpOwotCisgICAgdm9pZCBnZXRTZXR0aW5ncyhSZWZQdHI8SW5zcGVjdG9yT2Jq ZWN0PiopOwogCiAgICAgdm9pZCBpbnNwZWN0KE5vZGUqKTsKICAgICB2b2lkIGhpZ2hsaWdodChO b2RlKik7CkBAIC0xNTAsOCArMTUwLDYgQEAgcHVibGljOgogCiAgICAgdm9pZCBpbnNwZWN0ZWRX aW5kb3dTY3JpcHRPYmplY3RDbGVhcmVkKEZyYW1lKik7CiAKLSAgICBib29sIHdpbmRvd1Zpc2li bGUoKTsKLQogICAgIHZvaWQgZGlkQ29tbWl0TG9hZChEb2N1bWVudExvYWRlciopOwogICAgIHZv aWQgZnJhbWVEZXRhY2hlZEZyb21QYXJlbnQoRnJhbWUqKTsKICAgICB2b2lkIGRpZExvYWRSZXNv dXJjZUZyb21NZW1vcnlDYWNoZShEb2N1bWVudExvYWRlciosIGNvbnN0IENhY2hlZFJlc291cmNl Kik7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5l bC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzCmluZGV4 IGU1ODc3ZDkwY2IyOWJiMGFlNTczYzFlZTQ4ODY0OGY0MTYyM2I2MWUuLjc5MTA1MjkwOWVlZjVh NWM2MWY0OWY2OTYxMWU2ZjExYzhiMzcyNTcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Qcm9maWxlc1BhbmVsLmpzCkBAIC0xNTgsMjYgKzE1OCwyMCBAQCBXZWJJbnNwZWN0b3Iu UHJvZmlsZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgc2hvdzogZnVuY3Rpb24oKQogICAgIHsK ICAgICAgICAgV2ViSW5zcGVjdG9yLlBhbmVsLnByb3RvdHlwZS5zaG93LmNhbGwodGhpcyk7Ci0g ICAgICAgIGlmICh0aGlzLl9zaG91bGRQb3B1bGF0ZVByb2ZpbGVzKQorICAgICAgICBpZiAoIXRo aXMuX3JlcXVlc3RlZFByb2ZpbGVzKQogICAgICAgICAgICAgdGhpcy5fcG9wdWxhdGVQcm9maWxl cygpOwogICAgIH0sCiAKLSAgICBwb3B1bGF0ZUludGVyZmFjZTogZnVuY3Rpb24oKQotICAgIHsK LSAgICAgICAgdGhpcy5fcmVzZXQoKTsKLSAgICAgICAgaWYgKHRoaXMudmlzaWJsZSkKLSAgICAg ICAgICAgIHRoaXMuX3BvcHVsYXRlUHJvZmlsZXMoKTsKLSAgICAgICAgZWxzZQotICAgICAgICAg ICAgdGhpcy5fc2hvdWxkUG9wdWxhdGVQcm9maWxlcyA9IHRydWU7Ci0gICAgfSwKLQogICAgIHBy b2ZpbGVyV2FzRW5hYmxlZDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX3By b2ZpbGVyRW5hYmxlZCkKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICB0aGlzLl9wcm9m aWxlckVuYWJsZWQgPSB0cnVlOwotICAgICAgICB0aGlzLnBvcHVsYXRlSW50ZXJmYWNlKCk7CisK KyAgICAgICAgdGhpcy5fcmVzZXQoKTsKKyAgICAgICAgaWYgKHRoaXMudmlzaWJsZSkKKyAgICAg ICAgICAgIHRoaXMuX3BvcHVsYXRlUHJvZmlsZXMoKTsKICAgICB9LAogCiAgICAgcHJvZmlsZXJX YXNEaXNhYmxlZDogZnVuY3Rpb24oKQpAQCAtMjA3LDYgKzIwMSw3IEBAIFdlYkluc3BlY3Rvci5Q cm9maWxlc1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fcHJvZmlsZXNJZE1hcCA9 IHt9OwogICAgICAgICB0aGlzLl9wcm9maWxlR3JvdXBzID0ge307CiAgICAgICAgIHRoaXMuX3By b2ZpbGVHcm91cHNGb3JMaW5rcyA9IHt9CisgICAgICAgIHRoaXMuX3JlcXVlc3RlZFByb2ZpbGVz ID0gZmFsc2U7CiAKICAgICAgICAgdGhpcy5zaWRlYmFyVHJlZUVsZW1lbnQucmVtb3ZlU3R5bGVD bGFzcygic29tZS1leHBhbmRhYmxlIik7CiAKQEAgLTUzMiw3ICs1MjcsNyBAQCBXZWJJbnNwZWN0 b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBjYWxsSWQgPSBXZWJJ bnNwZWN0b3IuQ2FsbGJhY2sud3JhcChwb3B1bGF0ZUNhbGxiYWNrKTsKICAgICAgICAgSW5zcGVj dG9yQmFja2VuZC5nZXRQcm9maWxlSGVhZGVycyhjYWxsSWQpOwogCi0gICAgICAgIGRlbGV0ZSB0 aGlzLl9zaG91bGRQb3B1bGF0ZVByb2ZpbGVzOworICAgICAgICB0aGlzLl9yZXF1ZXN0ZWRQcm9m aWxlcyA9IHRydWU7CiAgICAgfSwKIAogICAgIHVwZGF0ZU1haW5WaWV3V2lkdGg6IGZ1bmN0aW9u KHdpZHRoKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdz LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzCmluZGV4IDY4ZTQw YzQxOWNlZTg0YjU5ZTJjZjBkZjdlYTJiNzcyNzFkYjI3MDMuLjMzYTFiOTEyMTUwZGYwYjU0ZGRm ODg1NmU1ZmM5ZWVhZjQ4Y2Q0OTggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9TZXR0aW5ncy5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGlu Z3MuanMKQEAgLTQ3LDMzICs0Nyw0NCBAQCB2YXIgUHJlZmVyZW5jZXMgPSB7CiAgICAgZG9tQnJl YWtwb2ludHNFbmFibGVkOiBmYWxzZQogfQogCi1XZWJJbnNwZWN0b3IucG9wdWxhdGVBcHBsaWNh dGlvblNldHRpbmdzID0gZnVuY3Rpb24oc2V0dGluZ3NTdHJpbmcpCitXZWJJbnNwZWN0b3IuU2V0 dGluZ3MgPSBmdW5jdGlvbihzZXNzaW9uU2NvcGUpCiB7Ci0gICAgV2ViSW5zcGVjdG9yLmFwcGxp Y2F0aW9uU2V0dGluZ3MuX2xvYWQoc2V0dGluZ3NTdHJpbmcpOwotICAgIFdlYkluc3BlY3Rvci5h cHBsaWNhdGlvblNldHRpbmdzLmluc3RhbGxTZXR0aW5nKCJldmVudExpc3RlbmVyc0ZpbHRlciIs ICJldmVudC1saXN0ZW5lcnMtZmlsdGVyIiwgImFsbCIpOwotICAgIFdlYkluc3BlY3Rvci5hcHBs aWNhdGlvblNldHRpbmdzLmluc3RhbGxTZXR0aW5nKCJjb2xvckZvcm1hdCIsICJjb2xvci1mb3Jt YXQiLCAiaGV4Iik7Ci0gICAgV2ViSW5zcGVjdG9yLmFwcGxpY2F0aW9uU2V0dGluZ3MuaW5zdGFs bFNldHRpbmcoInJlc291cmNlc0xhcmdlUm93cyIsICJyZXNvdXJjZXMtbGFyZ2Utcm93cyIsIHRy dWUpOwotICAgIFdlYkluc3BlY3Rvci5hcHBsaWNhdGlvblNldHRpbmdzLmluc3RhbGxTZXR0aW5n KCJ3YXRjaEV4cHJlc3Npb25zIiwgIndhdGNoLWV4cHJlc3Npb25zIiwgW10pOwotICAgIFdlYklu c3BlY3Rvci5hcHBsaWNhdGlvblNldHRpbmdzLmluc3RhbGxTZXR0aW5nKCJsYXN0Vmlld2VkU2Ny aXB0RmlsZSIsICJsYXN0LXZpZXdlZC1zY3JpcHQtZmlsZSIpOwotICAgIFdlYkluc3BlY3Rvci5h cHBsaWNhdGlvblNldHRpbmdzLmluc3RhbGxTZXR0aW5nKCJzaG93SW5oZXJpdGVkQ29tcHV0ZWRT dHlsZVByb3BlcnRpZXMiLCAic2hvdy1pbmhlcml0ZWQtY29tcHV0ZWQtc3R5bGUtcHJvcGVydGll cyIsIGZhbHNlKTsKLSAgICBXZWJJbnNwZWN0b3IuYXBwbGljYXRpb25TZXR0aW5ncy5pbnN0YWxs U2V0dGluZygic2hvd1VzZXJBZ2VudFN0eWxlcyIsICJzaG93LXVzZXItYWdlbnQtc3R5bGVzIiwg dHJ1ZSk7Ci0gICAgV2ViSW5zcGVjdG9yLmFwcGxpY2F0aW9uU2V0dGluZ3MuaW5zdGFsbFNldHRp bmcoInJlc291cmNlVmlld1RhYiIsICJyZXNvdXJjZS12aWV3LXRhYiIsICJjb250ZW50Iik7Ci0g ICAgV2ViSW5zcGVjdG9yLmFwcGxpY2F0aW9uU2V0dGluZ3MuaW5zdGFsbFNldHRpbmcoImNvbnNv bGVIaXN0b3J5IiwgImNvbnNvbGUtaGlzdG9yeSIsIFtdKTsKLSAgICBXZWJJbnNwZWN0b3IuYXBw bGljYXRpb25TZXR0aW5ncy5pbnN0YWxsU2V0dGluZygicmVzb3VyY2VzU29ydE9wdGlvbnMiLCAi cmVzb3VyY2VzLXNvcnQtb3B0aW9ucyIsIHt0aW1lT3B0aW9uOiAicmVzcG9uc2VUaW1lIiwgc2l6 ZU9wdGlvbjogInRyYW5zZmVyU2l6ZSJ9KTsKLQotICAgIFdlYkluc3BlY3Rvci5hcHBsaWNhdGlv blNldHRpbmdzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycygibG9hZGVkIik7CisgICAgdGhpcy5f c2Vzc2lvblNjb3BlID0gc2Vzc2lvblNjb3BlOworICAgIHRoaXMuX3N0b3JlID0ge307CiB9CiAK LVdlYkluc3BlY3Rvci5wb3B1bGF0ZVNlc3Npb25TZXR0aW5ncyA9IGZ1bmN0aW9uKHNldHRpbmdz U3RyaW5nKQorV2ViSW5zcGVjdG9yLlNldHRpbmdzLmluaXRpYWxpemUgPSBmdW5jdGlvbigpCiB7 Ci0gICAgV2ViSW5zcGVjdG9yLnNlc3Npb25TZXR0aW5ncy5fbG9hZChzZXR0aW5nc1N0cmluZyk7 Ci0gICAgV2ViSW5zcGVjdG9yLnNlc3Npb25TZXR0aW5ncy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5l cnMoImxvYWRlZCIpOwotfQorICAgIFdlYkluc3BlY3Rvci5hcHBsaWNhdGlvblNldHRpbmdzID0g bmV3IFdlYkluc3BlY3Rvci5TZXR0aW5ncyhmYWxzZSk7CisgICAgV2ViSW5zcGVjdG9yLnNlc3Np b25TZXR0aW5ncyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZ3ModHJ1ZSk7CiAKLVdlYkluc3Bl Y3Rvci5TZXR0aW5ncyA9IGZ1bmN0aW9uKHNlc3Npb25TY29wZSkKLXsKLSAgICB0aGlzLl9zZXNz aW9uU2NvcGUgPSBzZXNzaW9uU2NvcGU7Ci0gICAgdGhpcy5fc3RvcmUgPSB7fTsKKyAgICBmdW5j dGlvbiBwb3B1bGF0ZUFwcGxpY2F0aW9uU2V0dGluZ3Moc2V0dGluZ3NTdHJpbmcpCisgICAgewor ICAgICAgICBXZWJJbnNwZWN0b3IuYXBwbGljYXRpb25TZXR0aW5ncy5fbG9hZChzZXR0aW5nc1N0 cmluZyk7CisgICAgICAgIFdlYkluc3BlY3Rvci5hcHBsaWNhdGlvblNldHRpbmdzLmluc3RhbGxT ZXR0aW5nKCJldmVudExpc3RlbmVyc0ZpbHRlciIsICJldmVudC1saXN0ZW5lcnMtZmlsdGVyIiwg ImFsbCIpOworICAgICAgICBXZWJJbnNwZWN0b3IuYXBwbGljYXRpb25TZXR0aW5ncy5pbnN0YWxs U2V0dGluZygiY29sb3JGb3JtYXQiLCAiY29sb3ItZm9ybWF0IiwgImhleCIpOworICAgICAgICBX ZWJJbnNwZWN0b3IuYXBwbGljYXRpb25TZXR0aW5ncy5pbnN0YWxsU2V0dGluZygicmVzb3VyY2Vz TGFyZ2VSb3dzIiwgInJlc291cmNlcy1sYXJnZS1yb3dzIiwgdHJ1ZSk7CisgICAgICAgIFdlYklu c3BlY3Rvci5hcHBsaWNhdGlvblNldHRpbmdzLmluc3RhbGxTZXR0aW5nKCJ3YXRjaEV4cHJlc3Np b25zIiwgIndhdGNoLWV4cHJlc3Npb25zIiwgW10pOworICAgICAgICBXZWJJbnNwZWN0b3IuYXBw bGljYXRpb25TZXR0aW5ncy5pbnN0YWxsU2V0dGluZygibGFzdFZpZXdlZFNjcmlwdEZpbGUiLCAi bGFzdC12aWV3ZWQtc2NyaXB0LWZpbGUiKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLmFwcGxpY2F0 aW9uU2V0dGluZ3MuaW5zdGFsbFNldHRpbmcoInNob3dJbmhlcml0ZWRDb21wdXRlZFN0eWxlUHJv cGVydGllcyIsICJzaG93LWluaGVyaXRlZC1jb21wdXRlZC1zdHlsZS1wcm9wZXJ0aWVzIiwgZmFs c2UpOworICAgICAgICBXZWJJbnNwZWN0b3IuYXBwbGljYXRpb25TZXR0aW5ncy5pbnN0YWxsU2V0 dGluZygic2hvd1VzZXJBZ2VudFN0eWxlcyIsICJzaG93LXVzZXItYWdlbnQtc3R5bGVzIiwgdHJ1 ZSk7CisgICAgICAgIFdlYkluc3BlY3Rvci5hcHBsaWNhdGlvblNldHRpbmdzLmluc3RhbGxTZXR0 aW5nKCJyZXNvdXJjZVZpZXdUYWIiLCAicmVzb3VyY2Utdmlldy10YWIiLCAiY29udGVudCIpOwor ICAgICAgICBXZWJJbnNwZWN0b3IuYXBwbGljYXRpb25TZXR0aW5ncy5pbnN0YWxsU2V0dGluZygi Y29uc29sZUhpc3RvcnkiLCAiY29uc29sZS1oaXN0b3J5IiwgW10pOworICAgICAgICBXZWJJbnNw ZWN0b3IuYXBwbGljYXRpb25TZXR0aW5ncy5pbnN0YWxsU2V0dGluZygicmVzb3VyY2VzU29ydE9w dGlvbnMiLCAicmVzb3VyY2VzLXNvcnQtb3B0aW9ucyIsIHt0aW1lT3B0aW9uOiAicmVzcG9uc2VU aW1lIiwgc2l6ZU9wdGlvbjogInRyYW5zZmVyU2l6ZSJ9KTsKKworICAgICAgICBXZWJJbnNwZWN0 b3IuYXBwbGljYXRpb25TZXR0aW5ncy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoImxvYWRlZCIp OworICAgIH0KKworICAgIGZ1bmN0aW9uIHBvcHVsYXRlU2Vzc2lvblNldHRpbmdzKHNldHRpbmdz U3RyaW5nKQorICAgIHsKKyAgICAgICAgV2ViSW5zcGVjdG9yLnNlc3Npb25TZXR0aW5ncy5fbG9h ZChzZXR0aW5nc1N0cmluZyk7CisgICAgICAgIFdlYkluc3BlY3Rvci5zZXNzaW9uU2V0dGluZ3Mu ZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKCJsb2FkZWQiKTsKKyAgICB9CisKKyAgICBJbnNwZWN0 b3JCYWNrZW5kLmdldFNldHRpbmdzKFdlYkluc3BlY3Rvci5DYWxsYmFjay53cmFwKGZ1bmN0aW9u KHNldHRpbmdzKSB7CisgICAgICAgIHBvcHVsYXRlQXBwbGljYXRpb25TZXR0aW5ncyhzZXR0aW5n cy5hcHBsaWNhdGlvbik7CisgICAgICAgIHBvcHVsYXRlU2Vzc2lvblNldHRpbmdzKHNldHRpbmdz LnNlc3Npb24pOworICAgIH0pKTsKIH0KIAogV2ViSW5zcGVjdG9yLlNldHRpbmdzLnByb3RvdHlw ZSA9IHsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3Iu anMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCmluZGV4IDk5MWJm ZmVlNTllMzkzZjA2ZDFkYWUyZjFjNmE5M2QyOGIyYmQ5NzkuLmRiODllMjBlMjVmYjkwYzVmODk0 YWMzNThkYmViYzRjZTRhM2JkMGYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3Bl Y3Rvci5qcwpAQCAtNDkxLDggKzQ5MSw5IEBAIFdlYkluc3BlY3Rvci5kb0xvYWRlZERvbmUgPSBm dW5jdGlvbigpCiAgICAgdmFyIHBvcnQgPSBXZWJJbnNwZWN0b3IucG9ydDsKICAgICBkb2N1bWVu dC5ib2R5LmFkZFN0eWxlQ2xhc3MoInBvcnQtIiArIHBvcnQpOwogCi0gICAgdGhpcy5hcHBsaWNh dGlvblNldHRpbmdzID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5ncyhmYWxzZSk7Ci0gICAgdGhp cy5zZXNzaW9uU2V0dGluZ3MgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmdzKHRydWUpOworICAg IEluc3BlY3RvckZyb250ZW5kSG9zdC5sb2FkZWQoKTsKKyAgICBXZWJJbnNwZWN0b3IuU2V0dGlu Z3MuaW5pdGlhbGl6ZSgpOworICAgIAogICAgIHRoaXMuX3JlZ2lzdGVyU2hvcnRjdXRzKCk7CiAK ICAgICAvLyBzZXQgb3JkZXIgb2Ygc29tZSBzZWN0aW9ucyBleHBsaWNpdGx5CkBAIC01NzksNyAr NTgwLDcgQEAgV2ViSW5zcGVjdG9yLmRvTG9hZGVkRG9uZSA9IGZ1bmN0aW9uKCkKIAogICAgIHRo aXMuZXh0ZW5zaW9uU2VydmVyLmluaXRFeHRlbnNpb25zKCk7CiAKLSAgICBJbnNwZWN0b3JGcm9u dGVuZEhvc3QubG9hZGVkKCk7CisgICAgSW5zcGVjdG9yQmFja2VuZC5wb3B1bGF0ZVNjcmlwdE9i amVjdHMoKTsKIAogICAgIC8vIEFzIGEgRE9NQWdlbnQgbWV0aG9kLCB0aGlzIG5lZWRzIHRvIGhh cHBlbiBhZnRlciB0aGUgZnJvbnRlbmQgaGFzIGxvYWRlZCBhbmQgdGhlIGFnZW50IGlzIGF2YWls YWJsZS4KICAgICBJbnNwZWN0b3JCYWNrZW5kLmdldFN1cHBvcnRlZENTU1Byb3BlcnRpZXMoV2Vi SW5zcGVjdG9yLkNhbGxiYWNrLndyYXAoV2ViSW5zcGVjdG9yLkNTU0NvbXBsZXRpb25zLl9sb2Fk KSk7CkBAIC0xNDUwLDE1ICsxNDUxLDYgQEAgV2ViSW5zcGVjdG9yLnJlc3VtZWRTY3JpcHQgPSBm dW5jdGlvbigpCiAgICAgdGhpcy5wYW5lbHMuc2NyaXB0cy5kZWJ1Z2dlclJlc3VtZWQoKTsKIH0K IAotV2ViSW5zcGVjdG9yLnBvcHVsYXRlSW50ZXJmYWNlID0gZnVuY3Rpb24oKQotewotICAgIGZv ciAodmFyIHBhbmVsTmFtZSBpbiB0aGlzLnBhbmVscykgewotICAgICAgICB2YXIgcGFuZWwgPSB0 aGlzLnBhbmVsc1twYW5lbE5hbWVdOwotICAgICAgICBpZiAoInBvcHVsYXRlSW50ZXJmYWNlIiBp biBwYW5lbCkKLSAgICAgICAgICAgIHBhbmVsLnBvcHVsYXRlSW50ZXJmYWNlKCk7Ci0gICAgfQot fQotCiBXZWJJbnNwZWN0b3IucmVzZXQgPSBmdW5jdGlvbigpCiB7CiAgICAgZm9yICh2YXIgcGFu ZWxOYW1lIGluIHRoaXMucGFuZWxzKSB7Cg==