Changeset 204637 in webkit


Ignore:
Timestamp:
Aug 19, 2016, 11:10:23 AM (9 years ago)
Author:
Simon Fraser
Message:

Rename didLayout(LayoutMilestones) to didReachLayoutMilestone(), and related WK2 functions
​https://bugs.webkit.org/show_bug.cgi?id=160923

Reviewed by Tim Horton.

Source/WebCore:

didLayout(LayoutMilestones) -> didReachLayoutMilestone(LayoutMilestones)
dispatchDidLayout(LayoutMilestones) -> dispatchDidReachLayoutMilestone(LayoutMilestones)

  • dom/Document.cpp:

(WebCore::Document::setVisualUpdatesAllowed):

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

(WebCore::FrameLoader::didReachLayoutMilestone):
(WebCore::FrameLoader::didLayout): Deleted.

  • loader/FrameLoader.h:
  • loader/FrameLoaderClient.h:
  • page/FrameView.cpp:

(WebCore::FrameView::fireLayoutRelatedMilestonesIfNeeded):
(WebCore::FrameView::firePaintRelatedMilestonesIfNeeded):

  • page/LayoutMilestones.h: Formatting
  • page/Page.cpp:

(WebCore::Page::addRelevantRepaintedObject):

Source/WebKit/mac:

  • WebCoreSupport/WebFrameLoaderClient.h:
  • WebCoreSupport/WebFrameLoaderClient.mm:

(WebFrameLoaderClient::dispatchDidReachLayoutMilestone):
(WebFrameLoaderClient::dispatchDidLayout): Deleted.

Source/WebKit/win:

didLayout(LayoutMilestones) -> didReachLayoutMilestone(LayoutMilestones)
dispatchDidLayout(LayoutMilestones) -> dispatchDidReachLayoutMilestone(LayoutMilestones)

  • WebCoreSupport/WebFrameLoaderClient.cpp:

(WebFrameLoaderClient::dispatchDidReachLayoutMilestone):
(WebFrameLoaderClient::dispatchDidLayout): Deleted.

  • WebCoreSupport/WebFrameLoaderClient.h:

Source/WebKit2:

didLayout(LayoutMilestones) -> didReachLayoutMilestone(LayoutMilestones)
dispatchDidLayout(LayoutMilestones) -> dispatchDidReachLayoutMilestone(LayoutMilestones)

Avoided changing functions that are exposed as API/SPI.

  • UIProcess/API/APILoaderClient.h:

(API::LoaderClient::didReachLayoutMilestone):
(API::LoaderClient::didLayout): Deleted.

  • UIProcess/API/C/WKPage.cpp:

(WKPageSetPageLoaderClient):

  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::didLayoutForCustomContentProvider):
(WebKit::WebPageProxy::didReachLayoutMilestone):
(WebKit::WebPageProxy::didLayout): Deleted.

  • UIProcess/WebPageProxy.h:
  • UIProcess/WebPageProxy.messages.in:
  • UIProcess/ios/WebPageProxyIOS.mm:

(WebKit::WebPageProxy::didCommitLayerTree):

  • UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:

(WebKit::RemoteLayerTreeDrawingAreaProxy::commitLayerTree):

  • WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:

(didReachLayoutMilestone):
(setUpPageLoaderClient):
(didLayout): Deleted.

  • WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:

(WebKit::InjectedBundlePageLoaderClient::didReachLayoutMilestone):
(WebKit::InjectedBundlePageLoaderClient::didLayout): Deleted.

  • WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h:
  • WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::dispatchDidReachLayoutMilestone):
(WebKit::WebFrameLoaderClient::dispatchDidLayout): Deleted.

  • WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
  • WebProcess/WebPage/DrawingArea.h:

(WebKit::DrawingArea::dispatchDidReachLayoutMilestone):
(WebKit::DrawingArea::dispatchDidLayout): Deleted.

  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::dispatchDidReachLayoutMilestone):
(WebKit::WebPage::dispatchDidLayout): Deleted.

  • WebProcess/WebPage/WebPage.h:
  • WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
  • WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:

(WebKit::RemoteLayerTreeDrawingArea::dispatchDidReachLayoutMilestone):
(WebKit::RemoteLayerTreeDrawingArea::dispatchDidLayout): Deleted.

