81932 2012-03-22 10:04:22 -0700 Web Inspector: text gutter decorations should move upon edits. 2012-03-22 12:11:22 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 585421 0 pfeldman 2012-03-22 10:04:22 -0700 Decorations set by the line number now shift as editing inserts / removes lines. 585422 1 133285 pfeldman 2012-03-22 10:06:25 -0700 Created attachment 133285 Patch 585574 2 133285 vsevik 2012-03-22 12:09:31 -0700 Comment on attachment 133285 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=133285&action=review > Source/WebCore/inspector/front-end/TextViewer.js:688 > + if (isNaN(lineNumber)) It's not an array. > Source/WebCore/inspector/front-end/TextViewer.js:701 > + // Do not move decorations after the end position. Do not restore 585581 3 pfeldman 2012-03-22 12:11:22 -0700 Committed r111743: <http://trac.webkit.org/changeset/111743> 133285 2012-03-22 10:06:25 -0700 2012-03-22 12:09:31 -0700 Patch bug-81932-20120322210623.patch text/plain 4801 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNjgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2Q3Yjg3YjAwOThkNTkx MzljODA4NzNkYTMwODllNTI5ZTAwYWMyZi4uYzAyZTJjYWIzZGEyM2M4MWI5Y2MyMTI2NDMxMmNk YjJmNDJjYjdjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIyIEBACiAyMDEyLTAzLTIyICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHRleHQgZ3V0dGVyIGRlY29yYXRpb25zIHNob3VsZCBtb3ZlIHVwb24gZWRpdHMuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTkzMgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERlY29yYXRpb25zIHNl dCBieSB0aGUgbGluZSBudW1iZXIgbm93IHNoaWZ0IGFzIGVkaXRpbmcgaW5zZXJ0cyAvIHJlbW92 ZXMgbGluZXMuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRWaWV3ZXIuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dFZpZXdlci5wcm90b3R5cGUuX3N5bmNMaW5lSGVp Z2h0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yR3V0dGVyUGFuZWwpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JHdXR0ZXJQYW5lbC5wcm90b3R5cGUudGV4dENo YW5nZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JHdXR0ZXJQYW5lbC5wcm90 b3R5cGUuc3luY0NsaWVudEhlaWdodCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRv ckd1dHRlclBhbmVsLnByb3RvdHlwZS5hZGREZWNvcmF0aW9uKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5UZXh0RWRpdG9yR3V0dGVyUGFuZWwucHJvdG90eXBlLnJlbW92ZURlY29yYXRpb24pOgor CisyMDEyLTAzLTIyICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCiAg ICAgICAgIFdlYiBJbnNwZWN0b3I6IG1ha2UgQ1NTIGFuZCBKYXZhU2NyaXB0IGZpbGVzIGVkaXRh YmxlIGJ5IGRlZmF1bHQuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD04MTc4NwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1RleHRWaWV3ZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1RleHRWaWV3ZXIuanMKaW5kZXggOGI5YWM1NzViMTdjMmEwNjliMjE2ODFkOTc4ZDFkOWM0MDY1 NzVlOC4uZWE4NDMzNjYxMDM3ZDE1ZDlkNDM4MDNkOGE2MzdmZWU2MjMxNWMyMSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dFZpZXdlci5qcwpAQCAtMjM2 LDcgKzIzNiw4IEBAIFdlYkluc3BlY3Rvci5UZXh0Vmlld2VyLnByb3RvdHlwZSA9IHsKICAgICAg ICAgfQogICAgIH0sCiAKLSAgICBfc3luY0xpbmVIZWlnaHQ6IGZ1bmN0aW9uKGd1dHRlclJvdykg eworICAgIF9zeW5jTGluZUhlaWdodDogZnVuY3Rpb24oZ3V0dGVyUm93KQorICAgIHsKICAgICAg ICAgaWYgKHRoaXMuX2xpbmVIZWlnaHRTeW5jZWQpCiAgICAgICAgICAgICByZXR1cm47CiAgICAg ICAgIGlmIChndXR0ZXJSb3cgJiYgZ3V0dGVyUm93Lm9mZnNldEhlaWdodCkgewpAQCAtNjM5LDYg KzY0MCw3IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yR3V0dGVyUGFuZWwgPSBmdW5jdGlvbih0 ZXh0TW9kZWwsIHN5bmNEZWNvcmF0aW9uc0ZvckxpbmVMCiAKICAgICB0aGlzLmZyZWVDYWNoZWRF bGVtZW50cygpOwogICAgIHRoaXMuX2J1aWxkQ2h1bmtzKCk7CisgICAgdGhpcy5fZGVjb3JhdGlv bnMgPSB7fTsKIH0KIAogV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JHdXR0ZXJQYW5lbC5wcm90b3R5 cGUgPSB7CkBAIC02NzQsMTEgKzY3NiwzNiBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckd1dHRl clBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICB2YXIgbGFzdENodW5rID0gdGhp cy5fdGV4dENodW5rc1t0aGlzLl90ZXh0Q2h1bmtzLmxlbmd0aCAtIDFdOwogICAgICAgICAgICAg ICAgIHRvdGFsTGluZXMgPSBsYXN0Q2h1bmsuc3RhcnRMaW5lICsgbGFzdENodW5rLmxpbmVzQ291 bnQ7CiAgICAgICAgICAgICB9CisKICAgICAgICAgICAgIGZvciAodmFyIGkgPSB0b3RhbExpbmVz OyBpIDwgdGhpcy5fdGV4dE1vZGVsLmxpbmVzQ291bnQ7IGkgKz0gdGhpcy5fZGVmYXVsdENodW5r U2l6ZSkgewogICAgICAgICAgICAgICAgIHZhciBjaHVuayA9IHRoaXMuX2NyZWF0ZU5ld0NodW5r KGksIGkgKyB0aGlzLl9kZWZhdWx0Q2h1bmtTaXplKTsKICAgICAgICAgICAgICAgICB0aGlzLl90 ZXh0Q2h1bmtzLnB1c2goY2h1bmspOwogICAgICAgICAgICAgICAgIHRoaXMuX2NvbnRhaW5lci5h cHBlbmRDaGlsZChjaHVuay5lbGVtZW50KTsKICAgICAgICAgICAgIH0KKworICAgICAgICAgICAg Ly8gU2hpZnQgZGVjb3JhdGlvbnMgaWYgbmVjZXNzYXJ5CisgICAgICAgICAgICBmb3IgKHZhciBs aW5lTnVtYmVyIGluIHRoaXMuX2RlY29yYXRpb25zKSB7CisgICAgICAgICAgICAgICAgaWYgKGlz TmFOKGxpbmVOdW1iZXIpKQorICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAg ICAgICAgICBsaW5lTnVtYmVyID0gcGFyc2VJbnQobGluZU51bWJlciwgMTApOworCisgICAgICAg ICAgICAgICAgLy8gRG8gbm90IG1vdmUgZGVjb3JhdGlvbnMgYmVmb3JlIHRoZSBzdGFydCBwb3Np dGlvbi4KKyAgICAgICAgICAgICAgICBpZiAobGluZU51bWJlciA8IG9sZFJhbmdlLnN0YXJ0TGlu ZSkKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisKKyAgICAgICAgICAgICAgICB2YXIg bGluZURlY29yYXRpb25zQ29weSA9IHRoaXMuX2RlY29yYXRpb25zW2xpbmVOdW1iZXJdLnNsaWNl KCk7CisgICAgICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBsaW5lRGVjb3JhdGlvbnND b3B5Lmxlbmd0aDsgKytpKSB7CisgICAgICAgICAgICAgICAgICAgIHZhciBkZWNvcmF0aW9uID0g bGluZURlY29yYXRpb25zQ29weVtpXTsKKyAgICAgICAgICAgICAgICAgICAgdGhpcy5yZW1vdmVE ZWNvcmF0aW9uKGxpbmVOdW1iZXIsIGRlY29yYXRpb24pOworCisgICAgICAgICAgICAgICAgICAg IC8vIERvIG5vdCBtb3ZlIGRlY29yYXRpb25zIGFmdGVyIHRoZSBlbmQgcG9zaXRpb24uCisgICAg ICAgICAgICAgICAgICAgIGlmIChsaW5lTnVtYmVyIDwgb2xkUmFuZ2UuZW5kTGluZSkKKyAgICAg ICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAgICAgICAgICAgICAgIHRoaXMu YWRkRGVjb3JhdGlvbihsaW5lTnVtYmVyICsgbGluZXNEaWZmLCBkZWNvcmF0aW9uKTsKKyAgICAg ICAgICAgICAgICB9CisgICAgICAgICAgICB9CisKICAgICAgICAgICAgIHRoaXMuX3JlcGFpbnRB bGwoKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIC8vIERlY29yYXRpb25zIG1heSBo YXZlIGJlZW4gcmVtb3ZlZCwgc28gd2UgbWF5IGhhdmUgdG8gc3luYyB0aG9zZSBsaW5lcy4KQEAg LTcwMCw2ICs3MjcsMjggQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JHdXR0ZXJQYW5lbC5wcm90 b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl9jb250YWluZXIuc3R5bGUuc2V0UHJvcGVydHko InBhZGRpbmctYm90dG9tIiwgKHRoaXMuZWxlbWVudC5vZmZzZXRIZWlnaHQgLSBjbGllbnRIZWln aHQpICsgInB4Iik7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIHRoaXMuX2NvbnRhaW5lci5z dHlsZS5yZW1vdmVQcm9wZXJ0eSgicGFkZGluZy1ib3R0b20iKTsKKyAgICB9LAorCisgICAgYWRk RGVjb3JhdGlvbjogZnVuY3Rpb24obGluZU51bWJlciwgZGVjb3JhdGlvbikKKyAgICB7CisgICAg ICAgIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yQ2h1bmtlZFBhbmVsLnByb3RvdHlwZS5hZGREZWNv cmF0aW9uLmNhbGwodGhpcywgbGluZU51bWJlciwgZGVjb3JhdGlvbik7CisgICAgICAgIHZhciBk ZWNvcmF0aW9ucyA9IHRoaXMuX2RlY29yYXRpb25zW2xpbmVOdW1iZXJdOworICAgICAgICBpZiAo IWRlY29yYXRpb25zKSB7CisgICAgICAgICAgICBkZWNvcmF0aW9ucyA9IFtdOworICAgICAgICAg ICAgdGhpcy5fZGVjb3JhdGlvbnNbbGluZU51bWJlcl0gPSBkZWNvcmF0aW9uczsKKyAgICAgICAg fQorICAgICAgICBkZWNvcmF0aW9ucy5wdXNoKGRlY29yYXRpb24pOworICAgIH0sCisKKyAgICBy ZW1vdmVEZWNvcmF0aW9uOiBmdW5jdGlvbihsaW5lTnVtYmVyLCBkZWNvcmF0aW9uKQorICAgIHsK KyAgICAgICAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JDaHVua2VkUGFuZWwucHJvdG90eXBlLnJl bW92ZURlY29yYXRpb24uY2FsbCh0aGlzLCBsaW5lTnVtYmVyLCBkZWNvcmF0aW9uKTsKKyAgICAg ICAgdmFyIGRlY29yYXRpb25zID0gdGhpcy5fZGVjb3JhdGlvbnNbbGluZU51bWJlcl07CisgICAg ICAgIGlmIChkZWNvcmF0aW9ucykgeworICAgICAgICAgICAgZGVjb3JhdGlvbnMucmVtb3ZlKGRl Y29yYXRpb24pOworICAgICAgICAgICAgaWYgKCFkZWNvcmF0aW9ucy5sZW5ndGgpCisgICAgICAg ICAgICAgICAgZGVsZXRlIHRoaXMuX2RlY29yYXRpb25zW2xpbmVOdW1iZXJdOworICAgICAgICB9 CiAgICAgfQogfQogCg==