Patch 3 in the series.

WebKit/chromium/src/AsyncFileSystemChromium.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 30 matching lines @@
 #include "WebFileSystemCallbacksImpl.h"
 #include "WebFileWriter.h"
 #include <public/Platform.h>
 #include <public/WebFileInfo.h>
 #include <public/WebFileSystem.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
 
-namespace {
-
-// Specialized callback class for createSnapshotFileAndReadMetadata.
-class SnapshotFileCallbacks : public AsyncFileSystemCallbacks {
-public:
-    static PassOwnPtr<SnapshotFileCallbacks> create(const KURL& internalBlobURL, PassOwnPtr<WebCore::AsyncFileSystemCallbacks> callbacks)
-    {
-        return adoptPtr(new SnapshotFileCallbacks(internalBlobURL, callbacks));
-    }
-
-    virtual void didReadMetadata(const FileMetadata& metadata)
-    {
-        ASSERT(m_callbacks);
-
-        // This will create a new File object using the metadata.
-        m_callbacks->didReadMetadata(metadata);
-
-        // Now that we've registered the snapshot file, we can unregister our internalBlobURL which has played a placeholder for the file during the IPC.
-        ThreadableBlobRegistry::unregisterBlobURL(m_internalBlobURL);
-    }
-
-    virtual void didFail(int error)
-    {
-        ASSERT(m_callbacks);
-        m_callbacks->didFail(error);
-    }
-
-private:
-    SnapshotFileCallbacks(const KURL& internalBlobURL, PassOwnPtr<WebCore::AsyncFileSystemCallbacks> callbacks)
-        : m_internalBlobURL(internalBlobURL)
-        , m_callbacks(callbacks)
-    {
-    }
-
-    KURL m_internalBlobURL;
-    OwnPtr<WebCore::AsyncFileSystemCallbacks> m_callbacks;
-};
-
-} // namespace
-
 bool AsyncFileSystem::isAvailable()
 {
     return true;
 }
 
 PassOwnPtr<AsyncFileSystem> AsyncFileSystem::create()
 {
     return AsyncFileSystemChromium::create();
 }
 
@@ skipping 78 matching lines @@
         if (info.type != WebKit::WebFileInfo::TypeFile || info.length < 0)
             m_callbacks->didFail(WebKit::WebFileErrorInvalidState);
         else {
             OwnPtr<AsyncFileWriterChromium> asyncFileWriterChromium = adoptPtr(new AsyncFileWriterChromium(m_client));
             OwnPtr<WebKit::WebFileWriter> webFileWriter = adoptPtr(m_webFileSystem->createFileWriter(m_path, asyncFileWriterChromium.get()));
             asyncFileWriterChromium->setWebFileWriter(webFileWriter.release());
             m_callbacks->didCreateFileWriter(asyncFileWriterChromium.release(), info.length);
         }
         delete this;
     }
-
+    virtual void didCreateSnapshotFile(const WebKit::WebFileInfo& info)
+    {
+        ASSERT_NOT_REACHED();
+        delete this;
+    }
     virtual void didReadDirectory(const WebKit::WebVector<WebKit::WebFileSystemEntry>& entries, bool hasMore)
     {
         ASSERT_NOT_REACHED();
         delete this;
     }
     virtual void didOpenFileSystem(const WebKit::WebString& name, const WebKit::WebURL& rootURL)
     {
         ASSERT_NOT_REACHED();
         delete this;
     }
@@ skipping 12 matching lines @@
     OwnPtr<WebCore::AsyncFileSystemCallbacks> m_callbacks;
 };
 
 void AsyncFileSystemChromium::createWriter(AsyncFileWriterClient* client, const KURL& path, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
 {
     m_webFileSystem->readMetadata(path, new FileWriterHelperCallbacks(client, path, m_webFileSystem, callbacks));
 }
 
 void AsyncFileSystemChromium::createSnapshotFileAndReadMetadata(const KURL& path, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
 {
-    KURL internalBlobURL = BlobURL::createInternalURL();
-
-    // This will create a snapshot file and register the file to a blob using the given internalBlobURL.
-    m_webFileSystem->createSnapshotFileAndReadMetadata(internalBlobURL, path, new WebKit::WebFileSystemCallbacksImpl(createSnapshotFileCallback(internalBlobURL, callbacks)));
-}
-
-PassOwnPtr<AsyncFileSystemCallbacks> AsyncFileSystemChromium::createSnapshotFileCallback(const KURL& internalBlobURL, PassOwnPtr<AsyncFileSystemCallbacks> callbacks) const
-{
-    return SnapshotFileCallbacks::create(internalBlobURL, callbacks);
+    m_webFileSystem->createSnapshotFileAndReadMetadata(path, new WebKit::WebFileSystemCallbacksImpl(callbacks));
 }
 
 } // namespace WebCore
 
 #endif