Changeset 236462 in webkit

Timestamp:

Sep 25, 2018, 10:19:36 AM (8 years ago)

Author:

calvaris@igalia.com

Message:

[EME] Fix variable name that should have gone in r236317
​https://bugs.webkit.org/show_bug.cgi?id=189944

Reviewed by Jer Noble.

m_cdmInstanceClientWeakPtrFactory becomes
m_cdmInstanceSessionClientWeakPtrFactory as its type changes to
CDMInstanceSessionClient.

• Modules/encryptedmedia/MediaKeySession.cpp:

(WebCore::MediaKeySession::MediaKeySession):

• Modules/encryptedmedia/MediaKeySession.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/encryptedmedia/MediaKeySession.cpp (modified) (1 diff)
• Modules/encryptedmedia/MediaKeySession.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-09-25  Xabier Rodriguez Calvar  <calvaris@igalia.com>
+
+        [EME] Fix variable name that should have gone in r236317
+        https://bugs.webkit.org/show_bug.cgi?id=189944
+
+        Reviewed by Jer Noble.
+
+        m_cdmInstanceClientWeakPtrFactory becomes
+        m_cdmInstanceSessionClientWeakPtrFactory as its type changes to
+        CDMInstanceSessionClient.
+
+        * Modules/encryptedmedia/MediaKeySession.cpp:
+        (WebCore::MediaKeySession::MediaKeySession):
+        * Modules/encryptedmedia/MediaKeySession.h:
+
 2018-09-25  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp

@@ -89 +89 @@
     UNUSED_PARAM(m_uninitialized);
 
-    m_instanceSession->setClient(m_cdmInstanceClientWeakPtrFactory.createWeakPtr(*this));
+    m_instanceSession->setClient(m_cdmInstanceSessionClientWeakPtrFactory.createWeakPtr(*this));
 }
 

trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h

@@ -118 +118 @@
     double m_latestDecryptTime { 0 };
     Vector<std::pair<Ref<SharedBuffer>, MediaKeyStatus>> m_statuses;
-    WeakPtrFactory<CDMInstanceSessionClient> m_cdmInstanceClientWeakPtrFactory;
+    WeakPtrFactory<CDMInstanceSessionClient> m_cdmInstanceSessionClientWeakPtrFactory;
 };