Changeset 254753 in webkit


Ignore:
Timestamp:
Jan 17, 2020 10:45:34 AM (4 years ago)
Author:
Chris Dumez
Message:

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

Reviewed by Sam Weinig.

Drop dead code related to local storage prewarming. Sihui neutered it in <​https://trac.webkit.org/changeset/248734>
but did not remove the code.

  • loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::commitData):

  • page/DOMWindow.cpp:

(WebCore::DOMWindow::prewarmLocalStorageIfNecessary): Deleted.

  • page/DOMWindow.h:
  • page/Frame.cpp:

(WebCore::Frame::didPrewarmLocalStorage): Deleted.
(WebCore::Frame::mayPrewarmLocalStorage const): Deleted.

  • page/Frame.h:
Location:
trunk/Source/WebCore
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r254751 r254753  
     12020-01-17  Chris Dumez  <cdumez@apple.com>
     2
     3        Drop dead code related to local storage prewarming
     4        https://bugs.webkit.org/show_bug.cgi?id=206418
     5
     6        Reviewed by Sam Weinig.
     7
     8        Drop dead code related to local storage prewarming. Sihui neutered it in <https://trac.webkit.org/changeset/248734>
     9        but did not remove the code.
     10
     11        * loader/DocumentLoader.cpp:
     12        (WebCore::DocumentLoader::commitData):
     13        * page/DOMWindow.cpp:
     14        (WebCore::DOMWindow::prewarmLocalStorageIfNecessary): Deleted.
     15        * page/DOMWindow.h:
     16        * page/Frame.cpp:
     17        (WebCore::Frame::didPrewarmLocalStorage): Deleted.
     18        (WebCore::Frame::mayPrewarmLocalStorage const): Deleted.
     19        * page/Frame.h:
     20
    1212020-01-17  Adrian Perez de Castro  <aperez@igalia.com>
    222

  • trunk/Source/WebCore/loader/DocumentLoader.cpp

    r254662 r254753  
    10931093            return;
    10941094
    1095         if (auto* window = m_frame->document()->domWindow())
    1096             window->prewarmLocalStorageIfNecessary();
    1097 
    10981095        bool userChosen;
    10991096        String encoding;

  • trunk/Source/WebCore/page/DOMWindow.cpp

    r254178 r254753  
    440440}
    441441
    442 void DOMWindow::prewarmLocalStorageIfNecessary()
    443 {
    444     auto* page = this->page();
    445 
    446     // No need to prewarm for ephemeral sessions since the data is in memory only.
    447     if (!page || page->usesEphemeralSession())
    448         return;
    449 
    450     if (!page->mainFrame().mayPrewarmLocalStorage())
    451         return;
    452 
    453     auto localStorageResult = this->localStorage();
    454     if (localStorageResult.hasException())
    455         return;
    456 
    457     auto* localStorage = localStorageResult.returnValue();
    458     if (!localStorage)
    459         return;
    460 
    461     page->mainFrame().didPrewarmLocalStorage();
    462 }
    463 
    464442DOMWindow::~DOMWindow()
    465443{

  • trunk/Source/WebCore/page/DOMWindow.h

    r254178 r254753  
    204204    void showModalDialog(const String& urlString, const String& dialogFeaturesString, DOMWindow& activeWindow, DOMWindow& firstWindow, const WTF::Function<void(DOMWindow&)>& prepareDialogFunction);
    205205
    206     void prewarmLocalStorageIfNecessary();
    207 
    208206    void alert(const String& message = emptyString());
    209207    bool confirmForBindings(const String& message);

  • trunk/Source/WebCore/page/Frame.cpp

    r253634 r254753  
    118118DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, frameCounter, ("Frame"));
    119119
    120 // We prewarm local storage for at most 5 origins in a given page.
    121 static const unsigned maxlocalStoragePrewarmingCount { 5 };
    122 
    123120static inline Frame* parentFromOwnerElement(HTMLFrameOwnerElement* ownerElement)
    124121{
    … …  
    989986}
    990987
    991 void Frame::didPrewarmLocalStorage()
    992 {
    993     ASSERT(isMainFrame());
    994     ASSERT(m_localStoragePrewarmingCount < maxlocalStoragePrewarmingCount);
    995     ++m_localStoragePrewarmingCount;
    996 }
    997 
    998 bool Frame::mayPrewarmLocalStorage() const
    999 {
    1000     ASSERT(isMainFrame());
    1001     return m_localStoragePrewarmingCount < maxlocalStoragePrewarmingCount;
    1002 }
    1003 
    1004988void Frame::selfOnlyRef()
    1005989{

  • trunk/Source/WebCore/page/Frame.h

    r251273 r254753  
    292292    WEBCORE_EXPORT bool isAlwaysOnLoggingAllowed() const;
    293293
    294     void didPrewarmLocalStorage();
    295     bool mayPrewarmLocalStorage() const;
    296 
    297294// ========
    298295
    … …  
    357354    unsigned m_selfOnlyRefCount { 0 };
    358355    bool m_hasHadUserInteraction { false };
    359     unsigned m_localStoragePrewarmingCount { 0 };
    360356
    361357protected:
Note: See TracChangeset for help on using the changeset viewer.