Title: [193482] trunk/Source/WebCore
- Revision
- 193482
- Author
- [email protected]
- Date
- 2015-12-04 15:15:34 -0800 (Fri, 04 Dec 2015)
Log Message
Unreviewed build-fix; Add new parameter to overloaded createSession() method in MediaPlayerPrivateAVFoundationCF.
* platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp:
(WebCore::CDMSessionAVFoundationCF::CDMSessionAVFoundationCF):
* platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h:
* platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
(WebCore::MediaPlayerPrivateAVFoundationCF::createSession):
* platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (193481 => 193482)
--- trunk/Source/WebCore/ChangeLog 2015-12-04 23:09:37 UTC (rev 193481)
+++ trunk/Source/WebCore/ChangeLog 2015-12-04 23:15:34 UTC (rev 193482)
@@ -1,3 +1,14 @@
+2015-12-04 Jer Noble <[email protected]>
+
+ Unreviewed build-fix; Add new parameter to overloaded createSession() method in MediaPlayerPrivateAVFoundationCF.
+
+ * platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp:
+ (WebCore::CDMSessionAVFoundationCF::CDMSessionAVFoundationCF):
+ * platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h:
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+ (WebCore::MediaPlayerPrivateAVFoundationCF::createSession):
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h:
+
2015-12-01 Jer Noble <[email protected]>
Adopt AVContentKeySession
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp (193481 => 193482)
--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp 2015-12-04 23:09:37 UTC (rev 193481)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp 2015-12-04 23:15:34 UTC (rev 193482)
@@ -44,9 +44,9 @@
namespace WebCore {
-CDMSessionAVFoundationCF::CDMSessionAVFoundationCF(MediaPlayerPrivateAVFoundationCF* parent)
+CDMSessionAVFoundationCF::CDMSessionAVFoundationCF(MediaPlayerPrivateAVFoundationCF* parent, CDMSessionClient* client)
: m_parent(parent)
- , m_client(nullptr)
+ , m_client(client)
, m_sessionId(createCanonicalUUIDString())
{
}
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h (193481 => 193482)
--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h 2015-12-04 23:09:37 UTC (rev 193481)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h 2015-12-04 23:15:34 UTC (rev 193482)
@@ -39,7 +39,7 @@
class CDMSessionAVFoundationCF : public CDMSession {
public:
- CDMSessionAVFoundationCF(MediaPlayerPrivateAVFoundationCF* parent);
+ CDMSessionAVFoundationCF(MediaPlayerPrivateAVFoundationCF* parent, CDMSessionClient*);
virtual ~CDMSessionAVFoundationCF() { }
virtual void setClient(CDMSessionClient* client) override { m_client = client; }
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (193481 => 193482)
--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2015-12-04 23:09:37 UTC (rev 193481)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2015-12-04 23:15:34 UTC (rev 193482)
@@ -1124,15 +1124,15 @@
return m_avfWrapper->takeRequestForKeyURI(keyURI);
}
-std::unique_ptr<CDMSession> MediaPlayerPrivateAVFoundationCF::createSession(const String& keySystem)
+std::unique_ptr<CDMSession> MediaPlayerPrivateAVFoundationCF::createSession(const String& keySystem, CDMSessionClient* client)
{
if (!keySystemIsSupported(keySystem))
return nullptr;
- return std::make_unique<CDMSessionAVFoundationCF>(this);
+ return std::make_unique<CDMSessionAVFoundationCF>(this, client);
}
#elif ENABLE(ENCRYPTED_MEDIA_V2)
-std::unique_ptr<CDMSession> MediaPlayerPrivateAVFoundationCF::createSession(const String& keySystem)
+std::unique_ptr<CDMSession> MediaPlayerPrivateAVFoundationCF::createSession(const String& keySystem, , CDMSessionClient*)
{
return nullptr;
}
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h (193481 => 193482)
--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h 2015-12-04 23:09:37 UTC (rev 193481)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h 2015-12-04 23:15:34 UTC (rev 193482)
@@ -117,7 +117,7 @@
virtual void contentsNeedsDisplay();
#if ENABLE(ENCRYPTED_MEDIA_V2)
- virtual std::unique_ptr<CDMSession> createSession(const String&) override;
+ virtual std::unique_ptr<CDMSession> createSession(const String&, CDMSessionClient*) override;
#endif
virtual String languageOfPrimaryAudioTrack() const override;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
