Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2012, 2013 Apple Inc. All rights reserved. | 3 * Copyright (C) 2012, 2013 Apple Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 148 void removeDisplayTree(); | 148 void removeDisplayTree(); |
| 149 void markFutureAndPastNodes(ContainerNode*, double, double); | 149 void markFutureAndPastNodes(ContainerNode*, double, double); |
| 150 | 150 |
| 151 int calculateComputedLinePosition(); | 151 int calculateComputedLinePosition(); |
| 152 | 152 |
| 153 virtual const AtomicString& interfaceName() const; | 153 virtual const AtomicString& interfaceName() const; |
| 154 virtual ScriptExecutionContext* scriptExecutionContext() const; | 154 virtual ScriptExecutionContext* scriptExecutionContext() const; |
| 155 | 155 |
| 156 std::pair<double, double> getCSSPosition() const; | 156 std::pair<double, double> getCSSPosition() const; |
| 157 | 157 |
| 158 CSSValueID getCSSAlignment() const; | |
| 158 int getCSSSize() const; | 159 int getCSSSize() const; |
| 159 CSSValueID getCSSWritingDirection() const; | 160 CSSValueID getCSSWritingDirection() const; |
| 160 CSSValueID getCSSWritingMode() const; | 161 CSSValueID getCSSWritingMode() const; |
| 161 | 162 |
| 162 enum WritingDirection { | 163 enum WritingDirection { |
| 163 Horizontal, | 164 Horizontal, |
| 164 VerticalGrowingLeft, | 165 VerticalGrowingLeft, |
| 165 VerticalGrowingRight, | 166 VerticalGrowingRight, |
| 166 NumberOfWritingDirections | 167 NumberOfWritingDirections |
| 167 }; | 168 }; |
| 168 WritingDirection getWritingDirection() const { return m_writingDirection; } | 169 WritingDirection getWritingDirection() const { return m_writingDirection; } |
| 169 | 170 |
| 170 enum CueAlignment { | 171 enum CueAlignment { |
| 171 Start, | 172 Start, |
| 172 Middle, | 173 Middle, |
| 173 End | 174 End, |
| 175 Left, | |
| 176 Right, | |
| 177 NumberOfAlignments | |
| 174 }; | 178 }; |
| 175 CueAlignment getAlignment() const { return m_cueAlignment; } | 179 CueAlignment getAlignment() const { return m_cueAlignment; } |
| 176 | 180 |
| 177 virtual void videoSizeDidChange(const IntSize&) { } | 181 virtual void videoSizeDidChange(const IntSize&) { } |
| 178 | 182 |
| 179 virtual bool operator==(const TextTrackCue&) const; | 183 virtual bool operator==(const TextTrackCue&) const; |
| 180 virtual bool operator!=(const TextTrackCue& cue) const | 184 virtual bool operator!=(const TextTrackCue& cue) const |
| 181 { | 185 { |
| 182 return !(*this == cue); | 186 return !(*this == cue); |
| 183 } | 187 } |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 262 RefPtr<HTMLDivElement> m_cueBackgroundBox; | 266 RefPtr<HTMLDivElement> m_cueBackgroundBox; |
| 263 | 267 |
| 264 bool m_displayTreeShouldChange; | 268 bool m_displayTreeShouldChange; |
| 265 RefPtr<TextTrackCueBox> m_displayTree; | 269 RefPtr<TextTrackCueBox> m_displayTree; |
| 266 | 270 |
| 267 CSSValueID m_displayDirection; | 271 CSSValueID m_displayDirection; |
| 268 | 272 |
| 269 CSSValueID m_displayWritingModeMap[NumberOfWritingDirections]; | 273 CSSValueID m_displayWritingModeMap[NumberOfWritingDirections]; |
| 270 CSSValueID m_displayWritingMode; | 274 CSSValueID m_displayWritingMode; |
| 271 | 275 |
| 276 CSSValueID m_displayAlignmentMap[NumberOfAlignments]; | |
|
acolwell GONE FROM CHROMIUM
2013/10/04 17:26:41
nit: You should be able to make this static const
vcarbune.chromium
2013/10/07 09:37:28
Nice catch. Done.
| |
| 277 | |
| 272 int m_displaySize; | 278 int m_displaySize; |
| 273 | 279 |
| 274 std::pair<float, float> m_displayPosition; | 280 std::pair<float, float> m_displayPosition; |
| 275 #if ENABLE(WEBVTT_REGIONS) | 281 #if ENABLE(WEBVTT_REGIONS) |
| 276 String m_regionId; | 282 String m_regionId; |
| 277 #endif | 283 #endif |
| 278 }; | 284 }; |
| 279 | 285 |
| 280 } // namespace WebCore | 286 } // namespace WebCore |
| 281 | 287 |
| 282 #endif | 288 #endif |
| OLD | NEW |