Title: [113673] trunk/Source/WebCore
- Revision
- 113673
- Author
- [email protected]
- Date
- 2012-04-09 21:05:34 -0700 (Mon, 09 Apr 2012)
Log Message
Fixed ordering of deleting CCInputHandler and CCLayerTreeHostImpl in layerTreeHostClosedOnImplThread
https://bugs.webkit.org/show_bug.cgi?id=83488
Patch by Min Qin <[email protected]> on 2012-04-09
Reviewed by James Robinson.
CCInputHandler(WebCompositorInputHandlerImpl) has a pointer to CCLayerTreeHostImpl.
So we should delete CCInputHandler earlier as otherwise that pointer could get misused after LayerTreeHostImpl is deleted.
Just fixing a potential NPE error, no behavior change.
* platform/graphics/chromium/cc/CCThreadProxy.cpp:
(WebCore::CCThreadProxy::layerTreeHostClosedOnImplThread):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (113672 => 113673)
--- trunk/Source/WebCore/ChangeLog 2012-04-10 03:59:51 UTC (rev 113672)
+++ trunk/Source/WebCore/ChangeLog 2012-04-10 04:05:34 UTC (rev 113673)
@@ -1,3 +1,17 @@
+2012-04-09 Min Qin <[email protected]>
+
+ Fixed ordering of deleting CCInputHandler and CCLayerTreeHostImpl in layerTreeHostClosedOnImplThread
+ https://bugs.webkit.org/show_bug.cgi?id=83488
+
+ Reviewed by James Robinson.
+
+ CCInputHandler(WebCompositorInputHandlerImpl) has a pointer to CCLayerTreeHostImpl.
+ So we should delete CCInputHandler earlier as otherwise that pointer could get misused after LayerTreeHostImpl is deleted.
+ Just fixing a potential NPE error, no behavior change.
+
+ * platform/graphics/chromium/cc/CCThreadProxy.cpp:
+ (WebCore::CCThreadProxy::layerTreeHostClosedOnImplThread):
+
2012-04-09 Sheriff Bot <[email protected]>
Unreviewed, rolling out r113656.
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp (113672 => 113673)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp 2012-04-10 03:59:51 UTC (rev 113672)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp 2012-04-10 04:05:34 UTC (rev 113673)
@@ -732,8 +732,8 @@
TRACE_EVENT("CCThreadProxy::layerTreeHostClosedOnImplThread", this, 0);
ASSERT(isImplThread());
m_layerTreeHost->deleteContentsTexturesOnImplThread(m_layerTreeHostImpl->contentsTextureAllocator());
+ m_inputHandlerOnImplThread.clear();
m_layerTreeHostImpl.clear();
- m_inputHandlerOnImplThread.clear();
m_schedulerOnImplThread.clear();
completion->signal();
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
