Attachment 140558 Details for Bug 85760 – Patch with forwarding header

[patch] Patch with forwarding header

bug-85760-20120507141328.patch (text/plain), 28.79 KB, created by Mark Pilgrim (Google) on 2012-05-07 11:14:13 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Pilgrim (Google)

Created: 2012-05-07 11:14:13 PDT

Size: 28.79 KB

patch

obsolete

>Index: Source/Platform/ChangeLog
>===================================================================
>--- Source/Platform/ChangeLog	(revision 116321)
>+++ Source/Platform/ChangeLog	(working copy)
>@@ -1,3 +1,34 @@
>+2012-05-07  Mark Pilgrim  <pilgrim@chromium.org>
>+
>+        [Chromium] Move fileSystem to Platform.h
>+        https://bugs.webkit.org/show_bug.cgi?id=85760
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Part of a refactoring series. See tracking bug 82948.
>+
>+        * Platform.gypi:
>+        * chromium/public/Platform.h:
>+        (WebKit):
>+        (Platform):
>+        (WebKit::Platform::fileSystem):
>+        * chromium/public/WebFileSystem.h: Added.
>+        (WebKit):
>+        (WebFileSystem):
>+        (WebKit::WebFileSystem::move):
>+        (WebKit::WebFileSystem::copy):
>+        (WebKit::WebFileSystem::remove):
>+        (WebKit::WebFileSystem::removeRecursively):
>+        (WebKit::WebFileSystem::readMetadata):
>+        (WebKit::WebFileSystem::createFile):
>+        (WebKit::WebFileSystem::createDirectory):
>+        (WebKit::WebFileSystem::fileExists):
>+        (WebKit::WebFileSystem::directoryExists):
>+        (WebKit::WebFileSystem::readDirectory):
>+        (WebKit::WebFileSystem::createFileWriter):
>+        (WebKit::WebFileSystem::createSnapshotFileAndReadMetadata):
>+        (WebKit::WebFileSystem::~WebFileSystem):
>+
> 2012-05-07  Tommy Widenflycht  <tommyw@google.com>
> 
>         MediaStream API: Rename MediaStreamCenter::didConstructMediaStream
>Index: Source/Platform/Platform.gypi
>===================================================================
>--- Source/Platform/Platform.gypi	(revision 116308)
>+++ Source/Platform/Platform.gypi	(working copy)
>@@ -42,6 +42,7 @@
>             'chromium/public/WebContentLayerClient.h',
>             'chromium/public/WebData.h',
>             'chromium/public/WebExternalTextureLayer.h',
>+            'chromium/public/WebFileSystem.h',
>             'chromium/public/WebFilterOperation.h',
>             'chromium/public/WebFilterOperations.h',
>             'chromium/public/WebFloatPoint.h',
>Index: Source/Platform/chromium/public/Platform.h
>===================================================================
>--- Source/Platform/chromium/public/Platform.h	(revision 116308)
>+++ Source/Platform/chromium/public/Platform.h	(working copy)
>@@ -40,6 +40,7 @@
> namespace WebKit {
> 
> class WebAudioBus;
>+class WebFileSystem;
> class WebMediaStreamCenter;
> class WebMediaStreamCenterClient;
> class WebMimeRegistry;
>@@ -69,6 +70,11 @@ public:
>     virtual WebAudioDevice* createAudioDevice(size_t bufferSize, unsigned numberOfChannels, double sampleRate, WebAudioDevice::RenderCallback*) { return 0; }
> 
> 
>+    // FileSystem ----------------------------------------------------------
>+
>+    // Must return non-null.
>+    virtual WebFileSystem* fileSystem() { return 0; }
>+
>     // Gamepad -------------------------------------------------------------
> 
>     virtual void sampleGamepads(WebGamepads& into) { into.length = 0; }
>Index: Source/Platform/chromium/public/WebFileSystem.h
>===================================================================
>--- Source/Platform/chromium/public/WebFileSystem.h	(revision 0)
>+++ Source/Platform/chromium/public/WebFileSystem.h	(revision 0)
>@@ -0,0 +1,138 @@
>+/*
>+ * 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
>+ * copyright notice, this list of conditions and the following disclaimer
>+ * in the documentation and/or other materials provided with the
>+ * distribution.
>+ *     * Neither the name of Google Inc. nor the names of its
>+ * contributors may be used to endorse or promote products derived from
>+ * this software without specific prior written permission.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#ifndef WebFileSystem_h
>+#define WebFileSystem_h
>+
>+#include "WebCommon.h"
>+#include "WebURL.h"
>+
>+namespace WebKit {
>+
>+// FIXME: Move these classes into platform.
>+class WebFileSystemCallbacks;
>+class WebFileWriter;
>+class WebFileWriterClient;
>+
>+class WebFileSystem {
>+public:
>+    enum Type {
>+        TypeTemporary,
>+        TypePersistent,
>+
>+        // Indicates an isolated filesystem which only exposes a set of files.
>+        TypeIsolated,
>+
>+        // Indicates a non-sandboxed filesystem.
>+        TypeExternal,
>+    };
>+
>+    // Moves a file or directory at |srcPath| to |destPath|.
>+    // WebFileSystemCallbacks::didSucceed() must be called when the operation is completed successfully.
>+    // WebFileSystemCallbacks::didFail() must be called otherwise.
>+    virtual void move(const WebURL& srcPath, const WebURL& destPath, WebFileSystemCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
>+
>+    // Copies a file or directory at |srcPath| to |destPath|.
>+    // WebFileSystemCallbacks::didSucceed() must be called when the operation is completed successfully.
>+    // WebFileSystemCallbacks::didFail() must be called otherwise.
>+    virtual void copy(const WebURL& srcPath, const WebURL& destPath, WebFileSystemCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
>+
>+    // Deletes a file or directory at a given |path|.
>+    // It is an error to try to remove a directory that is not empty.
>+    // WebFileSystemCallbacks::didSucceed() must be called when the operation is completed successfully.
>+    // WebFileSystemCallbacks::didFail() must be called otherwise.
>+    virtual void remove(const WebURL& path, WebFileSystemCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
>+
>+    // Deletes a file or directory recursively at a given |path|.
>+    // WebFileSystemCallbacks::didSucceed() must be called when the operation is completed successfully.
>+    // WebFileSystemCallbacks::didFail() must be called otherwise.
>+    virtual void removeRecursively(const WebURL& path, WebFileSystemCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
>+
>+    // Retrieves the metadata information of the file or directory at the given |path|.
>+    // This may not always return the local platform path in remote filesystem cases.
>+    // WebFileSystemCallbacks::didReadMetadata() must be called with a valid metadata when the retrieval is completed successfully.
>+    // WebFileSystemCallbacks::didFail() must be called otherwise.
>+    virtual void readMetadata(const WebURL& path, WebFileSystemCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
>+
>+    // Creates a file at given |path|.
>+    // If the |path| doesn't exist, it creates a new file at |path|.
>+    // If |exclusive| is true, it fails if the |path| already exists.
>+    // If |exclusive| is false, it succeeds if the |path| already exists or
>+    // it has successfully created a new file at |path|.
>+    //
>+    // WebFileSystemCallbacks::didSucceed() must be called when the operation is completed successfully.
>+    // WebFileSystemCallbacks::didFail() must be called otherwise.
>+    virtual void createFile(const WebURL& path, bool exclusive, WebFileSystemCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
>+
>+    // Creates a directory at a given |path|.
>+    // If the |path| doesn't exist, it creates a new directory at |path|.
>+    // If |exclusive| is true, it fails if the |path| already exists.
>+    // If |exclusive| is false, it succeeds if the |path| already exists or it has successfully created a new directory at |path|.
>+    //
>+    // WebFileSystemCallbacks::didSucceed() must be called when
>+    // the operation is completed successfully.
>+    // WebFileSystemCallbacks::didFail() must be called otherwise.
>+    virtual void createDirectory(const WebURL& path, bool exclusive, WebFileSystemCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
>+
>+    // Checks if a file exists at a given |path|.
>+    // WebFileSystemCallbacks::didSucceed() must be called when the operation is completed successfully.
>+    // WebFileSystemCallbacks::didFail() must be called otherwise.
>+    virtual void fileExists(const WebURL& path, WebFileSystemCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
>+
>+    // Checks if a directory exists at a given |path|.
>+    // WebFileSystemCallbacks::didSucceed() must be called when the operation is completed successfully.
>+    // WebFileSystemCallbacks::didFail() must be called otherwise.
>+    virtual void directoryExists(const WebURL& path, WebFileSystemCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
>+
>+    // Reads directory entries of a given directory at |path|.
>+    // WebFileSystemCallbacks::didReadDirectory() must be called when the operation is completed successfully.
>+    // WebFileSystemCallbacks::didFail() must be called otherwise.
>+    virtual void readDirectory(const WebURL& path, WebFileSystemCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
>+
>+    // Creates a WebFileWriter that can be used to write to the given file.
>+    // This is a fast, synchronous call, and should not stat the filesystem.
>+    virtual WebFileWriter* createFileWriter(const WebURL& path, WebFileWriterClient*) { WEBKIT_ASSERT_NOT_REACHED(); return 0; }
>+
>+    // Creates a snapshot file for a given file specified by |path| and registers the file with the |blobURL|. It returns the metadata of the created snapshot file.
>+    // The returned metadata should include a local platform path to the snapshot image.
>+    // In local filesystem cases the backend may simply return the metadata of the file itself (as well as readMetadata does), while in remote filesystem case the backend may download the file into a temporary snapshot file and return the metadata of the temporary file.
>+    // The returned metadata is used to create a File object for the |path|.
>+    // The snapshot file is supposed to be deleted when the last reference to the |blobURL| is dropped.
>+    // WebFileSystemCallbacks::didReadMetadata() with the metadata of the snapshot file must be called when the operation is completed successfully.
>+    // WebFileSystemCallbacks::didFail() must be called otherwise.
>+    virtual void createSnapshotFileAndReadMetadata(const WebURL& blobURL, const WebURL& path, WebFileSystemCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
>+
>+protected:
>+    virtual ~WebFileSystem() { }
>+};
>+
>+} // namespace WebKit
>+
>+#endif
>Index: Source/WebKit/chromium/ChangeLog
>===================================================================
>--- Source/WebKit/chromium/ChangeLog	(revision 116321)
>+++ Source/WebKit/chromium/ChangeLog	(working copy)
>@@ -1,3 +1,32 @@
>+2012-05-07  Mark Pilgrim  <pilgrim@chromium.org>
>+
>+        [Chromium] Move fileSystem to Platform.h
>+        https://bugs.webkit.org/show_bug.cgi?id=85760
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Part of a refactoring series. See tracking bug 82948.
>+
>+        * WebKit.gyp:
>+        * public/WebCommonWorkerClient.h:
>+        * public/platform/WebFileSystem.h:
>+        * public/platform/WebKitPlatformSupport.h:
>+        (WebKit):
>+        (WebKitPlatformSupport):
>+        * src/AssertMatchingEnums.cpp:
>+        * src/AsyncFileSystemChromium.cpp:
>+        (WebCore::AsyncFileSystemChromium::AsyncFileSystemChromium):
>+        * src/LocalFileSystemChromium.cpp:
>+        * src/WebFileSystemCallbacksImpl.cpp:
>+        * src/WebFileSystemCallbacksImpl.h:
>+        * src/WebFrameImpl.cpp:
>+        * src/WebWorkerClientImpl.h:
>+        * src/WorkerAsyncFileSystemChromium.cpp:
>+        * src/WorkerAsyncFileWriterChromium.cpp:
>+        * src/WorkerFileSystemCallbacksBridge.h:
>+        * src/WorkerFileWriterCallbacksBridge.cpp:
>+        (WebKit::WorkerFileWriterCallbacksBridge::initOnMainThread):
>+
> 2012-05-07  Nat Duca  <nduca@chromium.org>
> 
>         Unreviewed, rolling out r115525.
>Index: Source/WebKit/chromium/WebKit.gyp
>===================================================================
>--- Source/WebKit/chromium/WebKit.gyp	(revision 116308)
>+++ Source/WebKit/chromium/WebKit.gyp	(working copy)
>@@ -309,7 +309,6 @@
>                 'public/platform/WebData.h',
>                 'public/platform/WebDragData.h',
>                 'public/platform/WebExternalTextureLayer.h',
>-                'public/platform/WebFileSystem.h',
>                 'public/platform/WebFloatPoint.h',
>                 'public/platform/WebFloatQuad.h',
>                 'public/platform/WebFloatRect.h',
>Index: Source/WebKit/chromium/public/WebCommonWorkerClient.h
>===================================================================
>--- Source/WebKit/chromium/public/WebCommonWorkerClient.h	(revision 116308)
>+++ Source/WebKit/chromium/public/WebCommonWorkerClient.h	(working copy)
>@@ -32,7 +32,7 @@
> #define WebCommonWorkerClient_h
> 
> #include "platform/WebCommon.h"
>-#include "platform/WebFileSystem.h"
>+#include <public/WebFileSystem.h>
> 
> namespace WebKit {
> 
>Index: Source/WebKit/chromium/public/platform/WebFileSystem.h
>===================================================================
>--- Source/WebKit/chromium/public/platform/WebFileSystem.h	(revision 116308)
>+++ Source/WebKit/chromium/public/platform/WebFileSystem.h	(working copy)
>@@ -28,111 +28,4 @@
>  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#ifndef WebFileSystem_h
>-#define WebFileSystem_h
>-
>-#include "WebCommon.h"
>-#include "WebURL.h"
>-
>-namespace WebKit {
>-
>-// FIXME: Move these classes into platform.
>-class WebFileSystemCallbacks;
>-class WebFileWriter;
>-class WebFileWriterClient;
>-
>-class WebFileSystem {
>-public:
>-    enum Type {
>-        TypeTemporary,
>-        TypePersistent,
>-
>-        // Indicates an isolated filesystem which only exposes a set of files.
>-        TypeIsolated,
>-
>-        // Indicates a non-sandboxed filesystem.
>-        TypeExternal,
>-    };
>-
>-    // Moves a file or directory at |srcPath| to |destPath|.
>-    // WebFileSystemCallbacks::didSucceed() must be called when the operation is completed successfully.
>-    // WebFileSystemCallbacks::didFail() must be called otherwise.
>-    virtual void move(const WebURL& srcPath, const WebURL& destPath, WebFileSystemCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
>-
>-    // Copies a file or directory at |srcPath| to |destPath|.
>-    // WebFileSystemCallbacks::didSucceed() must be called when the operation is completed successfully.
>-    // WebFileSystemCallbacks::didFail() must be called otherwise.
>-    virtual void copy(const WebURL& srcPath, const WebURL& destPath, WebFileSystemCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
>-
>-    // Deletes a file or directory at a given |path|.
>-    // It is an error to try to remove a directory that is not empty.
>-    // WebFileSystemCallbacks::didSucceed() must be called when the operation is completed successfully.
>-    // WebFileSystemCallbacks::didFail() must be called otherwise.
>-    virtual void remove(const WebURL& path, WebFileSystemCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
>-
>-    // Deletes a file or directory recursively at a given |path|.
>-    // WebFileSystemCallbacks::didSucceed() must be called when the operation is completed successfully.
>-    // WebFileSystemCallbacks::didFail() must be called otherwise.
>-    virtual void removeRecursively(const WebURL& path, WebFileSystemCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
>-
>-    // Retrieves the metadata information of the file or directory at the given |path|.
>-    // This may not always return the local platform path in remote filesystem cases.
>-    // WebFileSystemCallbacks::didReadMetadata() must be called with a valid metadata when the retrieval is completed successfully.
>-    // WebFileSystemCallbacks::didFail() must be called otherwise.
>-    virtual void readMetadata(const WebURL& path, WebFileSystemCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
>-
>-    // Creates a file at given |path|.
>-    // If the |path| doesn't exist, it creates a new file at |path|.
>-    // If |exclusive| is true, it fails if the |path| already exists.
>-    // If |exclusive| is false, it succeeds if the |path| already exists or
>-    // it has successfully created a new file at |path|.
>-    //
>-    // WebFileSystemCallbacks::didSucceed() must be called when the operation is completed successfully.
>-    // WebFileSystemCallbacks::didFail() must be called otherwise.
>-    virtual void createFile(const WebURL& path, bool exclusive, WebFileSystemCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
>-
>-    // Creates a directory at a given |path|.
>-    // If the |path| doesn't exist, it creates a new directory at |path|.
>-    // If |exclusive| is true, it fails if the |path| already exists.
>-    // If |exclusive| is false, it succeeds if the |path| already exists or it has successfully created a new directory at |path|.
>-    //
>-    // WebFileSystemCallbacks::didSucceed() must be called when
>-    // the operation is completed successfully.
>-    // WebFileSystemCallbacks::didFail() must be called otherwise.
>-    virtual void createDirectory(const WebURL& path, bool exclusive, WebFileSystemCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
>-
>-    // Checks if a file exists at a given |path|.
>-    // WebFileSystemCallbacks::didSucceed() must be called when the operation is completed successfully.
>-    // WebFileSystemCallbacks::didFail() must be called otherwise.
>-    virtual void fileExists(const WebURL& path, WebFileSystemCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
>-
>-    // Checks if a directory exists at a given |path|.
>-    // WebFileSystemCallbacks::didSucceed() must be called when the operation is completed successfully.
>-    // WebFileSystemCallbacks::didFail() must be called otherwise.
>-    virtual void directoryExists(const WebURL& path, WebFileSystemCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
>-
>-    // Reads directory entries of a given directory at |path|.
>-    // WebFileSystemCallbacks::didReadDirectory() must be called when the operation is completed successfully.
>-    // WebFileSystemCallbacks::didFail() must be called otherwise.
>-    virtual void readDirectory(const WebURL& path, WebFileSystemCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
>-
>-    // Creates a WebFileWriter that can be used to write to the given file.
>-    // This is a fast, synchronous call, and should not stat the filesystem.
>-    virtual WebFileWriter* createFileWriter(const WebURL& path, WebFileWriterClient*) { WEBKIT_ASSERT_NOT_REACHED(); return 0; }
>-
>-    // Creates a snapshot file for a given file specified by |path| and registers the file with the |blobURL|. It returns the metadata of the created snapshot file.
>-    // The returned metadata should include a local platform path to the snapshot image.
>-    // In local filesystem cases the backend may simply return the metadata of the file itself (as well as readMetadata does), while in remote filesystem case the backend may download the file into a temporary snapshot file and return the metadata of the temporary file.
>-    // The returned metadata is used to create a File object for the |path|.
>-    // The snapshot file is supposed to be deleted when the last reference to the |blobURL| is dropped.
>-    // WebFileSystemCallbacks::didReadMetadata() with the metadata of the snapshot file must be called when the operation is completed successfully.
>-    // WebFileSystemCallbacks::didFail() must be called otherwise.
>-    virtual void createSnapshotFileAndReadMetadata(const WebURL& blobURL, const WebURL& path, WebFileSystemCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
>-
>-protected:
>-    virtual ~WebFileSystem() { }
>-};
>-
>-} // namespace WebKit
>-
>-#endif
>+#include "../../../../Platform/chromium/public/WebFileSystem.h"
>Index: Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h
>===================================================================
>--- Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h	(revision 116308)
>+++ Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h	(working copy)
>@@ -53,7 +53,6 @@ class WebApplicationCacheHostClient; //
> class WebBlobRegistry;
> class WebClipboard;
> class WebCookieJar;
>-class WebFileSystem;
> class WebFileUtilities;
> class WebIDBFactory; // FIXME: Does this belong in platform?
> class WebIDBKey; // FIXME: Does this belong in platform?
>@@ -177,11 +176,6 @@ public:
>     virtual bool canAccelerate2dCanvas() { return false; }
> 
> 
>-    // FileSystem ----------------------------------------------------------
>-
>-    // Must return non-null.
>-    virtual WebFileSystem* fileSystem() { return 0; }
>-
>     // WebWorker ----------------------------------------------------------
> 
>     virtual void didStartWorkerRunLoop(const WebWorkerRunLoop&) { }
>Index: Source/WebKit/chromium/src/AssertMatchingEnums.cpp
>===================================================================
>--- Source/WebKit/chromium/src/AssertMatchingEnums.cpp	(revision 116308)
>+++ Source/WebKit/chromium/src/AssertMatchingEnums.cpp	(working copy)
>@@ -100,11 +100,11 @@
> #include "WebTextCheckingType.h"
> #include "WebView.h"
> #include "platform/WebClipboard.h"
>-#include "platform/WebFileSystem.h"
> #include "platform/WebICEOptions.h"
> #include "platform/WebMediaStreamSource.h"
> #include "platform/WebPeerConnection00Handler.h"
> #include "platform/WebPeerConnection00HandlerClient.h"
>+#include <public/WebFileSystem.h>
> #include <public/WebFilterOperation.h>
> #include <public/WebReferrerPolicy.h>
> #include <wtf/Assertions.h>
>Index: Source/WebKit/chromium/src/AsyncFileSystemChromium.cpp
>===================================================================
>--- Source/WebKit/chromium/src/AsyncFileSystemChromium.cpp	(revision 116308)
>+++ Source/WebKit/chromium/src/AsyncFileSystemChromium.cpp	(working copy)
>@@ -42,8 +42,8 @@
> #include "WebFileSystemCallbacksImpl.h"
> #include "WebFileWriter.h"
> #include "WebKit.h"
>-#include "platform/WebFileSystem.h"
>-#include "platform/WebKitPlatformSupport.h"
>+#include <public/Platform.h>
>+#include <public/WebFileSystem.h>
> #include <wtf/text/CString.h>
> #include <wtf/text/StringBuilder.h>
> 
>@@ -131,7 +131,7 @@ bool AsyncFileSystem::isValidType(FileSy
> 
> AsyncFileSystemChromium::AsyncFileSystemChromium(FileSystemType type, const KURL& rootURL)
>     : AsyncFileSystem(type)
>-    , m_webFileSystem(WebKit::webKitPlatformSupport()->fileSystem())
>+    , m_webFileSystem(WebKit::Platform::current()->fileSystem())
>     , m_filesystemRootURL(rootURL)
> {
>     ASSERT(m_webFileSystem);
>Index: Source/WebKit/chromium/src/LocalFileSystemChromium.cpp
>===================================================================
>--- Source/WebKit/chromium/src/LocalFileSystemChromium.cpp	(revision 116308)
>+++ Source/WebKit/chromium/src/LocalFileSystemChromium.cpp	(working copy)
>@@ -41,7 +41,6 @@
> #include "FileSystemType.h"
> #include "PlatformString.h"
> #include "WebFileError.h"
>-#include "platform/WebFileSystem.h"
> #include "WebFileSystemCallbacksImpl.h"
> #include "WebFrameClient.h"
> #include "WebFrameImpl.h"
>@@ -51,6 +50,7 @@
> #include "WorkerContext.h"
> #include "WorkerFileSystemCallbacksBridge.h"
> #include "WorkerThread.h"
>+#include <public/WebFileSystem.h>
> #include <wtf/Threading.h>
> 
> using namespace WebKit;
>Index: Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.cpp
>===================================================================
>--- Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.cpp	(revision 116308)
>+++ Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.cpp	(working copy)
>@@ -37,10 +37,10 @@
> #include "FileMetadata.h"
> #include "ScriptExecutionContext.h"
> #include "WebFileInfo.h"
>-#include "platform/WebFileSystem.h"
> #include "WebFileSystemEntry.h"
> #include "platform/WebString.h"
> #include "WorkerAsyncFileSystemChromium.h"
>+#include <public/WebFileSystem.h>
> #include <wtf/Vector.h>
> 
> using namespace WebCore;
>Index: Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.h
>===================================================================
>--- Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.h	(revision 116308)
>+++ Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.h	(working copy)
>@@ -33,8 +33,8 @@
> 
> #include "FileSystemType.h"
> #include "WebFileSystemCallbacks.h"
>-#include "platform/WebFileSystem.h"
> #include "platform/WebVector.h"
>+#include <public/WebFileSystem.h>
> #include <wtf/OwnPtr.h>
> #include <wtf/PassOwnPtr.h>
> 
>Index: Source/WebKit/chromium/src/WebFrameImpl.cpp
>===================================================================
>--- Source/WebKit/chromium/src/WebFrameImpl.cpp	(revision 116308)
>+++ Source/WebKit/chromium/src/WebFrameImpl.cpp	(working copy)
>@@ -178,7 +178,7 @@
> #include "V8DirectoryEntry.h"
> #include "V8DOMFileSystem.h"
> #include "V8FileEntry.h"
>-#include "platform/WebFileSystem.h"
>+#include <public/WebFileSystem.h>
> #endif
> 
> using namespace WebCore;
>Index: Source/WebKit/chromium/src/WebWorkerClientImpl.h
>===================================================================
>--- Source/WebKit/chromium/src/WebWorkerClientImpl.h	(revision 116308)
>+++ Source/WebKit/chromium/src/WebWorkerClientImpl.h	(working copy)
>@@ -39,8 +39,8 @@
> #include "WorkerMessagingProxy.h"
> #include "WorkerObjectProxy.h"
> 
>-#include "platform/WebFileSystem.h"
> #include "WebWorkerBase.h"
>+#include <public/WebFileSystem.h>
> #include <wtf/OwnPtr.h>
> #include <wtf/PassOwnPtr.h>
> #include <wtf/RefPtr.h>
>Index: Source/WebKit/chromium/src/WorkerAsyncFileSystemChromium.cpp
>===================================================================
>--- Source/WebKit/chromium/src/WorkerAsyncFileSystemChromium.cpp	(revision 116308)
>+++ Source/WebKit/chromium/src/WorkerAsyncFileSystemChromium.cpp	(working copy)
>@@ -38,7 +38,6 @@
> #include "FileMetadata.h"
> #include "FileSystem.h"
> #include "NotImplemented.h"
>-#include "platform/WebFileSystem.h"
> #include "WebFileSystemCallbacksImpl.h"
> #include "WebFileWriter.h"
> #include "WebKit.h"
>@@ -49,6 +48,7 @@
> #include "WorkerFileSystemCallbacksBridge.h"
> #include "WorkerScriptController.h"
> #include "WorkerThread.h"
>+#include <public/WebFileSystem.h>
> #include <wtf/text/CString.h>
> 
> using namespace WebKit;
>Index: Source/WebKit/chromium/src/WorkerAsyncFileWriterChromium.cpp
>===================================================================
>--- Source/WebKit/chromium/src/WorkerAsyncFileWriterChromium.cpp	(revision 116308)
>+++ Source/WebKit/chromium/src/WorkerAsyncFileWriterChromium.cpp	(working copy)
>@@ -36,7 +36,6 @@
> #include "AsyncFileSystem.h"
> #include "Blob.h"
> #include "ScriptExecutionContext.h"
>-#include "platform/WebFileSystem.h"
> #include "WebFileWriter.h"
> #include "platform/WebURL.h"
> #include "WebWorkerBase.h"
>@@ -44,6 +43,7 @@
> #include "WorkerFileWriterCallbacksBridge.h"
> #include "WorkerLoaderProxy.h"
> #include "WorkerThread.h"
>+#include <public/WebFileSystem.h>
> #include <wtf/Assertions.h>
> 
> using namespace WebKit;
>Index: Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.h
>===================================================================
>--- Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.h	(revision 116308)
>+++ Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.h	(working copy)
>@@ -36,8 +36,8 @@
> #include "PlatformString.h"
> #include "ScriptExecutionContext.h"
> #include "WebFileError.h"
>-#include "platform/WebFileSystem.h"
> #include "platform/WebVector.h"
>+#include <public/WebFileSystem.h>
> #include <wtf/PassOwnPtr.h>
> #include <wtf/PassRefPtr.h>
> #include <wtf/Threading.h>
>Index: Source/WebKit/chromium/src/WorkerFileWriterCallbacksBridge.cpp
>===================================================================
>--- Source/WebKit/chromium/src/WorkerFileWriterCallbacksBridge.cpp	(revision 116308)
>+++ Source/WebKit/chromium/src/WorkerFileWriterCallbacksBridge.cpp	(working copy)
>@@ -36,14 +36,14 @@
> #include "AsyncFileWriterClient.h"
> #include "CrossThreadTask.h"
> #include "platform/WebCString.h"
>-#include "platform/WebFileSystem.h"
> #include "WebFileWriter.h"
> #include "WebKit.h"
>-#include "platform/WebKitPlatformSupport.h"
> #include "WebWorkerBase.h"
> #include "WorkerContext.h"
> #include "WorkerLoaderProxy.h"
> #include "WorkerThread.h"
>+#include <public/Platform.h>
>+#include <public/WebFileSystem.h>
> #include <wtf/MainThread.h>
> #include <wtf/Threading.h>
> 
>@@ -104,7 +104,7 @@ void WorkerFileWriterCallbacksBridge::ab
> void WorkerFileWriterCallbacksBridge::initOnMainThread(ScriptExecutionContext*, PassRefPtr<WorkerFileWriterCallbacksBridge> bridge, const KURL& path)
> {
>     ASSERT(!bridge->m_writer);
>-    bridge->m_writer = adoptPtr(webKitPlatformSupport()->fileSystem()->createFileWriter(path, bridge.get()));
>+    bridge->m_writer = adoptPtr(WebKit::Platform::current()->fileSystem()->createFileWriter(path, bridge.get()));
> }
> 
> void WorkerFileWriterCallbacksBridge::shutdownOnMainThread(ScriptExecutionContext*, PassRefPtr<WorkerFileWriterCallbacksBridge> bridge)

Actions: View | Formatted Diff | Diff

Attachments on bug 85760: 140451 | 140528 | 140558 | 140563