2011-04-01 Sheriff Bot <webkit.review.bot@gmail.com>
authorpodivilov@chromium.org <podivilov@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Apr 2011 10:45:56 +0000 (10:45 +0000)
committerpodivilov@chromium.org <podivilov@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Apr 2011 10:45:56 +0000 (10:45 +0000)
        Unreviewed, rolling out r82667.
        http://trac.webkit.org/changeset/82667
        https://bugs.webkit.org/show_bug.cgi?id=57612

        Breaks Leopard 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-01  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r82667.
        http://trac.webkit.org/changeset/82667
        https://bugs.webkit.org/show_bug.cgi?id=57612

        Breaks Leopard layout tests (Requested by podivilov on
        #webkit).

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

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@82669 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/inspector/debugger/script-formatter-expected.txt [deleted file]
LayoutTests/inspector/debugger/script-formatter.html [deleted file]
LayoutTests/platform/chromium/test_expectations.txt
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.am
Source/WebCore/inspector/front-end/DebuggerPresentationModel.js

index dbd8930..6ef5615 100644 (file)
@@ -1,3 +1,16 @@
+2011-04-01  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r82667.
+        http://trac.webkit.org/changeset/82667
+        https://bugs.webkit.org/show_bug.cgi?id=57612
+
+        Breaks Leopard 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-03-30  Pavel Podivilov  <podivilov@chromium.org>
 
         Reviewed by Pavel Feldman.
 2011-03-30  Pavel Podivilov  <podivilov@chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/LayoutTests/inspector/debugger/script-formatter-expected.txt b/LayoutTests/inspector/debugger/script-formatter-expected.txt
deleted file mode 100644 (file)
index 3790837..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-Tests the script formatting functionality.
-
-
-Running: testScriptFormatterWorker
-
diff --git a/LayoutTests/inspector/debugger/script-formatter.html b/LayoutTests/inspector/debugger/script-formatter.html
deleted file mode 100644 (file)
index 563c7bd..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-<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>
index 24adf3c..d560bbb 100755 (executable)
@@ -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/eventsource/workers = PASS TIMEOUT FAIL
 WONTFIX SKIP : http/tests/websocket/tests/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/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
 // loaded pages alive in memory to be able to quickly substitute them when user clicks History buttons.
 
 // 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.
index 98f40a8..bb0e782 100644 (file)
@@ -1,3 +1,17 @@
+2011-04-01  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r82667.
+        http://trac.webkit.org/changeset/82667
+        https://bugs.webkit.org/show_bug.cgi?id=57612
+
+        Breaks Leopard layout tests (Requested by podivilov on
+        #webkit).
+
+        * GNUmakefile.am:
+        * inspector/front-end/DebuggerPresentationModel.js:
+        (WebInspector.DebuggerPresentationModel):
+        (WebInspector.DebuggerPresentationModel.prototype.toggleFormatSourceFiles):
+
 2011-03-30  Pavel Podivilov  <podivilov@chromium.org>
 
         Reviewed by Pavel Feldman.
 2011-03-30  Pavel Podivilov  <podivilov@chromium.org>
 
         Reviewed by Pavel Feldman.
index 85d2deb..99d6841 100644 (file)
@@ -5194,7 +5194,6 @@ dist_webinspector_DATA = \
        $(WebCore)/English.lproj/localizedStrings.js \
        DerivedSources/WebCore/InspectorBackendStub.js \
        $(shell ls $(WebCore)/inspector/front-end/*.js) \
        $(WebCore)/English.lproj/localizedStrings.js \
        DerivedSources/WebCore/InspectorBackendStub.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/*.css)
 
        $(shell ls $(WebCore)/inspector/front-end/*.html) \
        $(shell ls $(WebCore)/inspector/front-end/*.css)
 
@@ -5208,7 +5207,6 @@ dist_webinspectorimages_DATA = \
 noinst_DATA = ${GENSOURCES_INSPECTOR}/inspector.html
 ${GENSOURCES_INSPECTOR}/inspector.html: $(WebCore)/inspector/front-end/*.html \
                $(WebCore)/inspector/front-end/*.js \
 noinst_DATA = ${GENSOURCES_INSPECTOR}/inspector.html
 ${GENSOURCES_INSPECTOR}/inspector.html: $(WebCore)/inspector/front-end/*.html \
                $(WebCore)/inspector/front-end/*.js \
-               $(WebCore)/inspector/front-end/UglifyJS/*.js \
                $(WebCore)/inspector/front-end/*.css \
                $(WebCore)/inspector/front-end/Images/* \
                DerivedSources/WebCore/InspectorBackendStub.js \
                $(WebCore)/inspector/front-end/*.css \
                $(WebCore)/inspector/front-end/Images/* \
                DerivedSources/WebCore/InspectorBackendStub.js \
index 413b487..acef8d1 100644 (file)
@@ -35,7 +35,6 @@ WebInspector.DebuggerPresentationModel = function()
     this._presentationBreakpoints = {};
     this._presentationCallFrames = [];
     this._selectedCallFrameIndex = 0;
     this._presentationBreakpoints = {};
     this._presentationCallFrames = [];
     this._selectedCallFrameIndex = 0;
-    this._formatter = new WebInspector.ScriptFormatter();
 
     WebInspector.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.DebuggerWasEnabled, this._debuggerWasEnabled, this);
     WebInspector.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.ParsedScriptSource, this._parsedScriptSource, this);
 
     WebInspector.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.DebuggerWasEnabled, this._debuggerWasEnabled, this);
     WebInspector.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.ParsedScriptSource, this._parsedScriptSource, this);
@@ -181,6 +180,8 @@ WebInspector.DebuggerPresentationModel.prototype = {
     toggleFormatSourceFiles: function()
     {
         this._formatSourceFiles = !this._formatSourceFiles;
     toggleFormatSourceFiles: function()
     {
         this._formatSourceFiles = !this._formatSourceFiles;
+        if (this._formatSourceFiles && !this._formatter)
+            this._formatter = new WebInspector.ScriptFormatter();
 
         var messages = this._messages;
         this._sourceFiles = {};
 
         var messages = this._messages;
         this._sourceFiles = {};