| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2010, Google Inc. All rights reserved. | 2 * Copyright (c) 2010, Google Inc. All rights reserved. |
| 3 * Copyright (C) 2008, 2011 Apple Inc. All Rights Reserved. | 3 * Copyright (C) 2008, 2011 Apple Inc. All Rights Reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 | 69 |
| 70 int ScrollableArea::maxOverlapBetweenPages() | 70 int ScrollableArea::maxOverlapBetweenPages() |
| 71 { | 71 { |
| 72 static int maxOverlapBetweenPages = ScrollbarTheme::theme()->maxOverlapBetwe
enPages(); | 72 static int maxOverlapBetweenPages = ScrollbarTheme::theme()->maxOverlapBetwe
enPages(); |
| 73 return maxOverlapBetweenPages; | 73 return maxOverlapBetweenPages; |
| 74 } | 74 } |
| 75 | 75 |
| 76 ScrollableArea::ScrollableArea() | 76 ScrollableArea::ScrollableArea() |
| 77 : m_constrainsScrollingToContentEdge(true) | 77 : m_constrainsScrollingToContentEdge(true) |
| 78 , m_inLiveResize(false) | 78 , m_inLiveResize(false) |
| 79 , m_verticalScrollElasticity(ScrollElasticityNone) | |
| 80 , m_horizontalScrollElasticity(ScrollElasticityNone) | |
| 81 , m_scrollbarOverlayStyle(ScrollbarOverlayStyleDefault) | 79 , m_scrollbarOverlayStyle(ScrollbarOverlayStyleDefault) |
| 82 , m_scrollOriginChanged(false) | 80 , m_scrollOriginChanged(false) |
| 83 , m_hasViewportConstrainedObjectsForScrollCompensation(false) | 81 , m_hasViewportConstrainedObjectsForScrollCompensation(false) |
| 84 { | 82 { |
| 85 } | 83 } |
| 86 | 84 |
| 87 ScrollableArea::~ScrollableArea() | 85 ScrollableArea::~ScrollableArea() |
| 88 { | 86 { |
| 89 } | 87 } |
| 90 | 88 |
| (...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 518 { | 516 { |
| 519 return scrollSize(orientation); | 517 return scrollSize(orientation); |
| 520 } | 518 } |
| 521 | 519 |
| 522 float ScrollableArea::pixelStep(ScrollbarOrientation) const | 520 float ScrollableArea::pixelStep(ScrollbarOrientation) const |
| 523 { | 521 { |
| 524 return 1; | 522 return 1; |
| 525 } | 523 } |
| 526 | 524 |
| 527 } // namespace blink | 525 } // namespace blink |
| OLD | NEW |