Attachment 358791 Details for Bug 193321 – propect patch

[patch] propect patch

security-origin.patch (text/plain), 2.17 KB, created by Xabier Rodríguez Calvar on 2019-01-10 07:41:04 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Xabier Rodríguez Calvar

Created: 2019-01-10 07:41:04 PST

Size: 2.17 KB

patch

obsolete

>diff --git a/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp b/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp
>index 4bea9a0084b..4d4f1bad3d8 100644
>--- a/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp
>+++ b/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp
>@@ -671,6 +671,13 @@ void MediaKeySession::sendMessage(CDMMessageType messageType, Ref<SharedBuffer>&
>     enqueueMessage(messageType, message);
> }
> 
>+const SecurityOrigin& MediaKeySession::securityOrigin()
>+{
>+    auto* document = downcast<Document>(scriptExecutionContext());
>+    ASSERT(document);
>+    return document->securityOrigin();
>+}
>+
> void MediaKeySession::updateExpiration(double)
> {
>     notImplemented();
>diff --git a/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h b/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h
>index 35d8174268c..a5246068da9 100644
>--- a/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h
>+++ b/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h
>@@ -87,6 +87,7 @@ private:
>     // CDMInstanceSessionClient
>     void updateKeyStatuses(CDMInstanceSessionClient::KeyStatusVector&&) override;
>     void sendMessage(CDMMessageType, Ref<SharedBuffer>&& message) final;
>+    const SecurityOrigin& securityOrigin() final;
> 
>     // EventTarget
>     EventTargetInterface eventTargetInterface() const override { return MediaKeySessionEventTargetInterfaceType; }
>diff --git a/Source/WebCore/platform/encryptedmedia/CDMInstanceSession.h b/Source/WebCore/platform/encryptedmedia/CDMInstanceSession.h
>index 797a2f95dad..3de0d282980 100644
>--- a/Source/WebCore/platform/encryptedmedia/CDMInstanceSession.h
>+++ b/Source/WebCore/platform/encryptedmedia/CDMInstanceSession.h
>@@ -38,6 +38,7 @@
> namespace WebCore {
> 
> class SharedBuffer;
>+class SecurityOrigin;
> 
> class CDMInstanceSessionClient {
> public:
>@@ -47,6 +48,7 @@ public:
>     using KeyStatusVector = Vector<std::pair<Ref<SharedBuffer>, KeyStatus>>;
>     virtual void updateKeyStatuses(KeyStatusVector&&) = 0;
>     virtual void sendMessage(CDMMessageType, Ref<SharedBuffer>&& message) = 0;
>+    virtual const SecurityOrigin& securityOrigin() = 0;
> };
> 
> class CDMInstanceSession : public RefCounted<CDMInstanceSession> {

Actions: View | Formatted Diff | Diff

Attachments on bug 193321: 358791