101732 2012-11-09 02:19:24 -0800 Web Inspector: [Canvas] render canvas log as a grid. 2012-11-09 03:34:31 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman aandrey apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 762749 0 pfeldman 2012-11-09 02:19:24 -0800 Simple UI tweak. 762751 1 173247 pfeldman 2012-11-09 02:20:56 -0800 Created attachment 173247 Patch 762755 2 173247 aandrey 2012-11-09 02:26:49 -0800 Comment on attachment 173247 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=173247&action=review > Source/WebCore/inspector/front-end/CanvasProfileView.js:270 > + var fragment = document.createDocumentFragment(); this is not used > Source/WebCore/inspector/front-end/CanvasProfileView.js:274 > + var lastNode = this.rootNode().children[calls.length - 1]; can lastNode be NULL? (there used to be a NULL check here) 762801 3 pfeldman 2012-11-09 03:34:31 -0800 Committed r134045: <http://trac.webkit.org/changeset/134045> 173247 2012-11-09 02:20:56 -0800 2012-11-09 03:30:47 -0800 Patch bug-101732-20121109141903.patch text/plain 13323 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0MDMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmE0NWVhZmM0YzQ1MWM2 ZWQ3YmU1NzI3NDc3ODhlZWMwZTlkNWQzNS4uOWE5NTAwZjIwYTY5ZGEwNzc3MWEyNzFjYzNlNmY4 MGVkMDZkMWE3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTExLTA5ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHJlbmRlciBjYW52YXMgbG9nIGFzIGEgZ3JpZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTczMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdz LmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ2FudmFzUHJvZmlsZVZpZXcuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ2FudmFzUHJvZmlsZVZpZXcpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkNhbnZhc1Byb2ZpbGVWaWV3LnByb3RvdHlwZS5fb25TZWxlY3RUcmFjZUxvZyk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ2FudmFzUHJvZmlsZVZpZXcucHJvdG90eXBlLl9yZXBs YXlUcmFjZUxvZy5kaWRSZXBsYXlUcmFjZUxvZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ2Fu dmFzUHJvZmlsZVZpZXcucHJvdG90eXBlLl9yZXBsYXlUcmFjZUxvZyk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuQ2FudmFzUHJvZmlsZUhlYWRlci5wcm90b3R5cGUudHJhY2VMb2dJZCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuQ2FudmFzTG9nR3JpZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu Q2FudmFzTG9nR3JpZC5wcm90b3R5cGUuX2RpZFJlY2VpdmVUcmFjZUxvZyk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuQ2FudmFzTG9nR3JpZC5wcm90b3R5cGUuX2NyZWF0ZUNhbGxOb2RlKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFHcmlkLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkRhdGFHcmlkTm9kZS5wcm90b3R5cGUuY3JlYXRlQ2VsbCk6CisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9jYW52YXNQcm9maWxlci5jc3M6CisgICAgICAgICgjY2FudmFzLXJl cGxheS1pbWFnZS1jb250YWluZXIpOgorCiAyMDEyLTExLTA4ICBQYXZlbCBGZWxkbWFuICA8cGZl bGRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHNwbGl0IFNwbGl0 VmlldyBpbnRvIFNwbGl0VmlldyBhbmQgU2lkZWJhclZpZXcKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJDb3Jl L0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCAzNmQwMTkwMjA4ODEyMDI0 YTgwOWM5YTlkOTRjMjdlZGI4MTA4N2VmLi42ZDNkYmRjOThjZjJiMGQxNjc2M2ZhOTA1OThmYjI5 ZGUxMjA3MjlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2Fs aXplZFN0cmluZ3MuanMKKysrIGIvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6 ZWRTdHJpbmdzLmpzCkBAIC05NSw2ICs5NSw3IEBAIGxvY2FsaXplZFN0cmluZ3NbIkNTUyBTRUxF Q1RPUiBQUk9GSUxFUyJdID0gIkNTUyBTRUxFQ1RPUiBQUk9GSUxFUyI7CiBsb2NhbGl6ZWRTdHJp bmdzWyJDU1Mgc2VsZWN0b3IgcHJvZmlsZXMgc2hvdyBob3cgbG9uZyB0aGUgc2VsZWN0b3IgbWF0 Y2hpbmcgaGFzIHRha2VuIGluIHRvdGFsIGFuZCBob3cgbWFueSB0aW1lcyBhIGNlcnRhaW4gc2Vs ZWN0b3IgaGFzIG1hdGNoZWQgRE9NIGVsZW1lbnRzICh0aGUgcmVzdWx0cyBhcmUgYXBwcm94aW1h dGUgZHVlIHRvIG1hdGNoaW5nIGFsZ29yaXRobSBvcHRpbWl6YXRpb25zLikiXSA9ICJDU1Mgc2Vs ZWN0b3IgcHJvZmlsZXMgc2hvdyBob3cgbG9uZyB0aGUgc2VsZWN0b3IgbWF0Y2hpbmcgaGFzIHRh a2VuIGluIHRvdGFsIGFuZCBob3cgbWFueSB0aW1lcyBhIGNlcnRhaW4gc2VsZWN0b3IgaGFzIG1h dGNoZWQgRE9NIGVsZW1lbnRzICh0aGUgcmVzdWx0cyBhcmUgYXBwcm94aW1hdGUgZHVlIHRvIG1h dGNoaW5nIGFsZ29yaXRobSBvcHRpbWl6YXRpb25zLikiOwogbG9jYWxpemVkU3RyaW5nc1siQ2Fs bCBTaXRlIHN0YWNrIl0gPSAiQ2FsbCBTaXRlIHN0YWNrIjsKIGxvY2FsaXplZFN0cmluZ3NbIkNh bGwgU3RhY2siXSA9ICJDYWxsIFN0YWNrIjsKK2xvY2FsaXplZFN0cmluZ3NbIkNhbGwiXSA9ICJD YWxsIjsKIGxvY2FsaXplZFN0cmluZ3NbIkNhbGxzIl0gPSAiQ2FsbHMiOwogbG9jYWxpemVkU3Ry aW5nc1siQ2Fubm90IGZpbmQgY29ycmVzcG9uZGluZyBoZWFwIHNuYXBzaG90IG5vZGUiXSA9ICJD YW5ub3QgZmluZCBjb3JyZXNwb25kaW5nIGhlYXAgc25hcHNob3Qgbm9kZSI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJDbGVhciBhbGwgcHJvZmlsZXMuIl0gPSAiQ2xlYXIgYWxsIHByb2ZpbGVzLiI7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NhbnZhc1Byb2Zp bGVWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DYW52YXNQcm9m aWxlVmlldy5qcwppbmRleCA0NDBmYWJkZTRjMGVkMzEzNTlkZWM5N2VkYTEyN2YyZjcyYzM3ZDc4 Li4xMzAyZjY1NWE0YjE4NGEyYTBiMTJjOWMzN2MxOThjMmVlNzE1NDA2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NhbnZhc1Byb2ZpbGVWaWV3LmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ2FudmFzUHJvZmlsZVZpZXcu anMKQEAgLTM3LDI4ICszNywyNyBAQCBXZWJJbnNwZWN0b3IuQ2FudmFzUHJvZmlsZVZpZXcgPSBm dW5jdGlvbihwcm9maWxlKQogICAgIFdlYkluc3BlY3Rvci5WaWV3LmNhbGwodGhpcyk7CiAgICAg dGhpcy5yZWdpc3RlclJlcXVpcmVkQ1NTKCJjYW52YXNQcm9maWxlci5jc3MiKTsKICAgICB0aGlz Ll9wcm9maWxlID0gcHJvZmlsZTsKKyAgICB0aGlzLl90cmFjZUxvZ0lkID0gcHJvZmlsZS50cmFj ZUxvZ0lkKCk7CiAgICAgdGhpcy5lbGVtZW50LmFkZFN0eWxlQ2xhc3MoImNhbnZhcy1wcm9maWxl LXZpZXciKTsKIAogICAgIHRoaXMuX3NwbGl0VmlldyA9IG5ldyBXZWJJbnNwZWN0b3IuU3BsaXRW aWV3KGZhbHNlLCAiY2FudmFzUHJvZmlsZVZpZXdTcGxpdExvY2F0aW9uIiwgMzAwKTsKLSAgICB0 aGlzLl90cmFjZUxvZ0VsZW1lbnQgPSB0aGlzLl9zcGxpdFZpZXcuc2Vjb25kRWxlbWVudCgpOwot ICAgIHRoaXMuX3RyYWNlTG9nRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJjYW52YXMtdHJhY2UtbG9n Iik7Ci0gICAgdGhpcy5fdHJhY2VMb2dFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwg dGhpcy5fb25UcmFjZUxvZ0l0ZW1DbGljay5iaW5kKHRoaXMpLCBmYWxzZSk7CisKKyAgICB0aGlz Ll9saW5raWZpZXIgPSBuZXcgV2ViSW5zcGVjdG9yLkxpbmtpZmllcigpOworICAgIHRoaXMuX2xv Z0dyaWQgPSBuZXcgV2ViSW5zcGVjdG9yLkNhbnZhc0xvZ0dyaWQocHJvZmlsZS50cmFjZUxvZ0lk KCksIHRoaXMuX2xpbmtpZmllcik7CisgICAgdGhpcy5fbG9nR3JpZC5zaG93KHRoaXMuX3NwbGl0 Vmlldy5zZWNvbmRFbGVtZW50KCkpOwogCiAgICAgdmFyIHJlcGxheUltYWdlQ29udGFpbmVyID0g dGhpcy5fc3BsaXRWaWV3LmZpcnN0RWxlbWVudCgpOwogICAgIHJlcGxheUltYWdlQ29udGFpbmVy LmlkID0gImNhbnZhcy1yZXBsYXktaW1hZ2UtY29udGFpbmVyIjsKIAogICAgIHRoaXMuX3JlcGxh eUltYWdlRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImltYWdlIik7CiAgICAgdGhp cy5fcmVwbGF5SW1hZ2VFbGVtZW50LmlkID0gImNhbnZhcy1yZXBsYXktaW1hZ2UiOwotICAgIHJl cGxheUltYWdlQ29udGFpbmVyLmFwcGVuZENoaWxkKHRoaXMuX3JlcGxheUltYWdlRWxlbWVudCk7 CiAKKyAgICByZXBsYXlJbWFnZUNvbnRhaW5lci5hcHBlbmRDaGlsZCh0aGlzLl9yZXBsYXlJbWFn ZUVsZW1lbnQpOwogICAgIHRoaXMuX2RlYnVnSW5mb0VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVF bGVtZW50KCJkaXYiKTsKLQotICAgIHRoaXMuX3NwbGl0Vmlldy5zaG93KHRoaXMuZWxlbWVudCk7 CiAgICAgcmVwbGF5SW1hZ2VDb250YWluZXIuYXBwZW5kQ2hpbGQodGhpcy5fZGVidWdJbmZvRWxl bWVudCk7CiAKLSAgICB0aGlzLl9saW5raWZpZXIgPSBuZXcgV2ViSW5zcGVjdG9yLkxpbmtpZmll cigpOwotCi0gICAgdGhpcy5fc2hvd1RyYWNlTG9nKCk7CisgICAgdGhpcy5fc3BsaXRWaWV3LnNo b3codGhpcy5lbGVtZW50KTsKKyAgICB0aGlzLl9sb2dHcmlkLmFkZEV2ZW50TGlzdGVuZXIoV2Vi SW5zcGVjdG9yLkRhdGFHcmlkLkV2ZW50cy5TZWxlY3RlZE5vZGUsIHRoaXMuX29uU2VsZWN0VHJh Y2VMb2cuYmluZCh0aGlzKSk7CiB9CiAKIFdlYkluc3BlY3Rvci5DYW52YXNQcm9maWxlVmlldy5w cm90b3R5cGUgPSB7CkBAIC03OCw5OSArNzcsMjggQEAgV2ViSW5zcGVjdG9yLkNhbnZhc1Byb2Zp bGVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3Byb2ZpbGU7CiAgICAg fSwKIAotICAgIHdhc1Nob3duOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICB2YXIgc2Nyb2xs UG9zaXRpb24gPSB0aGlzLl90cmFjZUxvZ0VsZW1lbnRTY3JvbGxQb3NpdGlvbjsKLSAgICAgICAg ZGVsZXRlIHRoaXMuX3RyYWNlTG9nRWxlbWVudFNjcm9sbFBvc2l0aW9uOwotICAgICAgICBpZiAo c2Nyb2xsUG9zaXRpb24pIHsKLSAgICAgICAgICAgIHRoaXMuX3RyYWNlTG9nRWxlbWVudC5zY3Jv bGxUb3AgPSBzY3JvbGxQb3NpdGlvbi50b3A7Ci0gICAgICAgICAgICB0aGlzLl90cmFjZUxvZ0Vs ZW1lbnQuc2Nyb2xsTGVmdCA9IHNjcm9sbFBvc2l0aW9uLmxlZnQ7Ci0gICAgICAgIH0KLSAgICB9 LAotCi0gICAgd2lsbEhpZGU6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHRoaXMuX3RyYWNl TG9nRWxlbWVudFNjcm9sbFBvc2l0aW9uID0gewotICAgICAgICAgICAgdG9wOiB0aGlzLl90cmFj ZUxvZ0VsZW1lbnQuc2Nyb2xsVG9wLAotICAgICAgICAgICAgbGVmdDogdGhpcy5fdHJhY2VMb2dF bGVtZW50LnNjcm9sbExlZnQKLSAgICAgICAgfTsKLSAgICB9LAotCi0gICAgX3Nob3dUcmFjZUxv ZzogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgZnVuY3Rpb24gZGlkUmVjZWl2ZVRyYWNlTG9n KGVycm9yLCB0cmFjZUxvZykKLSAgICAgICAgewotICAgICAgICAgICAgdGhpcy5fdHJhY2VMb2dF bGVtZW50LnRleHRDb250ZW50ID0gIiI7Ci0gICAgICAgICAgICBpZiAoZXJyb3IgfHwgIXRyYWNl TG9nKQotICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIHZhciBmcmFnbWVudCA9 IGRvY3VtZW50LmNyZWF0ZURvY3VtZW50RnJhZ21lbnQoKTsKLSAgICAgICAgICAgIHZhciBjYWxs cyA9IHRyYWNlTG9nLmNhbGxzOwotICAgICAgICAgICAgZm9yICh2YXIgaSA9IDAsIG4gPSBjYWxs cy5sZW5ndGg7IGkgPCBuOyArK2kpIHsKLSAgICAgICAgICAgICAgICB2YXIgY2FsbCA9IGNhbGxz W2ldOwotICAgICAgICAgICAgICAgIHZhciB0cmFjZUxvZ0l0ZW0gPSBkb2N1bWVudC5jcmVhdGVF bGVtZW50KCJkaXYiKTsKLSAgICAgICAgICAgICAgICB0cmFjZUxvZ0l0ZW0udHJhY2VMb2dJZCA9 IHRyYWNlTG9nLmlkOwotICAgICAgICAgICAgICAgIHRyYWNlTG9nSXRlbS5zdGVwTm8gPSBpOwot ICAgICAgICAgICAgICAgIHRyYWNlTG9nSXRlbS5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVU ZXh0Tm9kZSgiKCIgKyAoaSsxKSArICIpICIpKTsKLQotICAgICAgICAgICAgICAgIHZhciBzb3Vy Y2VUZXh0ID0gY2FsbC5mdW5jdGlvbk5hbWUgfHwgImNvbnRleHQuIiArIGNhbGwucHJvcGVydHk7 Ci0gICAgICAgICAgICAgICAgaWYgKGNhbGwuc291cmNlVVJMKSB7Ci0gICAgICAgICAgICAgICAg ICAgIC8vIEZJWE1FKDYyNzI1KTogc3RhY2sgdHJhY2UgbGluZS9jb2x1bW4gbnVtYmVycyBhcmUg b25lLWJhc2VkLgotICAgICAgICAgICAgICAgICAgICB2YXIgbGluZU51bWJlciA9IE1hdGgubWF4 KDAsIGNhbGwubGluZU51bWJlciAtIDEpIHx8IDA7Ci0gICAgICAgICAgICAgICAgICAgIHZhciBj b2x1bW5OdW1iZXIgPSBNYXRoLm1heCgwLCBjYWxsLmNvbHVtbk51bWJlciAtIDEpIHx8IDA7Ci0g ICAgICAgICAgICAgICAgICAgIHZhciBsaW5rRWxlbWVudCA9IHRoaXMuX2xpbmtpZmllci5saW5r aWZ5TG9jYXRpb24oY2FsbC5zb3VyY2VVUkwsIGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlcik7Ci0g ICAgICAgICAgICAgICAgICAgIGxpbmtFbGVtZW50LnRleHRDb250ZW50ID0gc291cmNlVGV4dDsK LSAgICAgICAgICAgICAgICAgICAgdHJhY2VMb2dJdGVtLmFwcGVuZENoaWxkKGxpbmtFbGVtZW50 KTsKLSAgICAgICAgICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgICAgICAgICAgdHJhY2VMb2dJ dGVtLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKHNvdXJjZVRleHQpKTsKLQot ICAgICAgICAgICAgICAgIGlmIChjYWxsLmFyZ3VtZW50cykKLSAgICAgICAgICAgICAgICAgICAg dHJhY2VMb2dJdGVtLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKCIoIiArIGNh bGwuYXJndW1lbnRzLmpvaW4oIiwgIikgKyAiKSIpKTsKLSAgICAgICAgICAgICAgICBlbHNlCi0g ICAgICAgICAgICAgICAgICAgIHRyYWNlTG9nSXRlbS5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVh dGVUZXh0Tm9kZSgiID0gIiArIGNhbGwudmFsdWUpKTsKLQotICAgICAgICAgICAgICAgIGlmICh0 eXBlb2YgY2FsbC5yZXN1bHQgIT09ICJ1bmRlZmluZWQiKQotICAgICAgICAgICAgICAgICAgICB0 cmFjZUxvZ0l0ZW0uYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoIiA9PiAiICsg Y2FsbC5yZXN1bHQpKTsKLSAgICAgICAgICAgICAgICBmcmFnbWVudC5hcHBlbmRDaGlsZCh0cmFj ZUxvZ0l0ZW0pOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgdGhpcy5fdHJhY2VMb2dFbGVt ZW50LmFwcGVuZENoaWxkKGZyYWdtZW50KTsKLQotICAgICAgICAgICAgdmFyIGxhc3RJdGVtID0g dGhpcy5fdHJhY2VMb2dFbGVtZW50Lmxhc3RDaGlsZDsKLSAgICAgICAgICAgIGlmIChsYXN0SXRl bSkgewotICAgICAgICAgICAgICAgIGxhc3RJdGVtLnNjcm9sbEludG9WaWV3SWZOZWVkZWQoKTsK LSAgICAgICAgICAgICAgICB0aGlzLl9yZXBsYXlUcmFjZUxvZyhsYXN0SXRlbSk7Ci0gICAgICAg ICAgICB9Ci0gICAgICAgIH0KLSAgICAgICAgQ2FudmFzQWdlbnQuZ2V0VHJhY2VMb2codGhpcy5f cHJvZmlsZS50cmFjZUxvZ0lkKCksIGRpZFJlY2VpdmVUcmFjZUxvZy5iaW5kKHRoaXMpKTsKLSAg ICB9LAotCiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtFdmVudH0gZQorICAgICAqIEBwYXJhbSB7 V2ViSW5zcGVjdG9yLkV2ZW50fSBlCiAgICAgICovCi0gICAgX29uVHJhY2VMb2dJdGVtQ2xpY2s6 IGZ1bmN0aW9uKGUpCisgICAgX29uU2VsZWN0VHJhY2VMb2c6IGZ1bmN0aW9uKGUpCiAgICAgewot ICAgICAgICB0aGlzLl9yZXBsYXlUcmFjZUxvZygvKiogQHR5cGUge0VsZW1lbnR9ICovIChlLnRh cmdldCkpOworICAgICAgICB0aGlzLl9yZXBsYXlUcmFjZUxvZyh0aGlzLl9sb2dHcmlkLnNlbGVj dGVkTm9kZSk7CiAgICAgfSwKIAotICAgIC8qKgotICAgICAqIEBwYXJhbSB7RWxlbWVudH0gaXRl bQotICAgICAqLwotICAgIF9yZXBsYXlUcmFjZUxvZzogZnVuY3Rpb24oaXRlbSkKKyAgICBfcmVw bGF5VHJhY2VMb2c6IGZ1bmN0aW9uKGNhbGxOb2RlKQogICAgIHsKLSAgICAgICAgaWYgKCFpdGVt IHx8ICFpdGVtLnRyYWNlTG9nSWQpCisgICAgICAgIGlmICghY2FsbE5vZGUpCiAgICAgICAgICAg ICByZXR1cm47CisKICAgICAgICAgdmFyIHRpbWUgPSBEYXRlLm5vdygpOwogICAgICAgICBmdW5j dGlvbiBkaWRSZXBsYXlUcmFjZUxvZyhlcnJvciwgZGF0YVVSTCkKICAgICAgICAgewogICAgICAg ICAgICAgaWYgKGVycm9yKQogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIHRo aXMuX2RlYnVnSW5mb0VsZW1lbnQudGV4dENvbnRlbnQgPSAiUmVwbGF5IHRpbWU6ICIgKyAoRGF0 ZS5ub3coKSAtIHRpbWUpICsgIm1zIjsKLSAgICAgICAgICAgIGlmICh0aGlzLl9hY3RpdmVUcmFj ZUxvZ0l0ZW0pCi0gICAgICAgICAgICAgICAgdGhpcy5fYWN0aXZlVHJhY2VMb2dJdGVtLnN0eWxl LmJhY2tncm91bmRDb2xvciA9ICIiOwotICAgICAgICAgICAgdGhpcy5fYWN0aXZlVHJhY2VMb2dJ dGVtID0gaXRlbTsKLSAgICAgICAgICAgIHRoaXMuX2FjdGl2ZVRyYWNlTG9nSXRlbS5zdHlsZS5i YWNrZ3JvdW5kQ29sb3IgPSAieWVsbG93IjsKICAgICAgICAgICAgIHRoaXMuX3JlcGxheUltYWdl RWxlbWVudC5zcmMgPSBkYXRhVVJMOwogICAgICAgICB9Ci0gICAgICAgIENhbnZhc0FnZW50LnJl cGxheVRyYWNlTG9nKGl0ZW0udHJhY2VMb2dJZCwgaXRlbS5zdGVwTm8sIGRpZFJlcGxheVRyYWNl TG9nLmJpbmQodGhpcykpOworICAgICAgICBDYW52YXNBZ2VudC5yZXBsYXlUcmFjZUxvZyh0aGlz Ll90cmFjZUxvZ0lkLCBjYWxsTm9kZS5pbmRleCwgZGlkUmVwbGF5VHJhY2VMb2cuYmluZCh0aGlz KSk7CiAgICAgfSwKIAogICAgIF9fcHJvdG9fXzogV2ViSW5zcGVjdG9yLlZpZXcucHJvdG90eXBl CkBAIC0yNzksNyArMjA3LDggQEAgV2ViSW5zcGVjdG9yLkNhbnZhc1Byb2ZpbGVIZWFkZXIucHJv dG90eXBlID0gewogICAgIC8qKgogICAgICAqIEByZXR1cm4ge3N0cmluZz99CiAgICAgICovCi0g ICAgdHJhY2VMb2dJZDogZnVuY3Rpb24oKSB7CisgICAgdHJhY2VMb2dJZDogZnVuY3Rpb24oKQor ICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3RyYWNlTG9nSWQ7CiAgICAgfSwKIApAQCAtMzAy LDMgKzIzMSw3OSBAQCBXZWJJbnNwZWN0b3IuQ2FudmFzUHJvZmlsZUhlYWRlci5wcm90b3R5cGUg PSB7CiAKICAgICBfX3Byb3RvX186IFdlYkluc3BlY3Rvci5Qcm9maWxlSGVhZGVyLnByb3RvdHlw ZQogfQorCisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5E YXRhR3JpZH0KKyAqIEBwYXJhbSB7c3RyaW5nfSB0cmFjZUxvZ0lkCisgKiBAcGFyYW0ge1dlYklu c3BlY3Rvci5MaW5raWZpZXJ9IGxpbmtpZmllcgorICovCitXZWJJbnNwZWN0b3IuQ2FudmFzTG9n R3JpZCA9IGZ1bmN0aW9uKHRyYWNlTG9nSWQsIGxpbmtpZmllcikKK3sKKyAgICB0aGlzLl9saW5r aWZpZXIgPSBsaW5raWZpZXI7CisgICAgdmFyIGNvbHVtbnMgPSB7IDA6IHt9LCAxOiB7fSwgMjog e30gfTsKKyAgICBjb2x1bW5zWzBdLnRpdGxlID0gIiMiOworICAgIGNvbHVtbnNbMF0uc29ydGFi bGUgPSB0cnVlOworICAgIGNvbHVtbnNbMF0ud2lkdGggPSAiMyUiOworICAgIGNvbHVtbnNbMV0u dGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNhbGwiKTsKKyAgICBjb2x1bW5zWzFdLnNv cnRhYmxlID0gdHJ1ZTsKKyAgICBjb2x1bW5zWzFdLndpZHRoID0gIjc3JSI7CisgICAgY29sdW1u c1syXS50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiTG9jYXRpb24iKTsKKyAgICBjb2x1 bW5zWzJdLnNvcnRhYmxlID0gdHJ1ZTsKKyAgICBjb2x1bW5zWzJdLndpZHRoID0gIjIwJSI7CisK KyAgICBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuY2FsbCh0aGlzLCBjb2x1bW5zKTsKKyAgICB0aGlz LmVsZW1lbnQuYWRkU3R5bGVDbGFzcygiZmlsbCIpOworCisgICAgdGhpcy5fdHJhY2VMb2dJZCA9 IHRyYWNlTG9nSWQ7CisgICAgQ2FudmFzQWdlbnQuZ2V0VHJhY2VMb2codHJhY2VMb2dJZCwgdGhp cy5fZGlkUmVjZWl2ZVRyYWNlTG9nLmJpbmQodGhpcykpOworfQorCitXZWJJbnNwZWN0b3IuQ2Fu dmFzTG9nR3JpZC5wcm90b3R5cGUgPSB7CisKKyAgICBfZGlkUmVjZWl2ZVRyYWNlTG9nOiBmdW5j dGlvbihlcnJvciwgdHJhY2VMb2cpCisgICAgeworICAgICAgICB0aGlzLnJvb3ROb2RlKCkucmVt b3ZlQ2hpbGRyZW4oKTsKKyAgICAgICAgaWYgKGVycm9yIHx8ICF0cmFjZUxvZykKKyAgICAgICAg ICAgIHJldHVybjsKKworICAgICAgICB2YXIgZnJhZ21lbnQgPSBkb2N1bWVudC5jcmVhdGVEb2N1 bWVudEZyYWdtZW50KCk7CisgICAgICAgIHZhciBjYWxscyA9IHRyYWNlTG9nLmNhbGxzOworICAg ICAgICBmb3IgKHZhciBpID0gMCwgbiA9IGNhbGxzLmxlbmd0aDsgaSA8IG47ICsraSkKKyAgICAg ICAgICAgIHRoaXMucm9vdE5vZGUoKS5hcHBlbmRDaGlsZCh0aGlzLl9jcmVhdGVDYWxsTm9kZShp LCBjYWxsc1tpXSkpOworICAgICAgICB2YXIgbGFzdE5vZGUgPSB0aGlzLnJvb3ROb2RlKCkuY2hp bGRyZW5bY2FsbHMubGVuZ3RoIC0gMV07CisgICAgICAgIGxhc3ROb2RlLnJldmVhbCgpOworICAg ICAgICBsYXN0Tm9kZS5zZWxlY3QoKTsKKyAgICB9LAorCisgICAgX2NyZWF0ZUNhbGxOb2RlOiBm dW5jdGlvbihpbmRleCwgY2FsbCkKKyAgICB7CisgICAgICAgIHZhciB0cmFjZUxvZ0l0ZW0gPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICAgICAgdmFyIGRhdGEgPSB7fTsKKyAg ICAgICAgZGF0YVswXSA9IGluZGV4ICsgMTsKKyAgICAgICAgZGF0YVsxXSA9IGNhbGwuZnVuY3Rp b25OYW1lIHx8ICJjb250ZXh0LiIgKyBjYWxsLnByb3BlcnR5OworICAgICAgICBkYXRhWzJdID0g IiI7CisgICAgICAgIGlmIChjYWxsLnNvdXJjZVVSTCkgeworICAgICAgICAgICAgLy8gRklYTUUo NjI3MjUpOiBzdGFjayB0cmFjZSBsaW5lL2NvbHVtbiBudW1iZXJzIGFyZSBvbmUtYmFzZWQuCisg ICAgICAgICAgICB2YXIgbGluZU51bWJlciA9IE1hdGgubWF4KDAsIGNhbGwubGluZU51bWJlciAt IDEpIHx8IDA7CisgICAgICAgICAgICB2YXIgY29sdW1uTnVtYmVyID0gTWF0aC5tYXgoMCwgY2Fs bC5jb2x1bW5OdW1iZXIgLSAxKSB8fCAwOworICAgICAgICAgICAgZGF0YVsyXSA9IHRoaXMuX2xp bmtpZmllci5saW5raWZ5TG9jYXRpb24oY2FsbC5zb3VyY2VVUkwsIGxpbmVOdW1iZXIsIGNvbHVt bk51bWJlcik7CisgICAgICAgIH0KKworICAgICAgICBpZiAoY2FsbC5hcmd1bWVudHMpCisgICAg ICAgICAgICBkYXRhWzFdICs9ICIoIiArIGNhbGwuYXJndW1lbnRzLmpvaW4oIiwgIikgKyAiKSI7 CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGRhdGFbMV0gKz0gIiA9ICIgKyBjYWxsLnZhbHVl OworICAKKyAgICAgICAgaWYgKHR5cGVvZiBjYWxsLnJlc3VsdCAhPT0gInVuZGVmaW5lZCIpCisg ICAgICAgICAgICBkYXRhWzFdICs9ICIgPT4gIiArIGNhbGwucmVzdWx0OworCisgICAgICAgIHZh ciBub2RlID0gbmV3IFdlYkluc3BlY3Rvci5EYXRhR3JpZE5vZGUoZGF0YSk7CisgICAgICAgIG5v ZGUuY2FsbCA9IGNhbGw7CisgICAgICAgIG5vZGUuaW5kZXggPSBpbmRleDsKKyAgICAgICAgbm9k ZS5zZWxlY3RhYmxlID0gdHJ1ZTsKKyAgICAgICAgcmV0dXJuIG5vZGU7CisgICAgfSwKKworICAg IF9fcHJvdG9fXzogV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZQorfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EYXRhR3JpZC5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGF0YUdyaWQuanMKaW5kZXggNjZjMDI0ZDlh YTVjMjUzMDE4MTNlZTU1NTczMzE3NzY3NjhkZGRjYy4uNTBkMDQ2NDhjOTk5NjBmMGFjNjg2YWUz ZWUxYzJjMTBiYjUxNTFmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9EYXRhR3JpZC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0RhdGFHcmlkLmpzCkBAIC0xMjMyLDggKzEyMzIsMTIgQEAgV2ViSW5zcGVjdG9yLkRhdGFH cmlkTm9kZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmIChhbGlnbm1lbnQpCiAgICAgICAgICAg ICBjZWxsLmFkZFN0eWxlQ2xhc3MoYWxpZ25tZW50KTsKIAorICAgICAgICB2YXIgZGF0YSA9IHRo aXMuZGF0YVtjb2x1bW5JZGVudGlmaWVyXTsKICAgICAgICAgdmFyIGRpdiA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImRpdiIpOwotICAgICAgICBkaXYudGV4dENvbnRlbnQgPSB0aGlzLmRhdGFb Y29sdW1uSWRlbnRpZmllcl07CisgICAgICAgIGlmIChkYXRhIGluc3RhbmNlb2YgTm9kZSkKKyAg ICAgICAgICAgIGRpdi5hcHBlbmRDaGlsZChkYXRhKTsKKyAgICAgICAgZWxzZQorICAgICAgICAg ICAgZGl2LnRleHRDb250ZW50ID0gZGF0YTsKICAgICAgICAgY2VsbC5hcHBlbmRDaGlsZChkaXYp OwogCiAgICAgICAgIGlmIChjb2x1bW5JZGVudGlmaWVyID09PSB0aGlzLmRhdGFHcmlkLmRpc2Ns b3N1cmVDb2x1bW5JZGVudGlmaWVyKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL2NhbnZhc1Byb2ZpbGVyLmNzcyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvY2FudmFzUHJvZmlsZXIuY3NzCmluZGV4IGU3NjIwNjljMDczMmVjMmNm ZDBlOTViMDg4MjA0OWFmMjU1YTAyMjQuLjczOThhNWY2MTEzOTE4ZjU5NzYxODVhMGI3MTc0Yzdl OWJiNGEzYjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv Y2FudmFzUHJvZmlsZXIuY3NzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvY2FudmFzUHJvZmlsZXIuY3NzCkBAIC0zNywyNiArMzcsMTIgQEAKICAgICBib3R0b206IDA7 CiB9CiAKLS5jYW52YXMtcHJvZmlsZS12aWV3IC5zcGxpdC12aWV3LXJlc2l6ZXIgewotICAgIGJh Y2tncm91bmQ6IHJnYigxMjgsIDEyOCwgMTI4KTsKLX0KLQotLmNhbnZhcy10cmFjZS1sb2cgewot ICAgIGZvbnQtc2l6ZTogMTNweDsKLSAgICBvdmVyZmxvdzogYXV0bzsKLSAgICB3aGl0ZS1zcGFj ZTogbm93cmFwOwotICAgIHBhZGRpbmc6IDVweDsKLX0KLQotLmNhbnZhcy10cmFjZS1sb2cgZGl2 IHsKLSAgICBwYWRkaW5nLWJvdHRvbTogNHB4OwotfQotCiAjY2FudmFzLXJlcGxheS1pbWFnZS1j b250YWluZXIgewogICAgIHRleHQtYWxpZ246IGNlbnRlcjsKICAgICBiYWNrZ3JvdW5kLWNvbG9y OiBibGFjazsKICAgICBvdmVyZmxvdzogaGlkZGVuOwogICAgIHBhZGRpbmc6IDVweDsKKyAgICBj b2xvcjogd2hpdGU7CiB9CiAKICNjYW52YXMtcmVwbGF5LWltYWdlIHsK