57351 2011-03-29 09:33:38 -0700 Web Inspector: [Chromium] Remove exact retained size request in detailed heap snapshots 2011-03-30 00:12:29 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 mnaganov mnaganov abarth apavlov bweinstein eric joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 375430 0 mnaganov 2011-03-29 09:33:38 -0700 We currently have two kinds of retained memory sizes for object: "approximate" obtained using dominator tree, and "exact" calculated by reachable objects marking. It turns out, that in most cases these sizes are the same. I've checked a heap snapshot of GMail and have found no object for which "approximate" and "exact" sizes differ. I haven't found any proof that those sizes are always the same (nor a proof for the opposite statement). I suppose that in most practical cases they are the same, so it makes no sense bloating UI with "approximate" / "exact" separation. 375440 1 87348 mnaganov 2011-03-29 09:43:17 -0700 Created attachment 87348 patch 376061 2 mnaganov 2011-03-29 23:27:35 -0700 Manually committed http://trac.webkit.org/changeset/82393 2011-03-29 Mikhail Naganov <mnaganov@chromium.org> Reviewed by Pavel Feldman. Web Inspector: [Chromium] Remove exact retained size request in detailed heap snapshots. https://bugs.webkit.org/show_bug.cgi?id=57351 * bindings/js/ScriptHeapSnapshot.h: * bindings/v8/ScriptHeapSnapshot.cpp: * bindings/v8/ScriptHeapSnapshot.h: * inspector/Inspector.json: * inspector/InspectorProfilerAgent.cpp: * inspector/InspectorProfilerAgent.h: * inspector/front-end/DetailedHeapshotGridNodes.js: (WebInspector.HeapSnapshotGenericObjectNode): (WebInspector.HeapSnapshotGenericObjectNode.prototype.get data): * inspector/front-end/DetailedHeapshotView.js: (WebInspector.DetailedHeapshotView.prototype._mouseClickInContainmentGrid): 376094 3 webkit.review.bot 2011-03-30 00:12:29 -0700 http://trac.webkit.org/changeset/82393 might have broken SnowLeopard Intel Release (WebKit2 Tests) 87348 2011-03-29 09:43:17 -0700 2011-03-29 22:55:31 -0700 patch patch-57351 text/plain 10895 mnaganov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwMzc4ZmQwLi41ZWRkMTc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTEtMDMtMjkgIE1pa2hhaWwgTmFnYW5vdiAgPG1uYWdhbm92QGNocm9taXVtLm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiBbQ2hyb21pdW1dIFJlbW92ZSBleGFjdCByZXRhaW5lZCBzaXplIHJlcXVlc3QgaW4g ZGV0YWlsZWQgaGVhcCBzbmFwc2hvdHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01NzM1MQorCisgICAgICAgICogYmluZGluZ3MvanMvU2NyaXB0SGVh cFNuYXBzaG90Lmg6CisgICAgICAgICogYmluZGluZ3MvdjgvU2NyaXB0SGVhcFNuYXBzaG90LmNw cDoKKyAgICAgICAgKiBiaW5kaW5ncy92OC9TY3JpcHRIZWFwU25hcHNob3QuaDoKKyAgICAgICAg KiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpzb246CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rv clByb2ZpbGVyQWdlbnQuY3BwOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JQcm9maWxl ckFnZW50Lmg6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90 R3JpZE5vZGVzLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdEdlbmVyaWNP YmplY3ROb2RlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RHZW5lcmljT2Jq ZWN0Tm9kZS5wcm90b3R5cGUuZ2V0IGRhdGEpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvRGV0YWlsZWRIZWFwc2hvdFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGV0YWls ZWRIZWFwc2hvdFZpZXcucHJvdG90eXBlLl9tb3VzZUNsaWNrSW5Db250YWlubWVudEdyaWQpOgor CiAyMDExLTAzLTI5ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBOaWtvbGFzIFppbW1lcm1hbm4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9qcy9TY3JpcHRIZWFwU25hcHNob3QuaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL2pzL1NjcmlwdEhlYXBTbmFwc2hvdC5oCmluZGV4IDZiNDBlMjAuLmEzNDFkZGMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdEhlYXBTbmFwc2hvdC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdEhlYXBTbmFwc2hvdC5oCkBAIC01 MCw3ICs1MCw2IEBAIHB1YmxpYzoKICAgICB1bnNpZ25lZCBpbnQgdWlkKCkgY29uc3QgeyByZXR1 cm4gMDsgfQogCiAgICAgdm9pZCB3cml0ZUpTT04oT3V0cHV0U3RyZWFtKikgeyB9Ci0gICAgaW50 IGV4YWN0UmV0YWluZWRTaXplKHVpbnQ2NF90KSB7IHJldHVybiAtMTsgfQogCiBwcml2YXRlOgog ICAgIFNjcmlwdEhlYXBTbmFwc2hvdCgpIHsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvdjgvU2NyaXB0SGVhcFNuYXBzaG90LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3Y4L1NjcmlwdEhlYXBTbmFwc2hvdC5jcHAKaW5kZXggZDEwNTRlYy4uNjhlZDhkYSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0SGVhcFNuYXBzaG90LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRIZWFwU25hcHNob3QuY3Bw CkBAIC04MSwxMCArODEsNCBAQCB2b2lkIFNjcmlwdEhlYXBTbmFwc2hvdDo6d3JpdGVKU09OKFNj cmlwdEhlYXBTbmFwc2hvdDo6T3V0cHV0U3RyZWFtKiBzdHJlYW0pCiAgICAgbV9zbmFwc2hvdC0+ U2VyaWFsaXplKCZvdXRwdXRTdHJlYW0sIHY4OjpIZWFwU25hcHNob3Q6OmtKU09OKTsKIH0KIAot aW50IFNjcmlwdEhlYXBTbmFwc2hvdDo6ZXhhY3RSZXRhaW5lZFNpemUodWludDY0X3Qgbm9kZUlk KQotewotICAgIGNvbnN0IHY4OjpIZWFwR3JhcGhOb2RlKiBub2RlID0gbV9zbmFwc2hvdC0+R2V0 Tm9kZUJ5SWQobm9kZUlkKTsKLSAgICByZXR1cm4gbm9kZSA/IG5vZGUtPkdldFJldGFpbmVkU2l6 ZSh0cnVlKSA6IC0xOwotfQotCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRIZWFwU25hcHNob3QuaCBiL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdEhlYXBTbmFwc2hvdC5oCmluZGV4IGZkZDA5ZTMuLjQw OTNmYTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdEhlYXBT bmFwc2hvdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdEhlYXBTbmFw c2hvdC5oCkBAIC01OSw3ICs1OSw2IEBAIHB1YmxpYzoKICAgICBTdHJpbmcgdGl0bGUoKSBjb25z dDsKICAgICB1bnNpZ25lZCBpbnQgdWlkKCkgY29uc3Q7CiAgICAgdm9pZCB3cml0ZUpTT04oT3V0 cHV0U3RyZWFtKiBzdHJlYW0pOwotICAgIGludCBleGFjdFJldGFpbmVkU2l6ZSh1aW50NjRfdCBu b2RlSWQpOwogCiBwcml2YXRlOgogICAgIFNjcmlwdEhlYXBTbmFwc2hvdChjb25zdCB2ODo6SGVh cFNuYXBzaG90KiBzbmFwc2hvdCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3IuanNvbiBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNv bgppbmRleCBiN2Q5YTljLi4yOTBiNTk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yLmpzb24KKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3Rvci5qc29uCkBAIC0xMzg3LDE2ICsxMzg3LDYgQEAKICAgICAgICAgICAgICAgICBdCiAgICAg ICAgICAgICB9LAogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJuYW1lIjogImdldEV4 YWN0SGVhcFNuYXBzaG90Tm9kZVJldGFpbmVkU2l6ZSIsCi0gICAgICAgICAgICAgICAgInBhcmFt ZXRlcnMiOiBbCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidWlkIiwgInR5cGUiOiAi aW50ZWdlciIgfSwKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJub2RlSWQiLCAidHlw ZSI6ICJpbnRlZ2VyIiB9Ci0gICAgICAgICAgICAgICAgXSwKLSAgICAgICAgICAgICAgICAicmV0 dXJucyI6IFsKLSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzaXplIiwgInR5cGUiOiAi aW50ZWdlciIgfQotICAgICAgICAgICAgICAgIF0KLSAgICAgICAgICAgIH0sCi0gICAgICAgICAg ICB7CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAiY29sbGVjdEdhcmJhZ2UiCiAgICAgICAgICAg ICB9CiAgICAgICAgIF0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yUHJvZmlsZXJBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yUHJvZmlsZXJBZ2VudC5jcHAKaW5kZXggNjU0NGZiYi4uMWY5NWI2NCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclByb2ZpbGVyQWdlbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQcm9maWxlckFnZW50LmNwcApAQCAt MTgxLDE2ICsxODEsNiBAQCBTdHJpbmcgSW5zcGVjdG9yUHJvZmlsZXJBZ2VudDo6Z2V0Q3VycmVu dFVzZXJJbml0aWF0ZWRQcm9maWxlTmFtZShib29sIGluY3JlbWVudAogICAgIHJldHVybiBtYWtl U3RyaW5nKFVzZXJJbml0aWF0ZWRQcm9maWxlTmFtZSwgJy4nLCBTdHJpbmc6Om51bWJlcihtX2N1 cnJlbnRVc2VySW5pdGlhdGVkUHJvZmlsZU51bWJlcikpOwogfQogCi12b2lkIEluc3BlY3RvclBy b2ZpbGVyQWdlbnQ6OmdldEV4YWN0SGVhcFNuYXBzaG90Tm9kZVJldGFpbmVkU2l6ZShFcnJvclN0 cmluZyosIHVuc2lnbmVkIHVpZCwgaW50IG5vZGVJZCwgaW50KiBzaXplKQotewotICAgIEhlYXBT bmFwc2hvdHNNYXA6Oml0ZXJhdG9yIGl0ID0gbV9zbmFwc2hvdHMuZmluZCh1aWQpOwotICAgIGlm IChpdCAhPSBtX3NuYXBzaG90cy5lbmQoKSkgewotICAgICAgICBSZWZQdHI8U2NyaXB0SGVhcFNu YXBzaG90PiBzbmFwc2hvdCA9IGl0LT5zZWNvbmQ7Ci0gICAgICAgICpzaXplID0gc25hcHNob3Qt PmV4YWN0UmV0YWluZWRTaXplKG5vZGVJZCk7Ci0gICAgfSBlbHNlCi0gICAgICAgICpzaXplID0g LTE7Ci19Ci0KIHZvaWQgSW5zcGVjdG9yUHJvZmlsZXJBZ2VudDo6Z2V0UHJvZmlsZUhlYWRlcnMo RXJyb3JTdHJpbmcqLCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+KiBoZWFkZXJzKQogewogICAgIFBy b2ZpbGVzTWFwOjppdGVyYXRvciBwcm9maWxlc0VuZCA9IG1fcHJvZmlsZXMuZW5kKCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUHJvZmlsZXJBZ2VudC5o IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclByb2ZpbGVyQWdlbnQuaAppbmRl eCBlYjRjMGFkLi42YzVjZjRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yUHJvZmlsZXJBZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JQcm9maWxlckFnZW50LmgKQEAgLTc2LDcgKzc2LDYgQEAgcHVibGljOgogICAgIHZv aWQgZW5hYmxlKGJvb2wgc2tpcFJlY29tcGlsZSk7CiAgICAgYm9vbCBlbmFibGVkKCkgeyByZXR1 cm4gbV9lbmFibGVkOyB9CiAgICAgU3RyaW5nIGdldEN1cnJlbnRVc2VySW5pdGlhdGVkUHJvZmls ZU5hbWUoYm9vbCBpbmNyZW1lbnRQcm9maWxlTnVtYmVyID0gZmFsc2UpOwotICAgIHZvaWQgZ2V0 RXhhY3RIZWFwU25hcHNob3ROb2RlUmV0YWluZWRTaXplKEVycm9yU3RyaW5nKiwgdW5zaWduZWQg dWlkLCBpbnQgbm9kZUlkLCBpbnQqIHNpemUpOwogICAgIHZvaWQgZ2V0UHJvZmlsZUhlYWRlcnMo RXJyb3JTdHJpbmcqIGVycm9yLCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+KiBoZWFkZXJzKTsKICAg ICB2b2lkIGdldFByb2ZpbGUoRXJyb3JTdHJpbmcqIGVycm9yLCBjb25zdCBTdHJpbmcmIHR5cGUs IHVuc2lnbmVkIHVpZCwgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4qIHByb2ZpbGVPYmplY3QpOwog ICAgIGJvb2wgaXNSZWNvcmRpbmdVc2VySW5pdGlhdGVkUHJvZmlsZSgpIHsgcmV0dXJuIG1fcmVj b3JkaW5nVXNlckluaXRpYXRlZFByb2ZpbGU7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFwc2hvdEdyaWROb2Rlcy5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFwc2hvdEdyaWROb2Rlcy5q cwppbmRleCA0YWEzMjZjLi40ZmMxODQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RHcmlkTm9kZXMuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90R3JpZE5vZGVzLmpz CkBAIC0xMzEsNyArMTMxLDYgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdEdlbmVyaWNPYmpl Y3ROb2RlID0gZnVuY3Rpb24odHJlZSwgbm9kZSwgaGFzQ2hpbGRyZW4sIHAKICAgICB0aGlzLl90 eXBlID0gbm9kZS50eXBlOwogICAgIHRoaXMuX3NoYWxsb3dTaXplID0gbm9kZS5zZWxmU2l6ZTsK ICAgICB0aGlzLl9yZXRhaW5lZFNpemUgPSBub2RlLnJldGFpbmVkU2l6ZTsKLSAgICB0aGlzLl9y ZXRhaW5lZFNpemVFeGFjdCA9IHRoaXMuX3NoYWxsb3dTaXplID09PSB0aGlzLl9yZXRhaW5lZFNp emU7CiAgICAgdGhpcy5zbmFwc2hvdE5vZGVJZCA9IG5vZGUuaWQ7CiAgICAgdGhpcy5zbmFwc2hv dE5vZGVJbmRleCA9IG5vZGUubm9kZUluZGV4OwogfTsKQEAgLTIwNCwxOCArMjAzLDExIEBAIFdl Ykluc3BlY3Rvci5IZWFwU25hcHNob3RHZW5lcmljT2JqZWN0Tm9kZS5wcm90b3R5cGUgPSB7CiAK ICAgICAgICAgdmFyIHZpZXcgPSB0aGlzLmRhdGFHcmlkLnNuYXBzaG90VmlldzsKICAgICAgICAg ZGF0YVsic2hhbGxvd1NpemUiXSA9IHZpZXcuc2hvd1NoYWxsb3dTaXplQXNQZXJjZW50ID8gV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCIlLjJmJSUiLCB0aGlzLl9zaGFsbG93U2l6ZVBlcmNlbnQpIDog TnVtYmVyLmJ5dGVzVG9TdHJpbmcodGhpcy5fc2hhbGxvd1NpemUpOwotICAgICAgICBkYXRhWyJy ZXRhaW5lZFNpemUiXSA9ICh0aGlzLl9yZXRhaW5lZFNpemVFeGFjdCA/ICIiIDogIlx1MjI0OCIp ICsgKHZpZXcuc2hvd1JldGFpbmVkU2l6ZUFzUGVyY2VudCA/IFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiJS4yZiUlIiwgdGhpcy5fcmV0YWluZWRTaXplUGVyY2VudCkgOiBOdW1iZXIuYnl0ZXNUb1N0 cmluZyh0aGlzLl9yZXRhaW5lZFNpemUpKTsKKyAgICAgICAgZGF0YVsicmV0YWluZWRTaXplIl0g PSB2aWV3LnNob3dSZXRhaW5lZFNpemVBc1BlcmNlbnQgPyBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IiUuMmYlJSIsIHRoaXMuX3JldGFpbmVkU2l6ZVBlcmNlbnQpIDogTnVtYmVyLmJ5dGVzVG9TdHJp bmcodGhpcy5fcmV0YWluZWRTaXplKTsKIAogICAgICAgICByZXR1cm4gdGhpcy5fZW5oYW5jZURh dGEgPyB0aGlzLl9lbmhhbmNlRGF0YShkYXRhKSA6IGRhdGE7CiAgICAgfSwKIAotICAgIHNldCBl eGFjdFJldGFpbmVkU2l6ZShzaXplKQotICAgIHsKLSAgICAgICAgdGhpcy5fcmV0YWluZWRTaXpl ID0gc2l6ZTsKLSAgICAgICAgdGhpcy5fcmV0YWluZWRTaXplRXhhY3QgPSB0cnVlOwotICAgICAg ICB0aGlzLnJlZnJlc2goKTsKLSAgICB9LAotCiAgICAgZ2V0IF9yZXRhaW5lZFNpemVQZXJjZW50 KCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl9yZXRhaW5lZFNpemUgLyB0aGlzLmRhdGFH cmlkLnNuYXBzaG90LnRvdGFsU2l6ZSAqIDEwMC4wOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90Vmlldy5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFwc2hvdFZpZXcuanMKaW5kZXgg MjM3ZDRkZS4uMjFkMGZhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9EZXRhaWxlZEhlYXBzaG90Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RWaWV3LmpzCkBAIC0zNjQsNyArMzY0LDYg QEAgV2ViSW5zcGVjdG9yLkRldGFpbGVkSGVhcHNob3RWaWV3ID0gZnVuY3Rpb24ocGFyZW50LCBw cm9maWxlKQogICAgIHRoaXMuY29udGFpbm1lbnRWaWV3LmVsZW1lbnQuYWRkU3R5bGVDbGFzcygi dmlldyIpOwogICAgIHRoaXMuY29udGFpbm1lbnREYXRhR3JpZCA9IG5ldyBXZWJJbnNwZWN0b3Iu SGVhcFNuYXBzaG90Q29udGFpbm1lbnREYXRhR3JpZCgpOwogICAgIHRoaXMuY29udGFpbm1lbnRE YXRhR3JpZC5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fbW91c2VDbGlj a0luQ29udGFpbm1lbnRHcmlkLmJpbmQodGhpcyksIHRydWUpOwotICAgIHRoaXMuY29udGFpbm1l bnREYXRhR3JpZC5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImRibGNsaWNrIiwgdGhpcy5fZGJs Q2xpY2tJbkNvbnRhaW5tZW50R3JpZC5iaW5kKHRoaXMpLCB0cnVlKTsKICAgICB0aGlzLmNvbnRh aW5tZW50Vmlldy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuY29udGFpbm1lbnREYXRhR3JpZC5l bGVtZW50KTsKICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5jb250YWlubWVudFZp ZXcuZWxlbWVudCk7CiAKQEAgLTM3Miw3ICszNzEsNiBAQCBXZWJJbnNwZWN0b3IuRGV0YWlsZWRI ZWFwc2hvdFZpZXcgPSBmdW5jdGlvbihwYXJlbnQsIHByb2ZpbGUpCiAgICAgdGhpcy5jb25zdHJ1 Y3RvcnNWaWV3LmVsZW1lbnQuYWRkU3R5bGVDbGFzcygidmlldyIpOwogICAgIHRoaXMuY29uc3Ry dWN0b3JzRGF0YUdyaWQgPSBuZXcgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdENvbnN0cnVjdG9y c0RhdGFHcmlkKCk7CiAgICAgdGhpcy5jb25zdHJ1Y3RvcnNEYXRhR3JpZC5lbGVtZW50LmFkZEV2 ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fbW91c2VDbGlja0luQ29udGFpbm1lbnRHcmlkLmJp bmQodGhpcyksIHRydWUpOwotICAgIHRoaXMuY29uc3RydWN0b3JzRGF0YUdyaWQuZWxlbWVudC5h ZGRFdmVudExpc3RlbmVyKCJkYmxjbGljayIsIHRoaXMuX2RibENsaWNrSW5Db250YWlubWVudEdy aWQuYmluZCh0aGlzKSwgdHJ1ZSk7CiAgICAgdGhpcy5jb25zdHJ1Y3RvcnNWaWV3LmVsZW1lbnQu YXBwZW5kQ2hpbGQodGhpcy5jb25zdHJ1Y3RvcnNEYXRhR3JpZC5lbGVtZW50KTsKICAgICB0aGlz LmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5jb25zdHJ1Y3RvcnNWaWV3LmVsZW1lbnQpOwogCkBA IC0zODAsNyArMzc4LDYgQEAgV2ViSW5zcGVjdG9yLkRldGFpbGVkSGVhcHNob3RWaWV3ID0gZnVu Y3Rpb24ocGFyZW50LCBwcm9maWxlKQogICAgIHRoaXMuZGlmZlZpZXcuZWxlbWVudC5hZGRTdHls ZUNsYXNzKCJ2aWV3Iik7CiAgICAgdGhpcy5kaWZmRGF0YUdyaWQgPSBuZXcgV2ViSW5zcGVjdG9y LkhlYXBTbmFwc2hvdERpZmZEYXRhR3JpZCgpOwogICAgIHRoaXMuZGlmZkRhdGFHcmlkLmVsZW1l bnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9tb3VzZUNsaWNrSW5Db250YWlubWVu dEdyaWQuYmluZCh0aGlzKSwgdHJ1ZSk7Ci0gICAgdGhpcy5kaWZmRGF0YUdyaWQuZWxlbWVudC5h ZGRFdmVudExpc3RlbmVyKCJkYmxjbGljayIsIHRoaXMuX2RibENsaWNrSW5Db250YWlubWVudEdy aWQuYmluZCh0aGlzKSwgdHJ1ZSk7CiAgICAgdGhpcy5kaWZmVmlldy5lbGVtZW50LmFwcGVuZENo aWxkKHRoaXMuZGlmZkRhdGFHcmlkLmVsZW1lbnQpOwogICAgIHRoaXMuZWxlbWVudC5hcHBlbmRD aGlsZCh0aGlzLmRpZmZWaWV3LmVsZW1lbnQpOwogCkBAIC0zODgsNyArMzg1LDYgQEAgV2ViSW5z cGVjdG9yLkRldGFpbGVkSGVhcHNob3RWaWV3ID0gZnVuY3Rpb24ocGFyZW50LCBwcm9maWxlKQog ICAgIHRoaXMuZG9taW5hdG9yVmlldy5lbGVtZW50LmFkZFN0eWxlQ2xhc3MoInZpZXciKTsKICAg ICB0aGlzLmRvbWluYXRvckRhdGFHcmlkID0gbmV3IFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RE b21pbmF0b3JzRGF0YUdyaWQoKTsKICAgICB0aGlzLmRvbWluYXRvckRhdGFHcmlkLmVsZW1lbnQu YWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9tb3VzZUNsaWNrSW5Db250YWlubWVudEdy aWQuYmluZCh0aGlzKSwgdHJ1ZSk7Ci0gICAgdGhpcy5kb21pbmF0b3JEYXRhR3JpZC5lbGVtZW50 LmFkZEV2ZW50TGlzdGVuZXIoImRibGNsaWNrIiwgdGhpcy5fZGJsQ2xpY2tJbkNvbnRhaW5tZW50 R3JpZC5iaW5kKHRoaXMpLCB0cnVlKTsKICAgICB0aGlzLmRvbWluYXRvclZpZXcuZWxlbWVudC5h cHBlbmRDaGlsZCh0aGlzLmRvbWluYXRvckRhdGFHcmlkLmVsZW1lbnQpOwogICAgIHRoaXMuZWxl bWVudC5hcHBlbmRDaGlsZCh0aGlzLmRvbWluYXRvclZpZXcuZWxlbWVudCk7CiAKQEAgLTc1MCwy NCArNzQ2LDEwIEBAIFdlYkluc3BlY3Rvci5EZXRhaWxlZEhlYXBzaG90Vmlldy5wcm90b3R5cGUg PSB7CiAgICAgICAgIHByb2ZpbGUuc2lkZUJhckVsZW1lbnQuc3VidGl0bGUgPSBOdW1iZXIuYnl0 ZXNUb1N0cmluZyhzLnRvdGFsU2l6ZSk7CiAgICAgfSwKIAotICAgIF9kYmxDbGlja0luQ29udGFp bm1lbnRHcmlkOiBmdW5jdGlvbihldmVudCkKLSAgICB7Ci0gICAgICAgIHZhciBjZWxsID0gZXZl bnQudGFyZ2V0LmVuY2xvc2luZ05vZGVPclNlbGZXaXRoTm9kZU5hbWUoInRkIik7Ci0gICAgICAg IGlmICghY2VsbCB8fCAoIWNlbGwuaGFzU3R5bGVDbGFzcygicmV0YWluZWRTaXplLWNvbHVtbiIp KSkKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgdmFyIG5vZGVJdGVtID0gZXZlbnQudGFy Z2V0LmVuY2xvc2luZ05vZGVPclNlbGZXaXRoTm9kZU5hbWUoInRyIikuX2RhdGFHcmlkTm9kZTsK LSAgICAgICAgUHJvZmlsZXJBZ2VudC5nZXRFeGFjdEhlYXBTbmFwc2hvdE5vZGVSZXRhaW5lZFNp emUodGhpcy5fcHJvZmlsZVVpZCwgbm9kZUl0ZW0uc25hcHNob3ROb2RlSWQsIHNldEV4YWN0UmV0 YWluZWRTaXplKTsKLQotICAgICAgICBmdW5jdGlvbiBzZXRFeGFjdFJldGFpbmVkU2l6ZShleGFj dFNpemUpIHsKLSAgICAgICAgICAgIGlmIChleGFjdFNpemUgJiYgZXhhY3RTaXplICE9IC0xKQot ICAgICAgICAgICAgICAgIG5vZGVJdGVtLmV4YWN0UmV0YWluZWRTaXplID0gZXhhY3RTaXplOwot ICAgICAgICB9Ci0gICAgfSwKLQogICAgIF9tb3VzZUNsaWNrSW5Db250YWlubWVudEdyaWQ6IGZ1 bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgdmFyIGNlbGwgPSBldmVudC50YXJnZXQuZW5j bG9zaW5nTm9kZU9yU2VsZldpdGhOb2RlTmFtZSgidGQiKTsKLSAgICAgICAgaWYgKCFjZWxsIHx8 ICEoY2VsbC5oYXNTdHlsZUNsYXNzKCJvYmplY3QtY29sdW1uIikgfHwgIGNlbGwuaGFzU3R5bGVD bGFzcygic2hhbGxvd1NpemUtY29sdW1uIikpKQorICAgICAgICBpZiAoIWNlbGwgfHwgKCFjZWxs Lmhhc1N0eWxlQ2xhc3MoIm9iamVjdC1jb2x1bW4iKSAmJiAhY2VsbC5oYXNTdHlsZUNsYXNzKCJz aGFsbG93U2l6ZS1jb2x1bW4iKSAmJiAhY2VsbC5oYXNTdHlsZUNsYXNzKCJyZXRhaW5lZFNpemUt Y29sdW1uIikpKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB2YXIgcm93ID0gZXZlbnQu dGFyZ2V0LmVuY2xvc2luZ05vZGVPclNlbGZXaXRoTm9kZU5hbWUoInRyIik7CiAgICAgICAgIGlm ICghcm93KQo=