Merge Webkit at r70949: Initial merge by git.

Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e

1 files changed, 12 insertions, 10 deletions

diff --git a/WebCore/fileapi/FileException.idl b/WebCore/fileapi/FileException.idl
index 0b2ab9c..10bd151 100644
--- a/WebCore/fileapi/FileException.idl
+++ b/WebCore/fileapi/FileException.idl
@@ -45,15 +45,17 @@ module html {
 #endif
 
         // FileExceptionCode
-        const unsigned short NO_MODIFICATION_ALLOWED_ERR = 7;
-        const unsigned short NOT_FOUND_ERR = 8;
-        const unsigned short INVALID_STATE_ERR = 11;
-        const unsigned short SYNTAX_ERR = 12;
-        const unsigned short INVALID_MODIFICATION_ERR = 13;
-        const unsigned short SECURITY_ERR = 18;
-        const unsigned short ABORT_ERR = 20;
-        const unsigned short QUOTA_EXCEEDED_ERR = 22;
-        const unsigned short NOT_READABLE_ERR = 24;
-        const unsigned short ENCODING_ERR = 26;
+        const unsigned short NOT_FOUND_ERR = 1;
+        const unsigned short SECURITY_ERR = 2;
+        const unsigned short ABORT_ERR = 3;
+        const unsigned short NOT_READABLE_ERR = 4;
+        const unsigned short ENCODING_ERR = 5;
+        const unsigned short NO_MODIFICATION_ALLOWED_ERR = 6;
+        const unsigned short INVALID_STATE_ERR = 7;
+        const unsigned short SYNTAX_ERR = 8;
+        const unsigned short INVALID_MODIFICATION_ERR = 9;
+        const unsigned short QUOTA_EXCEEDED_ERR = 10;
+        const unsigned short TYPE_MISMATCH_ERR = 11;
+        const unsigned short PATH_EXISTS_ERR = 12;
     };
 }