Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(636)

Side by Side Diff: third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp

Issue 1714663002: Attempt to fix the crash in blink Scroll Animator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: added WILL_BE_USING_PRE_FINALIZER Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2010, Google Inc. All rights reserved. 2 * Copyright (c) 2010, Google Inc. All rights reserved.
3 * Copyright (C) 2008, 2011 Apple Inc. All Rights Reserved. 3 * Copyright (C) 2008, 2011 Apple Inc. All Rights Reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 , m_scrollCornerNeedsPaintInvalidation(false) 87 , m_scrollCornerNeedsPaintInvalidation(false)
88 { 88 {
89 } 89 }
90 90
91 ScrollableArea::~ScrollableArea() 91 ScrollableArea::~ScrollableArea()
92 { 92 {
93 } 93 }
94 94
95 void ScrollableArea::clearScrollAnimators() 95 void ScrollableArea::clearScrollAnimators()
96 { 96 {
97 #if OS(MACOSX) && ENABLE(OILPAN) 97 #if ENABLE(OILPAN)
ajuma 2016/02/22 15:15:01 Instead of using an #if, WDYT of adding a virtual
bokan 2016/02/22 15:55:35 Why do we need to manually call dispose here at al
ymalik 2016/02/22 19:22:56 I think they have this call here because if oilpan
bokan 2016/02/22 19:35:46 The only place I see this being called from is Pai
98 if (m_scrollAnimator) 98 if (m_scrollAnimator)
99 m_scrollAnimator->dispose(); 99 m_scrollAnimator->dispose();
100 #endif 100 #endif
101 m_scrollAnimator.clear(); 101 m_scrollAnimator.clear();
102 m_programmaticScrollAnimator.clear(); 102 m_programmaticScrollAnimator.clear();
103 } 103 }
104 104
105 ScrollAnimatorBase& ScrollableArea::scrollAnimator() const 105 ScrollAnimatorBase& ScrollableArea::scrollAnimator() const
106 { 106 {
107 if (!m_scrollAnimator) 107 if (!m_scrollAnimator)
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 std::max(0, size.height() - horizontalScrollbarHeight)); 607 std::max(0, size.height() - horizontalScrollbarHeight));
608 } 608 }
609 609
610 DEFINE_TRACE(ScrollableArea) 610 DEFINE_TRACE(ScrollableArea)
611 { 611 {
612 visitor->trace(m_scrollAnimator); 612 visitor->trace(m_scrollAnimator);
613 visitor->trace(m_programmaticScrollAnimator); 613 visitor->trace(m_programmaticScrollAnimator);
614 } 614 }
615 615
616 } // namespace blink 616 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698