Modified: trunk/LayoutTests/ChangeLog (93962 => 93963)
--- trunk/LayoutTests/ChangeLog 2011-08-29 08:53:30 UTC (rev 93962)
+++ trunk/LayoutTests/ChangeLog 2011-08-29 09:06:43 UTC (rev 93963)
@@ -1,3 +1,12 @@
+2011-08-25 Pavel Podivilov <[email protected]>
+
+ Web Inspector: remove RawSourceCode.setFormatted.
+ https://bugs.webkit.org/show_bug.cgi?id=66947
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/debugger/source-file.html:
+
2011-08-26 Pavel Podivilov <[email protected]>
Web Inspector: Debugger.setBreakpointByUrl should return error when setting breakpoint on the same location twice.
Modified: trunk/LayoutTests/inspector/debugger/source-file.html (93962 => 93963)
--- trunk/LayoutTests/inspector/debugger/source-file.html 2011-08-29 08:53:30 UTC (rev 93962)
+++ trunk/LayoutTests/inspector/debugger/source-file.html 2011-08-29 09:06:43 UTC (rev 93963)
@@ -81,8 +81,7 @@
function testFormattedConvertLocation(next)
{
var script = new WebInspector.Script("1", "foo.js", 0, 0, 20, 80, undefined, undefined, false);
- var sourceFile = new WebInspector.RawSourceCode("id", script, mockScriptFormatter);
- sourceFile.setFormatted(true);
+ var sourceFile = new WebInspector.RawSourceCode("id", script, mockScriptFormatter, true);
function didCreateSourceMapping()
{
@@ -97,8 +96,7 @@
{
var script1 = new WebInspector.Script("1", "foo.js", 10, 20, 30, 40, undefined, undefined, false);
var script2 = new WebInspector.Script("2", "foo.js", 50, 60, 70, 80, undefined, undefined, false);
- var sourceFile = new WebInspector.RawSourceCode("id", script1, mockScriptFormatter);
- sourceFile.setFormatted(true);
+ var sourceFile = new WebInspector.RawSourceCode("id", script1, mockScriptFormatter, true);
sourceFile.addScript(script2);
function didCreateSourceMapping()
Modified: trunk/Source/WebCore/ChangeLog (93962 => 93963)
--- trunk/Source/WebCore/ChangeLog 2011-08-29 08:53:30 UTC (rev 93962)
+++ trunk/Source/WebCore/ChangeLog 2011-08-29 09:06:43 UTC (rev 93963)
@@ -1,3 +1,14 @@
+2011-08-25 Pavel Podivilov <[email protected]>
+
+ Web Inspector: remove RawSourceCode.setFormatted.
+ https://bugs.webkit.org/show_bug.cgi?id=66947
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/front-end/DebuggerPresentationModel.js:
+ * inspector/front-end/SourceFile.js:
+ (WebInspector.RawSourceCode):
+
2011-08-26 Pavel Podivilov <[email protected]>
Web Inspector: Debugger.setBreakpointByUrl should return error when setting breakpoint on the same location twice.
Modified: trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js (93962 => 93963)
--- trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js 2011-08-29 08:53:30 UTC (rev 93962)
+++ trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js 2011-08-29 09:06:43 UTC (rev 93963)
@@ -170,8 +170,7 @@
return;
}
- sourceFile = new WebInspector.RawSourceCode(sourceFileId, script, this._formatter);
- sourceFile.setFormatted(this._formatSourceFiles);
+ sourceFile = new WebInspector.RawSourceCode(sourceFileId, script, this._formatter, this._formatSourceFiles);
this._sourceFiles[sourceFileId] = sourceFile;
sourceFile.addEventListener(WebInspector.RawSourceCode.Events.UISourceCodeReplaced, this._uiSourceCodeReplaced, this);
Modified: trunk/Source/WebCore/inspector/front-end/SourceFile.js (93962 => 93963)
--- trunk/Source/WebCore/inspector/front-end/SourceFile.js 2011-08-29 08:53:30 UTC (rev 93962)
+++ trunk/Source/WebCore/inspector/front-end/SourceFile.js 2011-08-29 09:06:43 UTC (rev 93963)
@@ -35,11 +35,11 @@
* @constructor
* @extends {WebInspector.Object}
*/
-WebInspector.RawSourceCode = function(id, script, formatter)
+WebInspector.RawSourceCode = function(id, script, formatter, formatted)
{
this._scripts = [script];
this._formatter = formatter;
- this._formatted = false;
+ this._formatted = formatted;
if (script.sourceURL)
this._resource = WebInspector.networkManager.inflightResourceForURL(script.sourceURL) || WebInspector.resourceForURL(script.sourceURL);
@@ -106,12 +106,6 @@
return closestScript;
},
- setFormatted: function(formatted)
- {
- // FIXME: this should initiate formatting and trigger events to update ui.
- this._formatted = formatted;
- },
-
requestContent: function(callback)
{
if (this._contentLoaded) {
