diff options
author | Kristian Monsen <kristianm@google.com> | 2010-05-21 16:53:46 +0100 |
---|---|---|
committer | Kristian Monsen <kristianm@google.com> | 2010-05-25 10:24:15 +0100 |
commit | 6c2af9490927c3c5959b5cb07461b646f8b32f6c (patch) | |
tree | f7111b9b22befab472616c1d50ec94eb50f1ec8c /WebCore/workers/WorkerContext.h | |
parent | a149172322a9067c14e8b474a53e63649aa17cad (diff) | |
download | external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.zip external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.tar.gz external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.tar.bz2 |
Merge WebKit at r59636: Initial merge by git
Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
Diffstat (limited to 'WebCore/workers/WorkerContext.h')
-rw-r--r-- | WebCore/workers/WorkerContext.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/WebCore/workers/WorkerContext.h b/WebCore/workers/WorkerContext.h index 91300c3..d05329e 100644 --- a/WebCore/workers/WorkerContext.h +++ b/WebCore/workers/WorkerContext.h @@ -31,6 +31,7 @@ #include "AtomicStringHash.h" #include "Database.h" +#include "DatabaseSync.h" #include "DatabaseCallback.h" #include "EventListener.h" #include "EventNames.h" @@ -105,10 +106,12 @@ namespace WebCore { #if ENABLE(DATABASE) // HTML 5 client-side database PassRefPtr<Database> openDatabase(const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode&); + PassRefPtr<DatabaseSync> openDatabaseSync(const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode&); + // Not implemented yet. virtual bool isDatabaseReadOnly() const { return false; } - // Not implemented yet. - virtual void databaseExceededQuota(const String&) { } + // Not implemented for real yet. + virtual void databaseExceededQuota(const String&); #endif virtual bool isContextThread() const; virtual bool isJSExecutionTerminated() const; |