HTMLMediaElement: WebKitMediaKeys member name should be prefixed

https://bugs.webkit.org/show_bug.cgi?id=168297

Reviewed by Xabier Rodriguez-Calvar.

Rename the LEGACY_ENCRYPTED_MEDIA m_mediaKeys variable to m_webkitMediaKeys
so that it contains the legacy prefix, just like the API. This will make
room for the MediaKeys member variable that will be implemented under
the ENCRYPTED_MEDIA guards.

* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::mediaPlayerCachedKeyForKeyId):
(WebCore::HTMLMediaElement::webkitSetMediaKeys):
* html/HTMLMediaElement.h:
(WebCore::HTMLMediaElement::webkitKeys):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@212289 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 837a1bd..b364bdd 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2017-02-14  Zan Dobersek  <zdobersek@igalia.com>
+
+        HTMLMediaElement: WebKitMediaKeys member name should be prefixed
+        https://bugs.webkit.org/show_bug.cgi?id=168297
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        Rename the LEGACY_ENCRYPTED_MEDIA m_mediaKeys variable to m_webkitMediaKeys
+        so that it contains the legacy prefix, just like the API. This will make
+        room for the MediaKeys member variable that will be implemented under
+        the ENCRYPTED_MEDIA guards.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::mediaPlayerCachedKeyForKeyId):
+        (WebCore::HTMLMediaElement::webkitSetMediaKeys):
+        * html/HTMLMediaElement.h:
+        (WebCore::HTMLMediaElement::webkitKeys):
+

 2017-02-14  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK] Make DragImageRef a RefPtr instead of a plain pointer
 2017-02-14  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK] Make DragImageRef a RefPtr instead of a plain pointer

diff --git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html/HTMLMediaElement.cpp
index 29363a1..6f78fc7 100644 (file)
--- a/Source/WebCore/html/HTMLMediaElement.cpp
+++ b/Source/WebCore/html/HTMLMediaElement.cpp
@@ -2417,7 +2417,7 @@ void HTMLMediaElement::setReadyState(MediaPlayer::ReadyState state)
 #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
 RefPtr<ArrayBuffer> HTMLMediaElement::mediaPlayerCachedKeyForKeyId(const String& keyId) const
 {
 #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
 RefPtr<ArrayBuffer> HTMLMediaElement::mediaPlayerCachedKeyForKeyId(const String& keyId) const
 {

-    return m_mediaKeys ? m_mediaKeys->cachedKeyForKeyId(keyId) : nullptr;
+    return m_webKitMediaKeys ? m_webKitMediaKeys->cachedKeyForKeyId(keyId) : nullptr;

 }
 
 bool HTMLMediaElement::mediaPlayerKeyNeeded(MediaPlayer*, Uint8Array* initData)
 }
 
 bool HTMLMediaElement::mediaPlayerKeyNeeded(MediaPlayer*, Uint8Array* initData)


@@ -2446,14 +2446,14 @@ String HTMLMediaElement::mediaPlayerMediaKeysStorageDirectory() const
 
 void HTMLMediaElement::webkitSetMediaKeys(WebKitMediaKeys* mediaKeys)
 {
 
 void HTMLMediaElement::webkitSetMediaKeys(WebKitMediaKeys* mediaKeys)
 {

-    if (m_mediaKeys == mediaKeys)
+    if (m_webKitMediaKeys == mediaKeys)

         return;
 
         return;
 

-    if (m_mediaKeys)
-        m_mediaKeys->setMediaElement(nullptr);
-    m_mediaKeys = mediaKeys;
-    if (m_mediaKeys)
-        m_mediaKeys->setMediaElement(this);
+    if (m_webKitMediaKeys)
+        m_webKitMediaKeys->setMediaElement(nullptr);
+    m_webKitMediaKeys = mediaKeys;
+    if (m_webKitMediaKeys)
+        m_webKitMediaKeys->setMediaElement(this);

 }
 
 void HTMLMediaElement::keyAdded()
 }
 
 void HTMLMediaElement::keyAdded()

diff --git a/Source/WebCore/html/HTMLMediaElement.h b/Source/WebCore/html/HTMLMediaElement.h
index 459bd3a..e368187 100644 (file)
--- a/Source/WebCore/html/HTMLMediaElement.h
+++ b/Source/WebCore/html/HTMLMediaElement.h
@@ -250,7 +250,7 @@ public:
 #endif
 
 #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
 #endif
 
 #if ENABLE(LEGACY_ENCRYPTED_MEDIA)

-    WebKitMediaKeys* webkitKeys() const { return m_mediaKeys.get(); }
+    WebKitMediaKeys* webkitKeys() const { return m_webKitMediaKeys.get(); }

     void webkitSetMediaKeys(WebKitMediaKeys*);
 
     void keyAdded();
     void webkitSetMediaKeys(WebKitMediaKeys*);
 
     void keyAdded();


@@ -1013,7 +1013,7 @@ private:
     friend class TrackDisplayUpdateScope;
 
 #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
     friend class TrackDisplayUpdateScope;
 
 #if ENABLE(LEGACY_ENCRYPTED_MEDIA)

-    RefPtr<WebKitMediaKeys> m_mediaKeys;
+    RefPtr<WebKitMediaKeys> m_webKitMediaKeys;

 #endif
 
     std::unique_ptr<MediaElementSession> m_mediaSession;
 #endif
 
     std::unique_ptr<MediaElementSession> m_mediaSession;