diff options
author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/page/DOMWindow.idl | |
parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/page/DOMWindow.idl')
-rw-r--r-- | Source/WebCore/page/DOMWindow.idl | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Source/WebCore/page/DOMWindow.idl b/Source/WebCore/page/DOMWindow.idl index b04a8a2..530c4ad 100644 --- a/Source/WebCore/page/DOMWindow.idl +++ b/Source/WebCore/page/DOMWindow.idl @@ -184,20 +184,18 @@ module window { attribute [EnabledAtRuntime] IDBDatabaseConstructor webkitIDBDatabase; attribute [EnabledAtRuntime] IDBDatabaseErrorConstructor webkitIDBDatabaseError; attribute [EnabledAtRuntime] IDBDatabaseExceptionConstructor webkitIDBDatabaseException; - attribute [EnabledAtRuntime] IDBErrorEventConstructor webkitIDBErrorEvent; - attribute [EnabledAtRuntime] IDBEventConstructor webkitIDBEvent; attribute [EnabledAtRuntime] IDBFactoryConstructor webkitIDBFactory; attribute [EnabledAtRuntime] IDBIndexConstructor webkitIDBIndex; attribute [EnabledAtRuntime] IDBKeyRangeConstructor webkitIDBKeyRange; attribute [EnabledAtRuntime] IDBObjectStoreConstructor webkitIDBObjectStore; attribute [EnabledAtRuntime] IDBRequestConstructor webkitIDBRequest; - attribute [EnabledAtRuntime] IDBSuccessEventConstructor webkitIDBSuccessEvent; attribute [EnabledAtRuntime] IDBTransactionConstructor webkitIDBTransaction; #endif #if defined(ENABLE_FILE_SYSTEM) && ENABLE_FILE_SYSTEM const unsigned short TEMPORARY = 0; const unsigned short PERSISTENT = 1; [EnabledAtRuntime=FileSystem] void requestFileSystem(in unsigned short type, in long long size, in [Callback, Optional] FileSystemCallback successCallback, in [Callback, Optional] ErrorCallback errorCallback); + [EnabledAtRuntime=FileSystem] void resolveLocalFileSystemURI(in DOMString uri, in [Callback, Optional] EntryCallback successCallback, in [Callback, Optional] ErrorCallback errorCallback); attribute [EnabledAtRuntime=FileSystem] FlagsConstructor Flags; #endif |