[webkit-changes] [101094] trunk

Wed, 23 Nov 2011 11:05:02 -0800

Title: [101094] trunk
Revision
101094
Author
[email protected]
Date
2011-11-23 11:04:48 -0800 (Wed, 23 Nov 2011)

Log Message

Unreviewed, rolling out r101069.
http://trac.webkit.org/changeset/101069
https://bugs.webkit.org/show_bug.cgi?id=73032

New test always times out (Requested by aklein on #webkit).

Patch by Sheriff Bot <[email protected]> on 2011-11-23

Source/WebCore:

* inspector/front-end/DebuggerPresentationModel.js:
(WebInspector.DebuggerPresentationModel.prototype._bindScriptToRawSourceCode):
(WebInspector.DebuggerPresentationModel.prototype.evaluateInSelectedCallFrame):
(WebInspector.DebuggerPresentationModel.prototype.get executionLineLocation):
(WebInspector.DebuggerPresentationModel.DefaultLinkifierFormatter.prototype.formatRawSourceCodeAnchor):
(WebInspector.DebuggerPresentationModel.Linkifier.prototype.linkifyLocation):
(WebInspector.DebuggerPresentationModel.Linkifier.prototype._updateAnchor):

LayoutTests:

* http/tests/inspector/compiler-source-mapping-debug-expected.txt: Removed.
* http/tests/inspector/compiler-source-mapping-debug.html: Removed.
* http/tests/inspector/resources/source-map.json:
* http/tests/inspector/resources/source1.js:
(window.onload):
* http/tests/inspector/resources/source2.js:
(ClickHandler.prototype.handle):
* platform/gtk/Skipped:
* platform/mac/Skipped:
* platform/qt/Skipped:
* platform/win/Skipped:
* platform/wincairo/Skipped:

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (101093 => 101094)


--- trunk/LayoutTests/ChangeLog	2011-11-23 18:51:58 UTC (rev 101093)
+++ trunk/LayoutTests/ChangeLog	2011-11-23 19:04:48 UTC (rev 101094)
@@ -1,3 +1,24 @@
+2011-11-23  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r101069.
+        http://trac.webkit.org/changeset/101069
+        https://bugs.webkit.org/show_bug.cgi?id=73032
+
+        New test always times out (Requested by aklein on #webkit).
+
+        * http/tests/inspector/compiler-source-mapping-debug-expected.txt: Removed.
+        * http/tests/inspector/compiler-source-mapping-debug.html: Removed.
+        * http/tests/inspector/resources/source-map.json:
+        * http/tests/inspector/resources/source1.js:
+        (window.onload):
+        * http/tests/inspector/resources/source2.js:
+        (ClickHandler.prototype.handle):
+        * platform/gtk/Skipped:
+        * platform/mac/Skipped:
+        * platform/qt/Skipped:
+        * platform/win/Skipped:
+        * platform/wincairo/Skipped:
+
 2011-11-23  Adam Klein  <[email protected]>
 
         [chromium] Crash in webkit::npapi::PluginInstance::NPP_SetWindow

Deleted: trunk/LayoutTests/http/tests/inspector/compiler-source-mapping-debug-expected.txt (101093 => 101094)


--- trunk/LayoutTests/http/tests/inspector/compiler-source-mapping-debug-expected.txt	2011-11-23 18:51:58 UTC (rev 101093)
+++ trunk/LayoutTests/http/tests/inspector/compiler-source-mapping-debug-expected.txt	2011-11-23 19:04:48 UTC (rev 101094)
@@ -1,15 +0,0 @@
-CONSOLE MESSAGE: line 2: button clicked!
-Tests installing compiler source map in scripts panel.
-
-
-Debugger was enabled.
-
-Running: testSetBreakpoint
-Script source was shown.
-Script execution paused.
-Call stack:
-    0) handleClick (compiled.js:2)
-    1) clickButton (compiler-source-mapping-debug.html:11)
-Script execution resumed.
-Debugger was disabled.
-

Deleted: trunk/LayoutTests/http/tests/inspector/compiler-source-mapping-debug.html (101093 => 101094)


--- trunk/LayoutTests/http/tests/inspector/compiler-source-mapping-debug.html	2011-11-23 18:51:58 UTC (rev 101093)
+++ trunk/LayoutTests/http/tests/inspector/compiler-source-mapping-debug.html	2011-11-23 19:04:48 UTC (rev 101094)
@@ -1,53 +0,0 @@
-<html>
-<head>
-<script src=""
-<script src=""
-<script src=""
-
-<script>
-
-function clickButton()
-{
-    document.getElementById('test').click();
-}
-
-function test()
-{
-
-    InspectorTest.runDebuggerTestSuite([
-        function testSetBreakpoint(next)
-        {
-            InspectorTest.showScriptSource("compiled.js", didShowCompiled);
-
-            function didShowCompiled(sourceFrame)
-            {
-                InspectorTest.addResult("Script source was shown.");
-                sourceFrame._model.setCompilerSourceMapping(sourceFrame._uiSourceCode, "http://localhost:8000/inspector/resources/source-map.json");
-                InspectorTest.showScriptSource("source1.js", didShowSource1);
-
-            }
-
-            function didShowSource1(sourceFrame)
-            {
-                InspectorTest.setBreakpoint(sourceFrame, 14, "", true);
-                InspectorTest.waitUntilPaused(paused);
-                InspectorTest.evaluateInPage("setTimeout(clickButton, 0)");
-            }
-
-            function paused(callFrames)
-            {
-                InspectorTest.captureStackTrace(callFrames);
-                next();
-            }
-        }
-    ]);
-};
-
-</script>
-
-</head>
-
-<body _onload_="runTest()">
-<p>Tests installing compiler source map in scripts panel.</p>
-</body>
-</html>

Modified: trunk/LayoutTests/http/tests/inspector/resources/source-map.json (101093 => 101094)


--- trunk/LayoutTests/http/tests/inspector/resources/source-map.json	2011-11-23 18:51:58 UTC (rev 101093)
+++ trunk/LayoutTests/http/tests/inspector/resources/source-map.json	2011-11-23 19:04:48 UTC (rev 101094)
@@ -1,8 +1,7 @@
 {
 "version":3,
-"file":"compiled.js",
 "lineCount":2,
-"mappings":"AACAA,MAAAC,iBAAuB,CAAC,MAAD,CAAS,QAAQ,EACxC,CACI,IAAIC,EAASC,QAAAC,cAAsB,CAAC,QAAD,CACnCF,EAAAG,GAAA,CAAY,MACZH,EAAAD,iBAAuB,CAAC,OAAD,CAAUK,WAAV,CAAuB,CAAA,CAAvB,CACvBH,SAAAI,KAAAC,YAAyB,CAACN,CAAD,CAErBO,EAAAA,CAAMN,QAAAC,cAAsB,CAAC,KAAD,CAChCK,EAAAJ,GAAA,CAAS,ocACTF;QAAAI,KAAAC,YAAyB,CAACC,CAAD,CAR7B,CADuB,CAYvBH,SAASA,YAAW,CAACI,CAAD,CACpB,CAEIC,CAD8BC,IAAZC,YAClBF,QAAc,CAACD,CAAD,CAFlB,C,CCbAG,QAASA,aAAY,EACrB,EAGAA,YAAAC,UAAAH,OAAA,CAAgCI,QAAQ,EACxC,CACIC,OAAAC,IAAW,CAAC,iBAAD,CADf;",
+"mappings":"AACAA,MAAAC,OAAA,CAAwBC,QAAA,EACxB,CACI,IAAIC,EAAMC,QAAAC,cAAsB,CAAC,KAAD,CAChCF,EAAAG,YAAA,CAAkB,KAClBH,EAAAI,iBAAoB,CAAC,OAAD,CAAUC,WAAV,CAAuB,CAAA,CAAvB,CACpBJ,SAAAK,KAAAC,YAAyB,CAACP,CAAD,CAErBQ,EAAAA,CAAMP,QAAAC,cAAsB,CAAC,KAAD,CAChCM,EAAAL,YAAA,CAAkB,ocAClBF;QAAAK,KAAAC,YAAyB,CAACC,CAAD,CAR7B,CAWSH,SAAAA,YAAW,CAACI,CAAD,CACpB,CAEIC,CAD8BC,IAAZC,YAClBF,QAAc,CAACD,CAAD,CAFlB,CCbSG,QAAAA,aAAY,EACrB,EAGAA,YAAAC,UAAAH,OAAA,CAAwCI,QAAA,CAACL,CAAD,CACxC,CACI,IAAIM,EAAUd,QAAAC,cAAsB,CAAC,KAAD,CACpCa,EAAAZ,YAAA,CAAsBM,CAAAO,UACtBf,SAAAK,KAAAC,YAAyB,CAACQ,CAAD,CAH7B;",
 "sources":["source1.js","source2.js"],
-"names":["window","addEventListener","button","document","createElement","id","handleClick","body","appendChild","bar","event","handle","handler","ClickHandler","prototype","ClickHandler.prototype.handle","console","log"]
+"names":["window","onload","window.onload","foo","document","createElement","textContent","addEventListener","handleClick","body","appendChild","bar","event","handle","handler","ClickHandler","prototype","ClickHandler.prototype.handle","element","timeStamp"]
 }

Modified: trunk/LayoutTests/http/tests/inspector/resources/source1.js (101093 => 101094)


--- trunk/LayoutTests/http/tests/inspector/resources/source1.js	2011-11-23 18:51:58 UTC (rev 101093)
+++ trunk/LayoutTests/http/tests/inspector/resources/source1.js	2011-11-23 19:04:48 UTC (rev 101094)
@@ -1,14 +1,14 @@
-window.addEventListener('load', function()
+window._onload_ = function()
 {
-    var button = document.createElement('button');
-    button.id = 'test';
-    button.addEventListener('click', handleClick, true);
-    document.body.appendChild(button);
+    var foo = document.createElement('div');
+    foo.textContent = 'foo';
+    foo.addEventListener('click', handleClick, true);
+    document.body.appendChild(foo);
 
     var bar = document.createElement('div');
-    bar.id = 'barrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr';
+    bar.textContent = 'barrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr';
     document.body.appendChild(bar);
-});
+}
 
 function handleClick(event)
 {

Modified: trunk/LayoutTests/http/tests/inspector/resources/source2.js (101093 => 101094)


--- trunk/LayoutTests/http/tests/inspector/resources/source2.js	2011-11-23 18:51:58 UTC (rev 101093)
+++ trunk/LayoutTests/http/tests/inspector/resources/source2.js	2011-11-23 19:04:48 UTC (rev 101094)
@@ -4,5 +4,7 @@
 
 ClickHandler.prototype.handle = function(event)
 {
-    console.log('button clicked!');
+    var element = document.createElement('div');
+    element.textContent = event.timeStamp;
+    document.body.appendChild(element);
 }

Modified: trunk/LayoutTests/platform/gtk/Skipped (101093 => 101094)


--- trunk/LayoutTests/platform/gtk/Skipped	2011-11-23 18:51:58 UTC (rev 101093)
+++ trunk/LayoutTests/platform/gtk/Skipped	2011-11-23 19:04:48 UTC (rev 101094)
@@ -1267,9 +1267,6 @@
 # https://bugs.webkit.org/show_bug.cgi?id=40300
 inspector/debugger/live-edit.html
 
-# https://bugs.webkit.org/show_bug.cgi?id=53003
-http/tests/inspector/compiler-source-mapping-debug.html
-
 # [GTK] r65681 broke a couple GTK+ a11y tests
 # https://bugs.webkit.org/show_bug.cgi?id=44316
 platform/gtk/accessibility/object-attributes.html

Modified: trunk/LayoutTests/platform/mac/Skipped (101093 => 101094)


--- trunk/LayoutTests/platform/mac/Skipped	2011-11-23 18:51:58 UTC (rev 101093)
+++ trunk/LayoutTests/platform/mac/Skipped	2011-11-23 19:04:48 UTC (rev 101094)
@@ -271,9 +271,6 @@
 # https://bugs.webkit.org/show_bug.cgi?id=40300
 inspector/debugger/live-edit.html
 
-# https://bugs.webkit.org/show_bug.cgi?id=53003
-http/tests/inspector/compiler-source-mapping-debug.html
-
 # Safari doesn't allow to customize outermost scrollbars.
 # https://bugs.webkit.org/show_bug.cgi?id=43960
 scrollbars/custom-scrollbar-with-incomplete-style.html

Modified: trunk/LayoutTests/platform/qt/Skipped (101093 => 101094)


--- trunk/LayoutTests/platform/qt/Skipped	2011-11-23 18:51:58 UTC (rev 101093)
+++ trunk/LayoutTests/platform/qt/Skipped	2011-11-23 19:04:48 UTC (rev 101094)
@@ -215,9 +215,6 @@
 # https://bugs.webkit.org/show_bug.cgi?id=40300
 inspector/debugger/live-edit.html
 
-# https://bugs.webkit.org/show_bug.cgi?id=53003
-http/tests/inspector/compiler-source-mapping-debug.html
-
 # Needs rebaseline
 fast/repaint/scale-page-shrink.html

Modified: trunk/LayoutTests/platform/win/Skipped (101093 => 101094)


--- trunk/LayoutTests/platform/win/Skipped	2011-11-23 18:51:58 UTC (rev 101093)
+++ trunk/LayoutTests/platform/win/Skipped	2011-11-23 19:04:48 UTC (rev 101094)
@@ -1198,9 +1198,6 @@
 # https://bugs.webkit.org/show_bug.cgi?id=40300
 inspector/debugger/live-edit.html
 
-# https://bugs.webkit.org/show_bug.cgi?id=53003
-http/tests/inspector/compiler-source-mapping-debug.html
-
 # <https://bugs.webkit.org/show_bug.cgi?id=44484>
 svg/batik/paints/patternRegions-positioned-objects.svg

Modified: trunk/LayoutTests/platform/wincairo/Skipped (101093 => 101094)


--- trunk/LayoutTests/platform/wincairo/Skipped	2011-11-23 18:51:58 UTC (rev 101093)
+++ trunk/LayoutTests/platform/wincairo/Skipped	2011-11-23 19:04:48 UTC (rev 101094)
@@ -1715,9 +1715,6 @@
 # https://bugs.webkit.org/show_bug.cgi?id=40300
 inspector/debugger/live-edit.html
 
-# https://bugs.webkit.org/show_bug.cgi?id=53003
-http/tests/inspector/compiler-source-mapping-debug.html
-
 # <https://bugs.webkit.org/show_bug.cgi?id=44484>
 svg/batik/paints/patternRegions-positioned-objects.svg

Modified: trunk/Source/WebCore/ChangeLog (101093 => 101094)


--- trunk/Source/WebCore/ChangeLog	2011-11-23 18:51:58 UTC (rev 101093)
+++ trunk/Source/WebCore/ChangeLog	2011-11-23 19:04:48 UTC (rev 101094)
@@ -1,3 +1,19 @@
+2011-11-23  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r101069.
+        http://trac.webkit.org/changeset/101069
+        https://bugs.webkit.org/show_bug.cgi?id=73032
+
+        New test always times out (Requested by aklein on #webkit).
+
+        * inspector/front-end/DebuggerPresentationModel.js:
+        (WebInspector.DebuggerPresentationModel.prototype._bindScriptToRawSourceCode):
+        (WebInspector.DebuggerPresentationModel.prototype.evaluateInSelectedCallFrame):
+        (WebInspector.DebuggerPresentationModel.prototype.get executionLineLocation):
+        (WebInspector.DebuggerPresentationModel.DefaultLinkifierFormatter.prototype.formatRawSourceCodeAnchor):
+        (WebInspector.DebuggerPresentationModel.Linkifier.prototype.linkifyLocation):
+        (WebInspector.DebuggerPresentationModel.Linkifier.prototype._updateAnchor):
+
 2011-11-23  Antti Koivisto  <[email protected]>
 
         https://bugs.webkit.org/show_bug.cgi?id=72354

Modified: trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js (101093 => 101094)


--- trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js	2011-11-23 18:51:58 UTC (rev 101093)
+++ trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js	2011-11-23 19:04:48 UTC (rev 101094)
@@ -157,7 +157,7 @@
     _bindScriptToRawSourceCode: function(script, rawSourceCode)
     {
         this._rawSourceCodeForScriptId[script.scriptId] = rawSourceCode;
-        this._rawSourceCodeForURL[script.sourceURL] = rawSourceCode;
+        this._rawSourceCodeForURL[script.sourceURL] = rawSourceCode; 
     },
 
     /**
@@ -336,16 +336,6 @@
     },
 
     /**
-     * @param {WebInspector.UISourceCode} uiSourceCode
-     * @param {string} sourceMappingURL
-     */
-    setCompilerSourceMapping: function(uiSourceCode, sourceMappingURL)
-    {
-        var sourceMapping = new WebInspector.ClosureCompilerSourceMapping(sourceMappingURL);
-        uiSourceCode.rawSourceCode.setCompilerSourceMapping(sourceMapping);
-    },
-
-    /**
      * @param {WebInspector.Event} event
      */
     _consoleMessageAdded: function(event)
@@ -561,11 +551,11 @@
                 callback(null, wasThrown, wasThrown ? null : result);
             else
                 callback(WebInspector.RemoteObject.fromPayload(result), wasThrown);
-
+            
             if (objectGroup === "console")
                 this.dispatchEventToListeners(WebInspector.DebuggerPresentationModel.Events.ConsoleCommandEvaluatedInSelectedCallFrame);
         }
-
+        
         this.selectedCallFrame.evaluate(code, objectGroup, includeCommandLineAPI, returnByValue, didEvaluate.bind(this));
     },
 
@@ -613,7 +603,7 @@
     {
         if (!this._selectedCallFrame.rawSourceCode.sourceMapping)
             return;
-
+        
         var rawLocation = this._selectedCallFrame._callFrame.location;
         var uiLocation = this._selectedCallFrame.rawSourceCode.sourceMapping.rawLocationToUILocation(rawLocation);
         return uiLocation;
@@ -920,7 +910,7 @@
         var uiLocation = rawSourceCode.sourceMapping.rawLocationToUILocation(anchor.rawLocation);
 
         anchor.textContent = WebInspector.formatLinkText(uiLocation.uiSourceCode.url, uiLocation.lineNumber);
-
+            
         var text = WebInspector.formatLinkText(uiLocation.uiSourceCode.url, uiLocation.lineNumber);
         if (this._maxLength)
             text = text.trimMiddle(this._maxLength);
@@ -954,7 +944,7 @@
         var rawSourceCode = this._model._rawSourceCodeForScriptWithURL(sourceURL);
         if (!rawSourceCode)
             return this.linkifyResource(sourceURL, lineNumber, classes);
-
+        
         return this.linkifyRawSourceCode(rawSourceCode, lineNumber, columnNumber, classes);
     },
 
@@ -1026,7 +1016,7 @@
         anchor.setAttribute("preferred_panel", "scripts");
         anchor.uiSourceCode = uiLocation.uiSourceCode;
         anchor.lineNumber = uiLocation.lineNumber;
-
+        
         this._formatter.formatRawSourceCodeAnchor(rawSourceCode, anchor);
     }
 }

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to