88081 2012-06-01 05:45:01 -0700 Web Inspector: add unknown size to the memory pie-chart legend 2012-06-04 05:02:44 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 87262 0 yurys yurys apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 639232 0 yurys 2012-06-01 05:45:01 -0700 We only show total size and all known parts, unknown part should also be presented. 639234 1 145278 yurys 2012-06-01 05:46:18 -0700 Created attachment 145278 Patch 639254 2 loislo 2012-06-01 06:02:42 -0700 View in context: https://bugs.webkit.org/attachment.cgi?id=145278&action=review > Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js:105 > + memoryBlock.children.push({ > + name: "Unknown", > + size: memoryBlock.size - knownSize I think it is not necessary to add 'unknown' memory block if unknown size is equal to 0. 639262 3 145286 yurys 2012-06-01 06:12:13 -0700 Created attachment 145286 Patch 639263 4 yurys 2012-06-01 06:12:33 -0700 (In reply to comment #2) > View in context: https://bugs.webkit.org/attachment.cgi?id=145278&action=review > > > Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js:105 > > + memoryBlock.children.push({ > > + name: "Unknown", > > + size: memoryBlock.size - knownSize > > I think it is not necessary to add 'unknown' memory block if unknown size is equal to 0. Done. 640484 5 145286 loislo 2012-06-04 05:02:36 -0700 Comment on attachment 145286 Patch Clearing flags on attachment: 145286 Committed r119386: <http://trac.webkit.org/changeset/119386> 640485 6 loislo 2012-06-04 05:02:44 -0700 All reviewed patches have been landed. Closing bug. 145278 2012-06-01 05:46:18 -0700 2012-06-01 06:12:06 -0700 Patch bug-88081-20120601164616.patch text/plain 6031 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5MjExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmYxMzYwZGVlNzk3NjIz NGNkYWIyYmE1ZWVmMmYyNjhiM2VkNzA0Zi4uZWEzYWU2ZjU1MjFhZjRhODNjMzgwZTE5NDBjNmYw OGE0YzJjYWZlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA2LTAxICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGFkZCBpbmtub3duIHNpemUgdG8gdGhlIG1lbW9yeSBwaWUtY2hhcnQgbGVnZW5kCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04ODA4MQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkICJVbmtub3du IiBwYXJ0IHNpemUgdG8gdGhlIG1lbW9yeSBwaWUtY2hhcnQgbGVnZW5kLgorCisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9OYXRpdmVNZW1vcnlTbmFwc2hvdFZpZXcuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuTmF0aXZlTWVtb3J5UHJvZmlsZVR5cGUucHJvdG90eXBlLmJ1dHRvbkNs aWNrZWQuZGlkUmVjZWl2ZU1lbW9yeVNuYXBzaG90KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5O YXRpdmVNZW1vcnlQcm9maWxlVHlwZS5wcm90b3R5cGUuYnV0dG9uQ2xpY2tlZCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuTWVtb3J5QmxvY2tWaWV3UHJvcGVydGllcy5faW5pdGlhbGl6ZSk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuTmF0aXZlTWVtb3J5UGllQ2hhcnQucHJvdG90eXBlLl9wYWlu dCk6CisKIDIwMTItMDYtMDEgIFN1ZGFyc2FuYSBOYWdpbmVuaSAgPHN1ZGFyc2FuYS5uYWdpbmVu aUBsaW51eC5pbnRlbC5jb20+CiAKICAgICAgICAgW0VGTF0gSW1wbGVtZW50IFBsYXRmb3JtU3Ry YXRlZ2llcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9O YXRpdmVNZW1vcnlTbmFwc2hvdFZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL05hdGl2ZU1lbW9yeVNuYXBzaG90Vmlldy5qcwppbmRleCA2OTcyMjVjMGE1NmM4MGZk ZDNkM2U2ZTkzZjg1OTYxYjAwNTYyNzBmLi5jMThmYzcyOGJkZjdhY2ZiZGRlM2Q3MjcyNDA5NDhl YmZkZjQ3MjZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L05hdGl2ZU1lbW9yeVNuYXBzaG90Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL05hdGl2ZU1lbW9yeVNuYXBzaG90Vmlldy5qcwpAQCAtOTMsNiArOTMsMTgg QEAgV2ViSW5zcGVjdG9yLk5hdGl2ZU1lbW9yeVByb2ZpbGVUeXBlLnByb3RvdHlwZSA9IHsKICAg ICAgICAgcHJvZmlsZXNQYW5lbC5hZGRQcm9maWxlSGVhZGVyKHByb2ZpbGVIZWFkZXIpOwogICAg ICAgICBmdW5jdGlvbiBkaWRSZWNlaXZlTWVtb3J5U25hcHNob3QoZXJyb3IsIG1lbW9yeUJsb2Nr KQogICAgICAgICB7CisgICAgICAgICAgICBpZiAobWVtb3J5QmxvY2suc2l6ZSAmJiBtZW1vcnlC bG9jay5jaGlsZHJlbikgeworICAgICAgICAgICAgICAgIHZhciBrbm93blNpemUgPSAwOworICAg ICAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbWVtb3J5QmxvY2suY2hpbGRyZW4ubGVu Z3RoOyBpKyspIHsKKyAgICAgICAgICAgICAgICAgICAgdmFyIHNpemUgPSBtZW1vcnlCbG9jay5j aGlsZHJlbltpXS5zaXplOworICAgICAgICAgICAgICAgICAgICBpZiAoc2l6ZSkKKyAgICAgICAg ICAgICAgICAgICAgICAgIGtub3duU2l6ZSArPSBzaXplOworICAgICAgICAgICAgICAgIH0KKyAg ICAgICAgICAgICAgICBtZW1vcnlCbG9jay5jaGlsZHJlbi5wdXNoKHsKKyAgICAgICAgICAgICAg ICAgICAgbmFtZTogIlVua25vd24iLAorICAgICAgICAgICAgICAgICAgICBzaXplOiBtZW1vcnlC bG9jay5zaXplIC0ga25vd25TaXplCisgICAgICAgICAgICAgICAgfSk7CisgICAgICAgICAgICB9 CiAgICAgICAgICAgICBwcm9maWxlSGVhZGVyLl9tZW1vcnlCbG9jayA9IG1lbW9yeUJsb2NrOwog ICAgICAgICAgICAgcHJvZmlsZUhlYWRlci5pc1RlbXBvcmFyeSA9IGZhbHNlOwogICAgICAgICB9 CkBAIC0xOTgsNyArMjEwLDggQEAgV2ViSW5zcGVjdG9yLk1lbW9yeUJsb2NrVmlld1Byb3BlcnRp ZXMuX2luaXRpYWxpemUgPSBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBXZWJJbnNwZWN0b3Iu TWVtb3J5QmxvY2tWaWV3UHJvcGVydGllcy5fc3RhbmRhcmRCbG9ja3NbbmFtZV0gPSBuZXcgV2Vi SW5zcGVjdG9yLk1lbW9yeUJsb2NrVmlld1Byb3BlcnRpZXMoZmlsbFN0eWxlLCBuYW1lLCBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoZGVzY3JpcHRpb24pKTsKICAgICB9Ci0gICAgYWRkQmxvY2soInJn YmEoMjQwLCAyNDAsIDI1MCwgMC44KSIsICJQcm9jZXNzUHJpdmF0ZU1lbW9yeSIsICJUb3RhbCIp OworICAgIGFkZEJsb2NrKCJyZ2JhKDI1NSwgMjU1LCAyNTUsIDAuOCkiLCAiUHJvY2Vzc1ByaXZh dGVNZW1vcnkiLCAiVG90YWwiKTsKKyAgICBhZGRCbG9jaygicmdiYSgyNDAsIDI0MCwgMjUwLCAw LjgpIiwgIlVua25vd24iLCAiVW5rbm93biIpOwogICAgIGFkZEJsb2NrKCJyZ2JhKDI1MCwgMjAw LCAyMDAsIDAuOCkiLCAiSlNIZWFwQWxsb2NhdGVkIiwgIkphdmFTY3JpcHQgaGVhcCIpOwogICAg IGFkZEJsb2NrKCJyZ2JhKDIwMCwgMjUwLCAyMDAsIDAuOCkiLCAiSlNIZWFwVXNlZCIsICJVc2Vk IEphdmFTY3JpcHQgaGVhcCIpOwogICAgIGFkZEJsb2NrKCJyZ2JhKDIwMCwgMTcwLCAyMDAsIDAu OCkiLCAiTWVtb3J5Q2FjaGUiLCAiTWVtb3J5IGNhY2hlIHJlc291cmNlcyIpOwpAQCAtMjgxLDkg KzI5NCw3IEBAIFdlYkluc3BlY3Rvci5OYXRpdmVNZW1vcnlQaWVDaGFydC5wcm90b3R5cGUgPSB7 CiAgICAgICAgIGN0eC5iZWdpblBhdGgoKTsKICAgICAgICAgY3R4LmFyYyh4LCB5LCByYWRpdXMs IDAsIE1hdGguUEkqMiwgZmFsc2UpOwogICAgICAgICBjdHgubGluZVdpZHRoID0gMTsKLSAgICAg ICAgY3R4LmZpbGxTdHlsZSA9IFdlYkluc3BlY3Rvci5NZW1vcnlCbG9ja1ZpZXdQcm9wZXJ0aWVz Ll9mb3JNZW1vcnlCbG9jayh0aGlzLl9tZW1vcnlTbmFwc2hvdCkuX2ZpbGxTdHlsZTsKICAgICAg ICAgY3R4LnN0cm9rZVN0eWxlID0gInJnYmEoMTMwLCAxMzAsIDEzMCwgMC44KSI7Ci0gICAgICAg IGN0eC5maWxsKCk7CiAgICAgICAgIGN0eC5zdHJva2UoKTsKICAgICAgICAgY3R4LmNsb3NlUGF0 aCgpOwogCkBAIC0zMTQsMzUgKzMyNSwzMSBAQCBXZWJJbnNwZWN0b3IuTmF0aXZlTWVtb3J5UGll Q2hhcnQucHJvdG90eXBlID0gewogICAgICAgICAgICAgY3R4LmNsb3NlUGF0aCgpOwogICAgICAg ICB9CiAKLSAgICAgICAgaWYgKG1lbW9yeUJsb2NrLmNoaWxkcmVuKSB7Ci0gICAgICAgICAgICB2 YXIgdG90YWwgPSBtZW1vcnlCbG9jay5zaXplOwotICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7 IGkgPCBtZW1vcnlCbG9jay5jaGlsZHJlbi5sZW5ndGg7IGkrKykgewotICAgICAgICAgICAgICAg IHZhciBjaGlsZCA9IG1lbW9yeUJsb2NrLmNoaWxkcmVuW2ldOwotICAgICAgICAgICAgICAgIGlm ICghY2hpbGQuc2l6ZSkKLSAgICAgICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAg ICAgICAgdmFyIHZpZXdQcm9wZXJ0aWVzID0gV2ViSW5zcGVjdG9yLk1lbW9yeUJsb2NrVmlld1By b3BlcnRpZXMuX2Zvck1lbW9yeUJsb2NrKGNoaWxkKTsKLSAgICAgICAgICAgICAgICB2YXIgYW5n bGVTcGFuID0gTWF0aC5QSSAqIDIgKiAoY2hpbGQuc2l6ZSAvIHRvdGFsKTsKLSAgICAgICAgICAg ICAgICBjdHguYmVnaW5QYXRoKCk7Ci0gICAgICAgICAgICAgICAgY3R4Lm1vdmVUbyh4LCB5KTsK LSAgICAgICAgICAgICAgICBjdHgubGluZVRvKHggKyByYWRpdXMgKiBNYXRoLmNvcyhjdXJyZW50 QW5nbGUpLCB5ICsgcmFkaXVzICogTWF0aC5zaW4oY3VycmVudEFuZ2xlKSk7Ci0gICAgICAgICAg ICAgICAgY3R4LmFyYyh4LCB5LCByYWRpdXMsIGN1cnJlbnRBbmdsZSwgY3VycmVudEFuZ2xlICsg YW5nbGVTcGFuLCBmYWxzZSk7Ci0gICAgICAgICAgICAgICAgY3R4LmxpbmVXaWR0aCA9IDAuNTsK LSAgICAgICAgICAgICAgICBjdHgubGluZVRvKHgsIHkpOwotICAgICAgICAgICAgICAgIGN0eC5m aWxsU3R5bGUgPSB2aWV3UHJvcGVydGllcy5fZmlsbFN0eWxlOwotICAgICAgICAgICAgICAgIGN0 eC5zdHJva2VTdHlsZSA9ICJyZ2JhKDEwMCwgMTAwLCAxMDAsIDAuOCkiOwotICAgICAgICAgICAg ICAgIGN0eC5maWxsKCk7Ci0gICAgICAgICAgICAgICAgY3R4LnN0cm9rZSgpOwotICAgICAgICAg ICAgICAgIGN0eC5jbG9zZVBhdGgoKTsKLQotICAgICAgICAgICAgICAgIHBhaW50UGVyY2VudEFu ZExhYmVsKGNoaWxkLnNpemUgLyB0b3RhbCwgdmlld1Byb3BlcnRpZXMuX2Rlc2NyaXB0aW9uLCBj dXJyZW50QW5nbGUgKyBhbmdsZVNwYW4gLyAyKTsKLQotICAgICAgICAgICAgICAgIGN1cnJlbnRB bmdsZSArPSBhbmdsZVNwYW47Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KKyAgICAgICAgaWYg KCFtZW1vcnlCbG9jay5jaGlsZHJlbikKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgdmFy IHRvdGFsID0gbWVtb3J5QmxvY2suc2l6ZTsKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBt ZW1vcnlCbG9jay5jaGlsZHJlbi5sZW5ndGg7IGkrKykgeworICAgICAgICAgICAgdmFyIGNoaWxk ID0gbWVtb3J5QmxvY2suY2hpbGRyZW5baV07CisgICAgICAgICAgICBpZiAoIWNoaWxkLnNpemUp CisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICB2YXIgdmlld1Byb3BlcnRp ZXMgPSBXZWJJbnNwZWN0b3IuTWVtb3J5QmxvY2tWaWV3UHJvcGVydGllcy5fZm9yTWVtb3J5Qmxv Y2soY2hpbGQpOworICAgICAgICAgICAgdmFyIGFuZ2xlU3BhbiA9IE1hdGguUEkgKiAyICogKGNo aWxkLnNpemUgLyB0b3RhbCk7CisgICAgICAgICAgICBjdHguYmVnaW5QYXRoKCk7CisgICAgICAg ICAgICBjdHgubW92ZVRvKHgsIHkpOworICAgICAgICAgICAgY3R4LmxpbmVUbyh4ICsgcmFkaXVz ICogTWF0aC5jb3MoY3VycmVudEFuZ2xlKSwgeSArIHJhZGl1cyAqIE1hdGguc2luKGN1cnJlbnRB bmdsZSkpOworICAgICAgICAgICAgY3R4LmFyYyh4LCB5LCByYWRpdXMsIGN1cnJlbnRBbmdsZSwg Y3VycmVudEFuZ2xlICsgYW5nbGVTcGFuLCBmYWxzZSk7CisgICAgICAgICAgICBjdHgubGluZVdp ZHRoID0gMC41OworICAgICAgICAgICAgY3R4LmxpbmVUbyh4LCB5KTsKKyAgICAgICAgICAgIGN0 eC5maWxsU3R5bGUgPSB2aWV3UHJvcGVydGllcy5fZmlsbFN0eWxlOworICAgICAgICAgICAgY3R4 LnN0cm9rZVN0eWxlID0gInJnYmEoMTAwLCAxMDAsIDEwMCwgMC44KSI7CisgICAgICAgICAgICBj dHguZmlsbCgpOworICAgICAgICAgICAgY3R4LnN0cm9rZSgpOworICAgICAgICAgICAgY3R4LmNs b3NlUGF0aCgpOwogCi0gICAgICAgIHZhciBmcmFjdGlvbiA9IDEgLSAoY3VycmVudEFuZ2xlIC0g c3RhcnRBbmdsZSkgLyAoMiAqIE1hdGguUEkpOwotICAgICAgICB2YXIgbWlkQW5nbGUgPSAoY3Vy cmVudEFuZ2xlICsgc3RhcnRBbmdsZSArIDIgKiBNYXRoLlBJKSAvIDI7Ci0gICAgICAgIHBhaW50 UGVyY2VudEFuZExhYmVsKGZyYWN0aW9uLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlVua25vd24i KSwgbWlkQW5nbGUpOworICAgICAgICAgICAgcGFpbnRQZXJjZW50QW5kTGFiZWwoY2hpbGQuc2l6 ZSAvIHRvdGFsLCB2aWV3UHJvcGVydGllcy5fZGVzY3JpcHRpb24sIGN1cnJlbnRBbmdsZSArIGFu Z2xlU3BhbiAvIDIpOworCisgICAgICAgICAgICBjdXJyZW50QW5nbGUgKz0gYW5nbGVTcGFuOwor ICAgICAgICB9CiAgICAgfSwKIAogICAgIF9jbGVhcjogZnVuY3Rpb24oKSB7Cg== 145286 2012-06-01 06:12:13 -0700 2012-06-04 05:02:36 -0700 Patch bug-88081-20120601171211.patch text/plain 6152 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5MjExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmYxMzYwZGVlNzk3NjIz NGNkYWIyYmE1ZWVmMmYyNjhiM2VkNzA0Zi4uNTZkNzBhYmQ5OTA5Mzg3ZGE3NzJkODMyNjFmYjQ0 N2UyM2IyMDY0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA2LTAxICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGFkZCB1bmtub3duIHNpemUgdG8gdGhlIG1lbW9yeSBwaWUtY2hhcnQgbGVnZW5kCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04ODA4MQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkICJVbmtub3du IiBwYXJ0IHNpemUgdG8gdGhlIG1lbW9yeSBwaWUtY2hhcnQgbGVnZW5kLgorCisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9OYXRpdmVNZW1vcnlTbmFwc2hvdFZpZXcuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuTmF0aXZlTWVtb3J5UHJvZmlsZVR5cGUucHJvdG90eXBlLmJ1dHRvbkNs aWNrZWQuZGlkUmVjZWl2ZU1lbW9yeVNuYXBzaG90KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5O YXRpdmVNZW1vcnlQcm9maWxlVHlwZS5wcm90b3R5cGUuYnV0dG9uQ2xpY2tlZCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuTWVtb3J5QmxvY2tWaWV3UHJvcGVydGllcy5faW5pdGlhbGl6ZSk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuTmF0aXZlTWVtb3J5UGllQ2hhcnQucHJvdG90eXBlLl9wYWlu dCk6CisKIDIwMTItMDYtMDEgIFN1ZGFyc2FuYSBOYWdpbmVuaSAgPHN1ZGFyc2FuYS5uYWdpbmVu aUBsaW51eC5pbnRlbC5jb20+CiAKICAgICAgICAgW0VGTF0gSW1wbGVtZW50IFBsYXRmb3JtU3Ry YXRlZ2llcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9O YXRpdmVNZW1vcnlTbmFwc2hvdFZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL05hdGl2ZU1lbW9yeVNuYXBzaG90Vmlldy5qcwppbmRleCA2OTcyMjVjMGE1NmM4MGZk ZDNkM2U2ZTkzZjg1OTYxYjAwNTYyNzBmLi4wOWU5MjJjNmY4NDBhZDA5NWU2ZTZhMmU1NWFkZjc1 MTBjYzAxMDUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L05hdGl2ZU1lbW9yeVNuYXBzaG90Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL05hdGl2ZU1lbW9yeVNuYXBzaG90Vmlldy5qcwpAQCAtOTMsNiArOTMsMjIg QEAgV2ViSW5zcGVjdG9yLk5hdGl2ZU1lbW9yeVByb2ZpbGVUeXBlLnByb3RvdHlwZSA9IHsKICAg ICAgICAgcHJvZmlsZXNQYW5lbC5hZGRQcm9maWxlSGVhZGVyKHByb2ZpbGVIZWFkZXIpOwogICAg ICAgICBmdW5jdGlvbiBkaWRSZWNlaXZlTWVtb3J5U25hcHNob3QoZXJyb3IsIG1lbW9yeUJsb2Nr KQogICAgICAgICB7CisgICAgICAgICAgICBpZiAobWVtb3J5QmxvY2suc2l6ZSAmJiBtZW1vcnlC bG9jay5jaGlsZHJlbikgeworICAgICAgICAgICAgICAgIHZhciBrbm93blNpemUgPSAwOworICAg ICAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbWVtb3J5QmxvY2suY2hpbGRyZW4ubGVu Z3RoOyBpKyspIHsKKyAgICAgICAgICAgICAgICAgICAgdmFyIHNpemUgPSBtZW1vcnlCbG9jay5j aGlsZHJlbltpXS5zaXplOworICAgICAgICAgICAgICAgICAgICBpZiAoc2l6ZSkKKyAgICAgICAg ICAgICAgICAgICAgICAgIGtub3duU2l6ZSArPSBzaXplOworICAgICAgICAgICAgICAgIH0KKyAg ICAgICAgICAgICAgICB2YXIgdW5rbm93blNpemUgPSBtZW1vcnlCbG9jay5zaXplIC0ga25vd25T aXplOworCisgICAgICAgICAgICAgICAgaWYgKHVua25vd25TaXplKSB7CisgICAgICAgICAgICAg ICAgICAgIG1lbW9yeUJsb2NrLmNoaWxkcmVuLnB1c2goeworICAgICAgICAgICAgICAgICAgICAg ICAgbmFtZTogIlVua25vd24iLAorICAgICAgICAgICAgICAgICAgICAgICAgc2l6ZTogdW5rbm93 blNpemUKKyAgICAgICAgICAgICAgICAgICAgfSk7CisgICAgICAgICAgICAgICAgfQorICAgICAg ICAgICAgfQogICAgICAgICAgICAgcHJvZmlsZUhlYWRlci5fbWVtb3J5QmxvY2sgPSBtZW1vcnlC bG9jazsKICAgICAgICAgICAgIHByb2ZpbGVIZWFkZXIuaXNUZW1wb3JhcnkgPSBmYWxzZTsKICAg ICAgICAgfQpAQCAtMTk4LDcgKzIxNCw4IEBAIFdlYkluc3BlY3Rvci5NZW1vcnlCbG9ja1ZpZXdQ cm9wZXJ0aWVzLl9pbml0aWFsaXplID0gZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgV2ViSW5z cGVjdG9yLk1lbW9yeUJsb2NrVmlld1Byb3BlcnRpZXMuX3N0YW5kYXJkQmxvY2tzW25hbWVdID0g bmV3IFdlYkluc3BlY3Rvci5NZW1vcnlCbG9ja1ZpZXdQcm9wZXJ0aWVzKGZpbGxTdHlsZSwgbmFt ZSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKGRlc2NyaXB0aW9uKSk7CiAgICAgfQotICAgIGFkZEJs b2NrKCJyZ2JhKDI0MCwgMjQwLCAyNTAsIDAuOCkiLCAiUHJvY2Vzc1ByaXZhdGVNZW1vcnkiLCAi VG90YWwiKTsKKyAgICBhZGRCbG9jaygicmdiYSgyNTUsIDI1NSwgMjU1LCAwLjgpIiwgIlByb2Nl c3NQcml2YXRlTWVtb3J5IiwgIlRvdGFsIik7CisgICAgYWRkQmxvY2soInJnYmEoMjQwLCAyNDAs IDI1MCwgMC44KSIsICJVbmtub3duIiwgIlVua25vd24iKTsKICAgICBhZGRCbG9jaygicmdiYSgy NTAsIDIwMCwgMjAwLCAwLjgpIiwgIkpTSGVhcEFsbG9jYXRlZCIsICJKYXZhU2NyaXB0IGhlYXAi KTsKICAgICBhZGRCbG9jaygicmdiYSgyMDAsIDI1MCwgMjAwLCAwLjgpIiwgIkpTSGVhcFVzZWQi LCAiVXNlZCBKYXZhU2NyaXB0IGhlYXAiKTsKICAgICBhZGRCbG9jaygicmdiYSgyMDAsIDE3MCwg MjAwLCAwLjgpIiwgIk1lbW9yeUNhY2hlIiwgIk1lbW9yeSBjYWNoZSByZXNvdXJjZXMiKTsKQEAg LTI4MSw5ICsyOTgsNyBAQCBXZWJJbnNwZWN0b3IuTmF0aXZlTWVtb3J5UGllQ2hhcnQucHJvdG90 eXBlID0gewogICAgICAgICBjdHguYmVnaW5QYXRoKCk7CiAgICAgICAgIGN0eC5hcmMoeCwgeSwg cmFkaXVzLCAwLCBNYXRoLlBJKjIsIGZhbHNlKTsKICAgICAgICAgY3R4LmxpbmVXaWR0aCA9IDE7 Ci0gICAgICAgIGN0eC5maWxsU3R5bGUgPSBXZWJJbnNwZWN0b3IuTWVtb3J5QmxvY2tWaWV3UHJv cGVydGllcy5fZm9yTWVtb3J5QmxvY2sodGhpcy5fbWVtb3J5U25hcHNob3QpLl9maWxsU3R5bGU7 CiAgICAgICAgIGN0eC5zdHJva2VTdHlsZSA9ICJyZ2JhKDEzMCwgMTMwLCAxMzAsIDAuOCkiOwot ICAgICAgICBjdHguZmlsbCgpOwogICAgICAgICBjdHguc3Ryb2tlKCk7CiAgICAgICAgIGN0eC5j bG9zZVBhdGgoKTsKIApAQCAtMzE0LDM1ICszMjksMzEgQEAgV2ViSW5zcGVjdG9yLk5hdGl2ZU1l bW9yeVBpZUNoYXJ0LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGN0eC5jbG9zZVBhdGgoKTsK ICAgICAgICAgfQogCi0gICAgICAgIGlmIChtZW1vcnlCbG9jay5jaGlsZHJlbikgewotICAgICAg ICAgICAgdmFyIHRvdGFsID0gbWVtb3J5QmxvY2suc2l6ZTsKLSAgICAgICAgICAgIGZvciAodmFy IGkgPSAwOyBpIDwgbWVtb3J5QmxvY2suY2hpbGRyZW4ubGVuZ3RoOyBpKyspIHsKLSAgICAgICAg ICAgICAgICB2YXIgY2hpbGQgPSBtZW1vcnlCbG9jay5jaGlsZHJlbltpXTsKLSAgICAgICAgICAg ICAgICBpZiAoIWNoaWxkLnNpemUpCi0gICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAg ICAgICAgICAgICAgIHZhciB2aWV3UHJvcGVydGllcyA9IFdlYkluc3BlY3Rvci5NZW1vcnlCbG9j a1ZpZXdQcm9wZXJ0aWVzLl9mb3JNZW1vcnlCbG9jayhjaGlsZCk7Ci0gICAgICAgICAgICAgICAg dmFyIGFuZ2xlU3BhbiA9IE1hdGguUEkgKiAyICogKGNoaWxkLnNpemUgLyB0b3RhbCk7Ci0gICAg ICAgICAgICAgICAgY3R4LmJlZ2luUGF0aCgpOwotICAgICAgICAgICAgICAgIGN0eC5tb3ZlVG8o eCwgeSk7Ci0gICAgICAgICAgICAgICAgY3R4LmxpbmVUbyh4ICsgcmFkaXVzICogTWF0aC5jb3Mo Y3VycmVudEFuZ2xlKSwgeSArIHJhZGl1cyAqIE1hdGguc2luKGN1cnJlbnRBbmdsZSkpOwotICAg ICAgICAgICAgICAgIGN0eC5hcmMoeCwgeSwgcmFkaXVzLCBjdXJyZW50QW5nbGUsIGN1cnJlbnRB bmdsZSArIGFuZ2xlU3BhbiwgZmFsc2UpOwotICAgICAgICAgICAgICAgIGN0eC5saW5lV2lkdGgg PSAwLjU7Ci0gICAgICAgICAgICAgICAgY3R4LmxpbmVUbyh4LCB5KTsKLSAgICAgICAgICAgICAg ICBjdHguZmlsbFN0eWxlID0gdmlld1Byb3BlcnRpZXMuX2ZpbGxTdHlsZTsKLSAgICAgICAgICAg ICAgICBjdHguc3Ryb2tlU3R5bGUgPSAicmdiYSgxMDAsIDEwMCwgMTAwLCAwLjgpIjsKLSAgICAg ICAgICAgICAgICBjdHguZmlsbCgpOwotICAgICAgICAgICAgICAgIGN0eC5zdHJva2UoKTsKLSAg ICAgICAgICAgICAgICBjdHguY2xvc2VQYXRoKCk7Ci0KLSAgICAgICAgICAgICAgICBwYWludFBl cmNlbnRBbmRMYWJlbChjaGlsZC5zaXplIC8gdG90YWwsIHZpZXdQcm9wZXJ0aWVzLl9kZXNjcmlw dGlvbiwgY3VycmVudEFuZ2xlICsgYW5nbGVTcGFuIC8gMik7Ci0KLSAgICAgICAgICAgICAgICBj dXJyZW50QW5nbGUgKz0gYW5nbGVTcGFuOwotICAgICAgICAgICAgfQotICAgICAgICB9CisgICAg ICAgIGlmICghbWVtb3J5QmxvY2suY2hpbGRyZW4pCisgICAgICAgICAgICByZXR1cm47CisgICAg ICAgIHZhciB0b3RhbCA9IG1lbW9yeUJsb2NrLnNpemU7CisgICAgICAgIGZvciAodmFyIGkgPSAw OyBpIDwgbWVtb3J5QmxvY2suY2hpbGRyZW4ubGVuZ3RoOyBpKyspIHsKKyAgICAgICAgICAgIHZh ciBjaGlsZCA9IG1lbW9yeUJsb2NrLmNoaWxkcmVuW2ldOworICAgICAgICAgICAgaWYgKCFjaGls ZC5zaXplKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgdmFyIHZpZXdQ cm9wZXJ0aWVzID0gV2ViSW5zcGVjdG9yLk1lbW9yeUJsb2NrVmlld1Byb3BlcnRpZXMuX2Zvck1l bW9yeUJsb2NrKGNoaWxkKTsKKyAgICAgICAgICAgIHZhciBhbmdsZVNwYW4gPSBNYXRoLlBJICog MiAqIChjaGlsZC5zaXplIC8gdG90YWwpOworICAgICAgICAgICAgY3R4LmJlZ2luUGF0aCgpOwor ICAgICAgICAgICAgY3R4Lm1vdmVUbyh4LCB5KTsKKyAgICAgICAgICAgIGN0eC5saW5lVG8oeCAr IHJhZGl1cyAqIE1hdGguY29zKGN1cnJlbnRBbmdsZSksIHkgKyByYWRpdXMgKiBNYXRoLnNpbihj dXJyZW50QW5nbGUpKTsKKyAgICAgICAgICAgIGN0eC5hcmMoeCwgeSwgcmFkaXVzLCBjdXJyZW50 QW5nbGUsIGN1cnJlbnRBbmdsZSArIGFuZ2xlU3BhbiwgZmFsc2UpOworICAgICAgICAgICAgY3R4 LmxpbmVXaWR0aCA9IDAuNTsKKyAgICAgICAgICAgIGN0eC5saW5lVG8oeCwgeSk7CisgICAgICAg ICAgICBjdHguZmlsbFN0eWxlID0gdmlld1Byb3BlcnRpZXMuX2ZpbGxTdHlsZTsKKyAgICAgICAg ICAgIGN0eC5zdHJva2VTdHlsZSA9ICJyZ2JhKDEwMCwgMTAwLCAxMDAsIDAuOCkiOworICAgICAg ICAgICAgY3R4LmZpbGwoKTsKKyAgICAgICAgICAgIGN0eC5zdHJva2UoKTsKKyAgICAgICAgICAg IGN0eC5jbG9zZVBhdGgoKTsKIAotICAgICAgICB2YXIgZnJhY3Rpb24gPSAxIC0gKGN1cnJlbnRB bmdsZSAtIHN0YXJ0QW5nbGUpIC8gKDIgKiBNYXRoLlBJKTsKLSAgICAgICAgdmFyIG1pZEFuZ2xl ID0gKGN1cnJlbnRBbmdsZSArIHN0YXJ0QW5nbGUgKyAyICogTWF0aC5QSSkgLyAyOwotICAgICAg ICBwYWludFBlcmNlbnRBbmRMYWJlbChmcmFjdGlvbiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJV bmtub3duIiksIG1pZEFuZ2xlKTsKKyAgICAgICAgICAgIHBhaW50UGVyY2VudEFuZExhYmVsKGNo aWxkLnNpemUgLyB0b3RhbCwgdmlld1Byb3BlcnRpZXMuX2Rlc2NyaXB0aW9uLCBjdXJyZW50QW5n bGUgKyBhbmdsZVNwYW4gLyAyKTsKKworICAgICAgICAgICAgY3VycmVudEFuZ2xlICs9IGFuZ2xl U3BhbjsKKyAgICAgICAgfQogICAgIH0sCiAKICAgICBfY2xlYXI6IGZ1bmN0aW9uKCkgewo=