Chromium Code Reviews Chromium Code Reviews
Issue 16387015:
Make unprefixed EME APIs use platform and Chromium. (Closed)
Base URL: svn://svn.chromium.org/blink/trunk| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 10 matching lines...) Expand all Loading... | |
| 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
| 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 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 Task_h | 31 #ifndef CDMChromium_h |
| 32 #define Task_h | 32 #define CDMChromium_h |
| 33 | 33 |
| 34 #include "wtf/Functional.h" | 34 #include "core/platform/graphics/CDM.h" |
| 35 #include "public/platform/WebThread.h" | 35 #include "public/platform/WebCDM.h" |
| 36 #include "wtf/OwnPtr.h" | |
| 36 | 37 |
| 37 namespace WebCore { | 38 namespace WebCore { |
| 38 | 39 |
| 39 class Task : public WebKit::WebThread::Task { | 40 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.
| |
| 40 public: | 41 public: |
| 41 explicit Task(const Closure& closure) | 42 CDMChromium(PassOwnPtr<WebKit::WebCDM>); |
| 42 : m_closure(closure) | 43 virtual ~CDMChromium() { } |
| 43 { | |
| 44 } | |
| 45 | 44 |
| 46 virtual void run() OVERRIDE | 45 // CDM |
| 47 { | 46 virtual bool supportsMIMEType(const WTF::String&) OVERRIDE; |
| 48 m_closure(); | 47 PassOwnPtr<CDMSession> createSession(CDMSessionClient*) OVERRIDE; |
| 49 } | |
| 50 | 48 |
| 51 private: | 49 private: |
| 52 Closure m_closure; | 50 OwnPtr<WebKit::WebCDM> m_cdm; |
| 53 }; | 51 }; |
| 54 | 52 |
| 55 } // namespace WebCore | 53 } // namespace WebCore |
| 56 | 54 |
| 57 #endif // Task_h | 55 #endif // CDMChromium_h |
| OLD | NEW |
