Diff
Modified: trunk/Source/Platform/ChangeLog (145451 => 145452)
--- trunk/Source/Platform/ChangeLog 2013-03-12 01:12:11 UTC (rev 145451)
+++ trunk/Source/Platform/ChangeLog 2013-03-12 01:13:50 UTC (rev 145452)
@@ -1,3 +1,26 @@
+2013-03-11 Mark Pilgrim <pilg...@chromium.org>
+
+ [Chromium] Move WebFileSystemCallbacks to Platform/
+ https://bugs.webkit.org/show_bug.cgi?id=112049
+
+ Reviewed by Adam Barth.
+
+ In preparation for moving filesystem-related methods from
+ WebFrameClient to Platform.
+
+ * Platform.gypi:
+ * chromium/public/WebFileError.h: Copied from Source/WebKit/chromium/public/WebFileError.h.
+ (WebKit):
+ * chromium/public/WebFileSystemCallbacks.h: Copied from Source/WebKit/chromium/public/WebFileSystemCallbacks.h.
+ (WebKit):
+ (WebFileSystemCallbacks):
+ (WebKit::WebFileSystemCallbacks::didCreateSnapshotFile):
+ (WebKit::WebFileSystemCallbacks::~WebFileSystemCallbacks):
+ * chromium/public/WebFileSystemEntry.h: Copied from Source/WebKit/chromium/public/WebFileSystemEntry.h.
+ (WebKit):
+ (WebKit::WebFileSystemEntry::WebFileSystemEntry):
+ (WebFileSystemEntry):
+
2013-03-11 James Robinson <jam...@chromium.org>
[chromium] Use SkMatrix44 instead of WebTransformationMatrix in animation APIs
Modified: trunk/Source/Platform/Platform.gypi (145451 => 145452)
--- trunk/Source/Platform/Platform.gypi 2013-03-12 01:12:11 UTC (rev 145451)
+++ trunk/Source/Platform/Platform.gypi 2013-03-12 01:13:50 UTC (rev 145452)
@@ -55,8 +55,11 @@
'chromium/public/WebDragData.h',
'chromium/public/WebExternalTextureLayer.h',
'chromium/public/WebExternalTextureLayerClient.h',
+ 'chromium/public/WebFileError.h',
'chromium/public/WebFileInfo.h',
'chromium/public/WebFileSystem.h',
+ 'chromium/public/WebFileSystemCallbacks.h',
+ 'chromium/public/WebFileSystemEntry.h',
'chromium/public/WebFileUtilities.h',
'chromium/public/WebFilterOperation.h',
'chromium/public/WebFilterOperations.h',
Copied: trunk/Source/Platform/chromium/public/WebFileError.h (from rev 145451, trunk/Source/WebKit/chromium/public/WebFileError.h) (0 => 145452)
--- trunk/Source/Platform/chromium/public/WebFileError.h (rev 0)
+++ trunk/Source/Platform/chromium/public/WebFileError.h 2013-03-12 01:13:50 UTC (rev 145452)
@@ -0,0 +1,53 @@
+/*
+ * 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 WebFileError_h
+#define WebFileError_h
+
+namespace WebKit {
+
+// File-related error code defined in HTML5 File API.
+enum WebFileError {
+ WebFileErrorNotFound = 1,
+ WebFileErrorSecurity = 2,
+ WebFileErrorAbort = 3,
+ WebFileErrorNotReadable = 4,
+ WebFileErrorEncoding = 5,
+ WebFileErrorNoModificationAllowed = 6,
+ WebFileErrorInvalidState = 7,
+ WebFileErrorSyntax = 8,
+ WebFileErrorInvalidModification = 9,
+ WebFileErrorQuotaExceeded = 10,
+ WebFileErrorTypeMismatch = 11,
+ WebFileErrorPathExists = 12,
+};
+
+} // namespace WebKit
+
+#endif
Copied: trunk/Source/Platform/chromium/public/WebFileSystemCallbacks.h (from rev 145451, trunk/Source/WebKit/chromium/public/WebFileSystemCallbacks.h) (0 => 145452)
--- trunk/Source/Platform/chromium/public/WebFileSystemCallbacks.h (rev 0)
+++ trunk/Source/Platform/chromium/public/WebFileSystemCallbacks.h 2013-03-12 01:13:50 UTC (rev 145452)
@@ -0,0 +1,78 @@
+/*
+ * 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 WebFileSystemCallbacks_h
+#define WebFileSystemCallbacks_h
+
+#include "WebFileError.h"
+#include "WebFileSystemEntry.h"
+#include "WebVector.h"
+
+namespace WebKit {
+
+class WebString;
+class WebURL;
+struct WebFileInfo;
+
+class WebFileSystemCallbacks {
+public:
+ // Callback for WebFileSystem's various operations that don't require
+ // return values.
+ virtual void didSucceed() = 0;
+
+ // Callback for WebFileSystem::readMetadata. Called with the file metadata
+ // for the requested path.
+ virtual void didReadMetadata(const WebFileInfo&) = 0;
+
+ // Callback for WebFileSystem::createSnapshot. The metadata also includes the
+ // platform file path.
+ virtual void didCreateSnapshotFile(const WebFileInfo&) { WEBKIT_ASSERT_NOT_REACHED(); }
+
+ // Callback for WebFileSystem::readDirectory. Called with a vector of
+ // file entries in the requested directory. This callback might be called
+ // multiple times if the directory has many entries. |hasMore| must be
+ // true when there are more entries.
+ virtual void didReadDirectory(const WebVector<WebFileSystemEntry>&, bool hasMore) = 0;
+
+ // Callback for WebFrameClient::openFileSystem. Called with a name and
+ // root URL for the FileSystem when the request is accepted.
+ virtual void didOpenFileSystem(const WebString& name, const WebURL& rootURL) = 0;
+
+ // Called with an error code when a requested operation hasn't been
+ // completed.
+ virtual void didFail(WebFileError) = 0;
+
+protected:
+ virtual ~WebFileSystemCallbacks() { }
+};
+
+} // namespace WebKit
+
+#endif
Copied: trunk/Source/Platform/chromium/public/WebFileSystemEntry.h (from rev 145451, trunk/Source/WebKit/chromium/public/WebFileSystemEntry.h) (0 => 145452)
--- trunk/Source/Platform/chromium/public/WebFileSystemEntry.h (rev 0)
+++ trunk/Source/Platform/chromium/public/WebFileSystemEntry.h 2013-03-12 01:13:50 UTC (rev 145452)
@@ -0,0 +1,50 @@
+/*
+ * 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 WebFileSystemEntry_h
+#define WebFileSystemEntry_h
+
+#include "WebString.h"
+
+namespace WebKit {
+
+struct WebFileSystemEntry {
+ WebFileSystemEntry() : isDirectory(false) { }
+
+ // The name of the entry.
+ WebString name;
+
+ // This flag indicates if the entry is directory or not.
+ bool isDirectory;
+};
+
+} // namespace WebKit
+
+#endif // WebFileSystemEntry_h
Modified: trunk/Source/WebKit/chromium/ChangeLog (145451 => 145452)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-03-12 01:12:11 UTC (rev 145451)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-03-12 01:13:50 UTC (rev 145452)
@@ -1,3 +1,29 @@
+2013-03-11 Mark Pilgrim <pilg...@chromium.org>
+
+ [Chromium] Move WebFileSystemCallbacks to Platform/
+ https://bugs.webkit.org/show_bug.cgi?id=112049
+
+ Reviewed by Adam Barth.
+
+ In preparation for moving filesystem-related methods from
+ WebFrameClient to Platform.
+
+ * WebKit.gyp:
+ * public/WebFileError.h:
+ * public/WebFileSystemCallbacks.h:
+ * public/WebFileSystemEntry.h:
+ * public/WebFileWriterClient.h:
+ * src/AssertMatchingEnums.cpp:
+ * src/AsyncFileWriterChromium.h:
+ * src/LocalFileSystemChromium.cpp:
+ * src/WebFileSystemCallbacksImpl.cpp:
+ * src/WebFileSystemCallbacksImpl.h:
+ * src/WebSharedWorkerImpl.cpp:
+ * src/WebWorkerClientImpl.cpp:
+ * src/WorkerFileSystemCallbacksBridge.cpp:
+ * src/WorkerFileSystemCallbacksBridge.h:
+ * src/WorkerFileWriterCallbacksBridge.h:
+
2013-03-11 Abhishek Arya <infe...@chromium.org>
Replace static_cast with to* helper functions.
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (145451 => 145452)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2013-03-12 01:12:11 UTC (rev 145451)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2013-03-12 01:13:50 UTC (rev 145452)
@@ -151,9 +151,6 @@
'public/WebExternalPopupMenuClient.h',
'public/WebFileChooserCompletion.h',
'public/WebFileChooserParams.h',
- 'public/WebFileError.h',
- 'public/WebFileSystemCallbacks.h',
- 'public/WebFileSystemEntry.h',
'public/WebFileWriter.h',
'public/WebFileWriterClient.h',
'public/WebFindOptions.h',
Modified: trunk/Source/WebKit/chromium/public/WebFileError.h (145451 => 145452)
--- trunk/Source/WebKit/chromium/public/WebFileError.h 2013-03-12 01:12:11 UTC (rev 145451)
+++ trunk/Source/WebKit/chromium/public/WebFileError.h 2013-03-12 01:13:50 UTC (rev 145452)
@@ -27,27 +27,5 @@
* (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 WebFileError_h
-#define WebFileError_h
-namespace WebKit {
-
-// File-related error code defined in HTML5 File API.
-enum WebFileError {
- WebFileErrorNotFound = 1,
- WebFileErrorSecurity = 2,
- WebFileErrorAbort = 3,
- WebFileErrorNotReadable = 4,
- WebFileErrorEncoding = 5,
- WebFileErrorNoModificationAllowed = 6,
- WebFileErrorInvalidState = 7,
- WebFileErrorSyntax = 8,
- WebFileErrorInvalidModification = 9,
- WebFileErrorQuotaExceeded = 10,
- WebFileErrorTypeMismatch = 11,
- WebFileErrorPathExists = 12,
-};
-
-} // namespace WebKit
-
-#endif
+#include "../../../Platform/chromium/public/WebFileError.h"
Modified: trunk/Source/WebKit/chromium/public/WebFileSystemCallbacks.h (145451 => 145452)
--- trunk/Source/WebKit/chromium/public/WebFileSystemCallbacks.h 2013-03-12 01:12:11 UTC (rev 145451)
+++ trunk/Source/WebKit/chromium/public/WebFileSystemCallbacks.h 2013-03-12 01:13:50 UTC (rev 145452)
@@ -28,51 +28,4 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef WebFileSystemCallbacks_h
-#define WebFileSystemCallbacks_h
-
-#include "../../../Platform/chromium/public/WebVector.h"
-#include "WebFileError.h"
-#include "WebFileSystemEntry.h"
-
-namespace WebKit {
-
-class WebString;
-class WebURL;
-struct WebFileInfo;
-
-class WebFileSystemCallbacks {
-public:
- // Callback for WebFileSystem's various operations that don't require
- // return values.
- virtual void didSucceed() = 0;
-
- // Callback for WebFileSystem::readMetadata. Called with the file metadata
- // for the requested path.
- virtual void didReadMetadata(const WebFileInfo&) = 0;
-
- // Callback for WebFileSystem::createSnapshot. The metadata also includes the
- // platform file path.
- virtual void didCreateSnapshotFile(const WebFileInfo&) { WEBKIT_ASSERT_NOT_REACHED(); }
-
- // Callback for WebFileSystem::readDirectory. Called with a vector of
- // file entries in the requested directory. This callback might be called
- // multiple times if the directory has many entries. |hasMore| must be
- // true when there are more entries.
- virtual void didReadDirectory(const WebVector<WebFileSystemEntry>&, bool hasMore) = 0;
-
- // Callback for WebFrameClient::openFileSystem. Called with a name and
- // root URL for the FileSystem when the request is accepted.
- virtual void didOpenFileSystem(const WebString& name, const WebURL& rootURL) = 0;
-
- // Called with an error code when a requested operation hasn't been
- // completed.
- virtual void didFail(WebFileError) = 0;
-
-protected:
- virtual ~WebFileSystemCallbacks() {}
-};
-
-} // namespace WebKit
-
-#endif
+#include "../../../Platform/chromium/public/WebFileSystemCallbacks.h"
Modified: trunk/Source/WebKit/chromium/public/WebFileSystemEntry.h (145451 => 145452)
--- trunk/Source/WebKit/chromium/public/WebFileSystemEntry.h 2013-03-12 01:12:11 UTC (rev 145451)
+++ trunk/Source/WebKit/chromium/public/WebFileSystemEntry.h 2013-03-12 01:13:50 UTC (rev 145452)
@@ -28,23 +28,4 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef WebFileSystemEntry_h
-#define WebFileSystemEntry_h
-
-#include "../../../Platform/chromium/public/WebString.h"
-
-namespace WebKit {
-
-struct WebFileSystemEntry {
- WebFileSystemEntry() : isDirectory(false) { }
-
- // The name of the entry.
- WebString name;
-
- // This flag indicates if the entry is directory or not.
- bool isDirectory;
-};
-
-} // namespace WebKit
-
-#endif // WebFileSystemEntry_h
+#include "../../../Platform/chromium/public/WebFileSystemEntry.h"
Modified: trunk/Source/WebKit/chromium/public/WebFileWriterClient.h (145451 => 145452)
--- trunk/Source/WebKit/chromium/public/WebFileWriterClient.h 2013-03-12 01:12:11 UTC (rev 145451)
+++ trunk/Source/WebKit/chromium/public/WebFileWriterClient.h 2013-03-12 01:13:50 UTC (rev 145452)
@@ -32,7 +32,7 @@
#define WebFileWriterClient_h
#include "../../../Platform/chromium/public/WebCommon.h"
-#include "WebFileError.h"
+#include "../../../Platform/chromium/public/WebFileError.h"
namespace WebKit {
Modified: trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp (145451 => 145452)
--- trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2013-03-12 01:12:11 UTC (rev 145451)
+++ trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2013-03-12 01:13:50 UTC (rev 145452)
@@ -89,7 +89,6 @@
#include "WebContentSecurityPolicy.h"
#include "WebCursorInfo.h"
#include "WebEditingAction.h"
-#include "WebFileError.h"
#include "WebFontDescription.h"
#if ENABLE(REQUEST_AUTOCOMPLETE)
#include "WebFormElement.h"
@@ -120,6 +119,7 @@
#include "WebTextCheckingType.h"
#include "WebView.h"
#include <public/WebClipboard.h>
+#include <public/WebFileError.h>
#include <public/WebFileInfo.h>
#include <public/WebFileSystem.h>
#include <public/WebFilterOperation.h>
Modified: trunk/Source/WebKit/chromium/src/AsyncFileWriterChromium.h (145451 => 145452)
--- trunk/Source/WebKit/chromium/src/AsyncFileWriterChromium.h 2013-03-12 01:12:11 UTC (rev 145451)
+++ trunk/Source/WebKit/chromium/src/AsyncFileWriterChromium.h 2013-03-12 01:13:50 UTC (rev 145452)
@@ -34,8 +34,8 @@
#if ENABLE(FILE_SYSTEM)
#include "AsyncFileWriter.h"
-#include "WebFileError.h"
#include "WebFileWriterClient.h"
+#include <public/WebFileError.h>
#include <wtf/PassOwnPtr.h>
namespace WebKit {
Modified: trunk/Source/WebKit/chromium/src/LocalFileSystemChromium.cpp (145451 => 145452)
--- trunk/Source/WebKit/chromium/src/LocalFileSystemChromium.cpp 2013-03-12 01:12:11 UTC (rev 145451)
+++ trunk/Source/WebKit/chromium/src/LocalFileSystemChromium.cpp 2013-03-12 01:13:50 UTC (rev 145452)
@@ -39,7 +39,6 @@
#include "FileSystemCallback.h"
#include "FileSystemCallbacks.h"
#include "FileSystemType.h"
-#include "WebFileError.h"
#include "WebFileSystemCallbacksImpl.h"
#include "WebFrameClient.h"
#include "WebFrameImpl.h"
@@ -49,6 +48,7 @@
#include "WorkerContext.h"
#include "WorkerFileSystemCallbacksBridge.h"
#include "WorkerThread.h"
+#include <public/WebFileError.h>
#include <public/WebFileSystem.h>
#include <wtf/Threading.h>
#include <wtf/text/WTFString.h>
Modified: trunk/Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.cpp (145451 => 145452)
--- trunk/Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.cpp 2013-03-12 01:12:11 UTC (rev 145451)
+++ trunk/Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.cpp 2013-03-12 01:13:50 UTC (rev 145452)
@@ -36,10 +36,10 @@
#include "AsyncFileSystemChromium.h"
#include "FileMetadata.h"
#include "ScriptExecutionContext.h"
-#include "WebFileSystemEntry.h"
#include "WorkerAsyncFileSystemChromium.h"
#include <public/WebFileInfo.h>
#include <public/WebFileSystem.h>
+#include <public/WebFileSystemEntry.h>
#include <public/WebString.h>
#include <wtf/Vector.h>
Modified: trunk/Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.h (145451 => 145452)
--- trunk/Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.h 2013-03-12 01:12:11 UTC (rev 145451)
+++ trunk/Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.h 2013-03-12 01:13:50 UTC (rev 145452)
@@ -32,8 +32,8 @@
#define WebFileSystemCallbacksImpl_h
#include "FileSystemType.h"
-#include "WebFileSystemCallbacks.h"
#include <public/WebFileSystem.h>
+#include <public/WebFileSystemCallbacks.h>
#include <public/WebVector.h>
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
Modified: trunk/Source/WebKit/chromium/src/WebSharedWorkerImpl.cpp (145451 => 145452)
--- trunk/Source/WebKit/chromium/src/WebSharedWorkerImpl.cpp 2013-03-12 01:12:11 UTC (rev 145451)
+++ trunk/Source/WebKit/chromium/src/WebSharedWorkerImpl.cpp 2013-03-12 01:13:50 UTC (rev 145452)
@@ -48,7 +48,6 @@
#include "SharedWorkerContext.h"
#include "SharedWorkerThread.h"
#include "WebDataSourceImpl.h"
-#include "WebFileError.h"
#include "WebFrameClient.h"
#include "WebFrameImpl.h"
#include "WebRuntimeFeatures.h"
@@ -60,6 +59,7 @@
#include "WorkerInspectorController.h"
#include "WorkerLoaderProxy.h"
#include "WorkerThread.h"
+#include <public/WebFileError.h>
#include <public/WebMessagePortChannel.h>
#include <public/WebString.h>
#include <public/WebURL.h>
Modified: trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp (145451 => 145452)
--- trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp 2013-03-12 01:12:11 UTC (rev 145451)
+++ trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp 2013-03-12 01:13:50 UTC (rev 145452)
@@ -56,11 +56,11 @@
#include "FrameLoaderClientImpl.h"
#include "PlatformMessagePortChannelChromium.h"
-#include "WebFileSystemCallbacks.h"
#include "WebFrameClient.h"
#include "WebFrameImpl.h"
#include "WebPermissionClient.h"
#include "WebViewImpl.h"
+#include <public/WebFileSystemCallbacks.h>
#include <public/WebMessagePortChannel.h>
#include <public/WebString.h>
#include <public/WebURL.h>
Modified: trunk/Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.cpp (145451 => 145452)
--- trunk/Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.cpp 2013-03-12 01:12:11 UTC (rev 145451)
+++ trunk/Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.cpp 2013-03-12 01:13:50 UTC (rev 145452)
@@ -36,14 +36,14 @@
#include "CrossThreadTask.h"
#include "KURL.h"
#include "WebCommonWorkerClient.h"
-#include "WebFileSystemCallbacks.h"
-#include "WebFileSystemEntry.h"
#include "WebWorkerBase.h"
#include "WorkerContext.h"
#include "WorkerLoaderProxy.h"
#include "WorkerScriptController.h"
#include "WorkerThread.h"
#include <public/WebFileInfo.h>
+#include <public/WebFileSystemCallbacks.h>
+#include <public/WebFileSystemEntry.h>
#include <public/WebString.h>
#include <public/WebURL.h>
#include <wtf/MainThread.h>
Modified: trunk/Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.h (145451 => 145452)
--- trunk/Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.h 2013-03-12 01:12:11 UTC (rev 145451)
+++ trunk/Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.h 2013-03-12 01:13:50 UTC (rev 145452)
@@ -34,7 +34,7 @@
#if ENABLE(FILE_SYSTEM) && ENABLE(WORKERS)
#include "ScriptExecutionContext.h"
-#include "WebFileError.h"
+#include <public/WebFileError.h>
#include <public/WebFileSystem.h>
#include <public/WebVector.h>
#include <wtf/PassOwnPtr.h>
Modified: trunk/Source/WebKit/chromium/src/WorkerFileWriterCallbacksBridge.h (145451 => 145452)
--- trunk/Source/WebKit/chromium/src/WorkerFileWriterCallbacksBridge.h 2013-03-12 01:12:11 UTC (rev 145451)
+++ trunk/Source/WebKit/chromium/src/WorkerFileWriterCallbacksBridge.h 2013-03-12 01:13:50 UTC (rev 145452)
@@ -34,9 +34,9 @@
#if ENABLE(FILE_SYSTEM) && ENABLE(WORKERS)
#include "KURL.h"
-#include "WebFileError.h"
#include "WebFileWriterClient.h"
#include "WorkerContext.h"
+#include <public/WebFileError.h>
#include <wtf/PassOwnPtr.h>
#include <wtf/PassRefPtr.h>
#include <wtf/ThreadSafeRefCounted.h>
