[webkit-changes] [99717] trunk

Wed, 09 Nov 2011 07:41:00 -0800

Title: [99717] trunk
Revision
99717
Author
[email protected]
Date
2011-11-09 07:40:50 -0800 (Wed, 09 Nov 2011)

Log Message

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

Reviewed by Pavel Feldman.

Source/WebCore:

* inspector/front-end/_javascript_SourceFrame.js:
(WebInspector._javascript_SourceFrame):
(WebInspector._javascript_SourceFrame.prototype.requestContent):
(WebInspector._javascript_SourceFrame.prototype.canEditSource):
(WebInspector._javascript_SourceFrame.prototype.editContent):
(WebInspector._javascript_SourceFrame.prototype.populateLineGutterContextMenu.else.editBreakpointCondition.didEditBreakpointCondition):
(WebInspector._javascript_SourceFrame.prototype.populateLineGutterContextMenu.else):
(WebInspector._javascript_SourceFrame.prototype.populateLineGutterContextMenu):
(WebInspector._javascript_SourceFrame.prototype.didEditContent):
(WebInspector._javascript_SourceFrame.prototype._onMouseDown):
* inspector/front-end/ScriptsPanel.js:

LayoutTests:

* http/tests/inspector/debugger-test.js:
(initialize_DebuggerTest):

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (99716 => 99717)


--- trunk/LayoutTests/ChangeLog	2011-11-09 15:35:11 UTC (rev 99716)
+++ trunk/LayoutTests/ChangeLog	2011-11-09 15:40:50 UTC (rev 99717)
@@ -1,3 +1,13 @@
+2011-11-09  Andrey Kosyakov  <[email protected]>
+
+        Web Inspector: [refactoring] remove a bunch of methods from _javascript_SourceFrameDelegate
+        https://bugs.webkit.org/show_bug.cgi?id=71826
+
+        Reviewed by Pavel Feldman.
+
+        * http/tests/inspector/debugger-test.js:
+        (initialize_DebuggerTest):
+
 2011-11-09  Alexander Pavlov  <[email protected]>
 
         Web Inspector: Provisionally change StylesSidebarPane section DOM layout to allow media queries

Modified: trunk/LayoutTests/http/tests/inspector/debugger-test.js (99716 => 99717)


--- trunk/LayoutTests/http/tests/inspector/debugger-test.js	2011-11-09 15:35:11 UTC (rev 99716)
+++ trunk/LayoutTests/http/tests/inspector/debugger-test.js	2011-11-09 15:40:50 UTC (rev 99717)
@@ -180,7 +180,7 @@
 
 InspectorTest.removeBreakpoint = function(sourceFrame, lineNumber)
 {
-    sourceFrame._delegate.removeBreakpoint(lineNumber);
+    sourceFrame._model.removeBreakpoint(sourceFrame._uiSourceCode, lineNumber);
 };

Modified: trunk/Source/WebCore/ChangeLog (99716 => 99717)


--- trunk/Source/WebCore/ChangeLog	2011-11-09 15:35:11 UTC (rev 99716)
+++ trunk/Source/WebCore/ChangeLog	2011-11-09 15:40:50 UTC (rev 99717)
@@ -1,3 +1,22 @@
+2011-11-09  Andrey Kosyakov  <[email protected]>
+
+        Web Inspector: [refactoring] remove a bunch of methods from _javascript_SourceFrameDelegate
+        https://bugs.webkit.org/show_bug.cgi?id=71826
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/front-end/_javascript_SourceFrame.js:
+        (WebInspector._javascript_SourceFrame):
+        (WebInspector._javascript_SourceFrame.prototype.requestContent):
+        (WebInspector._javascript_SourceFrame.prototype.canEditSource):
+        (WebInspector._javascript_SourceFrame.prototype.editContent):
+        (WebInspector._javascript_SourceFrame.prototype.populateLineGutterContextMenu.else.editBreakpointCondition.didEditBreakpointCondition):
+        (WebInspector._javascript_SourceFrame.prototype.populateLineGutterContextMenu.else):
+        (WebInspector._javascript_SourceFrame.prototype.populateLineGutterContextMenu):
+        (WebInspector._javascript_SourceFrame.prototype.didEditContent):
+        (WebInspector._javascript_SourceFrame.prototype._onMouseDown):
+        * inspector/front-end/ScriptsPanel.js:
+
 2011-11-09  Pavel Feldman  <[email protected]>
 
         Not reviewed: annotate inspector front-end _javascript_ so that it compiled again.

