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

Side by Side Diff: third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp

Issue 1743803002: Rename enums/functions that collide in chromium style in core/style/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-8
Patch Set: get-names-9: rebase Created 4 years, 9 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) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
5 * 5 *
6 * Other contributors: 6 * Other contributors:
7 * Robert O'Callahan <roc+@cs.cmu.edu> 7 * Robert O'Callahan <roc+@cs.cmu.edu>
8 * David Baron <dbaron@fas.harvard.edu> 8 * David Baron <dbaron@fas.harvard.edu>
9 * Christian Biesinger <cbiesinger@gmail.com> 9 * Christian Biesinger <cbiesinger@gmail.com>
10 * Randall Jesup <rjesup@wgate.com> 10 * Randall Jesup <rjesup@wgate.com>
(...skipping 722 matching lines...) Expand 10 before | Expand all | Expand 10 after
733 updateScrollableAreaSet(hasOverflow); 733 updateScrollableAreaSet(hasOverflow);
734 734
735 DisableCompositingQueryAsserts disabler; 735 DisableCompositingQueryAsserts disabler;
736 positionOverflowControls(); 736 positionOverflowControls();
737 737
738 return didMarkForDelayedLayout; 738 return didMarkForDelayedLayout;
739 } 739 }
740 740
741 ScrollBehavior PaintLayerScrollableArea::scrollBehaviorStyle() const 741 ScrollBehavior PaintLayerScrollableArea::scrollBehaviorStyle() const
742 { 742 {
743 return box().style()->scrollBehavior(); 743 return box().style()->getScrollBehavior();
744 } 744 }
745 745
746 bool PaintLayerScrollableArea::hasHorizontalOverflow() const 746 bool PaintLayerScrollableArea::hasHorizontalOverflow() const
747 { 747 {
748 return pixelSnappedScrollWidth() > box().pixelSnappedClientWidth(); 748 return pixelSnappedScrollWidth() > box().pixelSnappedClientWidth();
749 } 749 }
750 750
751 bool PaintLayerScrollableArea::hasVerticalOverflow() const 751 bool PaintLayerScrollableArea::hasVerticalOverflow() const
752 { 752 {
753 return pixelSnappedScrollHeight() > box().pixelSnappedClientHeight(); 753 return pixelSnappedScrollHeight() > box().pixelSnappedClientHeight();
(...skipping 804 matching lines...) Expand 10 before | Expand all | Expand 10 after
1558 } 1558 }
1559 1559
1560 DEFINE_TRACE(PaintLayerScrollableArea::ScrollbarManager) 1560 DEFINE_TRACE(PaintLayerScrollableArea::ScrollbarManager)
1561 { 1561 {
1562 visitor->trace(m_scrollableArea); 1562 visitor->trace(m_scrollableArea);
1563 visitor->trace(m_hBar); 1563 visitor->trace(m_hBar);
1564 visitor->trace(m_vBar); 1564 visitor->trace(m_vBar);
1565 } 1565 }
1566 1566
1567 } // namespace blink 1567 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698