diff options
author | Steve Block <steveblock@google.com> | 2010-02-02 14:57:50 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:55 +0000 |
commit | d0825bca7fe65beaee391d30da42e937db621564 (patch) | |
tree | 7461c49eb5844ffd1f35d1ba2c8b7584c1620823 /WebCore/workers/WorkerContext.h | |
parent | 3db770bd97c5a59b6c7574ca80a39e5a51c1defd (diff) | |
download | external_webkit-d0825bca7fe65beaee391d30da42e937db621564.zip external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.gz external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.bz2 |
Merge webkit.org at r54127 : Initial merge by git
Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
Diffstat (limited to 'WebCore/workers/WorkerContext.h')
-rw-r--r-- | WebCore/workers/WorkerContext.h | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/WebCore/workers/WorkerContext.h b/WebCore/workers/WorkerContext.h index f37d42c..a795947 100644 --- a/WebCore/workers/WorkerContext.h +++ b/WebCore/workers/WorkerContext.h @@ -30,11 +30,13 @@ #if ENABLE(WORKERS) #include "AtomicStringHash.h" +#include "Database.h" #include "EventListener.h" #include "EventNames.h" #include "EventTarget.h" #include "ScriptExecutionContext.h" #include "WorkerScriptController.h" +#include <wtf/Assertions.h> #include <wtf/OwnPtr.h> #include <wtf/PassRefPtr.h> #include <wtf/RefCounted.h> @@ -42,6 +44,7 @@ namespace WebCore { + class Database; class NotificationCenter; class ScheduledAction; class WorkerLocation; @@ -65,9 +68,9 @@ namespace WebCore { virtual String userAgent(const KURL&) const; WorkerScriptController* script() { return m_script.get(); } - void clearScript() { return m_script.clear(); } + void clearScript() { m_script.clear(); } - WorkerThread* thread() { return m_thread; } + WorkerThread* thread() const { return m_thread; } bool hasPendingActivity() const; @@ -101,6 +104,17 @@ namespace WebCore { NotificationCenter* webkitNotifications() const; #endif +#if ENABLE(DATABASE) + // HTML 5 client-side database + PassRefPtr<Database> openDatabase(const String& name, const String& version, const String& displayName, unsigned long estimatedSize, ExceptionCode&); + // Not implemented yet. + virtual bool isDatabaseReadOnly() const { return false; } + // Not implemented yet. + virtual void databaseExceededQuota(const String&) { } +#endif + virtual bool isContextThread() const; + + // These methods are used for GC marking. See JSWorkerContext::markChildren(MarkStack&) in // JSWorkerContextCustom.cpp. WorkerNavigator* optionalNavigator() const { return m_navigator.get(); } |