Modified: trunk/Source/WebCore/inspector/front-end/_javascript_SourceFrame.js (99716 => 99717)


--- trunk/Source/WebCore/inspector/front-end/_javascript_SourceFrame.js	2011-11-09 15:35:11 UTC (rev 99716)
+++ trunk/Source/WebCore/inspector/front-end/_javascript_SourceFrame.js	2011-11-09 15:40:50 UTC (rev 99717)
@@ -48,6 +48,7 @@
     this.addEventListener(WebInspector.SourceFrame.Events.Loaded, this._onTextViewerContentLoaded, this);
 
     this._model = model;
+    this._uiSourceCode = uiSourceCode; 
     this._popoverObjectGroup = "popover";
     this._breakpoints = {};
 }
@@ -63,12 +64,12 @@
     // SourceFrame overrides
     requestContent: function(callback)
     {
-        this._delegate.requestContent(callback);
+        this._uiSourceCode.requestContent(callback);
     },
 
     canEditSource: function()
     {
-        return this._delegate.canEditScriptSource();
+        return this._model.canEditScriptSource(this._uiSourceCode);
     },
 
     suggestedFileName: function()
@@ -78,7 +79,7 @@
 
     editContent: function(newContent, callback)
     {
-        this._delegate.setScriptSource(newContent, callback);
+        this._model.setScriptSource(this._uiSourceCode, newContent, callback);
     },
 
     _onContentChanged: function()
