Title: [125110] branches/safari-536.26-branch/Source/WebCore
- Revision
- 125110
- Author
- [email protected]
- Date
- 2012-08-08 16:37:50 -0700 (Wed, 08 Aug 2012)
Log Message
Merged r119740. <rdar://problem/12050720>
Modified Paths
Diff
Modified: branches/safari-536.26-branch/Source/WebCore/ChangeLog (125109 => 125110)
--- branches/safari-536.26-branch/Source/WebCore/ChangeLog 2012-08-08 23:36:00 UTC (rev 125109)
+++ branches/safari-536.26-branch/Source/WebCore/ChangeLog 2012-08-08 23:37:50 UTC (rev 125110)
@@ -1,5 +1,24 @@
2012-08-07 Lucas Forschler <[email protected]>
+ Merge 119740
+
+ 2012-06-07 Mark Hahnenberg <[email protected]>
+
+ Worker tear-down can re-enter JSC during GC finalization
+ https://bugs.webkit.org/show_bug.cgi?id=88449
+
+ Reviewed by Geoffrey Garen.
+
+ No new tests.
+
+ This is the first of two patches to fix this issue with Workers.
+
+ * workers/AbstractWorker.cpp:
+ (WebCore::AbstractWorker::~AbstractWorker): We don't need to call onDestroyWorker() here, it
+ will be called elsewhere in contextDestroyed().
+
+2012-08-07 Lucas Forschler <[email protected]>
+
Merge 124811
2012-08-06 Beth Dakin <[email protected]>
Modified: branches/safari-536.26-branch/Source/WebCore/workers/AbstractWorker.cpp (125109 => 125110)
--- branches/safari-536.26-branch/Source/WebCore/workers/AbstractWorker.cpp 2012-08-08 23:36:00 UTC (rev 125109)
+++ branches/safari-536.26-branch/Source/WebCore/workers/AbstractWorker.cpp 2012-08-08 23:37:50 UTC (rev 125110)
@@ -53,7 +53,6 @@
AbstractWorker::~AbstractWorker()
{
- onDestroyWorker();
}
void AbstractWorker::onDestroyWorker()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
