Title: [116971] trunk/Source/WebKit2
Revision
116971
Author
[email protected]
Date
2012-05-14 11:17:02 -0700 (Mon, 14 May 2012)

Log Message

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):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (116970 => 116971)


--- trunk/Source/WebKit2/ChangeLog	2012-05-14 18:14:26 UTC (rev 116970)
+++ trunk/Source/WebKit2/ChangeLog	2012-05-14 18:17:02 UTC (rev 116971)
@@ -1,3 +1,17 @@
+2012-05-14  Andreas Kling  <[email protected]>
+
+        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-14  Sheriff Bot  <[email protected]>
 
         Unreviewed, rolling out r116969.

Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (116970 => 116971)


--- trunk/Source/WebKit2/UIProcess/WebContext.cpp	2012-05-14 18:14:26 UTC (rev 116970)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp	2012-05-14 18:17:02 UTC (rev 116971)
@@ -166,6 +166,8 @@
 
 WebContext::~WebContext()
 {
+    m_pluginWorkQueue.invalidate();
+
     if (m_process && m_process->isValid())
         m_process->connection()->removeQueueClient(this);
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to