summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-05-12 07:19:48 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-05-12 07:19:48 -0700
commitba29528e8157ac38cfeedafd5e0b64bb063275a5 (patch)
tree889a8bcade1411b2b469a4730b645ad103657d11
parent619df39d24772ddf66eeb812e6bc654c3ec85ca3 (diff)
parent2ff981b136267de4c36122d20219b175c7a415b5 (diff)
downloadexternal_webkit-ba29528e8157ac38cfeedafd5e0b64bb063275a5.zip
external_webkit-ba29528e8157ac38cfeedafd5e0b64bb063275a5.tar.gz
external_webkit-ba29528e8157ac38cfeedafd5e0b64bb063275a5.tar.bz2
Merge "Cherry-pick WebKit change 59226 to use standard POSIX version of writeToFile()"
-rw-r--r--WebCore/platform/android/FileSystemAndroid.cpp14
-rw-r--r--WebCore/platform/posix/FileSystemPOSIX.cpp2
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)
{