Changeset 99717 in webkit


Ignore:
Timestamp:
Nov 9, 2011, 7:40:50 AM (14 years ago)
Author:
caseq@chromium.org
Message:

Web Inspector: [refactoring] remove a bunch of methods from JavaScriptSourceFrameDelegate
​https://bugs.webkit.org/show_bug.cgi?id=71826

Reviewed by Pavel Feldman.

Source/WebCore:

  • inspector/front-end/JavaScriptSourceFrame.js:

(WebInspector.JavaScriptSourceFrame):
(WebInspector.JavaScriptSourceFrame.prototype.requestContent):
(WebInspector.JavaScriptSourceFrame.prototype.canEditSource):
(WebInspector.JavaScriptSourceFrame.prototype.editContent):
(WebInspector.JavaScriptSourceFrame.prototype.populateLineGutterContextMenu.else.editBreakpointCondition.didEditBreakpointCondition):
(WebInspector.JavaScriptSourceFrame.prototype.populateLineGutterContextMenu.else):
(WebInspector.JavaScriptSourceFrame.prototype.populateLineGutterContextMenu):
(WebInspector.JavaScriptSourceFrame.prototype.didEditContent):
(WebInspector.JavaScriptSourceFrame.prototype._onMouseDown):

  • inspector/front-end/ScriptsPanel.js:

LayoutTests:

  • http/tests/inspector/debugger-test.js:

(initialize_DebuggerTest):

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r99713 r99717  
     12011-11-09  Andrey Kosyakov  <caseq@chromium.org>
     2
     3        Web Inspector: [refactoring] remove a bunch of methods from JavaScriptSourceFrameDelegate
     4        https://bugs.webkit.org/show_bug.cgi?id=71826
     5
     6        Reviewed by Pavel Feldman.
     7
     8        * http/tests/inspector/debugger-test.js:
     9        (initialize_DebuggerTest):
     10
    1112011-11-09  Alexander Pavlov  <apavlov@chromium.org>
    212

  • trunk/LayoutTests/http/tests/inspector/debugger-test.js

    r96709 r99717  
    181181InspectorTest.removeBreakpoint = function(sourceFrame, lineNumber)
    182182{
    183     sourceFrame._delegate.removeBreakpoint(lineNumber);
     183    sourceFrame._model.removeBreakpoint(sourceFrame._uiSourceCode, lineNumber);
    184184};
    185185

  • trunk/Source/WebCore/ChangeLog

    r99716 r99717  
     12011-11-09  Andrey Kosyakov  <caseq@chromium.org>
     2
     3        Web Inspector: [refactoring] remove a bunch of methods from JavaScriptSourceFrameDelegate
     4        https://bugs.webkit.org/show_bug.cgi?id=71826
     5
     6        Reviewed by Pavel Feldman.
     7
     8        * inspector/front-end/JavaScriptSourceFrame.js:
     9        (WebInspector.JavaScriptSourceFrame):
     10        (WebInspector.JavaScriptSourceFrame.prototype.requestContent):
     11        (WebInspector.JavaScriptSourceFrame.prototype.canEditSource):
     12        (WebInspector.JavaScriptSourceFrame.prototype.editContent):
     13        (WebInspector.JavaScriptSourceFrame.prototype.populateLineGutterContextMenu.else.editBreakpointCondition.didEditBreakpointCondition):
     14        (WebInspector.JavaScriptSourceFrame.prototype.populateLineGutterContextMenu.else):
     15        (WebInspector.JavaScriptSourceFrame.prototype.populateLineGutterContextMenu):
     16        (WebInspector.JavaScriptSourceFrame.prototype.didEditContent):
     17        (WebInspector.JavaScriptSourceFrame.prototype._onMouseDown):
     18        * inspector/front-end/ScriptsPanel.js:
     19
    1202011-11-09  Pavel Feldman  <pfeldman@google.com>
    221

  • trunk/Source/WebCore/inspector/front-end/JavaScriptSourceFrame.js

    r99573 r99717  
    4949
    5050    this._model = model;
     51    this._uiSourceCode = uiSourceCode;
    5152    this._popoverObjectGroup = "popover";
    5253    this._breakpoints = {};
    … …  
    6465    requestContent: function(callback)
    6566    {
    66         this._delegate.requestContent(callback);
     67        this._uiSourceCode.requestContent(callback);
    6768    },
    6869
    6970    canEditSource: function()
    7071    {
    71         return this._delegate.canEditScriptSource();
     72        return this._model.canEditScriptSource(this._uiSourceCode);
    7273    },
    7374
    … …  
    7980    editContent: function(newContent, callback)
    8081    {
    81         this._delegate.setScriptSource(newContent, callback);
     82        this._model.setScriptSource(this._uiSourceCode, newContent, callback);
    8283    },
    8384
    … …  
    100101    populateLineGutterContextMenu: function(lineNumber, contextMenu)
    101102    {
    102         contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Continue to here" : "Continue to Here"), this._delegate.continueToLine.bind(this._delegate, lineNumber));
    103 
    104         var breakpoint = this._delegate.findBreakpoint(lineNumber);
     103        contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Continue to here" : "Continue to Here"), this._model.continueToLine.bind(this._model, this._uiSourceCode, lineNumber));
     104
     105        var breakpoint = this._model.findBreakpoint(this._uiSourceCode, lineNumber);
    105106        if (!breakpoint) {
    106107            // This row doesn't have a breakpoint: We want to show Add Breakpoint and Add and Edit Breakpoint.
    … …  
    121122        } else {
    122123            // This row has a breakpoint, we want to show edit and remove breakpoint, and either disable or enable.
    123             contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Remove breakpoint" : "Remove Breakpoint"), this._delegate.removeBreakpoint.bind(this._delegate, lineNumber));
     124            contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Remove breakpoint" : "Remove Breakpoint"), this._model.removeBreakpoint.bind(this._model, this._uiSourceCode, lineNumber));
     125
    124126            function editBreakpointCondition()
    125127            {
    … …  
    127129                {
    128130                    if (committed)
    129                         this._delegate.updateBreakpoint(lineNumber, condition, breakpoint.enabled);
     131                        this._model.updateBreakpoint(this._uiSourceCode, lineNumber, condition, breakpoint.enabled);
    130132                }
    131133                this._editBreakpointCondition(lineNumber, breakpoint.condition, didEditBreakpointCondition.bind(this));
    … …  
    134136            function setBreakpointEnabled(enabled)
    135137            {
    136                 this._delegate.updateBreakpoint(lineNumber, breakpoint.condition, enabled);
     138                this._model.updateBreakpoint(this._uiSourceCode, lineNumber, breakpoint.condition, enabled);
    137139            }
    138140            if (breakpoint.enabled)
    … …  
    232234
    233235        for (var lineNumber in this._javaScriptSourceFrameState.breakpoints)
    234             this._delegate.removeBreakpoint(Number(lineNumber));
     236            this._model.removeBreakpoint(this._uiSourceCode, Number(lineNumber));
    235237
    236238        for (var lineNumber in newBreakpoints) {
    … …  
    365367        var lineNumber = target.lineNumber;
    366368
    367         var breakpoint = this._delegate.findBreakpoint(lineNumber);
     369        var breakpoint = this._model.findBreakpoint(this._uiSourceCode, lineNumber);
    368370        if (breakpoint) {
    369371            if (event.shiftKey)
    370                 this._delegate.updateBreakpoint(lineNumber, breakpoint.condition, !breakpoint.enabled);
     372                this._model.updateBreakpoint(this._uiSourceCode, lineNumber, breakpoint.condition, !breakpoint.enabled);
    371373            else
    372                 this._delegate.removeBreakpoint(lineNumber);
     374                this._model.removeBreakpoint(this._uiSourceCode, lineNumber);
    373375        } else
    374376            this._delegate.setBreakpoint(lineNumber, "", true);
    … …  
    474476
    475477WebInspector.JavaScriptSourceFrameDelegate.prototype = {
    476     requestContent: function(callback) { },
    477 
    478478    setBreakpoint: function(lineNumber, condition, enabled) { },
    479 
    480     removeBreakpoint: function(lineNumber) { },
    481 
    482     updateBreakpoint: function(lineNumber, condition, enabled) { },
    483 
    484     /**
    485      * @return {?WebInspector.Breakpoint}
    486      */
    487     findBreakpoint: function(lineNumber) { },
    488 
    489     continueToLine: function(lineNumber) { },
    490 
    491     canEditScriptSource: function() { return false; },
    492 
    493     setScriptSource: function(text, callback) { },
    494479
    495480    setScriptSourceIsBeingEdited: function(inEditMode) { },

  • trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js

    r99573 r99717  
    11761176
    11771177WebInspector.SourceFrameDelegateForScriptsPanel.prototype = {
    1178     requestContent: function(callback)
    1179     {
    1180         this._uiSourceCode.requestContent(callback);
    1181     },
    1182 
    11831178    setBreakpoint: function(lineNumber, condition, enabled)
    11841179    {
    … …  
    11871182        if (!this._scriptsPanel.breakpointsActivated)
    11881183            this._scriptsPanel._toggleBreakpointsClicked();
    1189     },
    1190 
    1191     updateBreakpoint: function(lineNumber, condition, enabled)
    1192     {
    1193         this._model.updateBreakpoint(this._uiSourceCode, lineNumber, condition, enabled);
    1194     },
    1195 
    1196     removeBreakpoint: function(lineNumber)
    1197     {
    1198         this._model.removeBreakpoint(this._uiSourceCode, lineNumber);
    1199     },
    1200 
    1201     findBreakpoint: function(lineNumber)
    1202     {
    1203         return this._model.findBreakpoint(this._uiSourceCode, lineNumber);
    1204     },
    1205 
    1206     continueToLine: function(lineNumber)
    1207     {
    1208         this._model.continueToLine(this._uiSourceCode, lineNumber);
    1209     },
    1210 
    1211     canEditScriptSource: function()
    1212     {
    1213         return this._model.canEditScriptSource(this._uiSourceCode);
    1214     },
    1215 
    1216     setScriptSource: function(text, callback)
    1217     {
    1218         this._model.setScriptSource(this._uiSourceCode, text, callback);
    12191184    },
    12201185
Note: See TracChangeset for help on using the changeset viewer.