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

Side by Side Diff: third_party/WebKit/Source/core/frame/FrameView.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) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 3769 matching lines...) Expand 10 before | Expand all | Expand 10 after
3780 3780
3781 bool FrameView::isScrollCornerVisible() const 3781 bool FrameView::isScrollCornerVisible() const
3782 { 3782 {
3783 return !scrollCornerRect().isEmpty(); 3783 return !scrollCornerRect().isEmpty();
3784 } 3784 }
3785 3785
3786 ScrollBehavior FrameView::scrollBehaviorStyle() const 3786 ScrollBehavior FrameView::scrollBehaviorStyle() const
3787 { 3787 {
3788 Element* scrollElement = m_frame->document()->scrollingElement(); 3788 Element* scrollElement = m_frame->document()->scrollingElement();
3789 LayoutObject* layoutObject = scrollElement ? scrollElement->layoutObject() : nullptr; 3789 LayoutObject* layoutObject = scrollElement ? scrollElement->layoutObject() : nullptr;
3790 if (layoutObject && layoutObject->style()->scrollBehavior() == ScrollBehavio rSmooth) 3790 if (layoutObject && layoutObject->style()->getScrollBehavior() == ScrollBeha viorSmooth)
3791 return ScrollBehaviorSmooth; 3791 return ScrollBehaviorSmooth;
3792 3792
3793 return ScrollBehaviorInstant; 3793 return ScrollBehaviorInstant;
3794 } 3794 }
3795 3795
3796 void FrameView::paint(GraphicsContext& context, const CullRect& cullRect) const 3796 void FrameView::paint(GraphicsContext& context, const CullRect& cullRect) const
3797 { 3797 {
3798 paint(context, GlobalPaintNormalPhase, cullRect); 3798 paint(context, GlobalPaintNormalPhase, cullRect);
3799 } 3799 }
3800 3800
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
4127 return m_hiddenForThrottling && m_crossOriginForThrottling; 4127 return m_hiddenForThrottling && m_crossOriginForThrottling;
4128 } 4128 }
4129 4129
4130 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const 4130 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const
4131 { 4131 {
4132 ASSERT(layoutView()); 4132 ASSERT(layoutView());
4133 return *layoutView(); 4133 return *layoutView();
4134 } 4134 }
4135 4135
4136 } // namespace blink 4136 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/Document.cpp ('k') | third_party/WebKit/Source/core/input/TouchActionUtil.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698