Chromium Code Reviews| 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 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 478 TouchActionDoubleTapZoom = 0x20, | 478 TouchActionDoubleTapZoom = 0x20, |
| 479 TouchActionAuto = TouchActionManipulation | TouchActionDoubleTapZoom | 479 TouchActionAuto = TouchActionManipulation | TouchActionDoubleTapZoom |
| 480 }; | 480 }; |
| 481 inline TouchAction operator| (TouchAction a, TouchAction b) { return static_cast <TouchAction>(int(a) | int(b)); } | 481 inline TouchAction operator| (TouchAction a, TouchAction b) { return static_cast <TouchAction>(int(a) | int(b)); } |
| 482 inline TouchAction& operator|= (TouchAction& a, TouchAction b) { return a = a | b; } | 482 inline TouchAction& operator|= (TouchAction& a, TouchAction b) { return a = a | b; } |
| 483 inline TouchAction operator& (TouchAction a, TouchAction b) { return static_cast <TouchAction>(int(a) & int(b)); } | 483 inline TouchAction operator& (TouchAction a, TouchAction b) { return static_cast <TouchAction>(int(a) & int(b)); } |
| 484 inline TouchAction& operator&= (TouchAction& a, TouchAction b) { return a = a & b; } | 484 inline TouchAction& operator&= (TouchAction& a, TouchAction b) { return a = a & b; } |
| 485 | 485 |
| 486 enum EIsolation { IsolationAuto, IsolationIsolate }; | 486 enum EIsolation { IsolationAuto, IsolationIsolate }; |
| 487 | 487 |
| 488 static const size_t EContainBits = 3; | |
|
Timothy Loh
2015/12/02 02:49:47
I don't think the E prefix is the current style.
leviw_travelin_and_unemployed
2015/12/03 00:01:59
Changed. The style code is sadly quite inconsisten
| |
| 489 enum EContain { | |
| 490 ContainsNone = 0x0, | |
| 491 ContainsLayout = 0x1, | |
| 492 ContainsStyle = 0x2, | |
| 493 ContainsPaint = 0x4, | |
| 494 ContainsStrict = 0x7 | |
|
alancutter (OOO until 2018)
2015/12/02 02:48:17
I wonder if we're allowed to use 0b111.
leviw_travelin_and_unemployed
2015/12/03 00:02:00
I didn't try, but I changed it to ContainsStrict =
| |
| 495 }; | |
| 496 inline EContain operator| (EContain a, EContain b) { return EContain(int(a) | in t(b)); } | |
| 497 inline EContain& operator|= (EContain& a, EContain b) { return a = a | b; } | |
| 498 | |
| 488 enum ItemPosition { | 499 enum ItemPosition { |
| 489 ItemPositionAuto, | 500 ItemPositionAuto, |
| 490 ItemPositionStretch, | 501 ItemPositionStretch, |
| 491 ItemPositionBaseline, | 502 ItemPositionBaseline, |
| 492 ItemPositionLastBaseline, | 503 ItemPositionLastBaseline, |
| 493 ItemPositionCenter, | 504 ItemPositionCenter, |
| 494 ItemPositionStart, | 505 ItemPositionStart, |
| 495 ItemPositionEnd, | 506 ItemPositionEnd, |
| 496 ItemPositionSelfStart, | 507 ItemPositionSelfStart, |
| 497 ItemPositionSelfEnd, | 508 ItemPositionSelfEnd, |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 543 | 554 |
| 544 enum ScrollSnapType { | 555 enum ScrollSnapType { |
| 545 ScrollSnapTypeNone, | 556 ScrollSnapTypeNone, |
| 546 ScrollSnapTypeMandatory, | 557 ScrollSnapTypeMandatory, |
| 547 ScrollSnapTypeProximity | 558 ScrollSnapTypeProximity |
| 548 }; | 559 }; |
| 549 | 560 |
| 550 } // namespace blink | 561 } // namespace blink |
| 551 | 562 |
| 552 #endif // ComputedStyleConstants_h | 563 #endif // ComputedStyleConstants_h |
| OLD | NEW |