60023 2011-05-03 07:09:42 -0700 Web Inspector: [Chromium] Expanding Summary view top-level nodes is very slow when the number of heap objects is high 2011-05-03 13:05:05 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 mnaganov mnaganov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 397068 0 mnaganov 2011-05-03 07:09:42 -0700 The most frustrating part is that even if object count is small, it expands slowly. This is because for every class we iterate through all nodes. 397069 1 92072 mnaganov 2011-05-03 07:14:08 -0700 Created attachment 92072 patch 397290 2 mnaganov 2011-05-03 13:05:05 -0700 Manually committed http://trac.webkit.org/changeset/85642 2011-05-03 Mikhail Naganov <mnaganov@chromium.org> Reviewed by Pavel Feldman. WebInspector: [Chromium] Fix slowness of Summary view nodes expansion in detailed heap profiles. https://bugs.webkit.org/show_bug.cgi?id=60023 * inspector/front-end/DetailedHeapshotGridNodes.js: (WebInspector.HeapSnapshotConstructorNode): (WebInspector.HeapSnapshotConstructorNode.prototype._createNodesProvider): * inspector/front-end/HeapSnapshot.js: (WebInspector.HeapSnapshot.prototype.dispose): (WebInspector.HeapSnapshot.prototype.aggregates): (WebInspector.HeapSnapshot.prototype._buildAggregates): (WebInspector.HeapSnapshot.prototype._sortAggregateIndexes): (WebInspector.HeapSnapshot.prototype.createNodesProviderForClass): (WebInspector.HeapSnapshotFilteredOrderedIterator): (WebInspector.HeapSnapshotNodesProvider): * inspector/front-end/HeapSnapshotProxy.js: (WebInspector.HeapSnapshotProxy.prototype.aggregates): (WebInspector.HeapSnapshotProxy.prototype.createNodesProviderForClass): 92072 2011-05-03 07:14:08 -0700 2011-05-03 12:18:30 -0700 patch patch-60023 text/plain 8372 mnaganov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjOWUxYjBiLi40MjExZGRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKzIwMTEtMDUtMDMgIE1pa2hhaWwgTmFnYW5vdiAgPG1uYWdhbm92QGNocm9taXVtLm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWJJbnNw ZWN0b3I6IFtDaHJvbWl1bV0gRml4IHNsb3duZXNzIG9mIFN1bW1hcnkgdmlldyBub2RlcyBleHBh bnNpb24gaW4gZGV0YWlsZWQgaGVhcCBwcm9maWxlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYwMDIzCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL0RldGFpbGVkSGVhcHNob3RHcmlkTm9kZXMuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuSGVhcFNuYXBzaG90Q29uc3RydWN0b3JOb2RlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5I ZWFwU25hcHNob3RDb25zdHJ1Y3Rvck5vZGUucHJvdG90eXBlLl9jcmVhdGVOb2Rlc1Byb3ZpZGVy KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hvdC5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3QucHJvdG90eXBlLmRpc3Bvc2UpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdC5wcm90b3R5cGUuYWdncmVnYXRlcyk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90LnByb3RvdHlwZS5fYnVpbGRBZ2dyZWdhdGVz KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3QucHJvdG90eXBlLl9zb3J0QWdn cmVnYXRlSW5kZXhlcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90LnByb3Rv dHlwZS5jcmVhdGVOb2Rlc1Byb3ZpZGVyRm9yQ2xhc3MpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkhlYXBTbmFwc2hvdEZpbHRlcmVkT3JkZXJlZEl0ZXJhdG9yKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5IZWFwU25hcHNob3ROb2Rlc1Byb3ZpZGVyKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL0hlYXBTbmFwc2hvdFByb3h5LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBT bmFwc2hvdFByb3h5LnByb3RvdHlwZS5hZ2dyZWdhdGVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5IZWFwU25hcHNob3RQcm94eS5wcm90b3R5cGUuY3JlYXRlTm9kZXNQcm92aWRlckZvckNsYXNz KToKKwogMjAxMS0wNS0wMyAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90R3JpZE5vZGVzLmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90R3Jp ZE5vZGVzLmpzCmluZGV4IDVmMmQ0ZmYuLjlkYWQ2NTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFwc2hvdEdyaWROb2Rlcy5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RHcmlk Tm9kZXMuanMKQEAgLTQ0NCw3ICs0NDQsNyBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90Q29u c3RydWN0b3JOb2RlID0gZnVuY3Rpb24odHJlZSwgY2xhc3NOYW1lLCBhZ2dyZWdhdGUpCiAgICAg dGhpcy5fY291bnQgPSBhZ2dyZWdhdGUuY291bnQ7CiAgICAgdGhpcy5fc2hhbGxvd1NpemUgPSBh Z2dyZWdhdGUuc2VsZjsKICAgICB0aGlzLl9yZXRhaW5lZFNpemUgPSBhZ2dyZWdhdGUubWF4UmV0 OwotICAgIHRoaXMuX3Byb3ZpZGVyID0gdGhpcy5fY3JlYXRlTm9kZXNQcm92aWRlcih0cmVlLnNu YXBzaG90LCBhZ2dyZWdhdGUudHlwZSwgY2xhc3NOYW1lKTsKKyAgICB0aGlzLl9wcm92aWRlciA9 IHRoaXMuX2NyZWF0ZU5vZGVzUHJvdmlkZXIodHJlZS5zbmFwc2hvdCwgY2xhc3NOYW1lKTsKIH0K IAogV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdENvbnN0cnVjdG9yTm9kZS5wcm90b3R5cGUgPSB7 CkBAIC00NTMsMTMgKzQ1Myw5IEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RDb25zdHJ1Y3Rv ck5vZGUucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5IZWFw U25hcHNob3RJbnN0YW5jZU5vZGUodGhpcy5kYXRhR3JpZCwgbnVsbCwgdGhpcy5kYXRhR3JpZC5z bmFwc2hvdCwgaXRlbSk7CiAgICAgfSwKIAotICAgIF9jcmVhdGVOb2Rlc1Byb3ZpZGVyOiBmdW5j dGlvbihzbmFwc2hvdCwgbm9kZVR5cGUsIG5vZGVDbGFzc05hbWUpCisgICAgX2NyZWF0ZU5vZGVz UHJvdmlkZXI6IGZ1bmN0aW9uKHNuYXBzaG90LCBjbGFzc05hbWUpCiAgICAgewotICAgICAgICBy ZXR1cm4gc25hcHNob3QuY3JlYXRlTm9kZXNQcm92aWRlcigKLSAgICAgICAgICAgICJmdW5jdGlv biAobm9kZSkgeyIgKyAKLSAgICAgICAgICAgICIgICAgIHJldHVybiBub2RlLnR5cGUgPT09IFwi IiArIG5vZGVUeXBlICsgIlwiICIgKwotICAgICAgICAgICAgKG5vZGVDbGFzc05hbWUgIT09IG51 bGwgPyAiJiYgbm9kZS5jbGFzc05hbWUgPT09IFwiIiArIG5vZGVDbGFzc05hbWUgKyAiXCIiIDog IiIpICsKLSAgICAgICAgICAgICJ9Iik7CisgICAgICAgIHJldHVybiBzbmFwc2hvdC5jcmVhdGVO b2Rlc1Byb3ZpZGVyRm9yQ2xhc3MoY2xhc3NOYW1lKTsKICAgICB9LAogCiAgICAgY29tcGFyYXRv cjogZnVuY3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9IZWFwU25hcHNob3QuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0hlYXBTbmFwc2hvdC5qcwppbmRleCA2YmYyOTA5Li45NWY0NGVmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hvdC5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hvdC5qcwpAQCAtNjg1LDcg KzY4NSw3IEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3QucHJvdG90eXBlID0gewogICAgICAg ICBkZWxldGUgdGhpcy5fbm9kZUluZGV4OwogICAgICAgICBpZiAodGhpcy5fYWdncmVnYXRlcykg ewogICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2FnZ3JlZ2F0ZXM7Ci0gICAgICAgICAgICB0aGlz Ll9hZ2dyZWdhdGVzV2l0aEluZGV4ZXMgPSBmYWxzZTsKKyAgICAgICAgICAgIHRoaXMuX2FnZ3Jl Z2F0ZXNJbmRleGVzU29ydGVkID0gZmFsc2U7CiAgICAgICAgIH0KICAgICAgICAgZGVsZXRlIHRo aXMuX2Jhc2VOb2RlSWRzOwogICAgIH0sCkBAIC03NDIsMTIgKzc0MiwxMiBAQCBXZWJJbnNwZWN0 b3IuSGVhcFNuYXBzaG90LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNw ZWN0b3IuSGVhcFNuYXBzaG90QXJyYXlTbGljZSh0aGlzLCAiX3JldGFpbmVycyIsIHJldEluZGV4 RnJvbSwgcmV0SW5kZXhUbyk7CiAgICAgfSwKIAotICAgIGFnZ3JlZ2F0ZXM6IGZ1bmN0aW9uKHdp dGhOb2RlSW5kZXhlcykKKyAgICBhZ2dyZWdhdGVzOiBmdW5jdGlvbihzb3J0ZWRJbmRleGVzKQog ICAgIHsKICAgICAgICAgaWYgKCF0aGlzLl9hZ2dyZWdhdGVzKQogICAgICAgICAgICAgdGhpcy5f YnVpbGRBZ2dyZWdhdGVzKCk7Ci0gICAgICAgIGlmICh3aXRoTm9kZUluZGV4ZXMgJiYgIXRoaXMu X2FnZ3JlZ2F0ZXNXaXRoSW5kZXhlcykKLSAgICAgICAgICAgIHRoaXMuX2J1aWxkQWdncmVnYXRl c0luZGV4ZXMoKTsKKyAgICAgICAgaWYgKHNvcnRlZEluZGV4ZXMgJiYgIXRoaXMuX2FnZ3JlZ2F0 ZXNJbmRleGVzU29ydGVkKQorICAgICAgICAgICAgdGhpcy5fc29ydEFnZ3JlZ2F0ZUluZGV4ZXMo KTsKICAgICAgICAgcmV0dXJuIHRoaXMuX2FnZ3JlZ2F0ZXM7CiAgICAgfSwKIApAQCAtODA2LDE5 ICs4MDYsMTUgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdC5wcm90b3R5cGUgPSB7CiAgICAg ICAgICAgICBjbHNzLnNlbGYgKz0gbm9kZS5zZWxmU2l6ZTsKICAgICAgICAgICAgIGlmIChub2Rl LnJldGFpbmVkU2l6ZSA+IGNsc3MubWF4UmV0KQogICAgICAgICAgICAgICAgIGNsc3MubWF4UmV0 ID0gbm9kZS5yZXRhaW5lZFNpemU7CisgICAgICAgICAgICBjbHNzLmlkeHMucHVzaChub2RlLm5v ZGVJbmRleCk7CiAgICAgICAgIH0KKyAgICAgICAgLy8gU2hhdmUgb2ZmIHByb3Zpc2lvbmFsbHkg YWxsb2NhdGVkIHNwYWNlLgorICAgICAgICBmb3IgKHZhciBjbGFzc05hbWUgaW4gdGhpcy5fYWdn cmVnYXRlcykKKyAgICAgICAgICAgIHRoaXMuX2FnZ3JlZ2F0ZXNbY2xhc3NOYW1lXS5pZHhzID0g dGhpcy5fYWdncmVnYXRlc1tjbGFzc05hbWVdLmlkeHMuc2xpY2UoMCk7CiAgICAgfSwKIAotICAg IF9idWlsZEFnZ3JlZ2F0ZXNJbmRleGVzOiBmdW5jdGlvbigpCisgICAgX3NvcnRBZ2dyZWdhdGVJ bmRleGVzOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICBmb3IgKHZhciBpdGVyID0gdGhpcy5f YWxsTm9kZXM7IGl0ZXIuaGFzTmV4dCgpOyBpdGVyLm5leHQoKSkgewotICAgICAgICAgICAgdmFy IG5vZGUgPSBpdGVyLm5vZGU7Ci0gICAgICAgICAgICB2YXIgY2xhc3NOYW1lID0gbm9kZS5jbGFz c05hbWU7Ci0gICAgICAgICAgICB2YXIgY2xzcyA9IHRoaXMuX2FnZ3JlZ2F0ZXNbY2xhc3NOYW1l XTsKLSAgICAgICAgICAgIGlmIChjbHNzKQotICAgICAgICAgICAgICAgIGNsc3MuaWR4cy5wdXNo KG5vZGUubm9kZUluZGV4KTsKLSAgICAgICAgfQotCiAgICAgICAgIHZhciBub2RlQSA9IG5ldyBX ZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90Tm9kZSh0aGlzKTsKICAgICAgICAgdmFyIG5vZGVCID0g bmV3IFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3ROb2RlKHRoaXMpOwogICAgICAgICBmb3IgKHZh ciBjbHNzIGluIHRoaXMuX2FnZ3JlZ2F0ZXMpCkBAIC04MjksNyArODI1LDcgQEAgV2ViSW5zcGVj dG9yLkhlYXBTbmFwc2hvdC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgICAgIHJldHVy biBub2RlQS5pZCA8IG5vZGVCLmlkID8gLTEgOiAxOwogICAgICAgICAgICAgICAgIH0pOwogCi0g ICAgICAgIHRoaXMuX2FnZ3JlZ2F0ZXNXaXRoSW5kZXhlcyA9IHRydWU7CisgICAgICAgIHRoaXMu X2FnZ3JlZ2F0ZXNJbmRleGVzU29ydGVkID0gdHJ1ZTsKICAgICB9LAogCiAgICAgX2J1aWxkTm9k ZUluZGV4OiBmdW5jdGlvbigpCkBAIC05MzcsNiArOTMzLDExIEBAIFdlYkluc3BlY3Rvci5IZWFw U25hcHNob3QucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5I ZWFwU25hcHNob3ROb2Rlc1Byb3ZpZGVyKHRoaXMsIHRoaXMuX3BhcnNlRmlsdGVyKGZpbHRlcikp OwogICAgIH0sCiAKKyAgICBjcmVhdGVOb2Rlc1Byb3ZpZGVyRm9yQ2xhc3M6IGZ1bmN0aW9uKGNs YXNzTmFtZSkKKyAgICB7CisgICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLkhlYXBTbmFw c2hvdE5vZGVzUHJvdmlkZXIodGhpcywgbnVsbCwgY2xhc3NOYW1lKTsKKyAgICB9LAorCiAgICAg Y3JlYXRlUGF0aEZpbmRlcjogZnVuY3Rpb24odGFyZ2V0Tm9kZUluZGV4LCBza2lwSGlkZGVuKQog ICAgIHsKICAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90UGF0aEZp bmRlcih0aGlzLCB0YXJnZXROb2RlSW5kZXgsIHNraXBIaWRkZW4pOwpAQCAtOTQ4LDExICs5NDks MTEgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdC5wcm90b3R5cGUgPSB7CiAgICAgfQogfTsK IAotV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdEZpbHRlcmVkT3JkZXJlZEl0ZXJhdG9yID0gZnVu Y3Rpb24oaXRlcmF0b3IsIGZpbHRlcikKK1dlYkluc3BlY3Rvci5IZWFwU25hcHNob3RGaWx0ZXJl ZE9yZGVyZWRJdGVyYXRvciA9IGZ1bmN0aW9uKGl0ZXJhdG9yLCBmaWx0ZXIsIGl0ZXJhdGlvbk9y ZGVyKQogewogICAgIHRoaXMuX2ZpbHRlciA9IGZpbHRlcjsKICAgICB0aGlzLl9pdGVyYXRvciA9 IGl0ZXJhdG9yOwotICAgIHRoaXMuX2l0ZXJhdGlvbk9yZGVyID0gbnVsbDsKKyAgICB0aGlzLl9p dGVyYXRpb25PcmRlciA9IGl0ZXJhdGlvbk9yZGVyID8gaXRlcmF0aW9uT3JkZXIuc2xpY2UoMCkg OiBudWxsOwogICAgIHRoaXMuX3Bvc2l0aW9uID0gMDsKICAgICB0aGlzLl9sYXN0Q29tcGFyYXRv ciA9IG51bGw7CiB9CkBAIC0xMTI5LDEwICsxMTMwLDEzIEBAIFdlYkluc3BlY3Rvci5IZWFwU25h cHNob3RFZGdlc1Byb3ZpZGVyLnByb3RvdHlwZSA9IHsKIAogV2ViSW5zcGVjdG9yLkhlYXBTbmFw c2hvdEVkZ2VzUHJvdmlkZXIucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5IZWFw U25hcHNob3RGaWx0ZXJlZE9yZGVyZWRJdGVyYXRvci5wcm90b3R5cGU7CiAKLVdlYkluc3BlY3Rv ci5IZWFwU25hcHNob3ROb2Rlc1Byb3ZpZGVyID0gZnVuY3Rpb24oc25hcHNob3QsIGZpbHRlcikK K1dlYkluc3BlY3Rvci5IZWFwU25hcHNob3ROb2Rlc1Byb3ZpZGVyID0gZnVuY3Rpb24oc25hcHNo b3QsIGZpbHRlciwgY2xhc3NOYW1lKQogewogICAgIHRoaXMuc25hcHNob3QgPSBzbmFwc2hvdDsK LSAgICBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90RmlsdGVyZWRPcmRlcmVkSXRlcmF0b3IuY2Fs bCh0aGlzLCBzbmFwc2hvdC5fYWxsTm9kZXMsIGZpbHRlcik7CisgICAgaWYgKCFjbGFzc05hbWUp CisgICAgICAgIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RGaWx0ZXJlZE9yZGVyZWRJdGVyYXRv ci5jYWxsKHRoaXMsIHNuYXBzaG90Ll9hbGxOb2RlcywgZmlsdGVyKTsKKyAgICBlbHNlCisgICAg ICAgIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RGaWx0ZXJlZE9yZGVyZWRJdGVyYXRvci5jYWxs KHRoaXMsIHNuYXBzaG90Ll9hbGxOb2RlcywgbnVsbCwgc25hcHNob3QuYWdncmVnYXRlcyhmYWxz ZSlbY2xhc3NOYW1lXS5pZHhzKTsKIH0KIAogV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdE5vZGVz UHJvdmlkZXIucHJvdG90eXBlID0gewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3RQcm94eS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90UHJveHkuanMKaW5kZXggOTRlMjhlMi4uNmM4NzBm NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25h cHNob3RQcm94eS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hl YXBTbmFwc2hvdFByb3h5LmpzCkBAIC0yODAsOSArMjgwLDkgQEAgV2ViSW5zcGVjdG9yLkhlYXBT bmFwc2hvdFByb3h5ID0gZnVuY3Rpb24od29ya2VyLCBvYmplY3RJZCkKIH0KIAogV2ViSW5zcGVj dG9yLkhlYXBTbmFwc2hvdFByb3h5LnByb3RvdHlwZSA9IHsKLSAgICBhZ2dyZWdhdGVzOiBmdW5j dGlvbih3aXRoTm9kZUluZGV4ZXMsIGNhbGxiYWNrKQorICAgIGFnZ3JlZ2F0ZXM6IGZ1bmN0aW9u KHNvcnRlZEluZGV4ZXMsIGNhbGxiYWNrKQogICAgIHsKLSAgICAgICAgdGhpcy5jYWxsTWV0aG9k KGNhbGxiYWNrLCAiYWdncmVnYXRlcyIsIHdpdGhOb2RlSW5kZXhlcyk7CisgICAgICAgIHRoaXMu Y2FsbE1ldGhvZChjYWxsYmFjaywgImFnZ3JlZ2F0ZXMiLCBzb3J0ZWRJbmRleGVzKTsKICAgICB9 LAogCiAgICAgY3JlYXRlRGlmZjogZnVuY3Rpb24oY2xhc3NOYW1lKQpAQCAtMzAwLDYgKzMwMCwx MSBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90UHJveHkucHJvdG90eXBlID0gewogICAgICAg ICByZXR1cm4gdGhpcy5jYWxsRmFjdG9yeU1ldGhvZChudWxsLCAiY3JlYXRlTm9kZXNQcm92aWRl ciIsICJXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90UHJvdmlkZXJQcm94eSIsIGZpbHRlcik7CiAg ICAgfSwKIAorICAgIGNyZWF0ZU5vZGVzUHJvdmlkZXJGb3JDbGFzczogZnVuY3Rpb24oY2xhc3NO YW1lKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuY2FsbEZhY3RvcnlNZXRob2QobnVsbCwg ImNyZWF0ZU5vZGVzUHJvdmlkZXJGb3JDbGFzcyIsICJXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90 UHJvdmlkZXJQcm94eSIsIGNsYXNzTmFtZSk7CisgICAgfSwKKwogICAgIGNyZWF0ZVBhdGhGaW5k ZXI6IGZ1bmN0aW9uKHRhcmdldE5vZGVJbmRleCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlz LmNhbGxGYWN0b3J5TWV0aG9kKG51bGwsICJjcmVhdGVQYXRoRmluZGVyIiwgIldlYkluc3BlY3Rv ci5IZWFwU25hcHNob3RQYXRoRmluZGVyUHJveHkiLCB0YXJnZXROb2RlSW5kZXgpOwo=