Changeset 83713 in webkit

Timestamp:

Apr 13, 2011 2:32:15 AM (13 years ago)

Author:

podivilov@chromium.org

Message:

2011-04-06 Pavel Podivilov <​podivilov@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: add "De-obfuscate Source" item to source frame text area context menu.
​https://bugs.webkit.org/show_bug.cgi?id=57942

• English.lproj/localizedStrings.js:
• inspector/front-end/DebuggerPresentationModel.js: (WebInspector.DebuggerPresentationModel.prototype.formatSourceFilesToggled):
• inspector/front-end/ScriptsPanel.js: (WebInspector.ScriptsPanel): (WebInspector.ScriptsPanel.prototype._togglePauseOnExceptions): (WebInspector.SourceFrameDelegateForScriptsPanel.prototype.releaseEvaluationResult): (WebInspector.SourceFrameDelegateForScriptsPanel.prototype.toggleFormatSourceFiles): (WebInspector.SourceFrameDelegateForScriptsPanel.prototype.formatSourceFilesToggled):
• inspector/front-end/SourceFrame.js: (WebInspector.SourceFrame.prototype._contextMenu): (WebInspector.SourceFrame.prototype._populateLineGutterContextMenu): (WebInspector.SourceFrame.prototype._populateTextAreaContextMenu): (WebInspector.SourceFrameDelegate.prototype.releaseEvaluationResult): (WebInspector.SourceFrameDelegate.prototype.toggleFormatSourceFiles): (WebInspector.SourceFrameDelegate.prototype.formatSourceFilesToggled):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• English.lproj/localizedStrings.js (modified) (previous)
• inspector/front-end/DebuggerPresentationModel.js (modified) (1 diff)
• inspector/front-end/ScriptsPanel.js (modified) (4 diffs)
• inspector/front-end/SourceFrame.js (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-06  Pavel Podivilov  <podivilov@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: add "De-obfuscate Source" item to source frame text area context menu.
+        https://bugs.webkit.org/show_bug.cgi?id=57942
+
+        * English.lproj/localizedStrings.js:
+        * inspector/front-end/DebuggerPresentationModel.js:
+        (WebInspector.DebuggerPresentationModel.prototype.formatSourceFilesToggled):
+        * inspector/front-end/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel):
+        (WebInspector.ScriptsPanel.prototype._togglePauseOnExceptions):
+        (WebInspector.SourceFrameDelegateForScriptsPanel.prototype.releaseEvaluationResult):
+        (WebInspector.SourceFrameDelegateForScriptsPanel.prototype.toggleFormatSourceFiles):
+        (WebInspector.SourceFrameDelegateForScriptsPanel.prototype.formatSourceFilesToggled):
+        * inspector/front-end/SourceFrame.js:
+        (WebInspector.SourceFrame.prototype._contextMenu):
+        (WebInspector.SourceFrame.prototype._populateLineGutterContextMenu):
+        (WebInspector.SourceFrame.prototype._populateTextAreaContextMenu):
+        (WebInspector.SourceFrameDelegate.prototype.releaseEvaluationResult):
+        (WebInspector.SourceFrameDelegate.prototype.toggleFormatSourceFiles):
+        (WebInspector.SourceFrameDelegate.prototype.formatSourceFilesToggled):
+
 2011-04-13  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js

@@ -227 +227 @@
     },
 
+    formatSourceFilesToggled: function()
+    {
+        return this._formatSourceFiles;
+    },
+
     _formatter: function()
     {

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

@@ -66 +66 @@
     // this.topStatusBar.appendChild(this.functionsSelectElement);
 
-    this.formatButton = document.createElement("button");
-    this.formatButton.className = "status-bar-item";
-    this.formatButton.id = "format-script";
-    this.formatButton.title = WebInspector.UIString("Format script.");
-    this.formatButton.appendChild(document.createElement("img"));
-    this.formatButton.addEventListener("click", this._toggleFormatSourceFiles.bind(this), false);
-    if (Preferences.debugMode)
-        this.topStatusBar.appendChild(this.formatButton);
-
     this.sidebarButtonsElement = document.createElement("div");
     this.sidebarButtonsElement.id = "scripts-sidebar-buttons";
@@ -782 +773 @@
     },
 
-    _toggleFormatSourceFiles: function()
-    {
-        this.reset();
-        this._presentationModel.toggleFormatSourceFiles();
-    },
-
     _enableDebugging: function()
     {
@@ -814 +799 @@
         var nextStateMap = {};
         var stateEnum = WebInspector.ScriptsPanel.PauseOnExceptionsState;
-        nextStateMap[stateEnum.DontPauseOnExceptions] = stateEnum.PauseOnAllExceptions;  
-        nextStateMap[stateEnum.PauseOnAllExceptions] = stateEnum.PauseOnUncaughtExceptions;  
+        nextStateMap[stateEnum.DontPauseOnExceptions] = stateEnum.PauseOnAllExceptions;
+        nextStateMap[stateEnum.PauseOnAllExceptions] = stateEnum.PauseOnUncaughtExceptions;
         nextStateMap[stateEnum.PauseOnUncaughtExceptions] = stateEnum.DontPauseOnExceptions;
         this._setPauseOnExceptions(nextStateMap[this._pauseOnExceptionButton.state]);
@@ -1088 +1073 @@
     {
         RuntimeAgent.releaseObjectGroup(this._popoverObjectGroup);
+    },
+
+    toggleFormatSourceFiles: function()
+    {
+        WebInspector.panels.scripts.reset();
+        this._model.toggleFormatSourceFiles();
+    },
+
+    formatSourceFilesToggled: function()
+    {
+        return this._model.formatSourceFilesToggled();
     }
 }

trunk/Source/WebCore/inspector/front-end/SourceFrame.js

@@ -600 +600 @@
     _contextMenu: function(event)
     {
+        var contextMenu = new WebInspector.ContextMenu();
         var target = event.target.enclosingNodeOrSelfWithClass("webkit-line-number");
-        if (!target)
-            return;
-        var lineNumber = target.lineNumber;
-
-        var contextMenu = new WebInspector.ContextMenu();
-
+        if (target)
+            this._populateLineGutterContextMenu(target.lineNumber, contextMenu);
+        else
+            this._populateTextAreaContextMenu(contextMenu);
+        contextMenu.show(event);
+    },
+
+    _populateLineGutterContextMenu: function(lineNumber, contextMenu)
+    {
         contextMenu.appendItem(WebInspector.UIString("Continue to Here"), this._delegate.continueToLine.bind(this._delegate, lineNumber));
 
@@ -648 +652 @@
                 contextMenu.appendItem(WebInspector.UIString("Enable Breakpoint"), setBreakpointEnabled.bind(this, true));
         }
-        contextMenu.show(event);
+    },
+
+    _populateTextAreaContextMenu: function(contextMenu)
+    {
+        contextMenu.appendCheckboxItem(WebInspector.UIString("De-obfuscate Source"), this._delegate.toggleFormatSourceFiles.bind(this._delegate), this._delegate.formatSourceFilesToggled());
     },
 
@@ -999 +1007 @@
     {
         // Should be implemented by subclasses.
+    },
+
+    toggleFormatSourceFiles: function()
+    {
+        // Should be implemented by subclasses.
+    },
+
+    formatSourceFilesToggled: function()
+    {
+        // Should be implemented by subclasses.
     }
 }