Skip to content

GitLab

T
tangled
Commit 307a5abc authored by podivilov@chromium.org's avatar podivilov@chromium.org
Browse files
Options

2011-04-06 Sheriff Bot <webkit.review.bot@gmail.com> 

        Unreviewed, rolling out r83045.
        http://trac.webkit.org/changeset/83045
        https://bugs.webkit.org/show_bug.cgi?id=57953

        Broke win layout tests (Requested by podivilov on #webkit).

        * inspector/debugger/script-formatter-expected.txt: Removed.
        * inspector/debugger/script-formatter.html: Removed.
        * platform/chromium/test_expectations.txt:
2011-04-06  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r83045.
        http://trac.webkit.org/changeset/83045
        https://bugs.webkit.org/show_bug.cgi?id=57953

        Broke win layout tests (Requested by podivilov on #webkit).

        * GNUmakefile.am:
        * inspector/front-end/DebuggerPresentationModel.js:
        (WebInspector.DebuggerPresentationModel.prototype._addScript):
        (WebInspector.DebuggerPresentationModel.prototype.toggleFormatSourceFiles):

git-svn-id: svn://svn.chromium.org/blink/trunk@83053 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 06795487
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 57 deletions
third_party/WebKit/LayoutTests/ChangeLog
View file @ 307a5abc
2011-04-06 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed, rolling out r83045.
http://trac.webkit.org/changeset/83045
https://bugs.webkit.org/show_bug.cgi?id=57953
Broke win layout tests (Requested by podivilov on #webkit).
* inspector/debugger/script-formatter-expected.txt: Removed.
* inspector/debugger/script-formatter.html: Removed.
* platform/chromium/test_expectations.txt:
2011-04-06 Andras Becsi <abecsi@webkit.org> 2011-04-06 Andras Becsi <abecsi@webkit.org>
Reviewed by Darin Adler. Reviewed by Darin Adler.
third_party/WebKit/LayoutTests/inspector/debugger/script-formatter-expected.txt deleted 100644 → 0
View file @ 06795487
Tests the script formatting functionality.
Running: testScriptFormatterWorker
third_party/WebKit/LayoutTests/inspector/debugger/script-formatter.html deleted 100644 → 0
View file @ 06795487
<html>
<head>
<script src="../../http/tests/inspector/inspector-test.js"></script>
<script src="../../http/tests/inspector/debugger-test.js"></script>
<script>
var test = function()
{
InspectorTest.runTestSuite([
function testScriptFormatterWorker(next)
{
var worker = new Worker("ScriptFormatterWorker.js");
worker.onmessage = InspectorTest.safeWrap(function(event)
{
InspectorTest.assertEquals("var x = 0;", event.data.formattedSource);
InspectorTest.completeTest();
});
worker.onerror = function(event)
{
InspectorTest.addResult("Error in worker: " + event.data);
InspectorTest.completeTest();
};
worker.postMessage("var x=0");
}
]);
}
</script>
</head>
<body onload="runTest()">
<p>Tests the script formatting functionality.
</p>
</body>
</html>
third_party/WebKit/LayoutTests/platform/chromium/test_expectations.txt
View file @ 307a5abc
...@@ -161,7 +161,6 @@ WONTFIX SKIP : http/tests/workers = PASS TIMEOUT FAIL ...@@ -161,7 +161,6 @@ WONTFIX SKIP : http/tests/workers = PASS TIMEOUT FAIL
WONTFIX SKIP : http/tests/xmlhttprequest/workers = PASS TIMEOUT FAIL WONTFIX SKIP : http/tests/xmlhttprequest/workers = PASS TIMEOUT FAIL
WONTFIX SKIP : http/tests/eventsource/workers = PASS TIMEOUT FAIL WONTFIX SKIP : http/tests/eventsource/workers = PASS TIMEOUT FAIL
WONTFIX SKIP : http/tests/websocket/tests/workers/ = PASS TIMEOUT FAIL WONTFIX SKIP : http/tests/websocket/tests/workers/ = PASS TIMEOUT FAIL
WONTFIX SKIP : inspector/debugger/script-formatter.html = PASS TIMEOUT FAIL
// Page Cache - based tests. Chromium disables page cache because the WebKit page cache keeps previously // Page Cache - based tests. Chromium disables page cache because the WebKit page cache keeps previously
// loaded pages alive in memory to be able to quickly substitute them when user clicks History buttons. // loaded pages alive in memory to be able to quickly substitute them when user clicks History buttons.
......
third_party/WebKit/Source/WebCore/ChangeLog
View file @ 307a5abc
2011-04-06 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed, rolling out r83045.
http://trac.webkit.org/changeset/83045
https://bugs.webkit.org/show_bug.cgi?id=57953
Broke win layout tests (Requested by podivilov on #webkit).
* GNUmakefile.am:
* inspector/front-end/DebuggerPresentationModel.js:
(WebInspector.DebuggerPresentationModel.prototype._addScript):
(WebInspector.DebuggerPresentationModel.prototype.toggleFormatSourceFiles):
2011-04-06 Ryosuke Niwa <rniwa@webkit.org> 2011-04-06 Ryosuke Niwa <rniwa@webkit.org>
Moved the declaration of positionNewFloatOnLine in RenderBlock.h after r83042. Moved the declaration of positionNewFloatOnLine in RenderBlock.h after r83042.
third_party/WebKit/Source/WebCore/GNUmakefile.am
View file @ 307a5abc
...@@ -5315,7 +5315,6 @@ dist_webinspector_DATA = \ ...@@ -5315,7 +5315,6 @@ dist_webinspector_DATA = \
$(WebCore)/English.lproj/localizedStrings.js \ $(WebCore)/English.lproj/localizedStrings.js \
DerivedSources/WebCore/InspectorBackendStub.js \ DerivedSources/WebCore/InspectorBackendStub.js \
$(shell ls $(WebCore)/inspector/front-end/*.js) \ $(shell ls $(WebCore)/inspector/front-end/*.js) \
$(shell ls $(WebCore)/inspector/front-end/UglifyJS/*.js) \
$(shell ls $(WebCore)/inspector/front-end/*.html) \ $(shell ls $(WebCore)/inspector/front-end/*.html) \
$(shell ls $(WebCore)/inspector/front-end/*.css) $(shell ls $(WebCore)/inspector/front-end/*.css)
...@@ -5329,7 +5328,6 @@ dist_webinspectorimages_DATA = \ ...@@ -5329,7 +5328,6 @@ dist_webinspectorimages_DATA = \
noinst_DATA = ${GENSOURCES_INSPECTOR}/inspector.html noinst_DATA = ${GENSOURCES_INSPECTOR}/inspector.html
${GENSOURCES_INSPECTOR}/inspector.html: $(WebCore)/inspector/front-end/*.html \ ${GENSOURCES_INSPECTOR}/inspector.html: $(WebCore)/inspector/front-end/*.html \
$(WebCore)/inspector/front-end/*.js \ $(WebCore)/inspector/front-end/*.js \
$(WebCore)/inspector/front-end/UglifyJS/*.js \
$(WebCore)/inspector/front-end/*.css \ $(WebCore)/inspector/front-end/*.css \
$(WebCore)/inspector/front-end/Images/* \ $(WebCore)/inspector/front-end/Images/* \
DerivedSources/WebCore/InspectorBackendStub.js \ DerivedSources/WebCore/InspectorBackendStub.js \
......
third_party/WebKit/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js
View file @ 307a5abc
...@@ -105,7 +105,7 @@ WebInspector.DebuggerPresentationModel.prototype = { ...@@ -105,7 +105,7 @@ WebInspector.DebuggerPresentationModel.prototype = {
if (!this._formatSourceFiles) if (!this._formatSourceFiles)
sourceFile = new WebInspector.SourceFile(sourceFileId, script, contentChanged.bind(this)); sourceFile = new WebInspector.SourceFile(sourceFileId, script, contentChanged.bind(this));
else else
sourceFile = new WebInspector.FormattedSourceFile(sourceFileId, script, contentChanged.bind(this), this._formatter()); sourceFile = new WebInspector.FormattedSourceFile(sourceFileId, script, contentChanged.bind(this), this._formatter);
this._sourceFiles[sourceFileId] = sourceFile; this._sourceFiles[sourceFileId] = sourceFile;
this.dispatchEventToListeners(WebInspector.DebuggerPresentationModel.Events.SourceFileAdded, sourceFile); this.dispatchEventToListeners(WebInspector.DebuggerPresentationModel.Events.SourceFileAdded, sourceFile);
}, },
...@@ -185,6 +185,8 @@ WebInspector.DebuggerPresentationModel.prototype = { ...@@ -185,6 +185,8 @@ WebInspector.DebuggerPresentationModel.prototype = {
toggleFormatSourceFiles: function() toggleFormatSourceFiles: function()
{ {
this._formatSourceFiles = !this._formatSourceFiles; this._formatSourceFiles = !this._formatSourceFiles;
if (this._formatSourceFiles && !this._formatter)
this._formatter = new WebInspector.ScriptFormatter();
var messages = this._messages; var messages = this._messages;
this._sourceFiles = {}; this._sourceFiles = {};
...@@ -204,13 +206,6 @@ WebInspector.DebuggerPresentationModel.prototype = { ...@@ -204,13 +206,6 @@ WebInspector.DebuggerPresentationModel.prototype = {
this._debuggerPaused(); this._debuggerPaused();
}, },
_formatter: function()
{
if (!this._scriptFormatter)
this._scriptFormatter = new WebInspector.ScriptFormatter();
return this._scriptFormatter;
},
addConsoleMessage: function(message) addConsoleMessage: function(message)
{ {
this._messages.push(message); this._messages.push(message);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment