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

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

Issue 15178010: Remove ENABLE_ENCRYPTED_MEDIA #define as it's always enabled (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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/features.gypi ('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 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 bool webkitClosedCaptionsVisible() const; 148 bool webkitClosedCaptionsVisible() const;
149 void setWebkitClosedCaptionsVisible(bool); 149 void setWebkitClosedCaptionsVisible(bool);
150 150
151 // Statistics 151 // Statistics
152 unsigned webkitAudioDecodedByteCount() const; 152 unsigned webkitAudioDecodedByteCount() const;
153 unsigned webkitVideoDecodedByteCount() const; 153 unsigned webkitVideoDecodedByteCount() const;
154 154
155 // Media Source. 155 // Media Source.
156 void closeMediaSource(); 156 void closeMediaSource();
157 157
158 #if ENABLE(ENCRYPTED_MEDIA)
159 void webkitGenerateKeyRequest(const String& keySystem, PassRefPtr<Uint8Array > initData, ExceptionCode&); 158 void webkitGenerateKeyRequest(const String& keySystem, PassRefPtr<Uint8Array > initData, ExceptionCode&);
160 void webkitGenerateKeyRequest(const String& keySystem, ExceptionCode&); 159 void webkitGenerateKeyRequest(const String& keySystem, ExceptionCode&);
161 void webkitAddKey(const String& keySystem, PassRefPtr<Uint8Array> key, PassR efPtr<Uint8Array> initData, const String& sessionId, ExceptionCode&); 160 void webkitAddKey(const String& keySystem, PassRefPtr<Uint8Array> key, PassR efPtr<Uint8Array> initData, const String& sessionId, ExceptionCode&);
162 void webkitAddKey(const String& keySystem, PassRefPtr<Uint8Array> key, Excep tionCode&); 161 void webkitAddKey(const String& keySystem, PassRefPtr<Uint8Array> key, Excep tionCode&);
163 void webkitCancelKeyRequest(const String& keySystem, const String& sessionId , ExceptionCode&); 162 void webkitCancelKeyRequest(const String& keySystem, const String& sessionId , ExceptionCode&);
164 163
165 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyadded); 164 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyadded);
166 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyerror); 165 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyerror);
167 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeymessage); 166 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeymessage);
168 #endif
169 #if ENABLE(ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA_V2)
170 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitneedkey); 167 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitneedkey);
171 #endif
172 168
173 #if ENABLE(ENCRYPTED_MEDIA_V2) 169 #if ENABLE(ENCRYPTED_MEDIA_V2)
174 MediaKeys* mediaKeys() const { return m_mediaKeys.get(); } 170 MediaKeys* mediaKeys() const { return m_mediaKeys.get(); }
175 void setMediaKeys(MediaKeys*); 171 void setMediaKeys(MediaKeys*);
176 #endif 172 #endif
177 173
178 // controls 174 // controls
179 bool controls() const; 175 bool controls() const;
180 void setControls(bool); 176 void setControls(bool);
181 double volume() const; 177 double volume() const;
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 virtual void mediaPlayerResourceNotSupported(MediaPlayer*); 377 virtual void mediaPlayerResourceNotSupported(MediaPlayer*);
382 virtual void mediaPlayerRepaint(MediaPlayer*); 378 virtual void mediaPlayerRepaint(MediaPlayer*);
383 virtual void mediaPlayerSizeChanged(MediaPlayer*); 379 virtual void mediaPlayerSizeChanged(MediaPlayer*);
384 virtual bool mediaPlayerRenderingCanBeAccelerated(MediaPlayer*); 380 virtual bool mediaPlayerRenderingCanBeAccelerated(MediaPlayer*);
385 virtual void mediaPlayerRenderingModeChanged(MediaPlayer*); 381 virtual void mediaPlayerRenderingModeChanged(MediaPlayer*);
386 virtual void mediaPlayerEngineUpdated(MediaPlayer*); 382 virtual void mediaPlayerEngineUpdated(MediaPlayer*);
387 383
388 virtual void mediaPlayerFirstVideoFrameAvailable(MediaPlayer*); 384 virtual void mediaPlayerFirstVideoFrameAvailable(MediaPlayer*);
389 virtual void mediaPlayerCharacteristicChanged(MediaPlayer*); 385 virtual void mediaPlayerCharacteristicChanged(MediaPlayer*);
390 386
391 #if ENABLE(ENCRYPTED_MEDIA)
392 virtual void mediaPlayerKeyAdded(MediaPlayer*, const String& keySystem, cons t String& sessionId) OVERRIDE; 387 virtual void mediaPlayerKeyAdded(MediaPlayer*, const String& keySystem, cons t String& sessionId) OVERRIDE;
393 virtual void mediaPlayerKeyError(MediaPlayer*, const String& keySystem, cons t String& sessionId, MediaPlayerClient::MediaKeyErrorCode, unsigned short system Code) OVERRIDE; 388 virtual void mediaPlayerKeyError(MediaPlayer*, const String& keySystem, cons t String& sessionId, MediaPlayerClient::MediaKeyErrorCode, unsigned short system Code) OVERRIDE;
394 virtual void mediaPlayerKeyMessage(MediaPlayer*, const String& keySystem, co nst String& sessionId, const unsigned char* message, unsigned messageLength, con st KURL& defaultURL) OVERRIDE; 389 virtual void mediaPlayerKeyMessage(MediaPlayer*, const String& keySystem, co nst String& sessionId, const unsigned char* message, unsigned messageLength, con st KURL& defaultURL) OVERRIDE;
395 virtual bool mediaPlayerKeyNeeded(MediaPlayer*, const String& keySystem, con st String& sessionId, const unsigned char* initData, unsigned initDataLength) OV ERRIDE; 390 virtual bool mediaPlayerKeyNeeded(MediaPlayer*, const String& keySystem, con st String& sessionId, const unsigned char* initData, unsigned initDataLength) OV ERRIDE;
396 #endif
397 391
398 #if ENABLE(ENCRYPTED_MEDIA_V2) 392 #if ENABLE(ENCRYPTED_MEDIA_V2)
399 virtual bool mediaPlayerKeyNeeded(MediaPlayer*, Uint8Array*); 393 virtual bool mediaPlayerKeyNeeded(MediaPlayer*, Uint8Array*);
400 #endif 394 #endif
401 395
402 virtual String mediaPlayerReferrer() const OVERRIDE; 396 virtual String mediaPlayerReferrer() const OVERRIDE;
403 virtual String mediaPlayerUserAgent() const OVERRIDE; 397 virtual String mediaPlayerUserAgent() const OVERRIDE;
404 virtual CORSMode mediaPlayerCORSMode() const OVERRIDE; 398 virtual CORSMode mediaPlayerCORSMode() const OVERRIDE;
405 399
406 virtual void mediaPlayerEnterFullscreen() OVERRIDE; 400 virtual void mediaPlayerEnterFullscreen() OVERRIDE;
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
653 647
654 inline HTMLMediaElement* toMediaElement(Node* node) 648 inline HTMLMediaElement* toMediaElement(Node* node)
655 { 649 {
656 ASSERT_WITH_SECURITY_IMPLICATION(!node || isMediaElement(node)); 650 ASSERT_WITH_SECURITY_IMPLICATION(!node || isMediaElement(node));
657 return static_cast<HTMLMediaElement*>(node); 651 return static_cast<HTMLMediaElement*>(node);
658 } 652 }
659 653
660 } //namespace 654 } //namespace
661 655
662 #endif 656 #endif
OLDNEW
« no previous file with comments | « Source/core/features.gypi ('k') | Source/core/html/HTMLMediaElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698