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

Side by Side Diff: Source/core/rendering/RenderLayerScrollableArea.cpp

Issue 641733004: Merge FrameView and ScrollView. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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 | Annotate | Revision Log
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@web.de> 9 * Christian Biesinger <cbiesinger@web.de>
10 * Randall Jesup <rjesup@wgate.com> 10 * Randall Jesup <rjesup@wgate.com>
(...skipping 862 matching lines...) Expand 10 before | Expand all | Expand 10 after
873 873
874 void RenderLayerScrollableArea::destroyScrollbar(ScrollbarOrientation orientatio n) 874 void RenderLayerScrollableArea::destroyScrollbar(ScrollbarOrientation orientatio n)
875 { 875 {
876 RefPtr<Scrollbar>& scrollbar = orientation == HorizontalScrollbar ? m_hBar : m_vBar; 876 RefPtr<Scrollbar>& scrollbar = orientation == HorizontalScrollbar ? m_hBar : m_vBar;
877 if (!scrollbar) 877 if (!scrollbar)
878 return; 878 return;
879 879
880 if (!scrollbar->isCustomScrollbar()) 880 if (!scrollbar->isCustomScrollbar())
881 willRemoveScrollbar(scrollbar.get(), orientation); 881 willRemoveScrollbar(scrollbar.get(), orientation);
882 882
883 toScrollView(scrollbar->parent())->removeChild(scrollbar.get()); 883 toFrameView(scrollbar->parent())->removeChild(scrollbar.get());
884 scrollbar->disconnectFromScrollableArea(); 884 scrollbar->disconnectFromScrollableArea();
885 scrollbar = nullptr; 885 scrollbar = nullptr;
886 } 886 }
887 887
888 void RenderLayerScrollableArea::setHasHorizontalScrollbar(bool hasScrollbar) 888 void RenderLayerScrollableArea::setHasHorizontalScrollbar(bool hasScrollbar)
889 { 889 {
890 if (hasScrollbar == hasHorizontalScrollbar()) 890 if (hasScrollbar == hasHorizontalScrollbar())
891 return; 891 return;
892 892
893 if (hasScrollbar) { 893 if (hasScrollbar) {
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
1470 void RenderLayerScrollableArea::setTopmostScrollChild(RenderLayer* scrollChild) 1470 void RenderLayerScrollableArea::setTopmostScrollChild(RenderLayer* scrollChild)
1471 { 1471 {
1472 // We only want to track the topmost scroll child for scrollable areas with 1472 // We only want to track the topmost scroll child for scrollable areas with
1473 // overlay scrollbars. 1473 // overlay scrollbars.
1474 if (!hasOverlayScrollbars()) 1474 if (!hasOverlayScrollbars())
1475 return; 1475 return;
1476 m_nextTopmostScrollChild = scrollChild; 1476 m_nextTopmostScrollChild = scrollChild;
1477 } 1477 }
1478 1478
1479 } // namespace blink 1479 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698