| OLD | NEW | 
| (Empty) |  | 
 |   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 | 
 |   3 // found in the LICENSE file. | 
 |   4  | 
 |   5 #ifndef CC_LAYERS_SCROLL_BLOCKS_ON_H_ | 
 |   6 #define CC_LAYERS_SCROLL_BLOCKS_ON_H_ | 
 |   7  | 
 |   8 enum ScrollBlocksOn { | 
 |   9   ScrollBlocksOnNone = 0x0, | 
 |  10   ScrollBlocksOnStartTouch = 0x1, | 
 |  11   ScrollBlocksOnWheelEvent = 0x2, | 
 |  12   ScrollBlocksOnScrollEvent = 0x4, | 
 |  13   ScrollBlocksOnMax = ScrollBlocksOnStartTouch | ScrollBlocksOnWheelEvent | | 
 |  14                       ScrollBlocksOnScrollEvent | 
 |  15 }; | 
 |  16  | 
 |  17 inline ScrollBlocksOn operator|(ScrollBlocksOn a, ScrollBlocksOn b) { | 
 |  18   return ScrollBlocksOn(static_cast<int>(a) | static_cast<int>(b)); | 
 |  19 } | 
 |  20  | 
 |  21 inline ScrollBlocksOn& operator|=(ScrollBlocksOn& a, ScrollBlocksOn b) { | 
 |  22   return a = a | b; | 
 |  23 } | 
 |  24  | 
 |  25 #endif  // CC_LAYERS_SCROLL_BLOCKS_ON_H_ | 
| OLD | NEW |