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

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

Issue 14619016: Add WebKit prefix to MediaSource,SourceBuffer, and SourceBufferList objects. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 7 years, 7 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/DOMURL.idl ('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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 // captions 150 // captions
151 bool webkitHasClosedCaptions() const; 151 bool webkitHasClosedCaptions() const;
152 bool webkitClosedCaptionsVisible() const; 152 bool webkitClosedCaptionsVisible() const;
153 void setWebkitClosedCaptionsVisible(bool); 153 void setWebkitClosedCaptionsVisible(bool);
154 154
155 // Statistics 155 // Statistics
156 unsigned webkitAudioDecodedByteCount() const; 156 unsigned webkitAudioDecodedByteCount() const;
157 unsigned webkitVideoDecodedByteCount() const; 157 unsigned webkitVideoDecodedByteCount() const;
158 158
159 // Media Source. 159 // Media Source.
160 void setSourceState(const String&); 160 void closeMediaSource();
161 161
162 #if ENABLE(ENCRYPTED_MEDIA) 162 #if ENABLE(ENCRYPTED_MEDIA)
163 void webkitGenerateKeyRequest(const String& keySystem, PassRefPtr<Uint8Array > initData, ExceptionCode&); 163 void webkitGenerateKeyRequest(const String& keySystem, PassRefPtr<Uint8Array > initData, ExceptionCode&);
164 void webkitGenerateKeyRequest(const String& keySystem, ExceptionCode&); 164 void webkitGenerateKeyRequest(const String& keySystem, ExceptionCode&);
165 void webkitAddKey(const String& keySystem, PassRefPtr<Uint8Array> key, PassR efPtr<Uint8Array> initData, const String& sessionId, ExceptionCode&); 165 void webkitAddKey(const String& keySystem, PassRefPtr<Uint8Array> key, PassR efPtr<Uint8Array> initData, const String& sessionId, ExceptionCode&);
166 void webkitAddKey(const String& keySystem, PassRefPtr<Uint8Array> key, Excep tionCode&); 166 void webkitAddKey(const String& keySystem, PassRefPtr<Uint8Array> key, Excep tionCode&);
167 void webkitCancelKeyRequest(const String& keySystem, const String& sessionId , ExceptionCode&); 167 void webkitCancelKeyRequest(const String& keySystem, const String& sessionId , ExceptionCode&);
168 168
169 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyadded); 169 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyadded);
170 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyerror); 170 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyerror);
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 BehaviorRestrictions m_restrictions; 558 BehaviorRestrictions m_restrictions;
559 559
560 MediaPlayer::Preload m_preload; 560 MediaPlayer::Preload m_preload;
561 561
562 DisplayMode m_displayMode; 562 DisplayMode m_displayMode;
563 563
564 // Counter incremented while processing a callback from the media player, so we can avoid 564 // Counter incremented while processing a callback from the media player, so we can avoid
565 // calling the media engine recursively. 565 // calling the media engine recursively.
566 int m_processingMediaPlayerCallback; 566 int m_processingMediaPlayerCallback;
567 567
568 RefPtr<MediaSource> m_mediaSource; 568 RefPtr<WebKitMediaSource> m_mediaSource;
569 569
570 mutable double m_cachedTime; 570 mutable double m_cachedTime;
571 mutable double m_cachedTimeWallClockUpdateTime; 571 mutable double m_cachedTimeWallClockUpdateTime;
572 mutable double m_minimumWallClockTimeToCacheMediaTime; 572 mutable double m_minimumWallClockTimeToCacheMediaTime;
573 573
574 double m_fragmentStartTime; 574 double m_fragmentStartTime;
575 double m_fragmentEndTime; 575 double m_fragmentEndTime;
576 576
577 typedef unsigned PendingActionFlags; 577 typedef unsigned PendingActionFlags;
578 PendingActionFlags m_pendingActionFlags; 578 PendingActionFlags m_pendingActionFlags;
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
667 667
668 inline HTMLMediaElement* toMediaElement(Node* node) 668 inline HTMLMediaElement* toMediaElement(Node* node)
669 { 669 {
670 ASSERT_WITH_SECURITY_IMPLICATION(!node || isMediaElement(node)); 670 ASSERT_WITH_SECURITY_IMPLICATION(!node || isMediaElement(node));
671 return static_cast<HTMLMediaElement*>(node); 671 return static_cast<HTMLMediaElement*>(node);
672 } 672 }
673 673
674 } //namespace 674 } //namespace
675 675
676 #endif 676 #endif
OLDNEW
« no previous file with comments | « Source/core/html/DOMURL.idl ('k') | Source/core/html/HTMLMediaElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698