Web Inspector: introduce JavaScriptSourceFrame class.

https://bugs.webkit.org/show_bug.cgi?id=67838

SourceFrame should not deal with JavaScript debugging since it is a base class for all source frame implementations.

Reviewed by Pavel Feldman.

* WebCore.gypi:
* WebCore.vcproj/WebCore.vcproj:
* inspector/front-end/JavaScriptSourceFrame.js: Added.
(WebInspector.JavaScriptSourceFrame):
(WebInspector.SourceFrameDelegateForScriptsPanel): moved from ScriptsPanel.js
(WebInspector.SourceFrameDelegateForScriptsPanel.prototype.requestContent):
(WebInspector.SourceFrameDelegateForScriptsPanel.prototype.debuggingSupported):
(WebInspector.SourceFrameDelegateForScriptsPanel.prototype.setBreakpoint):
(WebInspector.SourceFrameDelegateForScriptsPanel.prototype.updateBreakpoint):
(WebInspector.SourceFrameDelegateForScriptsPanel.prototype.removeBreakpoint):
(WebInspector.SourceFrameDelegateForScriptsPanel.prototype.findBreakpoint):
(WebInspector.SourceFrameDelegateForScriptsPanel.prototype.continueToLine):
(WebInspector.SourceFrameDelegateForScriptsPanel.prototype.canEditScriptSource):
(WebInspector.SourceFrameDelegateForScriptsPanel.prototype.setScriptSource):
(WebInspector.SourceFrameDelegateForScriptsPanel.prototype.setScriptSourceIsBeingEdited):
(WebInspector.SourceFrameDelegateForScriptsPanel.prototype.debuggerPaused):
(WebInspector.SourceFrameDelegateForScriptsPanel.prototype.evaluateInSelectedCallFrame):
(WebInspector.SourceFrameDelegateForScriptsPanel.prototype.releaseEvaluationResult):
(WebInspector.SourceFrameDelegateForScriptsPanel.prototype.suggestedFileName):
* inspector/front-end/ScriptsPanel.js:
(WebInspector.ScriptsPanel.prototype._createSourceFrame):
* inspector/front-end/WebKit.qrc:
* inspector/front-end/inspector.html:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@94855 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 94ca1184
2011-09-09 Pavel Podivilov <podivilov@chromium.org>
Web Inspector: introduce JavaScriptSourceFrame class.
https://bugs.webkit.org/show_bug.cgi?id=67838
SourceFrame should not deal with JavaScript debugging since it is a base class for all source frame implementations.
Reviewed by Pavel Feldman.
* WebCore.gypi:
* WebCore.vcproj/WebCore.vcproj:
* inspector/front-end/JavaScriptSourceFrame.js: Added.
(WebInspector.JavaScriptSourceFrame):
(WebInspector.SourceFrameDelegateForScriptsPanel): moved from ScriptsPanel.js
(WebInspector.SourceFrameDelegateForScriptsPanel.prototype.requestContent):
(WebInspector.SourceFrameDelegateForScriptsPanel.prototype.debuggingSupported):
(WebInspector.SourceFrameDelegateForScriptsPanel.prototype.setBreakpoint):
(WebInspector.SourceFrameDelegateForScriptsPanel.prototype.updateBreakpoint):
(WebInspector.SourceFrameDelegateForScriptsPanel.prototype.removeBreakpoint):
(WebInspector.SourceFrameDelegateForScriptsPanel.prototype.findBreakpoint):
(WebInspector.SourceFrameDelegateForScriptsPanel.prototype.continueToLine):
(WebInspector.SourceFrameDelegateForScriptsPanel.prototype.canEditScriptSource):
(WebInspector.SourceFrameDelegateForScriptsPanel.prototype.setScriptSource):
(WebInspector.SourceFrameDelegateForScriptsPanel.prototype.setScriptSourceIsBeingEdited):
(WebInspector.SourceFrameDelegateForScriptsPanel.prototype.debuggerPaused):
(WebInspector.SourceFrameDelegateForScriptsPanel.prototype.evaluateInSelectedCallFrame):
(WebInspector.SourceFrameDelegateForScriptsPanel.prototype.releaseEvaluationResult):
(WebInspector.SourceFrameDelegateForScriptsPanel.prototype.suggestedFileName):
* inspector/front-end/ScriptsPanel.js:
(WebInspector.ScriptsPanel.prototype._createSourceFrame):
* inspector/front-end/WebKit.qrc:
* inspector/front-end/inspector.html:
2011-09-09 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed, rolling out r94845.
......@@ -6368,6 +6368,7 @@
'inspector/front-end/InjectedFakeWorker.js',
'inspector/front-end/inspector.js',
'inspector/front-end/JavaScriptFormatter.js',
'inspector/front-end/JavaScriptSourceFrame.js',
'inspector/front-end/KeyboardShortcut.js',
'inspector/front-end/MetricsSidebarPane.js',
'inspector/front-end/NetworkItemView.js',
......
......@@ -69028,6 +69028,10 @@
RelativePath="..\inspector\front-end\JavaScriptContextManager.js"
>
</File>
<File
RelativePath="..\inspector\front-end\JavaScriptSourceFrame.js"
>
</File>
<File
RelativePath="..\inspector\front-end\JavaScriptFormatter.js"
>
/*
* Copyright (C) 2011 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
WebInspector.JavaScriptSourceFrame = function(model, uiSourceCode)
{
// FIXME: move all SourceFrame methods related to JavaScript debugging here and
// get rid of SourceFrame._delegate.
var delegate = new WebInspector.SourceFrameDelegateForScriptsPanel(model, uiSourceCode);
WebInspector.SourceFrame.call(this, delegate, uiSourceCode.url);
}
WebInspector.JavaScriptSourceFrame.prototype.__proto__ = WebInspector.SourceFrame.prototype;
WebInspector.SourceFrameDelegateForScriptsPanel = function(model, uiSourceCode)
{
WebInspector.SourceFrameDelegate.call(this);
this._model = model;
this._uiSourceCode = uiSourceCode;
this._popoverObjectGroup = "popover";
}
WebInspector.SourceFrameDelegateForScriptsPanel.prototype = {
requestContent: function(callback)
{
this._uiSourceCode.requestContent(callback);
},
debuggingSupported: function()
{
return true;
},
setBreakpoint: function(lineNumber, condition, enabled)
{
this._model.setBreakpoint(this._uiSourceCode, lineNumber, condition, enabled);
if (!WebInspector.panels.scripts.breakpointsActivated)
WebInspector.panels.scripts.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)
{
WebInspector.panels.scripts.setScriptSourceIsBeingEdited(this._uiSourceCode, inEditMode);
},
debuggerPaused: function()
{
return WebInspector.panels.scripts.paused;
},
evaluateInSelectedCallFrame: function(string, callback)
{
WebInspector.panels.scripts.evaluateInSelectedCallFrame(string, this._popoverObjectGroup, false, false, callback);
},
releaseEvaluationResult: function()
{
RuntimeAgent.releaseObjectGroup(this._popoverObjectGroup);
},
suggestedFileName: function()
{
var names = WebInspector.panels.scripts._folderAndDisplayNameForScriptURL(this._uiSourceCode.url);
return names.displayName || "untitled.js";
}
}
WebInspector.SourceFrameDelegateForScriptsPanel.prototype.__proto__ = WebInspector.SourceFrameDelegate.prototype;
......@@ -658,8 +658,7 @@ WebInspector.ScriptsPanel.prototype = {
_createSourceFrame: function(uiSourceCode)
{
var delegate = new WebInspector.SourceFrameDelegateForScriptsPanel(this._presentationModel, uiSourceCode);
var sourceFrame = new WebInspector.SourceFrame(delegate, uiSourceCode.url);
var sourceFrame = new WebInspector.JavaScriptSourceFrame(this._presentationModel, uiSourceCode);
this.addChildView(sourceFrame);
sourceFrame._uiSourceCode = uiSourceCode;
sourceFrame.addEventListener(WebInspector.SourceFrame.Events.Loaded, this._sourceFrameLoaded, this);
......@@ -1172,90 +1171,3 @@ WebInspector.ScriptsPanel.prototype = {
}
WebInspector.ScriptsPanel.prototype.__proto__ = WebInspector.Panel.prototype;
WebInspector.SourceFrameDelegateForScriptsPanel = function(model, uiSourceCode)
{
WebInspector.SourceFrameDelegate.call(this);
this._model = model;
this._uiSourceCode = uiSourceCode;
this._popoverObjectGroup = "popover";
}
WebInspector.SourceFrameDelegateForScriptsPanel.prototype = {
requestContent: function(callback)
{
this._uiSourceCode.requestContent(callback);
},
debuggingSupported: function()
{
return true;
},
setBreakpoint: function(lineNumber, condition, enabled)
{
this._model.setBreakpoint(this._uiSourceCode, lineNumber, condition, enabled);
if (!WebInspector.panels.scripts.breakpointsActivated)
WebInspector.panels.scripts.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)
{
WebInspector.panels.scripts.setScriptSourceIsBeingEdited(this._uiSourceCode, inEditMode);
},
debuggerPaused: function()
{
return WebInspector.panels.scripts.paused;
},
evaluateInSelectedCallFrame: function(string, callback)
{
WebInspector.panels.scripts.evaluateInSelectedCallFrame(string, this._popoverObjectGroup, false, false, callback);
},
releaseEvaluationResult: function()
{
RuntimeAgent.releaseObjectGroup(this._popoverObjectGroup);
},
suggestedFileName: function()
{
var names = WebInspector.panels.scripts._folderAndDisplayNameForScriptURL(this._uiSourceCode.url);
return names.displayName || "untitled.js";
}
}
WebInspector.SourceFrameDelegateForScriptsPanel.prototype.__proto__ = WebInspector.SourceFrameDelegate.prototype;
......@@ -67,6 +67,7 @@
<file>InspectorFrontendHostStub.js</file>
<file>JavaScriptContextManager.js</file>
<file>JavaScriptFormatter.js</file>
<file>JavaScriptSourceFrame.js</file>
<file>KeyboardShortcut.js</file>
<file>MetricsSidebarPane.js</file>
<file>NetworkItemView.js</file>
......
......@@ -111,6 +111,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<script type="text/javascript" src="SourceFrame.js"></script>
<script type="text/javascript" src="ResourceView.js"></script>
<script type="text/javascript" src="ScriptsPanel.js"></script>
<script type="text/javascript" src="JavaScriptSourceFrame.js"></script>
<script type="text/javascript" src="ResourcesPanel.js"></script>
<script type="text/javascript" src="ProfilesPanel.js"></script>
<script type="text/javascript" src="ConsolePanel.js"></script>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment