Commit 0a9b0e2d authored by Xiaohan Wang's avatar Xiaohan Wang Committed by Commit Bot

media: Move CdmProxy constructor and destructor to cc file

This class is exported, and inlining the constructor and destructor is
causing compile errors on Windows when the CdmProxy is used by a
component outside of media/.

BUG=785563

Change-Id: Ic9e4866d8a9724fe2fdec5d0093a78bc931011d5
Reviewed-on: https://chromium-review.googlesource.com/849472Reviewed-by: default avatarJohn Rummell <jrummell@chromium.org>
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#526910}
parent c7861ba7
...@@ -31,6 +31,7 @@ source_set("cdm") { ...@@ -31,6 +31,7 @@ source_set("cdm") {
# TODO(crbug.com/676224): Move this to |enable_library_cdms| block below # TODO(crbug.com/676224): Move this to |enable_library_cdms| block below
# when EnabledIf attribute is supported in mojom. # when EnabledIf attribute is supported in mojom.
"cdm_proxy.cc",
"cdm_proxy.h", "cdm_proxy.h",
"cenc_utils.cc", "cenc_utils.cc",
"cenc_utils.h", "cenc_utils.h",
......
...@@ -6,7 +6,9 @@ ...@@ -6,7 +6,9 @@
namespace media { namespace media {
CdmProxyKeyInfo::CdmProxyKeyInfo() = default; CdmProxy::Client::Client() = default;
CdmProxyKeyInfo::~CdmProxyKeyInfo() = default; CdmProxy::Client::~Client() = default;
CdmProxy::CdmProxy() = default;
CdmProxy::~CdmProxy() = default;
} // namespace media } // namespace media
\ No newline at end of file
...@@ -23,10 +23,10 @@ namespace media { ...@@ -23,10 +23,10 @@ namespace media {
class MEDIA_EXPORT CdmProxy { class MEDIA_EXPORT CdmProxy {
public: public:
// Client of the proxy. // Client of the proxy.
class Client { class MEDIA_EXPORT Client {
public: public:
Client() {} Client();
virtual ~Client() {} virtual ~Client();
// Called when there is a hardware reset and all the hardware context is // Called when there is a hardware reset and all the hardware context is
// lost. // lost.
virtual void NotifyHardwareReset() = 0; virtual void NotifyHardwareReset() = 0;
...@@ -54,8 +54,8 @@ class MEDIA_EXPORT CdmProxy { ...@@ -54,8 +54,8 @@ class MEDIA_EXPORT CdmProxy {
kMax = kIntelNegotiateCryptoSessionKeyExchange, kMax = kIntelNegotiateCryptoSessionKeyExchange,
}; };
CdmProxy() {} CdmProxy();
virtual ~CdmProxy() {} virtual ~CdmProxy();
// Callback for Initialize(). If the proxy created a crypto session, then the // Callback for Initialize(). If the proxy created a crypto session, then the
// ID for the crypto session is |crypto_session_id|. // ID for the crypto session is |crypto_session_id|.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment