From e14391e94c850b8bd03680c23b38978db68687a8 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Thu, 4 Nov 2010 12:00:17 -0700
Subject: Merge Webkit at r70949: Initial merge by git.

Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
---
 WebCore/fileapi/EntrySync.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'WebCore/fileapi/EntrySync.cpp')

diff --git a/WebCore/fileapi/EntrySync.cpp b/WebCore/fileapi/EntrySync.cpp
index ad007db..299aeda 100644
--- a/WebCore/fileapi/EntrySync.cpp
+++ b/WebCore/fileapi/EntrySync.cpp
@@ -38,6 +38,7 @@
 #include "DirectoryEntry.h"
 #include "DirectoryEntrySync.h"
 #include "FileEntrySync.h"
+#include "FileException.h"
 #include "Metadata.h"
 #include "SyncCallbackHelper.h"
 
@@ -55,7 +56,7 @@ PassRefPtr<Metadata> EntrySync::getMetadata(ExceptionCode& ec)
     ec = 0;
     MetadataSyncCallbackHelper helper(m_fileSystem->asyncFileSystem());
     if (!m_fileSystem->getMetadata(this, helper.successCallback(), helper.errorCallback())) {
-        ec = INVALID_MODIFICATION_ERR;
+        ec = FileException::INVALID_MODIFICATION_ERR;
         return 0;
     }
     return helper.getResult(ec);
@@ -66,7 +67,7 @@ PassRefPtr<EntrySync> EntrySync::moveTo(PassRefPtr<DirectoryEntrySync> parent, c
     ec = 0;
     EntrySyncCallbackHelper helper(m_fileSystem->asyncFileSystem());
     if (!m_fileSystem->move(this, parent.get(), name, helper.successCallback(), helper.errorCallback())) {
-        ec = INVALID_MODIFICATION_ERR;
+        ec = FileException::INVALID_MODIFICATION_ERR;
         return 0;
     }
     return helper.getResult(ec);
@@ -77,7 +78,7 @@ PassRefPtr<EntrySync> EntrySync::copyTo(PassRefPtr<DirectoryEntrySync> parent, c
     ec = 0;
     EntrySyncCallbackHelper helper(m_fileSystem->asyncFileSystem());
     if (!m_fileSystem->copy(this, parent.get(), name, helper.successCallback(), helper.errorCallback())) {
-        ec = INVALID_MODIFICATION_ERR;
+        ec = FileException::INVALID_MODIFICATION_ERR;
         return 0;
     }
     return helper.getResult(ec);
@@ -88,7 +89,7 @@ void EntrySync::remove(ExceptionCode& ec) const
     ec = 0;
     VoidSyncCallbackHelper helper(m_fileSystem->asyncFileSystem());
     if (!m_fileSystem->remove(this, helper.successCallback(), helper.errorCallback())) {
-        ec = INVALID_MODIFICATION_ERR;
+        ec = FileException::INVALID_MODIFICATION_ERR;
         return;
     }
     helper.getResult(ec);
@@ -101,7 +102,7 @@ PassRefPtr<EntrySync> EntrySync::getParent() const
     return DirectoryEntrySync::create(m_fileSystem, parentPath);
 }
 
-EntrySync::EntrySync(DOMFileSystemBase* fileSystem, const String& fullPath)
+EntrySync::EntrySync(PassRefPtr<DOMFileSystemBase> fileSystem, const String& fullPath)
     : EntryBase(fileSystem, fullPath)
 {
 }
-- 
cgit v1.1