Changeset 72200 in webkit

Timestamp:

Nov 17, 2010 5:30:20 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-11-17 Eric Uhrhane <​ericu@chromium.org>

Reviewed by David Levin.

[Chromium] implementation of async FileWriter for workers
​https://bugs.webkit.org/show_bug.cgi?id=47681

Tests are in a separate changelist.

• platform/CrossThreadCopier.h: Changed CrossThreadCopier[Base] to support PassRefPtrs

2010-11-17 Eric Uhrhane <​ericu@chromium.org>

Reviewed by David Levin.

[Chromium] implementation of async FileWriter for workers
​https://bugs.webkit.org/show_bug.cgi?id=47681

Tests are in a separate changelist.

Added new files.

• WebKit.gyp:

• src/WorkerAsyncFileSystemChromium.cpp: Added WorkerAsyncFileWriterChromium construction.
• src/WorkerAsyncFileWriterChromium.cpp: Added.
• src/WorkerAsyncFileWriterChromium.h: Added.

This class bridges between the context and main threads for the WorkerAsyncFileWriterChromium.

• src/WorkerFileWriterCallbacksBridge.cpp: Added.
• src/WorkerFileWriterCallbacksBridge.h: Added.

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/CrossThreadCopier.h (modified) (2 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/WebKit.gyp (modified) (1 diff)
• WebKit/chromium/src/WorkerAsyncFileSystemChromium.cpp (modified) (2 diffs)
• WebKit/chromium/src/WorkerAsyncFileWriterChromium.cpp (added)
• WebKit/chromium/src/WorkerAsyncFileWriterChromium.h (added)
• WebKit/chromium/src/WorkerFileWriterCallbacksBridge.cpp (added)
• WebKit/chromium/src/WorkerFileWriterCallbacksBridge.h (added)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-17  Eric Uhrhane  <ericu@chromium.org>
+
+        Reviewed by David Levin.
+
+        [Chromium] implementation of async FileWriter for workers
+        https://bugs.webkit.org/show_bug.cgi?id=47681
+
+        Tests are in a separate changelist.
+
+        * platform/CrossThreadCopier.h: Changed CrossThreadCopier[Base] to support PassRefPtrs
+
 2010-11-17  Alejandro G. Castro  <alex@igalia.com>
 

trunk/WebCore/platform/CrossThreadCopier.h

@@ -72 +72 @@
     // Custom copy methods.
     template<typename T> struct CrossThreadCopierBase<false, true, T> {
-        typedef typename WTF::RemoveTemplate<T, RefPtr>::Type RefCountedType;
+        typedef typename WTF::RemoveTemplate<T, RefPtr>::Type TypeWithoutRefPtr;
+        typedef typename WTF::RemoveTemplate<TypeWithoutRefPtr, PassRefPtr>::Type RefCountedType;
         typedef PassRefPtr<RefCountedType> Type;
         static Type copy(const T& refPtr)
@@ -114 +115 @@
 
     template<typename T> struct CrossThreadCopier : public CrossThreadCopierBase<WTF::IsConvertibleToInteger<T>::value,
-                                                                                 WTF::IsSubclassOfTemplate<typename WTF::RemoveTemplate<T, RefPtr>::Type, ThreadSafeShared>::value,
+                                                                                 WTF::IsSubclassOfTemplate<typename WTF::RemoveTemplate<T, RefPtr>::Type, ThreadSafeShared>::value
+                                                                                     || WTF::IsSubclassOfTemplate<typename WTF::RemoveTemplate<T, PassRefPtr>::Type, ThreadSafeShared>::value,
                                                                                  T> {
     };

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-11-17  Eric Uhrhane  <ericu@chromium.org>
+
+        Reviewed by David Levin.
+
+        [Chromium] implementation of async FileWriter for workers
+        https://bugs.webkit.org/show_bug.cgi?id=47681
+
+        Tests are in a separate changelist.
+
+        Added new files.
+        * WebKit.gyp:
+
+        * src/WorkerAsyncFileSystemChromium.cpp: Added WorkerAsyncFileWriterChromium construction.
+        * src/WorkerAsyncFileWriterChromium.cpp: Added.
+        * src/WorkerAsyncFileWriterChromium.h: Added.
+
+        This class bridges between the context and main threads for the WorkerAsyncFileWriterChromium.
+        * src/WorkerFileWriterCallbacksBridge.cpp: Added.
+        * src/WorkerFileWriterCallbacksBridge.h: Added.
+
 2010-11-17  John Mellor  <johnme@chromium.org>
 

trunk/WebKit/chromium/WebKit.gyp

@@ -548 +548 @@
                 'src/WorkerAsyncFileSystemChromium.cpp',
                 'src/WorkerAsyncFileSystemChromium.h',
+                'src/WorkerAsyncFileWriterChromium.cpp',
+                'src/WorkerAsyncFileWriterChromium.h',
                 'src/WorkerFileSystemCallbacksBridge.cpp',
                 'src/WorkerFileSystemCallbacksBridge.h',
+                'src/WorkerFileWriterCallbacksBridge.cpp',
+                'src/WorkerFileWriterCallbacksBridge.h',
                 'src/WrappedResourceRequest.h',
                 'src/WrappedResourceResponse.h',

trunk/WebKit/chromium/src/WorkerAsyncFileSystemChromium.cpp

@@ -35 +35 @@
 
 #include "AsyncFileSystemCallbacks.h"
+#include "FileMetadata.h"
 #include "FileSystem.h"
 #include "NotImplemented.h"
 #include "WebFileSystem.h"
 #include "WebFileSystemCallbacksImpl.h"
+#include "WebFileWriter.h"
 #include "WebKit.h"
 #include "WebKitClient.h"
 #include "WebWorkerBase.h"
+#include "WorkerAsyncFileWriterChromium.h"
 #include "WorkerContext.h"
 #include "WorkerFileSystemCallbacksBridge.h"
@@ -135 +138 @@
 }
 
-void WorkerAsyncFileSystemChromium::createWriter(AsyncFileWriterClient*, const String&, PassOwnPtr<AsyncFileSystemCallbacks>)
-{
-    notImplemented();
+class WorkerFileWriterHelperCallbacks : public AsyncFileSystemCallbacks {
+public:
+    static PassOwnPtr<WorkerFileWriterHelperCallbacks> create(AsyncFileWriterClient* client, const String& path, WebKit::WebFileSystem* webFileSystem, PassOwnPtr<WebCore::AsyncFileSystemCallbacks> callbacks, WorkerContext* workerContext)
+    {
+        return adoptPtr(new WorkerFileWriterHelperCallbacks(client, path, webFileSystem, callbacks, workerContext));
+    }
+
+    virtual void didSucceed()
+    {
+        ASSERT_NOT_REACHED();
+    }
+
+    virtual void didReadMetadata(const FileMetadata& metadata)
+    {
+        ASSERT(m_callbacks);
+        if (metadata.type != FileMetadata::TypeFile || metadata.length < 0)
+            m_callbacks->didFail(WebKit::WebFileErrorInvalidState);
+        else {
+            OwnPtr<WorkerAsyncFileWriterChromium> asyncFileWriterChromium = WorkerAsyncFileWriterChromium::create(m_webFileSystem, m_path, m_workerContext, m_client, WorkerAsyncFileWriterChromium::Asynchronous);
+            m_callbacks->didCreateFileWriter(asyncFileWriterChromium.release(), metadata.length);
+        }
+    }
+
+    virtual void didReadDirectoryEntry(const String& name, bool isDirectory)
+    {
+        ASSERT_NOT_REACHED();
+    }
+
+    virtual void didReadDirectoryEntries(bool hasMore)
+    {
+        ASSERT_NOT_REACHED();
+    }
+
+    virtual void didOpenFileSystem(const String&, PassOwnPtr<AsyncFileSystem>)
+    {
+        ASSERT_NOT_REACHED();
+    }
+
+    // Called when an AsyncFileWrter has been created successfully.
+    virtual void didCreateFileWriter(PassOwnPtr<AsyncFileWriter>, long long)
+    {
+        ASSERT_NOT_REACHED();
+    }
+
+    virtual void didFail(int code)
+    {
+        ASSERT(m_callbacks);
+        m_callbacks->didFail(code);
+    }
+
+private:
+    WorkerFileWriterHelperCallbacks(AsyncFileWriterClient* client, const String& path, WebKit::WebFileSystem* webFileSystem, PassOwnPtr<WebCore::AsyncFileSystemCallbacks> callbacks, WorkerContext* workerContext)
+        : m_client(client)
+        , m_path(path)
+        , m_webFileSystem(webFileSystem)
+        , m_callbacks(callbacks)
+        , m_workerContext(workerContext)
+    {
+    }
+
+    AsyncFileWriterClient* m_client;
+    String m_path;
+    WebKit::WebFileSystem* m_webFileSystem;
+    OwnPtr<WebCore::AsyncFileSystemCallbacks> m_callbacks;
+    WorkerContext* m_workerContext;
+};
+
+void WorkerAsyncFileSystemChromium::createWriter(AsyncFileWriterClient* client, const String& path, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
+{
+    createWorkerFileSystemCallbacksBridge(WorkerFileWriterHelperCallbacks::create(client, path, m_webFileSystem, callbacks, m_workerContext))->postReadMetadataToMainThread(m_webFileSystem, path, m_modeForCurrentOperation);
 }