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

Side by Side Diff: Source/web/ScrollbarGroup.cpp

Issue 269433002: Revert of isActiveFocus() is a more meaningful name (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 7 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
« no previous file with comments | « Source/web/ScrollbarGroup.h ('k') | Source/web/tests/ScrollAnimatorNoneTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 if (m_horizontalScrollbar && scrollbar == m_horizontalScrollbar->scrollbar() ) 113 if (m_horizontalScrollbar && scrollbar == m_horizontalScrollbar->scrollbar() )
114 m_horizontalScrollbar->invalidateScrollbarRect(rect); 114 m_horizontalScrollbar->invalidateScrollbarRect(rect);
115 else if (m_verticalScrollbar && scrollbar == m_verticalScrollbar->scrollbar( )) 115 else if (m_verticalScrollbar && scrollbar == m_verticalScrollbar->scrollbar( ))
116 m_verticalScrollbar->invalidateScrollbarRect(rect); 116 m_verticalScrollbar->invalidateScrollbarRect(rect);
117 } 117 }
118 118
119 void ScrollbarGroup::invalidateScrollCornerRect(const IntRect&) 119 void ScrollbarGroup::invalidateScrollCornerRect(const IntRect&)
120 { 120 {
121 } 121 }
122 122
123 bool ScrollbarGroup::isActiveFocus() const 123 bool ScrollbarGroup::isActive() const
124 { 124 {
125 return true; 125 return true;
126 } 126 }
127 127
128 void ScrollbarGroup::setFrameRect(const IntRect& frameRect) 128 void ScrollbarGroup::setFrameRect(const IntRect& frameRect)
129 { 129 {
130 m_frameRect = frameRect; 130 m_frameRect = frameRect;
131 } 131 }
132 132
133 IntRect ScrollbarGroup::scrollableAreaBoundingBox() const 133 IntRect ScrollbarGroup::scrollableAreaBoundingBox() const
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 } 277 }
278 278
279 int pageStep = std::max( 279 int pageStep = std::max(
280 static_cast<int>(static_cast<float>(length) * ScrollableArea::minFractio nToStepWhenPaging()), 280 static_cast<int>(static_cast<float>(length) * ScrollableArea::minFractio nToStepWhenPaging()),
281 length - ScrollableArea::maxOverlapBetweenPages()); 281 length - ScrollableArea::maxOverlapBetweenPages());
282 282
283 return std::max(pageStep, 1); 283 return std::max(pageStep, 1);
284 } 284 }
285 285
286 } // namespace blink 286 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/ScrollbarGroup.h ('k') | Source/web/tests/ScrollAnimatorNoneTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698