Changeset 55364 in webkit

Timestamp:

Mar 1, 2010 2:12:10 AM (14 years ago)

Author:

pfeldman@chromium.org

Message:

2010-02-27 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Timothy Hatcher.

Web Inspector: disable breakpoint upon Shift-click.

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

• inspector/front-end/ConsoleView.js: (WebInspector.ConsoleView.prototype._format):
• inspector/front-end/SourceFrame.js: (WebInspector.SourceFrame.prototype._mouseDown): (WebInspector.SourceFrame.prototype._mouseMove):
• inspector/front-end/textViewer.css: Chromium: remove DevTools part that has been upstreamed.
• src/js/DevTools.js:

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/inspector/front-end/ConsoleView.js (modified) (1 diff)
• WebCore/inspector/front-end/SourceFrame.js (modified) (2 diffs)
• WebCore/inspector/front-end/textViewer.css (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/js/DevTools.js (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-02-27  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: disable breakpoint upon Shift-click.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35477
+
+        * inspector/front-end/ConsoleView.js:
+        (WebInspector.ConsoleView.prototype._format):
+        * inspector/front-end/SourceFrame.js:
+        (WebInspector.SourceFrame.prototype._mouseDown):
+        (WebInspector.SourceFrame.prototype._mouseMove):
+        * inspector/front-end/textViewer.css:
+
 2010-02-28  Alexey Proskuryakov  <ap@apple.com>
 

trunk/WebCore/inspector/front-end/ConsoleView.js

@@ -518 +518 @@
         if (!formatter || !isProxy) {
             formatter = this._formatvalue;
-            output = output.description || output;
+            output = output.description;
         }
 

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

@@ -436 +436 @@
         this._resetHoverTimer();
         this._hidePopup();
-        if (event.button != 0 || event.altKey || event.ctrlKey || event.metaKey || event.shiftKey)
+        if (event.button != 0 || event.altKey || event.ctrlKey || event.metaKey)
             return;
         if (event.target.className !== "webkit-line-number")
@@ -445 +445 @@
 
         var breakpoint = this._textModel.getAttribute(lineNumber, "breakpoint");
-        if (breakpoint)
-            this._removeBreakpointDelegate(breakpoint);
-        else if (this._addBreakpointDelegate)
+        if (breakpoint) {
+            if (event.shiftKey)
+                breakpoint.enabled = !breakpoint.enabled;
+            else
+                this._removeBreakpointDelegate(breakpoint);
+        } else
             this._addBreakpointDelegate(lineNumber + 1);
         event.preventDefault();

trunk/WebCore/inspector/front-end/textViewer.css

@@ -11 +11 @@
 .text-editor-lines {
     border: 0;
-    width: 100%;
     -webkit-border-horizontal-spacing: 0;
     -webkit-border-vertical-spacing: 0;

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-02-27  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Chromium: remove DevTools part that has been upstreamed.
+
+        * src/js/DevTools.js:
+
 2010-02-26  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebKit/chromium/src/js/DevTools.js

@@ -207 +207 @@
 
 
-(function()
-{
-
-    /**
-     * Handles an F3 keydown event to focus the Inspector search box.
-     * @param {KeyboardEvent} event Event to optionally handle
-     * @return {boolean} whether the event has been handled
-     */
-    function handleF3Keydown(event) {
-        if (event.keyIdentifier === "F3" && !event.altKey && !event.ctrlKey && !event.shiftKey && !event.metaKey) {
-            var searchField = document.getElementById("search");
-            searchField.focus();
-            searchField.select();
-            event.preventDefault();
-            return true;
-        }
-        return false;
-    }
-
-
-    var oldKeyDown = WebInspector.documentKeyDown;
-    /**
-     * This override allows to intercept keydown events we want to handle in a
-     * custom way. Some nested documents (iframes) delegate keydown handling to
-     * WebInspector.documentKeyDown (e.g. SourceFrame).
-     * @param {KeyboardEvent} event
-     * @override
-     */
-    WebInspector.documentKeyDown = function(event) {
-        var isHandled = handleF3Keydown(event);
-        if (!isHandled) {
-            // Mute refresh action.
-            if (event.keyIdentifier === "F5")
-                event.preventDefault();
-            else if (event.keyIdentifier === "U+0052" /* "R" */ && (event.ctrlKey || event.metaKey))
-                event.preventDefault();
-            else
-                oldKeyDown.call(this, event);
-        }
-    };
-})();
-
-
 /**
  * This override is necessary for adding script source asynchronously.