194171 2019-02-01 13:20:10 -0800 Web Inspector: Make WI.ColumnChart a WI.View subclass 2019-02-01 13:41:27 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck webkit-unassigned hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1501235 0 joepeck 2019-02-01 13:20:10 -0800 Make WI.ColumnChart a WI.View subclass 1501236 1 360888 joepeck 2019-02-01 13:20:44 -0800 Created attachment 360888 [PATCH] Proposed Fix 1501252 2 360890 joepeck 2019-02-01 13:28:37 -0800 Created attachment 360890 [PATCH] Proposed Fix 1501257 3 360890 hi 2019-02-01 13:36:50 -0800 Comment on attachment 360890 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=360888&action=review rs=me > Source/WebInspectorUI/UserInterface/Views/ColumnChart.js:51 > + this._svgElement = this.element.appendChild(createSVGElement("svg")); I think it's worth adding `preservesAspectRatio="none"` like many of the other charts, so that if we ever use it elsewhere it also supports stretching. this._svgElement.setAttribute("preserveAspectRatio", "none"); 1501258 4 joepeck 2019-02-01 13:41:01 -0800 https://trac.webkit.org/changeset/240872/webkit 1501259 5 webkit-bug-importer 2019-02-01 13:41:27 -0800 <rdar://problem/47747770> 360888 2019-02-01 13:20:44 -0800 2019-02-01 13:28:37 -0800 [PATCH] Proposed Fix column-chart-1.patch text/plain 4335 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDE0ZmQzZTFjMjcwLi42ZWYxMmYyMzYzOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTktMDItMDEgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBNYWtlIFdJLkNvbHVtbkNoYXJ0IGEgV0kuVmlldyBzdWJjbGFzcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk0MTcxCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NQ VVRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5qczoKKyAgICAgICAgKFdJLkNQVVRpbWVsaW5lT3ZlcnZp ZXdHcmFwaCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Db2x1bW5DaGFydC5qczoK KyAgICAgICAgKFdJLkNvbHVtbkNoYXJ0KToKKyAgICAgICAgKFdJLkNvbHVtbkNoYXJ0LnByb3Rv dHlwZS5zZXQgc2l6ZSk6CisgICAgICAgIChXSS5Db2x1bW5DaGFydC5wcm90b3R5cGUubGF5b3V0 KToKKyAgICAgICAgKFdJLkNvbHVtbkNoYXJ0LnByb3RvdHlwZS5nZXQgZWxlbWVudCk6IERlbGV0 ZWQuCisgICAgICAgIChXSS5Db2x1bW5DaGFydC5wcm90b3R5cGUubmVlZHNMYXlvdXQpOiBEZWxl dGVkLgorICAgICAgICAoV0kuQ29sdW1uQ2hhcnQucHJvdG90eXBlLnVwZGF0ZUxheW91dCk6IERl bGV0ZWQuCisKIDIwMTktMDItMDEgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNv bT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBNYWtlIFdJLlN0YWNrZWRMaW5lQ2hhcnQgYSBX SS5WaWV3IHN1YmNsYXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9DUFVUaW1lbGluZU92ZXJ2aWV3R3JhcGguanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DUFVUaW1lbGluZU92ZXJ2aWV3R3JhcGguanMK aW5kZXggYzU4ZmE4YmE0OTcuLjIyMWQ4OGY2NTdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DUFVUaW1lbGluZU92ZXJ2aWV3R3JhcGguanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1BVVGltZWxp bmVPdmVydmlld0dyYXBoLmpzCkBAIC0zOSw2ICszOSw3IEBAIFdJLkNQVVRpbWVsaW5lT3ZlcnZp ZXdHcmFwaCA9IGNsYXNzIENQVVRpbWVsaW5lT3ZlcnZpZXdHcmFwaCBleHRlbmRzIFdJLlRpbWVs aW5lCiAKICAgICAgICAgbGV0IHNpemUgPSBuZXcgV0kuU2l6ZSgwLCB0aGlzLmhlaWdodCk7CiAg ICAgICAgIHRoaXMuX2NoYXJ0ID0gbmV3IFdJLkNvbHVtbkNoYXJ0KHNpemUpOworICAgICAgICB0 aGlzLmFkZFN1YnZpZXcodGhpcy5fY2hhcnQpOwogICAgICAgICB0aGlzLmVsZW1lbnQuYXBwZW5k Q2hpbGQodGhpcy5fY2hhcnQuZWxlbWVudCk7CiAKICAgICAgICAgdGhpcy5fbGVnZW5kRWxlbWVu dCA9IHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYi KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9Db2x1bW5DaGFydC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0NvbHVtbkNoYXJ0LmpzCmluZGV4IDY3ZWM5ODRiZWEyLi5iZmE4NjhiYmZhYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29sdW1uQ2hh cnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29s dW1uQ2hhcnQuanMKQEAgLTMyLDIyICszMiwyMyBAQAogLy8KIC8vIC0gVGhlcmUgaXMgYSBzaW5n bGUgcmVjdCBmb3IgZWFjaCBiYXIuCiAvLwotLy8gIDxkaXYgY2xhc3M9ImxpbmUtY2hhcnQiPgot Ly8gICAgICA8c3ZnIHdpZHRoPSI4MDAiIGhlaWdodD0iNzUiIHZpZXdib3g9IjAgMCA4MDAgNzUi PgorLy8gIDxkaXYgY2xhc3M9ImNvbHVtbi1jaGFydCI+CisvLyAgICAgIDxzdmcgdmlld0JveD0i MCAwIDgwMCA3NSI+CiAvLyAgICAgICAgICA8cmVjdCB3aWR0aD0iPHc+IiBoZWlnaHQ9IjxoPiIg dHJhbnNmb3JtPSJ0cmFuc2xhdGUoPHg+LCA8eT4pIiAvPgogLy8gICAgICAgICAgPHJlY3Qgd2lk dGg9Ijx3PiIgaGVpZ2h0PSI8aD4iIHRyYW5zZm9ybT0idHJhbnNsYXRlKDx4PiwgPHk+KSIgLz4K IC8vICAgICAgICAgIC4uLgogLy8gICAgICA8L3N2Zz4KIC8vICA8L2Rpdj4KIAotV0kuQ29sdW1u Q2hhcnQgPSBjbGFzcyBDb2x1bW5DaGFydAorV0kuQ29sdW1uQ2hhcnQgPSBjbGFzcyBDb2x1bW5D aGFydCBleHRlbmRzIFdJLlZpZXcKIHsKICAgICBjb25zdHJ1Y3RvcihzaXplKQogICAgIHsKLSAg ICAgICAgdGhpcy5fZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotICAg ICAgICB0aGlzLl9lbGVtZW50LmNsYXNzTGlzdC5hZGQoImNvbHVtbi1jaGFydCIpOworICAgICAg ICBzdXBlcigpOwogCi0gICAgICAgIHRoaXMuX3N2Z0VsZW1lbnQgPSB0aGlzLl9lbGVtZW50LmFw cGVuZENoaWxkKGNyZWF0ZVNWR0VsZW1lbnQoInN2ZyIpKTsKKyAgICAgICAgdGhpcy5lbGVtZW50 LmNsYXNzTGlzdC5hZGQoImNvbHVtbi1jaGFydCIpOworCisgICAgICAgIHRoaXMuX3N2Z0VsZW1l bnQgPSB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQoY3JlYXRlU1ZHRWxlbWVudCgic3ZnIikpOwog CiAgICAgICAgIHRoaXMuX2NvbHVtbnMgPSBbXTsKICAgICAgICAgdGhpcy5zaXplID0gc2l6ZTsK QEAgLTU1LDggKzU2LDYgQEAgV0kuQ29sdW1uQ2hhcnQgPSBjbGFzcyBDb2x1bW5DaGFydAogCiAg ICAgLy8gUHVibGljCiAKLSAgICBnZXQgZWxlbWVudCgpIHsgcmV0dXJuIHRoaXMuX2VsZW1lbnQ7 IH0KLQogICAgIGdldCBzaXplKCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl9zaXplOwpA QCAtNjYsOSArNjUsNyBAQCBXSS5Db2x1bW5DaGFydCA9IGNsYXNzIENvbHVtbkNoYXJ0CiAgICAg ewogICAgICAgICB0aGlzLl9zaXplID0gc2l6ZTsKIAotICAgICAgICB0aGlzLl9zdmdFbGVtZW50 LnNldEF0dHJpYnV0ZSgid2lkdGgiLCBzaXplLndpZHRoKTsKLSAgICAgICAgdGhpcy5fc3ZnRWxl bWVudC5zZXRBdHRyaWJ1dGUoImhlaWdodCIsIHNpemUuaGVpZ2h0KTsKLSAgICAgICAgdGhpcy5f c3ZnRWxlbWVudC5zZXRBdHRyaWJ1dGUoInZpZXdib3giLCBgMCAwICR7c2l6ZS53aWR0aH0gJHtz aXplLmhlaWdodH1gKTsKKyAgICAgICAgdGhpcy5fc3ZnRWxlbWVudC5zZXRBdHRyaWJ1dGUoInZp ZXdCb3giLCBgMCAwICR7c2l6ZS53aWR0aH0gJHtzaXplLmhlaWdodH1gKTsKICAgICB9CiAKICAg ICBhZGRDb2x1bW4oeCwgeSwgd2lkdGgsIGhlaWdodCkKQEAgLTgxLDIxICs3OCwxNSBAQCBXSS5D b2x1bW5DaGFydCA9IGNsYXNzIENvbHVtbkNoYXJ0CiAgICAgICAgIHRoaXMuX2NvbHVtbnMgPSBb XTsKICAgICB9CiAKLSAgICBuZWVkc0xheW91dCgpCisgICAgLy8gUHJvdGVjdGVkCisKKyAgICBs YXlvdXQoKQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX3NjaGVkdWxlZExheW91dFVwZGF0ZUlk ZW50aWZpZXIpCisgICAgICAgIHN1cGVyLmxheW91dCgpOworCisgICAgICAgIGlmICh0aGlzLmxh eW91dFJlYXNvbiA9PT0gV0kuVmlldy5MYXlvdXRSZWFzb24uUmVzaXplKQogICAgICAgICAgICAg cmV0dXJuOwogCi0gICAgICAgIHRoaXMuX3NjaGVkdWxlZExheW91dFVwZGF0ZUlkZW50aWZpZXIg PSByZXF1ZXN0QW5pbWF0aW9uRnJhbWUodGhpcy51cGRhdGVMYXlvdXQuYmluZCh0aGlzKSk7Ci0g ICAgfQotCi0gICAgdXBkYXRlTGF5b3V0KCkKLSAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9zY2hl ZHVsZWRMYXlvdXRVcGRhdGVJZGVudGlmaWVyKSB7Ci0gICAgICAgICAgICBjYW5jZWxBbmltYXRp b25GcmFtZSh0aGlzLl9zY2hlZHVsZWRMYXlvdXRVcGRhdGVJZGVudGlmaWVyKTsKLSAgICAgICAg ICAgIHRoaXMuX3NjaGVkdWxlZExheW91dFVwZGF0ZUlkZW50aWZpZXIgPSB1bmRlZmluZWQ7Ci0g ICAgICAgIH0KLQogICAgICAgICB0aGlzLl9zdmdFbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7CiAK ICAgICAgICAgZm9yIChsZXQge3gsIHksIHdpZHRoLCBoZWlnaHR9IG9mIHRoaXMuX2NvbHVtbnMp IHsK 360890 2019-02-01 13:28:37 -0800 2019-02-01 13:40:28 -0800 [PATCH] Proposed Fix column-chart-1.patch text/plain 4335 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDE0ZmQzZTFjMjcwLi42ZWYxMmYyMzYzOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTktMDItMDEgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBNYWtlIFdJLkNvbHVtbkNoYXJ0IGEgV0kuVmlldyBzdWJjbGFzcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk0MTcxCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NQ VVRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5qczoKKyAgICAgICAgKFdJLkNQVVRpbWVsaW5lT3ZlcnZp ZXdHcmFwaCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Db2x1bW5DaGFydC5qczoK KyAgICAgICAgKFdJLkNvbHVtbkNoYXJ0KToKKyAgICAgICAgKFdJLkNvbHVtbkNoYXJ0LnByb3Rv dHlwZS5zZXQgc2l6ZSk6CisgICAgICAgIChXSS5Db2x1bW5DaGFydC5wcm90b3R5cGUubGF5b3V0 KToKKyAgICAgICAgKFdJLkNvbHVtbkNoYXJ0LnByb3RvdHlwZS5nZXQgZWxlbWVudCk6IERlbGV0 ZWQuCisgICAgICAgIChXSS5Db2x1bW5DaGFydC5wcm90b3R5cGUubmVlZHNMYXlvdXQpOiBEZWxl dGVkLgorICAgICAgICAoV0kuQ29sdW1uQ2hhcnQucHJvdG90eXBlLnVwZGF0ZUxheW91dCk6IERl bGV0ZWQuCisKIDIwMTktMDItMDEgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNv bT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBNYWtlIFdJLlN0YWNrZWRMaW5lQ2hhcnQgYSBX SS5WaWV3IHN1YmNsYXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9DUFVUaW1lbGluZU92ZXJ2aWV3R3JhcGguanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DUFVUaW1lbGluZU92ZXJ2aWV3R3JhcGguanMK aW5kZXggYzU4ZmE4YmE0OTcuLjIyMWQ4OGY2NTdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DUFVUaW1lbGluZU92ZXJ2aWV3R3JhcGguanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1BVVGltZWxp bmVPdmVydmlld0dyYXBoLmpzCkBAIC0zOSw2ICszOSw3IEBAIFdJLkNQVVRpbWVsaW5lT3ZlcnZp ZXdHcmFwaCA9IGNsYXNzIENQVVRpbWVsaW5lT3ZlcnZpZXdHcmFwaCBleHRlbmRzIFdJLlRpbWVs aW5lCiAKICAgICAgICAgbGV0IHNpemUgPSBuZXcgV0kuU2l6ZSgwLCB0aGlzLmhlaWdodCk7CiAg ICAgICAgIHRoaXMuX2NoYXJ0ID0gbmV3IFdJLkNvbHVtbkNoYXJ0KHNpemUpOworICAgICAgICB0 aGlzLmFkZFN1YnZpZXcodGhpcy5fY2hhcnQpOwogICAgICAgICB0aGlzLmVsZW1lbnQuYXBwZW5k Q2hpbGQodGhpcy5fY2hhcnQuZWxlbWVudCk7CiAKICAgICAgICAgdGhpcy5fbGVnZW5kRWxlbWVu dCA9IHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYi KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9Db2x1bW5DaGFydC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0NvbHVtbkNoYXJ0LmpzCmluZGV4IDY3ZWM5ODRiZWEyLi5iZmE4NjhiYmZhYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29sdW1uQ2hh cnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29s dW1uQ2hhcnQuanMKQEAgLTMyLDIyICszMiwyMyBAQAogLy8KIC8vIC0gVGhlcmUgaXMgYSBzaW5n bGUgcmVjdCBmb3IgZWFjaCBiYXIuCiAvLwotLy8gIDxkaXYgY2xhc3M9ImxpbmUtY2hhcnQiPgot Ly8gICAgICA8c3ZnIHdpZHRoPSI4MDAiIGhlaWdodD0iNzUiIHZpZXdib3g9IjAgMCA4MDAgNzUi PgorLy8gIDxkaXYgY2xhc3M9ImNvbHVtbi1jaGFydCI+CisvLyAgICAgIDxzdmcgdmlld0JveD0i MCAwIDgwMCA3NSI+CiAvLyAgICAgICAgICA8cmVjdCB3aWR0aD0iPHc+IiBoZWlnaHQ9IjxoPiIg dHJhbnNmb3JtPSJ0cmFuc2xhdGUoPHg+LCA8eT4pIiAvPgogLy8gICAgICAgICAgPHJlY3Qgd2lk dGg9Ijx3PiIgaGVpZ2h0PSI8aD4iIHRyYW5zZm9ybT0idHJhbnNsYXRlKDx4PiwgPHk+KSIgLz4K IC8vICAgICAgICAgIC4uLgogLy8gICAgICA8L3N2Zz4KIC8vICA8L2Rpdj4KIAotV0kuQ29sdW1u Q2hhcnQgPSBjbGFzcyBDb2x1bW5DaGFydAorV0kuQ29sdW1uQ2hhcnQgPSBjbGFzcyBDb2x1bW5D aGFydCBleHRlbmRzIFdJLlZpZXcKIHsKICAgICBjb25zdHJ1Y3RvcihzaXplKQogICAgIHsKLSAg ICAgICAgdGhpcy5fZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotICAg ICAgICB0aGlzLl9lbGVtZW50LmNsYXNzTGlzdC5hZGQoImNvbHVtbi1jaGFydCIpOworICAgICAg ICBzdXBlcigpOwogCi0gICAgICAgIHRoaXMuX3N2Z0VsZW1lbnQgPSB0aGlzLl9lbGVtZW50LmFw cGVuZENoaWxkKGNyZWF0ZVNWR0VsZW1lbnQoInN2ZyIpKTsKKyAgICAgICAgdGhpcy5lbGVtZW50 LmNsYXNzTGlzdC5hZGQoImNvbHVtbi1jaGFydCIpOworCisgICAgICAgIHRoaXMuX3N2Z0VsZW1l bnQgPSB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQoY3JlYXRlU1ZHRWxlbWVudCgic3ZnIikpOwog CiAgICAgICAgIHRoaXMuX2NvbHVtbnMgPSBbXTsKICAgICAgICAgdGhpcy5zaXplID0gc2l6ZTsK QEAgLTU1LDggKzU2LDYgQEAgV0kuQ29sdW1uQ2hhcnQgPSBjbGFzcyBDb2x1bW5DaGFydAogCiAg ICAgLy8gUHVibGljCiAKLSAgICBnZXQgZWxlbWVudCgpIHsgcmV0dXJuIHRoaXMuX2VsZW1lbnQ7 IH0KLQogICAgIGdldCBzaXplKCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl9zaXplOwpA QCAtNjYsOSArNjUsNyBAQCBXSS5Db2x1bW5DaGFydCA9IGNsYXNzIENvbHVtbkNoYXJ0CiAgICAg ewogICAgICAgICB0aGlzLl9zaXplID0gc2l6ZTsKIAotICAgICAgICB0aGlzLl9zdmdFbGVtZW50 LnNldEF0dHJpYnV0ZSgid2lkdGgiLCBzaXplLndpZHRoKTsKLSAgICAgICAgdGhpcy5fc3ZnRWxl bWVudC5zZXRBdHRyaWJ1dGUoImhlaWdodCIsIHNpemUuaGVpZ2h0KTsKLSAgICAgICAgdGhpcy5f c3ZnRWxlbWVudC5zZXRBdHRyaWJ1dGUoInZpZXdib3giLCBgMCAwICR7c2l6ZS53aWR0aH0gJHtz aXplLmhlaWdodH1gKTsKKyAgICAgICAgdGhpcy5fc3ZnRWxlbWVudC5zZXRBdHRyaWJ1dGUoInZp ZXdCb3giLCBgMCAwICR7c2l6ZS53aWR0aH0gJHtzaXplLmhlaWdodH1gKTsKICAgICB9CiAKICAg ICBhZGRDb2x1bW4oeCwgeSwgd2lkdGgsIGhlaWdodCkKQEAgLTgxLDIxICs3OCwxNSBAQCBXSS5D b2x1bW5DaGFydCA9IGNsYXNzIENvbHVtbkNoYXJ0CiAgICAgICAgIHRoaXMuX2NvbHVtbnMgPSBb XTsKICAgICB9CiAKLSAgICBuZWVkc0xheW91dCgpCisgICAgLy8gUHJvdGVjdGVkCisKKyAgICBs YXlvdXQoKQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX3NjaGVkdWxlZExheW91dFVwZGF0ZUlk ZW50aWZpZXIpCisgICAgICAgIHN1cGVyLmxheW91dCgpOworCisgICAgICAgIGlmICh0aGlzLmxh eW91dFJlYXNvbiA9PT0gV0kuVmlldy5MYXlvdXRSZWFzb24uUmVzaXplKQogICAgICAgICAgICAg cmV0dXJuOwogCi0gICAgICAgIHRoaXMuX3NjaGVkdWxlZExheW91dFVwZGF0ZUlkZW50aWZpZXIg PSByZXF1ZXN0QW5pbWF0aW9uRnJhbWUodGhpcy51cGRhdGVMYXlvdXQuYmluZCh0aGlzKSk7Ci0g ICAgfQotCi0gICAgdXBkYXRlTGF5b3V0KCkKLSAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9zY2hl ZHVsZWRMYXlvdXRVcGRhdGVJZGVudGlmaWVyKSB7Ci0gICAgICAgICAgICBjYW5jZWxBbmltYXRp b25GcmFtZSh0aGlzLl9zY2hlZHVsZWRMYXlvdXRVcGRhdGVJZGVudGlmaWVyKTsKLSAgICAgICAg ICAgIHRoaXMuX3NjaGVkdWxlZExheW91dFVwZGF0ZUlkZW50aWZpZXIgPSB1bmRlZmluZWQ7Ci0g ICAgICAgIH0KLQogICAgICAgICB0aGlzLl9zdmdFbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7CiAK ICAgICAgICAgZm9yIChsZXQge3gsIHksIHdpZHRoLCBoZWlnaHR9IG9mIHRoaXMuX2NvbHVtbnMp IHsK