Changeset 87704 in webkit

Timestamp:

May 30, 2011 6:44:55 PM (13 years ago)

Author:

eric.carlson@apple.com

Message:

2011-05-30 Eric Carlson <​eric.carlson@apple.com>

Reviewed by Alexey Proskuryakov.

Audio and video files saved to the Application Cache should preserve the original file extension
​https://bugs.webkit.org/show_bug.cgi?id=61750
<rdar://9524922>

No new tests, it isn't possible to check the name of the file in the cache from within
DRT. Changes verified manually.

• loader/appcache/ApplicationCacheStorage.cpp: (WebCore::ApplicationCacheStorage::store): Append the original file extension to the cache

file name.

(WebCore::ApplicationCacheStorage::writeDataToUniqueFileInDirectory): Add extension parameter.

• loader/appcache/ApplicationCacheStorage.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/appcache/ApplicationCacheStorage.cpp (modified) (2 diffs)
• loader/appcache/ApplicationCacheStorage.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-30  Eric Carlson  <eric.carlson@apple.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Audio and video files saved to the Application Cache should preserve the original file extension
+        https://bugs.webkit.org/show_bug.cgi?id=61750
+        <rdar://9524922>
+
+        No new tests, it isn't possible to check the name of the file in the cache from within
+        DRT. Changes verified manually.
+
+        * loader/appcache/ApplicationCacheStorage.cpp:
+        (WebCore::ApplicationCacheStorage::store): Append the original file extension to the cache
+            file name.
+        (WebCore::ApplicationCacheStorage::writeDataToUniqueFileInDirectory): Add extension parameter.
+        * loader/appcache/ApplicationCacheStorage.h:
+
 2011-05-30  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp

@@ -804 +804 @@
         String flatFileDirectory = pathByAppendingComponent(m_cacheDirectory, flatFileSubdirectory);
         makeAllDirectories(flatFileDirectory);
+
+        String extension;
+        
+        String fileName = resource->response().suggestedFilename();
+        size_t dotIndex = fileName.reverseFind('.');
+        if (dotIndex != notFound && dotIndex < (fileName.length() - 1))
+            extension = fileName.substring(dotIndex);
+
         String path;
-        if (!writeDataToUniqueFileInDirectory(resource->data(), flatFileDirectory, path))
+        if (!writeDataToUniqueFileInDirectory(resource->data(), flatFileDirectory, path, extension))
             return false;
         
@@ -1232 +1240 @@
 }
     
-bool ApplicationCacheStorage::writeDataToUniqueFileInDirectory(SharedBuffer* data, const String& directory, String& path)
+bool ApplicationCacheStorage::writeDataToUniqueFileInDirectory(SharedBuffer* data, const String& directory, String& path, const String& fileExtension)
 {
     String fullPath;
     
     do {
-        path = encodeForFileName(createCanonicalUUIDString());
+        path = encodeForFileName(createCanonicalUUIDString()) + fileExtension;
         // Guard against the above function being called on a platform which does not implement
         // createCanonicalUUIDString().

trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.h

@@ -116 +116 @@
     bool shouldStoreResourceAsFlatFile(ApplicationCacheResource*);
     void deleteTables();
-    bool writeDataToUniqueFileInDirectory(SharedBuffer*, const String& directory, String& outFilename);
+    bool writeDataToUniqueFileInDirectory(SharedBuffer*, const String& directory, String& outFilename, const String& fileExtension);
 
     void loadManifestHostHashes();