Changeset 162226 in webkit


Ignore:
Timestamp:
Jan 17, 2014 2:59:21 PM (10 years ago)
Author:
andersca@apple.com
Message:

Remove FrameLoaderClient::didPerformFirstNavigation()
​https://bugs.webkit.org/show_bug.cgi?id=127191

Reviewed by Dan Bernstein.

Source/WebCore:

  • loader/EmptyClients.h:
  • loader/FrameLoader.cpp:

(WebCore::FrameLoader::FrameLoader):

  • loader/FrameLoader.h:
  • loader/FrameLoaderClient.h:
  • loader/HistoryController.cpp:

(WebCore::HistoryController::updateBackForwardListClippedAtTarget):

Source/WebKit2:

  • WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
  • WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
Location:
trunk/Source
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r162224 r162226  
     12014-01-17  Anders Carlsson  <andersca@apple.com>
     2
     3        Remove FrameLoaderClient::didPerformFirstNavigation()
     4        https://bugs.webkit.org/show_bug.cgi?id=127191
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * loader/EmptyClients.h:
     9        * loader/FrameLoader.cpp:
     10        (WebCore::FrameLoader::FrameLoader):
     11        * loader/FrameLoader.h:
     12        * loader/FrameLoaderClient.h:
     13        * loader/HistoryController.cpp:
     14        (WebCore::HistoryController::updateBackForwardListClippedAtTarget):
     15
    1162014-01-17  Anders Carlsson  <andersca@apple.com>
    217

  • trunk/Source/WebCore/loader/EmptyClients.h

    r162139 r162226  
    394394    virtual void dispatchDidClearWindowObjectInWorld(DOMWrapperWorld&) override { }
    395395    virtual void documentElementAvailable() override { }
    396     virtual void didPerformFirstNavigation() const override { }
    397396
    398397    virtual void registerForIconNotification(bool) override { }

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

    r161768 r162226  
    247247    , m_shouldCallCheckLoadComplete(false)
    248248    , m_opener(nullptr)
    249     , m_didPerformFirstNavigation(false)
    250249    , m_loadingFromCachedPage(false)
    251250    , m_suppressOpenerInNewFrame(false)
    … …  
    31443143        return false;
    31453144    return ownerElement->fastHasAttribute(srcdocAttr);
    3146 }
    3147 
    3148 void FrameLoader::checkDidPerformFirstNavigation()
    3149 {
    3150     Page* page = m_frame.page();
    3151     if (!page)
    3152         return;
    3153 
    3154     if (!m_didPerformFirstNavigation && page->backForward().currentItem() && !page->backForward().backItem() && !page->backForward().forwardItem()) {
    3155         m_didPerformFirstNavigation = true;
    3156         m_client.didPerformFirstNavigation();
    3157     }
    31583145}
    31593146

  • trunk/Source/WebCore/loader/FrameLoader.h

    r161768 r162226  
    241241    void checkCompleted();
    242242
    243     void checkDidPerformFirstNavigation();
    244 
    245243    bool isComplete() const;
    246244
    … …  
    437435    HashSet<Frame*> m_openedFrames;
    438436
    439     bool m_didPerformFirstNavigation;
    440437    bool m_loadingFromCachedPage;
    441438    bool m_suppressOpenerInNewFrame;

  • trunk/Source/WebCore/loader/FrameLoaderClient.h

    r162224 r162226  
    283283        virtual void dispatchDidClearWindowObjectInWorld(DOMWrapperWorld&) = 0;
    284284        virtual void documentElementAvailable() = 0;
    285         virtual void didPerformFirstNavigation() const { }
    286285
    287286        virtual void registerForIconNotification(bool listen = true) = 0;

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

    r161593 r162226  
    800800    FrameLoader& frameLoader = m_frame.mainFrame().loader();
    801801
    802     frameLoader.checkDidPerformFirstNavigation();
    803 
    804802    RefPtr<HistoryItem> topItem = frameLoader.history().createItemTree(m_frame, doClip);
    805803    LOG(BackForward, "WebCoreBackForward - Adding backforward item %p for frame %s", topItem.get(), m_frame.loader().documentLoader()->url().string().ascii().data());

  • trunk/Source/WebKit2/ChangeLog

    r162215 r162226  
     12014-01-17  Anders Carlsson  <andersca@apple.com>
     2
     3        Remove FrameLoaderClient::didPerformFirstNavigation()
     4        https://bugs.webkit.org/show_bug.cgi?id=127191
     5
     6        Reviewed by Dan Bernstein.
     7
     8        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
     9        * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
     10
    1112014-01-17  Manuel Rego Casasnovas  <rego@igalia.com>
    212

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

    r162141 r162226  
    15081508}
    15091509
    1510 void WebFrameLoaderClient::didPerformFirstNavigation() const
    1511 {
    1512     notImplemented();
    1513 }
    1514 
    15151510void WebFrameLoaderClient::registerForIconNotification(bool /*listen*/)
    15161511{

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h

    r162143 r162226  
    210210
    211211    virtual void documentElementAvailable() override;
    212     virtual void didPerformFirstNavigation() const override; // "Navigation" here means a transition from one page to another that ends up in the back/forward list.
    213    
     212
    214213    virtual void registerForIconNotification(bool listen = true) override;
    215214   
Note: See TracChangeset for help on using the changeset viewer.