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

Side by Side Diff: third_party/WebKit/Source/core/html/HTMLMediaElement.idl

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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2010, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2010, 2011, 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 readonly attribute TimeRanges buffered; 48 readonly attribute TimeRanges buffered;
49 void load(); 49 void load();
50 CanPlayTypeResult canPlayType(DOMString type); 50 CanPlayTypeResult canPlayType(DOMString type);
51 51
52 // ready state 52 // ready state
53 const unsigned short HAVE_NOTHING = 0; 53 const unsigned short HAVE_NOTHING = 0;
54 const unsigned short HAVE_METADATA = 1; 54 const unsigned short HAVE_METADATA = 1;
55 const unsigned short HAVE_CURRENT_DATA = 2; 55 const unsigned short HAVE_CURRENT_DATA = 2;
56 const unsigned short HAVE_FUTURE_DATA = 3; 56 const unsigned short HAVE_FUTURE_DATA = 3;
57 const unsigned short HAVE_ENOUGH_DATA = 4; 57 const unsigned short HAVE_ENOUGH_DATA = 4;
58 readonly attribute unsigned short readyState; 58 [ImplementedAs=getReadyState] readonly attribute unsigned short readyState;
59 readonly attribute boolean seeking; 59 readonly attribute boolean seeking;
60 60
61 // playback state 61 // playback state
62 attribute double currentTime; 62 attribute double currentTime;
63 // FIXME: void fastSeek(double time); 63 // FIXME: void fastSeek(double time);
64 readonly attribute unrestricted double duration; 64 readonly attribute unrestricted double duration;
65 // FIXME: Date getStartDate(); crbug.com/312699 65 // FIXME: Date getStartDate(); crbug.com/312699
66 readonly attribute boolean paused; 66 readonly attribute boolean paused;
67 attribute double defaultPlaybackRate; 67 attribute double defaultPlaybackRate;
68 attribute double playbackRate; 68 attribute double playbackRate;
(...skipping 15 matching lines...) Expand all
84 [SameObject, RuntimeEnabled=AudioVideoTracks] readonly attribute AudioTrackL ist audioTracks; 84 [SameObject, RuntimeEnabled=AudioVideoTracks] readonly attribute AudioTrackL ist audioTracks;
85 [SameObject, RuntimeEnabled=AudioVideoTracks] readonly attribute VideoTrackL ist videoTracks; 85 [SameObject, RuntimeEnabled=AudioVideoTracks] readonly attribute VideoTrackL ist videoTracks;
86 [SameObject] readonly attribute TextTrackList textTracks; 86 [SameObject] readonly attribute TextTrackList textTracks;
87 [RaisesException] TextTrack addTextTrack(TextTrackKind kind, optional DOMStr ing label = "", optional DOMString language = ""); 87 [RaisesException] TextTrack addTextTrack(TextTrackKind kind, optional DOMStr ing label = "", optional DOMString language = "");
88 88
89 // Non-standard APIs 89 // Non-standard APIs
90 // The number of bytes consumed by the media decoder. 90 // The number of bytes consumed by the media decoder.
91 [MeasureAs=PrefixedAudioDecodedByteCount] readonly attribute unsigned long w ebkitAudioDecodedByteCount; 91 [MeasureAs=PrefixedAudioDecodedByteCount] readonly attribute unsigned long w ebkitAudioDecodedByteCount;
92 [MeasureAs=PrefixedVideoDecodedByteCount] readonly attribute unsigned long w ebkitVideoDecodedByteCount; 92 [MeasureAs=PrefixedVideoDecodedByteCount] readonly attribute unsigned long w ebkitVideoDecodedByteCount;
93 }; 93 };
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLMediaElement.cpp ('k') | third_party/WebKit/Source/core/html/HTMLTrackElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698