<!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>[169272] branches/safari-537.77-branch/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/169272">169272</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-05-23 12:00:36 -0700 (Fri, 23 May 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/165862">r165862</a>. &lt;rdar://problem/16975511&gt;</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53777branchSourceWebCoreChangeLog">branches/safari-537.77-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53777branchSourceWebCorehtmlHTMLMediaElementcpp">branches/safari-537.77-branch/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#branchessafari53777branchSourceWebCorehtmlHTMLMediaElementh">branches/safari-537.77-branch/Source/WebCore/html/HTMLMediaElement.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53777branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebCore/ChangeLog (169271 => 169272)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebCore/ChangeLog        2014-05-23 18:59:56 UTC (rev 169271)
+++ branches/safari-537.77-branch/Source/WebCore/ChangeLog        2014-05-23 19:00:36 UTC (rev 169272)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2014-05-23  Dana Burkart  &lt;dburkart@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r165862
+
+        2014-03-18  Jeffrey Pfau  &lt;jpfau@apple.com&gt;
+
+                Unify &lt;media&gt; element callback registration and unregistration
+                https://bugs.webkit.org/show_bug.cgi?id=130417
+
+                Reviewed by Eric Carlson.
+
+                * html/HTMLMediaElement.cpp:
+                (WebCore::HTMLMediaElement::HTMLMediaElement):
+                (WebCore::HTMLMediaElement::~HTMLMediaElement):
+                (WebCore::HTMLMediaElement::registerWithDocument):
+                (WebCore::HTMLMediaElement::unregisterWithDocument):
+                (WebCore::HTMLMediaElement::didMoveToNewDocument):
+                * html/HTMLMediaElement.h:
+
+2014-05-23  Dana Burkart  &lt;dburkart@apple.com&gt;
+
</ins><span class="cx">         Merge r160847
</span><span class="cx"> 
</span><span class="cx">     2013-12-19  Ryosuke Niwa  &lt;rniwa@webkit.org&gt;
</span></span></pre></div>
<a id="branchessafari53777branchSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebCore/html/HTMLMediaElement.cpp (169271 => 169272)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebCore/html/HTMLMediaElement.cpp        2014-05-23 18:59:56 UTC (rev 169271)
+++ branches/safari-537.77-branch/Source/WebCore/html/HTMLMediaElement.cpp        2014-05-23 19:00:36 UTC (rev 169272)
</span><span class="lines">@@ -328,8 +328,6 @@
</span><span class="cx">     , m_reportedExtraMemoryCost(0)
</span><span class="cx"> {
</span><span class="cx">     LOG(Media, &quot;HTMLMediaElement::HTMLMediaElement&quot;);
</span><del>-    document-&gt;registerForMediaVolumeCallbacks(this);
-    document-&gt;registerForPrivateBrowsingStateChangedCallbacks(this);
</del><span class="cx"> 
</span><span class="cx">     if (document-&gt;settings() &amp;&amp; document-&gt;settings()-&gt;mediaPlaybackRequiresUserGesture()) {
</span><span class="cx">         addBehaviorRestriction(RequireUserGestureForRateChangeRestriction);
</span><span class="lines">@@ -337,13 +335,13 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     setHasCustomStyleCallbacks();
</span><del>-    addElementToDocumentMap(this, document);
</del><span class="cx"> 
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>-    document-&gt;registerForCaptionPreferencesChangedCallbacks(this);
</del><span class="cx">     if (document-&gt;page())
</span><span class="cx">         m_captionDisplayMode = document-&gt;page()-&gt;group().captionPreferences()-&gt;captionDisplayMode();
</span><span class="cx"> #endif
</span><ins>+
+    registerWithDocument(document);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> HTMLMediaElement::~HTMLMediaElement()
</span><span class="lines">@@ -352,13 +350,11 @@
</span><span class="cx"> 
</span><span class="cx">     m_asyncEventQueue-&gt;close();
</span><span class="cx"> 
</span><del>-    if (m_isWaitingUntilMediaCanStart)
-        document()-&gt;removeMediaCanStartListener(this);
</del><span class="cx">     setShouldDelayLoadEvent(false);
</span><del>-    document()-&gt;unregisterForMediaVolumeCallbacks(this);
-    document()-&gt;unregisterForPrivateBrowsingStateChangedCallbacks(this);
</del><ins>+
+    unregisterWithDocument(document());
+
</ins><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>-    document()-&gt;unregisterForCaptionPreferencesChangedCallbacks(this);
</del><span class="cx">     if (m_audioTracks) {
</span><span class="cx">         m_audioTracks-&gt;clearElement();
</span><span class="cx">         for (unsigned i = 0; i &lt; m_audioTracks-&gt;length(); ++i)
</span><span class="lines">@@ -390,21 +386,43 @@
</span><span class="cx">     setMediaKeys(0);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    removeElementFromDocumentMap(this, document());
-
</del><span class="cx">     m_completelyLoaded = true;
</span><span class="cx">     if (m_player)
</span><span class="cx">         m_player-&gt;clearMediaPlayerClient();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void HTMLMediaElement::registerWithDocument(Document* document)
+{
+    if (m_isWaitingUntilMediaCanStart)
+        document-&gt;addMediaCanStartListener(this);
+
+    document-&gt;registerForMediaVolumeCallbacks(this);
+    document-&gt;registerForPrivateBrowsingStateChangedCallbacks(this);
+
+#if ENABLE(VIDEO_TRACK)
+    document-&gt;registerForCaptionPreferencesChangedCallbacks(this);
+#endif
+
+    addElementToDocumentMap(this, document);
+}
+
+void HTMLMediaElement::unregisterWithDocument(Document* document)
+{
+    if (m_isWaitingUntilMediaCanStart)
+        document-&gt;removeMediaCanStartListener(this);
+
+    document-&gt;unregisterForMediaVolumeCallbacks(this);
+    document-&gt;unregisterForPrivateBrowsingStateChangedCallbacks(this);
+
+#if ENABLE(VIDEO_TRACK)
+    document-&gt;unregisterForCaptionPreferencesChangedCallbacks(this);
+#endif
+
+    removeElementFromDocumentMap(this, document);
+}
+
</ins><span class="cx"> void HTMLMediaElement::didMoveToNewDocument(Document* oldDocument)
</span><span class="cx"> {
</span><del>-    if (m_isWaitingUntilMediaCanStart) {
-        if (oldDocument)
-            oldDocument-&gt;removeMediaCanStartListener(this);
-        document()-&gt;addMediaCanStartListener(this);
-    }
-
</del><span class="cx">     if (m_shouldDelayLoadEvent) {
</span><span class="cx">         if (oldDocument)
</span><span class="cx">             oldDocument-&gt;decrementLoadEventDelayCount();
</span><span class="lines">@@ -412,12 +430,10 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (oldDocument) {
</span><del>-        oldDocument-&gt;unregisterForMediaVolumeCallbacks(this);
-        removeElementFromDocumentMap(this, oldDocument);
</del><ins>+        unregisterWithDocument(oldDocument);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><del>-    document()-&gt;registerForMediaVolumeCallbacks(this);
-    addElementToDocumentMap(this, document());
</del><ins>+    registerWithDocument(document());
</ins><span class="cx"> 
</span><span class="cx">     HTMLElement::didMoveToNewDocument(oldDocument);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari53777branchSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebCore/html/HTMLMediaElement.h (169271 => 169272)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebCore/html/HTMLMediaElement.h        2014-05-23 18:59:56 UTC (rev 169271)
+++ branches/safari-537.77-branch/Source/WebCore/html/HTMLMediaElement.h        2014-05-23 19:00:36 UTC (rev 169272)
</span><span class="lines">@@ -629,6 +629,9 @@
</span><span class="cx">     bool shouldDisableSleep() const;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+    void registerWithDocument(Document*);
+    void unregisterWithDocument(Document*);
+
</ins><span class="cx">     Timer&lt;HTMLMediaElement&gt; m_loadTimer;
</span><span class="cx">     Timer&lt;HTMLMediaElement&gt; m_progressEventTimer;
</span><span class="cx">     Timer&lt;HTMLMediaElement&gt; m_playbackProgressTimer;
</span></span></pre>
</div>
</div>

</body>
</html>