Changeset 248667 in webkit

Timestamp:

Aug 14, 2019 3:25:00 AM (5 years ago)

Author:

youenn@apple.com

Message:

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• dom/Document.h (modified) (1 diff)
• dom/Element.h (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (1 diff)
• html/HTMLMediaElement.h (modified) (1 diff)
• page/Page.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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):
+
 2019-08-13  Sam Weinig  <weinig@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -5263 +5263 @@
 }
 
-void Document::privateBrowsingStateDidChange() 
-{
-    m_sessionID = SessionID::emptySessionID();
+void Document::privateBrowsingStateDidChange(PAL::SessionID sessionID)
+{
+    m_sessionID = sessionID;
     if (m_logger)
-        m_logger->setEnabled(this, sessionID().isAlwaysOnLoggingAllowed());
+        m_logger->setEnabled(this, sessionID.isAlwaysOnLoggingAllowed());
 
     for (auto* element : m_privateBrowsingStateChangedElements)
-        element->privateBrowsingStateDidChange();
+        element->privateBrowsingStateDidChange(sessionID);
 
 #if ENABLE(SERVICE_WORKER)
-    ASSERT(sessionID().isValid());
-    if (RuntimeEnabledFeatures::sharedFeatures().serviceWorkerEnabled() && m_serviceWorkerConnection && sessionID().isValid())
-        setServiceWorkerConnection(&ServiceWorkerProvider::singleton().serviceWorkerConnectionForSession(sessionID()));
+    ASSERT(sessionID.isValid());
+    if (RuntimeEnabledFeatures::sharedFeatures().serviceWorkerEnabled() && m_serviceWorkerConnection && sessionID.isValid())
+        setServiceWorkerConnection(&ServiceWorkerProvider::singleton().serviceWorkerConnectionForSession(sessionID));
 #endif
 }

trunk/Source/WebCore/dom/Document.h

@@ -1093 +1093 @@
     void unregisterForPrivateBrowsingStateChangedCallbacks(Element&);
     void storageBlockingStateDidChange();
-    void privateBrowsingStateDidChange();
+    void privateBrowsingStateDidChange(PAL::SessionID);
 
 #if ENABLE(VIDEO_TRACK)

trunk/Source/WebCore/dom/Element.h

@@ -420 +420 @@
 
     // Use Document::registerForPrivateBrowsingStateChangedCallbacks() to subscribe to this.
-    virtual void privateBrowsingStateDidChange() { }
+    virtual void privateBrowsingStateDidChange(PAL::SessionID) { }
 
     virtual void willBecomeFullscreenElement();

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -6437 +6437 @@
 }
 
-void HTMLMediaElement::privateBrowsingStateDidChange()
+void HTMLMediaElement::privateBrowsingStateDidChange(PAL::SessionID sessionID)
 {
     if (!m_player)
         return;
 
-    bool privateMode = document().page() && document().page()->usesEphemeralSession();
-    m_player->setPrivateBrowsingMode(privateMode);
+    m_player->setPrivateBrowsingMode(sessionID.isEphemeral());
 }
 

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -457 +457 @@
     void sourceWasAdded(HTMLSourceElement&);
 
-    void privateBrowsingStateDidChange() override;
+    void privateBrowsingStateDidChange(PAL::SessionID) override;
 
     // Media cache management.

trunk/Source/WebCore/page/Page.cpp

@@ -2518 +2518 @@
         if (!frame->document())
             continue;
-        frame->document()->privateBrowsingStateDidChange();
+        frame->document()->privateBrowsingStateDidChange(m_sessionID);
     }