Changeset 254857 in webkit

Timestamp:

Jan 21, 2020 9:52:52 AM (4 years ago)

Author:

Chris Dumez

Message:

Unreviewed, rolling out r254753.

It turns out this is not dead code

Reverted changeset:

"Drop dead code related to local storage prewarming"
​https://bugs.webkit.org/show_bug.cgi?id=206418
​https://trac.webkit.org/changeset/254753

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/DocumentLoader.cpp (modified) (1 diff)
• page/DOMWindow.cpp (modified) (1 diff)
• page/DOMWindow.h (modified) (1 diff)
• page/Frame.cpp (modified) (2 diffs)
• page/Frame.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-01-21  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed, rolling out r254753.
+
+        It turns out this is not dead code
+
+        Reverted changeset:
+
+        "Drop dead code related to local storage prewarming"
+        https://bugs.webkit.org/show_bug.cgi?id=206418
+        https://trac.webkit.org/changeset/254753
+
 2020-01-21  Sihui Liu  <sihui_liu@apple.com>
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -1093 +1093 @@
             return;
 
+        if (auto* window = m_frame->document()->domWindow())
+            window->prewarmLocalStorageIfNecessary();
+
         bool userChosen;
         String encoding;

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -440 +440 @@
 }
 
+void DOMWindow::prewarmLocalStorageIfNecessary()
+{
+    auto* page = this->page();
+
+    // No need to prewarm for ephemeral sessions since the data is in memory only.
+    if (!page || page->usesEphemeralSession())
+        return;
+
+    if (!page->mainFrame().mayPrewarmLocalStorage())
+        return;
+
+    auto localStorageResult = this->localStorage();
+    if (localStorageResult.hasException())
+        return;
+
+    auto* localStorage = localStorageResult.returnValue();
+    if (!localStorage)
+        return;
+
+    page->mainFrame().didPrewarmLocalStorage();
+}
+
 DOMWindow::~DOMWindow()
 {

trunk/Source/WebCore/page/DOMWindow.h

@@ -204 +204 @@
     void showModalDialog(const String& urlString, const String& dialogFeaturesString, DOMWindow& activeWindow, DOMWindow& firstWindow, const WTF::Function<void(DOMWindow&)>& prepareDialogFunction);
 
+    void prewarmLocalStorageIfNecessary();
+
     void alert(const String& message = emptyString());
     bool confirmForBindings(const String& message);

trunk/Source/WebCore/page/Frame.cpp

@@ -118 +118 @@
 DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, frameCounter, ("Frame"));
 
+// We prewarm local storage for at most 5 origins in a given page.
+static const unsigned maxlocalStoragePrewarmingCount { 5 };
+
 static inline Frame* parentFromOwnerElement(HTMLFrameOwnerElement* ownerElement)
 {
@@ -986 +989 @@
 }
 
+void Frame::didPrewarmLocalStorage()
+{
+    ASSERT(isMainFrame());
+    ASSERT(m_localStoragePrewarmingCount < maxlocalStoragePrewarmingCount);
+    ++m_localStoragePrewarmingCount;
+}
+
+bool Frame::mayPrewarmLocalStorage() const
+{
+    ASSERT(isMainFrame());
+    return m_localStoragePrewarmingCount < maxlocalStoragePrewarmingCount;
+}
+
 void Frame::selfOnlyRef()
 {

trunk/Source/WebCore/page/Frame.h

@@ -292 +292 @@
     WEBCORE_EXPORT bool isAlwaysOnLoggingAllowed() const;
 
+    void didPrewarmLocalStorage();
+    bool mayPrewarmLocalStorage() const;
+
 // ========
 
@@ -354 +357 @@
     unsigned m_selfOnlyRefCount { 0 };
     bool m_hasHadUserInteraction { false };
+    unsigned m_localStoragePrewarmingCount { 0 };
 
 protected: