Changeset 88914 in webkit

Timestamp:

Jun 15, 2011 1:24:41 AM (13 years ago)

Author:

yurys@chromium.org

Message:

2011-06-10 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Dmitry Titov.

[Chromium] Worker object may be garbage collected if it doesn't send any messages
​https://bugs.webkit.org/show_bug.cgi?id=62446

• fast/workers/resources/worker-init.js: Added.
• fast/workers/worker-init-expected.txt: Added.
• fast/workers/worker-init.html: Added.

2011-06-10 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Dmitry Titov.

[Chromium] Worker object may be garbage collected if it doesn't send any messages
​https://bugs.webkit.org/show_bug.cgi?id=62446

Assume that WorkerContext has pending activity before explicit notification
is received from it. It prevents worker object from being collected before
the first message from its context is received.

• src/WebWorkerClientImpl.cpp: (WebKit::WebWorkerClientImpl::startWorkerContext): (WebKit::WebWorkerClientImpl::startWorkerContextInternal): (WebKit::WebWorkerClientImpl::startWorkerContextTask):
• src/WebWorkerClientImpl.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/workers/resources/worker-init.js (added)
• LayoutTests/fast/workers/worker-init-expected.txt (added)
• LayoutTests/fast/workers/worker-init.html (added)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/src/WebWorkerClientImpl.cpp (modified) (2 diffs)
• Source/WebKit/chromium/src/WebWorkerClientImpl.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-10  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Dmitry Titov.
+
+        [Chromium] Worker object may be garbage collected if it doesn't send any messages
+        https://bugs.webkit.org/show_bug.cgi?id=62446
+
+        * fast/workers/resources/worker-init.js: Added.
+        * fast/workers/worker-init-expected.txt: Added.
+        * fast/workers/worker-init.html: Added.
+
 2011-06-15  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-06-10  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Dmitry Titov.
+
+        [Chromium] Worker object may be garbage collected if it doesn't send any messages
+        https://bugs.webkit.org/show_bug.cgi?id=62446
+
+        Assume that WorkerContext has pending activity before explicit notification
+        is received from it. It prevents worker object from being collected before
+        the first message from its context is received.
+
+        * src/WebWorkerClientImpl.cpp:
+        (WebKit::WebWorkerClientImpl::startWorkerContext):
+        (WebKit::WebWorkerClientImpl::startWorkerContextInternal):
+        (WebKit::WebWorkerClientImpl::startWorkerContextTask):
+        * src/WebWorkerClientImpl.h:
+
 2011-06-14  Eric Uhrhane  <ericu@chromium.org>
 

trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp

@@ -151 +151 @@
         return;
     }
+    startWorkerContextInternal(scriptURL, userAgent, sourceCode);
+}
+
+void WebWorkerClientImpl::startWorkerContextInternal(const KURL& scriptURL, const WTF::String& userAgent, const WTF::String& sourceCode)
+{
     m_webWorker->startWorkerContext(scriptURL, userAgent, sourceCode);
+    m_workerContextHadPendingActivity = true; // Worker initialization means a pending activity.
 }
 
@@ -352 +358 @@
                                                  const String& sourceCode)
 {
-    thisPtr->m_webWorker->startWorkerContext(KURL(ParsedURLString, scriptURL),
-                                             userAgent, sourceCode);
+    thisPtr->startWorkerContextInternal(KURL(ParsedURLString, scriptURL), userAgent, sourceCode);
 }
 

trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.h

@@ -160 +160 @@
                                           bool hasPendingActivity);
 
+    void startWorkerContextInternal(const WebCore::KURL& scriptURL, const WTF::String& userAgent, const WTF::String& sourceCode);
+
     // Guard against context from being destroyed before a worker exits.
     RefPtr<WebCore::ScriptExecutionContext> m_scriptExecutionContext;