Location:
trunk/Source
Files:
33 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r204631 r204637  
     12016-08-16  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Rename didLayout(LayoutMilestones) to didReachLayoutMilestone(), and related WK2 functions
     4        https://bugs.webkit.org/show_bug.cgi?id=160923
     5
     6        Reviewed by Tim Horton.
     7
     8        didLayout(LayoutMilestones) -> didReachLayoutMilestone(LayoutMilestones)
     9        dispatchDidLayout(LayoutMilestones) -> dispatchDidReachLayoutMilestone(LayoutMilestones)
     10
     11        * dom/Document.cpp:
     12        (WebCore::Document::setVisualUpdatesAllowed):
     13        * loader/EmptyClients.h:
     14        * loader/FrameLoader.cpp:
     15        (WebCore::FrameLoader::didReachLayoutMilestone):
     16        (WebCore::FrameLoader::didLayout): Deleted.
     17        * loader/FrameLoader.h:
     18        * loader/FrameLoaderClient.h:
     19        * page/FrameView.cpp:
     20        (WebCore::FrameView::fireLayoutRelatedMilestonesIfNeeded):
     21        (WebCore::FrameView::firePaintRelatedMilestonesIfNeeded):
     22        * page/LayoutMilestones.h: Formatting
     23        * page/Page.cpp:
     24        (WebCore::Page::addRelevantRepaintedObject):
     25
    1262016-08-19  Chris Dumez  <cdumez@apple.com>
    227

  • trunk/Source/WebCore/dom/Document.cpp

    r204521 r204637  
    13061306            frameView->addPaintPendingMilestones(DidFirstPaintAfterSuppressedIncrementalRendering);
    13071307            if (page->requestedLayoutMilestones() & DidFirstLayoutAfterSuppressedIncrementalRendering)
    1308                 frame()->loader().didLayout(DidFirstLayoutAfterSuppressedIncrementalRendering);
     1308                frame()->loader().didReachLayoutMilestone(DidFirstLayoutAfterSuppressedIncrementalRendering);
    13091309        }
    13101310    }

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

    r204508 r204637  
    301301    void dispatchDidFinishDocumentLoad() override { }
    302302    void dispatchDidFinishLoad() override { }
    303     void dispatchDidLayout(LayoutMilestones) override { }
     303    void dispatchDidReachLayoutMilestone(LayoutMilestones) override { }
    304304
    305305    Frame* dispatchCreatePage(const NavigationAction&) override { return nullptr; }

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

    r204472 r204637  
    23842384}
    23852385
    2386 void FrameLoader::didLayout(LayoutMilestones milestones)
     2386void FrameLoader::didReachLayoutMilestone(LayoutMilestones milestones)
    23872387{
    23882388    ASSERT(m_frame.isMainFrame());
    23892389
    2390     m_client.dispatchDidLayout(milestones);
     2390    m_client.dispatchDidReachLayoutMilestone(milestones);
    23912391}
    23922392

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

    r203720 r204637  
    191191    CachePolicy subresourceCachePolicy() const;
    192192
    193     void didLayout(LayoutMilestones);
     193    void didReachLayoutMilestone(LayoutMilestones);
    194194    void didFirstLayout();
    195195

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

    r203003 r204637  
    175175
    176176        virtual void dispatchDidLayout() { }
    177         virtual void dispatchDidLayout(LayoutMilestones) { }
     177        virtual void dispatchDidReachLayoutMilestone(LayoutMilestones) { }
    178178
    179179        virtual Frame* dispatchCreatePage(const NavigationAction&) = 0;

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

    r204320 r204637  
    48504850
    48514851    if (milestonesAchieved && frame().isMainFrame())
    4852         frame().loader().didLayout(milestonesAchieved);
     4852        frame().loader().didReachLayoutMilestone(milestonesAchieved);
    48534853}
    48544854
    … …  
    48754875
    48764876    if (milestonesAchieved)
    4877         page->mainFrame().loader().didLayout(milestonesAchieved);
     4877        page->mainFrame().loader().didReachLayoutMilestone(milestonesAchieved);
    48784878}
    48794879

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

    r176097 r204637  
    3333// two enums -- one for painting and one for layout.
    3434enum LayoutMilestoneFlag {
    35     DidFirstLayout = 1 << 0,
    36     DidFirstVisuallyNonEmptyLayout = 1 << 1,
    37     DidHitRelevantRepaintedObjectsAreaThreshold = 1 << 2,
    38     DidFirstFlushForHeaderLayer = 1 << 3,
    39     DidFirstLayoutAfterSuppressedIncrementalRendering = 1 << 4,
    40     DidFirstPaintAfterSuppressedIncrementalRendering = 1 << 5,
    41     ReachedSessionRestorationRenderTreeSizeThreshold = 1 << 6 // FIXME: only implemented by WK2 currently.
     35    DidFirstLayout                                      = 1 << 0,
     36    DidFirstVisuallyNonEmptyLayout                      = 1 << 1,
     37    DidHitRelevantRepaintedObjectsAreaThreshold         = 1 << 2,
     38    DidFirstFlushForHeaderLayer                         = 1 << 3,
     39    DidFirstLayoutAfterSuppressedIncrementalRendering   = 1 << 4,
     40    DidFirstPaintAfterSuppressedIncrementalRendering    = 1 << 5,
     41    ReachedSessionRestorationRenderTreeSizeThreshold    = 1 << 6 // FIXME: only implemented by WK2 currently.
    4242};
    4343

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

    r204466 r204637  
    17301730        resetRelevantPaintedObjectCounter();
    17311731        if (Frame* frame = &mainFrame())
    1732             frame->loader().didLayout(DidHitRelevantRepaintedObjectsAreaThreshold);
     1732            frame->loader().didReachLayoutMilestone(DidHitRelevantRepaintedObjectsAreaThreshold);
    17331733    }
    17341734}

  • trunk/Source/WebKit/mac/ChangeLog

    r204627 r204637  
     12016-08-16  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Rename didLayout(LayoutMilestones) to didReachLayoutMilestone(), and related WK2 functions
     4        https://bugs.webkit.org/show_bug.cgi?id=160923
     5
     6        Reviewed by Tim Horton.
     7
     8        * WebCoreSupport/WebFrameLoaderClient.h:
     9        * WebCoreSupport/WebFrameLoaderClient.mm:
     10        (WebFrameLoaderClient::dispatchDidReachLayoutMilestone):
     11        (WebFrameLoaderClient::dispatchDidLayout): Deleted.
     12
    1132016-08-18  Daniel Bates  <dabates@apple.com>
    214

  • trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h

    r204053 r204637  
    117117    void dispatchDidFinishDocumentLoad() override;
    118118    void dispatchDidFinishLoad() override;
    119     void dispatchDidLayout(WebCore::LayoutMilestones) override;
     119    void dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones) override;
    120120
    121121    WebCore::Frame* dispatchCreatePage(const WebCore::NavigationAction&) override;

  • trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm

    r204462 r204637  
    785785}
    786786
    787 void WebFrameLoaderClient::dispatchDidLayout(LayoutMilestones milestones)
     787void WebFrameLoaderClient::dispatchDidReachLayoutMilestone(LayoutMilestones milestones)
    788788{
    789789    WebView *webView = getWebView(m_webFrame.get());

  • trunk/Source/WebKit/win/ChangeLog

    r204617 r204637  
     12016-08-16  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Rename didLayout(LayoutMilestones) to didReachLayoutMilestone(), and related WK2 functions
     4        https://bugs.webkit.org/show_bug.cgi?id=160923
     5
     6        Reviewed by Tim Horton.
     7
     8        didLayout(LayoutMilestones) -> didReachLayoutMilestone(LayoutMilestones)
     9        dispatchDidLayout(LayoutMilestones) -> dispatchDidReachLayoutMilestone(LayoutMilestones)
     10
     11        * WebCoreSupport/WebFrameLoaderClient.cpp:
     12        (WebFrameLoaderClient::dispatchDidReachLayoutMilestone):
     13        (WebFrameLoaderClient::dispatchDidLayout): Deleted.
     14        * WebCoreSupport/WebFrameLoaderClient.h:
     15
    1162016-08-18  Anders Carlsson  <andersca@apple.com>
    217

  • trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp

    r204320 r204637  
    470470}
    471471
    472 void WebFrameLoaderClient::dispatchDidLayout(LayoutMilestones milestones)
     472void WebFrameLoaderClient::dispatchDidReachLayoutMilestone(LayoutMilestones milestones)
    473473{
    474474    WebView* webView = m_webFrame->webView();

  • trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h

    r202410 r204637  
    9292    void dispatchDidFinishDocumentLoad() override;
    9393    void dispatchDidFinishLoad() override;
    94     void dispatchDidLayout(WebCore::LayoutMilestones) override;
     94    void dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones) override;
    9595
    9696    void dispatchDecidePolicyForResponse(const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, WebCore::FramePolicyFunction) override;

  • trunk/Source/WebKit2/ChangeLog

    r204627 r204637  
     12016-08-16  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Rename didLayout(LayoutMilestones) to didReachLayoutMilestone(), and related WK2 functions
     4        https://bugs.webkit.org/show_bug.cgi?id=160923
     5
     6        Reviewed by Tim Horton.
     7
     8        didLayout(LayoutMilestones) -> didReachLayoutMilestone(LayoutMilestones)
     9        dispatchDidLayout(LayoutMilestones) -> dispatchDidReachLayoutMilestone(LayoutMilestones)
     10
     11        Avoided changing functions that are exposed as API/SPI.
     12
     13        * UIProcess/API/APILoaderClient.h:
     14        (API::LoaderClient::didReachLayoutMilestone):
     15        (API::LoaderClient::didLayout): Deleted.
     16        * UIProcess/API/C/WKPage.cpp:
     17        (WKPageSetPageLoaderClient):
     18        * UIProcess/WebPageProxy.cpp:
     19        (WebKit::WebPageProxy::didLayoutForCustomContentProvider):
     20        (WebKit::WebPageProxy::didReachLayoutMilestone):
     21        (WebKit::WebPageProxy::didLayout): Deleted.
     22        * UIProcess/WebPageProxy.h:
     23        * UIProcess/WebPageProxy.messages.in:
     24        * UIProcess/ios/WebPageProxyIOS.mm:
     25        (WebKit::WebPageProxy::didCommitLayerTree):
     26        * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
     27        (WebKit::RemoteLayerTreeDrawingAreaProxy::commitLayerTree):
     28        * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:
     29        (didReachLayoutMilestone):
     30        (setUpPageLoaderClient):
     31        (didLayout): Deleted.
     32        * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:
     33        (WebKit::InjectedBundlePageLoaderClient::didReachLayoutMilestone):
     34        (WebKit::InjectedBundlePageLoaderClient::didLayout): Deleted.
     35        * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h:
     36        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
     37        (WebKit::WebFrameLoaderClient::dispatchDidReachLayoutMilestone):
     38        (WebKit::WebFrameLoaderClient::dispatchDidLayout): Deleted.
     39        * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
     40        * WebProcess/WebPage/DrawingArea.h:
     41        (WebKit::DrawingArea::dispatchDidReachLayoutMilestone):
     42        (WebKit::DrawingArea::dispatchDidLayout): Deleted.
     43        * WebProcess/WebPage/WebPage.cpp:
     44        (WebKit::WebPage::dispatchDidReachLayoutMilestone):
     45        (WebKit::WebPage::dispatchDidLayout): Deleted.
     46        * WebProcess/WebPage/WebPage.h:
     47        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
     48        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
     49        (WebKit::RemoteLayerTreeDrawingArea::dispatchDidReachLayoutMilestone):
     50        (WebKit::RemoteLayerTreeDrawingArea::dispatchDidLayout): Deleted.
     51
    1522016-08-18  Daniel Bates  <dabates@apple.com>
    253

  • trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h

    r191906 r204637  
    7676    virtual void didDetectXSSForFrame(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, API::Object*) { }
    7777
    78     virtual void didLayout(WebKit::WebPageProxy&, WebCore::LayoutMilestones) { }
     78    virtual void didReachLayoutMilestone(WebKit::WebPageProxy&, WebCore::LayoutMilestones) { }
    7979   
    8080    virtual bool canAuthenticateAgainstProtectionSpaceInFrame(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, WebKit::WebProtectionSpace*) { return false; }

  • trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp

    r204284 r204637  
    10881088        }
    10891089
    1090         void didLayout(WebPageProxy& page, LayoutMilestones milestones) override
     1090        void didReachLayoutMilestone(WebPageProxy& page, LayoutMilestones milestones) override
    10911091        {
    10921092            if (!m_client.didLayout)

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r204472 r204637  
    34703470void WebPageProxy::didLayoutForCustomContentProvider()
    34713471{
    3472     didLayout(DidFirstLayout | DidFirstVisuallyNonEmptyLayout | DidHitRelevantRepaintedObjectsAreaThreshold);
    3473 }
    3474 
    3475 void WebPageProxy::didLayout(uint32_t layoutMilestones)
     3472    didReachLayoutMilestone(DidFirstLayout | DidFirstVisuallyNonEmptyLayout | DidHitRelevantRepaintedObjectsAreaThreshold);
     3473}
     3474
     3475void WebPageProxy::didReachLayoutMilestone(uint32_t layoutMilestones)
    34763476{
    34773477    PageClientProtector protector(m_pageClient);
    … …  
    34803480        m_navigationClient->renderingProgressDidChange(*this, static_cast<LayoutMilestones>(layoutMilestones));
    34813481    else
    3482         m_loaderClient->didLayout(*this, static_cast<LayoutMilestones>(layoutMilestones));
     3482        m_loaderClient->didReachLayoutMilestone(*this, static_cast<LayoutMilestones>(layoutMilestones));
    34833483}
    34843484

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r204318 r204637  
    11011101    void callAfterNextPresentationUpdate(std::function<void (CallbackBase::Error)>);
    11021102
    1103     void didLayout(uint32_t layoutMilestones);
     1103    void didReachLayoutMilestone(uint32_t layoutMilestones);
    11041104
    11051105    void didRestoreScrollPosition();

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in

    r203312 r204637  
    133133    DidFirstLayoutForFrame(uint64_t frameID, WebKit::UserData userData)
    134134    DidFirstVisuallyNonEmptyLayoutForFrame(uint64_t frameID, WebKit::UserData userData)
    135     DidLayout(uint32_t type)
     135    DidReachLayoutMilestone(uint32_t type)
    136136    DidReceiveTitleForFrame(uint64_t frameID, String title, WebKit::UserData userData)
    137137    DidDisplayInsecureContentForFrame(uint64_t frameID, WebKit::UserData userData)

  • trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm

    r203842 r204637  
    365365        && exceedsRenderTreeSizeSizeThreshold(m_sessionRestorationRenderTreeSize, layerTreeTransaction.renderTreeSize())) {
    366366        m_hitRenderTreeSizeThreshold = true;
    367         didLayout(WebCore::ReachedSessionRestorationRenderTreeSizeThreshold);
     367        didReachLayoutMilestone(WebCore::ReachedSessionRestorationRenderTreeSizeThreshold);
    368368    }
    369369

  • trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm

    r204057 r204637  
    237237
    238238    if (auto milestones = layerTreeTransaction.newlyReachedLayoutMilestones())
    239         m_webPageProxy.didLayout(milestones);
     239        m_webPageProxy.didReachLayoutMilestone(milestones);
    240240
    241241    for (auto& callbackID : layerTreeTransaction.callbackIDs()) {

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm

    r199040 r204637  
    183183}
    184184
    185 static void didLayout(WKBundlePageRef page, WKLayoutMilestones milestones, WKTypeRef* userData, const void *clientInfo)
     185static void didReachLayoutMilestone(WKBundlePageRef page, WKLayoutMilestones milestones, WKTypeRef* userData, const void *clientInfo)
    186186{
    187187    WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
    … …  
    250250
    251251    client.didLayoutForFrame = didLayoutForFrame;
    252     client.didLayout = didLayout;
     252    client.didLayout = didReachLayoutMilestone;
    253253
    254254    page.initializeInjectedBundleLoaderClient(&client.base);

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp

    r183105 r204637  
    253253}
    254254
    255 void InjectedBundlePageLoaderClient::didLayout(WebPage* page, LayoutMilestones milestones, RefPtr<API::Object>& userData)
     255void InjectedBundlePageLoaderClient::didReachLayoutMilestone(WebPage* page, LayoutMilestones milestones, RefPtr<API::Object>& userData)
    256256{
    257257    if (!m_client.didLayout)

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h

    r170330 r204637  
    8585    void didFirstVisuallyNonEmptyLayoutForFrame(WebPage*, WebFrame*, RefPtr<API::Object>& userData);
    8686    void didLayoutForFrame(WebPage*, WebFrame*);
    87     void didLayout(WebPage*, WebCore::LayoutMilestones, RefPtr<API::Object>& userData);
     87    void didReachLayoutMilestone(WebPage*, WebCore::LayoutMilestones, RefPtr<API::Object>& userData);
    8888
    8989    void didClearWindowObjectForFrame(WebPage*, WebFrame*, WebCore::DOMWrapperWorld&);

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

    r204320 r204637  
    567567}
    568568
    569 void WebFrameLoaderClient::dispatchDidLayout(LayoutMilestones milestones)
     569void WebFrameLoaderClient::dispatchDidReachLayoutMilestone(LayoutMilestones milestones)
    570570{
    571571    WebPage* webPage = m_frame->page();
    … …  
    596596
    597597    // Send this after DidFirstLayout-specific calls since some clients expect to get those messages first.
    598     webPage->dispatchDidLayout(milestones);
     598    webPage->dispatchDidReachLayoutMilestone(milestones);
    599599
    600600    if (milestones & DidFirstVisuallyNonEmptyLayout) {

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

    r203003 r204637  
    103103    void dispatchDidFinishLoad() override;
    104104
    105     void dispatchDidLayout(WebCore::LayoutMilestones) override;
     105    void dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones) override;
    106106    void dispatchDidLayout() override;
    107107

  • trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h

    r204013 r204637  
    132132    virtual void setShouldScaleViewToFitDocument(bool) { }
    133133
    134     virtual bool dispatchDidLayout(WebCore::LayoutMilestones) { return false; }
     134    virtual bool dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones) { return false; }
    135135
    136136#if PLATFORM(COCOA)

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r204472 r204637  
    54365436}
    54375437
    5438 void WebPage::dispatchDidLayout(WebCore::LayoutMilestones milestones)
     5438void WebPage::dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones milestones)
    54395439{
    54405440    RefPtr<API::Object> userData;
    5441     injectedBundleLoaderClient().didLayout(this, milestones, userData);
     5441    injectedBundleLoaderClient().didReachLayoutMilestone(this, milestones, userData);
    54425442
    54435443    // Clients should not set userData for this message, and it won't be passed through.
    … …  
    54455445
    54465446    // The drawing area might want to defer dispatch of didLayout to the UI process.
    5447     if (m_drawingArea && m_drawingArea->dispatchDidLayout(milestones))
    5448         return;
    5449 
    5450     send(Messages::WebPageProxy::DidLayout(milestones));
     5447    if (m_drawingArea && m_drawingArea->dispatchDidReachLayoutMilestone(milestones))
     5448        return;
     5449
     5450    send(Messages::WebPageProxy::DidReachLayoutMilestone(milestones));
    54515451}
    54525452

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

    r204318 r204637  
    938938    void removeAllUserContent();
    939939
    940     void dispatchDidLayout(WebCore::LayoutMilestones);
     940    void dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones);
    941941
    942942    void didRestoreScrollPosition();

  • trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h

    r201441 r204637  
    111111    bool adjustLayerFlushThrottling(WebCore::LayerFlushThrottleState::Flags) override;
    112112
    113     bool dispatchDidLayout(WebCore::LayoutMilestones) override;
     113    bool dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones) override;
    114114
    115115    void updateScrolledExposedRect();

  • trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm

    r202297 r204637  
    512512}
    513513
    514 bool RemoteLayerTreeDrawingArea::dispatchDidLayout(WebCore::LayoutMilestones layoutMilestones)
     514bool RemoteLayerTreeDrawingArea::dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones layoutMilestones)
    515515{
    516516    m_pendingNewlyReachedLayoutMilestones |= layoutMilestones;
Note: See TracChangeset for help on using the changeset viewer.