diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/page/DOMWindow.h | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/page/DOMWindow.h')
| -rw-r--r-- | Source/WebCore/page/DOMWindow.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Source/WebCore/page/DOMWindow.h b/Source/WebCore/page/DOMWindow.h index 404f40f..14ae79c 100644 --- a/Source/WebCore/page/DOMWindow.h +++ b/Source/WebCore/page/DOMWindow.h @@ -64,6 +64,7 @@ namespace WebCore { class Screen; class SerializedScriptValue; class Storage; + class StorageInfo; class StyleMedia; class WebKitPoint; @@ -284,8 +285,6 @@ namespace WebCore { DEFINE_ATTRIBUTE_EVENT_LISTENER(ended); DEFINE_ATTRIBUTE_EVENT_LISTENER(error); DEFINE_ATTRIBUTE_EVENT_LISTENER(focus); - DEFINE_ATTRIBUTE_EVENT_LISTENER(formchange); - DEFINE_ATTRIBUTE_EVENT_LISTENER(forminput); DEFINE_ATTRIBUTE_EVENT_LISTENER(hashchange); DEFINE_ATTRIBUTE_EVENT_LISTENER(input); DEFINE_ATTRIBUTE_EVENT_LISTENER(invalid); @@ -391,9 +390,10 @@ namespace WebCore { enum FileSystemType { TEMPORARY, PERSISTENT, + EXTERNAL, }; - void requestFileSystem(int type, long long size, PassRefPtr<FileSystemCallback>, PassRefPtr<ErrorCallback>); - void resolveLocalFileSystemURL(const String&, PassRefPtr<EntryCallback>, PassRefPtr<ErrorCallback>); + void webkitRequestFileSystem(int type, long long size, PassRefPtr<FileSystemCallback>, PassRefPtr<ErrorCallback>); + void webkitResolveLocalFileSystemURL(const String&, PassRefPtr<EntryCallback>, PassRefPtr<ErrorCallback>); #endif #if ENABLE(INDEXED_DATABASE) @@ -404,6 +404,10 @@ namespace WebCore { NotificationCenter* webkitNotifications() const; #endif +#if ENABLE(QUOTA) + StorageInfo* webkitStorageInfo() const; +#endif + #if ENABLE(OFFLINE_WEB_APPLICATIONS) DOMApplicationCache* applicationCache() const; DOMApplicationCache* optionalApplicationCache() const { return m_applicationCache.get(); } @@ -496,6 +500,10 @@ namespace WebCore { #if ENABLE(BLOB) mutable RefPtr<DOMURL> m_domURL; #endif + +#if ENABLE(QUOTA) + mutable RefPtr<StorageInfo> m_storageInfo; +#endif }; inline String DOMWindow::status() const |