[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 bbd205890f3a920b95e0e80995643e3fb7ef626f
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 10 20:37:01 2010 +0000

    2010-03-10  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: now that audits panel is added, add it to the
            enums (for storing last active, etc.).
    
            https://bugs.webkit.org/show_bug.cgi?id=35980
    
            * inspector/InspectorController.cpp:
            (WebCore::InspectorController::setWindowVisible):
            (WebCore::InspectorController::specialPanelForJSName):
            * inspector/InspectorController.h:
            (WebCore::InspectorController::):
            * inspector/InspectorFrontend.cpp:
            (WebCore::InspectorFrontend::showPanel):
            * inspector/front-end/inspector.js:
            (WebInspector.showAuditsPanel):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55799 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bba0301..0368702 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-03-10  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: now that audits panel is added, add it to the
+        enums (for storing last active, etc.).
+
+        https://bugs.webkit.org/show_bug.cgi?id=35980
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::setWindowVisible):
+        (WebCore::InspectorController::specialPanelForJSName):
+        * inspector/InspectorController.h:
+        (WebCore::InspectorController::):
+        * inspector/InspectorFrontend.cpp:
+        (WebCore::InspectorFrontend::showPanel):
+        * inspector/front-end/inspector.js:
+        (WebInspector.showAuditsPanel):
+
 2010-03-10  Nate Chapin  <japhet at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index e369ab5..331443d 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -312,8 +312,8 @@ void InspectorController::setWindowVisible(bool visible, bool attached)
         populateScriptObjects();
 
         if (m_showAfterVisible == CurrentPanel) {
-          String lastActivePanelSetting = setting(lastActivePanelSettingName);
-          m_showAfterVisible = specialPanelForJSName(lastActivePanelSetting);
+            String lastActivePanelSetting = setting(lastActivePanelSettingName);
+            m_showAfterVisible = specialPanelForJSName(lastActivePanelSetting);
         }
 
         if (m_nodeToFocus)
@@ -1950,6 +1950,8 @@ InspectorController::SpecialPanels InspectorController::specialPanelForJSName(co
         return ProfilesPanel;
     if (panelName == "storage" || panelName == "databases")
         return StoragePanel;
+    if (panelName == "audits")
+        return AuditsPanel;
     if (panelName == "console")
         return ConsolePanel;
     return ElementsPanel;
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index a6a2ada..ead4d5e 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -101,6 +101,7 @@ public:
     typedef HashMap<int, RefPtr<InspectorDOMStorageResource> > DOMStorageResourcesMap;
 
     typedef enum {
+        AuditsPanel,
         CurrentPanel,
         ConsolePanel,
         ElementsPanel,
diff --git a/WebCore/inspector/InspectorFrontend.cpp b/WebCore/inspector/InspectorFrontend.cpp
index 781a095..af5620f 100755
--- a/WebCore/inspector/InspectorFrontend.cpp
+++ b/WebCore/inspector/InspectorFrontend.cpp
@@ -177,6 +177,9 @@ void InspectorFrontend::showPanel(int panel)
 {
     const char* showFunctionName;
     switch (panel) {
+        case InspectorController::AuditsPanel:
+            showFunctionName = "showAuditsPanel";
+            break;
         case InspectorController::ConsolePanel:
             showFunctionName = "showConsolePanel";
             break;
@@ -186,15 +189,15 @@ void InspectorFrontend::showPanel(int panel)
         case InspectorController::ResourcesPanel:
             showFunctionName = "showResourcesPanel";
             break;
-        case InspectorController::ScriptsPanel:
-            showFunctionName = "showScriptsPanel";
-            break;
         case InspectorController::TimelinePanel:
             showFunctionName = "showTimelinePanel";
             break;
         case InspectorController::ProfilesPanel:
             showFunctionName = "showProfilesPanel";
             break;
+        case InspectorController::ScriptsPanel:
+            showFunctionName = "showScriptsPanel";
+            break;
         case InspectorController::StoragePanel:
             showFunctionName = "showStoragePanel";
             break;
diff --git a/WebCore/inspector/front-end/AuditLauncherView.js b/WebCore/inspector/front-end/AuditLauncherView.js
index f2a2fd2..47424c5 100644
--- a/WebCore/inspector/front-end/AuditLauncherView.js
+++ b/WebCore/inspector/front-end/AuditLauncherView.js
@@ -206,18 +206,6 @@ WebInspector.AuditLauncherView.prototype = {
             this._launchButton.textContent = WebInspector.UIString("Running...");
         else
             this._launchButton.textContent = WebInspector.UIString("Run");
-    },
-
-    show: function(parentElement)
-    {
-        WebInspector.View.prototype.show.call(this, parentElement);
-        setTimeout(this.resize(), 0);
-    },
-
-    resize: function()
-    {
-        if (this._categoriesElement)
-            this._categoriesElement.style.height = (this._buttonContainerElement.totalOffsetTop - this._categoriesElement.totalOffsetTop) + "px";
     }
 }
 
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index 6859861..59120cd 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -1045,6 +1045,11 @@ WebInspector.showConsolePanel = function()
     this.currentPanel = this.panels.console;
 }
 
+WebInspector.showAuditsPanel = function()
+{
+    this.currentPanel = this.panels.audits;
+}
+
 WebInspector.clearConsoleMessages = function()
 {
     WebInspector.console.clearMessages();

-- 
WebKit Debian packaging