Merge webkit.org at r58033 : Initial merge by git

Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1

1 files changed, 17 insertions, 8 deletions

diff --git a/WebCore/dom/ScriptExecutionContext.h b/WebCore/dom/ScriptExecutionContext.h
index 709bc69..d0f2e26 100644
--- a/WebCore/dom/ScriptExecutionContext.h
+++ b/WebCore/dom/ScriptExecutionContext.h
@@ -45,17 +45,16 @@ namespace WebCore {
     class DatabaseThread;
 #endif
     class DOMTimer;
+#if ENABLE(FILE_READER) || ENABLE(FILE_WRITER)
+    class FileThread;
+#endif
     class MessagePort;
     class SecurityOrigin;
     class ScriptString;
     class String;
-
-    enum MessageDestination {
 #if ENABLE(INSPECTOR)
-        InspectorControllerDestination,
+    class InspectorController;
 #endif
-        ConsoleDestination,
-    };
 
     class ScriptExecutionContext {
     public:
@@ -84,11 +83,12 @@ namespace WebCore {
         virtual String userAgent(const KURL&) const = 0;
 
         SecurityOrigin* securityOrigin() const { return m_securityOrigin.get(); }
+#if ENABLE(INSPECTOR)
+        virtual InspectorController* inspectorController() const { return 0; }
+#endif
 
         virtual void reportException(const String& errorMessage, int lineNumber, const String& sourceURL) = 0;
-        virtual void addMessage(MessageDestination, MessageSource, MessageType, MessageLevel, const String& message, unsigned lineNumber, const String& sourceURL) = 0;
-        virtual void resourceRetrievedByXMLHttpRequest(unsigned long identifier, const ScriptString& sourceString) = 0;
-        virtual void scriptImported(unsigned long, const String&) = 0;
+        virtual void addMessage(MessageSource, MessageType, MessageLevel, const String& message, unsigned lineNumber, const String& sourceURL) = 0;
         
         // Active objects are not garbage collected even if inaccessible, e.g. because their activity may result in callbacks being invoked.
         bool canSuspendActiveDOMObjects();
@@ -130,6 +130,11 @@ namespace WebCore {
         JSC::JSGlobalData* globalData();
 #endif
 
+#if ENABLE(FILE_READER) || ENABLE(FILE_WRITER)
+        FileThread* fileThread();
+        void stopFileThread();
+#endif
+
     protected:
         // Explicitly override the security origin for this script context.
         // Note: It is dangerous to change the security origin of a script context
@@ -157,6 +162,10 @@ namespace WebCore {
         typedef HashSet<Database* > DatabaseSet;
         OwnPtr<DatabaseSet> m_openDatabaseSet;
 #endif
+
+#if ENABLE(FILE_READER) || ENABLE(FILE_WRITER)
+        RefPtr<FileThread> m_fileThread;
+#endif
     };
 
 } // namespace WebCore