Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 140 virtual void pause() OVERRIDE FINAL; | 140 virtual void pause() OVERRIDE FINAL; |
| 141 | 141 |
| 142 // statistics | 142 // statistics |
| 143 unsigned webkitAudioDecodedByteCount() const; | 143 unsigned webkitAudioDecodedByteCount() const; |
| 144 unsigned webkitVideoDecodedByteCount() const; | 144 unsigned webkitVideoDecodedByteCount() const; |
| 145 | 145 |
| 146 // media source extensions | 146 // media source extensions |
| 147 void closeMediaSource(); | 147 void closeMediaSource(); |
| 148 void durationChanged(double duration); | 148 void durationChanged(double duration); |
| 149 | 149 |
| 150 // encrypted media extensions | 150 // encrypted media extensions (prefixed) |
|
xhwang
2014/01/13 18:42:40
s/prefixed/v0.1b/ ?
jrummell
2014/01/13 19:01:32
Done.
| |
| 151 void webkitGenerateKeyRequest(const String& keySystem, PassRefPtr<Uint8Array > initData, ExceptionState&); | 151 void webkitGenerateKeyRequest(const String& keySystem, PassRefPtr<Uint8Array > initData, ExceptionState&); |
| 152 void webkitGenerateKeyRequest(const String& keySystem, ExceptionState&); | 152 void webkitGenerateKeyRequest(const String& keySystem, ExceptionState&); |
| 153 void webkitAddKey(const String& keySystem, PassRefPtr<Uint8Array> key, PassR efPtr<Uint8Array> initData, const String& sessionId, ExceptionState&); | 153 void webkitAddKey(const String& keySystem, PassRefPtr<Uint8Array> key, PassR efPtr<Uint8Array> initData, const String& sessionId, ExceptionState&); |
| 154 void webkitAddKey(const String& keySystem, PassRefPtr<Uint8Array> key, Excep tionState&); | 154 void webkitAddKey(const String& keySystem, PassRefPtr<Uint8Array> key, Excep tionState&); |
| 155 void webkitCancelKeyRequest(const String& keySystem, const String& sessionId , ExceptionState&); | 155 void webkitCancelKeyRequest(const String& keySystem, const String& sessionId , ExceptionState&); |
| 156 | 156 |
| 157 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyadded); | 157 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyadded); |
| 158 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyerror); | 158 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyerror); |
| 159 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeymessage); | 159 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeymessage); |
| 160 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitneedkey); | 160 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitneedkey); |
| 161 | 161 |
| 162 // encrypted media extensions (non-prefixed) | |
|
xhwang
2014/01/13 18:42:40
s/non-prefixed/WD/ ?
jrummell
2014/01/13 19:01:32
Done.
| |
| 162 MediaKeys* mediaKeys() const { return m_mediaKeys.get(); } | 163 MediaKeys* mediaKeys() const { return m_mediaKeys.get(); } |
| 163 void setMediaKeys(MediaKeys*); | 164 void setMediaKeys(MediaKeys*); |
| 165 DEFINE_ATTRIBUTE_EVENT_LISTENER(needkey); | |
| 164 | 166 |
| 165 // controls | 167 // controls |
| 166 bool controls() const; | 168 bool controls() const; |
| 167 void setControls(bool); | 169 void setControls(bool); |
| 168 virtual double volume() const OVERRIDE FINAL; | 170 virtual double volume() const OVERRIDE FINAL; |
| 169 virtual void setVolume(double, ExceptionState&) OVERRIDE FINAL; | 171 virtual void setVolume(double, ExceptionState&) OVERRIDE FINAL; |
| 170 virtual bool muted() const OVERRIDE FINAL; | 172 virtual bool muted() const OVERRIDE FINAL; |
| 171 virtual void setMuted(bool) OVERRIDE FINAL; | 173 virtual void setMuted(bool) OVERRIDE FINAL; |
| 172 | 174 |
| 173 void togglePlayState(); | 175 void togglePlayState(); |
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 351 virtual void mediaPlayerDurationChanged() OVERRIDE FINAL; | 353 virtual void mediaPlayerDurationChanged() OVERRIDE FINAL; |
| 352 virtual void mediaPlayerPlaybackStateChanged() OVERRIDE FINAL; | 354 virtual void mediaPlayerPlaybackStateChanged() OVERRIDE FINAL; |
| 353 virtual void mediaPlayerRequestFullscreen() OVERRIDE FINAL; | 355 virtual void mediaPlayerRequestFullscreen() OVERRIDE FINAL; |
| 354 virtual void mediaPlayerRequestSeek(double) OVERRIDE FINAL; | 356 virtual void mediaPlayerRequestSeek(double) OVERRIDE FINAL; |
| 355 virtual void mediaPlayerRepaint() OVERRIDE FINAL; | 357 virtual void mediaPlayerRepaint() OVERRIDE FINAL; |
| 356 virtual void mediaPlayerSizeChanged() OVERRIDE FINAL; | 358 virtual void mediaPlayerSizeChanged() OVERRIDE FINAL; |
| 357 | 359 |
| 358 virtual void mediaPlayerKeyAdded(const String& keySystem, const String& sess ionId) OVERRIDE FINAL; | 360 virtual void mediaPlayerKeyAdded(const String& keySystem, const String& sess ionId) OVERRIDE FINAL; |
| 359 virtual void mediaPlayerKeyError(const String& keySystem, const String& sess ionId, MediaPlayerClient::MediaKeyErrorCode, unsigned short systemCode) OVERRIDE FINAL; | 361 virtual void mediaPlayerKeyError(const String& keySystem, const String& sess ionId, MediaPlayerClient::MediaKeyErrorCode, unsigned short systemCode) OVERRIDE FINAL; |
| 360 virtual void mediaPlayerKeyMessage(const String& keySystem, const String& se ssionId, const unsigned char* message, unsigned messageLength, const KURL& defau ltURL) OVERRIDE FINAL; | 362 virtual void mediaPlayerKeyMessage(const String& keySystem, const String& se ssionId, const unsigned char* message, unsigned messageLength, const KURL& defau ltURL) OVERRIDE FINAL; |
| 361 virtual bool mediaPlayerKeyNeeded(const String& keySystem, const String& ses sionId, const unsigned char* initData, unsigned initDataLength) OVERRIDE FINAL; | 363 virtual bool mediaPlayerKeyNeeded(const String& contentType, const unsigned char* initData, unsigned initDataLength) OVERRIDE FINAL; |
| 362 virtual bool mediaPlayerKeyNeeded(Uint8Array*) OVERRIDE FINAL; | |
| 363 | 364 |
| 364 virtual CORSMode mediaPlayerCORSMode() const OVERRIDE FINAL; | 365 virtual CORSMode mediaPlayerCORSMode() const OVERRIDE FINAL; |
| 365 | 366 |
| 366 virtual void mediaPlayerSetWebLayer(blink::WebLayer*) OVERRIDE FINAL; | 367 virtual void mediaPlayerSetWebLayer(blink::WebLayer*) OVERRIDE FINAL; |
| 367 virtual void mediaPlayerSetOpaque(bool) OVERRIDE FINAL; | 368 virtual void mediaPlayerSetOpaque(bool) OVERRIDE FINAL; |
| 368 virtual void mediaPlayerMediaSourceOpened(blink::WebMediaSource*) OVERRIDE F INAL; | 369 virtual void mediaPlayerMediaSourceOpened(blink::WebMediaSource*) OVERRIDE F INAL; |
| 369 | 370 |
| 370 void loadTimerFired(Timer<HTMLMediaElement>*); | 371 void loadTimerFired(Timer<HTMLMediaElement>*); |
| 371 void progressEventTimerFired(Timer<HTMLMediaElement>*); | 372 void progressEventTimerFired(Timer<HTMLMediaElement>*); |
| 372 void playbackProgressTimerFired(Timer<HTMLMediaElement>*); | 373 void playbackProgressTimerFired(Timer<HTMLMediaElement>*); |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 586 inline bool isHTMLMediaElement(const Node& node) | 587 inline bool isHTMLMediaElement(const Node& node) |
| 587 { | 588 { |
| 588 return node.isElementNode() && toElement(node).isMediaElement(); | 589 return node.isElementNode() && toElement(node).isMediaElement(); |
| 589 } | 590 } |
| 590 | 591 |
| 591 DEFINE_NODE_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); | 592 DEFINE_NODE_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); |
| 592 | 593 |
| 593 } //namespace | 594 } //namespace |
| 594 | 595 |
| 595 #endif | 596 #endif |
| OLD | NEW |