Title: [108284] releases/WebKitGTK/webkit-1.8/Source/WebCore
- Revision
- 108284
- Author
- [email protected]
- Date
- 2012-02-20 18:39:15 -0800 (Mon, 20 Feb 2012)
Log Message
Merging rr108248
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog (108283 => 108284)
--- releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog 2012-02-21 02:37:59 UTC (rev 108283)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog 2012-02-21 02:39:15 UTC (rev 108284)
@@ -1,3 +1,16 @@
+2012-02-20 Anders Carlsson <[email protected]>
+
+ Stop the committer timer when the page is destroyed
+ https://bugs.webkit.org/show_bug.cgi?id=78907
+
+ Reviewed by Adam Roben.
+
+ We don't want the committer timer to fire after the scrolling tree has been invalidated,
+ so stop the committer timer to prevent it from firing and trying to access the scrolling tree.
+
+ * page/scrolling/ScrollingCoordinator.cpp:
+ (WebCore::ScrollingCoordinator::pageDestroyed):
+
2012-02-20 Vsevolod Vlasov <[email protected]>
Unreviewed manual rollout of r107970 which breaks table column widths
Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp (108283 => 108284)
--- releases/WebKitGTK/webkit-1.8/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2012-02-21 02:37:59 UTC (rev 108283)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2012-02-21 02:39:15 UTC (rev 108284)
@@ -80,6 +80,8 @@
m_page = 0;
#if ENABLE(THREADED_SCROLLING)
+ m_scrollingTreeStateCommitterTimer.stop();
+
// Invalidating the scrolling tree will break the reference cycle between the ScrollingCoordinator and ScrollingTree objects.
ScrollingThread::dispatch(bind(&ScrollingTree::invalidate, m_scrollingTree.release()));
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
