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

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

Issue 13674022: Remove MEDIA_SOURCE feature define. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@blink-master
Patch Set: Rebase Created 7 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
« no previous file with comments | « Source/WebCore/html/DOMURL.idl ('k') | Source/WebCore/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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 bool webkitHasClosedCaptions() const; 171 bool webkitHasClosedCaptions() const;
172 bool webkitClosedCaptionsVisible() const; 172 bool webkitClosedCaptionsVisible() const;
173 void setWebkitClosedCaptionsVisible(bool); 173 void setWebkitClosedCaptionsVisible(bool);
174 174
175 #if ENABLE(MEDIA_STATISTICS) 175 #if ENABLE(MEDIA_STATISTICS)
176 // Statistics 176 // Statistics
177 unsigned webkitAudioDecodedByteCount() const; 177 unsigned webkitAudioDecodedByteCount() const;
178 unsigned webkitVideoDecodedByteCount() const; 178 unsigned webkitVideoDecodedByteCount() const;
179 #endif 179 #endif
180 180
181 #if ENABLE(MEDIA_SOURCE)
182 // Media Source. 181 // Media Source.
183 void setSourceState(const String&); 182 void setSourceState(const String&);
184 #endif
185 183
186 #if ENABLE(ENCRYPTED_MEDIA) 184 #if ENABLE(ENCRYPTED_MEDIA)
187 void webkitGenerateKeyRequest(const String& keySystem, PassRefPtr<Uint8Array > initData, ExceptionCode&); 185 void webkitGenerateKeyRequest(const String& keySystem, PassRefPtr<Uint8Array > initData, ExceptionCode&);
188 void webkitGenerateKeyRequest(const String& keySystem, ExceptionCode&); 186 void webkitGenerateKeyRequest(const String& keySystem, ExceptionCode&);
189 void webkitAddKey(const String& keySystem, PassRefPtr<Uint8Array> key, PassR efPtr<Uint8Array> initData, const String& sessionId, ExceptionCode&); 187 void webkitAddKey(const String& keySystem, PassRefPtr<Uint8Array> key, PassR efPtr<Uint8Array> initData, const String& sessionId, ExceptionCode&);
190 void webkitAddKey(const String& keySystem, PassRefPtr<Uint8Array> key, Excep tionCode&); 188 void webkitAddKey(const String& keySystem, PassRefPtr<Uint8Array> key, Excep tionCode&);
191 void webkitCancelKeyRequest(const String& keySystem, const String& sessionId , ExceptionCode&); 189 void webkitCancelKeyRequest(const String& keySystem, const String& sessionId , ExceptionCode&);
192 190
193 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyadded); 191 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyadded);
194 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyerror); 192 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyerror);
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 BehaviorRestrictions m_restrictions; 634 BehaviorRestrictions m_restrictions;
637 635
638 MediaPlayer::Preload m_preload; 636 MediaPlayer::Preload m_preload;
639 637
640 DisplayMode m_displayMode; 638 DisplayMode m_displayMode;
641 639
642 // Counter incremented while processing a callback from the media player, so we can avoid 640 // Counter incremented while processing a callback from the media player, so we can avoid
643 // calling the media engine recursively. 641 // calling the media engine recursively.
644 int m_processingMediaPlayerCallback; 642 int m_processingMediaPlayerCallback;
645 643
646 #if ENABLE(MEDIA_SOURCE)
647 RefPtr<MediaSource> m_mediaSource; 644 RefPtr<MediaSource> m_mediaSource;
648 #endif
649 645
650 mutable float m_cachedTime; 646 mutable float m_cachedTime;
651 mutable double m_cachedTimeWallClockUpdateTime; 647 mutable double m_cachedTimeWallClockUpdateTime;
652 mutable double m_minimumWallClockTimeToCacheMediaTime; 648 mutable double m_minimumWallClockTimeToCacheMediaTime;
653 649
654 double m_fragmentStartTime; 650 double m_fragmentStartTime;
655 double m_fragmentEndTime; 651 double m_fragmentEndTime;
656 652
657 typedef unsigned PendingActionFlags; 653 typedef unsigned PendingActionFlags;
658 PendingActionFlags m_pendingActionFlags; 654 PendingActionFlags m_pendingActionFlags;
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
762 inline HTMLMediaElement* toMediaElement(Node* node) 758 inline HTMLMediaElement* toMediaElement(Node* node)
763 { 759 {
764 ASSERT_WITH_SECURITY_IMPLICATION(!node || isMediaElement(node)); 760 ASSERT_WITH_SECURITY_IMPLICATION(!node || isMediaElement(node));
765 return static_cast<HTMLMediaElement*>(node); 761 return static_cast<HTMLMediaElement*>(node);
766 } 762 }
767 763
768 } //namespace 764 } //namespace
769 765
770 #endif 766 #endif
771 #endif 767 #endif
OLDNEW
« no previous file with comments | « Source/WebCore/html/DOMURL.idl ('k') | Source/WebCore/html/HTMLMediaElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698