Title: [108636] trunk/Source/WebCore
- Revision
- 108636
- Author
- [email protected]
- Date
- 2012-02-23 10:01:30 -0800 (Thu, 23 Feb 2012)
Log Message
Crash in ScrollElasticityController::snapRubberBandTimerFired()
https://bugs.webkit.org/show_bug.cgi?id=79372
<rdar://problem/10915193>
Reviewed by Andreas Kling.
Invalidate the rubber-band timer in the ScrollingTreeNodeMac destructor.
* page/scrolling/mac/ScrollingTreeNodeMac.h:
(ScrollingTreeNodeMac):
* page/scrolling/mac/ScrollingTreeNodeMac.mm:
(WebCore::ScrollingTreeNodeMac::~ScrollingTreeNodeMac):
(WebCore):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (108635 => 108636)
--- trunk/Source/WebCore/ChangeLog 2012-02-23 17:32:01 UTC (rev 108635)
+++ trunk/Source/WebCore/ChangeLog 2012-02-23 18:01:30 UTC (rev 108636)
@@ -1,3 +1,19 @@
+2012-02-23 Anders Carlsson <[email protected]>
+
+ Crash in ScrollElasticityController::snapRubberBandTimerFired()
+ https://bugs.webkit.org/show_bug.cgi?id=79372
+ <rdar://problem/10915193>
+
+ Reviewed by Andreas Kling.
+
+ Invalidate the rubber-band timer in the ScrollingTreeNodeMac destructor.
+
+ * page/scrolling/mac/ScrollingTreeNodeMac.h:
+ (ScrollingTreeNodeMac):
+ * page/scrolling/mac/ScrollingTreeNodeMac.mm:
+ (WebCore::ScrollingTreeNodeMac::~ScrollingTreeNodeMac):
+ (WebCore):
+
2012-02-23 Pavel Feldman <[email protected]>
Web Inspector: add experiment that loads stylesheets as links
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeNodeMac.h (108635 => 108636)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeNodeMac.h 2012-02-23 17:32:01 UTC (rev 108635)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeNodeMac.h 2012-02-23 18:01:30 UTC (rev 108636)
@@ -39,6 +39,7 @@
class ScrollingTreeNodeMac : public ScrollingTreeNode, private ScrollElasticityControllerClient {
public:
explicit ScrollingTreeNodeMac(ScrollingTree*);
+ virtual ~ScrollingTreeNodeMac();
private:
// ScrollingTreeNode member functions.
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeNodeMac.mm (108635 => 108636)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeNodeMac.mm 2012-02-23 17:32:01 UTC (rev 108635)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeNodeMac.mm 2012-02-23 18:01:30 UTC (rev 108636)
@@ -45,6 +45,12 @@
{
}
+ScrollingTreeNodeMac::~ScrollingTreeNodeMac()
+{
+ if (m_snapRubberbandTimer)
+ CFRunLoopTimerInvalidate(m_snapRubberbandTimer.get());
+}
+
void ScrollingTreeNodeMac::update(ScrollingTreeState* state)
{
ScrollingTreeNode::update(state);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
