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

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: undo scroll animator mac changes 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
« no previous file with comments | « third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 OS(MACOSX) && ENABLE(OILPAN)
98 // TODO(ymalik): Let oilpan decide when to call dispose rather than
99 // explicitly calling it here to cleanup.
98 if (m_scrollAnimator) 100 if (m_scrollAnimator)
99 m_scrollAnimator->dispose(); 101 m_scrollAnimator->dispose();
100 #endif 102 #endif
101 m_scrollAnimator.clear(); 103 m_scrollAnimator.clear();
102 m_programmaticScrollAnimator.clear(); 104 m_programmaticScrollAnimator.clear();
103 } 105 }
104 106
105 ScrollAnimatorBase& ScrollableArea::scrollAnimator() const 107 ScrollAnimatorBase& ScrollableArea::scrollAnimator() const
106 { 108 {
107 if (!m_scrollAnimator) 109 if (!m_scrollAnimator)
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 std::max(0, size.height() - horizontalScrollbarHeight)); 609 std::max(0, size.height() - horizontalScrollbarHeight));
608 } 610 }
609 611
610 DEFINE_TRACE(ScrollableArea) 612 DEFINE_TRACE(ScrollableArea)
611 { 613 {
612 visitor->trace(m_scrollAnimator); 614 visitor->trace(m_scrollAnimator);
613 visitor->trace(m_programmaticScrollAnimator); 615 visitor->trace(m_programmaticScrollAnimator);
614 } 616 }
615 617
616 } // namespace blink 618 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698