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

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

Issue 603193005: Move the Widget hierarchy to the Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add ~Scrollbar assert Created 6 years, 2 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 ScrollableArea::~ScrollableArea() 86 ScrollableArea::~ScrollableArea()
87 { 87 {
88 } 88 }
89 89
90 ScrollAnimator* ScrollableArea::scrollAnimator() const 90 ScrollAnimator* ScrollableArea::scrollAnimator() const
91 { 91 {
92 if (!m_animators) 92 if (!m_animators)
93 m_animators = adoptPtr(new ScrollableAreaAnimators); 93 m_animators = adoptPtr(new ScrollableAreaAnimators);
94 94
95 if (!m_animators->scrollAnimator) 95 if (!m_animators->scrollAnimator)
96
haraken 2014/09/29 14:16:36 mis-edit.
96 m_animators->scrollAnimator = ScrollAnimator::create(const_cast<Scrollab leArea*>(this)); 97 m_animators->scrollAnimator = ScrollAnimator::create(const_cast<Scrollab leArea*>(this));
97 98
98 return m_animators->scrollAnimator.get(); 99 return m_animators->scrollAnimator.get();
99 } 100 }
100 101
101 ProgrammaticScrollAnimator* ScrollableArea::programmaticScrollAnimator() const 102 ProgrammaticScrollAnimator* ScrollableArea::programmaticScrollAnimator() const
102 { 103 {
103 if (!m_animators) 104 if (!m_animators)
104 m_animators = adoptPtr(new ScrollableAreaAnimators); 105 m_animators = adoptPtr(new ScrollableAreaAnimators);
105 106
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 { 482 {
482 return scrollSize(orientation); 483 return scrollSize(orientation);
483 } 484 }
484 485
485 float ScrollableArea::pixelStep(ScrollbarOrientation) const 486 float ScrollableArea::pixelStep(ScrollbarOrientation) const
486 { 487 {
487 return 1; 488 return 1;
488 } 489 }
489 490
490 } // namespace blink 491 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698