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

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

Issue 12183027: Merge 141127 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 10 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
« no previous file with comments | « Source/WebCore/html/HTMLMediaElement.cpp ('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 Apple Inc. All rights reserved. 3 * Copyright (C) 2011, 2012 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 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 // direction is vertical growing left, then let writing-mode be 224 // direction is vertical growing left, then let writing-mode be
225 // 'vertical-rl'. Otherwise, the text track cue writing direction is 225 // 'vertical-rl'. Otherwise, the text track cue writing direction is
226 // vertical growing right; let writing-mode be 'vertical-lr'. 226 // vertical growing right; let writing-mode be 'vertical-lr'.
227 m_displayWritingModeMap[Horizontal] = CSSValueHorizontalTb; 227 m_displayWritingModeMap[Horizontal] = CSSValueHorizontalTb;
228 m_displayWritingModeMap[VerticalGrowingLeft] = CSSValueVerticalRl; 228 m_displayWritingModeMap[VerticalGrowingLeft] = CSSValueVerticalRl;
229 m_displayWritingModeMap[VerticalGrowingRight] = CSSValueVerticalLr; 229 m_displayWritingModeMap[VerticalGrowingRight] = CSSValueVerticalLr;
230 } 230 }
231 231
232 TextTrackCue::~TextTrackCue() 232 TextTrackCue::~TextTrackCue()
233 { 233 {
234 removeDisplayTree();
234 } 235 }
235 236
236 void TextTrackCue::cueWillChange() 237 void TextTrackCue::cueWillChange()
237 { 238 {
238 if (m_track) 239 if (m_track)
239 m_track->cueWillChange(this); 240 m_track->cueWillChange(this);
240 } 241 }
241 242
242 void TextTrackCue::cueDidChange() 243 void TextTrackCue::cueDidChange()
243 { 244 {
(...skipping 812 matching lines...) Expand 10 before | Expand all | Expand 10 after
1056 } 1057 }
1057 1058
1058 EventTargetData* TextTrackCue::ensureEventTargetData() 1059 EventTargetData* TextTrackCue::ensureEventTargetData()
1059 { 1060 {
1060 return &m_eventTargetData; 1061 return &m_eventTargetData;
1061 } 1062 }
1062 1063
1063 } // namespace WebCore 1064 } // namespace WebCore
1064 1065
1065 #endif 1066 #endif
OLDNEW
« no previous file with comments | « Source/WebCore/html/HTMLMediaElement.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698