| OLD | NEW |
|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CC_LAYERS_SCROLL_BLOCKS_ON_H_ | 5 #ifndef CC_LAYERS_SCROLL_BLOCKS_ON_H_ |
| 6 #define CC_LAYERS_SCROLL_BLOCKS_ON_H_ | 6 #define CC_LAYERS_SCROLL_BLOCKS_ON_H_ |
| 7 | 7 |
| 8 enum ScrollBlocksOn { | 8 enum ScrollBlocksOn { |
| 9 SCROLL_BLOCKS_ON_NONE = 0x0, | 9 ScrollBlocksOnNone = 0x0, |
| 10 SCROLL_BLOCKS_ON_START_TOUCH = 0x1, | 10 ScrollBlocksOnStartTouch = 0x1, |
| 11 SCROLL_BLOCKS_ON_WHEEL_EVENT = 0x2, | 11 ScrollBlocksOnWheelEvent = 0x2, |
| 12 SCROLL_BLOCKS_ON_SCROLL_EVENT = 0x4, | 12 ScrollBlocksOnScrollEvent = 0x4, |
| 13 SCROLL_BLOCKS_ON_MAX = SCROLL_BLOCKS_ON_START_TOUCH | | 13 ScrollBlocksOnMax = ScrollBlocksOnStartTouch | ScrollBlocksOnWheelEvent | |
| 14 SCROLL_BLOCKS_ON_WHEEL_EVENT | | 14 ScrollBlocksOnScrollEvent |
| 15 SCROLL_BLOCKS_ON_SCROLL_EVENT | |
| 16 }; | 15 }; |
| 17 | 16 |
| 18 inline ScrollBlocksOn operator|(ScrollBlocksOn a, ScrollBlocksOn b) { | 17 inline ScrollBlocksOn operator|(ScrollBlocksOn a, ScrollBlocksOn b) { |
| 19 return ScrollBlocksOn(static_cast<int>(a) | static_cast<int>(b)); | 18 return ScrollBlocksOn(static_cast<int>(a) | static_cast<int>(b)); |
| 20 } | 19 } |
| 21 | 20 |
| 22 inline ScrollBlocksOn& operator|=(ScrollBlocksOn& a, ScrollBlocksOn b) { | 21 inline ScrollBlocksOn& operator|=(ScrollBlocksOn& a, ScrollBlocksOn b) { |
| 23 return a = a | b; | 22 return a = a | b; |
| 24 } | 23 } |
| 25 | 24 |
| 26 #endif // CC_LAYERS_SCROLL_BLOCKS_ON_H_ | 25 #endif // CC_LAYERS_SCROLL_BLOCKS_ON_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 951673002:
Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" (Closed)
Base URL: git@github.com:domokit/mojo.git@master