| OLD | NEW |
| 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 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 if (m_verticalScrollbar) | 214 if (m_verticalScrollbar) |
| 215 size.setHeight(m_verticalScrollbar->scrollbar()->totalSize()); | 215 size.setHeight(m_verticalScrollbar->scrollbar()->totalSize()); |
| 216 else if (m_horizontalScrollbar) { | 216 else if (m_horizontalScrollbar) { |
| 217 size.setHeight(m_horizontalScrollbar->scrollbar()->y()); | 217 size.setHeight(m_horizontalScrollbar->scrollbar()->y()); |
| 218 if (m_horizontalScrollbar->scrollbar()->isOverlayScrollbar()) | 218 if (m_horizontalScrollbar->scrollbar()->isOverlayScrollbar()) |
| 219 size.expand(0, WebPluginScrollbar::defaultThickness()); | 219 size.expand(0, WebPluginScrollbar::defaultThickness()); |
| 220 } | 220 } |
| 221 return size; | 221 return size; |
| 222 } | 222 } |
| 223 | 223 |
| 224 IntSize ScrollbarGroup::overhangAmount() const | |
| 225 { | |
| 226 return IntSize(); | |
| 227 } | |
| 228 | |
| 229 IntPoint ScrollbarGroup::lastKnownMousePosition() const | 224 IntPoint ScrollbarGroup::lastKnownMousePosition() const |
| 230 { | 225 { |
| 231 return m_lastMousePosition; | 226 return m_lastMousePosition; |
| 232 } | 227 } |
| 233 | 228 |
| 234 bool ScrollbarGroup::shouldSuspendScrollAnimations() const | 229 bool ScrollbarGroup::shouldSuspendScrollAnimations() const |
| 235 { | 230 { |
| 236 return false; | 231 return false; |
| 237 } | 232 } |
| 238 | 233 |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 275 } | 270 } |
| 276 | 271 |
| 277 int pageStep = std::max( | 272 int pageStep = std::max( |
| 278 static_cast<int>(static_cast<float>(length) * ScrollableArea::minFractio
nToStepWhenPaging()), | 273 static_cast<int>(static_cast<float>(length) * ScrollableArea::minFractio
nToStepWhenPaging()), |
| 279 length - ScrollableArea::maxOverlapBetweenPages()); | 274 length - ScrollableArea::maxOverlapBetweenPages()); |
| 280 | 275 |
| 281 return std::max(pageStep, 1); | 276 return std::max(pageStep, 1); |
| 282 } | 277 } |
| 283 | 278 |
| 284 } // namespace blink | 279 } // namespace blink |
| OLD | NEW |