Chromium Code Reviews| Index: Source/core/platform/graphics/CDMChromium.h |
| diff --git a/Source/core/platform/Task.h b/Source/core/platform/graphics/CDMChromium.h |
| similarity index 78% |
| copy from Source/core/platform/Task.h |
| copy to Source/core/platform/graphics/CDMChromium.h |
| index b9d2e46802aebf6391df4ec3dabb580d43b2483c..db07b9980d63c9e02f9bb1ba12bc11a98c99667c 100644 |
| --- a/Source/core/platform/Task.h |
| +++ b/Source/core/platform/graphics/CDMChromium.h |
| @@ -28,30 +28,28 @@ |
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| -#ifndef Task_h |
| -#define Task_h |
| +#ifndef CDMChromium_h |
| +#define CDMChromium_h |
| -#include "wtf/Functional.h" |
| -#include "public/platform/WebThread.h" |
| +#include "core/platform/graphics/CDM.h" |
| +#include "public/platform/WebCDM.h" |
| +#include "wtf/OwnPtr.h" |
| namespace WebCore { |
| -class Task : public WebKit::WebThread::Task { |
| +class CDMChromium : public CDM { |
|
abarth-chromium
2013/06/07 00:08:23
There's no need for a CDMChromium anymore. You ca
ddorwin
2013/06/10 22:52:34
Done.
|
| public: |
| - explicit Task(const Closure& closure) |
| - : m_closure(closure) |
| - { |
| - } |
| + CDMChromium(PassOwnPtr<WebKit::WebCDM>); |
| + virtual ~CDMChromium() { } |
| - virtual void run() OVERRIDE |
| - { |
| - m_closure(); |
| - } |
| + // CDM |
| + virtual bool supportsMIMEType(const WTF::String&) OVERRIDE; |
| + PassOwnPtr<CDMSession> createSession(CDMSessionClient*) OVERRIDE; |
| private: |
| - Closure m_closure; |
| + OwnPtr<WebKit::WebCDM> m_cdm; |
| }; |
| } // namespace WebCore |
| -#endif // Task_h |
| +#endif // CDMChromium_h |