[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 13:42:17 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit e23242ec2b8bda97402a337d753454769a8e8d09
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 23 19:33:39 2010 +0000
2010-09-23 Eric Uhrhane <ericu at chromium.org>
Reviewed by David Levin.
Rename FileWriterClient to AsyncFileWriterClient.
https://bugs.webkit.org/show_bug.cgi?id=46325
* GNUmakefile.am:
* WebCore.gypi:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* fileapi/AsyncFileWriter.h:
* fileapi/AsyncFileWriterClient.h: Copied from WebCore/fileapi/FileWriterClient.h.
* fileapi/FileWriter.h:
* fileapi/FileWriterClient.h: Removed.
* platform/AsyncFileSystem.h:
2010-09-23 Eric Uhrhane <ericu at chromium.org>
Reviewed by David Levin.
Rename FileWriterClient to AsyncFileWriterClient.
https://bugs.webkit.org/show_bug.cgi?id=46325
* src/AsyncFileSystemChromium.cpp:
* src/AsyncFileSystemChromium.h:
* src/AsyncFileWriterChromium.cpp:
* src/AsyncFileWriterChromium.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68180 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 056422d..9bec7bc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-09-23 Eric Uhrhane <ericu at chromium.org>
+
+ Reviewed by David Levin.
+
+ Rename FileWriterClient to AsyncFileWriterClient.
+ https://bugs.webkit.org/show_bug.cgi?id=46325
+
+ * GNUmakefile.am:
+ * WebCore.gypi:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * fileapi/AsyncFileWriter.h:
+ * fileapi/AsyncFileWriterClient.h: Copied from WebCore/fileapi/FileWriterClient.h.
+ * fileapi/FileWriter.h:
+ * fileapi/FileWriterClient.h: Removed.
+ * platform/AsyncFileSystem.h:
+
2010-09-23 David Hyatt <hyatt at apple.com>
Reviewed by Dan Bernstein.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index bfe6bdd..44c71b5 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -1350,6 +1350,7 @@ webcore_sources += \
WebCore/editing/WrapContentsInDummySpanCommand.cpp \
WebCore/editing/WrapContentsInDummySpanCommand.h \
WebCore/fileapi/AsyncFileWriter.h \
+ WebCore/fileapi/AsyncFileWriterClient.h \
WebCore/fileapi/BlobBuilder.cpp \
WebCore/fileapi/BlobBuilder.h \
WebCore/fileapi/Blob.cpp \
@@ -1393,7 +1394,6 @@ webcore_sources += \
WebCore/fileapi/FileThread.h \
WebCore/fileapi/FileThreadTask.h \
WebCore/fileapi/FileWriterCallback.h \
- WebCore/fileapi/FileWriterClient.h \
WebCore/fileapi/FileWriter.cpp \
WebCore/fileapi/FileWriter.h \
WebCore/fileapi/Flags.h \
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index c8702fc..5762f2b 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -1438,6 +1438,7 @@
'editing/visible_units.cpp',
'editing/visible_units.h',
'fileapi/AsyncFileWriter.h',
+ 'fileapi/AsyncFileWriterClient.h',
'fileapi/Blob.cpp',
'fileapi/Blob.h',
'fileapi/BlobBuilder.cpp',
@@ -1483,7 +1484,6 @@
'fileapi/FileWriter.cpp',
'fileapi/FileWriter.h',
'fileapi/FileWriterCallback.h',
- 'fileapi/FileWriterClient.h',
'fileapi/Flags.h',
'fileapi/LocalFileSystem.h',
'fileapi/Metadata.h',
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index 52cb26b..55c8d72 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -37521,6 +37521,10 @@
>
</File>
<File
+ RelativePath="..\fileapi\AsyncFileWriterClient.h"
+ >
+ </File>
+ <File
RelativePath="..\html\AsyncImageResizer.cpp"
>
</File>
@@ -37825,10 +37829,6 @@
>
</File>
<File
- RelativePath="..\fileapi\FileWriterClient.h"
- >
- </File>
- <File
RelativePath="..\fileapi\Flags.h"
>
</File>
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index adbb434..3abe3d3 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -2777,6 +2777,7 @@
973E325610883B7C005BC493 /* ResourceLoadNotifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 973E325410883B7C005BC493 /* ResourceLoadNotifier.cpp */; };
973E325710883B7C005BC493 /* ResourceLoadNotifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 973E325510883B7C005BC493 /* ResourceLoadNotifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
976D6C77122B8A3D001FD1F7 /* AsyncFileWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 976D6C58122B8A3D001FD1F7 /* AsyncFileWriter.h */; };
+ 976D6C93122B8A3D001FD1F7 /* AsyncFileWriterClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 976D6C74122B8A3D001FD1F7 /* AsyncFileWriterClient.h */; };
976D6C78122B8A3D001FD1F7 /* Blob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 976D6C59122B8A3D001FD1F7 /* Blob.cpp */; };
976D6C79122B8A3D001FD1F7 /* Blob.h in Headers */ = {isa = PBXBuildFile; fileRef = 976D6C5A122B8A3D001FD1F7 /* Blob.h */; };
976D6C7B122B8A3D001FD1F7 /* BlobBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 976D6C5C122B8A3D001FD1F7 /* BlobBuilder.cpp */; };
@@ -2797,7 +2798,6 @@
976D6C8F122B8A3D001FD1F7 /* FileThreadTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 976D6C70122B8A3D001FD1F7 /* FileThreadTask.h */; };
976D6C90122B8A3D001FD1F7 /* FileWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 976D6C71122B8A3D001FD1F7 /* FileWriter.cpp */; };
976D6C91122B8A3D001FD1F7 /* FileWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 976D6C72122B8A3D001FD1F7 /* FileWriter.h */; };
- 976D6C93122B8A3D001FD1F7 /* FileWriterClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 976D6C74122B8A3D001FD1F7 /* FileWriterClient.h */; };
976D6C94122B8A3D001FD1F7 /* ThreadableBlobRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 976D6C75122B8A3D001FD1F7 /* ThreadableBlobRegistry.cpp */; };
976D6C95122B8A3D001FD1F7 /* ThreadableBlobRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 976D6C76122B8A3D001FD1F7 /* ThreadableBlobRegistry.h */; };
977B37231228721700B81FF8 /* HTMLElementStack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 977B371F1228721700B81FF8 /* HTMLElementStack.cpp */; };
@@ -8677,6 +8677,7 @@
973E325410883B7C005BC493 /* ResourceLoadNotifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceLoadNotifier.cpp; sourceTree = "<group>"; };
973E325510883B7C005BC493 /* ResourceLoadNotifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceLoadNotifier.h; sourceTree = "<group>"; };
976D6C58122B8A3D001FD1F7 /* AsyncFileWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AsyncFileWriter.h; path = fileapi/AsyncFileWriter.h; sourceTree = "<group>"; };
+ 976D6C74122B8A3D001FD1F7 /* AsyncFileWriterClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AsyncFileWriterClient.h; path = fileapi/AsyncFileWriterClient.h; sourceTree = "<group>"; };
976D6C59122B8A3D001FD1F7 /* Blob.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Blob.cpp; path = fileapi/Blob.cpp; sourceTree = "<group>"; };
976D6C5A122B8A3D001FD1F7 /* Blob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Blob.h; path = fileapi/Blob.h; sourceTree = "<group>"; };
976D6C5C122B8A3D001FD1F7 /* BlobBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BlobBuilder.cpp; path = fileapi/BlobBuilder.cpp; sourceTree = "<group>"; };
@@ -8697,7 +8698,6 @@
976D6C70122B8A3D001FD1F7 /* FileThreadTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileThreadTask.h; path = fileapi/FileThreadTask.h; sourceTree = "<group>"; };
976D6C71122B8A3D001FD1F7 /* FileWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileWriter.cpp; path = fileapi/FileWriter.cpp; sourceTree = "<group>"; };
976D6C72122B8A3D001FD1F7 /* FileWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileWriter.h; path = fileapi/FileWriter.h; sourceTree = "<group>"; };
- 976D6C74122B8A3D001FD1F7 /* FileWriterClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileWriterClient.h; path = fileapi/FileWriterClient.h; sourceTree = "<group>"; };
976D6C75122B8A3D001FD1F7 /* ThreadableBlobRegistry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadableBlobRegistry.cpp; path = fileapi/ThreadableBlobRegistry.cpp; sourceTree = "<group>"; };
976D6C76122B8A3D001FD1F7 /* ThreadableBlobRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadableBlobRegistry.h; path = fileapi/ThreadableBlobRegistry.h; sourceTree = "<group>"; };
977B371F1228721700B81FF8 /* HTMLElementStack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HTMLElementStack.cpp; path = parser/HTMLElementStack.cpp; sourceTree = "<group>"; };
@@ -14433,6 +14433,7 @@
isa = PBXGroup;
children = (
976D6C58122B8A3D001FD1F7 /* AsyncFileWriter.h */,
+ 976D6C74122B8A3D001FD1F7 /* AsyncFileWriterClient.h */,
976D6C59122B8A3D001FD1F7 /* Blob.cpp */,
976D6C5A122B8A3D001FD1F7 /* Blob.h */,
976D6C5C122B8A3D001FD1F7 /* BlobBuilder.cpp */,
@@ -14478,7 +14479,6 @@
976D6C71122B8A3D001FD1F7 /* FileWriter.cpp */,
976D6C72122B8A3D001FD1F7 /* FileWriter.h */,
893C47A61238908B002B3D86 /* FileWriterCallback.h */,
- 976D6C74122B8A3D001FD1F7 /* FileWriterClient.h */,
8987854D122CA064003AABDA /* Flags.h */,
8987854E122CA064003AABDA /* LocalFileSystem.cpp */,
8987854F122CA064003AABDA /* LocalFileSystem.h */,
@@ -17876,6 +17876,7 @@
89D08DA012228451001241DF /* AsyncFileSystem.h in Headers */,
89D08DA112228451001241DF /* AsyncFileSystemCallbacks.h in Headers */,
976D6C77122B8A3D001FD1F7 /* AsyncFileWriter.h in Headers */,
+ 976D6C93122B8A3D001FD1F7 /* AsyncFileWriterClient.h in Headers */,
B0149E7E11A4B21500196A7B /* AsyncImageResizer.h in Headers */,
8A413AE01207BBA50082016E /* AsyncScriptRunner.h in Headers */,
37C61F0112095C87007A3C67 /* AtomicStringKeyedMRUCache.h in Headers */,
@@ -18931,7 +18932,6 @@
976D6C8F122B8A3D001FD1F7 /* FileThreadTask.h in Headers */,
976D6C91122B8A3D001FD1F7 /* FileWriter.h in Headers */,
893C47A81238908B002B3D86 /* FileWriterCallback.h in Headers */,
- 976D6C93122B8A3D001FD1F7 /* FileWriterClient.h in Headers */,
BC5EB69F0E81DAEB00B25965 /* FillLayer.h in Headers */,
845E72F80FD261EE00A87D79 /* Filter.h in Headers */,
08C9251A0FCC7C4A00480DEC /* FilterEffect.h in Headers */,
diff --git a/WebCore/fileapi/AsyncFileWriter.h b/WebCore/fileapi/AsyncFileWriter.h
index c1a47c5..fef1643 100644
--- a/WebCore/fileapi/AsyncFileWriter.h
+++ b/WebCore/fileapi/AsyncFileWriter.h
@@ -39,7 +39,6 @@
namespace WebCore {
class Blob;
-class FileWriterClient;
class AsyncFileWriter {
public:
diff --git a/WebCore/fileapi/AsyncFileWriterClient.h b/WebCore/fileapi/AsyncFileWriterClient.h
new file mode 100644
index 0000000..1c0a4b1
--- /dev/null
+++ b/WebCore/fileapi/AsyncFileWriterClient.h
@@ -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 AsyncFileWriterClient_h
+#define AsyncFileWriterClient_h
+
+#if ENABLE(FILE_SYSTEM)
+
+#include "ExceptionCode.h"
+
+namespace WebCore {
+
+class AsyncFileWriterClient {
+public:
+ virtual ~AsyncFileWriterClient() {}
+
+ virtual void didWrite(long long bytes, bool complete) = 0;
+ virtual void didTruncate(long long position) = 0;
+ virtual void didFail(ExceptionCode) = 0;
+};
+
+} // namespace
+
+#endif // ENABLE(FILE_SYSTEM)
+
+#endif // AsyncFileWriterClient_h
diff --git a/WebCore/fileapi/FileWriter.h b/WebCore/fileapi/FileWriter.h
index 0737085..c5314cb 100644
--- a/WebCore/fileapi/FileWriter.h
+++ b/WebCore/fileapi/FileWriter.h
@@ -34,8 +34,8 @@
#if ENABLE(FILE_SYSTEM)
#include "ActiveDOMObject.h"
+#include "AsyncFileWriterClient.h"
#include "EventTarget.h"
-#include "FileWriterClient.h"
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
#include <wtf/PassRefPtr.h>
@@ -49,7 +49,7 @@ class Blob;
class FileError;
class ScriptExecutionContext;
-class FileWriter : public RefCounted<FileWriter>, public ActiveDOMObject, public EventTarget, public FileWriterClient {
+class FileWriter : public RefCounted<FileWriter>, public ActiveDOMObject, public EventTarget, public AsyncFileWriterClient {
public:
static PassRefPtr<FileWriter> create(ScriptExecutionContext* context)
{
@@ -74,7 +74,7 @@ public:
long long position() const { return m_position; }
long long length() const { return m_length; }
- // FileWriterClient
+ // AsyncFileWriterClient
void didWrite(long long bytes, bool complete);
void didTruncate(long long length);
void didFail(ExceptionCode ec);
diff --git a/WebCore/fileapi/FileWriterClient.h b/WebCore/fileapi/FileWriterClient.h
deleted file mode 100644
index 1bebbd6..0000000
--- a/WebCore/fileapi/FileWriterClient.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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 FileWriterClient_h
-#define FileWriterClient_h
-
-#if ENABLE(FILE_SYSTEM)
-
-#include "ExceptionCode.h"
-
-namespace WebCore {
-
-class FileWriterClient {
-public:
- virtual ~FileWriterClient() {}
-
- virtual void didWrite(long long bytes, bool complete) = 0;
- virtual void didTruncate(long long position) = 0;
- virtual void didFail(ExceptionCode) = 0;
-};
-
-} // namespace
-
-#endif // ENABLE(FILE_SYSTEM)
-
-#endif // FileWriterClient_h
diff --git a/WebCore/platform/AsyncFileSystem.h b/WebCore/platform/AsyncFileSystem.h
index 600736b..71a0cc3 100644
--- a/WebCore/platform/AsyncFileSystem.h
+++ b/WebCore/platform/AsyncFileSystem.h
@@ -41,7 +41,7 @@ namespace WebCore {
class AsyncFileSystem;
class AsyncFileSystemCallbacks;
-class FileWriterClient;
+class AsyncFileWriterClient;
// This class provides async interface for platform-specific file system implementation. Note that all the methods take platform paths.
class AsyncFileSystem : public Noncopyable {
@@ -111,7 +111,7 @@ public:
// Creates an AsyncFileWriter for a given file path.
// AsyncFileSystemCallbacks::didCreateFileWriter() is called when an AsyncFileWriter is created successfully.
// AsyncFileSystemCallbacks::didFail() is called otherwise.
- virtual void createWriter(FileWriterClient* client, const String& path, PassOwnPtr<AsyncFileSystemCallbacks>) = 0;
+ virtual void createWriter(AsyncFileWriterClient* client, const String& path, PassOwnPtr<AsyncFileSystemCallbacks>) = 0;
// Converts a given absolute virtual path to a platform path that starts with the platform root path of this file system.
virtual String virtualToPlatformPath(const String& path) const;
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index a8b0fa8..718d118 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-23 Eric Uhrhane <ericu at chromium.org>
+
+ Reviewed by David Levin.
+
+ Rename FileWriterClient to AsyncFileWriterClient.
+ https://bugs.webkit.org/show_bug.cgi?id=46325
+
+ * src/AsyncFileSystemChromium.cpp:
+ * src/AsyncFileSystemChromium.h:
+ * src/AsyncFileWriterChromium.cpp:
+ * src/AsyncFileWriterChromium.h:
+
2010-09-23 Nate Chapin <japhet at chromium.org>
Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/src/AsyncFileSystemChromium.cpp b/WebKit/chromium/src/AsyncFileSystemChromium.cpp
index 8911941..430b2fb 100644
--- a/WebKit/chromium/src/AsyncFileSystemChromium.cpp
+++ b/WebKit/chromium/src/AsyncFileSystemChromium.cpp
@@ -103,7 +103,7 @@ void AsyncFileSystemChromium::readDirectory(const String& path, PassOwnPtr<Async
class FileWriterHelperCallbacks : public WebKit::WebFileSystemCallbacks {
public:
- FileWriterHelperCallbacks(FileWriterClient* client, const String& path, WebKit::WebFileSystem* webFileSystem, PassOwnPtr<WebCore::AsyncFileSystemCallbacks> callbacks)
+ FileWriterHelperCallbacks(AsyncFileWriterClient* client, const String& path, WebKit::WebFileSystem* webFileSystem, PassOwnPtr<WebCore::AsyncFileSystemCallbacks> callbacks)
: m_client(client)
, m_path(path)
, m_webFileSystem(webFileSystem)
@@ -149,13 +149,13 @@ public:
}
private:
- FileWriterClient* m_client;
+ AsyncFileWriterClient* m_client;
String m_path;
WebKit::WebFileSystem* m_webFileSystem;
OwnPtr<WebCore::AsyncFileSystemCallbacks> m_callbacks;
};
-void AsyncFileSystemChromium::createWriter(FileWriterClient* client, const String& path, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
+void AsyncFileSystemChromium::createWriter(AsyncFileWriterClient* client, const String& path, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
{
m_webFileSystem->readMetadata(path, new FileWriterHelperCallbacks(client, path, m_webFileSystem, callbacks));
}
diff --git a/WebKit/chromium/src/AsyncFileSystemChromium.h b/WebKit/chromium/src/AsyncFileSystemChromium.h
index b20e7d4..d8698d5 100644
--- a/WebKit/chromium/src/AsyncFileSystemChromium.h
+++ b/WebKit/chromium/src/AsyncFileSystemChromium.h
@@ -58,7 +58,7 @@ public:
virtual void fileExists(const String& path, PassOwnPtr<AsyncFileSystemCallbacks>);
virtual void directoryExists(const String& path, PassOwnPtr<AsyncFileSystemCallbacks>);
virtual void readDirectory(const String& path, PassOwnPtr<AsyncFileSystemCallbacks>);
- virtual void createWriter(FileWriterClient* client, const String& path, PassOwnPtr<AsyncFileSystemCallbacks>);
+ virtual void createWriter(AsyncFileWriterClient* client, const String& path, PassOwnPtr<AsyncFileSystemCallbacks>);
private:
WebKit::WebFileSystem* m_webFileSystem;
diff --git a/WebKit/chromium/src/AsyncFileWriterChromium.cpp b/WebKit/chromium/src/AsyncFileWriterChromium.cpp
index 7573cd2..29897a3 100644
--- a/WebKit/chromium/src/AsyncFileWriterChromium.cpp
+++ b/WebKit/chromium/src/AsyncFileWriterChromium.cpp
@@ -33,14 +33,14 @@
#if ENABLE(FILE_SYSTEM)
+#include "AsyncFileWriterClient.h"
#include "Blob.h"
-#include "FileWriterClient.h"
#include "WebFileWriter.h"
#include "WebURL.h"
namespace WebCore {
-AsyncFileWriterChromium::AsyncFileWriterChromium(FileWriterClient* client)
+AsyncFileWriterChromium::AsyncFileWriterChromium(AsyncFileWriterClient* client)
: m_client(client)
{
}
diff --git a/WebKit/chromium/src/AsyncFileWriterChromium.h b/WebKit/chromium/src/AsyncFileWriterChromium.h
index b336cb5..3117f7f 100644
--- a/WebKit/chromium/src/AsyncFileWriterChromium.h
+++ b/WebKit/chromium/src/AsyncFileWriterChromium.h
@@ -45,11 +45,11 @@ class WebFileWriter;
namespace WebCore {
class Blob;
-class FileWriterClient;
+class AsyncFileWriterClient;
class AsyncFileWriterChromium : public AsyncFileWriter, public WebKit::WebFileWriterClient {
public:
- AsyncFileWriterChromium(FileWriterClient* client);
+ AsyncFileWriterChromium(AsyncFileWriterClient* client);
~AsyncFileWriterChromium();
void setWebFileWriter(PassOwnPtr<WebKit::WebFileWriter> writer);
@@ -66,7 +66,7 @@ public:
private:
OwnPtr<WebKit::WebFileWriter> m_writer;
- FileWriterClient* m_client;
+ AsyncFileWriterClient* m_client;
};
} // namespace
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list