[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 0a53a0a7ad22ef69527371515a2c164b8dcad56e
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 1 10:12:10 2010 +0000

    2010-02-27  Pavel Feldman  <pfeldman at 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:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55364 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0c8cc01..edbaad4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-02-27  Pavel Feldman  <pfeldman at 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 at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/inspector/front-end/ConsoleView.js b/WebCore/inspector/front-end/ConsoleView.js
index 489c789..8d206a9 100644
--- a/WebCore/inspector/front-end/ConsoleView.js
+++ b/WebCore/inspector/front-end/ConsoleView.js
@@ -517,7 +517,7 @@ WebInspector.ConsoleView.prototype = {
         var formatter = this._customFormatters[type];
         if (!formatter || !isProxy) {
             formatter = this._formatvalue;
-            output = output.description || output;
+            output = output.description;
         }
 
         var span = document.createElement("span");
diff --git a/WebCore/inspector/front-end/SourceFrame.js b/WebCore/inspector/front-end/SourceFrame.js
index 1184300..dbc1a7b 100644
--- a/WebCore/inspector/front-end/SourceFrame.js
+++ b/WebCore/inspector/front-end/SourceFrame.js
@@ -435,7 +435,7 @@ WebInspector.SourceFrame.prototype = {
     {
         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")
             return;
@@ -444,9 +444,12 @@ WebInspector.SourceFrame.prototype = {
         var lineNumber = row.lineNumber;
 
         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();
     },
diff --git a/WebCore/inspector/front-end/textViewer.css b/WebCore/inspector/front-end/textViewer.css
index 18e712b..6ba0be8 100644
--- a/WebCore/inspector/front-end/textViewer.css
+++ b/WebCore/inspector/front-end/textViewer.css
@@ -10,7 +10,6 @@
 
 .text-editor-lines {
     border: 0;
-    width: 100%;
     -webkit-border-horizontal-spacing: 0;
     -webkit-border-vertical-spacing: 0;
     -webkit-user-select: text;
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index b70a32a..398a8c6 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-27  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Chromium: remove DevTools part that has been upstreamed.
+
+        * src/js/DevTools.js:
+
 2010-02-26  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebKit/chromium/src/js/DevTools.js b/WebKit/chromium/src/js/DevTools.js
index dcb181b..c871820 100644
--- a/WebKit/chromium/src/js/DevTools.js
+++ b/WebKit/chromium/src/js/DevTools.js
@@ -206,49 +206,6 @@ WebInspector.loaded = function()
 };
 
 
-(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.
  * @override

-- 
WebKit Debian packaging