⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 101094 in webkit


Ignore:
Timestamp:
Nov 23, 2011, 11:04:48 AM (15 years ago)
Author:
commit-queue@webkit.org
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 <webkit.review.bot@gmail.com> 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:
Location:
trunk
Files:
2 deleted
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r101093 r101094  
     12011-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
    1222011-11-23  Adam Klein  <adamk@chromium.org>
    223
  • trunk/LayoutTests/http/tests/inspector/resources/source-map.json

    r101069 r101094  
    11{
    22"version":3,
    3 "file":"compiled.js",
    43"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;",
    65"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"]
    87}
  • trunk/LayoutTests/http/tests/inspector/resources/source1.js

    r101069 r101094  
    1 window.addEventListener('load', function()
     1window.onload = function()
    22{
    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);
    77
    88    var bar = document.createElement('div');
    9     bar.id = 'barrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr';
     9    bar.textContent = 'barrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr';
    1010    document.body.appendChild(bar);
    11 });
     11}
    1212
    1313function handleClick(event)
  • trunk/LayoutTests/http/tests/inspector/resources/source2.js

    r101069 r101094  
    55ClickHandler.prototype.handle = function(event)
    66{
    7     console.log('button clicked!');
     7    var element = document.createElement('div');
     8    element.textContent = event.timeStamp;
     9    document.body.appendChild(element);
    810}
  • trunk/LayoutTests/platform/gtk/Skipped

    r101084 r101094  
    12681268inspector/debugger/live-edit.html
    12691269
    1270 # https://bugs.webkit.org/show_bug.cgi?id=53003
    1271 http/tests/inspector/compiler-source-mapping-debug.html
    1272 
    12731270# [GTK] r65681 broke a couple GTK+ a11y tests
    12741271# https://bugs.webkit.org/show_bug.cgi?id=44316
  • trunk/LayoutTests/platform/mac/Skipped

    r101069 r101094  
    272272inspector/debugger/live-edit.html
    273273
    274 # https://bugs.webkit.org/show_bug.cgi?id=53003
    275 http/tests/inspector/compiler-source-mapping-debug.html
    276 
    277274# Safari doesn't allow to customize outermost scrollbars.
    278275# https://bugs.webkit.org/show_bug.cgi?id=43960
  • trunk/LayoutTests/platform/qt/Skipped

    r101069 r101094  
    215215# https://bugs.webkit.org/show_bug.cgi?id=40300
    216216inspector/debugger/live-edit.html
    217 
    218 # https://bugs.webkit.org/show_bug.cgi?id=53003
    219 http/tests/inspector/compiler-source-mapping-debug.html
    220217
    221218# Needs rebaseline
  • trunk/LayoutTests/platform/win/Skipped

    r101069 r101094  
    11991199inspector/debugger/live-edit.html
    12001200
    1201 # https://bugs.webkit.org/show_bug.cgi?id=53003
    1202 http/tests/inspector/compiler-source-mapping-debug.html
    1203 
    12041201# <https://bugs.webkit.org/show_bug.cgi?id=44484>
    12051202svg/batik/paints/patternRegions-positioned-objects.svg
  • trunk/LayoutTests/platform/wincairo/Skipped

    r101069 r101094  
    17161716inspector/debugger/live-edit.html
    17171717
    1718 # https://bugs.webkit.org/show_bug.cgi?id=53003
    1719 http/tests/inspector/compiler-source-mapping-debug.html
    1720 
    17211718# <https://bugs.webkit.org/show_bug.cgi?id=44484>
    17221719svg/batik/paints/patternRegions-positioned-objects.svg
  • trunk/Source/WebCore/ChangeLog

    r101091 r101094  
     12011-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
    1172011-11-23  Antti Koivisto  <antti@apple.com>
    218
  • trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js

    r101069 r101094  
    158158    {
    159159        this._rawSourceCodeForScriptId[script.scriptId] = rawSourceCode;
    160         this._rawSourceCodeForURL[script.sourceURL] = rawSourceCode;
     160        this._rawSourceCodeForURL[script.sourceURL] = rawSourceCode; 
    161161    },
    162162
     
    337337
    338338    /**
    339      * @param {WebInspector.UISourceCode} uiSourceCode
    340      * @param {string} sourceMappingURL
    341      */
    342     setCompilerSourceMapping: function(uiSourceCode, sourceMappingURL)
    343     {
    344         var sourceMapping = new WebInspector.ClosureCompilerSourceMapping(sourceMappingURL);
    345         uiSourceCode.rawSourceCode.setCompilerSourceMapping(sourceMapping);
    346     },
    347 
    348     /**
    349339     * @param {WebInspector.Event} event
    350340     */
     
    562552            else
    563553                callback(WebInspector.RemoteObject.fromPayload(result), wasThrown);
    564 
     554           
    565555            if (objectGroup === "console")
    566556                this.dispatchEventToListeners(WebInspector.DebuggerPresentationModel.Events.ConsoleCommandEvaluatedInSelectedCallFrame);
    567557        }
    568 
     558       
    569559        this.selectedCallFrame.evaluate(code, objectGroup, includeCommandLineAPI, returnByValue, didEvaluate.bind(this));
    570560    },
     
    614604        if (!this._selectedCallFrame.rawSourceCode.sourceMapping)
    615605            return;
    616 
     606       
    617607        var rawLocation = this._selectedCallFrame._callFrame.location;
    618608        var uiLocation = this._selectedCallFrame.rawSourceCode.sourceMapping.rawLocationToUILocation(rawLocation);
     
    921911
    922912        anchor.textContent = WebInspector.formatLinkText(uiLocation.uiSourceCode.url, uiLocation.lineNumber);
    923 
     913           
    924914        var text = WebInspector.formatLinkText(uiLocation.uiSourceCode.url, uiLocation.lineNumber);
    925915        if (this._maxLength)
     
    955945        if (!rawSourceCode)
    956946            return this.linkifyResource(sourceURL, lineNumber, classes);
    957 
     947       
    958948        return this.linkifyRawSourceCode(rawSourceCode, lineNumber, columnNumber, classes);
    959949    },
     
    10271017        anchor.uiSourceCode = uiLocation.uiSourceCode;
    10281018        anchor.lineNumber = uiLocation.lineNumber;
    1029 
     1019       
    10301020        this._formatter.formatRawSourceCodeAnchor(rawSourceCode, anchor);
    10311021    }
Note: See TracChangeset for help on using the changeset viewer.