Attachment #68494 for bug #46325

View Details Raw Unified Return to Bug 46325



2010-09-22  Eric Uhrhane  <ericu@chromium.org>

        Reviewed by NOBODY (OOPS!).

        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-22  Andy Estes  <aestes@apple.com>

        Rubber-stamped by Darin Adler.



	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 \

	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 \



            'editing/visible_units.cpp',
            'editing/visible_units.h',
            'fileapi/AsyncFileWriter.h',
            'fileapi/AsyncFileWriterClient.h',
            'fileapi/Blob.cpp',
            'fileapi/Blob.h',
            'fileapi/BlobBuilder.cpp',

            'fileapi/FileWriter.cpp',
            'fileapi/FileWriter.h',
            'fileapi/FileWriterCallback.h',
            'fileapi/FileWriterClient.h',
            'fileapi/Flags.h',
            'fileapi/LocalFileSystem.h',
            'fileapi/Metadata.h',

Lines 37521-37526 WebCore/WebCore.vcproj/WebCore.vcproj_sec1
- WebCore/WebCore.vcproj/WebCore.vcproj -4 / +4 lines
37521	>	37521	>
37522	</File>	37522	</File>
37523	<File	37523	<File
		37524	RelativePath="..\fileapi\AsyncFileWriterClient.h"
		37525	>
		37526	</File>
		37527	<File
