| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008, 2011 Apple Inc. All Rights Reserved. | 2 * Copyright (C) 2008, 2011 Apple 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 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 ScrollBehaviorInstant, | 55 ScrollBehaviorInstant, |
| 56 ScrollBehaviorSmooth, | 56 ScrollBehaviorSmooth, |
| 57 }; | 57 }; |
| 58 | 58 |
| 59 enum IncludeScrollbarsInRect { | 59 enum IncludeScrollbarsInRect { |
| 60 ExcludeScrollbars, | 60 ExcludeScrollbars, |
| 61 IncludeScrollbars, | 61 IncludeScrollbars, |
| 62 }; | 62 }; |
| 63 | 63 |
| 64 #if ENABLE(OILPAN) | 64 #if ENABLE(OILPAN) |
| 65 // Oilpan: Using the transition type WillBeGarbageCollectedMixin is | 65 // Oilpan: Using the transition type GarbageCollectedMixin is |
| 66 // problematic non-Oilpan as the type expands to DummyBase, exporting it | 66 // problematic non-Oilpan as the type expands to DummyBase, exporting it |
| 67 // also from 'platform' as a result. Bringing about duplicate DummyBases | 67 // also from 'platform' as a result. Bringing about duplicate DummyBases |
| 68 // as core also exports same; with component build linking fails as a | 68 // as core also exports same; with component build linking fails as a |
| 69 // result. Hence the workaround of not using a transition type. | 69 // result. Hence the workaround of not using a transition type. |
| 70 class PLATFORM_EXPORT ScrollableArea : public GarbageCollectedMixin { | 70 class PLATFORM_EXPORT ScrollableArea : public GarbageCollectedMixin { |
| 71 #else | 71 #else |
| 72 class PLATFORM_EXPORT ScrollableArea { | 72 class PLATFORM_EXPORT ScrollableArea { |
| 73 #endif | 73 #endif |
| 74 WTF_MAKE_NONCOPYABLE(ScrollableArea); | 74 WTF_MAKE_NONCOPYABLE(ScrollableArea); |
| 75 public: | 75 public: |
| (...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 328 virtual void setScrollOffset(const DoublePoint& offset, ScrollType scrollTyp
e) | 328 virtual void setScrollOffset(const DoublePoint& offset, ScrollType scrollTyp
e) |
| 329 { | 329 { |
| 330 setScrollOffset(flooredIntPoint(offset), scrollType); | 330 setScrollOffset(flooredIntPoint(offset), scrollType); |
| 331 } | 331 } |
| 332 | 332 |
| 333 virtual int lineStep(ScrollbarOrientation) const; | 333 virtual int lineStep(ScrollbarOrientation) const; |
| 334 virtual int pageStep(ScrollbarOrientation) const; | 334 virtual int pageStep(ScrollbarOrientation) const; |
| 335 virtual int documentStep(ScrollbarOrientation) const; | 335 virtual int documentStep(ScrollbarOrientation) const; |
| 336 virtual float pixelStep(ScrollbarOrientation) const; | 336 virtual float pixelStep(ScrollbarOrientation) const; |
| 337 | 337 |
| 338 mutable OwnPtrWillBeMember<ScrollAnimatorBase> m_scrollAnimator; | 338 mutable Member<ScrollAnimatorBase> m_scrollAnimator; |
| 339 mutable OwnPtrWillBeMember<ProgrammaticScrollAnimator> m_programmaticScrollA
nimator; | 339 mutable Member<ProgrammaticScrollAnimator> m_programmaticScrollAnimator; |
| 340 | 340 |
| 341 unsigned m_inLiveResize : 1; | 341 unsigned m_inLiveResize : 1; |
| 342 | 342 |
| 343 unsigned m_scrollbarOverlayStyle : 2; // ScrollbarOverlayStyle | 343 unsigned m_scrollbarOverlayStyle : 2; // ScrollbarOverlayStyle |
| 344 | 344 |
| 345 unsigned m_scrollOriginChanged : 1; | 345 unsigned m_scrollOriginChanged : 1; |
| 346 | 346 |
| 347 unsigned m_horizontalScrollbarNeedsPaintInvalidation : 1; | 347 unsigned m_horizontalScrollbarNeedsPaintInvalidation : 1; |
| 348 unsigned m_verticalScrollbarNeedsPaintInvalidation : 1; | 348 unsigned m_verticalScrollbarNeedsPaintInvalidation : 1; |
| 349 unsigned m_scrollCornerNeedsPaintInvalidation : 1; | 349 unsigned m_scrollCornerNeedsPaintInvalidation : 1; |
| 350 | 350 |
| 351 // There are 8 possible combinations of writing mode and direction. Scroll o
rigin will be non-zero in the x or y axis | 351 // There are 8 possible combinations of writing mode and direction. Scroll o
rigin will be non-zero in the x or y axis |
| 352 // if there is any reversed direction or writing-mode. The combinations are: | 352 // if there is any reversed direction or writing-mode. The combinations are: |
| 353 // writing-mode / direction scrollOrigin.x() set scrollOrigin.y() set | 353 // writing-mode / direction scrollOrigin.x() set scrollOrigin.y() set |
| 354 // horizontal-tb / ltr NO NO | 354 // horizontal-tb / ltr NO NO |
| 355 // horizontal-tb / rtl YES NO | 355 // horizontal-tb / rtl YES NO |
| 356 // horizontal-bt / ltr NO YES | 356 // horizontal-bt / ltr NO YES |
| 357 // horizontal-bt / rtl YES YES | 357 // horizontal-bt / rtl YES YES |
| 358 // vertical-lr / ltr NO NO | 358 // vertical-lr / ltr NO NO |
| 359 // vertical-lr / rtl NO YES | 359 // vertical-lr / rtl NO YES |
| 360 // vertical-rl / ltr YES NO | 360 // vertical-rl / ltr YES NO |
| 361 // vertical-rl / rtl YES YES | 361 // vertical-rl / rtl YES YES |
| 362 IntPoint m_scrollOrigin; | 362 IntPoint m_scrollOrigin; |
| 363 }; | 363 }; |
| 364 | 364 |
| 365 } // namespace blink | 365 } // namespace blink |
| 366 | 366 |
| 367 #endif // ScrollableArea_h | 367 #endif // ScrollableArea_h |
| OLD | NEW |