Changeset 101094 in webkit
- Timestamp:
- Nov 23, 2011, 11:04:48 AM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 deleted
- 11 edited
-
LayoutTests/ChangeLog (modified) (1 diff)
-
LayoutTests/http/tests/inspector/compiler-source-mapping-debug-expected.txt (deleted)
-
LayoutTests/http/tests/inspector/compiler-source-mapping-debug.html (deleted)
-
LayoutTests/http/tests/inspector/resources/source-map.json (modified) (1 diff)
-
LayoutTests/http/tests/inspector/resources/source1.js (modified) (1 diff)
-
LayoutTests/http/tests/inspector/resources/source2.js (modified) (1 diff)
-
LayoutTests/platform/gtk/Skipped (modified) (1 diff)
-
LayoutTests/platform/mac/Skipped (modified) (1 diff)
-
LayoutTests/platform/qt/Skipped (modified) (1 diff)
-
LayoutTests/platform/win/Skipped (modified) (1 diff)
-
LayoutTests/platform/wincairo/Skipped (modified) (1 diff)
-
Source/WebCore/ChangeLog (modified) (1 diff)
-
Source/WebCore/inspector/front-end/DebuggerPresentationModel.js (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r101093 r101094 1 2011-11-23 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r101069. 4 http://trac.webkit.org/changeset/101069 5 https://bugs.webkit.org/show_bug.cgi?id=73032 6 7 New test always times out (Requested by aklein on #webkit). 8 9 * http/tests/inspector/compiler-source-mapping-debug-expected.txt: Removed. 10 * http/tests/inspector/compiler-source-mapping-debug.html: Removed. 11 * http/tests/inspector/resources/source-map.json: 12 * http/tests/inspector/resources/source1.js: 13 (window.onload): 14 * http/tests/inspector/resources/source2.js: 15 (ClickHandler.prototype.handle): 16 * platform/gtk/Skipped: 17 * platform/mac/Skipped: 18 * platform/qt/Skipped: 19 * platform/win/Skipped: 20 * platform/wincairo/Skipped: 21 1 22 2011-11-23 Adam Klein <adamk@chromium.org> 2 23 -
trunk/LayoutTests/http/tests/inspector/resources/source-map.json
r101069 r101094 1 1 { 2 2 "version":3, 3 "file":"compiled.js",4 3 "lineCount":2, 5 "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;",4 "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;", 6 5 "sources":["source1.js","source2.js"], 7 "names":["window"," addEventListener","button","document","createElement","id","handleClick","body","appendChild","bar","event","handle","handler","ClickHandler","prototype","ClickHandler.prototype.handle","console","log"]6 "names":["window","onload","window.onload","foo","document","createElement","textContent","addEventListener","handleClick","body","appendChild","bar","event","handle","handler","ClickHandler","prototype","ClickHandler.prototype.handle","element","timeStamp"] 8 7 } -
trunk/LayoutTests/http/tests/inspector/resources/source1.js
r101069 r101094 1 window. addEventListener('load',function()1 window.onload = function() 2 2 { 3 var button = document.createElement('button');4 button.id = 'test';5 button.addEventListener('click', handleClick, true);6 document.body.appendChild( button);3 var foo = document.createElement('div'); 4 foo.textContent = 'foo'; 5 foo.addEventListener('click', handleClick, true); 6 document.body.appendChild(foo); 7 7 8 8 var bar = document.createElement('div'); 9 bar. id= 'barrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr';9 bar.textContent = 'barrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr'; 10 10 document.body.appendChild(bar); 11 } );11 } 12 12 13 13 function handleClick(event) -
trunk/LayoutTests/http/tests/inspector/resources/source2.js
r101069 r101094 5 5 ClickHandler.prototype.handle = function(event) 6 6 { 7 console.log('button clicked!'); 7 var element = document.createElement('div'); 8 element.textContent = event.timeStamp; 9 document.body.appendChild(element); 8 10 } -
trunk/LayoutTests/platform/gtk/Skipped
r101084 r101094 1268 1268 inspector/debugger/live-edit.html 1269 1269 1270 # https://bugs.webkit.org/show_bug.cgi?id=530031271 http/tests/inspector/compiler-source-mapping-debug.html1272 1273 1270 # [GTK] r65681 broke a couple GTK+ a11y tests 1274 1271 # https://bugs.webkit.org/show_bug.cgi?id=44316 -
trunk/LayoutTests/platform/mac/Skipped
r101069 r101094 272 272 inspector/debugger/live-edit.html 273 273 274 # https://bugs.webkit.org/show_bug.cgi?id=53003275 http/tests/inspector/compiler-source-mapping-debug.html276 277 274 # Safari doesn't allow to customize outermost scrollbars. 278 275 # https://bugs.webkit.org/show_bug.cgi?id=43960 -
trunk/LayoutTests/platform/qt/Skipped
r101069 r101094 215 215 # https://bugs.webkit.org/show_bug.cgi?id=40300 216 216 inspector/debugger/live-edit.html 217 218 # https://bugs.webkit.org/show_bug.cgi?id=53003219 http/tests/inspector/compiler-source-mapping-debug.html220 217 221 218 # Needs rebaseline -
trunk/LayoutTests/platform/win/Skipped
r101069 r101094 1199 1199 inspector/debugger/live-edit.html 1200 1200 1201 # https://bugs.webkit.org/show_bug.cgi?id=530031202 http/tests/inspector/compiler-source-mapping-debug.html1203 1204 1201 # <https://bugs.webkit.org/show_bug.cgi?id=44484> 1205 1202 svg/batik/paints/patternRegions-positioned-objects.svg -
trunk/LayoutTests/platform/wincairo/Skipped
r101069 r101094 1716 1716 inspector/debugger/live-edit.html 1717 1717 1718 # https://bugs.webkit.org/show_bug.cgi?id=530031719 http/tests/inspector/compiler-source-mapping-debug.html1720 1721 1718 # <https://bugs.webkit.org/show_bug.cgi?id=44484> 1722 1719 svg/batik/paints/patternRegions-positioned-objects.svg -
trunk/Source/WebCore/ChangeLog
r101091 r101094 1 2011-11-23 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r101069. 4 http://trac.webkit.org/changeset/101069 5 https://bugs.webkit.org/show_bug.cgi?id=73032 6 7 New test always times out (Requested by aklein on #webkit). 8 9 * inspector/front-end/DebuggerPresentationModel.js: 10 (WebInspector.DebuggerPresentationModel.prototype._bindScriptToRawSourceCode): 11 (WebInspector.DebuggerPresentationModel.prototype.evaluateInSelectedCallFrame): 12 (WebInspector.DebuggerPresentationModel.prototype.get executionLineLocation): 13 (WebInspector.DebuggerPresentationModel.DefaultLinkifierFormatter.prototype.formatRawSourceCodeAnchor): 14 (WebInspector.DebuggerPresentationModel.Linkifier.prototype.linkifyLocation): 15 (WebInspector.DebuggerPresentationModel.Linkifier.prototype._updateAnchor): 16 1 17 2011-11-23 Antti Koivisto <antti@apple.com> 2 18 -
trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js
r101069 r101094 158 158 { 159 159 this._rawSourceCodeForScriptId[script.scriptId] = rawSourceCode; 160 this._rawSourceCodeForURL[script.sourceURL] = rawSourceCode; 160 this._rawSourceCodeForURL[script.sourceURL] = rawSourceCode; 161 161 }, 162 162 … … 337 337 338 338 /** 339 * @param {WebInspector.UISourceCode} uiSourceCode340 * @param {string} sourceMappingURL341 */342 setCompilerSourceMapping: function(uiSourceCode, sourceMappingURL)343 {344 var sourceMapping = new WebInspector.ClosureCompilerSourceMapping(sourceMappingURL);345 uiSourceCode.rawSourceCode.setCompilerSourceMapping(sourceMapping);346 },347 348 /**349 339 * @param {WebInspector.Event} event 350 340 */ … … 562 552 else 563 553 callback(WebInspector.RemoteObject.fromPayload(result), wasThrown); 564 554 565 555 if (objectGroup === "console") 566 556 this.dispatchEventToListeners(WebInspector.DebuggerPresentationModel.Events.ConsoleCommandEvaluatedInSelectedCallFrame); 567 557 } 568 558 569 559 this.selectedCallFrame.evaluate(code, objectGroup, includeCommandLineAPI, returnByValue, didEvaluate.bind(this)); 570 560 }, … … 614 604 if (!this._selectedCallFrame.rawSourceCode.sourceMapping) 615 605 return; 616 606 617 607 var rawLocation = this._selectedCallFrame._callFrame.location; 618 608 var uiLocation = this._selectedCallFrame.rawSourceCode.sourceMapping.rawLocationToUILocation(rawLocation); … … 921 911 922 912 anchor.textContent = WebInspector.formatLinkText(uiLocation.uiSourceCode.url, uiLocation.lineNumber); 923 913 924 914 var text = WebInspector.formatLinkText(uiLocation.uiSourceCode.url, uiLocation.lineNumber); 925 915 if (this._maxLength) … … 955 945 if (!rawSourceCode) 956 946 return this.linkifyResource(sourceURL, lineNumber, classes); 957 947 958 948 return this.linkifyRawSourceCode(rawSourceCode, lineNumber, columnNumber, classes); 959 949 }, … … 1027 1017 anchor.uiSourceCode = uiLocation.uiSourceCode; 1028 1018 anchor.lineNumber = uiLocation.lineNumber; 1029 1019 1030 1020 this._formatter.formatRawSourceCodeAnchor(rawSourceCode, anchor); 1031 1021 }
Note:
See TracChangeset
for help on using the changeset viewer.