37524	RelativePath="..\html\AsyncImageResizer.cpp"	37528	RelativePath="..\html\AsyncImageResizer.cpp"
37525	>	37529	>
37526	</File>	37530	</File>
Lines 37825-37834 WebCore/WebCore.vcproj/WebCore.vcproj_sec2
37825	>	37829	>
37826	</File>	37830	</File>
37827	<File	37831	<File
37828	RelativePath="..\fileapi\FileWriterClient.h"
37829	>
37830	</File>
37831	<File
37832	RelativePath="..\fileapi\Flags.h"	37832	RelativePath="..\fileapi\Flags.h"
37833	>	37833	>
37834	</File>	37834	</File>



		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 */; };

		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 */; };

		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>"; };

		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>"; };

			isa = PBXGroup;
			children = (
				976D6C58122B8A3D001FD1F7 /* AsyncFileWriter.h */,
				976D6C74122B8A3D001FD1F7 /* AsyncFileWriterClient.h */,
				976D6C59122B8A3D001FD1F7 /* Blob.cpp */,
				976D6C5A122B8A3D001FD1F7 /* Blob.h */,
				976D6C5C122B8A3D001FD1F7 /* BlobBuilder.cpp */,

				976D6C71122B8A3D001FD1F7 /* FileWriter.cpp */,
				976D6C72122B8A3D001FD1F7 /* FileWriter.h */,
				893C47A61238908B002B3D86 /* FileWriterCallback.h */,
				976D6C74122B8A3D001FD1F7 /* FileWriterClient.h */,
				8987854D122CA064003AABDA /* Flags.h */,
				8987854E122CA064003AABDA /* LocalFileSystem.cpp */,
				8987854F122CA064003AABDA /* LocalFileSystem.h */,

				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 */,

				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 */,

Lines 39-45 WebCore/fileapi/AsyncFileWriter.h_sec1
- WebCore/fileapi/AsyncFileWriter.h -1 lines
39	namespace WebCore {	39	namespace WebCore {
40		40
41	class Blob;	41	class Blob;
42	class FileWriterClient;
43		42
44	class AsyncFileWriter {	43	class AsyncFileWriter {
45	public:	44	public:



/*
 * 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



 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#ifndef AsyncFileWriterClient_h
#define AsyncFileWriterClient_h

#if ENABLE(FILE_SYSTEM)



namespace WebCore {

class AsyncFileWriterClient {
public:
    virtual ~AsyncFileWriterClient() {}

    virtual void didWrite(long long bytes, bool complete) = 0;
    virtual void didTruncate(long long position) = 0;


#endif // ENABLE(FILE_SYSTEM)

#endif // AsyncFileWriterClient_h



#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>

class FileError;
class ScriptExecutionContext;

class FileWriter : public RefCounted<FileWriter>, public ActiveDOMObject, public EventTarget, public AsyncFileWriterClient {
public:
    static PassRefPtr<FileWriter> create(ScriptExecutionContext* context)
    {

    long long position() const { return m_position; }
    long long length() const { return m_length; }

    // AsyncFileWriterClient
    void didWrite(long long bytes, bool complete);
    void didTruncate(long long length);
    void didFail(ExceptionCode ec);



/*
 * 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




class AsyncFileSystem;
class AsyncFileSystemCallbacks;
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 {

    // 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(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;



2010-09-22  Eric Uhrhane  <ericu@chromium.org>

        Reviewed by NOBODY (OOPS!).

        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-22  Mihai Parparita  <mihaip@chromium.org>

        Reviewed by Darin Fisher.




class FileWriterHelperCallbacks : public WebKit::WebFileSystemCallbacks {
public:
    FileWriterHelperCallbacks(AsyncFileWriterClient* client, const String& path, WebKit::WebFileSystem* webFileSystem, PassOwnPtr<WebCore::AsyncFileSystemCallbacks> callbacks)
        : m_client(client)
        , m_path(path)
        , m_webFileSystem(webFileSystem)

    }

private:
    AsyncFileWriterClient* m_client;
    String m_path;
    WebKit::WebFileSystem* m_webFileSystem;
    OwnPtr<WebCore::AsyncFileSystemCallbacks> m_callbacks;
};

void AsyncFileSystemChromium::createWriter(AsyncFileWriterClient* client, const String& path, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
{
    m_webFileSystem->readMetadata(path, new FileWriterHelperCallbacks(client, path, m_webFileSystem, callbacks));
}

Lines 58-64 public: WebKit/chromium/src/AsyncFileSystemChromium.h_sec1
- WebKit/chromium/src/AsyncFileSystemChromium.h -1 / +1 lines
58	virtual void fileExists(const String& path, PassOwnPtr<AsyncFileSystemCallbacks>);	58	virtual void fileExists(const String& path, PassOwnPtr<AsyncFileSystemCallbacks>);
59	virtual void directoryExists(const String& path, PassOwnPtr<AsyncFileSystemCallbacks>);	59	virtual void directoryExists(const String& path, PassOwnPtr<AsyncFileSystemCallbacks>);
60	virtual void readDirectory(const String& path, PassOwnPtr<AsyncFileSystemCallbacks>);	60	virtual void readDirectory(const String& path, PassOwnPtr<AsyncFileSystemCallbacks>);
61	virtual void createWriter(FileWriterClient* client, const String& path, PassOwnPtr<AsyncFileSystemCallbacks>);	61	virtual void createWriter(AsyncFileWriterClient* client, const String& path, PassOwnPtr<AsyncFileSystemCallbacks>);
62		62
63	private:	63	private:
64	WebKit::WebFileSystem* m_webFileSystem;	64	WebKit::WebFileSystem* m_webFileSystem;




#if ENABLE(FILE_SYSTEM)

#include "AsyncFileWriterClient.h"
#include "Blob.h"
#include "FileWriterClient.h"
#include "WebFileWriter.h"
#include "WebURL.h"

namespace WebCore {

AsyncFileWriterChromium::AsyncFileWriterChromium(AsyncFileWriterClient* client)
    : m_client(client)
{
}



namespace WebCore {

class Blob;
class AsyncFileWriterClient;

class AsyncFileWriterChromium : public AsyncFileWriter, public WebKit::WebFileWriterClient {
public:
    AsyncFileWriterChromium(AsyncFileWriterClient* client);
    ~AsyncFileWriterChromium();
    
    void setWebFileWriter(PassOwnPtr<WebKit::WebFileWriter> writer);


private:
    OwnPtr<WebKit::WebFileWriter> m_writer;
    AsyncFileWriterClient* m_client;
};

} // namespace

Return to Bug 46325

Lines 1438-1443 WebCore/WebCore.gypi_sec1
- WebCore/WebCore.gypi -1 / +1 lines
1438	'editing/visible_units.cpp',	1438	'editing/visible_units.cpp',
1439	'editing/visible_units.h',	1439	'editing/visible_units.h',
1440	'fileapi/AsyncFileWriter.h',	1440	'fileapi/AsyncFileWriter.h',
		1441	'fileapi/AsyncFileWriterClient.h',
1441	'fileapi/Blob.cpp',	1442	'fileapi/Blob.cpp',
1442	'fileapi/Blob.h',	1443	'fileapi/Blob.h',
1443	'fileapi/BlobBuilder.cpp',	1444	'fileapi/BlobBuilder.cpp',
Lines 1483-1489 WebCore/WebCore.gypi_sec2
1483	'fileapi/FileWriter.cpp',	1484	'fileapi/FileWriter.cpp',
1484	'fileapi/FileWriter.h',	1485	'fileapi/FileWriter.h',
1485	'fileapi/FileWriterCallback.h',	1486	'fileapi/FileWriterCallback.h',
1486	'fileapi/FileWriterClient.h',
1487	'fileapi/Flags.h',	1487	'fileapi/Flags.h',
1488	'fileapi/LocalFileSystem.h',	1488	'fileapi/LocalFileSystem.h',
1489	'fileapi/Metadata.h',	1489	'fileapi/Metadata.h',

Lines 103-109 void AsyncFileSystemChromium::readDirect WebKit/chromium/src/AsyncFileSystemChromium.cpp_sec1
- WebKit/chromium/src/AsyncFileSystemChromium.cpp -3 / +3 lines
103		103
104	class FileWriterHelperCallbacks : public WebKit::WebFileSystemCallbacks {	104	class FileWriterHelperCallbacks : public WebKit::WebFileSystemCallbacks {
105	public:	105	public:
106	FileWriterHelperCallbacks(FileWriterClient* client, const String& path, WebKit::WebFileSystem* webFileSystem, PassOwnPtr<WebCore::AsyncFileSystemCallbacks> callbacks)	106	FileWriterHelperCallbacks(AsyncFileWriterClient* client, const String& path, WebKit::WebFileSystem* webFileSystem, PassOwnPtr<WebCore::AsyncFileSystemCallbacks> callbacks)
107	: m_client(client)	107	: m_client(client)
108	, m_path(path)	108	, m_path(path)
109	, m_webFileSystem(webFileSystem)	109	, m_webFileSystem(webFileSystem)
Lines 149-161 public: WebKit/chromium/src/AsyncFileSystemChromium.cpp_sec2
149	}	149	}
150		150
151	private:	151	private:
152	FileWriterClient* m_client;	152	AsyncFileWriterClient* m_client;
153	String m_path;	153	String m_path;
154	WebKit::WebFileSystem* m_webFileSystem;	154	WebKit::WebFileSystem* m_webFileSystem;
155	OwnPtr<WebCore::AsyncFileSystemCallbacks> m_callbacks;	155	OwnPtr<WebCore::AsyncFileSystemCallbacks> m_callbacks;
156	};	156	};
157		157
158	void AsyncFileSystemChromium::createWriter(FileWriterClient* client, const String& path, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)	158	void AsyncFileSystemChromium::createWriter(AsyncFileWriterClient* client, const String& path, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
159	{	159	{
160	m_webFileSystem->readMetadata(path, new FileWriterHelperCallbacks(client, path, m_webFileSystem, callbacks));	160	m_webFileSystem->readMetadata(path, new FileWriterHelperCallbacks(client, path, m_webFileSystem, callbacks));
161	}	161	}

Lines 1-3 WebCore/ChangeLog_sec1
- WebCore/ChangeLog +17 lines
		1	2010-09-22 Eric Uhrhane <ericu@chromium.org>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	Rename FileWriterClient to AsyncFileWriterClient.
		6	https://bugs.webkit.org/show_bug.cgi?id=46325
		7
		8	* GNUmakefile.am:
		9	* WebCore.gypi:
		10	* WebCore.vcproj/WebCore.vcproj:
		11	* WebCore.xcodeproj/project.pbxproj:
		12	* fileapi/AsyncFileWriter.h:
		13	* fileapi/AsyncFileWriterClient.h: Copied from WebCore/fileapi/FileWriterClient.h.
		14	* fileapi/FileWriter.h:
		15	* fileapi/FileWriterClient.h: Removed.
		16	* platform/AsyncFileSystem.h:
		17
1	2010-09-22 Andy Estes <aestes@apple.com>	18	2010-09-22 Andy Estes <aestes@apple.com>
2		19
3	Rubber-stamped by Darin Adler.	20	Rubber-stamped by Darin Adler.

Lines 1350-1355 webcore_sources += \ WebCore/GNUmakefile.am_sec1
- WebCore/GNUmakefile.am -1 / +1 lines
1350	WebCore/editing/WrapContentsInDummySpanCommand.cpp \	1350	WebCore/editing/WrapContentsInDummySpanCommand.cpp \
1351	WebCore/editing/WrapContentsInDummySpanCommand.h \	1351	WebCore/editing/WrapContentsInDummySpanCommand.h \
1352	WebCore/fileapi/AsyncFileWriter.h \	1352	WebCore/fileapi/AsyncFileWriter.h \
		1353	WebCore/fileapi/AsyncFileWriterClient.h \
1353	WebCore/fileapi/BlobBuilder.cpp \	1354	WebCore/fileapi/BlobBuilder.cpp \
1354	WebCore/fileapi/BlobBuilder.h \	1355	WebCore/fileapi/BlobBuilder.h \
1355	WebCore/fileapi/Blob.cpp \	1356	WebCore/fileapi/Blob.cpp \
Lines 1393-1399 webcore_sources += \ WebCore/GNUmakefile.am_sec2
1393	WebCore/fileapi/FileThread.h \	1394	WebCore/fileapi/FileThread.h \
1394	WebCore/fileapi/FileThreadTask.h \	1395	WebCore/fileapi/FileThreadTask.h \
1395	WebCore/fileapi/FileWriterCallback.h \	1396	WebCore/fileapi/FileWriterCallback.h \
1396	WebCore/fileapi/FileWriterClient.h \
1397	WebCore/fileapi/FileWriter.cpp \	1397	WebCore/fileapi/FileWriter.cpp \
1398	WebCore/fileapi/FileWriter.h \	1398	WebCore/fileapi/FileWriter.h \
1399	WebCore/fileapi/Flags.h \	1399	WebCore/fileapi/Flags.h \

Lines 2777-2782 WebCore/WebCore.xcodeproj/project.pbxproj_sec1
- WebCore/WebCore.xcodeproj/project.pbxproj -4 / +4 lines
2777	973E325610883B7C005BC493 /* ResourceLoadNotifier.cpp in Sources / = {isa = PBXBuildFile; fileRef = 973E325410883B7C005BC493 / ResourceLoadNotifier.cpp */; };	2777	973E325610883B7C005BC493 /* ResourceLoadNotifier.cpp in Sources / = {isa = PBXBuildFile; fileRef = 973E325410883B7C005BC493 / ResourceLoadNotifier.cpp */; };
2778	973E325710883B7C005BC493 /* ResourceLoadNotifier.h in Headers / = {isa = PBXBuildFile; fileRef = 973E325510883B7C005BC493 / ResourceLoadNotifier.h */; settings = {ATTRIBUTES = (Private, ); }; };	2778	973E325710883B7C005BC493 /* ResourceLoadNotifier.h in Headers / = {isa = PBXBuildFile; fileRef = 973E325510883B7C005BC493 / ResourceLoadNotifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
2779	976D6C77122B8A3D001FD1F7 /* AsyncFileWriter.h in Headers / = {isa = PBXBuildFile; fileRef = 976D6C58122B8A3D001FD1F7 / AsyncFileWriter.h */; };	2779	976D6C77122B8A3D001FD1F7 /* AsyncFileWriter.h in Headers / = {isa = PBXBuildFile; fileRef = 976D6C58122B8A3D001FD1F7 / AsyncFileWriter.h */; };
		2780	976D6C93122B8A3D001FD1F7 /* AsyncFileWriterClient.h in Headers / = {isa = PBXBuildFile; fileRef = 976D6C74122B8A3D001FD1F7 / AsyncFileWriterClient.h */; };
