Imported WebKit commit 9a52e27980f47e8b0d8f8b7cc0fd7b5741bceb92 (http://svn.webkit.org/repository/webkit/trunk@116736)

New snapshot to include QDeclarative* -> QQml* build fixes

1 files changed, 2 insertions, 5 deletions

diff --git a/Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.h b/Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.h
index 76e8cdf8f..e5f04081f 100644
--- a/Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.h
+++ b/Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.h
@@ -33,8 +33,8 @@
 
 #include "FileSystemType.h"
 #include "WebFileSystemCallbacks.h"
-#include "platform/WebFileSystem.h"
 #include "platform/WebVector.h"
+#include <public/WebFileSystem.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 
@@ -52,7 +52,7 @@ class WebURL;
 
 class WebFileSystemCallbacksImpl : public WebFileSystemCallbacks {
 public:
-    WebFileSystemCallbacksImpl(PassOwnPtr<WebCore::AsyncFileSystemCallbacks>, WebCore::FileSystemType = WebCore::FileSystemTypeTemporary, WebCore::ScriptExecutionContext* = 0, WebCore::FileSystemSynchronousType = WebCore::AsynchronousFileSystem);
+    WebFileSystemCallbacksImpl(PassOwnPtr<WebCore::AsyncFileSystemCallbacks>, WebCore::ScriptExecutionContext* = 0, WebCore::FileSystemSynchronousType = WebCore::AsynchronousFileSystem);
     virtual ~WebFileSystemCallbacksImpl();
 
     virtual void didSucceed();
@@ -64,9 +64,6 @@ public:
 private:
     OwnPtr<WebCore::AsyncFileSystemCallbacks> m_callbacks;
 
-    // Used for openFileSystem callbacks.
-    WebCore::FileSystemType m_type;
-
     // Used for worker's openFileSystem callbacks.
     WebCore::ScriptExecutionContext* m_context;
     WebCore::FileSystemSynchronousType m_synchronousType;