| 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 487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 498 TouchActionPanY = 0x4, | 498 TouchActionPanY = 0x4, |
| 499 TouchActionPinchZoom = 0x8, | 499 TouchActionPinchZoom = 0x8, |
| 500 }; | 500 }; |
| 501 inline TouchAction operator| (TouchAction a, TouchAction b) { return TouchAction
(int(a) | int(b)); } | 501 inline TouchAction operator| (TouchAction a, TouchAction b) { return TouchAction
(int(a) | int(b)); } |
| 502 inline TouchAction& operator|= (TouchAction& a, TouchAction b) { return a = a |
b; } | 502 inline TouchAction& operator|= (TouchAction& a, TouchAction b) { return a = a |
b; } |
| 503 inline TouchAction operator& (TouchAction a, TouchAction b) { return TouchAction
(int(a) & int(b)); } | 503 inline TouchAction operator& (TouchAction a, TouchAction b) { return TouchAction
(int(a) & int(b)); } |
| 504 inline TouchAction& operator&= (TouchAction& a, TouchAction b) { return a = a &
b; } | 504 inline TouchAction& operator&= (TouchAction& a, TouchAction b) { return a = a &
b; } |
| 505 | 505 |
| 506 enum EIsolation { IsolationAuto, IsolationIsolate }; | 506 enum EIsolation { IsolationAuto, IsolationIsolate }; |
| 507 | 507 |
| 508 enum ScrollBlocksOn { | |
| 509 ScrollBlocksOnNone = 0x0, | |
| 510 ScrollBlocksOnStartTouch = 0x1, | |
| 511 ScrollBlocksOnWheelEvent = 0x2, | |
| 512 ScrollBlocksOnScrollEvent = 0x4, | |
| 513 }; | |
| 514 inline ScrollBlocksOn operator| (ScrollBlocksOn a, ScrollBlocksOn b) { return Sc
rollBlocksOn(int(a) | int(b)); } | |
| 515 inline ScrollBlocksOn& operator|= (ScrollBlocksOn& a, ScrollBlocksOn b) { return
a = a | b; } | |
| 516 inline ScrollBlocksOn operator& (ScrollBlocksOn a, ScrollBlocksOn b) { return Sc
rollBlocksOn(int(a) & int(b)); } | |
| 517 inline ScrollBlocksOn& operator&= (ScrollBlocksOn& a, ScrollBlocksOn b) { return
a = a & b; } | |
| 518 | |
| 519 enum ItemPosition { | 508 enum ItemPosition { |
| 520 ItemPositionAuto, | 509 ItemPositionAuto, |
| 521 ItemPositionStretch, | 510 ItemPositionStretch, |
| 522 ItemPositionBaseline, | 511 ItemPositionBaseline, |
| 523 ItemPositionLastBaseline, | 512 ItemPositionLastBaseline, |
| 524 ItemPositionCenter, | 513 ItemPositionCenter, |
| 525 ItemPositionStart, | 514 ItemPositionStart, |
| 526 ItemPositionEnd, | 515 ItemPositionEnd, |
| 527 ItemPositionSelfStart, | 516 ItemPositionSelfStart, |
| 528 ItemPositionSelfEnd, | 517 ItemPositionSelfEnd, |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 568 static const float maximumAllowedFontSize = 1000000.0f; | 557 static const float maximumAllowedFontSize = 1000000.0f; |
| 569 | 558 |
| 570 enum TextIndentLine { TextIndentFirstLine, TextIndentEachLine }; | 559 enum TextIndentLine { TextIndentFirstLine, TextIndentEachLine }; |
| 571 enum TextIndentType { TextIndentNormal, TextIndentHanging }; | 560 enum TextIndentType { TextIndentNormal, TextIndentHanging }; |
| 572 | 561 |
| 573 enum CSSBoxType { BoxMissing = 0, MarginBox, BorderBox, PaddingBox, ContentBox }
; | 562 enum CSSBoxType { BoxMissing = 0, MarginBox, BorderBox, PaddingBox, ContentBox }
; |
| 574 | 563 |
| 575 } // namespace blink | 564 } // namespace blink |
| 576 | 565 |
| 577 #endif // RenderStyleConstants_h | 566 #endif // RenderStyleConstants_h |
| OLD | NEW |