[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
podivilov at chromium.org
podivilov at chromium.org
Sun Feb 20 22:51:21 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit ecd0a7066a0071ac060605f839b9814be1587b67
Author: podivilov at chromium.org <podivilov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jan 12 12:55:40 2011 +0000
2011-01-12 Pavel Podivilov <podivilov at chromium.org>
Reviewed by Pavel Feldman.
Web Inspector: do not replace all tabs with spaces when editing script source
https://bugs.webkit.org/show_bug.cgi?id=52291
* inspector/front-end/SourceFrame.js:
(WebInspector.SourceFrame.prototype.setContent):
(WebInspector.SourceFrame.prototype._editLine):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75601 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 7591a68..bc55e27 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-12 Pavel Podivilov <podivilov at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: do not replace all tabs with spaces when editing script source
+ https://bugs.webkit.org/show_bug.cgi?id=52291
+
+ * inspector/front-end/SourceFrame.js:
+ (WebInspector.SourceFrame.prototype.setContent):
+ (WebInspector.SourceFrame.prototype._editLine):
+
2011-01-11 Jeremy Orlow <jorlow at chromium.org>
Reviewed by Nate Chapin.
diff --git a/Source/WebCore/inspector/front-end/SourceFrame.js b/Source/WebCore/inspector/front-end/SourceFrame.js
index 74cc85c..42c98f5 100644
--- a/Source/WebCore/inspector/front-end/SourceFrame.js
+++ b/Source/WebCore/inspector/front-end/SourceFrame.js
@@ -144,6 +144,7 @@ WebInspector.SourceFrame.prototype = {
this._loaded = true;
this._textModel.setText(null, content);
this._mimeType = mimeType;
+ this._content = content;
this._url = url;
this._createViewerIfNeeded();
},
@@ -802,11 +803,12 @@ WebInspector.SourceFrame.prototype = {
lineNumber += 1;
var lines = [];
- for (var i = 0; i < this._textModel.linesCount; ++i) {
+ var oldLines = this._content.split('\n');
+ for (var i = 0; i < oldLines.length; ++i) {
if (i === lineNumber - 1)
lines.push(newContent);
else
- lines.push(this._textModel.line(i));
+ lines.push(oldLines[i]);
}
var editData = {};
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list