diff options
| author | Steve Block <steveblock@google.com> | 2010-05-11 16:09:46 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-12 13:59:10 +0100 |
| commit | 2ff981b136267de4c36122d20219b175c7a415b5 (patch) | |
| tree | 8b6af226e92a5548a1c2e33148127efd0eabc3a6 | |
| parent | cae38efe66aa87d4dbcc096e0d59574e6f7122d7 (diff) | |
| download | external_webkit-2ff981b136267de4c36122d20219b175c7a415b5.zip external_webkit-2ff981b136267de4c36122d20219b175c7a415b5.tar.gz external_webkit-2ff981b136267de4c36122d20219b175c7a415b5.tar.bz2 | |
Cherry-pick WebKit change 59226 to use standard POSIX version of writeToFile()
The Android version of writeToFile() tries to support interrupted writes, but
has a bug as the data pointer is not updated. So instead we take the standard
POSIX version.
See https://mondrian.corp.google.com/changelist/75998-p9
and https://bugs.webkit.org/show_bug.cgi?id=38908
Change-Id: I011671211017005a06727e436f92e8458902a7db
| -rw-r--r-- | WebCore/platform/android/FileSystemAndroid.cpp | 14 | ||||
| -rw-r--r-- | WebCore/platform/posix/FileSystemPOSIX.cpp | 2 |
2 files changed, 0 insertions, 16 deletions
diff --git a/WebCore/platform/android/FileSystemAndroid.cpp b/WebCore/platform/android/FileSystemAndroid.cpp index 8a9777d..3d841d7 100644 --- a/WebCore/platform/android/FileSystemAndroid.cpp +++ b/WebCore/platform/android/FileSystemAndroid.cpp @@ -75,20 +75,6 @@ bool unloadModule(PlatformModule module) return !dlclose(module); } -int writeToFile(PlatformFileHandle handle, const char* data, int length) -{ - int totalBytesWritten = 0; - while (totalBytesWritten < length) { - int bytesWritten = write(handle, data, (size_t)(length - totalBytesWritten)); - if (bytesWritten < 0 && errno != EINTR) - return -1; - if (bytesWritten > 0) - totalBytesWritten += bytesWritten; - } - - return totalBytesWritten; -} - String homeDirectoryPath() { return sPluginPath; diff --git a/WebCore/platform/posix/FileSystemPOSIX.cpp b/WebCore/platform/posix/FileSystemPOSIX.cpp index ba17d39..ac8c7fa 100644 --- a/WebCore/platform/posix/FileSystemPOSIX.cpp +++ b/WebCore/platform/posix/FileSystemPOSIX.cpp @@ -116,7 +116,6 @@ bool truncateFile(PlatformFileHandle handle, long long offset) return !ftruncate(handle, offset); } -#if !PLATFORM(ANDROID) int writeToFile(PlatformFileHandle handle, const char* data, int length) { do { @@ -126,7 +125,6 @@ int writeToFile(PlatformFileHandle handle, const char* data, int length) } while (errno == EINTR); return -1; } -#endif int readFromFile(PlatformFileHandle handle, char* data, int length) { |