Title: [117316] branches/safari-536-branch/Source/WebKit2
- Revision
- 117316
- Author
- lforsch...@apple.com
- Date
- 2012-05-16 12:11:55 -0700 (Wed, 16 May 2012)
Log Message
Merged r116971.
Modified Paths
Diff
Modified: branches/safari-536-branch/Source/WebKit2/ChangeLog (117315 => 117316)
--- branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-05-16 19:10:26 UTC (rev 117315)
+++ branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-05-16 19:11:55 UTC (rev 117316)
@@ -1,5 +1,23 @@
2012-05-16 Lucas Forschler <lforsch...@apple.com>
+ Merge 116971
+
+ 2012-05-14 Andreas Kling <kl...@webkit.org>
+
+ REGRESSION(r116796): Assertion failure in API tests
+ <http://webkit.org/b/86378>
+ <rdar://problem/10777218>
+
+ Reviewed by Anders Carlsson.
+
+ Invalidate the plugin work queue in ~WebContext to avoid hitting
+ the !m_isValid assertion in ~WorkQueue later on.
+
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::~WebContext):
+
+2012-05-16 Lucas Forschler <lforsch...@apple.com>
+
Merge 116796
2012-05-11 Andreas Kling <kl...@webkit.org>
Modified: branches/safari-536-branch/Source/WebKit2/UIProcess/WebContext.cpp (117315 => 117316)
--- branches/safari-536-branch/Source/WebKit2/UIProcess/WebContext.cpp 2012-05-16 19:10:26 UTC (rev 117315)
+++ branches/safari-536-branch/Source/WebKit2/UIProcess/WebContext.cpp 2012-05-16 19:11:55 UTC (rev 117316)
@@ -166,6 +166,8 @@
WebContext::~WebContext()
{
+ m_pluginWorkQueue.invalidate();
+
if (m_process && m_process->isValid())
m_process->connection()->removeQueueClient(this);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
