[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[bweinstein at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit a003156e55428d74afaf378bf827ca37ea8d2a17
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 10 18:58:39 2009 +0000

    Fixes <http://webkit.org/b/31738>.
    Web Inspector: Console Scope Bar should be on top of console when Console is a Panel.
    
    Reviewed by Pavel Feldman.
    
    When the console is set to be shown as a full panel, move the scope bar to the top
    where it looks best. When it is only shown as a drawer, move it to the bottom, where
    it originally was. This takes up less space as a drawer, and makes it more discoverable
    and usable when it is the full panel.
    
    * inspector/front-end/ConsolePanel.js:
    (WebInspector.ConsolePanel.prototype.show): Move filter bar to top.
    (WebInspector.ConsolePanel.prototype.hide): Move filter bar back to bottom.
    * inspector/front-end/inspector.css:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51952 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c4fa212..6996d09 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2009-12-09  Brian Weinstein  <bweinstein at apple.com>
+
+        Reviewed by Pavel Feldman.
+
+        Fixes <http://webkit.org/b/31738>.
+        Web Inspector: Console Scope Bar should be on top of console when Console is a Panel.
+        
+        When the console is set to be shown as a full panel, move the scope bar to the top
+        where it looks best. When it is only shown as a drawer, move it to the bottom, where
+        it originally was. This takes up less space as a drawer, and makes it more discoverable
+        and usable when it is the full panel.
+
+        * inspector/front-end/ConsolePanel.js:
+        (WebInspector.ConsolePanel.prototype.show): Move filter bar to top.
+        (WebInspector.ConsolePanel.prototype.hide): Move filter bar back to bottom.
+        * inspector/front-end/inspector.css:
+
 2009-12-10  Stephen White  <senorblanco at chromium.org>
 
         Reviewed by Dirk Schulze.
diff --git a/WebCore/inspector/front-end/ConsolePanel.js b/WebCore/inspector/front-end/ConsolePanel.js
index 15ec615..6dbc558 100644
--- a/WebCore/inspector/front-end/ConsolePanel.js
+++ b/WebCore/inspector/front-end/ConsolePanel.js
@@ -46,6 +46,19 @@ WebInspector.ConsolePanel.prototype = {
         this._previousConsoleState = WebInspector.drawer.state;
         WebInspector.drawer.enterPanelMode();
         WebInspector.showConsole();
+        
+        // Move the scope bar to the top of the messages, like the resources filter.
+        var scopeBar = document.getElementById("console-filter");
+        var consoleMessages = document.getElementById("console-messages");
+
+        scopeBar.parentNode.removeChild(scopeBar);
+        document.getElementById("console-view").insertBefore(scopeBar, consoleMessages);
+        
+        // Update styles, and give console-messages a top margin so it doesn't overwrite the scope bar.
+        scopeBar.addStyleClass("console-filter-top");
+        scopeBar.removeStyleClass("status-bar-item");
+
+        consoleMessages.addStyleClass("console-filter-top");
     },
 
     hide: function()
@@ -57,6 +70,18 @@ WebInspector.ConsolePanel.prototype = {
         else
             WebInspector.drawer.exitPanelMode();
         delete this._previousConsoleState;
+        
+        // Move the scope bar back to the bottom bar, next to Clear Console.
+        var scopeBar = document.getElementById("console-filter");
+
+        scopeBar.parentNode.removeChild(scopeBar);
+        document.getElementById("other-drawer-status-bar-items").appendChild(scopeBar);
+        
+        // Update styles, and remove the top margin on console-messages.
+        scopeBar.removeStyleClass("console-filter-top");
+        scopeBar.addStyleClass("status-bar-item");
+
+        document.getElementById("console-messages").removeStyleClass("console-filter-top");
     }
 }
 
diff --git a/WebCore/inspector/front-end/inspector.css b/WebCore/inspector/front-end/inspector.css
index 3ac365c..7cae8b2 100644
--- a/WebCore/inspector/front-end/inspector.css
+++ b/WebCore/inspector/front-end/inspector.css
@@ -2418,9 +2418,14 @@ button.enable-toggle-status-bar-item.toggled-on .glyph {
     -webkit-mask-image: url(Images/largerResourcesButtonGlyph.png);
 }
 
-#resources-filter {
+#resources-filter, #console-filter.console-filter-top {
     background: -webkit-gradient(linear, left top, left bottom, from(rgb(236, 236, 236)), to(rgb(217, 217, 217)));
     border-bottom: 1px solid rgb(64%, 64%, 64%);
+    width: 100%;
+}
+
+#console-messages.console-filter-top {
+    margin-top: 23px;
 }
 
 #console-filter {

-- 
WebKit Debian packaging