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

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

Issue 48273013: Move MediaPlayer, IntSizeHash to platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Adapt patch to already moved ContentDecryption files Created 7 years, 1 month 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 10 matching lines...) Expand all
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "core/html/track/InbandTextTrack.h" 27 #include "core/html/track/InbandTextTrack.h"
28 28
29 #include "bindings/v8/ExceptionStatePlaceholder.h" 29 #include "bindings/v8/ExceptionStatePlaceholder.h"
30 #include "core/html/track/TextTrackCue.h" 30 #include "core/html/track/TextTrackCue.h"
31 #include "core/platform/graphics/InbandTextTrackPrivate.h"
32 #include "platform/Logging.h" 31 #include "platform/Logging.h"
32 #include "platform/graphics/media/InbandTextTrackPrivate.h"
33 #include "wtf/UnusedParam.h" 33 #include "wtf/UnusedParam.h"
34 #include <math.h> 34 #include <math.h>
35 35
36 namespace WebCore { 36 namespace WebCore {
37 37
38 PassRefPtr<InbandTextTrack> InbandTextTrack::create(Document& document, TextTrac kClient* client, PassRefPtr<InbandTextTrackPrivate> playerPrivate) 38 PassRefPtr<InbandTextTrack> InbandTextTrack::create(Document& document, TextTrac kClient* client, PassRefPtr<InbandTextTrackPrivate> playerPrivate)
39 { 39 {
40 return adoptRef(new InbandTextTrack(document, client, playerPrivate)); 40 return adoptRef(new InbandTextTrack(document, client, playerPrivate));
41 } 41 }
42 42
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 cue->setId(id); 146 cue->setId(id);
147 cue->setCueSettings(settings); 147 cue->setCueSettings(settings);
148 148
149 if (hasCue(cue.get())) 149 if (hasCue(cue.get()))
150 return; 150 return;
151 151
152 addCue(cue); 152 addCue(cue);
153 } 153 }
154 154
155 } // namespace WebCore 155 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/html/track/InbandTextTrack.h ('k') | Source/core/platform/graphics/InbandTextTrackPrivate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698