Changeset 39514 in webkit

Timestamp:

Dec 29, 2008, 11:46:02 PM (16 years ago)

Author:

ap@webkit.org

Message:

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):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/DocumentLoader.cpp (modified) (1 diff)
• loader/appcache/ApplicationCacheGroup.cpp (modified) (2 diffs)
• loader/appcache/ApplicationCacheResource.cpp (modified) (1 diff)
• loader/appcache/ApplicationCacheResource.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/WebCore/loader/DocumentLoader.cpp

@@ -894 +894 @@
     ApplicationCacheResource* resource;
     if (!shouldLoadResourceFromApplicationCache(request, resource))
-        // FIXME: Handle opportunistic caching namespaces
         return false;
     

trunk/WebCore/loader/appcache/ApplicationCacheGroup.cpp

@@ -469 +469 @@
     }
         
-    // FIXME: Add the opportunistic caching namespaces and their fallbacks.
-    
     // We have the manifest, now download the resources.
     m_status = Downloading;
@@ -493 +491 @@
         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);
         }

trunk/WebCore/loader/appcache/ApplicationCacheResource.cpp

@@ -58 +58 @@
     if (type & Fallback)
         printf("fallback ");
-    if (type & Opportunistic)
-        printf("opportunistic ");
     if (type & Dynamic)
         printf("dynamic ");

trunk/WebCore/loader/appcache/ApplicationCacheResource.h

@@ -41 +41 @@
         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
     };