third_party/WebKit/Source/core/style/ComputedStyleConstants.h - Issue 1422513006: Simplify TouchAction enum to be a simple bit flag

Side by Side Diff: third_party/WebKit/Source/core/style/ComputedStyleConstants.h

Issue 1422513006: Simplify TouchAction enum to be a simple bit flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix windows build warning Created 5 years, 1 month ago

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

Jump to:

View unified diff | Download patch

« content/common/input/touch_action.h ('K') | « third_party/WebKit/Source/core/input/TouchActionUtil.cpp ('k') | third_party/WebKit/Source/web/AssertMatchingEnums.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)	2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)

3 * (C) 2000 Antti Koivisto (koivisto@kde.org)	3 * (C) 2000 Antti Koivisto (koivisto@kde.org)

4 * (C) 2000 Dirk Mueller (mueller@kde.org)	4 * (C) 2000 Dirk Mueller (mueller@kde.org)

5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.	5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.

6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)	6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)

7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)	7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)

8 *	8 *

9 * This library is free software; you can redistribute it and/or	9 * This library is free software; you can redistribute it and/or

10 * modify it under the terms of the GNU Library General Public	10 * modify it under the terms of the GNU Library General Public

(...skipping 445 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
456 AutoFlowRow = InternalAutoFlowAlgorithmSparse \| InternalAutoFlowDirectionRow ,	456 AutoFlowRow = InternalAutoFlowAlgorithmSparse \| InternalAutoFlowDirectionRow ,

457 AutoFlowColumn = InternalAutoFlowAlgorithmSparse \| InternalAutoFlowDirection Column,	457 AutoFlowColumn = InternalAutoFlowAlgorithmSparse \| InternalAutoFlowDirection Column,

458 AutoFlowRowDense = InternalAutoFlowAlgorithmDense \| InternalAutoFlowDirectio nRow,	458 AutoFlowRowDense = InternalAutoFlowAlgorithmDense \| InternalAutoFlowDirectio nRow,

459 AutoFlowColumnDense = InternalAutoFlowAlgorithmDense \| InternalAutoFlowDirec tionColumn	459 AutoFlowColumnDense = InternalAutoFlowAlgorithmDense \| InternalAutoFlowDirec tionColumn

460 };	460 };

461	461

462 enum DraggableRegionMode { DraggableRegionNone, DraggableRegionDrag, DraggableRe gionNoDrag };	462 enum DraggableRegionMode { DraggableRegionNone, DraggableRegionDrag, DraggableRe gionNoDrag };

463	463

464 static const size_t TouchActionBits = 6;	464 static const size_t TouchActionBits = 6;

465 enum TouchAction {	465 enum TouchAction {

466 TouchActionAuto = 0x0,	466 TouchActionNone = 0x0,

467 TouchActionNone = 0x1,	467 TouchActionPanLeft = 0x1,

468 TouchActionPanLeft = 0x2,	468 TouchActionPanRight = 0x2,

469 TouchActionPanRight = 0x4,

470 TouchActionPanX = TouchActionPanLeft \| TouchActionPanRight,	469 TouchActionPanX = TouchActionPanLeft \| TouchActionPanRight,

471 TouchActionPanUp = 0x8,	470 TouchActionPanUp = 0x4,

472 TouchActionPanDown = 0x10,	471 TouchActionPanDown = 0x8,

473 TouchActionPanY = TouchActionPanUp \| TouchActionPanDown,	472 TouchActionPanY = TouchActionPanUp \| TouchActionPanDown,

474 TouchActionPinchZoom = 0x20,	473 TouchActionPan = TouchActionPanX \| TouchActionPanY,

	474 TouchActionPinchZoom = 0x10,

	475 TouchActionManipulation = TouchActionPan \| TouchActionPinchZoom,

	476 TouchActionDoubleTapZoom = 0x20,

	477 TouchActionAuto = TouchActionManipulation \| TouchActionDoubleTapZoom

475 };	478 };

476 inline TouchAction operator\| (TouchAction a, TouchAction b) { return TouchAction (int(a) \| int(b)); }	479 inline TouchAction operator\| (TouchAction a, TouchAction b) { return TouchAction (int(a) \| int(b)); }

477 inline TouchAction& operator\|= (TouchAction& a, TouchAction b) { return a = a \| b; }	480 inline TouchAction& operator\|= (TouchAction& a, TouchAction b) { return a = a \| b; }

478 inline TouchAction operator& (TouchAction a, TouchAction b) { return TouchAction (int(a) & int(b)); }	481 inline TouchAction operator& (TouchAction a, TouchAction b) { return TouchAction (int(a) & int(b)); }

479 inline TouchAction& operator&= (TouchAction& a, TouchAction b) { return a = a & b; }	482 inline TouchAction& operator&= (TouchAction& a, TouchAction b) { return a = a & b; }

480	483

481 enum EIsolation { IsolationAuto, IsolationIsolate };	484 enum EIsolation { IsolationAuto, IsolationIsolate };

482	485

483 enum ItemPosition {	486 enum ItemPosition {

484 ItemPositionAuto,	487 ItemPositionAuto,

(...skipping 53 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
538	541

539 enum ScrollSnapType {	542 enum ScrollSnapType {

540 ScrollSnapTypeNone,	543 ScrollSnapTypeNone,

541 ScrollSnapTypeMandatory,	544 ScrollSnapTypeMandatory,

542 ScrollSnapTypeProximity	545 ScrollSnapTypeProximity

543 };	546 };

544	547

545 } // namespace blink	548 } // namespace blink

546	549

547 #endif // ComputedStyleConstants_h	550 #endif // ComputedStyleConstants_h

OLD	NEW