2780	976D6C78122B8A3D001FD1F7 /* Blob.cpp in Sources / = {isa = PBXBuildFile; fileRef = 976D6C59122B8A3D001FD1F7 / Blob.cpp */; };	2781	976D6C78122B8A3D001FD1F7 /* Blob.cpp in Sources / = {isa = PBXBuildFile; fileRef = 976D6C59122B8A3D001FD1F7 / Blob.cpp */; };
2781	976D6C79122B8A3D001FD1F7 /* Blob.h in Headers / = {isa = PBXBuildFile; fileRef = 976D6C5A122B8A3D001FD1F7 / Blob.h */; };	2782	976D6C79122B8A3D001FD1F7 /* Blob.h in Headers / = {isa = PBXBuildFile; fileRef = 976D6C5A122B8A3D001FD1F7 / Blob.h */; };
2782	976D6C7B122B8A3D001FD1F7 /* BlobBuilder.cpp in Sources / = {isa = PBXBuildFile; fileRef = 976D6C5C122B8A3D001FD1F7 / BlobBuilder.cpp */; };	2783	976D6C7B122B8A3D001FD1F7 /* BlobBuilder.cpp in Sources / = {isa = PBXBuildFile; fileRef = 976D6C5C122B8A3D001FD1F7 / BlobBuilder.cpp */; };
Lines 2797-2803 WebCore/WebCore.xcodeproj/project.pbxproj_sec2
2797	976D6C8F122B8A3D001FD1F7 /* FileThreadTask.h in Headers / = {isa = PBXBuildFile; fileRef = 976D6C70122B8A3D001FD1F7 / FileThreadTask.h */; };	2798	976D6C8F122B8A3D001FD1F7 /* FileThreadTask.h in Headers / = {isa = PBXBuildFile; fileRef = 976D6C70122B8A3D001FD1F7 / FileThreadTask.h */; };
2798	976D6C90122B8A3D001FD1F7 /* FileWriter.cpp in Sources / = {isa = PBXBuildFile; fileRef = 976D6C71122B8A3D001FD1F7 / FileWriter.cpp */; };	2799	976D6C90122B8A3D001FD1F7 /* FileWriter.cpp in Sources / = {isa = PBXBuildFile; fileRef = 976D6C71122B8A3D001FD1F7 / FileWriter.cpp */; };
2799	976D6C91122B8A3D001FD1F7 /* FileWriter.h in Headers / = {isa = PBXBuildFile; fileRef = 976D6C72122B8A3D001FD1F7 / FileWriter.h */; };	2800	976D6C91122B8A3D001FD1F7 /* FileWriter.h in Headers / = {isa = PBXBuildFile; fileRef = 976D6C72122B8A3D001FD1F7 / FileWriter.h */; };
2800	976D6C93122B8A3D001FD1F7 /* FileWriterClient.h in Headers / = {isa = PBXBuildFile; fileRef = 976D6C74122B8A3D001FD1F7 / FileWriterClient.h */; };
2801	976D6C94122B8A3D001FD1F7 /* ThreadableBlobRegistry.cpp in Sources / = {isa = PBXBuildFile; fileRef = 976D6C75122B8A3D001FD1F7 / ThreadableBlobRegistry.cpp */; };	2801	976D6C94122B8A3D001FD1F7 /* ThreadableBlobRegistry.cpp in Sources / = {isa = PBXBuildFile; fileRef = 976D6C75122B8A3D001FD1F7 / ThreadableBlobRegistry.cpp */; };
2802	976D6C95122B8A3D001FD1F7 /* ThreadableBlobRegistry.h in Headers / = {isa = PBXBuildFile; fileRef = 976D6C76122B8A3D001FD1F7 / ThreadableBlobRegistry.h */; };	2802	976D6C95122B8A3D001FD1F7 /* ThreadableBlobRegistry.h in Headers / = {isa = PBXBuildFile; fileRef = 976D6C76122B8A3D001FD1F7 / ThreadableBlobRegistry.h */; };
2803	977B37231228721700B81FF8 /* HTMLElementStack.cpp in Sources / = {isa = PBXBuildFile; fileRef = 977B371F1228721700B81FF8 / HTMLElementStack.cpp */; };	2803	977B37231228721700B81FF8 /* HTMLElementStack.cpp in Sources / = {isa = PBXBuildFile; fileRef = 977B371F1228721700B81FF8 / HTMLElementStack.cpp */; };
Lines 8677-8682 WebCore/WebCore.xcodeproj/project.pbxproj_sec3
8677	973E325410883B7C005BC493 /* ResourceLoadNotifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceLoadNotifier.cpp; sourceTree = "<group>"; };	8677	973E325410883B7C005BC493 /* ResourceLoadNotifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceLoadNotifier.cpp; sourceTree = "<group>"; };
8678	973E325510883B7C005BC493 /* ResourceLoadNotifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceLoadNotifier.h; sourceTree = "<group>"; };	8678	973E325510883B7C005BC493 /* ResourceLoadNotifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceLoadNotifier.h; sourceTree = "<group>"; };
8679	976D6C58122B8A3D001FD1F7 /* AsyncFileWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AsyncFileWriter.h; path = fileapi/AsyncFileWriter.h; sourceTree = "<group>"; };	8679	976D6C58122B8A3D001FD1F7 /* AsyncFileWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AsyncFileWriter.h; path = fileapi/AsyncFileWriter.h; sourceTree = "<group>"; };
		8680	976D6C74122B8A3D001FD1F7 /* AsyncFileWriterClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AsyncFileWriterClient.h; path = fileapi/AsyncFileWriterClient.h; sourceTree = "<group>"; };
8680	976D6C59122B8A3D001FD1F7 /* Blob.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Blob.cpp; path = fileapi/Blob.cpp; sourceTree = "<group>"; };	8681	976D6C59122B8A3D001FD1F7 /* Blob.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Blob.cpp; path = fileapi/Blob.cpp; sourceTree = "<group>"; };
8681	976D6C5A122B8A3D001FD1F7 /* Blob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Blob.h; path = fileapi/Blob.h; sourceTree = "<group>"; };	8682	976D6C5A122B8A3D001FD1F7 /* Blob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Blob.h; path = fileapi/Blob.h; sourceTree = "<group>"; };
8682	976D6C5C122B8A3D001FD1F7 /* BlobBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BlobBuilder.cpp; path = fileapi/BlobBuilder.cpp; sourceTree = "<group>"; };	8683	976D6C5C122B8A3D001FD1F7 /* BlobBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BlobBuilder.cpp; path = fileapi/BlobBuilder.cpp; sourceTree = "<group>"; };
Lines 8697-8703 WebCore/WebCore.xcodeproj/project.pbxproj_sec4
8697	976D6C70122B8A3D001FD1F7 /* FileThreadTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileThreadTask.h; path = fileapi/FileThreadTask.h; sourceTree = "<group>"; };	8698	976D6C70122B8A3D001FD1F7 /* FileThreadTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileThreadTask.h; path = fileapi/FileThreadTask.h; sourceTree = "<group>"; };
8698	976D6C71122B8A3D001FD1F7 /* FileWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileWriter.cpp; path = fileapi/FileWriter.cpp; sourceTree = "<group>"; };	8699	976D6C71122B8A3D001FD1F7 /* FileWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileWriter.cpp; path = fileapi/FileWriter.cpp; sourceTree = "<group>"; };
8699	976D6C72122B8A3D001FD1F7 /* FileWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileWriter.h; path = fileapi/FileWriter.h; sourceTree = "<group>"; };	8700	976D6C72122B8A3D001FD1F7 /* FileWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileWriter.h; path = fileapi/FileWriter.h; sourceTree = "<group>"; };
8700	976D6C74122B8A3D001FD1F7 /* FileWriterClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileWriterClient.h; path = fileapi/FileWriterClient.h; sourceTree = "<group>"; };
8701	976D6C75122B8A3D001FD1F7 /* ThreadableBlobRegistry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadableBlobRegistry.cpp; path = fileapi/ThreadableBlobRegistry.cpp; sourceTree = "<group>"; };	8701	976D6C75122B8A3D001FD1F7 /* ThreadableBlobRegistry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadableBlobRegistry.cpp; path = fileapi/ThreadableBlobRegistry.cpp; sourceTree = "<group>"; };
8702	976D6C76122B8A3D001FD1F7 /* ThreadableBlobRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadableBlobRegistry.h; path = fileapi/ThreadableBlobRegistry.h; sourceTree = "<group>"; };	8702	976D6C76122B8A3D001FD1F7 /* ThreadableBlobRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadableBlobRegistry.h; path = fileapi/ThreadableBlobRegistry.h; sourceTree = "<group>"; };
8703	977B371F1228721700B81FF8 /* HTMLElementStack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HTMLElementStack.cpp; path = parser/HTMLElementStack.cpp; sourceTree = "<group>"; };	8703	977B371F1228721700B81FF8 /* HTMLElementStack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HTMLElementStack.cpp; path = parser/HTMLElementStack.cpp; sourceTree = "<group>"; };
Lines 14433-14438 WebCore/WebCore.xcodeproj/project.pbxproj_sec5
14433	isa = PBXGroup;	14433	isa = PBXGroup;
14434	children = (	14434	children = (
14435	976D6C58122B8A3D001FD1F7 /* AsyncFileWriter.h */,	14435	976D6C58122B8A3D001FD1F7 /* AsyncFileWriter.h */,
		14436	976D6C74122B8A3D001FD1F7 /* AsyncFileWriterClient.h */,
