Merge Webkit at r58956: Initial merge by Git.

Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228

2 files changed, 18 insertions, 1 deletions

diff --git a/WebCore/platform/android/FileSystemAndroid.cpp b/WebCore/platform/android/FileSystemAndroid.cpp
index 3d841d7..520bc7d 100644
--- a/WebCore/platform/android/FileSystemAndroid.cpp
+++ b/WebCore/platform/android/FileSystemAndroid.cpp
@@ -75,6 +75,23 @@ bool unloadModule(PlatformModule module)
     return !dlclose(module);
 }
 
+<<<<<<< HEAD:WebCore/platform/android/FileSystemAndroid.cpp
+=======
+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;
+}
+
+>>>>>>> webkit.org at r58956:WebCore/platform/android/FileSystemAndroid.cpp
 String homeDirectoryPath() 
 {
     return sPluginPath;
diff --git a/WebCore/platform/android/WidgetAndroid.cpp b/WebCore/platform/android/WidgetAndroid.cpp
index 9ab0b2c..14da0ca 100644
--- a/WebCore/platform/android/WidgetAndroid.cpp
+++ b/WebCore/platform/android/WidgetAndroid.cpp
@@ -54,7 +54,7 @@ IntRect Widget::frameRect() const
     return platformWidget()->getBounds();
 }
 
-void Widget::setFocus()
+void Widget::setFocus(bool focused)
 {
     notImplemented();
 }