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

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

Issue 244493002: Oilpan: add transition types to track interface objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 8 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 return m_webTrack->textTrackIndex(); 84 return m_webTrack->textTrackIndex();
85 } 85 }
86 86
87 void InbandTextTrack::setTrackList(TextTrackList* trackList) 87 void InbandTextTrack::setTrackList(TextTrackList* trackList)
88 { 88 {
89 TextTrack::setTrackList(trackList); 89 TextTrack::setTrackList(trackList);
90 if (trackList) 90 if (trackList)
91 return; 91 return;
92 92
93 ASSERT(m_webTrack); 93 ASSERT(m_webTrack);
94 m_webTrack->setClient(0); 94 m_webTrack->setClient(0);
sof 2014/04/21 15:23:42 This is a problem - informing the platform that th
95 m_webTrack = 0; 95 m_webTrack = 0;
96 } 96 }
97 97
98 void InbandTextTrack::addWebVTTCue(double start, double end, const WebString& id , const WebString& content, const WebString& settings) 98 void InbandTextTrack::addWebVTTCue(double start, double end, const WebString& id , const WebString& content, const WebString& settings)
99 { 99 {
100 RefPtr<VTTCue> cue = VTTCue::create(document(), start, end, content); 100 RefPtrWillBeRawPtr<VTTCue> cue = VTTCue::create(document(), start, end, cont ent);
101 cue->setId(id); 101 cue->setId(id);
102 cue->parseSettings(settings); 102 cue->parseSettings(settings);
103 addCue(cue); 103 addCue(cue);
104 } 104 }
105 105
106 } // namespace WebCore 106 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698