187703 2018-07-16 10:41:28 -0700 Web Inspector: Fix execution highlighting after r233820 2018-07-16 13:07:01 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 mattbaker mattbaker commit-queue inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1442420 0 mattbaker 2018-07-16 10:41:28 -0700 Summary: Fix execution highlighting after r233820. In https://webkit.org/b/187613, the arguments to TextEditor.prototype.getTextInRange were changed to SourceCodePosition instead of CodeMirror.Pos. A call site in SourceCodeTextEditor was missed. 1442421 1 webkit-bug-importer 2018-07-16 10:42:07 -0700 <rdar://problem/42246167> 1442423 2 345099 mattbaker 2018-07-16 10:43:53 -0700 Created attachment 345099 Patch 1442473 3 345099 joepeck 2018-07-16 12:39:58 -0700 Comment on attachment 345099 Patch rs=me 1442489 4 345099 commit-queue 2018-07-16 13:06:59 -0700 Comment on attachment 345099 Patch Clearing flags on attachment: 345099 Committed r233861: <https://trac.webkit.org/changeset/233861> 1442490 5 commit-queue 2018-07-16 13:07:01 -0700 All reviewed patches have been landed. Closing bug. 345099 2018-07-16 10:43:53 -0700 2018-07-16 13:06:59 -0700 Patch bug-187703-20180716104352.patch text/plain 3827 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzODQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBh YjU2NWE5ZTlkMzBjYzlmNjRiNmQ3OTczMGE4OTgzMmUyMTMyY2MyLi44OTA5ZDFlYzFmNGJiOTdj YzhlYzM0Mjg4MDIzOTNlZmI5ZTU0MmI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAxOC0wNy0xNiAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRml4IGV4ZWN1dGlvbiBoaWdobGlnaHRpbmcgYWZ0 ZXIgcjIzMzgyMAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTg3NzAzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80MjI0NjE2Nz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvU291cmNlQ29kZVRleHRFZGl0b3IuanM6CisgICAgICAgIChXSS5Tb3VyY2VDb2RlVGV4dEVk aXRvci5wcm90b3R5cGUudGV4dEVkaXRvckV4ZWN1dGlvbkhpZ2hsaWdodFJhbmdlKToKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RleHRFZGl0b3IuanM6CisgICAgICAgIChXSS5UZXh0 RWRpdG9yLnByb3RvdHlwZS5jdXJyZW50UG9zaXRpb25Ub09yaWdpbmFsUG9zaXRpb24pOgorICAg ICAgICAoV0kuVGV4dEVkaXRvci5wcm90b3R5cGUuX3VwZGF0ZUV4ZWN1dGlvblJhbmdlSGlnaGxp Z2h0KToKKwogMjAxOC0wNy0xNiAgTmlraXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNv bT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBEYXJrIE1vZGU6IENvbnNvbGUgZmlsdGVyIGZp ZWxkIGJ1dHRvbnMgc2hvdWxkIGJlIGRhcmtlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRleHRFZGl0b3IuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VDb2RlVGV4dEVkaXRv ci5qcwppbmRleCAzN2Q0ZTRiNjI2NDI5YWFkYWZhYjI4OTUwODI2OGJmNTBlMzhiMDg1Li5lNWIy YzZiYmMxNWUyNDI5OWZjMDkwZTgwMTMzZGMzMGQ0MWQ4OThjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VDb2RlVGV4dEVkaXRvci5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VD b2RlVGV4dEVkaXRvci5qcwpAQCAtMTQxMyw4ICsxNDEzLDcgQEAgV0kuU291cmNlQ29kZVRleHRF ZGl0b3IgPSBjbGFzcyBTb3VyY2VDb2RlVGV4dEVkaXRvciBleHRlbmRzIFdJLlRleHRFZGl0b3IK IAogICAgIHRleHRFZGl0b3JFeGVjdXRpb25IaWdobGlnaHRSYW5nZShjdXJyZW50UG9zaXRpb24s IGNhbGxiYWNrKQogICAgIHsKLSAgICAgICAgbGV0IHtsaW5lLCBjaH0gPSB0aGlzLmN1cnJlbnRQ b3NpdGlvblRvT3JpZ2luYWxQb3NpdGlvbihjdXJyZW50UG9zaXRpb24pOwotICAgICAgICBsZXQg cG9zaXRpb24gPSBuZXcgV0kuU291cmNlQ29kZVBvc2l0aW9uKGxpbmUsIGNoKTsKKyAgICAgICAg bGV0IHBvc2l0aW9uID0gdGhpcy5jdXJyZW50UG9zaXRpb25Ub09yaWdpbmFsUG9zaXRpb24oY3Vy cmVudFBvc2l0aW9uKTsKIAogICAgICAgICBsZXQgc2NyaXB0ID0gdGhpcy5fZ2V0QXNzb2NpYXRl ZFNjcmlwdChwb3NpdGlvbik7CiAgICAgICAgIGlmICghc2NyaXB0KSB7CkBAIC0xNDkxLDcgKzE0 OTAsNyBAQCBXSS5Tb3VyY2VDb2RlVGV4dEVkaXRvciA9IGNsYXNzIFNvdXJjZUNvZGVUZXh0RWRp dG9yIGV4dGVuZHMgV0kuVGV4dEVkaXRvcgogICAgICAgICAgICAgICAgIHJldHVybiBhTGVuZ3Ro IC0gYkxlbmd0aDsKICAgICAgICAgICAgIH0pOwogCi0gICAgICAgICAgICBsZXQgY2hhcmFjdGVy QXRQb3NpdGlvbiA9IHRoaXMuZ2V0VGV4dEluUmFuZ2UoY3VycmVudFBvc2l0aW9uLCB7bGluZTog Y3VycmVudFBvc2l0aW9uLmxpbmUsIGNoOiBjdXJyZW50UG9zaXRpb24uY2ggKyAxfSk7CisgICAg ICAgICAgICBsZXQgY2hhcmFjdGVyQXRQb3NpdGlvbiA9IHRoaXMuZ2V0VGV4dEluUmFuZ2UoY3Vy cmVudFBvc2l0aW9uLCBjdXJyZW50UG9zaXRpb24ub2Zmc2V0Q29sdW1uKDEpKTsKICAgICAgICAg ICAgIGxldCBjaGFyYWN0ZXJBdFBvc2l0aW9uSXNEb3RPckJyYWNrZXQgPSBjaGFyYWN0ZXJBdFBv c2l0aW9uID09PSAiLiIgfHwgY2hhcmFjdGVyQXRQb3NpdGlvbiA9PT0gIlsiOwogCiAgICAgICAg ICAgICBmb3IgKGxldCBpID0gMDsgaSA8IG5vZGVzLmxlbmd0aDsgKytpKSB7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UZXh0RWRpdG9yLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGV4dEVkaXRvci5q cwppbmRleCBlNTg5NmZlYWNmYzU3ZDFhYWI4ZGY5ZWIxNzkwNGJhNDQwZjAzNTVhLi5jOTY2MGM3 NTgyZjI4ZjM4MTI4YjU3ZTJmODE4ZTNjOTEyNTc0N2I5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UZXh0RWRpdG9yLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RleHRFZGl0b3IuanMKQEAgLTc4 NCw4ICs3ODQsOCBAQCBXSS5UZXh0RWRpdG9yID0gY2xhc3MgVGV4dEVkaXRvciBleHRlbmRzIFdJ LlZpZXcKICAgICAgICAgaWYgKCF0aGlzLl9mb3JtYXR0ZXJTb3VyY2VNYXApCiAgICAgICAgICAg ICByZXR1cm4gcG9zaXRpb247CiAKLSAgICAgICAgbGV0IGxvY2F0aW9uID0gdGhpcy5fZm9ybWF0 dGVyU291cmNlTWFwLmZvcm1hdHRlZFRvT3JpZ2luYWwocG9zaXRpb24ubGluZSwgcG9zaXRpb24u Y2gpOwotICAgICAgICByZXR1cm4ge2xpbmU6IGxvY2F0aW9uLmxpbmVOdW1iZXIsIGNoOiBsb2Nh dGlvbi5jb2x1bW5OdW1iZXJ9OworICAgICAgICBsZXQgbG9jYXRpb24gPSB0aGlzLl9mb3JtYXR0 ZXJTb3VyY2VNYXAuZm9ybWF0dGVkVG9PcmlnaW5hbChwb3NpdGlvbi5saW5lTnVtYmVyLCBwb3Np dGlvbi5jb2x1bW5OdW1iZXIpOworICAgICAgICByZXR1cm4gbmV3IFdJLlNvdXJjZUNvZGVQb3Np dGlvbihsb2NhdGlvbi5saW5lTnVtYmVyLCBsb2NhdGlvbi5jb2x1bW5OdW1iZXIpOwogICAgIH0K IAogICAgIGN1cnJlbnRQb3NpdGlvblRvQ3VycmVudE9mZnNldChwb3NpdGlvbikKQEAgLTEzMjMs NyArMTMyMyw3IEBAIFdJLlRleHRFZGl0b3IgPSBjbGFzcyBUZXh0RWRpdG9yIGV4dGVuZHMgV0ku VmlldwogICAgICAgICBpZiAoaXNOYU4odGhpcy5fZXhlY3V0aW9uTGluZU51bWJlcikpCiAgICAg ICAgICAgICByZXR1cm47CiAKLSAgICAgICAgbGV0IGN1cnJlbnRQb3NpdGlvbiA9IHtsaW5lOiB0 aGlzLl9leGVjdXRpb25MaW5lTnVtYmVyLCBjaDogdGhpcy5fZXhlY3V0aW9uQ29sdW1uTnVtYmVy fTsKKyAgICAgICAgbGV0IGN1cnJlbnRQb3NpdGlvbiA9IG5ldyBXSS5Tb3VyY2VDb2RlUG9zaXRp b24odGhpcy5fZXhlY3V0aW9uTGluZU51bWJlciwgdGhpcy5fZXhlY3V0aW9uQ29sdW1uTnVtYmVy KTsKIAogICAgICAgICB0aGlzLl9kZWxlZ2F0ZS50ZXh0RWRpdG9yRXhlY3V0aW9uSGlnaGxpZ2h0 UmFuZ2UoY3VycmVudFBvc2l0aW9uLCAocmFuZ2UpID0+IHsKICAgICAgICAgICAgIGxldCBzdGFy dCwgZW5kOwo=