Title: [119648] trunk/Source/WebCore
- Revision
- 119648
- Author
- [email protected]
- Date
- 2012-06-06 17:27:35 -0700 (Wed, 06 Jun 2012)
Log Message
Unreviewed, rolling out r119624.
http://trac.webkit.org/changeset/119624
https://bugs.webkit.org/show_bug.cgi?id=88472
Caused worker tests to become flaky (Requested by mhahnenberg
on #webkit).
Patch by Sheriff Bot <[email protected]> on 2012-06-06
* workers/AbstractWorker.cpp:
(WebCore::AbstractWorker::~AbstractWorker):
* workers/WorkerMessagingProxy.cpp:
(WebCore::WorkerMessagingProxy::workerObjectDestroyed):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (119647 => 119648)
--- trunk/Source/WebCore/ChangeLog 2012-06-07 00:23:36 UTC (rev 119647)
+++ trunk/Source/WebCore/ChangeLog 2012-06-07 00:27:35 UTC (rev 119648)
@@ -1,3 +1,17 @@
+2012-06-06 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r119624.
+ http://trac.webkit.org/changeset/119624
+ https://bugs.webkit.org/show_bug.cgi?id=88472
+
+ Caused worker tests to become flaky (Requested by mhahnenberg
+ on #webkit).
+
+ * workers/AbstractWorker.cpp:
+ (WebCore::AbstractWorker::~AbstractWorker):
+ * workers/WorkerMessagingProxy.cpp:
+ (WebCore::WorkerMessagingProxy::workerObjectDestroyed):
+
2012-06-06 Brady Eidson <[email protected]>
<rdar://problem/11575112> and https://bugs.webkit.org/show_bug.cgi?id=88428
Modified: trunk/Source/WebCore/workers/AbstractWorker.cpp (119647 => 119648)
--- trunk/Source/WebCore/workers/AbstractWorker.cpp 2012-06-07 00:23:36 UTC (rev 119647)
+++ trunk/Source/WebCore/workers/AbstractWorker.cpp 2012-06-07 00:27:35 UTC (rev 119648)
@@ -53,6 +53,7 @@
AbstractWorker::~AbstractWorker()
{
+ onDestroyWorker();
}
void AbstractWorker::onDestroyWorker()
Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp (119647 => 119648)
--- trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2012-06-07 00:23:36 UTC (rev 119647)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2012-06-07 00:27:35 UTC (rev 119648)
@@ -354,12 +354,10 @@
void WorkerMessagingProxy::workerObjectDestroyed()
{
m_workerObject = 0;
- // These tasks must be done asynchronously because this function is called during finalization
- // of JS wrappers for Workers and can cause re-entry in JS due to updating the Inspector.
if (m_workerThread)
- workerContextClosed();
+ terminateWorkerContext();
else
- workerContextDestroyed();
+ workerContextDestroyedInternal();
}
#if ENABLE(INSPECTOR)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
