third_party/WebKit/Source/core/html/track/TextTrack.h - Issue 1740483004: Rename enums/functions that collide in chromium style in core/html/.

Side by Side Diff: third_party/WebKit/Source/core/html/track/TextTrack.h

Issue 1740483004: Rename enums/functions that collide in chromium style in core/html/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-5

Patch Set: get-names-6: . Created 4 years, 9 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 | « third_party/WebKit/Source/core/html/track/LoadableTextTrack.cpp ('k') | third_party/WebKit/Source/core/html/track/TextTrack.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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	6 * modification, are permitted provided that the following conditions

7 * are met:	7 * are met:

8 * 1. Redistributions of source code must retain the above copyright	8 * 1. Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * 2. Redistributions in binary form must reproduce the above copyright	10 * 2. Redistributions in binary form must reproduce the above copyright

(...skipping 58 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
69 static bool isValidKindKeyword(const String&);	69 static bool isValidKindKeyword(const String&);

70	70

71 static const AtomicString& disabledKeyword();	71 static const AtomicString& disabledKeyword();

72 static const AtomicString& hiddenKeyword();	72 static const AtomicString& hiddenKeyword();

73 static const AtomicString& showingKeyword();	73 static const AtomicString& showingKeyword();

74	74

75 AtomicString mode() const { return m_mode; }	75 AtomicString mode() const { return m_mode; }

76 virtual void setMode(const AtomicString&);	76 virtual void setMode(const AtomicString&);

77	77

78 enum ReadinessState { NotLoaded = 0, Loading = 1, Loaded = 2, FailedToLoad = 3 };	78 enum ReadinessState { NotLoaded = 0, Loading = 1, Loaded = 2, FailedToLoad = 3 };

79 ReadinessState readinessState() const { return m_readinessState; }	79 ReadinessState getReadinessState() const { return m_readinessState; }

80 void setReadinessState(ReadinessState state) { m_readinessState = state; }	80 void setReadinessState(ReadinessState state) { m_readinessState = state; }

81	81

82 TextTrackCueList* cues();	82 TextTrackCueList* cues();

83 TextTrackCueList* activeCues();	83 TextTrackCueList* activeCues();

84	84

85 HTMLMediaElement* mediaElement() const;	85 HTMLMediaElement* mediaElement() const;

86 Node* owner() const;	86 Node* owner() const;

87	87

88 void addCue(TextTrackCue*);	88 void addCue(TextTrackCue*);

89 void removeCue(TextTrackCue*, ExceptionState&);	89 void removeCue(TextTrackCue*, ExceptionState&);

(...skipping 54 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
144 int m_trackIndex;	144 int m_trackIndex;

145 int m_renderedTrackIndex;	145 int m_renderedTrackIndex;

146 bool m_hasBeenConfigured;	146 bool m_hasBeenConfigured;

147 };	147 };

148	148

149 DEFINE_TRACK_TYPE_CASTS(TextTrack, TrackBase::TextTrack);	149 DEFINE_TRACK_TYPE_CASTS(TextTrack, TrackBase::TextTrack);

150	150

151 } // namespace blink	151 } // namespace blink

152	152

153 #endif // TextTrack_h	153 #endif // TextTrack_h

OLD	NEW