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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutView.cpp

Issue 1907213002: Refactor OverlayScrollbarSizeRelevancy into OverlayScrollbarClipBehavior (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Include -> Exclude Created 4 years, 8 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 839 matching lines...) Expand 10 before | Expand all | Expand 10 after
850 850
851 LayoutRect LayoutView::viewRect() const 851 LayoutRect LayoutView::viewRect() const
852 { 852 {
853 if (shouldUsePrintingLayout()) 853 if (shouldUsePrintingLayout())
854 return LayoutRect(LayoutPoint(), size()); 854 return LayoutRect(LayoutPoint(), size());
855 if (m_frameView) 855 if (m_frameView)
856 return LayoutRect(m_frameView->visibleContentRect()); 856 return LayoutRect(m_frameView->visibleContentRect());
857 return LayoutRect(); 857 return LayoutRect();
858 } 858 }
859 859
860 LayoutRect LayoutView::overflowClipRect(const LayoutPoint& location, OverlayScro llbarSizeRelevancy relevancy) const 860 LayoutRect LayoutView::overflowClipRect(const LayoutPoint& location, OverlayScro llbarClipBehavior overlayScrollbarClipBehavior) const
861 { 861 {
862 LayoutRect rect = viewRect(); 862 LayoutRect rect = viewRect();
863 if (rect.isEmpty()) 863 if (rect.isEmpty())
864 return LayoutBox::overflowClipRect(location, relevancy); 864 return LayoutBox::overflowClipRect(location, overlayScrollbarClipBehavio r);
865 865
866 rect.setLocation(location); 866 rect.setLocation(location);
867 if (hasOverflowClip()) 867 if (hasOverflowClip())
868 excludeScrollbars(rect, relevancy); 868 excludeScrollbars(rect, overlayScrollbarClipBehavior);
869 869
870 return rect; 870 return rect;
871 } 871 }
872 872
873 IntRect LayoutView::documentRect() const 873 IntRect LayoutView::documentRect() const
874 { 874 {
875 LayoutRect overflowRect(layoutOverflowRect()); 875 LayoutRect overflowRect(layoutOverflowRect());
876 flipForWritingMode(overflowRect); 876 flipForWritingMode(overflowRect);
877 return pixelSnappedIntRect(overflowRect); 877 return pixelSnappedIntRect(overflowRect);
878 } 878 }
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
1038 // ASSERT(!frame()->isMainFrame()) here. All main frame scrolling should 1038 // ASSERT(!frame()->isMainFrame()) here. All main frame scrolling should
1039 // be handled by the ViewportScrollCallback. 1039 // be handled by the ViewportScrollCallback.
1040 1040
1041 if (!frameView()) 1041 if (!frameView())
1042 return ScrollResult(false, false, delta.width(), delta.height()); 1042 return ScrollResult(false, false, delta.width(), delta.height());
1043 1043
1044 return frameView()->getScrollableArea()->userScroll(granularity, delta); 1044 return frameView()->getScrollableArea()->userScroll(granularity, delta);
1045 } 1045 }
1046 1046
1047 } // namespace blink 1047 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698