Yet another try at submitting http://codereview.chromium.org/3397030/show.

This hopefully fixes the linux x64 failure, which appears to be a disagreement between int64 and long long.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/3601001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61020 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 26 insertions, 0 deletions

diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc
index 33eff1a..661b87b 100644
--- a/webkit/glue/webkit_glue.cc
+++ b/webkit/glue/webkit_glue.cc
@@ -313,6 +313,26 @@ WebString FilePathToWebString(const FilePath& file_path) {
   return FilePathStringToWebString(file_path.value());
 }
 
+WebKit::WebFileError PlatformFileErrorToWebFileError(
+    base::PlatformFileError error_code) {
+  switch (error_code) {
+    case base::PLATFORM_FILE_ERROR_NOT_FOUND:
+      return WebKit::WebFileErrorNotFound;
+    case base::PLATFORM_FILE_ERROR_INVALID_OPERATION:
+    case base::PLATFORM_FILE_ERROR_EXISTS:
+    case base::PLATFORM_FILE_ERROR_NOT_A_DIRECTORY:
+      return WebKit::WebFileErrorInvalidModification;
+    case base::PLATFORM_FILE_ERROR_ACCESS_DENIED:
+      return WebKit::WebFileErrorNoModificationAllowed;
+    case base::PLATFORM_FILE_ERROR_FAILED:
+      return WebKit::WebFileErrorInvalidState;
+    case base::PLATFORM_FILE_ERROR_ABORT:
+      return WebKit::WebFileErrorAbort;
+    default:
+      return WebKit::WebFileErrorInvalidModification;
+  }
+}
+
 namespace {
 
 struct UserAgentState {
diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h
index 6c7387d..380bf36 100644
--- a/webkit/glue/webkit_glue.h
+++ b/webkit/glue/webkit_glue.h
@@ -16,8 +16,10 @@
 
 #include "app/clipboard/clipboard.h"
 #include "base/file_path.h"
+#include "base/platform_file.h"
 #include "base/string16.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCanvas.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebFileError.h"
 
 class GURL;
 class SkBitmap;
@@ -132,6 +134,10 @@ WebKit::WebString FilePathStringToWebString(const FilePath::StringType& str);
 FilePath WebStringToFilePath(const WebKit::WebString& str);
 WebKit::WebString FilePathToWebString(const FilePath& file_path);
 
+// File error conversion
+WebKit::WebFileError PlatformFileErrorToWebFileError(
+    base::PlatformFileError error_code);
+
 // Returns a WebCanvas pointer associated with the given Skia canvas.
 WebKit::WebCanvas* ToWebCanvas(skia::PlatformCanvas*);