| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright (c) 2010, Google Inc. All rights reserved. | 2 * Copyright (c) 2010, 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 virtual bool scroll(ScrollbarOrientation, ScrollGranularity, float step, flo
at delta); | 59 virtual bool scroll(ScrollbarOrientation, ScrollGranularity, float step, flo
at delta); |
| 60 | 60 |
| 61 virtual void scrollToOffsetWithoutAnimation(const FloatPoint&); | 61 virtual void scrollToOffsetWithoutAnimation(const FloatPoint&); |
| 62 | 62 |
| 63 ScrollableArea* scrollableArea() const { return m_scrollableArea; } | 63 ScrollableArea* scrollableArea() const { return m_scrollableArea; } |
| 64 | 64 |
| 65 virtual void setIsActive() { } | 65 virtual void setIsActive() { } |
| 66 | 66 |
| 67 virtual bool handleWheelEvent(const PlatformWheelEvent&); | 67 virtual bool handleWheelEvent(const PlatformWheelEvent&); |
| 68 | 68 |
| 69 #if OS(MACOSX) | |
| 70 virtual void handleWheelEventPhase(PlatformWheelEventPhase) { } | |
| 71 #endif | |
| 72 | |
| 73 void setCurrentPosition(const FloatPoint&); | 69 void setCurrentPosition(const FloatPoint&); |
| 74 FloatPoint currentPosition() const; | 70 FloatPoint currentPosition() const; |
| 75 | 71 |
| 76 virtual void cancelAnimations() { } | 72 virtual void cancelAnimations() { } |
| 77 virtual void serviceScrollAnimations() { } | 73 virtual void serviceScrollAnimations() { } |
| 78 | 74 |
| 79 virtual void mouseEnteredContentArea() const { } | 75 virtual void mouseEnteredContentArea() const { } |
| 80 virtual void mouseExitedContentArea() const { } | 76 virtual void mouseExitedContentArea() const { } |
| 81 virtual void mouseMovedInContentArea() const { } | 77 virtual void mouseMovedInContentArea() const { } |
| 82 virtual void mouseEnteredScrollbar(Scrollbar*) const { } | 78 virtual void mouseEnteredScrollbar(Scrollbar*) const { } |
| (...skipping 24 matching lines...) Expand all Loading... |
| 107 float m_currentPosX; // We avoid using a FloatPoint in order to reduce | 103 float m_currentPosX; // We avoid using a FloatPoint in order to reduce |
| 108 float m_currentPosY; // subclass code complexity. | 104 float m_currentPosY; // subclass code complexity. |
| 109 | 105 |
| 110 private: | 106 private: |
| 111 float clampScrollPosition(ScrollbarOrientation, float); | 107 float clampScrollPosition(ScrollbarOrientation, float); |
| 112 }; | 108 }; |
| 113 | 109 |
| 114 } // namespace blink | 110 } // namespace blink |
| 115 | 111 |
| 116 #endif // ScrollAnimator_h | 112 #endif // ScrollAnimator_h |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 709603006:
Remove a bunch of OS(MACOSX) code (Closed)
Base URL: git@github.com:domokit/mojo.git@master