[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 65678229f35ffe4616b5dec997eafcfdfcbf0d00
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 29 17:58:27 2009 +0000

    2009-10-29  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: Add TimelinePanel into the panels enum.
    
            https://bugs.webkit.org/show_bug.cgi?id=30915
    
            * inspector/InspectorController.cpp:
            (WebCore::InspectorController::specialPanelForJSName):
            * inspector/InspectorController.h:
            (WebCore::InspectorController::):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50286 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 079c17b..a60c152 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-10-29  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: Add TimelinePanel into the panels enum.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30915
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::specialPanelForJSName):
+        * inspector/InspectorController.h:
+        (WebCore::InspectorController::):
+
 2009-10-29  Xan Lopez  <xlopez at igalia.com>
 
         Reviewed by Oliver Hunt.
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 459b175..eff8014 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -1791,6 +1791,8 @@ InspectorController::SpecialPanels InspectorController::specialPanelForJSName(co
         return ResourcesPanel;
     else if (panelName == "scripts")
         return ScriptsPanel;
+    else if (panelName == "timeline")
+        return TimelinePanel;
     else if (panelName == "profiles")
         return ProfilesPanel;
     else if (panelName == "storage" || panelName == "databases")
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index e5642b9..822fbf2 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -101,9 +101,10 @@ public:
         CurrentPanel,
         ConsolePanel,
         ElementsPanel,
-        ProfilesPanel,
         ResourcesPanel,
         ScriptsPanel,
+        TimelinePanel,
+        ProfilesPanel,
         StoragePanel
     } SpecialPanels;
 

-- 
WebKit Debian packaging