Title: [197390] trunk/Source/WebKit2
- Revision
- 197390
- Author
- [email protected]
- Date
- 2016-02-29 23:39:23 -0800 (Mon, 29 Feb 2016)
Log Message
ThreadedCompositor: clean up composition-specific resources before shutting down the thread
https://bugs.webkit.org/show_bug.cgi?id=154793
Reviewed by Carlos Garcia Campos.
* Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
(WebKit::ThreadedCompositor::runCompositingThread): Before concluding the
compositing thread run, clean up all the resources that were allocated at
the start, and in the reverse order. Specifically, we now also deallocate
the CoordinatedGraphicsScene and the SimpleViewportController objects. This
way these are not deallocated on the main thread when the ThreadedCompositor
destructor would otherwise clean them up.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (197389 => 197390)
--- trunk/Source/WebKit2/ChangeLog 2016-03-01 07:37:16 UTC (rev 197389)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-01 07:39:23 UTC (rev 197390)
@@ -1,5 +1,20 @@
2016-02-29 Zan Dobersek <[email protected]>
+ ThreadedCompositor: clean up composition-specific resources before shutting down the thread
+ https://bugs.webkit.org/show_bug.cgi?id=154793
+
+ Reviewed by Carlos Garcia Campos.
+
+ * Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
+ (WebKit::ThreadedCompositor::runCompositingThread): Before concluding the
+ compositing thread run, clean up all the resources that were allocated at
+ the start, and in the reverse order. Specifically, we now also deallocate
+ the CoordinatedGraphicsScene and the SimpleViewportController objects. This
+ way these are not deallocated on the main thread when the ThreadedCompositor
+ destructor would otherwise clean them up.
+
+2016-02-29 Zan Dobersek <[email protected]>
+
ThreadSafeCoordinatedSurface: remove the unused private create() static method
https://bugs.webkit.org/show_bug.cgi?id=154792
Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp (197389 => 197390)
--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp 2016-03-01 07:37:16 UTC (rev 197389)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp 2016-03-01 07:39:23 UTC (rev 197390)
@@ -331,8 +331,10 @@
{
LockHolder locker(m_terminateRunLoopConditionMutex);
+ m_context = nullptr;
+ m_scene = nullptr;
+ m_viewportController = nullptr;
m_compositingRunLoop = nullptr;
- m_context = nullptr;
m_terminateRunLoopCondition.notifyOne();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
