[Chromium] Migrate to WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
https://bugs.webkit.org/show_bug.cgi?id=112754
Reviewed by Darin Fisher.
Remove old code behind ifndef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
now that it's always defined.
Source/WebKit/chromium:
* public/WebCommonWorkerClient.h:
(WebCommonWorkerClient):
* public/WebFrame.h:
(WebFrame):
* public/WebFrameClient.h:
(WebFrameClient):
(WebKit::WebFrameClient::openFileSystem):
(WebKit::WebFrameClient::deleteFileSystem):
* src/LocalFileSystemChromium.cpp:
(WebCore):
(WebCore::openFileSystemHelper):
(WebCore::LocalFileSystem::deleteFileSystem):
* src/WebFrameImpl.cpp:
* src/WebFrameImpl.h:
(WebFrameImpl):
* src/WebWorkerClientImpl.cpp:
(WebKit::WebWorkerClientImpl::openFileSystem):
* src/WebWorkerClientImpl.h:
* src/WorkerFileSystemCallbacksBridge.cpp:
* src/WorkerFileSystemCallbacksBridge.h:
(WorkerFileSystemCallbacksBridge):
Tools:
* DumpRenderTree/chromium/WebViewHost.cpp:
* DumpRenderTree/chromium/WebViewHost.h:
(WebViewHost):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk/Source/WebKit/chromium/public@146299 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCommonWorkerClient.h b/WebCommonWorkerClient.h
index f928e67..026b4f4 100644
--- a/WebCommonWorkerClient.h
+++ b/WebCommonWorkerClient.h
@@ -60,11 +60,7 @@
}
// Called on the main webkit thread before opening a file system.
-#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
virtual void openFileSystem(WebFileSystemType, long long size, bool create, WebFileSystemCallbacks*)
-#else
- virtual void openFileSystem(WebFileSystem::Type, long long size, bool create, WebFileSystemCallbacks*)
-#endif
{
WEBKIT_ASSERT_NOT_REACHED();
}
diff --git a/WebFrame.h b/WebFrame.h
index ca0ceb4..a472191 100644
--- a/WebFrame.h
+++ b/WebFrame.h
@@ -291,7 +291,6 @@
// be calling this API.
virtual v8::Local<v8::Context> mainWorldScriptContext() const = 0;
-#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
// Creates an instance of file system object.
virtual v8::Handle<v8::Value> createFileSystem(WebFileSystemType,
const WebString& name,
@@ -308,24 +307,6 @@
const WebString& fileSystemRootURL,
const WebString& filePath,
bool isDirectory) = 0;
-#else
- // Creates an instance of file system object.
- virtual v8::Handle<v8::Value> createFileSystem(WebFileSystem::Type,
- const WebString& name,
- const WebString& rootURL) = 0;
- // Creates an instance of serializable file system object.
- // FIXME: Remove this API after we have a better way of creating serialized
- // file system object.
- virtual v8::Handle<v8::Value> createSerializableFileSystem(WebFileSystem::Type,
- const WebString& name,
- const WebString& rootURL) = 0;
- // Creates an instance of file or directory entry object.
- virtual v8::Handle<v8::Value> createFileEntry(WebFileSystem::Type,
- const WebString& fileSystemName,
- const WebString& fileSystemRootURL,
- const WebString& filePath,
- bool isDirectory) = 0;
-#endif // WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
// Navigation ----------------------------------------------------------
diff --git a/WebFrameClient.h b/WebFrameClient.h
index cfbe27f..f478156 100644
--- a/WebFrameClient.h
+++ b/WebFrameClient.h
@@ -360,15 +360,9 @@
// is completed successfully. WebFileSystemCallbacks::didFail() must be
// called otherwise. The create bool is for indicating whether or not to
// create root path for file systems if it do not exist.
-#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
virtual void openFileSystem(
WebFrame*, WebFileSystemType, long long size,
bool create, WebFileSystemCallbacks*) { }
-#else
- virtual void openFileSystem(
- WebFrame*, WebFileSystem::Type, long long size,
- bool create, WebFileSystemCallbacks*) { }
-#endif
// Deletes FileSystem.
// WebFileSystemCallbacks::didSucceed() must be called when the operation
@@ -376,13 +370,8 @@
// called otherwise.
// All in-flight operations and following operations may fail after the
// FileSystem is deleted.
-#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
virtual void deleteFileSystem(
WebFrame*, WebFileSystemType, WebFileSystemCallbacks*) { }
-#else
- virtual void deleteFileSystem(
- WebFrame*, WebFileSystem::Type, WebFileSystemCallbacks*) { }
-#endif
// Quota ---------------------------------------------------------
