52574 2011-01-17 07:08:21 -0800 Web Inspector: restore agents' state upon frontend reuse. 2011-01-17 12:59:55 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 335307 0 pfeldman 2011-01-17 07:08:21 -0800 Sometimes, we'd like to connect existing front-end to the existing inspector. We should restore agents state in the front-end in theses cases: dom, network, database, etc. 335308 1 79166 pfeldman 2011-01-17 07:11:34 -0800 Created attachment 79166 [PATCH] Proposed change. 335329 2 79166 yurys 2011-01-17 07:58:09 -0800 Comment on attachment 79166 [PATCH] Proposed change. View in context: https://bugs.webkit.org/attachment.cgi?id=79166&action=review > Source/WebCore/inspector/Inspector.idl:-188 > - [notify, domain=DOM] void didCommitLoad(); This method should be deleted from the front-end as well. > Source/WebCore/inspector/front-end/inspector.js:1657 > + this.networkManager.reset(); Why not move this call inside WebInspector.reset ? 335349 3 pfeldman 2011-01-17 08:43:17 -0800 (In reply to comment #2) > (From update of attachment 79166 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=79166&action=review > > > Source/WebCore/inspector/Inspector.idl:-188 > > - [notify, domain=DOM] void didCommitLoad(); > > This method should be deleted from the front-end as well. > Done. > > Source/WebCore/inspector/front-end/inspector.js:1657 > > + this.networkManager.reset(); > > Why not move this call inside WebInspector.reset ? We'll need a better fix for that: WebInspector.reset should not lead to cached resource query (which network manager would do upon the call). Committing to http://svn.webkit.org/repository/webkit/trunk ... M Source/WebCore/ChangeLog M Source/WebCore/inspector/Inspector.idl M Source/WebCore/inspector/InspectorController.cpp M Source/WebCore/inspector/InspectorController.h M Source/WebCore/inspector/front-end/DOMAgent.js M Source/WebCore/inspector/front-end/NetworkManager.js M Source/WebCore/inspector/front-end/NetworkPanel.js M Source/WebCore/inspector/front-end/ResourceTreeModel.js M Source/WebCore/inspector/front-end/ResourcesPanel.js M Source/WebCore/inspector/front-end/inspector.js Committed r75949 335455 4 79166 caseq 2011-01-17 12:41:17 -0800 Comment on attachment 79166 [PATCH] Proposed change. View in context: https://bugs.webkit.org/attachment.cgi?id=79166&action=review > Source/WebCore/inspector/front-end/NetworkPanel.js:819 > var resourcesToAppend = (WebInspector.mainResource.redirects || []).concat(WebInspector.mainResource); Now we re-append the main resource event if we have _preserveLogToggle.toggled and did not clear the panel in clear(). Should we? 335471 5 pfeldman 2011-01-17 12:59:55 -0800 > Now we re-append the main resource event if we have _preserveLogToggle.toggled and did not clear the panel in clear(). Should we? Nope. r75969 has a fix. Thanks. 79166 2011-01-17 07:11:34 -0800 2011-01-17 12:41:17 -0800 [PATCH] Proposed change. reuse_frontend text/plain 9926 pfeldman ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkNDIxNmIyLi5hYTVlMWEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTEtMDEtMTcgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogcmVzdG9yZSBkb20gYW5kIG5ldHdvcmsgc3RhdGUgdXBvbiBmcm9udGVuZCByZXVzZS4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUyNTc0CisK KyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmlkbDoKKyAgICAgICAgKiBpbnNwZWN0b3Iv SW5zcGVjdG9yQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250 cm9sbGVyOjpyZXN0b3JlSW5zcGVjdG9yU3RhdGVGcm9tQ29va2llKToKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OnBvcHVsYXRlU2NyaXB0T2JqZWN0cyk6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpwdXNoRGF0YUNvbGxlY3RlZE9mZmxpbmUp OgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlkQ29tbWl0TG9hZCk6 CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLk5ldHdvcmtNYW5hZ2VyLnByb3RvdHlwZS5yZXNldCk6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29y a1BhbmVsLnByb3RvdHlwZS5jbGVhcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya1Bh bmVsLnByb3RvdHlwZS5tYWluUmVzb3VyY2VDaGFuZ2VkKToKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL1Jlc291cmNlVHJlZU1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJl c291cmNlVHJlZU1vZGVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2Rl bC5wcm90b3R5cGUucmVsb2FkQ2FjaGVkUmVzb3VyY2VzKToKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291 cmNlc1BhbmVsLnByb3RvdHlwZS5jbGVhcik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9pbnNwZWN0b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuZnJvbnRlbmRSZXVzZWQpOgor CiAyMDExLTAxLTE3ICBMYXN6bG8gR29tYm9zICA8bGFzemxvLjEuZ29tYm9zQG5va2lhLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuaWRsIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3Rvci5pZGwKaW5kZXggMDVjODg0OS4uMjdjMjBmMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3Rvci5pZGwKQEAgLTQ4LDYgKzQ4LDcgQEAgbW9kdWxlIGNvcmUgewog CiAgICAgICAgIFtkb21haW49SW5zcGVjdG9yXSB2b2lkIG9wZW5Jbkluc3BlY3RlZFdpbmRvdyhp biBTdHJpbmcgdXJsKTsKICAgICAgICAgW2RvbWFpbj1JbnNwZWN0b3JdIHZvaWQgc2V0U2VhcmNo aW5nRm9yTm9kZShpbiBib29sZWFuIGVuYWJsZWQsIG91dCBib29sZWFuIG5ld1N0YXRlKTsKKyAg ICAgICAgW25vdGlmeSwgZG9tYWluPUluc3BlY3Rvcl0gdm9pZCBmcm9udGVuZFJldXNlZCgpOwog ICAgICAgICBbbm90aWZ5LCBkb21haW49SW5zcGVjdG9yXSB2b2lkIGFkZE5vZGVzVG9TZWFyY2hS ZXN1bHQob3V0IEFycmF5IG5vZGVJZHMpOwogICAgICAgICBbbm90aWZ5LCBkb21haW49SW5zcGVj dG9yXSB2b2lkIGJyaW5nVG9Gcm9udCgpOwogICAgICAgICBbbm90aWZ5LCBkb21haW49SW5zcGVj dG9yXSB2b2lkIGRpc2Nvbm5lY3RGcm9tQmFja2VuZCgpOwpAQCAtMTg1LDcgKzE4Niw2IEBAIG1v ZHVsZSBjb3JlIHsKICAgICAgICAgW25vdGlmeSwgZG9tYWluPURPTV0gdm9pZCBjaGlsZE5vZGVD b3VudFVwZGF0ZWQob3V0IGxvbmcgaWQsIG91dCBpbnQgbmV3VmFsdWUpOwogICAgICAgICBbbm90 aWZ5LCBkb21haW49RE9NXSB2b2lkIGNoaWxkTm9kZUluc2VydGVkKG91dCBsb25nIHBhcmVudElk LCBvdXQgbG9uZyBwcmV2SWQsIG91dCBPYmplY3Qgbm9kZSk7CiAgICAgICAgIFtub3RpZnksIGRv bWFpbj1ET01dIHZvaWQgY2hpbGROb2RlUmVtb3ZlZChvdXQgbG9uZyBwYXJlbnRJZCwgb3V0IGxv bmcgaWQpOwotICAgICAgICBbbm90aWZ5LCBkb21haW49RE9NXSB2b2lkIGRpZENvbW1pdExvYWQo KTsKIAogICAgICAgICAvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLwogICAgICAgICAvLyBDU1MgQVBJCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKaW5kZXggODVh OTQ4ZC4uYWU3ZTlkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckNvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JDb250cm9sbGVyLmNwcApAQCAtMjI0LDggKzIyNCwxMyBAQCB2b2lkIEluc3BlY3RvckNvbnRy b2xsZXI6OnJlc3RvcmVJbnNwZWN0b3JTdGF0ZUZyb21Db29raWUoY29uc3QgU3RyaW5nJiBpbnNw ZWN0bwogewogICAgIG1fc3RhdGUtPnJlc3RvcmVGcm9tSW5zcGVjdG9yQ29va2llKGluc3BlY3Rv clN0YXRlQ29va2llKTsKIAotICAgIGlmICghbV9mcm9udGVuZCkKKyAgICBpZiAoIW1fZnJvbnRl bmQpIHsKICAgICAgICAgY29ubmVjdEZyb250ZW5kKCk7CisgICAgICAgIG1fZnJvbnRlbmQtPmZy b250ZW5kUmV1c2VkKCk7CisgICAgICAgIG1fZnJvbnRlbmQtPmluc3BlY3RlZFVSTENoYW5nZWQo bV9pbnNwZWN0ZWRQYWdlLT5tYWluRnJhbWUoKS0+bG9hZGVyKCktPnVybCgpLnN0cmluZygpKTsK KyAgICAgICAgbV9kb21BZ2VudC0+c2V0RG9jdW1lbnQobV9pbnNwZWN0ZWRQYWdlLT5tYWluRnJh bWUoKS0+ZG9jdW1lbnQoKSk7CisgICAgICAgIHB1c2hEYXRhQ29sbGVjdGVkT2ZmbGluZSgpOwor ICAgIH0KIAogICAgIGlmIChtX3N0YXRlLT5nZXRCb29sZWFuKEluc3BlY3RvclN0YXRlOjp0aW1l bGluZVByb2ZpbGVyRW5hYmxlZCkpCiAgICAgICAgIHN0YXJ0VGltZWxpbmVQcm9maWxlcigpOwpA QCAtNTQ4LDExICs1NTMsMjQgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpwb3B1bGF0ZVNj cmlwdE9iamVjdHMoKQogICAgICAgICBtX2Zyb250ZW5kLT5wcm9maWxlcldhc0VuYWJsZWQoKTsK ICNlbmRpZgogCi0gICAgbV9kb21BZ2VudC0+c2V0RG9jdW1lbnQobV9pbnNwZWN0ZWRQYWdlLT5t YWluRnJhbWUoKS0+ZG9jdW1lbnQoKSk7CisgICAgcHVzaERhdGFDb2xsZWN0ZWRPZmZsaW5lKCk7 CiAKICAgICBpZiAobV9ub2RlVG9Gb2N1cykKICAgICAgICAgZm9jdXNOb2RlKCk7CiAKKyAgICAv LyBEaXNwYXRjaCBwZW5kaW5nIGZyb250ZW5kIGNvbW1hbmRzCisgICAgZm9yIChWZWN0b3I8cGFp cjxsb25nLCBTdHJpbmc+ID46Oml0ZXJhdG9yIGl0ID0gbV9wZW5kaW5nRXZhbHVhdGVUZXN0Q29t bWFuZHMuYmVnaW4oKTsgaXQgIT0gbV9wZW5kaW5nRXZhbHVhdGVUZXN0Q29tbWFuZHMuZW5kKCk7 ICsraXQpCisgICAgICAgIG1fZnJvbnRlbmQtPmV2YWx1YXRlRm9yVGVzdEluRnJvbnRlbmQoKCpp dCkuZmlyc3QsICgqaXQpLnNlY29uZCk7CisgICAgbV9wZW5kaW5nRXZhbHVhdGVUZXN0Q29tbWFu ZHMuY2xlYXIoKTsKKworICAgIHJlc3RvcmVEZWJ1Z2dlcigpOworICAgIHJlc3RvcmVQcm9maWxl cihQcm9maWxlclJlc3RvcmVOb0FjdGlvbik7Cit9CisKK3ZvaWQgSW5zcGVjdG9yQ29udHJvbGxl cjo6cHVzaERhdGFDb2xsZWN0ZWRPZmZsaW5lKCkKK3sKKyAgICBtX2RvbUFnZW50LT5zZXREb2N1 bWVudChtX2luc3BlY3RlZFBhZ2UtPm1haW5GcmFtZSgpLT5kb2N1bWVudCgpKTsKKwogI2lmIEVO QUJMRShEQVRBQkFTRSkKICAgICBEYXRhYmFzZVJlc291cmNlc01hcDo6aXRlcmF0b3IgZGF0YWJh c2VzRW5kID0gbV9kYXRhYmFzZVJlc291cmNlcy5lbmQoKTsKICAgICBmb3IgKERhdGFiYXNlUmVz b3VyY2VzTWFwOjppdGVyYXRvciBpdCA9IG1fZGF0YWJhc2VSZXNvdXJjZXMuYmVnaW4oKTsgaXQg IT0gZGF0YWJhc2VzRW5kOyArK2l0KQpAQCAtNTcwLDE0ICs1ODgsNiBAQCB2b2lkIEluc3BlY3Rv ckNvbnRyb2xsZXI6OnBvcHVsYXRlU2NyaXB0T2JqZWN0cygpCiAgICAgICAgIG1fZnJvbnRlbmQt PmRpZENyZWF0ZVdvcmtlcih3b3JrZXItPmlkKCksIHdvcmtlci0+dXJsKCksIHdvcmtlci0+aXNT aGFyZWRXb3JrZXIoKSk7CiAgICAgfQogI2VuZGlmCi0KLSAgICAvLyBEaXNwYXRjaCBwZW5kaW5n IGZyb250ZW5kIGNvbW1hbmRzCi0gICAgZm9yIChWZWN0b3I8cGFpcjxsb25nLCBTdHJpbmc+ID46 Oml0ZXJhdG9yIGl0ID0gbV9wZW5kaW5nRXZhbHVhdGVUZXN0Q29tbWFuZHMuYmVnaW4oKTsgaXQg IT0gbV9wZW5kaW5nRXZhbHVhdGVUZXN0Q29tbWFuZHMuZW5kKCk7ICsraXQpCi0gICAgICAgIG1f ZnJvbnRlbmQtPmV2YWx1YXRlRm9yVGVzdEluRnJvbnRlbmQoKCppdCkuZmlyc3QsICgqaXQpLnNl Y29uZCk7Ci0gICAgbV9wZW5kaW5nRXZhbHVhdGVUZXN0Q29tbWFuZHMuY2xlYXIoKTsKLQotICAg IHJlc3RvcmVEZWJ1Z2dlcigpOwotICAgIHJlc3RvcmVQcm9maWxlcihQcm9maWxlclJlc3RvcmVO b0FjdGlvbik7CiB9CiAKIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6cmVzdG9yZURlYnVnZ2Vy KCkKQEAgLTY3MSwxMCArNjgxLDggQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRDb21t aXRMb2FkKERvY3VtZW50TG9hZGVyKiBsb2FkZXIpCiAgICAgICAgIG1fZG9tU3RvcmFnZVJlc291 cmNlcy5jbGVhcigpOwogI2VuZGlmCiAKLSAgICAgICAgaWYgKG1fZnJvbnRlbmQpIHsKLSAgICAg ICAgICAgIG1fZnJvbnRlbmQtPmRpZENvbW1pdExvYWQoKTsKKyAgICAgICAgaWYgKG1fZnJvbnRl bmQpCiAgICAgICAgICAgICBtX2RvbUFnZW50LT5zZXREb2N1bWVudChtX2luc3BlY3RlZFBhZ2Ut Pm1haW5GcmFtZSgpLT5kb2N1bWVudCgpKTsKLSAgICAgICAgfQogICAgIH0KIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaCBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgKaW5kZXggMTJhZDBi Zi4uYmY4ODQyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckNvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29u dHJvbGxlci5oCkBAIC0yNTgsNiArMjU4LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGdldEluc3Bl Y3RvclN0YXRlKFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+KiBzdGF0ZSk7CiAKICAgICB2b2lkIHBv cHVsYXRlU2NyaXB0T2JqZWN0cygpOworICAgIHZvaWQgcHVzaERhdGFDb2xsZWN0ZWRPZmZsaW5l KCk7CiAgICAgdm9pZCByZXN0b3JlRGVidWdnZXIoKTsKICAgICBlbnVtIFByb2ZpbGVyUmVzdG9y ZUFjdGlvbiB7CiAgICAgICAgIFByb2ZpbGVyUmVzdG9yZU5vQWN0aW9uID0gMCwKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzCmlu ZGV4IGM4ZmYyZTAuLjM5NDJkYjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcwpAQCAtODcsNiArODcsMTMgQEAgV2ViSW5z cGVjdG9yLk5ldHdvcmtNYW5hZ2VyLnVwZGF0ZVJlc291cmNlV2l0aENhY2hlZFJlc291cmNlID0g ZnVuY3Rpb24ocmVzb3VyY2UKIH0KIAogV2ViSW5zcGVjdG9yLk5ldHdvcmtNYW5hZ2VyLnByb3Rv dHlwZSA9IHsKKyAgICByZXNldDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgV2ViSW5zcGVj dG9yLnBhbmVscy5uZXR3b3JrLmNsZWFyKCk7CisgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMu cmVzb3VyY2VzLmNsZWFyKCk7CisgICAgICAgIHRoaXMuX3Jlc291cmNlVHJlZU1vZGVsLnJlbG9h ZENhY2hlZFJlc291cmNlcygpOworICAgIH0sCisKICAgICBpZGVudGlmaWVyRm9ySW5pdGlhbFJl cXVlc3Q6IGZ1bmN0aW9uKGlkZW50aWZpZXIsIHVybCwgbG9hZGVyLCBjYWxsU3RhY2spCiAgICAg ewogICAgICAgICB2YXIgcmVzb3VyY2UgPSB0aGlzLl9yZXNvdXJjZVRyZWVNb2RlbC5jcmVhdGVS ZXNvdXJjZShpZGVudGlmaWVyLCB1cmwsIGxvYWRlciwgY2FsbFN0YWNrKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMKaW5kZXggMzU3 MTQ0YS4uYWE4NjhmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9OZXR3b3JrUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9OZXR3b3JrUGFuZWwuanMKQEAgLTgwNCwxMiArODA0LDE3IEBAIFdlYkluc3BlY3Rvci5O ZXR3b3JrUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy52aXNpYmxlVmlldyA9 IG5ld1ZpZXc7CiAgICAgfSwKIAotICAgIG1haW5SZXNvdXJjZUNoYW5nZWQ6IGZ1bmN0aW9uKCkK KyAgICBjbGVhcjogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX3ByZXNlcnZl TG9nVG9nZ2xlLnRvZ2dsZWQpCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgdGhpcy5f cmVzZXQoKTsKKyAgICB9LAorCisgICAgbWFpblJlc291cmNlQ2hhbmdlZDogZnVuY3Rpb24oKQor ICAgIHsKKyAgICAgICAgdGhpcy5jbGVhcigpOwogICAgICAgICAvLyBOb3cgcmVzdXJyZWN0IHRo ZSBtYWluIHJlc291cmNlIGFsb25nIHdpdGggYWxsIHJlZGlyZWN0cyB0aGF0IGxlYWQgdG8gaXQu CiAgICAgICAgIHZhciByZXNvdXJjZXNUb0FwcGVuZCA9IChXZWJJbnNwZWN0b3IubWFpblJlc291 cmNlLnJlZGlyZWN0cyB8fCBbXSkuY29uY2F0KFdlYkluc3BlY3Rvci5tYWluUmVzb3VyY2UpOwog ICAgICAgICByZXNvdXJjZXNUb0FwcGVuZC5mb3JFYWNoKHRoaXMuYXBwZW5kUmVzb3VyY2UsIHRo aXMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNv dXJjZVRyZWVNb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVz b3VyY2VUcmVlTW9kZWwuanMKaW5kZXggNmY2YmE3YS4uYjExNGI5NCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVRyZWVNb2RlbC5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVHJlZU1vZGVsLmpz CkBAIC0zMSwxMyArMzEsMTggQEAKIAogV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsID0g ZnVuY3Rpb24oKQogewotICAgIHRoaXMuX3Jlc291cmNlc0J5VVJMID0ge307Ci0gICAgdGhpcy5f cmVzb3VyY2VzQnlGcmFtZUlkID0ge307Ci0gICAgdGhpcy5fc3ViZnJhbWVzID0ge307Ci0gICAg SW5zcGVjdG9yQmFja2VuZC5jYWNoZWRSZXNvdXJjZXModGhpcy5fcHJvY2Vzc0NhY2hlZFJlc291 cmNlcy5iaW5kKHRoaXMpKTsKKyAgICB0aGlzLnJlbG9hZENhY2hlZFJlc291cmNlcygpOwogfQog CiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwucHJvdG90eXBlID0geworICAgIHJlbG9h ZENhY2hlZFJlc291cmNlczogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fcmVzb3Vy Y2VzQnlVUkwgPSB7fTsKKyAgICAgICAgdGhpcy5fcmVzb3VyY2VzQnlGcmFtZUlkID0ge307Cisg ICAgICAgIHRoaXMuX3N1YmZyYW1lcyA9IHt9OworICAgICAgICBJbnNwZWN0b3JCYWNrZW5kLmNh Y2hlZFJlc291cmNlcyh0aGlzLl9wcm9jZXNzQ2FjaGVkUmVzb3VyY2VzLmJpbmQodGhpcykpOwor ICAgIH0sCisKICAgICBhZGRPclVwZGF0ZUZyYW1lOiBmdW5jdGlvbihmcmFtZSkKICAgICB7CiAg ICAgICAgIHZhciB0bXBSZXNvdXJjZSA9IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2UobnVsbCwg ZnJhbWUudXJsKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvUmVzb3VyY2VzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1Jlc291cmNlc1BhbmVsLmpzCmluZGV4IDA3NTI0OWEuLjllZjhmNWIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwpAQCAt MTY1LDYgKzE2NSwxMiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0g ewogICAgICAgICAgICAgdGhpcy5zaWRlYmFyVHJlZS5zZWxlY3RlZFRyZWVFbGVtZW50LmRlc2Vs ZWN0KCk7CiAgICAgfSwKIAorICAgIGNsZWFyOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB0 aGlzLnJlc291cmNlc0xpc3RUcmVlRWxlbWVudC5yZW1vdmVDaGlsZHJlbigpOworICAgICAgICB0 aGlzLnJlc2V0KCk7CisgICAgfSwKKwogICAgIGFkZE9yVXBkYXRlRnJhbWU6IGZ1bmN0aW9uKHBh cmVudEZyYW1lSWQsIGZyYW1lSWQsIHRpdGxlLCBzdWJ0aXRsZSkKICAgICB7CiAgICAgICAgIHZh ciBmcmFtZVRyZWVFbGVtZW50ID0gdGhpcy5fdHJlZUVsZW1lbnRGb3JGcmFtZUlkW2ZyYW1lSWRd OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0 b3IuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpp bmRleCBjZDA3NGZkLi5kOGE5M2IxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpAQCAtMTY1Miw2ICsxNjUyLDEyIEBAIFdlYkluc3BlY3Rv ci5kb1BlcmZvcm1TZWFyY2ggPSBmdW5jdGlvbihxdWVyeSwgZm9yY2VTZWFyY2gsIGlzQmFja3dh cmRTZWFyY2gsIHJlCiAgICAgdGhpcy5jdXJyZW50UGFuZWwucGVyZm9ybVNlYXJjaChxdWVyeSk7 CiB9CiAKK1dlYkluc3BlY3Rvci5mcm9udGVuZFJldXNlZCA9IGZ1bmN0aW9uKCkKK3sKKyAgICB0 aGlzLm5ldHdvcmtNYW5hZ2VyLnJlc2V0KCk7CisgICAgdGhpcy5yZXNldCgpOworfQorCiBXZWJJ bnNwZWN0b3IuYWRkTm9kZXNUb1NlYXJjaFJlc3VsdCA9IGZ1bmN0aW9uKG5vZGVJZHMpCiB7CiAg ICAgV2ViSW5zcGVjdG9yLnBhbmVscy5lbGVtZW50cy5hZGROb2Rlc1RvU2VhcmNoUmVzdWx0KG5v ZGVJZHMpOwo=