Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(217)

Side by Side Diff: Source/core/html/track/TextTrackCue.cpp

Issue 16339006: Make sure to use CSSValueID and CSSPropertyID rather than integers. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 6 months 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/html/track/TextTrackCue.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * Copyright (C) 2011, 2012, 2013 Apple Inc. All rights reserved. 3 * Copyright (C) 2011, 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 1100 matching lines...) Expand 10 before | Expand all | Expand 10 after
1111 // writing direction is not horizontal, but cue's region identifier is not 1111 // writing direction is not horizontal, but cue's region identifier is not
1112 // the empty string, let cue's region identifier be the empty string. 1112 // the empty string, let cue's region identifier be the empty string.
1113 if (m_regionId.isEmpty()) 1113 if (m_regionId.isEmpty())
1114 return; 1114 return;
1115 1115
1116 if (m_linePosition != undefinedPosition || m_cueSize != 100 || m_writingDire ction != Horizontal) 1116 if (m_linePosition != undefinedPosition || m_cueSize != 100 || m_writingDire ction != Horizontal)
1117 m_regionId = emptyString(); 1117 m_regionId = emptyString();
1118 #endif 1118 #endif
1119 } 1119 }
1120 1120
1121 int TextTrackCue::getCSSWritingDirection() const 1121 CSSValueID TextTrackCue::getCSSWritingDirection() const
1122 { 1122 {
1123 return m_displayDirection; 1123 return m_displayDirection;
1124 } 1124 }
1125 1125
1126 int TextTrackCue::getCSSWritingMode() const 1126 CSSValueID TextTrackCue::getCSSWritingMode() const
1127 { 1127 {
1128 return m_displayWritingMode; 1128 return m_displayWritingMode;
1129 } 1129 }
1130 1130
1131 int TextTrackCue::getCSSSize() const 1131 int TextTrackCue::getCSSSize() const
1132 { 1132 {
1133 return m_displaySize; 1133 return m_displaySize;
1134 } 1134 }
1135 1135
1136 std::pair<double, double> TextTrackCue::getCSSPosition() const 1136 std::pair<double, double> TextTrackCue::getCSSPosition() const
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
1183 if (m_cueSize != cue.size()) 1183 if (m_cueSize != cue.size())
1184 return false; 1184 return false;
1185 if (align() != cue.align()) 1185 if (align() != cue.align())
1186 return false; 1186 return false;
1187 1187
1188 return true; 1188 return true;
1189 } 1189 }
1190 1190
1191 } // namespace WebCore 1191 } // namespace WebCore
1192 1192
OLDNEW
« no previous file with comments | « Source/core/html/track/TextTrackCue.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698