[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[pfeldman at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit bff6674a0f81f5c72d56879600b6b1a86c06450e
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 18 10:39:11 2010 +0000

    2010-10-18  Pavel Feldman  <pfeldman at chromium.org>
    
            Not reviewed. Build fix.
    
            * inspector/InspectorResourceAgent.cpp:
            (WebCore::cachedResourceTypeString):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69949 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ebe3f4d..915c5b6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-18  Pavel Feldman  <pfeldman at chromium.org>
+
+        Not reviewed. Build fix.
+
+        * inspector/InspectorResourceAgent.cpp:
+        (WebCore::cachedResourceTypeString):
+
 2010-10-17  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/WebCore/inspector/InspectorResourceAgent.cpp b/WebCore/inspector/InspectorResourceAgent.cpp
index e8f339a..f49e1d7 100644
--- a/WebCore/inspector/InspectorResourceAgent.cpp
+++ b/WebCore/inspector/InspectorResourceAgent.cpp
@@ -232,8 +232,8 @@ static String cachedResourceTypeString(const CachedResource& cachedResource)
     case CachedResource::Script:
         return "Script";
     default:
+        return "Other";
     }
-    return "Other";
 }
 
 static PassRefPtr<InspectorObject> buildObjectForCachedResource(const CachedResource& cachedResource)

-- 
WebKit Debian packaging