@@ -99,9 +100,9 @@
 
     populateLineGutterContextMenu: function(lineNumber, contextMenu)
     {
-        contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Continue to here" : "Continue to Here"), this._delegate.continueToLine.bind(this._delegate, lineNumber));
+        contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Continue to here" : "Continue to Here"), this._model.continueToLine.bind(this._model, this._uiSourceCode, lineNumber));
 
-        var breakpoint = this._delegate.findBreakpoint(lineNumber);
+        var breakpoint = this._model.findBreakpoint(this._uiSourceCode, lineNumber);
         if (!breakpoint) {
             // This row doesn't have a breakpoint: We want to show Add Breakpoint and Add and Edit Breakpoint.
             contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Add breakpoint" : "Add Breakpoint"), this._delegate.setBreakpoint.bind(this._delegate, lineNumber, "", true));
@@ -120,20 +121,21 @@
             contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Add conditional breakpoint…" : "Add Conditional Breakpoint…"), addConditionalBreakpoint.bind(this));
         } else {
             // This row has a breakpoint, we want to show edit and remove breakpoint, and either disable or enable.
-            contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Remove breakpoint" : "Remove Breakpoint"), this._delegate.removeBreakpoint.bind(this._delegate, lineNumber));
+            contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Remove breakpoint" : "Remove Breakpoint"), this._model.removeBreakpoint.bind(this._model, this._uiSourceCode, lineNumber));
+
             function editBreakpointCondition()
             {
                 function didEditBreakpointCondition(committed, condition)
                 {
                     if (committed)
-                        this._delegate.updateBreakpoint(lineNumber, condition, breakpoint.enabled);
+                        this._model.updateBreakpoint(this._uiSourceCode, lineNumber, condition, breakpoint.enabled);
                 }
                 this._editBreakpointCondition(lineNumber, breakpoint.condition, didEditBreakpointCondition.bind(this));
             }
             contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Edit breakpoint…" : "Edit Breakpoint…"), editBreakpointCondition.bind(this));
             function setBreakpointEnabled(enabled)
             {
-                this._delegate.updateBreakpoint(lineNumber, breakpoint.condition, enabled);
+                this._model.updateBreakpoint(this._uiSourceCode, lineNumber, breakpoint.condition, enabled);
             }
             if (breakpoint.enabled)
                 contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Disable breakpoint" : "Disable Breakpoint"), setBreakpointEnabled.bind(this, false));
@@ -231,7 +233,7 @@
         }
 
         for (var lineNumber in this._javaScriptSourceFrameState.breakpoints)
-            this._delegate.removeBreakpoint(Number(lineNumber));
+            this._model.removeBreakpoint(this._uiSourceCode, Number(lineNumber));
 
         for (var lineNumber in newBreakpoints) {
             var breakpoint = newBreakpoints[lineNumber];
@@ -364,12 +366,12 @@
             return;
         var lineNumber = target.lineNumber;
 
-        var breakpoint = this._delegate.findBreakpoint(lineNumber);
+        var breakpoint = this._model.findBreakpoint(this._uiSourceCode, lineNumber);
         if (breakpoint) {
             if (event.shiftKey)
-                this._delegate.updateBreakpoint(lineNumber, breakpoint.condition, !breakpoint.enabled);
+                this._model.updateBreakpoint(this._uiSourceCode, lineNumber, breakpoint.condition, !breakpoint.enabled);
             else
-                this._delegate.removeBreakpoint(lineNumber);
+                this._model.removeBreakpoint(this._uiSourceCode, lineNumber);
         } else
             this._delegate.setBreakpoint(lineNumber, "", true);
         event.preventDefault();
@@ -473,25 +475,8 @@
 }
 
 WebInspector._javascript_SourceFrameDelegate.prototype = {
-    requestContent: function(callback) { },
-
     setBreakpoint: function(lineNumber, condition, enabled) { },
 
-    removeBreakpoint: function(lineNumber) { },
-
-    updateBreakpoint: function(lineNumber, condition, enabled) { },
-
-    /**
-     * @return {?WebInspector.Breakpoint}
-     */
-    findBreakpoint: function(lineNumber) { },
-
-    continueToLine: function(lineNumber) { },
-
-    canEditScriptSource: function() { return false; },
-
-    setScriptSource: function(text, callback) { },
-
     setScriptSourceIsBeingEdited: function(inEditMode) { },
 
     suggestedFileName: function() { },

Modified: trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js (99716 => 99717)


--- trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js	2011-11-09 15:35:11 UTC (rev 99716)
+++ trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js	2011-11-09 15:40:50 UTC (rev 99717)
@@ -1175,11 +1175,6 @@
 }
 
 WebInspector.SourceFrameDelegateForScriptsPanel.prototype = {
-    requestContent: function(callback)
-    {
-        this._uiSourceCode.requestContent(callback);
-    },
-
     setBreakpoint: function(lineNumber, condition, enabled)
     {
         this._model.setBreakpoint(this._uiSourceCode, lineNumber, condition, enabled);
@@ -1188,36 +1183,6 @@
             this._scriptsPanel._toggleBreakpointsClicked();
     },
 
-    updateBreakpoint: function(lineNumber, condition, enabled)
-    {
-        this._model.updateBreakpoint(this._uiSourceCode, lineNumber, condition, enabled);
-    },
-
-    removeBreakpoint: function(lineNumber)
-    {
-        this._model.removeBreakpoint(this._uiSourceCode, lineNumber);
-    },
-
-    findBreakpoint: function(lineNumber)
-    {
-        return this._model.findBreakpoint(this._uiSourceCode, lineNumber);
-    },
-
-    continueToLine: function(lineNumber)
-    {
-        this._model.continueToLine(this._uiSourceCode, lineNumber);
-    },
-
-    canEditScriptSource: function()
-    {
-        return this._model.canEditScriptSource(this._uiSourceCode);
-    },
-
-    setScriptSource: function(text, callback)
-    {
-        this._model.setScriptSource(this._uiSourceCode, text, callback);
-    },
-
     setScriptSourceIsBeingEdited: function(inEditMode)
     {
         this._scriptsPanel._setScriptSourceIsBeingEdited(this._uiSourceCode, inEditMode);

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

Reply via email to