14436	976D6C59122B8A3D001FD1F7 /* Blob.cpp */,	14437	976D6C59122B8A3D001FD1F7 /* Blob.cpp */,
14437	976D6C5A122B8A3D001FD1F7 /* Blob.h */,	14438	976D6C5A122B8A3D001FD1F7 /* Blob.h */,
14438	976D6C5C122B8A3D001FD1F7 /* BlobBuilder.cpp */,	14439	976D6C5C122B8A3D001FD1F7 /* BlobBuilder.cpp */,
Lines 14478-14484 WebCore/WebCore.xcodeproj/project.pbxproj_sec6
14478	976D6C71122B8A3D001FD1F7 /* FileWriter.cpp */,	14479	976D6C71122B8A3D001FD1F7 /* FileWriter.cpp */,
14479	976D6C72122B8A3D001FD1F7 /* FileWriter.h */,	14480	976D6C72122B8A3D001FD1F7 /* FileWriter.h */,
14480	893C47A61238908B002B3D86 /* FileWriterCallback.h */,	14481	893C47A61238908B002B3D86 /* FileWriterCallback.h */,
14481	976D6C74122B8A3D001FD1F7 /* FileWriterClient.h */,
14482	8987854D122CA064003AABDA /* Flags.h */,	14482	8987854D122CA064003AABDA /* Flags.h */,
14483	8987854E122CA064003AABDA /* LocalFileSystem.cpp */,	14483	8987854E122CA064003AABDA /* LocalFileSystem.cpp */,
14484	8987854F122CA064003AABDA /* LocalFileSystem.h */,	14484	8987854F122CA064003AABDA /* LocalFileSystem.h */,
Lines 17876-17881 WebCore/WebCore.xcodeproj/project.pbxproj_sec7
17876	89D08DA012228451001241DF /* AsyncFileSystem.h in Headers */,	17876	89D08DA012228451001241DF /* AsyncFileSystem.h in Headers */,
17877	89D08DA112228451001241DF /* AsyncFileSystemCallbacks.h in Headers */,	17877	89D08DA112228451001241DF /* AsyncFileSystemCallbacks.h in Headers */,
17878	976D6C77122B8A3D001FD1F7 /* AsyncFileWriter.h in Headers */,	17878	976D6C77122B8A3D001FD1F7 /* AsyncFileWriter.h in Headers */,
		17879	976D6C93122B8A3D001FD1F7 /* AsyncFileWriterClient.h in Headers */,
