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

[japhet at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 38000dca1d08eda3425c3baa51f9f94f1516b8d1
Author: japhet at chromium.org <japhet at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 17:44:54 2010 +0000

    2010-10-05  Nate Chapin  <japhet at chromium.org>
    
            Reviewed by David Levin.
    
            Remove unused CachedResource::Status values (New and NotCached).
            https://bugs.webkit.org/show_bug.cgi?id=47132
    
            Refactor only, no new tests.
    
            * loader/CachedResource.h:
            * loader/CachedResourceLoader.cpp:
            (WebCore::CachedResourceLoader::checkCacheObjectStatus):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69125 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e8ee817..d61f1c0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-05  Nate Chapin  <japhet at chromium.org>
+
+        Reviewed by David Levin.
+
+        Remove unused CachedResource::Status values (New and NotCached).
+        https://bugs.webkit.org/show_bug.cgi?id=47132
+
+        Refactor only, no new tests.
+
+        * loader/CachedResource.h:
+        * loader/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::checkCacheObjectStatus):
+
 2010-10-04  Jeremy Orlow  <jorlow at chromium.org>
 
         Reviewed by Nate Chapin.
diff --git a/WebCore/loader/CachedResource.h b/WebCore/loader/CachedResource.h
index 958c8fd..f95dccf 100644
--- a/WebCore/loader/CachedResource.h
+++ b/WebCore/loader/CachedResource.h
@@ -67,9 +67,7 @@ public:
     };
 
     enum Status {
-        NotCached,    // this URL is not cached
         Unknown,      // let cache decide what to do with it
-        New,          // inserting new item
         Pending,      // only partially loaded
         Cached        // regular case
     };
@@ -256,7 +254,7 @@ private:
     bool m_loading : 1;
 
     unsigned m_type : 3; // Type
-    unsigned m_status : 3; // Status
+    unsigned m_status : 2; // Status
 
 #ifndef NDEBUG
     bool m_deleted;
diff --git a/WebCore/loader/CachedResourceLoader.cpp b/WebCore/loader/CachedResourceLoader.cpp
index d925eab..1f84a49 100644
--- a/WebCore/loader/CachedResourceLoader.cpp
+++ b/WebCore/loader/CachedResourceLoader.cpp
@@ -347,19 +347,9 @@ void CachedResourceLoader::setLoadInProgress(bool load)
 void CachedResourceLoader::checkCacheObjectStatus(CachedResource* resource)
 {
     // Return from the function for objects that we didn't load from the cache or if we don't have a frame.
-    if (!resource || !frame())
+    if (!resource || !frame() || resource->status() != CachedResource::Cached)
         return;
 
-    switch (resource->status()) {
-        case CachedResource::Cached:
-            break;
-        case CachedResource::NotCached:
-        case CachedResource::Unknown:
-        case CachedResource::New:
-        case CachedResource::Pending:
-            return;
-    }
-
     // FIXME: If the WebKit client changes or cancels the request, WebCore does not respect this and continues the load.
     frame()->loader()->loadedResourceFromMemoryCache(resource);
 }

-- 
WebKit Debian packaging