Changeset 99328 in webkit

Timestamp:

Nov 4, 2011, 3:24:17 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

Allow ScriptExecutionContext::addMessage to be called from background threads.
​https://bugs.webkit.org/show_bug.cgi?id=71575

Patch by Michael Nordman <​michaeln@google.coom> on 2011-11-04
Reviewed by Nate Chapin.

No new tests.

• dom/Document.cpp:

(WebCore::Document::addMessage):

• dom/ScriptExecutionContext.cpp:
• dom/ScriptExecutionContext.h:

(WebCore::ScriptExecutionContext::AddConsoleMessageTask::create):
(WebCore::ScriptExecutionContext::AddConsoleMessageTask::performTask):
(WebCore::ScriptExecutionContext::AddConsoleMessageTask::AddConsoleMessageTask):

• workers/WorkerContext.cpp:

(WebCore::WorkerContext::addMessage):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• dom/ScriptExecutionContext.cpp (modified) (1 diff)
• dom/ScriptExecutionContext.h (modified) (1 diff)
• workers/WorkerContext.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-04  Michael Nordman  <michaeln@google.coom>
+
+        Allow ScriptExecutionContext::addMessage to be called from background threads.
+        https://bugs.webkit.org/show_bug.cgi?id=71575
+
+        Reviewed by Nate Chapin.
+
+        No new tests.
+
+        * dom/Document.cpp:
+        (WebCore::Document::addMessage):
+        * dom/ScriptExecutionContext.cpp:
+        * dom/ScriptExecutionContext.h:
+        (WebCore::ScriptExecutionContext::AddConsoleMessageTask::create):
+        (WebCore::ScriptExecutionContext::AddConsoleMessageTask::performTask):
+        (WebCore::ScriptExecutionContext::AddConsoleMessageTask::AddConsoleMessageTask):
+        * workers/WorkerContext.cpp:
+        (WebCore::WorkerContext::addMessage):
+
 2011-11-04  Shawn Singh  <shawnsingh@chromium.org>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -4604 +4604 @@
 void Document::addMessage(MessageSource source, MessageType type, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceURL, PassRefPtr<ScriptCallStack> callStack)
 {
+    if (!isContextThread()) {
+        postTask(AddConsoleMessageTask::create(source, type, level, message));
+        return;
+    }
+
     if (DOMWindow* window = domWindow())
         window->console()->addMessage(source, type, level, message, lineNumber, sourceURL, callStack);

trunk/Source/WebCore/dom/ScriptExecutionContext.cpp

@@ -84 +84 @@
 };
 
+void ScriptExecutionContext::AddConsoleMessageTask::performTask(ScriptExecutionContext *context)
+{
+    context->addMessage(m_source, m_type, m_level, m_message, 0, String(), 0);
+}
+
 ScriptExecutionContext::ScriptExecutionContext()
     : m_iteratingActiveDOMObjects(false)

trunk/Source/WebCore/dom/ScriptExecutionContext.h

@@ -164 +164 @@
 
 protected:
+    class AddConsoleMessageTask : public Task {
+    public:
+        static PassOwnPtr<AddConsoleMessageTask> create(MessageSource source, MessageType type, MessageLevel level, const String& message)
+        {
+            return adoptPtr(new AddConsoleMessageTask(source, type, level, message));
+        }
+        virtual void performTask(ScriptExecutionContext*);
+    private:
+        AddConsoleMessageTask(MessageSource source, MessageType type, MessageLevel level, const String& message)
+            : m_source(source)
+            , m_type(type)
+            , m_level(level)
+            , m_message(message.isolatedCopy())
+        {
+        }
+        MessageSource m_source;
+        MessageType m_type;
+        MessageLevel m_level;
+        String m_message;
+    };
+
     // Explicitly override the security origin for this script context.
     // Note: It is dangerous to change the security origin of a script context

trunk/Source/WebCore/workers/WorkerContext.cpp

@@ -300 +300 @@
 void WorkerContext::addMessage(MessageSource source, MessageType type, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceURL, PassRefPtr<ScriptCallStack>)
 {
+    if (!isContextThread()) {
+        postTask(AddConsoleMessageTask::create(source, type, level, message));
+        return;
+    }
     thread()->workerReportingProxy().postConsoleMessageToWorkerObject(source, type, level, message, lineNumber, sourceURL);
 }