<!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>[248667] 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/248667">248667</a></dd>
<dt>Author</dt> <dd>youenn@apple.com</dd>
<dt>Date</dt> <dd>2019-08-14 03:25:00 -0700 (Wed, 14 Aug 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Make privateBrowsingStateDidChange take an explicit SessionID
https://bugs.webkit.org/show_bug.cgi?id=200666

Reviewed by Alex Christensen.

Instead of stating that the page session ID changed and get it from the page,
pass it directly to privateBrowsingStateDidChange.
No change of behavior.

* dom/Document.cpp:
(WebCore::Document::privateBrowsingStateDidChange):
* dom/Document.h:
* dom/Element.h:
(WebCore::Element::privateBrowsingStateDidChange):
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::privateBrowsingStateDidChange):
* html/HTMLMediaElement.h:
* page/Page.cpp:
(WebCore::Page::setSessionID):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</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>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (248666 => 248667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-08-14 10:13:55 UTC (rev 248666)
+++ trunk/Source/WebCore/ChangeLog      2019-08-14 10:25:00 UTC (rev 248667)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2019-08-14  Youenn Fablet  <youenn@apple.com>
+
+        Make privateBrowsingStateDidChange take an explicit SessionID
+        https://bugs.webkit.org/show_bug.cgi?id=200666
+
+        Reviewed by Alex Christensen.
+
+        Instead of stating that the page session ID changed and get it from the page,
+        pass it directly to privateBrowsingStateDidChange.
+        No change of behavior.
+
+        * dom/Document.cpp:
+        (WebCore::Document::privateBrowsingStateDidChange):
+        * dom/Document.h:
+        * dom/Element.h:
+        (WebCore::Element::privateBrowsingStateDidChange):
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::privateBrowsingStateDidChange):
+        * html/HTMLMediaElement.h:
+        * page/Page.cpp:
+        (WebCore::Page::setSessionID):
+
</ins><span class="cx"> 2019-08-13  Sam Weinig  <weinig@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Fix the WPE build.
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (248666 => 248667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp    2019-08-14 10:13:55 UTC (rev 248666)
+++ trunk/Source/WebCore/dom/Document.cpp       2019-08-14 10:25:00 UTC (rev 248667)
</span><span class="lines">@@ -5262,19 +5262,19 @@
</span><span class="cx">     securityOrigin().setStorageBlockingPolicy(settings().storageBlockingPolicy());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Document::privateBrowsingStateDidChange() 
</del><ins>+void Document::privateBrowsingStateDidChange(PAL::SessionID sessionID)
</ins><span class="cx"> {
</span><del>-    m_sessionID = SessionID::emptySessionID();
</del><ins>+    m_sessionID = sessionID;
</ins><span class="cx">     if (m_logger)
</span><del>-        m_logger->setEnabled(this, sessionID().isAlwaysOnLoggingAllowed());
</del><ins>+        m_logger->setEnabled(this, sessionID.isAlwaysOnLoggingAllowed());
</ins><span class="cx"> 
</span><span class="cx">     for (auto* element : m_privateBrowsingStateChangedElements)
</span><del>-        element->privateBrowsingStateDidChange();
</del><ins>+        element->privateBrowsingStateDidChange(sessionID);
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(SERVICE_WORKER)
</span><del>-    ASSERT(sessionID().isValid());
-    if (RuntimeEnabledFeatures::sharedFeatures().serviceWorkerEnabled() && m_serviceWorkerConnection && sessionID().isValid())
-        setServiceWorkerConnection(&ServiceWorkerProvider::singleton().serviceWorkerConnectionForSession(sessionID()));
</del><ins>+    ASSERT(sessionID.isValid());
+    if (RuntimeEnabledFeatures::sharedFeatures().serviceWorkerEnabled() && m_serviceWorkerConnection && sessionID.isValid())
+        setServiceWorkerConnection(&ServiceWorkerProvider::singleton().serviceWorkerConnectionForSession(sessionID));
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (248666 => 248667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h      2019-08-14 10:13:55 UTC (rev 248666)
+++ trunk/Source/WebCore/dom/Document.h 2019-08-14 10:25:00 UTC (rev 248667)
</span><span class="lines">@@ -1092,7 +1092,7 @@
</span><span class="cx">     void registerForPrivateBrowsingStateChangedCallbacks(Element&);
</span><span class="cx">     void unregisterForPrivateBrowsingStateChangedCallbacks(Element&);
</span><span class="cx">     void storageBlockingStateDidChange();
</span><del>-    void privateBrowsingStateDidChange();
</del><ins>+    void privateBrowsingStateDidChange(PAL::SessionID);
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx">     void registerForCaptionPreferencesChangedCallbacks(Element&);
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (248666 => 248667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h       2019-08-14 10:13:55 UTC (rev 248666)
+++ trunk/Source/WebCore/dom/Element.h  2019-08-14 10:25:00 UTC (rev 248667)
</span><span class="lines">@@ -419,7 +419,7 @@
</span><span class="cx">     virtual void mediaVolumeDidChange() { }
</span><span class="cx"> 
</span><span class="cx">     // Use Document::registerForPrivateBrowsingStateChangedCallbacks() to subscribe to this.
</span><del>-    virtual void privateBrowsingStateDidChange() { }
</del><ins>+    virtual void privateBrowsingStateDidChange(PAL::SessionID) { }
</ins><span class="cx"> 
</span><span class="cx">     virtual void willBecomeFullscreenElement();
</span><span class="cx">     virtual void ancestorWillEnterFullscreen() { }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (248666 => 248667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp   2019-08-14 10:13:55 UTC (rev 248666)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp      2019-08-14 10:25:00 UTC (rev 248667)
</span><span class="lines">@@ -6436,13 +6436,12 @@
</span><span class="cx">     MediaPlayer::resetMediaEngines();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void HTMLMediaElement::privateBrowsingStateDidChange()
</del><ins>+void HTMLMediaElement::privateBrowsingStateDidChange(PAL::SessionID sessionID)
</ins><span class="cx"> {
</span><span class="cx">     if (!m_player)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    bool privateMode = document().page() && document().page()->usesEphemeralSession();
-    m_player->setPrivateBrowsingMode(privateMode);
</del><ins>+    m_player->setPrivateBrowsingMode(sessionID.isEphemeral());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> MediaControls* HTMLMediaElement::mediaControls() const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (248666 => 248667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h     2019-08-14 10:13:55 UTC (rev 248666)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h        2019-08-14 10:25:00 UTC (rev 248667)
</span><span class="lines">@@ -456,7 +456,7 @@
</span><span class="cx">     void sourceWasRemoved(HTMLSourceElement&);
</span><span class="cx">     void sourceWasAdded(HTMLSourceElement&);
</span><span class="cx"> 
</span><del>-    void privateBrowsingStateDidChange() override;
</del><ins>+    void privateBrowsingStateDidChange(PAL::SessionID) override;
</ins><span class="cx"> 
</span><span class="cx">     // Media cache management.
</span><span class="cx">     WEBCORE_EXPORT static void setMediaCacheDirectory(const String&);
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (248666 => 248667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp       2019-08-14 10:13:55 UTC (rev 248666)
+++ trunk/Source/WebCore/page/Page.cpp  2019-08-14 10:25:00 UTC (rev 248667)
</span><span class="lines">@@ -2517,7 +2517,7 @@
</span><span class="cx">     for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
</span><span class="cx">         if (!frame->document())
</span><span class="cx">             continue;
</span><del>-        frame->document()->privateBrowsingStateDidChange();
</del><ins>+        frame->document()->privateBrowsingStateDidChange(m_sessionID);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     // Collect the PluginViews in to a vector to ensure that action the plug-in takes
</span></span></pre>
</div>
</div>

</body>
</html>