Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (146298 => 146299)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-03-20 04:00:45 UTC (rev 146298)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-03-20 04:08:49 UTC (rev 146299)
@@ -1,3 +1,35 @@
+2013-03-19 Mark Pilgrim <pilg...@chromium.org>
+
+ [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.
+
+ * 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):
+
2013-03-19 Kenneth Russell <k...@google.com>
Unreviewed, rolling out r146277.
Modified: trunk/Source/WebKit/chromium/public/WebCommonWorkerClient.h (146298 => 146299)
--- trunk/Source/WebKit/chromium/public/WebCommonWorkerClient.h 2013-03-20 04:00:45 UTC (rev 146298)
+++ trunk/Source/WebKit/chromium/public/WebCommonWorkerClient.h 2013-03-20 04:08:49 UTC (rev 146299)
@@ -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();
}
Modified: trunk/Source/WebKit/chromium/public/WebFrame.h (146298 => 146299)
--- trunk/Source/WebKit/chromium/public/WebFrame.h 2013-03-20 04:00:45 UTC (rev 146298)
+++ trunk/Source/WebKit/chromium/public/WebFrame.h 2013-03-20 04:08:49 UTC (rev 146299)
@@ -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 ----------------------------------------------------------
Modified: trunk/Source/WebKit/chromium/public/WebFrameClient.h (146298 => 146299)
--- trunk/Source/WebKit/chromium/public/WebFrameClient.h 2013-03-20 04:00:45 UTC (rev 146298)
+++ trunk/Source/WebKit/chromium/public/WebFrameClient.h 2013-03-20 04:08:49 UTC (rev 146299)
@@ -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 ---------------------------------------------------------
Modified: trunk/Source/WebKit/chromium/src/LocalFileSystemChromium.cpp (146298 => 146299)
--- trunk/Source/WebKit/chromium/src/LocalFileSystemChromium.cpp 2013-03-20 04:00:45 UTC (rev 146298)
+++ trunk/Source/WebKit/chromium/src/LocalFileSystemChromium.cpp 2013-03-20 04:08:49 UTC (rev 146299)
@@ -154,11 +154,7 @@
return bridge->result();
}
-#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
void openFileSystemForWorker(WebCommonWorkerClient* commonClient, WebFileSystemType type, long long size, bool create, WebFileSystemCallbacksImpl* callbacks, FileSystemSynchronousType synchronousType)
-#else
-void openFileSystemForWorker(WebCommonWorkerClient* commonClient, WebFileSystem::Type type, long long size, bool create, WebFileSystemCallbacksImpl* callbacks, FileSystemSynchronousType synchronousType)
-#endif
{
WorkerScriptController* controller = WorkerScriptController::controllerForContext();
WorkerContext* workerContext = controller->workerContext();
@@ -204,11 +200,7 @@
if (webView->permissionClient() && !webView->permissionClient()->allowFileSystem(webFrame))
allowed = false;
else
-#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
webFrame->client()->openFileSystem(webFrame, static_cast<WebFileSystemType>(type), size, create == CreateIfNotPresent, new WebFileSystemCallbacksImpl(callbacks));
-#else
- webFrame->client()->openFileSystem(webFrame, static_cast<WebFileSystem::Type>(type), size, create == CreateIfNotPresent, new WebFileSystemCallbacksImpl(callbacks));
-#endif
} else {
#if ENABLE(WORKERS)
WorkerContext* workerContext = static_cast<WorkerContext*>(context);
@@ -216,12 +208,8 @@
if (!allowFileSystemForWorker(webWorker->commonClient()))
allowed = false;
else
-#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
openFileSystemForWorker(webWorker->commonClient(), static_cast<WebFileSystemType>(type), size, create == CreateIfNotPresent, new WebFileSystemCallbacksImpl(callbacks, context, synchronousType), synchronousType);
#else
- openFileSystemForWorker(webWorker->commonClient(), static_cast<WebFileSystem::Type>(type), size, create == CreateIfNotPresent, new WebFileSystemCallbacksImpl(callbacks, context, synchronousType), synchronousType);
-#endif
-#else
ASSERT_NOT_REACHED();
#endif
}
@@ -255,11 +243,7 @@
return;
}
-#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
webFrame->client()->deleteFileSystem(webFrame, static_cast<WebFileSystemType>(type), new WebFileSystemCallbacksImpl(callbacks));
-#else
- webFrame->client()->deleteFileSystem(webFrame, static_cast<WebFileSystem::Type>(type), new WebFileSystemCallbacksImpl(callbacks));
-#endif
}
} // namespace WebCore
Modified: trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp (146298 => 146299)
--- trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2013-03-20 04:00:45 UTC (rev 146298)
+++ trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2013-03-20 04:08:49 UTC (rev 146299)
@@ -902,21 +902,13 @@
return ScriptController::mainWorldContext(frame());
}
-#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
v8::Handle<v8::Value> WebFrameImpl::createFileSystem(WebFileSystemType type, const WebString& name, const WebString& path)
-#else
-v8::Handle<v8::Value> WebFrameImpl::createFileSystem(WebFileSystem::Type type, const WebString& name, const WebString& path)
-#endif
{
ASSERT(frame());
return toV8(DOMFileSystem::create(frame()->document(), name, static_cast<WebCore::FileSystemType>(type), KURL(ParsedURLString, path.utf8().data()), AsyncFileSystemChromium::create()), v8::Handle<v8::Object>(), frame()->script()->currentWorldContext()->GetIsolate());
}
-#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
v8::Handle<v8::Value> WebFrameImpl::createSerializableFileSystem(WebFileSystemType type, const WebString& name, const WebString& path)
-#else
-v8::Handle<v8::Value> WebFrameImpl::createSerializableFileSystem(WebFileSystem::Type type, const WebString& name, const WebString& path)
-#endif
{
ASSERT(frame());
RefPtr<DOMFileSystem> fileSystem = DOMFileSystem::create(frame()->document(), name, static_cast<WebCore::FileSystemType>(type), KURL(ParsedURLString, path.utf8().data()), AsyncFileSystemChromium::create());
@@ -924,11 +916,7 @@
return toV8(fileSystem.release(), v8::Handle<v8::Object>(), frame()->script()->currentWorldContext()->GetIsolate());
}
-#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
v8::Handle<v8::Value> WebFrameImpl::createFileEntry(WebFileSystemType type, const WebString& fileSystemName, const WebString& fileSystemPath, const WebString& filePath, bool isDirectory)
-#else
-v8::Handle<v8::Value> WebFrameImpl::createFileEntry(WebFileSystem::Type type, const WebString& fileSystemName, const WebString& fileSystemPath, const WebString& filePath, bool isDirectory)
-#endif
{
ASSERT(frame());
Modified: trunk/Source/WebKit/chromium/src/WebFrameImpl.h (146298 => 146299)
--- trunk/Source/WebKit/chromium/src/WebFrameImpl.h 2013-03-20 04:00:45 UTC (rev 146298)
+++ trunk/Source/WebKit/chromium/src/WebFrameImpl.h 2013-03-20 04:08:49 UTC (rev 146299)
@@ -128,7 +128,6 @@
int argc,
v8::Handle<v8::Value> argv[]);
virtual v8::Local<v8::Context> mainWorldScriptContext() const;
-#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
virtual v8::Handle<v8::Value> createFileSystem(WebFileSystemType,
const WebString& name,
const WebString& path);
@@ -140,19 +139,6 @@
const WebString& fileSystemPath,
const WebString& filePath,
bool isDirectory);
-#else
- virtual v8::Handle<v8::Value> createFileSystem(WebFileSystem::Type,
- const WebString& name,
- const WebString& path);
- virtual v8::Handle<v8::Value> createSerializableFileSystem(WebFileSystem::Type,
- const WebString& name,
- const WebString& path);
- virtual v8::Handle<v8::Value> createFileEntry(WebFileSystem::Type,
- const WebString& fileSystemName,
- const WebString& fileSystemPath,
- const WebString& filePath,
- bool isDirectory);
-#endif
virtual void reload(bool ignoreCache);
virtual void reloadWithOverrideURL(const WebURL& overrideUrl, bool ignoreCache);
virtual void loadRequest(const WebURLRequest&);
Modified: trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp (146298 => 146299)
--- trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp 2013-03-20 04:00:45 UTC (rev 146298)
+++ trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp 2013-03-20 04:08:49 UTC (rev 146299)
@@ -122,13 +122,8 @@
return !webView->permissionClient() || webView->permissionClient()->allowFileSystem(m_webFrame);
}
-#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
void WebWorkerClientImpl::openFileSystem(WebFileSystemType type, long long size, bool create,
WebFileSystemCallbacks* callbacks)
-#else
-void WebWorkerClientImpl::openFileSystem(WebFileSystem::Type type, long long size, bool create,
- WebFileSystemCallbacks* callbacks)
-#endif
{
if (askedToTerminate()) {
callbacks->didFail(WebFileErrorAbort);
Modified: trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.h (146298 => 146299)
--- trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.h 2013-03-20 04:00:45 UTC (rev 146298)
+++ trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.h 2013-03-20 04:08:49 UTC (rev 146299)
@@ -84,13 +84,8 @@
// WebCommonWorkerClient methods:
virtual bool allowDatabase(WebFrame*, const WebString& name, const WebString& displayName, unsigned long estimatedSize) OVERRIDE;
virtual bool allowFileSystem();
-#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
virtual void openFileSystem(WebFileSystemType, long long size, bool create,
WebFileSystemCallbacks*) OVERRIDE;
-#else
- virtual void openFileSystem(WebFileSystem::Type, long long size, bool create,
- WebFileSystemCallbacks*) OVERRIDE;
-#endif
virtual bool allowIndexedDB(const WebString& name) OVERRIDE;
private:
Modified: trunk/Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.cpp (146298 => 146299)
--- trunk/Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.cpp 2013-03-20 04:00:45 UTC (rev 146298)
+++ trunk/Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.cpp 2013-03-20 04:08:49 UTC (rev 146299)
@@ -206,11 +206,7 @@
}
}
-#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
void WorkerFileSystemCallbacksBridge::postOpenFileSystemToMainThread(WebCommonWorkerClient* commonClient, WebFileSystemType type, long long size, bool create, const String& mode)
-#else
-void WorkerFileSystemCallbacksBridge::postOpenFileSystemToMainThread(WebCommonWorkerClient* commonClient, WebFileSystem::Type type, long long size, bool create, const String& mode)
-#endif
{
dispatchTaskToMainThread(
createCallbackTask(&openFileSystemOnMainThread,
@@ -314,11 +310,7 @@
path, this, mode));
}
-#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
void WorkerFileSystemCallbacksBridge::openFileSystemOnMainThread(ScriptExecutionContext*, WebCommonWorkerClient* commonClient, WebFileSystemType type, long long size, bool create, PassRefPtr<WorkerFileSystemCallbacksBridge> bridge, const String& mode)
-#else
-void WorkerFileSystemCallbacksBridge::openFileSystemOnMainThread(ScriptExecutionContext*, WebCommonWorkerClient* commonClient, WebFileSystem::Type type, long long size, bool create, PassRefPtr<WorkerFileSystemCallbacksBridge> bridge, const String& mode)
-#endif
{
if (!commonClient)
bridge->didFailOnMainThread(WebFileErrorAbort, mode);
Modified: trunk/Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.h (146298 => 146299)
--- trunk/Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.h 2013-03-20 04:00:45 UTC (rev 146298)
+++ trunk/Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.h 2013-03-20 04:08:49 UTC (rev 146299)
@@ -85,11 +85,7 @@
}
// Methods that create an instance and post an initial request task to the main thread. They must be called on the worker thread.
-#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
void postOpenFileSystemToMainThread(WebCommonWorkerClient*, WebFileSystemType, long long size, bool create, const String& mode);
-#else
- void postOpenFileSystemToMainThread(WebCommonWorkerClient*, WebFileSystem::Type, long long size, bool create, const String& mode);
-#endif
void postMoveToMainThread(WebFileSystem*, const WebCore::KURL& srcPath, const WebCore::KURL& destPath, const String& mode);
void postCopyToMainThread(WebFileSystem*, const WebCore::KURL& srcPath, const WebCore::KURL& destPath, const String& mode);
void postRemoveToMainThread(WebFileSystem*, const WebCore::KURL& path, const String& mode);
@@ -114,11 +110,7 @@
WorkerFileSystemCallbacksBridge(WebCore::WorkerLoaderProxy*, WebCore::ScriptExecutionContext*, WebFileSystemCallbacksImpl*);
// Methods that are to be called on the main thread.
-#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
static void openFileSystemOnMainThread(WebCore::ScriptExecutionContext*, WebCommonWorkerClient*, WebFileSystemType, long long size, bool create, PassRefPtr<WorkerFileSystemCallbacksBridge>, const String& mode);
-#else
- static void openFileSystemOnMainThread(WebCore::ScriptExecutionContext*, WebCommonWorkerClient*, WebFileSystem::Type, long long size, bool create, PassRefPtr<WorkerFileSystemCallbacksBridge>, const String& mode);
-#endif
static void moveOnMainThread(WebCore::ScriptExecutionContext*, WebFileSystem*, const WebCore::KURL& srcPath, const WebCore::KURL& destPath, PassRefPtr<WorkerFileSystemCallbacksBridge>, const String& mode);
static void copyOnMainThread(WebCore::ScriptExecutionContext*, WebFileSystem*, const WebCore::KURL& srcPath, const WebCore::KURL& destPath, PassRefPtr<WorkerFileSystemCallbacksBridge>, const String& mode);
static void removeOnMainThread(WebCore::ScriptExecutionContext*, WebFileSystem*, const WebCore::KURL& path, PassRefPtr<WorkerFileSystemCallbacksBridge>, const String& mode);
Modified: trunk/Tools/ChangeLog (146298 => 146299)
--- trunk/Tools/ChangeLog 2013-03-20 04:00:45 UTC (rev 146298)
+++ trunk/Tools/ChangeLog 2013-03-20 04:08:49 UTC (rev 146299)
@@ -1,3 +1,17 @@
+2013-03-19 Mark Pilgrim <pilg...@chromium.org>
+
+ [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.
+
+ * DumpRenderTree/chromium/WebViewHost.cpp:
+ * DumpRenderTree/chromium/WebViewHost.h:
+ (WebViewHost):
+
2013-03-19 Kenneth Russell <k...@google.com>
Unreviewed, rolling out r146290.
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp (146298 => 146299)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2013-03-20 04:00:45 UTC (rev 146298)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2013-03-20 04:08:49 UTC (rev 146299)
@@ -497,20 +497,12 @@
request.setExtraData(webkit_support::CreateWebURLRequestExtraData(frame->document().referrerPolicy()));
}
-#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
void WebViewHost::openFileSystem(WebFrame* frame, WebFileSystemType type, long long size, bool create, WebFileSystemCallbacks* callbacks)
-#else
-void WebViewHost::openFileSystem(WebFrame* frame, WebFileSystem::Type type, long long size, bool create, WebFileSystemCallbacks* callbacks)
-#endif
{
webkit_support::OpenFileSystem(frame, type, size, create, callbacks);
}
-#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
void WebViewHost::deleteFileSystem(WebKit::WebFrame* frame, WebKit::WebFileSystemType type, WebKit::WebFileSystemCallbacks* callbacks)
-#else
-void WebViewHost::deleteFileSystem(WebKit::WebFrame* frame, WebKit::WebFileSystem::Type type, WebKit::WebFileSystemCallbacks* callbacks)
-#endif
{
webkit_support::DeleteFileSystem(frame, type, callbacks);
}
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.h (146298 => 146299)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2013-03-20 04:00:45 UTC (rev 146298)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2013-03-20 04:08:49 UTC (rev 146299)
@@ -193,13 +193,8 @@
virtual void didChangeIcon(WebKit::WebFrame* , WebKit::WebIconURL::Type);
virtual void didNavigateWithinPage(WebKit::WebFrame*, bool isNewNavigation);
virtual void willSendRequest(WebKit::WebFrame*, unsigned identifier, WebKit::WebURLRequest&, const WebKit::WebURLResponse&);
-#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
virtual void openFileSystem(WebKit::WebFrame*, WebKit::WebFileSystemType, long long size, bool create, WebKit::WebFileSystemCallbacks*);
virtual void deleteFileSystem(WebKit::WebFrame*, WebKit::WebFileSystemType, WebKit::WebFileSystemCallbacks*);
-#else
- virtual void openFileSystem(WebKit::WebFrame*, WebKit::WebFileSystem::Type, long long size, bool create, WebKit::WebFileSystemCallbacks*);
- virtual void deleteFileSystem(WebKit::WebFrame*, WebKit::WebFileSystem::Type, WebKit::WebFileSystemCallbacks*);
-#endif
virtual bool willCheckAndDispatchMessageEvent(
WebKit::WebFrame* sourceFrame, WebKit::WebFrame* targetFrame,
WebKit::WebSecurityOrigin target, WebKit::WebDOMMessageEvent);
