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

Side by Side Diff: Source/core/html/HTMLMediaElement.h

Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final rebase Created 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/html/HTMLLinkElement.cpp ('k') | Source/core/html/HTMLMediaElement.cpp » ('j') | 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) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 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 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 197
198 virtual void mediaPlayerDidAddTrack(blink::WebInbandTextTrack*) OVERRIDE FIN AL; 198 virtual void mediaPlayerDidAddTrack(blink::WebInbandTextTrack*) OVERRIDE FIN AL;
199 virtual void mediaPlayerDidRemoveTrack(blink::WebInbandTextTrack*) OVERRIDE FINAL; 199 virtual void mediaPlayerDidRemoveTrack(blink::WebInbandTextTrack*) OVERRIDE FINAL;
200 // FIXME: Remove this when WebMediaPlayerClientImpl::loadInternal does not d epend on it. 200 // FIXME: Remove this when WebMediaPlayerClientImpl::loadInternal does not d epend on it.
201 virtual KURL mediaPlayerPosterURL() OVERRIDE { return KURL(); } 201 virtual KURL mediaPlayerPosterURL() OVERRIDE { return KURL(); }
202 202
203 struct TrackGroup { 203 struct TrackGroup {
204 enum GroupKind { CaptionsAndSubtitles, Description, Chapter, Metadata, O ther }; 204 enum GroupKind { CaptionsAndSubtitles, Description, Chapter, Metadata, O ther };
205 205
206 TrackGroup(GroupKind kind) 206 TrackGroup(GroupKind kind)
207 : visibleTrack(0) 207 : visibleTrack(nullptr)
208 , defaultTrack(0) 208 , defaultTrack(nullptr)
209 , kind(kind) 209 , kind(kind)
210 , hasSrcLang(false) 210 , hasSrcLang(false)
211 { 211 {
212 } 212 }
213 213
214 Vector<RefPtr<TextTrack> > tracks; 214 Vector<RefPtr<TextTrack> > tracks;
215 RefPtr<TextTrack> visibleTrack; 215 RefPtr<TextTrack> visibleTrack;
216 RefPtr<TextTrack> defaultTrack; 216 RefPtr<TextTrack> defaultTrack;
217 GroupKind kind; 217 GroupKind kind;
218 bool hasSrcLang; 218 bool hasSrcLang;
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 inline bool isHTMLMediaElement(const Node& node) 595 inline bool isHTMLMediaElement(const Node& node)
596 { 596 {
597 return node.isElementNode() && toElement(node).isMediaElement(); 597 return node.isElementNode() && toElement(node).isMediaElement();
598 } 598 }
599 599
600 DEFINE_NODE_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 600 DEFINE_NODE_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
601 601
602 } //namespace 602 } //namespace
603 603
604 #endif 604 #endif
OLDNEW
« no previous file with comments | « Source/core/html/HTMLLinkElement.cpp ('k') | Source/core/html/HTMLMediaElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698