Reviewed by Sam Weinig.
authorap@webkit.org <ap@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 30 Dec 2008 07:46:02 +0000 (07:46 +0000)
committerap@webkit.org <ap@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 30 Dec 2008 07:46:02 +0000 (07:46 +0000)
        https://bugs.webkit.org/show_bug.cgi?id=23023
        Remove incomplete support for opportunistic appcache entries

        No change in behavior, thus no test.

        * loader/appcache/ApplicationCacheResource.h:
        (WebCore::ApplicationCacheResource::Type): Removed Opportunistic bit, will re-use when schema
        version changes.

        * loader/DocumentLoader.cpp:
        (WebCore::DocumentLoader::scheduleApplicationCacheLoad):
        * loader/appcache/ApplicationCacheGroup.cpp:
        (WebCore::ApplicationCacheGroup::didFinishLoadingManifest):
        * loader/appcache/ApplicationCacheResource.cpp:
        (WebCore::ApplicationCacheResource::dumpType):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@39514 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/loader/DocumentLoader.cpp
WebCore/loader/appcache/ApplicationCacheGroup.cpp
WebCore/loader/appcache/ApplicationCacheResource.cpp
WebCore/loader/appcache/ApplicationCacheResource.h

index 46649d7..302c87e 100644 (file)
@@ -1,3 +1,23 @@
+2008-12-29  Alexey Proskuryakov  <ap@webkit.org>
+
+        Reviewed by Sam Weinig.
+
+        https://bugs.webkit.org/show_bug.cgi?id=23023
+        Remove incomplete support for opportunistic appcache entries
+
+        No change in behavior, thus no test.
+
+        * loader/appcache/ApplicationCacheResource.h:
+        (WebCore::ApplicationCacheResource::Type): Removed Opportunistic bit, will re-use when schema
+        version changes.
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::scheduleApplicationCacheLoad):
+        * loader/appcache/ApplicationCacheGroup.cpp:
+        (WebCore::ApplicationCacheGroup::didFinishLoadingManifest):
+        * loader/appcache/ApplicationCacheResource.cpp:
+        (WebCore::ApplicationCacheResource::dumpType):
+
 2008-12-29  Dirk Schulze  <krit@webkit.org>
 
         Reviewed by Oliver Hunt.
index 2d9e748..f8a4b4b 100644 (file)
@@ -893,7 +893,6 @@ bool DocumentLoader::scheduleApplicationCacheLoad(ResourceLoader* loader, const
 
     ApplicationCacheResource* resource;
     if (!shouldLoadResourceFromApplicationCache(request, resource))
-        // FIXME: Handle opportunistic caching namespaces
         return false;
     
     m_pendingSubstituteResources.set(loader, resource);
index 99a519a..b81e2a9 100644 (file)
@@ -468,8 +468,6 @@ void ApplicationCacheGroup::didFinishLoadingManifest()
         return;
     }
         
-    // FIXME: Add the opportunistic caching namespaces and their fallbacks.
-    
     // We have the manifest, now download the resources.
     m_status = Downloading;
     
@@ -492,7 +490,7 @@ void ApplicationCacheGroup::didFinishLoadingManifest()
         ApplicationCache::ResourceMap::const_iterator end = m_newestCache->end();
         for (ApplicationCache::ResourceMap::const_iterator it = m_newestCache->begin(); it != end; ++it) {
             unsigned type = it->second->type();
-            if (type & (ApplicationCacheResource::Opportunistic | ApplicationCacheResource::Implicit | ApplicationCacheResource::Dynamic))
+            if (type & (ApplicationCacheResource::Implicit | ApplicationCacheResource::Dynamic))
                 addEntry(it->first, type);
         }
     }
index ee82ff5..28de467 100644 (file)
@@ -57,8 +57,6 @@ void ApplicationCacheResource::dumpType(unsigned type)
         printf("foreign ");
     if (type & Fallback)
         printf("fallback ");
-    if (type & Opportunistic)
-        printf("opportunistic ");
     if (type & Dynamic)
         printf("dynamic ");
     
index 1d7b853..0838cae 100644 (file)
@@ -40,7 +40,7 @@ public:
         Explicit = 1 << 2,
         Foreign = 1 << 3,
         Fallback = 1 << 4,
-        Opportunistic = 1 << 5,
+        // Bit 5 was used for opportunistic entries, which were removed from the spec.
         Dynamic = 1 << 6
     };