77726 2012-02-03 02:11:59 -0800 Web Inspector: Retained size for classes is too conservative in heap profiler 2012-02-11 01:26:39 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 78411 0 alph webkit-unassigned apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 548590 0 alph 2012-02-03 02:11:59 -0800 Retained size for all objects of particular class currently just shows size of the largest object of this class. This estimate is too conservative and thus makes sorting by retained sizes (which is the default) useless. Make it more precise. 548592 1 125296 alph 2012-02-03 02:24:56 -0800 Created attachment 125296 Patch 548661 2 125296 yurys 2012-02-03 05:55:25 -0800 Comment on attachment 125296 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=125296&action=review > Source/WebCore/inspector/front-end/HeapSnapshot.js:918 > + function skip(node) skip -> shouldSkip? > Source/WebCore/inspector/front-end/HeapSnapshot.js:951 > + var snapshot = this; Just pass it as a parameter to forDominatedNodes. > Source/WebCore/inspector/front-end/HeapSnapshot.js:961 > + var doms = snapshot._dominatedNodesOfNode(node); doms -> dominatedNodeIndexes, we usually avoid abbreviations in the front-end code 548694 3 125320 alph 2012-02-03 07:17:52 -0800 Created attachment 125320 Patch 548763 4 125320 webkit.review.bot 2012-02-03 08:50:30 -0800 Comment on attachment 125320 Patch Clearing flags on attachment: 125320 Committed r106665: <http://trac.webkit.org/changeset/106665> 548764 5 webkit.review.bot 2012-02-03 08:50:35 -0800 All reviewed patches have been landed. Closing bug. 125296 2012-02-03 02:24:56 -0800 2012-02-03 07:17:43 -0800 Patch bug-77726-20120203142454.patch text/plain 5136 alph U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2NjM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmE0YmFlYjM2ODU0Njgy NDZhNGY5NjFjN2IxOTYwZDk4MDgwMjVkMi4uYmJlNDg3NjllMzhlOTM4ZGRkMDQ0MWFmNTU2YzU3 OWZmNTNjM2EwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTAyLTAzICBBbGV4 ZWkgRmlsaXBwb3YgIDxhbGV4ZWlmQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBSZXRhaW5lZCBzaXplIGZvciBjbGFzc2VzIGlzIHRvbyBjb25zZXJ2YXRpdmUgaW4gaGVh cCBwcm9maWxlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9Nzc3MjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBNYWtlcyByZXRhaW5lZCBzaXplIG9mIGFsbCBvYmplY3RzIG9mIHBhcnRpY3VsYXIgY2xhc3Mg c2hvdyBjb3JyZWN0IHZhbHVlCisgICAgICAgIGluIFN1bW1hcnkgdmlldyBvZiBoZWFwIHByb2Zp bGVyLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90R3Jp ZE5vZGVzLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdENvbnN0cnVjdG9y Tm9kZS5wcm90b3R5cGUuZ2V0IGRhdGEpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv SGVhcFNuYXBzaG90LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdC5wcm90 b3R5cGUuX2J1aWxkQWdncmVnYXRlcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBz aG90LnByb3RvdHlwZS5fYnVpbGRBZ2dyZWdhdGVzLmZvckRvbWluYXRlZE5vZGVzKToKKwogMjAx Mi0wMi0wMyAgU2hpbnlhIEthd2FuYWthICA8c2hpbnlha0Bnb29nbGUuY29tPgogCiAgICAgICAg UmVpbXBsZW1lbnQgREVUQUlMUyBhbmQgU1VNTUFSWSB1c2luZyBzZWxlY3RvciBxdWVyeS4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFw c2hvdEdyaWROb2Rlcy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0 YWlsZWRIZWFwc2hvdEdyaWROb2Rlcy5qcwppbmRleCAyNzJhMDBmM2Y3MDBjM2E0NDljNGJkNWU1 NDgxNjQzZmMzOGU4MTgwLi45MzMzMzU2OGU5YjczNTAwODUzMGVmMTAyNWY3MWNlODJkMzMzODUx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVk SGVhcHNob3RHcmlkTm9kZXMuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9EZXRhaWxlZEhlYXBzaG90R3JpZE5vZGVzLmpzCkBAIC02MDcsNyArNjA3LDcgQEAgV2Vi SW5zcGVjdG9yLkhlYXBTbmFwc2hvdENvbnN0cnVjdG9yTm9kZS5wcm90b3R5cGUgPSB7CiAgICAg ICAgIHZhciB2aWV3ID0gdGhpcy5kYXRhR3JpZC5zbmFwc2hvdFZpZXc7CiAgICAgICAgIGRhdGFb ImNvdW50Il0gPSAgTnVtYmVyLndpdGhUaG91c2FuZHNTZXBhcmF0b3IodGhpcy5fY291bnQpOwog ICAgICAgICBkYXRhWyJzaGFsbG93U2l6ZSJdID0gTnVtYmVyLndpdGhUaG91c2FuZHNTZXBhcmF0 b3IodGhpcy5fc2hhbGxvd1NpemUpOwotICAgICAgICBkYXRhWyJyZXRhaW5lZFNpemUiXSA9IE51 bWJlci53aXRoVGhvdXNhbmRzU2VwYXJhdG9yKHRoaXMuX3JldGFpbmVkU2l6ZSkgKyAiKyI7Cisg ICAgICAgIGRhdGFbInJldGFpbmVkU2l6ZSJdID0gTnVtYmVyLndpdGhUaG91c2FuZHNTZXBhcmF0 b3IodGhpcy5fcmV0YWluZWRTaXplKTsKICAgICAgICAgaWYgKHZpZXcuX3Nob3dQZXJjZW50YWdl KSB7CiAgICAgICAgICAgICBkYXRhWyJzaGFsbG93U2l6ZS1wZXJjZW50Il0gPSB0aGlzLl90b1Bl cmNlbnRTdHJpbmcodGhpcy5fc2hhbGxvd1NpemVQZXJjZW50KTsKICAgICAgICAgICAgIGRhdGFb InJldGFpbmVkU2l6ZS1wZXJjZW50Il0gPSB0aGlzLl90b1BlcmNlbnRTdHJpbmcodGhpcy5fcmV0 YWluZWRTaXplUGVyY2VudCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0hlYXBTbmFwc2hvdC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvSGVhcFNuYXBzaG90LmpzCmluZGV4IDFhMzNlZTNlYzFiMzlmYzc0ZjA2Yjk0MGMxZGFk ODExYTQ0NThiNTcuLmYzZTBkOTUzNjEzNTc1NTFhOTA5N2Q5MDRmYzNmYThlNDc2ODk1MzIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90 LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90 LmpzCkBAIC05MTUsMjggKzkxNSw1NiBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90LnByb3Rv dHlwZSA9IHsKIAogICAgIF9idWlsZEFnZ3JlZ2F0ZXM6IGZ1bmN0aW9uKGZpbHRlcikKICAgICB7 Ci0gICAgICAgIHZhciBhZ2dyZWdhdGVzID0ge307Ci0gICAgICAgIGZvciAodmFyIGl0ZXIgPSB0 aGlzLl9hbGxOb2RlczsgaXRlci5oYXNOZXh0KCk7IGl0ZXIubmV4dCgpKSB7Ci0gICAgICAgICAg ICB2YXIgbm9kZSA9IGl0ZXIubm9kZTsKKyAgICAgICAgZnVuY3Rpb24gc2tpcChub2RlKQorICAg ICAgICB7CiAgICAgICAgICAgICBpZiAoZmlsdGVyICYmICFmaWx0ZXIobm9kZSkpCi0gICAgICAg ICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAg ICAgICBpZiAobm9kZS50eXBlICE9PSAibmF0aXZlIiAmJiBub2RlLnNlbGZTaXplID09PSAwKQot ICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwog ICAgICAgICAgICAgdmFyIGNsYXNzTmFtZSA9IG5vZGUuY2xhc3NOYW1lOwogICAgICAgICAgICAg aWYgKGNsYXNzTmFtZSA9PT0gIkRvY3VtZW50IERPTSB0cmVlIikKLSAgICAgICAgICAgICAgICBj b250aW51ZTsKKyAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgICAgIGlmIChj bGFzc05hbWUgPT09ICJEZXRhY2hlZCBET00gdHJlZSIpCisgICAgICAgICAgICAgICAgcmV0dXJu IHRydWU7CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0KKworICAgICAgICB2 YXIgYWdncmVnYXRlcyA9IHt9OworICAgICAgICBmb3IgKHZhciBpdGVyID0gdGhpcy5fYWxsTm9k ZXM7IGl0ZXIuaGFzTmV4dCgpOyBpdGVyLm5leHQoKSkgeworICAgICAgICAgICAgdmFyIG5vZGUg PSBpdGVyLm5vZGU7CisgICAgICAgICAgICBpZiAoc2tpcChub2RlKSkKICAgICAgICAgICAgICAg ICBjb250aW51ZTsKKyAgICAgICAgICAgIHZhciBjbGFzc05hbWUgPSBub2RlLmNsYXNzTmFtZTsK ICAgICAgICAgICAgIHZhciBuYW1lTWF0dGVycyA9IG5vZGUudHlwZSA9PT0gIm9iamVjdCIgfHwg bm9kZS50eXBlID09PSAibmF0aXZlIjsKICAgICAgICAgICAgIGlmICghYWdncmVnYXRlcy5oYXNP d25Qcm9wZXJ0eShjbGFzc05hbWUpKQogICAgICAgICAgICAgICAgIGFnZ3JlZ2F0ZXNbY2xhc3NO YW1lXSA9IHsgY291bnQ6IDAsIHNlbGY6IDAsIG1heFJldDogMCwgdHlwZTogbm9kZS50eXBlLCBu YW1lOiBuYW1lTWF0dGVycyA/IG5vZGUubmFtZSA6IG51bGwsIGlkeHM6IFtdIH07CiAgICAgICAg ICAgICB2YXIgY2xzcyA9IGFnZ3JlZ2F0ZXNbY2xhc3NOYW1lXTsKICAgICAgICAgICAgICsrY2xz cy5jb3VudDsKICAgICAgICAgICAgIGNsc3Muc2VsZiArPSBub2RlLnNlbGZTaXplOwotICAgICAg ICAgICAgaWYgKG5vZGUucmV0YWluZWRTaXplID4gY2xzcy5tYXhSZXQpCi0gICAgICAgICAgICAg ICAgY2xzcy5tYXhSZXQgPSBub2RlLnJldGFpbmVkU2l6ZTsKICAgICAgICAgICAgIGNsc3MuaWR4 cy5wdXNoKG5vZGUubm9kZUluZGV4KTsKICAgICAgICAgfQorCisgICAgICAgIC8vIFJlY3Vyc2l2 ZWx5IHZpc2l0IGRvbWluYXRvcnMgdHJlZSBhbmQgc3VtIHVwIHJldGFpbmVkIHNpemVzCisgICAg ICAgIC8vIG9mIHRvcG1vc3Qgb2JqZWN0cyBpbiBlYWNoIGNsYXNzLgorICAgICAgICAvLyBUaGlz IGdpdmVzIHVzIHJldGFpbmVkIHNpemVzIGZvciBjbGFzc2VzLgorICAgICAgICB2YXIgc2VlbkNs YXNzZXMgPSB7fTsKKyAgICAgICAgdmFyIHNuYXBzaG90ID0gdGhpczsKKyAgICAgICAgZnVuY3Rp b24gZm9yRG9taW5hdGVkTm9kZXMobm9kZUluZGV4KQorICAgICAgICB7CisgICAgICAgICAgICB2 YXIgbm9kZSA9IG5ldyBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90Tm9kZShzbmFwc2hvdCwgbm9k ZUluZGV4KTsKKyAgICAgICAgICAgIHZhciBjbGFzc05hbWUgPSBub2RlLmNsYXNzTmFtZTsKKyAg ICAgICAgICAgIHZhciBzZWVuID0gISFzZWVuQ2xhc3Nlc1tjbGFzc05hbWVdOworICAgICAgICAg ICAgaWYgKCFzZWVuICYmIGNsYXNzTmFtZSBpbiBhZ2dyZWdhdGVzICYmICFza2lwKG5vZGUpKSB7 CisgICAgICAgICAgICAgICAgYWdncmVnYXRlc1tjbGFzc05hbWVdLm1heFJldCArPSBub2RlLnJl dGFpbmVkU2l6ZTsKKyAgICAgICAgICAgICAgICBzZWVuQ2xhc3Nlc1tjbGFzc05hbWVdID0gdHJ1 ZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHZhciBkb21zID0gc25hcHNob3QuX2RvbWlu YXRlZE5vZGVzT2ZOb2RlKG5vZGUpOworICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBk b21zLmxlbmd0aDsgaSsrKQorICAgICAgICAgICAgICAgIGZvckRvbWluYXRlZE5vZGVzKGRvbXMu aXRlbShpKSk7CisgICAgICAgICAgICBzZWVuQ2xhc3Nlc1tjbGFzc05hbWVdID0gc2VlbjsKKyAg ICAgICAgfQorICAgICAgICBmb3JEb21pbmF0ZWROb2Rlcyh0aGlzLl9yb290Tm9kZUluZGV4KTsK KwogICAgICAgICAvLyBTaGF2ZSBvZmYgcHJvdmlzaW9uYWxseSBhbGxvY2F0ZWQgc3BhY2UuCiAg ICAgICAgIGZvciAodmFyIGNsYXNzTmFtZSBpbiBhZ2dyZWdhdGVzKQogICAgICAgICAgICAgYWdn cmVnYXRlc1tjbGFzc05hbWVdLmlkeHMgPSBhZ2dyZWdhdGVzW2NsYXNzTmFtZV0uaWR4cy5zbGlj ZSgwKTsK 125320 2012-02-03 07:17:52 -0800 2012-02-03 08:50:30 -0800 Patch bug-77726-20120203191751.patch text/plain 5184 alph U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2NjM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmE0YmFlYjM2ODU0Njgy NDZhNGY5NjFjN2IxOTYwZDk4MDgwMjVkMi4uYmJlNDg3NjllMzhlOTM4ZGRkMDQ0MWFmNTU2YzU3 OWZmNTNjM2EwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTAyLTAzICBBbGV4 ZWkgRmlsaXBwb3YgIDxhbGV4ZWlmQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBSZXRhaW5lZCBzaXplIGZvciBjbGFzc2VzIGlzIHRvbyBjb25zZXJ2YXRpdmUgaW4gaGVh cCBwcm9maWxlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9Nzc3MjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBNYWtlcyByZXRhaW5lZCBzaXplIG9mIGFsbCBvYmplY3RzIG9mIHBhcnRpY3VsYXIgY2xhc3Mg c2hvdyBjb3JyZWN0IHZhbHVlCisgICAgICAgIGluIFN1bW1hcnkgdmlldyBvZiBoZWFwIHByb2Zp bGVyLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90R3Jp ZE5vZGVzLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdENvbnN0cnVjdG9y Tm9kZS5wcm90b3R5cGUuZ2V0IGRhdGEpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv SGVhcFNuYXBzaG90LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdC5wcm90 b3R5cGUuX2J1aWxkQWdncmVnYXRlcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBz aG90LnByb3RvdHlwZS5fYnVpbGRBZ2dyZWdhdGVzLmZvckRvbWluYXRlZE5vZGVzKToKKwogMjAx Mi0wMi0wMyAgU2hpbnlhIEthd2FuYWthICA8c2hpbnlha0Bnb29nbGUuY29tPgogCiAgICAgICAg UmVpbXBsZW1lbnQgREVUQUlMUyBhbmQgU1VNTUFSWSB1c2luZyBzZWxlY3RvciBxdWVyeS4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFw c2hvdEdyaWROb2Rlcy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0 YWlsZWRIZWFwc2hvdEdyaWROb2Rlcy5qcwppbmRleCAyNzJhMDBmM2Y3MDBjM2E0NDljNGJkNWU1 NDgxNjQzZmMzOGU4MTgwLi45MzMzMzU2OGU5YjczNTAwODUzMGVmMTAyNWY3MWNlODJkMzMzODUx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVk SGVhcHNob3RHcmlkTm9kZXMuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9EZXRhaWxlZEhlYXBzaG90R3JpZE5vZGVzLmpzCkBAIC02MDcsNyArNjA3LDcgQEAgV2Vi SW5zcGVjdG9yLkhlYXBTbmFwc2hvdENvbnN0cnVjdG9yTm9kZS5wcm90b3R5cGUgPSB7CiAgICAg ICAgIHZhciB2aWV3ID0gdGhpcy5kYXRhR3JpZC5zbmFwc2hvdFZpZXc7CiAgICAgICAgIGRhdGFb ImNvdW50Il0gPSAgTnVtYmVyLndpdGhUaG91c2FuZHNTZXBhcmF0b3IodGhpcy5fY291bnQpOwog ICAgICAgICBkYXRhWyJzaGFsbG93U2l6ZSJdID0gTnVtYmVyLndpdGhUaG91c2FuZHNTZXBhcmF0 b3IodGhpcy5fc2hhbGxvd1NpemUpOwotICAgICAgICBkYXRhWyJyZXRhaW5lZFNpemUiXSA9IE51 bWJlci53aXRoVGhvdXNhbmRzU2VwYXJhdG9yKHRoaXMuX3JldGFpbmVkU2l6ZSkgKyAiKyI7Cisg ICAgICAgIGRhdGFbInJldGFpbmVkU2l6ZSJdID0gTnVtYmVyLndpdGhUaG91c2FuZHNTZXBhcmF0 b3IodGhpcy5fcmV0YWluZWRTaXplKTsKICAgICAgICAgaWYgKHZpZXcuX3Nob3dQZXJjZW50YWdl KSB7CiAgICAgICAgICAgICBkYXRhWyJzaGFsbG93U2l6ZS1wZXJjZW50Il0gPSB0aGlzLl90b1Bl cmNlbnRTdHJpbmcodGhpcy5fc2hhbGxvd1NpemVQZXJjZW50KTsKICAgICAgICAgICAgIGRhdGFb InJldGFpbmVkU2l6ZS1wZXJjZW50Il0gPSB0aGlzLl90b1BlcmNlbnRTdHJpbmcodGhpcy5fcmV0 YWluZWRTaXplUGVyY2VudCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0hlYXBTbmFwc2hvdC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvSGVhcFNuYXBzaG90LmpzCmluZGV4IDFhMzNlZTNlYzFiMzlmYzc0ZjA2Yjk0MGMxZGFk ODExYTQ0NThiNTcuLjVlMjQzYWExNGUyOTg1Mjk4MjgzOWZlYTI1ZmJlMTI2N2RlYzViNWUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90 LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90 LmpzCkBAIC05MTUsMjggKzkxNSw1NiBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90LnByb3Rv dHlwZSA9IHsKIAogICAgIF9idWlsZEFnZ3JlZ2F0ZXM6IGZ1bmN0aW9uKGZpbHRlcikKICAgICB7 Ci0gICAgICAgIHZhciBhZ2dyZWdhdGVzID0ge307Ci0gICAgICAgIGZvciAodmFyIGl0ZXIgPSB0 aGlzLl9hbGxOb2RlczsgaXRlci5oYXNOZXh0KCk7IGl0ZXIubmV4dCgpKSB7Ci0gICAgICAgICAg ICB2YXIgbm9kZSA9IGl0ZXIubm9kZTsKKyAgICAgICAgZnVuY3Rpb24gc2hvdWxkU2tpcChub2Rl KQorICAgICAgICB7CiAgICAgICAgICAgICBpZiAoZmlsdGVyICYmICFmaWx0ZXIobm9kZSkpCi0g ICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAg ICAgICAgICAgICBpZiAobm9kZS50eXBlICE9PSAibmF0aXZlIiAmJiBub2RlLnNlbGZTaXplID09 PSAwKQotICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgICAgIHJldHVybiB0 cnVlOwogICAgICAgICAgICAgdmFyIGNsYXNzTmFtZSA9IG5vZGUuY2xhc3NOYW1lOwogICAgICAg ICAgICAgaWYgKGNsYXNzTmFtZSA9PT0gIkRvY3VtZW50IERPTSB0cmVlIikKLSAgICAgICAgICAg ICAgICBjb250aW51ZTsKKyAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgICAg IGlmIChjbGFzc05hbWUgPT09ICJEZXRhY2hlZCBET00gdHJlZSIpCisgICAgICAgICAgICAgICAg cmV0dXJuIHRydWU7CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0KKworICAg ICAgICB2YXIgYWdncmVnYXRlcyA9IHt9OworICAgICAgICBmb3IgKHZhciBpdGVyID0gdGhpcy5f YWxsTm9kZXM7IGl0ZXIuaGFzTmV4dCgpOyBpdGVyLm5leHQoKSkgeworICAgICAgICAgICAgdmFy IG5vZGUgPSBpdGVyLm5vZGU7CisgICAgICAgICAgICBpZiAoc2hvdWxkU2tpcChub2RlKSkKICAg ICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIHZhciBjbGFzc05hbWUgPSBub2Rl LmNsYXNzTmFtZTsKICAgICAgICAgICAgIHZhciBuYW1lTWF0dGVycyA9IG5vZGUudHlwZSA9PT0g Im9iamVjdCIgfHwgbm9kZS50eXBlID09PSAibmF0aXZlIjsKICAgICAgICAgICAgIGlmICghYWdn cmVnYXRlcy5oYXNPd25Qcm9wZXJ0eShjbGFzc05hbWUpKQogICAgICAgICAgICAgICAgIGFnZ3Jl Z2F0ZXNbY2xhc3NOYW1lXSA9IHsgY291bnQ6IDAsIHNlbGY6IDAsIG1heFJldDogMCwgdHlwZTog bm9kZS50eXBlLCBuYW1lOiBuYW1lTWF0dGVycyA/IG5vZGUubmFtZSA6IG51bGwsIGlkeHM6IFtd IH07CiAgICAgICAgICAgICB2YXIgY2xzcyA9IGFnZ3JlZ2F0ZXNbY2xhc3NOYW1lXTsKICAgICAg ICAgICAgICsrY2xzcy5jb3VudDsKICAgICAgICAgICAgIGNsc3Muc2VsZiArPSBub2RlLnNlbGZT aXplOwotICAgICAgICAgICAgaWYgKG5vZGUucmV0YWluZWRTaXplID4gY2xzcy5tYXhSZXQpCi0g ICAgICAgICAgICAgICAgY2xzcy5tYXhSZXQgPSBub2RlLnJldGFpbmVkU2l6ZTsKICAgICAgICAg ICAgIGNsc3MuaWR4cy5wdXNoKG5vZGUubm9kZUluZGV4KTsKICAgICAgICAgfQorCisgICAgICAg IC8vIFJlY3Vyc2l2ZWx5IHZpc2l0IGRvbWluYXRvcnMgdHJlZSBhbmQgc3VtIHVwIHJldGFpbmVk IHNpemVzCisgICAgICAgIC8vIG9mIHRvcG1vc3Qgb2JqZWN0cyBpbiBlYWNoIGNsYXNzLgorICAg ICAgICAvLyBUaGlzIGdpdmVzIHVzIHJldGFpbmVkIHNpemVzIGZvciBjbGFzc2VzLgorICAgICAg ICB2YXIgc2VlbkNsYXNzZXMgPSB7fTsKKyAgICAgICAgdmFyIHNuYXBzaG90ID0gdGhpczsKKyAg ICAgICAgZnVuY3Rpb24gZm9yRG9taW5hdGVkTm9kZXMobm9kZUluZGV4KQorICAgICAgICB7Cisg ICAgICAgICAgICB2YXIgbm9kZSA9IG5ldyBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90Tm9kZShz bmFwc2hvdCwgbm9kZUluZGV4KTsKKyAgICAgICAgICAgIHZhciBjbGFzc05hbWUgPSBub2RlLmNs YXNzTmFtZTsKKyAgICAgICAgICAgIHZhciBzZWVuID0gISFzZWVuQ2xhc3Nlc1tjbGFzc05hbWVd OworICAgICAgICAgICAgaWYgKCFzZWVuICYmIGNsYXNzTmFtZSBpbiBhZ2dyZWdhdGVzICYmICFz aG91bGRTa2lwKG5vZGUpKSB7CisgICAgICAgICAgICAgICAgYWdncmVnYXRlc1tjbGFzc05hbWVd Lm1heFJldCArPSBub2RlLnJldGFpbmVkU2l6ZTsKKyAgICAgICAgICAgICAgICBzZWVuQ2xhc3Nl c1tjbGFzc05hbWVdID0gdHJ1ZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHZhciBkb21p bmF0ZWROb2RlcyA9IHNuYXBzaG90Ll9kb21pbmF0ZWROb2Rlc09mTm9kZShub2RlKTsKKyAgICAg ICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgZG9taW5hdGVkTm9kZXMubGVuZ3RoOyBpKyspCisg ICAgICAgICAgICAgICAgZm9yRG9taW5hdGVkTm9kZXMoZG9taW5hdGVkTm9kZXMuaXRlbShpKSk7 CisgICAgICAgICAgICBzZWVuQ2xhc3Nlc1tjbGFzc05hbWVdID0gc2VlbjsKKyAgICAgICAgfQor ICAgICAgICBmb3JEb21pbmF0ZWROb2Rlcyh0aGlzLl9yb290Tm9kZUluZGV4KTsKKwogICAgICAg ICAvLyBTaGF2ZSBvZmYgcHJvdmlzaW9uYWxseSBhbGxvY2F0ZWQgc3BhY2UuCiAgICAgICAgIGZv ciAodmFyIGNsYXNzTmFtZSBpbiBhZ2dyZWdhdGVzKQogICAgICAgICAgICAgYWdncmVnYXRlc1tj bGFzc05hbWVdLmlkeHMgPSBhZ2dyZWdhdGVzW2NsYXNzTmFtZV0uaWR4cy5zbGljZSgwKTsK