cc/layers/scroll_blocks_on.h - Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/layers/scroll_blocks_on.h

Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: cc/layers/scroll_blocks_on.h

diff --git a/cc/layers/scroll_blocks_on.h b/cc/layers/scroll_blocks_on.h

index f41e7fdd20f42ba8efc2745f9be5d6507ca5111e..2447298664656994d7397effe2aa998eaa6006c0 100644

--- a/cc/layers/scroll_blocks_on.h

+++ b/cc/layers/scroll_blocks_on.h

@@ -6,13 +6,12 @@

#define CC_LAYERS_SCROLL_BLOCKS_ON_H_

enum ScrollBlocksOn {

- SCROLL_BLOCKS_ON_NONE = 0x0,

- SCROLL_BLOCKS_ON_START_TOUCH = 0x1,

- SCROLL_BLOCKS_ON_WHEEL_EVENT = 0x2,

- SCROLL_BLOCKS_ON_SCROLL_EVENT = 0x4,

- SCROLL_BLOCKS_ON_MAX = SCROLL_BLOCKS_ON_START_TOUCH |

- SCROLL_BLOCKS_ON_WHEEL_EVENT |

- SCROLL_BLOCKS_ON_SCROLL_EVENT

+ ScrollBlocksOnNone = 0x0,

+ ScrollBlocksOnStartTouch = 0x1,

+ ScrollBlocksOnWheelEvent = 0x2,

+ ScrollBlocksOnScrollEvent = 0x4,

+ ScrollBlocksOnMax = ScrollBlocksOnStartTouch | ScrollBlocksOnWheelEvent |

+ ScrollBlocksOnScrollEvent

};

inline ScrollBlocksOn operator|(ScrollBlocksOn a, ScrollBlocksOn b) {

« no previous file with comments | « cc/layers/picture_layer_impl_unittest.cc ('k') | cc/layers/scrollbar_layer_unittest.cc » ('j') | no next file with comments »