17879	B0149E7E11A4B21500196A7B /* AsyncImageResizer.h in Headers */,	17880	B0149E7E11A4B21500196A7B /* AsyncImageResizer.h in Headers */,
17880	8A413AE01207BBA50082016E /* AsyncScriptRunner.h in Headers */,	17881	8A413AE01207BBA50082016E /* AsyncScriptRunner.h in Headers */,
17881	37C61F0112095C87007A3C67 /* AtomicStringKeyedMRUCache.h in Headers */,	17882	37C61F0112095C87007A3C67 /* AtomicStringKeyedMRUCache.h in Headers */,
Lines 18931-18937 WebCore/WebCore.xcodeproj/project.pbxproj_sec8
18931	976D6C8F122B8A3D001FD1F7 /* FileThreadTask.h in Headers */,	18932	976D6C8F122B8A3D001FD1F7 /* FileThreadTask.h in Headers */,
18932	976D6C91122B8A3D001FD1F7 /* FileWriter.h in Headers */,	18933	976D6C91122B8A3D001FD1F7 /* FileWriter.h in Headers */,
18933	893C47A81238908B002B3D86 /* FileWriterCallback.h in Headers */,	18934	893C47A81238908B002B3D86 /* FileWriterCallback.h in Headers */,
18934	976D6C93122B8A3D001FD1F7 /* FileWriterClient.h in Headers */,
18935	BC5EB69F0E81DAEB00B25965 /* FillLayer.h in Headers */,	18935	BC5EB69F0E81DAEB00B25965 /* FillLayer.h in Headers */,
18936	845E72F80FD261EE00A87D79 /* Filter.h in Headers */,	18936	845E72F80FD261EE00A87D79 /* Filter.h in Headers */,
18937	08C9251A0FCC7C4A00480DEC /* FilterEffect.h in Headers */,	18937	08C9251A0FCC7C4A00480DEC /* FilterEffect.h in Headers */,

