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 30 matching lines...) Expand all Loading... | |
| 41 #include "third_party/skia/include/core/SkRefCnt.h" | 41 #include "third_party/skia/include/core/SkRefCnt.h" |
| 42 #include "third_party/skia/include/gpu/GrTexture.h" | 42 #include "third_party/skia/include/gpu/GrTexture.h" |
| 43 #endif | 43 #endif |
| 44 #include "platform/weborigin/KURL.h" | 44 #include "platform/weborigin/KURL.h" |
| 45 #include "wtf/OwnPtr.h" | 45 #include "wtf/OwnPtr.h" |
| 46 #include "wtf/PassOwnPtr.h" | 46 #include "wtf/PassOwnPtr.h" |
| 47 #include "wtf/ThreadingPrimitives.h" | 47 #include "wtf/ThreadingPrimitives.h" |
| 48 | 48 |
| 49 namespace WebCore { | 49 namespace WebCore { |
| 50 class AudioSourceProviderClient; | 50 class AudioSourceProviderClient; |
| 51 class KURL; | |
|
acolwell GONE FROM CHROMIUM
2014/02/06 22:53:50
nit: You shouldn't need this since 7 lines up ther
cimamoglu (inactive)
2014/02/07 14:36:19
Done.
| |
| 51 } | 52 } |
| 52 | 53 |
| 53 namespace blink { | 54 namespace blink { |
| 54 | 55 |
| 55 class WebHelperPlugin; | 56 class WebHelperPlugin; |
| 56 class WebAudioSourceProvider; | 57 class WebAudioSourceProvider; |
| 57 class WebContentDecryptionModule; | 58 class WebContentDecryptionModule; |
| 58 class WebMediaPlayer; | 59 class WebMediaPlayer; |
| 59 | 60 |
| 60 // This class serves as a bridge between WebCore::MediaPlayer and | 61 // This class serves as a bridge between WebCore::MediaPlayer and |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 106 virtual bool hasAudio() const OVERRIDE; | 107 virtual bool hasAudio() const OVERRIDE; |
| 107 virtual double duration() const OVERRIDE; | 108 virtual double duration() const OVERRIDE; |
| 108 virtual double currentTime() const OVERRIDE; | 109 virtual double currentTime() const OVERRIDE; |
| 109 virtual void seek(double time) OVERRIDE; | 110 virtual void seek(double time) OVERRIDE; |
| 110 virtual bool seeking() const OVERRIDE; | 111 virtual bool seeking() const OVERRIDE; |
| 111 virtual double rate() const OVERRIDE; | 112 virtual double rate() const OVERRIDE; |
| 112 virtual void setRate(double) OVERRIDE; | 113 virtual void setRate(double) OVERRIDE; |
| 113 virtual bool paused() const OVERRIDE; | 114 virtual bool paused() const OVERRIDE; |
| 114 virtual void setVolume(double) OVERRIDE; | 115 virtual void setVolume(double) OVERRIDE; |
| 115 virtual void setMuted(bool) OVERRIDE; | 116 virtual void setMuted(bool) OVERRIDE; |
| 117 virtual void setPoster(const WebCore::KURL&) OVERRIDE; | |
| 116 virtual WebCore::MediaPlayer::NetworkState networkState() const OVERRIDE; | 118 virtual WebCore::MediaPlayer::NetworkState networkState() const OVERRIDE; |
| 117 virtual WebCore::MediaPlayer::ReadyState readyState() const OVERRIDE; | 119 virtual WebCore::MediaPlayer::ReadyState readyState() const OVERRIDE; |
| 118 virtual double maxTimeSeekable() const OVERRIDE; | 120 virtual double maxTimeSeekable() const OVERRIDE; |
| 119 virtual WTF::PassRefPtr<WebCore::TimeRanges> buffered() const OVERRIDE; | 121 virtual WTF::PassRefPtr<WebCore::TimeRanges> buffered() const OVERRIDE; |
| 120 virtual bool didLoadingProgress() const OVERRIDE; | 122 virtual bool didLoadingProgress() const OVERRIDE; |
| 121 virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect&) OVERR IDE; | 123 virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect&) OVERR IDE; |
| 122 virtual bool copyVideoTextureToPlatformTexture(WebCore::GraphicsContext3D*, Platform3DObject texture, GLint level, GLenum type, GLenum internalFormat, bool premultiplyAlpha, bool flipY) OVERRIDE; | 124 virtual bool copyVideoTextureToPlatformTexture(WebCore::GraphicsContext3D*, Platform3DObject texture, GLint level, GLenum type, GLenum internalFormat, bool premultiplyAlpha, bool flipY) OVERRIDE; |
| 123 virtual void setPreload(WebCore::MediaPlayer::Preload) OVERRIDE; | 125 virtual void setPreload(WebCore::MediaPlayer::Preload) OVERRIDE; |
| 124 virtual bool hasSingleSecurityOrigin() const OVERRIDE; | 126 virtual bool hasSingleSecurityOrigin() const OVERRIDE; |
| 125 virtual bool didPassCORSAccessCheck() const OVERRIDE; | 127 virtual bool didPassCORSAccessCheck() const OVERRIDE; |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 215 | 217 |
| 216 AudioSourceProviderImpl m_audioSourceProvider; | 218 AudioSourceProviderImpl m_audioSourceProvider; |
| 217 #endif | 219 #endif |
| 218 | 220 |
| 219 WebMediaPlayer::LoadType m_loadType; | 221 WebMediaPlayer::LoadType m_loadType; |
| 220 }; | 222 }; |
| 221 | 223 |
| 222 } // namespace blink | 224 } // namespace blink |
| 223 | 225 |
| 224 #endif | 226 #endif |
| OLD | NEW |