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