Line 0 WebCore/fileapi/AsyncFileWriterClient.h_sec1
- WebCore/fileapi/AsyncFileWriterClient.h +53 lines
	1	/*
	2	* Copyright (C) 2010 Google Inc. All rights reserved.
	3	*
	4	* Redistribution and use in source and binary forms, with or without
	5	* modification, are permitted provided that the following conditions are
	6	* met:
	7	*
	8	* * Redistributions of source code must retain the above copyright
	9	* notice, this list of conditions and the following disclaimer.
	10	* * Redistributions in binary form must reproduce the above
	11	* copyright notice, this list of conditions and the following disclaimer
	12	* in the documentation and/or other materials provided with the
	13	* distribution.
	14	* * Neither the name of Google Inc. nor the names of its
	15	* contributors may be used to endorse or promote products derived from
	16	* this software without specific prior written permission.
	17	*
	18	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
	19	* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
	20	* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
	21	* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
	22	* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
	23	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
	24	* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
	25	* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
	26	* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
	27	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
	28	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	29	*/
	30
	31	#ifndef FileWriterClient_h
	32	#define FileWriterClient_h
	33
	34	#if ENABLE(FILE_SYSTEM)
	35
	36	#include "ExceptionCode.h"
	37
	38	namespace WebCore {
	39
	40	class FileWriterClient {
	41	public:
	42	virtual ~FileWriterClient() {}
	43
	44	virtual void didWrite(long long bytes, bool complete) = 0;
	45	virtual void didTruncate(long long position) = 0;
	46	virtual void didFail(ExceptionCode) = 0;
	47	};
	48
	49	} // namespace
	50
	51	#endif // ENABLE(FILE_SYSTEM)
	52
	53	#endif // FileWriterClient_h

