diff options
| author | Ben Murdoch <benm@google.com> | 2010-08-11 14:44:44 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-08-12 19:15:41 +0100 |
| commit | dd8bb3de4f353a81954234999f1fea748aee2ea9 (patch) | |
| tree | 729b52bf09294f0d6c67cd5ea80aee1b727b7bd8 /WebCore/dom/ScriptExecutionContext.h | |
| parent | f3d41ba51d86bf719c7a65ab5297aea3c17e2d98 (diff) | |
| download | external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.zip external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.gz external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.bz2 | |
Merge WebKit at r65072 : Initial merge by git.
Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
Diffstat (limited to 'WebCore/dom/ScriptExecutionContext.h')
| -rw-r--r-- | WebCore/dom/ScriptExecutionContext.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/WebCore/dom/ScriptExecutionContext.h b/WebCore/dom/ScriptExecutionContext.h index 4cd483a..d2da307 100644 --- a/WebCore/dom/ScriptExecutionContext.h +++ b/WebCore/dom/ScriptExecutionContext.h @@ -29,6 +29,7 @@ #include "Console.h" #include "KURL.h" +#include <wtf/Forward.h> #include <wtf/HashMap.h> #include <wtf/HashSet.h> #include <wtf/PassOwnPtr.h> @@ -45,13 +46,12 @@ namespace WebCore { class DatabaseThread; #endif class DOMTimer; -#if ENABLE(FILE_READER) || ENABLE(FILE_WRITER) +#if ENABLE(BLOB) || ENABLE(FILE_WRITER) class FileThread; #endif class MessagePort; class SecurityOrigin; class ScriptString; - class String; #if ENABLE(INSPECTOR) class InspectorController; #endif @@ -129,7 +129,7 @@ namespace WebCore { JSC::JSGlobalData* globalData(); #endif -#if ENABLE(FILE_READER) || ENABLE(FILE_WRITER) +#if ENABLE(BLOB) || ENABLE(FILE_WRITER) FileThread* fileThread(); void stopFileThread(); #endif @@ -160,7 +160,7 @@ namespace WebCore { bool m_hasOpenDatabases; // This never changes back to false, even after the database thread is closed. #endif -#if ENABLE(FILE_READER) || ENABLE(FILE_WRITER) +#if ENABLE(BLOB) || ENABLE(FILE_WRITER) RefPtr<FileThread> m_fileThread; #endif }; |