Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #ifndef WebMediaPlayerClient_h | 31 #ifndef WebMediaPlayerClient_h |
| 32 #define WebMediaPlayerClient_h | 32 #define WebMediaPlayerClient_h |
| 33 | 33 |
| 34 #include "WebInbandTextTrack.h" | |
|
acolwell GONE FROM CHROMIUM
2013/04/17 00:13:56
nit: remove and forward declare.
Matthew Heaney (Chromium)
2013/04/18 23:15:42
Done.
| |
| 34 #include "WebMediaPlayer.h" | 35 #include "WebMediaPlayer.h" |
| 35 | 36 |
| 36 namespace WebKit { | 37 namespace WebKit { |
| 37 | 38 |
| 38 class WebFrame; | 39 class WebFrame; |
| 39 class WebLayer; | 40 class WebLayer; |
| 40 class WebMediaSource; | 41 class WebMediaSource; |
| 41 class WebPlugin; | 42 class WebPlugin; |
| 42 class WebRequest; | 43 class WebRequest; |
| 43 class WebURL; | 44 class WebURL; |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 76 virtual void keyAdded(const WebString& keySystem, const WebString& sessionId ) = 0; | 77 virtual void keyAdded(const WebString& keySystem, const WebString& sessionId ) = 0; |
| 77 virtual void keyError(const WebString& keySystem, const WebString& sessionId , MediaKeyErrorCode, unsigned short systemCode) = 0; | 78 virtual void keyError(const WebString& keySystem, const WebString& sessionId , MediaKeyErrorCode, unsigned short systemCode) = 0; |
| 78 virtual void keyMessage(const WebString& keySystem, const WebString& session Id, const unsigned char* message, unsigned messageLength, const WebURL& defaultU RL) = 0; | 79 virtual void keyMessage(const WebString& keySystem, const WebString& session Id, const unsigned char* message, unsigned messageLength, const WebURL& defaultU RL) = 0; |
| 79 virtual void keyNeeded(const WebString& keySystem, const WebString& sessionI d, const unsigned char* initData, unsigned initDataLength) = 0; | 80 virtual void keyNeeded(const WebString& keySystem, const WebString& sessionI d, const unsigned char* initData, unsigned initDataLength) = 0; |
| 80 // The returned pointer is valid until closeHelperPlugin() is called. | 81 // The returned pointer is valid until closeHelperPlugin() is called. |
| 81 // Returns 0 if the plugin could not be instantiated. | 82 // Returns 0 if the plugin could not be instantiated. |
| 82 virtual WebPlugin* createHelperPlugin(const WebString& pluginType, WebFrame* ) = 0; | 83 virtual WebPlugin* createHelperPlugin(const WebString& pluginType, WebFrame* ) = 0; |
| 83 virtual void closeHelperPlugin() = 0; | 84 virtual void closeHelperPlugin() = 0; |
| 84 virtual bool needsWebLayerForVideo() const = 0; | 85 virtual bool needsWebLayerForVideo() const = 0; |
| 85 virtual void setWebLayer(WebLayer*) = 0; | 86 virtual void setWebLayer(WebLayer*) = 0; |
| 87 // TODO(matthewjheaney): resolve nature of pointer | |
|
acolwell GONE FROM CHROMIUM
2013/04/17 00:13:56
Remove comment? I'm assuming you have resolved the
Matthew Heaney (Chromium)
2013/04/18 23:15:42
Done.
| |
| 88 virtual void addTextTrack(WebInbandTextTrack* text_track) = 0; | |
|
acolwell GONE FROM CHROMIUM
2013/04/17 00:13:56
nit: remove parameter name.
Matthew Heaney (Chromium)
2013/04/18 23:15:42
Done.
| |
| 89 | |
| 86 protected: | 90 protected: |
| 87 ~WebMediaPlayerClient() { } | 91 ~WebMediaPlayerClient() { } |
| 88 }; | 92 }; |
| 89 | 93 |
| 90 } // namespace WebKit | 94 } // namespace WebKit |
| 91 | 95 |
| 92 #endif | 96 #endif |
| OLD | NEW |