Lines 34-41 WebCore/fileapi/FileWriter.h_sec1
- WebCore/fileapi/FileWriter.h -3 / +3 lines
34	#if ENABLE(FILE_SYSTEM)	34	#if ENABLE(FILE_SYSTEM)
35		35
36	#include "ActiveDOMObject.h"	36	#include "ActiveDOMObject.h"
		37	#include "AsyncFileWriterClient.h"
37	#include "EventTarget.h"	38	#include "EventTarget.h"
38	#include "FileWriterClient.h"
39	#include <wtf/OwnPtr.h>	39	#include <wtf/OwnPtr.h>
40	#include <wtf/PassOwnPtr.h>	40	#include <wtf/PassOwnPtr.h>
41	#include <wtf/PassRefPtr.h>	41	#include <wtf/PassRefPtr.h>
Lines 49-55 class Blob; WebCore/fileapi/FileWriter.h_sec2
49	class FileError;	49	class FileError;
50	class ScriptExecutionContext;	50	class ScriptExecutionContext;
51		51
52	class FileWriter : public RefCounted<FileWriter>, public ActiveDOMObject, public EventTarget, public FileWriterClient {	52	class FileWriter : public RefCounted<FileWriter>, public ActiveDOMObject, public EventTarget, public AsyncFileWriterClient {
53	public:	53	public:
54	static PassRefPtr<FileWriter> create(ScriptExecutionContext* context)	54	static PassRefPtr<FileWriter> create(ScriptExecutionContext* context)
55	{	55	{
Lines 74-80 public: WebCore/fileapi/FileWriter.h_sec3
74	long long position() const { return m_position; }	74	long long position() const { return m_position; }
75	long long length() const { return m_length; }	75	long long length() const { return m_length; }
76		76
77	// FileWriterClient	77	// AsyncFileWriterClient
78	void didWrite(long long bytes, bool complete);	78	void didWrite(long long bytes, bool complete);
79	void didTruncate(long long length);	79	void didTruncate(long long length);
80	void didFail(ExceptionCode ec);	80	void didFail(ExceptionCode ec);

Lines 1-53 WebCore/fileapi/FileWriterClient.h_sec1
- WebCore/fileapi/FileWriterClient.h -53 lines
1	/*
2	* Copyright (C) 2010 Google Inc. All rights reserved.
3	*
4	* Redistribution and use in source and binary forms, with or without
5	* modification, are permitted provided that the following conditions are
6	* met:
7	*
8	* * Redistributions of source code must retain the above copyright
9	* notice, this list of conditions and the following disclaimer.
10	* * Redistributions in binary form must reproduce the above
11	* copyright notice, this list of conditions and the following disclaimer
12	* in the documentation and/or other materials provided with the
13	* distribution.
14	* * Neither the name of Google Inc. nor the names of its
15	* contributors may be used to endorse or promote products derived from
16	* this software without specific prior written permission.
17	*
18	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19	* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20	* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21	* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22	* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24	* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25	* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26	* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29	*/
30
31	#ifndef FileWriterClient_h
32	#define FileWriterClient_h
33
34	#if ENABLE(FILE_SYSTEM)
35
36	#include "ExceptionCode.h"
37
38	namespace WebCore {
39
40	class FileWriterClient {
41	public:
42	virtual ~FileWriterClient() {}
43
44	virtual void didWrite(long long bytes, bool complete) = 0;
45	virtual void didTruncate(long long position) = 0;
46	virtual void didFail(ExceptionCode) = 0;
47	};
48
49	} // namespace
50
51	#endif // ENABLE(FILE_SYSTEM)
52
53	#endif // FileWriterClient_h

Lines 41-47 namespace WebCore { WebCore/platform/AsyncFileSystem.h_sec1
- WebCore/platform/AsyncFileSystem.h -2 / +2 lines
41		41
42	class AsyncFileSystem;	42	class AsyncFileSystem;
43	class AsyncFileSystemCallbacks;	43	class AsyncFileSystemCallbacks;
44	class FileWriterClient;	44	class AsyncFileWriterClient;
45		45
46	// This class provides async interface for platform-specific file system implementation. Note that all the methods take platform paths.	46	// This class provides async interface for platform-specific file system implementation. Note that all the methods take platform paths.
47	class AsyncFileSystem : public Noncopyable {	47	class AsyncFileSystem : public Noncopyable {
Lines 111-117 public: WebCore/platform/AsyncFileSystem.h_sec2
111	// Creates an AsyncFileWriter for a given file path.	111	// Creates an AsyncFileWriter for a given file path.
112	// AsyncFileSystemCallbacks::didCreateFileWriter() is called when an AsyncFileWriter is created successfully.	112	// AsyncFileSystemCallbacks::didCreateFileWriter() is called when an AsyncFileWriter is created successfully.
113	// AsyncFileSystemCallbacks::didFail() is called otherwise.	113	// AsyncFileSystemCallbacks::didFail() is called otherwise.
114	virtual void createWriter(FileWriterClient* client, const String& path, PassOwnPtr<AsyncFileSystemCallbacks>) = 0;	114	virtual void createWriter(AsyncFileWriterClient* client, const String& path, PassOwnPtr<AsyncFileSystemCallbacks>) = 0;
115		115
116	// Converts a given absolute virtual path to a platform path that starts with the platform root path of this file system.	116	// Converts a given absolute virtual path to a platform path that starts with the platform root path of this file system.
117	virtual String virtualToPlatformPath(const String& path) const;	117	virtual String virtualToPlatformPath(const String& path) const;

Lines 1-3 WebKit/chromium/ChangeLog_sec1
- WebKit/chromium/ChangeLog +12 lines
		1	2010-09-22 Eric Uhrhane <ericu@chromium.org>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	Rename FileWriterClient to AsyncFileWriterClient.
		6	https://bugs.webkit.org/show_bug.cgi?id=46325
		7
		8	* src/AsyncFileSystemChromium.cpp:
		9	* src/AsyncFileSystemChromium.h:
		10	* src/AsyncFileWriterChromium.cpp:
		11	* src/AsyncFileWriterChromium.h:
		12
1	2010-09-22 Mihai Parparita <mihaip@chromium.org>	13	2010-09-22 Mihai Parparita <mihaip@chromium.org>
2		14
3	Reviewed by Darin Fisher.	15	Reviewed by Darin Fisher.

Lines 33-46 WebKit/chromium/src/AsyncFileWriterChromium.cpp_sec1
- WebKit/chromium/src/AsyncFileWriterChromium.cpp -2 / +2 lines
33		33
34	#if ENABLE(FILE_SYSTEM)	34	#if ENABLE(FILE_SYSTEM)
35		35
		36	#include "AsyncFileWriterClient.h"
36	#include "Blob.h"	37	#include "Blob.h"
37	#include "FileWriterClient.h"
38	#include "WebFileWriter.h"	38	#include "WebFileWriter.h"
39	#include "WebURL.h"	39	#include "WebURL.h"
40		40
41	namespace WebCore {	41	namespace WebCore {
42		42
43	AsyncFileWriterChromium::AsyncFileWriterChromium(FileWriterClient* client)	43	AsyncFileWriterChromium::AsyncFileWriterChromium(AsyncFileWriterClient* client)
44	: m_client(client)	44	: m_client(client)
45	{	45	{
46	}	46	}