<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[212289] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/212289">212289</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2017-02-14 04:56:15 -0800 (Tue, 14 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212288 => 212289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-14 12:03:02 UTC (rev 212288)
+++ trunk/Source/WebCore/ChangeLog 2017-02-14 12:56:15 UTC (rev 212289)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+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):
+
</ins><span class="cx"> 2017-02-14 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Make DragImageRef a RefPtr instead of a plain pointer
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (212288 => 212289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2017-02-14 12:03:02 UTC (rev 212288)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2017-02-14 12:56:15 UTC (rev 212289)
</span><span class="lines">@@ -2417,7 +2417,7 @@
</span><span class="cx"> #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</span><span class="cx"> RefPtr<ArrayBuffer> HTMLMediaElement::mediaPlayerCachedKeyForKeyId(const String& keyId) const
</span><span class="cx"> {
</span><del>- return m_mediaKeys ? m_mediaKeys->cachedKeyForKeyId(keyId) : nullptr;
</del><ins>+ return m_webKitMediaKeys ? m_webKitMediaKeys->cachedKeyForKeyId(keyId) : nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTMLMediaElement::mediaPlayerKeyNeeded(MediaPlayer*, Uint8Array* initData)
</span><span class="lines">@@ -2446,14 +2446,14 @@
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::webkitSetMediaKeys(WebKitMediaKeys* mediaKeys)
</span><span class="cx"> {
</span><del>- if (m_mediaKeys == mediaKeys)
</del><ins>+ if (m_webKitMediaKeys == mediaKeys)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_mediaKeys)
- m_mediaKeys->setMediaElement(nullptr);
- m_mediaKeys = mediaKeys;
- if (m_mediaKeys)
- m_mediaKeys->setMediaElement(this);
</del><ins>+ if (m_webKitMediaKeys)
+ m_webKitMediaKeys->setMediaElement(nullptr);
+ m_webKitMediaKeys = mediaKeys;
+ if (m_webKitMediaKeys)
+ m_webKitMediaKeys->setMediaElement(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::keyAdded()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (212288 => 212289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2017-02-14 12:03:02 UTC (rev 212288)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2017-02-14 12:56:15 UTC (rev 212289)
</span><span class="lines">@@ -250,7 +250,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</span><del>- WebKitMediaKeys* webkitKeys() const { return m_mediaKeys.get(); }
</del><ins>+ WebKitMediaKeys* webkitKeys() const { return m_webKitMediaKeys.get(); }
</ins><span class="cx"> void webkitSetMediaKeys(WebKitMediaKeys*);
</span><span class="cx">
</span><span class="cx"> void keyAdded();
</span><span class="lines">@@ -1013,7 +1013,7 @@
</span><span class="cx"> friend class TrackDisplayUpdateScope;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</span><del>- RefPtr<WebKitMediaKeys> m_mediaKeys;
</del><ins>+ RefPtr<WebKitMediaKeys> m_webKitMediaKeys;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<MediaElementSession> m_mediaSession;
</span></span></pre>
</div>
</div>
</body>
</html>