Changeset 90284 in webkit

Timestamp:

Jul 1, 2011 3:06:07 PM (13 years ago)

Author:

Nate Chapin

Message:

2011-07-01 Nate Chapin <Nate Chapin>

Test for ​https://bugs.webkit.org/show_bug.cgi?id=63835.

Reviewed by Dmitry Titov.

• fast/workers/worker-finish-crash-expected.txt: Added.
• fast/workers/worker-finish-crash.html: Added.

2011-07-01 Nate Chapin <Nate Chapin>

Ensure WorkerScriptLoader::notifyFinished() doesn't re-enter.
​https://bugs.webkit.org/show_bug.cgi?id=63835

Reviewed by Dmitry Titov.

Test: fast/workers/worker-finish-crash.html

• workers/WorkerScriptLoader.cpp: (WebCore::WorkerScriptLoader::WorkerScriptLoader): (WebCore::WorkerScriptLoader::notifyFinished):
• workers/WorkerScriptLoader.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/workers/worker-finish-crash-expected.txt (added)
• LayoutTests/fast/workers/worker-finish-crash.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/workers/WorkerScriptLoader.cpp (modified) (2 diffs)
• Source/WebCore/workers/WorkerScriptLoader.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-07-01  Nate Chapin  <japhet@chromium.org>
+
+        Test for https://bugs.webkit.org/show_bug.cgi?id=63835.
+
+        Reviewed by Dmitry Titov.
+
+        * fast/workers/worker-finish-crash-expected.txt: Added.
+        * fast/workers/worker-finish-crash.html: Added.
+
 2011-07-01  Mihai Parparita  <mihaip@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-01  Nate Chapin  <japhet@chromium.org>
+
+        Ensure WorkerScriptLoader::notifyFinished() doesn't re-enter.
+        https://bugs.webkit.org/show_bug.cgi?id=63835
+
+        Reviewed by Dmitry Titov.
+
+        Test: fast/workers/worker-finish-crash.html
+
+        * workers/WorkerScriptLoader.cpp:
+        (WebCore::WorkerScriptLoader::WorkerScriptLoader):
+        (WebCore::WorkerScriptLoader::notifyFinished):
+        * workers/WorkerScriptLoader.h:
+
 2011-07-01  Adrienne Walker  <enne@google.com>
 

trunk/Source/WebCore/workers/WorkerScriptLoader.cpp

@@ -53 +53 @@
     , m_identifier(0)
     , m_targetType(targetType)
+    , m_finishing(false)
 {
 }
@@ -182 +183 @@
 void WorkerScriptLoader::notifyFinished()
 {
-    if (m_client)
-        m_client->notifyFinished();
+    if (!m_client || m_finishing)
+        return;
+
+    m_finishing = true;
+    m_client->notifyFinished();
 }
 

trunk/Source/WebCore/workers/WorkerScriptLoader.h

@@ -93 +93 @@
         unsigned long m_identifier;
         ResourceRequestBase::TargetType m_targetType;
+        bool m_finishing;
     };