57749 2011-04-04 02:52:13 -0700 Web Inspector: Highlighted search tokens would not be shown on long lines in the text viewer 2011-04-04 05:40:32 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 aandrey webkit-unassigned apavlov bweinstein joepeck keishi loislo pfeldman pmuellr podivilov rik yurys oldest_to_newest 378718 0 aandrey 2011-04-04 02:52:13 -0700 Search tokens may not be shown if the editor is busy with highlighting the lines (i.e. scrollIntoViewIfNeeded() is not called). 378727 1 88048 aandrey 2011-04-04 04:25:51 -0700 Created attachment 88048 Patch 378737 2 88048 yurys 2011-04-04 05:17:44 -0700 Comment on attachment 88048 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=88048&action=review > Source/WebCore/inspector/front-end/TextViewer.js:1029 > + if (this._rangeToMark && this._rangeToMark.startLine === lineNumber) Consider refactoring this method and extracting syntax highlight and search result highlight into separate methods. 378742 3 88048 podivilov 2011-04-04 05:40:23 -0700 Comment on attachment 88048 Patch Clearing flags on attachment: 88048 Committed r82824: <http://trac.webkit.org/changeset/82824> 378743 4 podivilov 2011-04-04 05:40:32 -0700 All reviewed patches have been landed. Closing bug. 88048 2011-04-04 04:25:51 -0700 2011-04-04 05:40:23 -0700 Patch patch.txt text/plain 4508 aandrey Y29tbWl0IGJjNWJmZDUyZmMwN2VhNDA3YzI4OTY0MDdmYWEwMGQzMWQ5YzkzMWIKQXV0aG9yOiBB bmRyZXkgQWRhaWtpbiA8YWFuZHJleUBnb29nbGUuY29tPgpEYXRlOiAgIE1vbiBBcHIgNCAxMzo0 ODowOCAyMDExICswNDAwCgogICAgLgoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4ZGNhOGNkLi4zMGJmNDEyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDQtMDQgIEFuZHJleSBBZGFpa2luICA8 YWFuZHJleUBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEhpZ2hsaWdodGVkIHNlYXJjaCB0b2tlbnMgd291 bGQgbm90IGJlIHNob3duIG9uIGxvbmcgbGluZXMgaW4gdGhlIHRleHQgdmlld2VyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Nzc0OQorCisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBlLm1hcmtBbmRSZXZlYWxSYW5nZSk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5wcm90b3R5cGUuX3BhaW50 TGluZSk6CisKIDIwMTEtMDQtMDQgIE5pY28gV2ViZXIgIDx0aGFraXNAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzCmluZGV4IGI2ZTc1Y2YuLmZmMDIxMTQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dFZpZXdl ci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRWaWV3ZXIu anMKQEAgLTc3NCwxNCArNzc0LDI1IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVs LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIGlmICh0aGlzLl9yYW5nZVRvTWFyaykgewog ICAgICAgICAgICAgdmFyIG1hcmtlZExpbmUgPSB0aGlzLl9yYW5nZVRvTWFyay5zdGFydExpbmU7 Ci0gICAgICAgICAgICB0aGlzLl9yYW5nZVRvTWFyayA9IG51bGw7Ci0gICAgICAgICAgICB0aGlz Ll9wYWludExpbmVzKG1hcmtlZExpbmUsIG1hcmtlZExpbmUgKyAxKTsKKyAgICAgICAgICAgIGRl bGV0ZSB0aGlzLl9yYW5nZVRvTWFyazsKKyAgICAgICAgICAgIC8vIFJlbW92ZSB0aGUgbWFya2Vk IHJlZ2lvbiBpbW1lZGlhdGVseS4KKyAgICAgICAgICAgIGlmICghdGhpcy5fZGlydHlMaW5lcykg eworICAgICAgICAgICAgICAgIHRoaXMuYmVnaW5Eb21VcGRhdGVzKCk7CisgICAgICAgICAgICAg ICAgdmFyIGNodW5rID0gdGhpcy5jaHVua0ZvckxpbmUobWFya2VkTGluZSk7CisgICAgICAgICAg ICAgICAgdmFyIHdhc0V4cGFuZGVkID0gY2h1bmsuZXhwYW5kZWQ7CisgICAgICAgICAgICAgICAg Y2h1bmsuZXhwYW5kZWQgPSBmYWxzZTsKKyAgICAgICAgICAgICAgICBjaHVuay51cGRhdGVDb2xs YXBzZWRMaW5lUm93KCk7CisgICAgICAgICAgICAgICAgY2h1bmsuZXhwYW5kZWQgPSB3YXNFeHBh bmRlZDsKKyAgICAgICAgICAgICAgICB0aGlzLmVuZERvbVVwZGF0ZXMoKTsKKyAgICAgICAgICAg IH0gZWxzZQorICAgICAgICAgICAgICAgIHRoaXMuX3BhaW50TGluZXMobWFya2VkTGluZSwgbWFy a2VkTGluZSArIDEpOwogICAgICAgICB9CiAKICAgICAgICAgaWYgKHJhbmdlKSB7CiAgICAgICAg ICAgICB0aGlzLl9yYW5nZVRvTWFyayA9IHJhbmdlOwogICAgICAgICAgICAgdGhpcy5yZXZlYWxM aW5lKHJhbmdlLnN0YXJ0TGluZSk7Ci0gICAgICAgICAgICB0aGlzLl9wYWludExpbmVzKHJhbmdl LnN0YXJ0TGluZSwgcmFuZ2Uuc3RhcnRMaW5lICsgMSk7CisgICAgICAgICAgICB2YXIgY2h1bmsg PSB0aGlzLm1ha2VMaW5lQUNodW5rKHJhbmdlLnN0YXJ0TGluZSk7CisgICAgICAgICAgICB0aGlz Ll9wYWludExpbmUoY2h1bmsuZWxlbWVudCk7CiAgICAgICAgICAgICBpZiAodGhpcy5fbWFya2Vk UmFuZ2VFbGVtZW50KQogICAgICAgICAgICAgICAgIHRoaXMuX21hcmtlZFJhbmdlRWxlbWVudC5z Y3JvbGxJbnRvVmlld0lmTmVlZGVkKCk7CiAgICAgICAgIH0KQEAgLTk2MywyMCArOTc0LDIyIEBA IFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZSA9IHsKICAgICBfcGFp bnRMaW5lOiBmdW5jdGlvbihsaW5lUm93KQogICAgIHsKICAgICAgICAgdmFyIGxpbmVOdW1iZXIg PSBsaW5lUm93LmxpbmVOdW1iZXI7Ci0gICAgICAgIGlmICh0aGlzLl9kaXJ0eUxpbmVzIHx8IHRo aXMuX3NjaGVkdWxlZFBhaW50TGluZXMgfHwgdGhpcy5fcGFpbnRMaW5lc09wZXJhdGlvbnNDcmVk aXQgPCAwKSB7CisgICAgICAgIGlmICh0aGlzLl9kaXJ0eUxpbmVzKSB7CiAgICAgICAgICAgICB0 aGlzLl9zY2hlZHVsZVBhaW50TGluZXMobGluZU51bWJlciwgbGluZU51bWJlciArIDEpOwogICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKICAgICAgICAgdGhpcy5iZWdpbkRvbVVwZGF0 ZXMoKTsKICAgICAgICAgdHJ5IHsKLSAgICAgICAgICAgIHZhciBoaWdobGlnaHQgPSB0aGlzLl90 ZXh0TW9kZWwuZ2V0QXR0cmlidXRlKGxpbmVOdW1iZXIsICJoaWdobGlnaHQiKTsKLSAgICAgICAg ICAgIGlmICghaGlnaGxpZ2h0KSB7Ci0gICAgICAgICAgICAgICAgaWYgKHRoaXMuX3JhbmdlVG9N YXJrICYmIHRoaXMuX3JhbmdlVG9NYXJrLnN0YXJ0TGluZSA9PT0gbGluZU51bWJlcikKLSAgICAg ICAgICAgICAgICAgICAgdGhpcy5fbWFya2VkUmFuZ2VFbGVtZW50ID0gaGlnaGxpZ2h0U2VhcmNo UmVzdWx0KGxpbmVSb3csIHRoaXMuX3JhbmdlVG9NYXJrLnN0YXJ0Q29sdW1uLCB0aGlzLl9yYW5n ZVRvTWFyay5lbmRDb2x1bW4gLSB0aGlzLl9yYW5nZVRvTWFyay5zdGFydENvbHVtbik7CisgICAg ICAgICAgICBpZiAodGhpcy5fc2NoZWR1bGVkUGFpbnRMaW5lcyB8fCB0aGlzLl9wYWludExpbmVz T3BlcmF0aW9uc0NyZWRpdCA8IDApIHsKKyAgICAgICAgICAgICAgICB0aGlzLl9zY2hlZHVsZVBh aW50TGluZXMobGluZU51bWJlciwgbGluZU51bWJlciArIDEpOwogICAgICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgICAgIH0KIAorICAgICAgICAgICAgdmFyIGhpZ2hsaWdodCA9IHRoaXMu X3RleHRNb2RlbC5nZXRBdHRyaWJ1dGUobGluZU51bWJlciwgImhpZ2hsaWdodCIpOworICAgICAg ICAgICAgaWYgKCFoaWdobGlnaHQpCisgICAgICAgICAgICAgICAgcmV0dXJuOworCiAgICAgICAg ICAgICBsaW5lUm93LnJlbW92ZUNoaWxkcmVuKCk7CiAgICAgICAgICAgICB2YXIgbGluZSA9IHRo aXMuX3RleHRNb2RlbC5saW5lKGxpbmVOdW1iZXIpOwogICAgICAgICAgICAgaWYgKCFsaW5lKQpA QCAtMTAxMCwxMSArMTAyMywxMSBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5w cm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgdGhpcy5fYXBwZW5kVGV4dE5vZGUobGluZVJv dywgbGluZS5zdWJzdHJpbmcocGxhaW5UZXh0U3RhcnQsIGxpbmUubGVuZ3RoKSk7CiAgICAgICAg ICAgICAgICAgLS10aGlzLl9wYWludExpbmVzT3BlcmF0aW9uc0NyZWRpdDsKICAgICAgICAgICAg IH0KLSAgICAgICAgICAgIGlmICh0aGlzLl9yYW5nZVRvTWFyayAmJiB0aGlzLl9yYW5nZVRvTWFy ay5zdGFydExpbmUgPT09IGxpbmVOdW1iZXIpCi0gICAgICAgICAgICAgICAgdGhpcy5fbWFya2Vk UmFuZ2VFbGVtZW50ID0gaGlnaGxpZ2h0U2VhcmNoUmVzdWx0KGxpbmVSb3csIHRoaXMuX3Jhbmdl VG9NYXJrLnN0YXJ0Q29sdW1uLCB0aGlzLl9yYW5nZVRvTWFyay5lbmRDb2x1bW4gLSB0aGlzLl9y YW5nZVRvTWFyay5zdGFydENvbHVtbik7CiAgICAgICAgICAgICBpZiAobGluZVJvdy5kZWNvcmF0 aW9uc0VsZW1lbnQpCiAgICAgICAgICAgICAgICAgbGluZVJvdy5hcHBlbmRDaGlsZChsaW5lUm93 LmRlY29yYXRpb25zRWxlbWVudCk7CiAgICAgICAgIH0gZmluYWxseSB7CisgICAgICAgICAgICBp ZiAodGhpcy5fcmFuZ2VUb01hcmsgJiYgdGhpcy5fcmFuZ2VUb01hcmsuc3RhcnRMaW5lID09PSBs aW5lTnVtYmVyKQorICAgICAgICAgICAgICAgIHRoaXMuX21hcmtlZFJhbmdlRWxlbWVudCA9IGhp Z2hsaWdodFNlYXJjaFJlc3VsdChsaW5lUm93LCB0aGlzLl9yYW5nZVRvTWFyay5zdGFydENvbHVt biwgdGhpcy5fcmFuZ2VUb01hcmsuZW5kQ29sdW1uIC0gdGhpcy5fcmFuZ2VUb01hcmsuc3RhcnRD b2x1bW4pOwogICAgICAgICAgICAgdGhpcy5lbmREb21VcGRhdGVzKCk7CiAgICAgICAgIH0KICAg ICB9LAo=