| 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 static const int kPixelsPerLineStep = 40; | 47 static const int kPixelsPerLineStep = 40; |
| 48 static const float kMinFractionToStepWhenPaging = 0.875f; | 48 static const float kMinFractionToStepWhenPaging = 0.875f; |
| 49 | 49 |
| 50 namespace blink { | 50 namespace blink { |
| 51 | 51 |
| 52 struct SameSizeAsScrollableArea { | 52 struct SameSizeAsScrollableArea { |
| 53 virtual ~SameSizeAsScrollableArea(); | 53 virtual ~SameSizeAsScrollableArea(); |
| 54 #if ENABLE(ASSERT) && ENABLE(OILPAN) | 54 #if ENABLE(ASSERT) && ENABLE(OILPAN) |
| 55 VerifyEagerFinalization verifyEager; | 55 VerifyEagerFinalization verifyEager; |
| 56 #endif | 56 #endif |
| 57 OwnPtrWillBeMember<void*> pointer[2]; | 57 Member<void*> pointer[2]; |
| 58 unsigned bitfields : 16; | 58 unsigned bitfields : 16; |
| 59 IntPoint origin; | 59 IntPoint origin; |
| 60 }; | 60 }; |
| 61 | 61 |
| 62 static_assert(sizeof(ScrollableArea) == sizeof(SameSizeAsScrollableArea), "Scrol
lableArea should stay small"); | 62 static_assert(sizeof(ScrollableArea) == sizeof(SameSizeAsScrollableArea), "Scrol
lableArea should stay small"); |
| 63 | 63 |
| 64 int ScrollableArea::pixelsPerLineStep(HostWindow* host) | 64 int ScrollableArea::pixelsPerLineStep(HostWindow* host) |
| 65 { | 65 { |
| 66 if (!host) | 66 if (!host) |
| 67 return kPixelsPerLineStep; | 67 return kPixelsPerLineStep; |
| (...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 614 std::max(0, size.height() - horizontalScrollbarHeight)); | 614 std::max(0, size.height() - horizontalScrollbarHeight)); |
| 615 } | 615 } |
| 616 | 616 |
| 617 DEFINE_TRACE(ScrollableArea) | 617 DEFINE_TRACE(ScrollableArea) |
| 618 { | 618 { |
| 619 visitor->trace(m_scrollAnimator); | 619 visitor->trace(m_scrollAnimator); |
| 620 visitor->trace(m_programmaticScrollAnimator); | 620 visitor->trace(m_programmaticScrollAnimator); |
| 621 } | 621 } |
| 622 | 622 |
| 623 } // namespace blink | 623 } // namespace blink |
| OLD | NEW |