Diff
Modified: trunk/Source/WebCore/ChangeLog (96931 => 96932)
--- trunk/Source/WebCore/ChangeLog 2011-10-07 12:34:12 UTC (rev 96931)
+++ trunk/Source/WebCore/ChangeLog 2011-10-07 13:55:43 UTC (rev 96932)
@@ -1,3 +1,57 @@
+2011-10-07 Pavel Feldman <pfeld...@google.com>
+
+ Web Inspector: make ScriptsPanel compile
+ https://bugs.webkit.org/show_bug.cgi?id=69623
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/compile-front-end.sh:
+ * inspector/front-end/CallStackSidebarPane.js:
+ (WebInspector.CallStackSidebarPane.prototype.update):
+ (WebInspector.CallStackSidebarPane.prototype._placardSelected):
+ * inspector/front-end/DebuggerModel.js:
+ * inspector/front-end/_javascript_SourceFrame.js:
+ (WebInspector._javascript_SourceFrame):
+ * inspector/front-end/KeyboardShortcut.js:
+ * inspector/front-end/Object.js:
+ * inspector/front-end/ObjectPropertiesSection.js:
+ * inspector/front-end/ScopeChainSidebarPane.js:
+ (WebInspector.ScopeChainSidebarPane.prototype.update):
+ * inspector/front-end/ScriptsPanel.js:
+ (WebInspector.ScriptsPanel.prototype._setScriptSourceIsBeingEdited):
+ (WebInspector.ScriptsPanel.prototype._createSourceFrame):
+ (WebInspector.ScriptsPanel.prototype._toggleBreakpointsClicked):
+ (WebInspector.SourceFrameDelegateForScriptsPanel):
+ (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/StatusBarButton.js:
+ * inspector/front-end/WatchExpressionsSidebarPane.js:
+ (WebInspector.WatchExpressionsSection.prototype.update.appendResult):
+ (WebInspector.WatchExpressionsSection.prototype.update):
+ (WebInspector.WatchExpressionTreeElement.prototype.startEditing):
+ * inspector/front-end/WorkerManager.js:
+ (WebInspector.WorkerManager.prototype._openInspectorWindow):
+ (WebInspector.WorkerManager.prototype._pageInspectorClosing):
+ (WebInspector.DedicatedWorkerMessageForwarder.prototype._receiveMessage):
+ * inspector/front-end/WorkersSidebarPane.js:
+ (WebInspector.WorkersSidebarPane.prototype.removeWorker):
+ * inspector/front-end/externs.js:
+ (WebInspector.linkifyURL):
+ (InjectedFakeWorker):
+ * inspector/front-end/inspector.js:
+
2011-10-07 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r96879.
Modified: trunk/Source/WebCore/inspector/compile-front-end.sh (96931 => 96932)
--- trunk/Source/WebCore/inspector/compile-front-end.sh 2011-10-07 12:34:12 UTC (rev 96931)
+++ trunk/Source/WebCore/inspector/compile-front-end.sh 2011-10-07 13:55:43 UTC (rev 96932)
@@ -72,7 +72,7 @@
--js Source/WebCore/inspector/front-end/Resource.js \
--js Source/WebCore/inspector/front-end/NetworkManager.js \
--js Source/WebCore/inspector/front-end/UISourceCode.js \
- --module jsmodule_ui:37:jsmodule_common \
+ --module jsmodule_ui:35:jsmodule_common \
--js Source/WebCore/inspector/front-end/Checkbox.js \
--js Source/WebCore/inspector/front-end/Color.js \
--js Source/WebCore/inspector/front-end/ContextMenu.js \
@@ -108,27 +108,29 @@
--js Source/WebCore/inspector/front-end/UIUtils.js \
--js Source/WebCore/inspector/front-end/View.js \
--js Source/WebCore/inspector/front-end/WelcomeView.js \
- --module jsmodule_inspector_views:31:jsmodule_sdk,jsmodule_ui \
- --js Source/WebCore/inspector/front-end/ApplicationCacheItemsView.js \
+ --module jsmodule_inspector_views:14:jsmodule_sdk,jsmodule_ui \
--js Source/WebCore/inspector/front-end/ConsoleMessage.js \
- --js Source/WebCore/inspector/front-end/ConsoleView.js \
- --js Source/WebCore/inspector/front-end/CookieItemsView.js \
- --js Source/WebCore/inspector/front-end/DatabaseQueryView.js \
- --js Source/WebCore/inspector/front-end/DatabaseTableView.js \
--js Source/WebCore/inspector/front-end/BreakpointsSidebarPane.js \
--js Source/WebCore/inspector/front-end/DOMBreakpointsSidebarPane.js \
--js Source/WebCore/inspector/front-end/DOMPresentationUtils.js \
- --js Source/WebCore/inspector/front-end/DOMStorageItemsView.js \
--js Source/WebCore/inspector/front-end/ElementsTreeOutline.js \
--js Source/WebCore/inspector/front-end/EventListenersSidebarPane.js \
- --js Source/WebCore/inspector/front-end/FontView.js \
--js Source/WebCore/inspector/front-end/GoToLineDialog.js \
- --js Source/WebCore/inspector/front-end/ImageView.js \
--js Source/WebCore/inspector/front-end/_javascript_ContextManager.js \
- --js Source/WebCore/inspector/front-end/MetricsSidebarPane.js \
- --js Source/WebCore/inspector/front-end/NetworkItemView.js \
--js Source/WebCore/inspector/front-end/ObjectPopoverHelper.js \
--js Source/WebCore/inspector/front-end/ObjectPropertiesSection.js \
+ --js Source/WebCore/inspector/front-end/SourceFrame.js \
+ --js Source/WebCore/inspector/front-end/TimelineAgent.js \
+ --js Source/WebCore/inspector/front-end/TimelineGrid.js \
+ --js Source/WebCore/inspector/front-end/TimelineManager.js \
+ --module jsmodule_elements:3:jsmodule_inspector_views \
+ --js Source/WebCore/inspector/front-end/StylesSidebarPane.js \
+ --js Source/WebCore/inspector/front-end/MetricsSidebarPane.js \
+ --js Source/WebCore/inspector/front-end/ElementsPanel.js \
+ --module jsmodule_network:12:jsmodule_inspector_views \
+ --js Source/WebCore/inspector/front-end/FontView.js \
+ --js Source/WebCore/inspector/front-end/ImageView.js \
+ --js Source/WebCore/inspector/front-end/NetworkItemView.js \
--js Source/WebCore/inspector/front-end/ResourceCookiesView.js \
--js Source/WebCore/inspector/front-end/ResourceHeadersView.js \
--js Source/WebCore/inspector/front-end/ResourceHTMLView.js \
@@ -137,26 +139,27 @@
--js Source/WebCore/inspector/front-end/ResourceResponseView.js \
--js Source/WebCore/inspector/front-end/ResourceTimingView.js \
--js Source/WebCore/inspector/front-end/ResourceView.js \
- --js Source/WebCore/inspector/front-end/SourceFrame.js \
- --js Source/WebCore/inspector/front-end/StylesSidebarPane.js \
- --js Source/WebCore/inspector/front-end/TimelineAgent.js \
- --js Source/WebCore/inspector/front-end/TimelineGrid.js \
- --js Source/WebCore/inspector/front-end/TimelineManager.js \
- --module jsmodule_inspector_panels:3:jsmodule_inspector_views \
- --js Source/WebCore/inspector/front-end/ElementsPanel.js \
--js Source/WebCore/inspector/front-end/NetworkPanel.js \
- --js Source/WebCore/inspector/front-end/ResourcesPanel.js
+ --module jsmodule_resources:6:jsmodule_inspector_views \
+ --js Source/WebCore/inspector/front-end/ApplicationCacheItemsView.js \
+ --js Source/WebCore/inspector/front-end/CookieItemsView.js \
+ --js Source/WebCore/inspector/front-end/DatabaseQueryView.js \
+ --js Source/WebCore/inspector/front-end/DatabaseTableView.js \
+ --js Source/WebCore/inspector/front-end/DOMStorageItemsView.js \
+ --js Source/WebCore/inspector/front-end/ResourcesPanel.js \
+ --module jsmodule_scripts:7:jsmodule_inspector_views \
+ --js Source/WebCore/inspector/front-end/CallStackSidebarPane.js \
+ --js Source/WebCore/inspector/front-end/ScopeChainSidebarPane.js \
+ --js Source/WebCore/inspector/front-end/_javascript_SourceFrame.js \
+ --js Source/WebCore/inspector/front-end/ScriptsPanel.js \
+ --js Source/WebCore/inspector/front-end/WatchExpressionsSidebarPane.js \
+ --js Source/WebCore/inspector/front-end/WorkerManager.js \
+ --js Source/WebCore/inspector/front-end/WorkersSidebarPane.js \
+ --module jsmodule_console:2:jsmodule_inspector_views \
+ --js Source/WebCore/inspector/front-end/ConsoleView.js \
+ --js Source/WebCore/inspector/front-end/ConsolePanel.js
# To be compiled...
-# [Scripts]
-# _javascript_Formatter
-# _javascript_SourceFrame
-# ScopeChainSidebarPane
-# ScriptFormatterWorker
-# ScriptsPanel
-# WatchExpressionsSidebarPane
-# CallStackSidebarPane
-#
# [Timeline]
# TimelineOverviewPane
# TimelinePanel
@@ -182,9 +185,6 @@
# AuditRules
# AuditsPanel
#
-# [Console]
-# ConsolePanel
-#
# [Extensions]
# ExtensionAPI
# ExtensionAuditCategory
@@ -199,8 +199,5 @@
# SourceHTMLTokenizer
# SourceJavaScriptTokenizer
# TestController
-#
-# [Workers]
-# InjectedFakeWorker
-# WorkerManager
-# WorkersSidebarPane
+# _javascript_Formatter
+# ScriptFormatterWorker
Modified: trunk/Source/WebCore/inspector/front-end/CallStackSidebarPane.js (96931 => 96932)
--- trunk/Source/WebCore/inspector/front-end/CallStackSidebarPane.js 2011-10-07 12:34:12 UTC (rev 96931)
+++ trunk/Source/WebCore/inspector/front-end/CallStackSidebarPane.js 2011-10-07 13:55:43 UTC (rev 96932)
@@ -23,6 +23,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+/**
+ * @constructor
+ * @extends {WebInspector.SidebarPane}
+ */
WebInspector.CallStackSidebarPane = function(model)
{
WebInspector.SidebarPane.call(this, WebInspector.UIString("Call Stack"));
@@ -32,7 +36,7 @@
}
WebInspector.CallStackSidebarPane.prototype = {
- update: function(callFrames, details)
+ update: function(callFrames)
{
this.bodyElement.removeChildren();
@@ -99,7 +103,7 @@
return -1;
},
- _placardSelected: function(placard, event)
+ _placardSelected: function(placard)
{
this._model.selectedCallFrame = placard.callFrame;
},
Modified: trunk/Source/WebCore/inspector/front-end/ConsolePanel.js (96931 => 96932)
--- trunk/Source/WebCore/inspector/front-end/ConsolePanel.js 2011-10-07 12:34:12 UTC (rev 96931)
+++ trunk/Source/WebCore/inspector/front-end/ConsolePanel.js 2011-10-07 13:55:43 UTC (rev 96932)
@@ -26,6 +26,10 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+/**
+ * @constructor
+ * @extends {WebInspector.Panel}
+ */
WebInspector.ConsolePanel = function()
{
WebInspector.Panel.call(this, "console");
Modified: trunk/Source/WebCore/inspector/front-end/DebuggerModel.js (96931 => 96932)
--- trunk/Source/WebCore/inspector/front-end/DebuggerModel.js 2011-10-07 12:34:12 UTC (rev 96931)
+++ trunk/Source/WebCore/inspector/front-end/DebuggerModel.js 2011-10-07 13:55:43 UTC (rev 96932)
@@ -59,6 +59,13 @@
Reset: "reset"
}
+WebInspector.DebuggerModel.BreakReason = {
+ DOM: "DOM",
+ EventListener: "EventListener",
+ XHR: "XHR",
+ Exception: "exception"
+}
+
WebInspector.DebuggerModel.prototype = {
enableDebugger: function()
{
Modified: trunk/Source/WebCore/inspector/front-end/_javascript_SourceFrame.js (96931 => 96932)
--- trunk/Source/WebCore/inspector/front-end/_javascript_SourceFrame.js 2011-10-07 12:34:12 UTC (rev 96931)
+++ trunk/Source/WebCore/inspector/front-end/_javascript_SourceFrame.js 2011-10-07 13:55:43 UTC (rev 96932)
@@ -31,103 +31,14 @@
/**
* @constructor
* @extends {WebInspector.SourceFrame}
+ * @param {WebInspector.SourceFrameDelegate} delegate
+ * @param {WebInspector.UISourceCode} uiSourceCode
*/
-WebInspector._javascript_SourceFrame = function(model, uiSourceCode)
+WebInspector._javascript_SourceFrame = function(delegate, 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._javascript_SourceFrame.prototype.__proto__ = WebInspector.SourceFrame.prototype;
-
-/**
- * @constructor
- * @implements {WebInspector.SourceFrameDelegate}
- */
-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;
Modified: trunk/Source/WebCore/inspector/front-end/KeyboardShortcut.js (96931 => 96932)
--- trunk/Source/WebCore/inspector/front-end/KeyboardShortcut.js 2011-10-07 12:34:12 UTC (rev 96931)
+++ trunk/Source/WebCore/inspector/front-end/KeyboardShortcut.js 2011-10-07 13:55:43 UTC (rev 96932)
@@ -117,6 +117,9 @@
return WebInspector.KeyboardShortcut._makeKeyFromCodeAndModifiers(keyboardEvent.keyCode, modifiers);
}
+/**
+ * @param {number=} modifiers
+ */
WebInspector.KeyboardShortcut.makeDescriptor = function(key, modifiers)
{
return {
Modified: trunk/Source/WebCore/inspector/front-end/Object.js (96931 => 96932)
--- trunk/Source/WebCore/inspector/front-end/Object.js 2011-10-07 12:34:12 UTC (rev 96931)
+++ trunk/Source/WebCore/inspector/front-end/Object.js 2011-10-07 13:55:43 UTC (rev 96932)
@@ -101,3 +101,5 @@
return event.defaultPrevented;
}
}
+
+WebInspector.notifications = new WebInspector.Object();
Modified: trunk/Source/WebCore/inspector/front-end/ObjectPropertiesSection.js (96931 => 96932)
--- trunk/Source/WebCore/inspector/front-end/ObjectPropertiesSection.js 2011-10-07 12:34:12 UTC (rev 96931)
+++ trunk/Source/WebCore/inspector/front-end/ObjectPropertiesSection.js 2011-10-07 13:55:43 UTC (rev 96932)
@@ -31,7 +31,7 @@
* @param {string=} title
* @param {string=} subtitle
* @param {string=} emptyPlaceholder
- * @param {string=} ignoreHasOwnProperty
+ * @param {boolean=} ignoreHasOwnProperty
* @param {Array.<WebInspector.RemoteObjectProperty>=} extraProperties
* @param {function()=} treeElementConstructor
*/
Modified: trunk/Source/WebCore/inspector/front-end/ScopeChainSidebarPane.js (96931 => 96932)
--- trunk/Source/WebCore/inspector/front-end/ScopeChainSidebarPane.js 2011-10-07 12:34:12 UTC (rev 96931)
+++ trunk/Source/WebCore/inspector/front-end/ScopeChainSidebarPane.js 2011-10-07 13:55:43 UTC (rev 96932)
@@ -24,6 +24,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+/**
+ * @constructor
+ * @extends {WebInspector.SidebarPane}
+ */
WebInspector.ScopeChainSidebarPane = function()
{
WebInspector.SidebarPane.call(this, WebInspector.UIString("Scope Variables"));
@@ -76,7 +80,7 @@
extraProperties = [ new WebInspector.RemoteObjectProperty("this", WebInspector.RemoteObject.fromPayload(callFrame.this)) ];
if (i == 0) {
var details = WebInspector.debuggerModel.debuggerPausedDetails;
- var exception = details.reason === WebInspector.ScriptsPanel.BreakReason.Exception ? details.auxData : 0;
+ var exception = details.reason === WebInspector.DebuggerModel.BreakReason.Exception ? details.auxData : 0;
if (exception) {
extraProperties = extraProperties || [];
extraProperties.push(new WebInspector.RemoteObjectProperty("<exception>", WebInspector.RemoteObject.fromPayload(exception)));
@@ -117,6 +121,10 @@
WebInspector.ScopeChainSidebarPane.prototype.__proto__ = WebInspector.SidebarPane.prototype;
+/**
+ * @constructor
+ * @extends {WebInspector.ObjectPropertyTreeElement}
+ */
WebInspector.ScopeVariableTreeElement = function(property)
{
WebInspector.ObjectPropertyTreeElement.call(this, property);
Modified: trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js (96931 => 96932)
--- trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js 2011-10-07 12:34:12 UTC (rev 96931)
+++ trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js 2011-10-07 13:55:43 UTC (rev 96932)
@@ -24,6 +24,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+/**
+ * @constructor
+ * @extends {WebInspector.Panel}
+ */
WebInspector.ScriptsPanel = function(presentationModel)
{
WebInspector.Panel.call(this, "scripts");
@@ -79,7 +83,7 @@
this.toggleBreakpointsButton = new WebInspector.StatusBarButton(WebInspector.UIString("Deactivate all breakpoints."), "toggle-breakpoints");
this.toggleBreakpointsButton.toggled = true;
- this.toggleBreakpointsButton.addEventListener("click", this.toggleBreakpointsClicked.bind(this), false);
+ this.toggleBreakpointsButton.addEventListener("click", this._toggleBreakpointsClicked.bind(this), false);
this.sidebarButtonsElement.appendChild(this.toggleBreakpointsButton.element);
this.debuggerStatusElement = document.createElement("div");
@@ -190,13 +194,6 @@
PauseOnUncaughtExceptions: "uncaught"
};
-WebInspector.ScriptsPanel.BreakReason = {
- DOM: "DOM",
- EventListener: "EventListener",
- XHR: "XHR",
- Exception: "exception"
-}
-
WebInspector.ScriptsPanel.prototype = {
get toolbarItemLabel()
{
@@ -390,7 +387,7 @@
return { domain: (parsedURL ? parsedURL.host : ""), folderName: folderName, displayName: displayName };
},
- setScriptSourceIsBeingEdited: function(uiSourceCode, inEditMode)
+ _setScriptSourceIsBeingEdited: function(uiSourceCode, inEditMode)
{
var option = uiSourceCode._option;
if (!option)
@@ -492,25 +489,25 @@
WebInspector.setCurrentPanel(this);
- this.sidebarPanes.callstack.update(callFrames, details);
+ this.sidebarPanes.callstack.update(callFrames);
this.sidebarPanes.callstack.selectedCallFrame = this._presentationModel.selectedCallFrame;
- if (details.reason === WebInspector.ScriptsPanel.BreakReason.DOM) {
+ if (details.reason === WebInspector.DebuggerModel.BreakReason.DOM) {
this.sidebarPanes.domBreakpoints.highlightBreakpoint(details.auxData);
function didCreateBreakpointHitStatusMessage(element)
{
this.sidebarPanes.callstack.setStatus(element);
}
this.sidebarPanes.domBreakpoints.createBreakpointHitStatusMessage(details.auxData, didCreateBreakpointHitStatusMessage.bind(this));
- } else if (details.reason === WebInspector.ScriptsPanel.BreakReason.EventListener) {
+ } else if (details.reason === WebInspector.DebuggerModel.BreakReason.EventListener) {
var eventName = details.auxData.eventName;
this.sidebarPanes.eventListenerBreakpoints.highlightBreakpoint(details.auxData.eventName);
var eventNameForUI = WebInspector.EventListenerBreakpointsSidebarPane.eventNameForUI(eventName);
this.sidebarPanes.callstack.setStatus(WebInspector.UIString("Paused on a \"%s\" Event Listener.", eventNameForUI));
- } else if (details.reason === WebInspector.ScriptsPanel.BreakReason.XHR) {
- this.sidebarPanes.xhrBreakpoints.highlightBreakpoint(details.auxData.breakpointURL);
+ } else if (details.reason === WebInspector.DebuggerModel.BreakReason.XHR) {
+ this.sidebarPanes.xhrBreakpoints.highlightBreakpoint(details.auxData["breakpointURL"]);
this.sidebarPanes.callstack.setStatus(WebInspector.UIString("Paused on a XMLHttpRequest."));
- } else if (details.reason === WebInspector.ScriptsPanel.BreakReason.Exception) {
+ } else if (details.reason === WebInspector.DebuggerModel.BreakReason.Exception) {
this.sidebarPanes.callstack.setStatus(WebInspector.UIString("Paused on exception: '%s'.", details.auxData.description));
} else {
function didGetUILocation(uiLocation)
@@ -669,7 +666,9 @@
_createSourceFrame: function(uiSourceCode)
{
- var sourceFrame = new WebInspector._javascript_SourceFrame(this._presentationModel, uiSourceCode);
+ var delegate = new WebInspector.SourceFrameDelegateForScriptsPanel(this, uiSourceCode);
+ var sourceFrame = new WebInspector._javascript_SourceFrame(delegate, uiSourceCode);
+
this.addChildView(sourceFrame);
sourceFrame._uiSourceCode = uiSourceCode;
sourceFrame.addEventListener(WebInspector.SourceFrame.Events.Loaded, this._sourceFrameLoaded, this);
@@ -994,7 +993,7 @@
DebuggerAgent.stepOut();
},
- toggleBreakpointsClicked: function()
+ _toggleBreakpointsClicked: function()
{
this.toggleBreakpointsButton.toggled = !this.toggleBreakpointsButton.toggled;
if (this.toggleBreakpointsButton.toggled) {
@@ -1182,3 +1181,97 @@
}
WebInspector.ScriptsPanel.prototype.__proto__ = WebInspector.Panel.prototype;
+
+/**
+ * @constructor
+ * @implements {WebInspector.SourceFrameDelegate}
+ * @param {WebInspector.ScriptsPanel} scriptsPanel
+ * @param {WebInspector.UISourceCode} uiSourceCode
+ */
+WebInspector.SourceFrameDelegateForScriptsPanel = function(scriptsPanel, uiSourceCode)
+{
+ WebInspector.SourceFrameDelegate.call(this);
+
+ this._scriptsPanel = scriptsPanel;
+ this._model = this._scriptsPanel._presentationModel;
+ 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 (!this._scriptsPanel.breakpointsActivated)
+ 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);
+ },
+
+ debuggerPaused: function()
+ {
+ return WebInspector.panels.scripts.paused;
+ },
+
+ evaluateInSelectedCallFrame: function(string, callback)
+ {
+ this._scriptsPanel.evaluateInSelectedCallFrame(string, this._popoverObjectGroup, false, false, callback);
+ },
+
+ releaseEvaluationResult: function()
+ {
+ RuntimeAgent.releaseObjectGroup(this._popoverObjectGroup);
+ },
+
+ suggestedFileName: function()
+ {
+ var names = this._scriptsPanel._folderAndDisplayNameForScriptURL(this._uiSourceCode.url);
+ return names.displayName || "untitled.js";
+ }
+}
+
+WebInspector.SourceFrameDelegateForScriptsPanel.prototype.__proto__ = WebInspector.SourceFrameDelegate.prototype;
Modified: trunk/Source/WebCore/inspector/front-end/StatusBarButton.js (96931 => 96932)
--- trunk/Source/WebCore/inspector/front-end/StatusBarButton.js 2011-10-07 12:34:12 UTC (rev 96931)
+++ trunk/Source/WebCore/inspector/front-end/StatusBarButton.js 2011-10-07 13:55:43 UTC (rev 96932)
@@ -31,7 +31,7 @@
/**
* @extends {WebInspector.Object}
* @constructor
- * @param {Array.<string>=} states
+ * @param {number=} states
*/
WebInspector.StatusBarButton = function(title, className, states)
{
Modified: trunk/Source/WebCore/inspector/front-end/WatchExpressionsSidebarPane.js (96931 => 96932)
--- trunk/Source/WebCore/inspector/front-end/WatchExpressionsSidebarPane.js 2011-10-07 12:34:12 UTC (rev 96931)
+++ trunk/Source/WebCore/inspector/front-end/WatchExpressionsSidebarPane.js 2011-10-07 13:55:43 UTC (rev 96932)
@@ -28,6 +28,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+/**
+ * @constructor
+ * @extends {WebInspector.SidebarPane}
+ */
WebInspector.WatchExpressionsSidebarPane = function()
{
WebInspector.SidebarPane.call(this, WebInspector.UIString("Watch Expressions"));
@@ -105,11 +109,16 @@
WebInspector.WatchExpressionsSidebarPane.prototype.__proto__ = WebInspector.SidebarPane.prototype;
+/**
+ * @constructor
+ * @extends {WebInspector.ObjectPropertiesSection}
+ */
WebInspector.WatchExpressionsSection = function()
{
this._watchObjectGroupId = "watch-group";
WebInspector.ObjectPropertiesSection.call(this);
+
this.emptyElement = document.createElement("div");
this.emptyElement.className = "info";
this.emptyElement.textContent = WebInspector.UIString("No Watch Expressions");
@@ -159,7 +168,7 @@
if (this._newExpressionAdded) {
delete this._newExpressionAdded;
- treeElement = this.findAddedTreeElement();
+ var treeElement = this.findAddedTreeElement();
if (treeElement)
treeElement.startEditing();
}
@@ -285,6 +294,10 @@
return 1;
}
+/**
+ * @constructor
+ * @extends {WebInspector.ObjectPropertyTreeElement}
+ */
WebInspector.WatchExpressionTreeElement = function(property)
{
WebInspector.ObjectPropertyTreeElement.call(this, property);
@@ -326,11 +339,7 @@
this.listItemElement.addStyleClass("editing-sub-part");
- WebInspector.startEditing(this.nameElement, {
- context: context,
- commitHandler: this.editingCommitted.bind(this),
- cancelHandler: this.editingCancelled.bind(this)
- });
+ WebInspector.startEditing(this.nameElement, new WebInspector.EditingConfig(this.editingCommitted.bind(this), this.editingCancelled.bind(this), context));
},
editingCancelled: function(element, context)
Modified: trunk/Source/WebCore/inspector/front-end/WorkerManager.js (96931 => 96932)
--- trunk/Source/WebCore/inspector/front-end/WorkerManager.js 2011-10-07 12:34:12 UTC (rev 96931)
+++ trunk/Source/WebCore/inspector/front-end/WorkerManager.js 2011-10-07 13:55:43 UTC (rev 96932)
@@ -28,6 +28,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+/**
+ * @constructor
+ * @extends {WebInspector.Object}
+ */
WebInspector.WorkerManager = function()
{
this._workerIdToWindow = {};
@@ -103,7 +107,7 @@
_openInspectorWindow: function(workerId)
{
- var url = "" + "&dedicatedWorkerId=" + workerId;
+ var url = "" + "&dedicatedWorkerId=" + workerId;
url = "" "");
// Set location=0 just to make sure the front-end will be opened in a separate window, not in new tab.
var workerInspectorWindow = window.open(url, undefined, "location=0");
@@ -134,7 +138,7 @@
this._ignoreWorkerInspectorClosing = true;
for (var workerId in this._workerIdToWindow) {
this._workerIdToWindow[workerId].close();
- WorkerAgent.disconnectFromWorker(workerId);
+ WorkerAgent.disconnectFromWorker(parseInt(workerId, 10));
}
},
@@ -150,6 +154,10 @@
WebInspector.WorkerManager.prototype.__proto__ = WebInspector.Object.prototype;
+/**
+ * @constructor
+ * @implements {WorkerAgent.Dispatcher}
+ */
WebInspector.DedicatedWorkerMessageForwarder = function(workerManager)
{
this._workerManager = workerManager;
@@ -159,8 +167,8 @@
WebInspector.DedicatedWorkerMessageForwarder.prototype = {
_receiveMessage: function(event)
{
- var workerId = event.data.workerId;
- workerId = parseInt(workerId);
+ var workerId = event.data["workerId"];
+ workerId = parseInt(workerId, 10);
var command = event.data.command;
var message = event.data.message;
Modified: trunk/Source/WebCore/inspector/front-end/WorkersSidebarPane.js (96931 => 96932)
--- trunk/Source/WebCore/inspector/front-end/WorkersSidebarPane.js 2011-10-07 12:34:12 UTC (rev 96931)
+++ trunk/Source/WebCore/inspector/front-end/WorkersSidebarPane.js 2011-10-07 13:55:43 UTC (rev 96932)
@@ -28,6 +28,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+/**
+ * @constructor
+ * @extends {WebInspector.SidebarPane}
+ */
WebInspector.WorkersSidebarPane = function()
{
WebInspector.SidebarPane.call(this, WebInspector.UIString("Workers"));
@@ -67,7 +71,7 @@
removeWorker: function(id)
{
if (id in this._workers) {
- this._treeOutline.removeChild(this._treeOutline.findTreeElement(this._workers[id]));
+ this._treeOutline.removeChild(this._treeOutline.getCachedTreeElement(this._workers[id]));
delete this._workers[id];
}
},
@@ -94,6 +98,9 @@
WebInspector.WorkersSidebarPane.prototype.__proto__ = WebInspector.SidebarPane.prototype;
+/**
+ * @constructor
+ */
WebInspector.Worker = function(id, url, shared)
{
this.id = id;
@@ -101,8 +108,10 @@
this.shared = shared;
}
-
-
+/**
+ * @constructor
+ * @extends {WebInspector.SidebarPane}
+ */
WebInspector.WorkerListSidebarPane = function(workerManager)
{
WebInspector.SidebarPane.call(this, WebInspector.UIString("Worker inspectors"));
Modified: trunk/Source/WebCore/inspector/front-end/externs.js (96931 => 96932)
--- trunk/Source/WebCore/inspector/front-end/externs.js 2011-10-07 12:34:12 UTC (rev 96931)
+++ trunk/Source/WebCore/inspector/front-end/externs.js 2011-10-07 13:55:43 UTC (rev 96932)
@@ -44,6 +44,15 @@
*/
WebInspector.linkifyURLAsNode = function(url, linkText, classes, isExternal, tooltipText) {}
+/**
+ * @param {string} url
+ * @param {string=} linkText
+ * @param {string=} classes
+ * @param {boolean=} isExternal
+ * @param {string=} tooltipText
+ */
+WebInspector.linkifyURL = function(url, linkText, classes, isExternal, tooltipText) {}
+
/** @param {string} url */
WebInspector.linkifyStringAsFragment = function(url) {}
/** @param {string} url */
@@ -148,20 +157,8 @@
WebInspector.panels = {};
/**
- * @constructor
+ * @type {WebInspector.ScriptsPanel}
*/
-WebInspector.ScriptsPanel = function()
-{
- /** @param {...*} var_args */
- this.evaluateInSelectedCallFrame = function(var_args) {}
- /** @param {...*} var_args */
- this.getSelectedCallFrameVariables = function(var_args) {}
- this.paused = false;
-}
-
-/**
- * @type {?WebInspector.ScriptsPanel}
- */
WebInspector.panels.scripts = null;
/**
@@ -222,3 +219,11 @@
DOMApplicationCache.prototype.OBSOLETE = 5;
WebInspector.openRequestInNetworkPanel = function(request) {}
+
+var InjectedFakeWorker = function() {}
+
+WebInspector.queryParamsObject = {}
+
+WebInspector.Events = {
+ InspectorClosing: "InspectorClosing"
+}
Modified: trunk/Source/WebCore/inspector/front-end/inspector.js (96931 => 96932)
--- trunk/Source/WebCore/inspector/front-end/inspector.js 2011-10-07 12:34:12 UTC (rev 96931)
+++ trunk/Source/WebCore/inspector/front-end/inspector.js 2011-10-07 13:55:43 UTC (rev 96932)
@@ -419,8 +419,6 @@
{
InspectorFrontendHost.loaded();
- this.notifications = new WebInspector.Object();
-
var platform = WebInspector.platform;
document.body.addStyleClass("platform-" + platform);
var flavor = WebInspector.platformFlavor;
