⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 259752 in webkit


Ignore:
Timestamp:
Apr 8, 2020, 1:14:50 PM (6 years ago)
Author:
commit-queue@webkit.org
Message:

Make more use of FrameLoader pageID/frameID getters
​https://bugs.webkit.org/show_bug.cgi?id=210182

Patch by Rob Buis <​rbuis@igalia.com> on 2020-04-08
Reviewed by Chris Dumez.

Make more use of FrameLoader pageID/frameID getters, before
this change they were only used internally in FrameLoader.

Source/WebCore:

  • dom/Document.cpp:

(WebCore::Document::pageID const):
(WebCore::Document::frameID const):

  • html/HTMLAnchorElement.cpp:

(WebCore::HTMLAnchorElement::handleClick):

  • loader/CookieJar.cpp:

(WebCore::CookieJar::cookies const):
(WebCore::CookieJar::cookieRequestHeaderFieldProxy):
(WebCore::CookieJar::setCookies):
(WebCore::CookieJar::cookieRequestHeaderFieldValue const):
(WebCore::CookieJar::getRawCookies const):

  • loader/NavigationAction.cpp:

(WebCore::createGlobalFrameIdentifier):

  • loader/PolicyChecker.cpp:
  • testing/Internals.cpp:

(WebCore::Internals::frameIdentifier const):

Source/WebKit:

  • WebProcess/Network/WebLoaderStrategy.cpp:

(WebKit::addParametersShared):

Location:
trunk/Source
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r259751 r259752  
     12020-04-08  Rob Buis  <rbuis@igalia.com>
     2
     3        Make more use of FrameLoader pageID/frameID getters
     4        https://bugs.webkit.org/show_bug.cgi?id=210182
     5
     6        Reviewed by Chris Dumez.
     7
     8        Make more use of FrameLoader pageID/frameID getters, before
     9        this change they were only used internally in FrameLoader.
     10
     11        * dom/Document.cpp:
     12        (WebCore::Document::pageID const):
     13        (WebCore::Document::frameID const):
     14        * html/HTMLAnchorElement.cpp:
     15        (WebCore::HTMLAnchorElement::handleClick):
     16        * loader/CookieJar.cpp:
     17        (WebCore::CookieJar::cookies const):
     18        (WebCore::CookieJar::cookieRequestHeaderFieldProxy):
     19        (WebCore::CookieJar::setCookies):
     20        (WebCore::CookieJar::cookieRequestHeaderFieldValue const):
     21        (WebCore::CookieJar::getRawCookies const):
     22        * loader/NavigationAction.cpp:
     23        (WebCore::createGlobalFrameIdentifier):
     24        * loader/PolicyChecker.cpp:
     25        * testing/Internals.cpp:
     26        (WebCore::Internals::frameIdentifier const):
     27
    1282020-04-08  Doug Kelly  <dougk@apple.com>
    229

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

    r259577 r259752  
    79627962Optional<PageIdentifier> Document::pageID() const
    79637963{
    7964     return m_frame->loader().client().pageID();
     7964    return m_frame->loader().pageID();
    79657965}
    79667966
    79677967Optional<FrameIdentifier> Document::frameID() const
    79687968{
    7969     return m_frame->loader().client().frameID();
     7969    return m_frame->loader().frameID();
    79707970}
    79717971

  • trunk/Source/WebCore/html/HTMLAnchorElement.cpp

    r259687 r259752  
    489489        systemPreviewInfo.element.elementIdentifier = document().identifierForElement(*this);
    490490        systemPreviewInfo.element.documentIdentifier = document().identifier();
    491         systemPreviewInfo.element.webPageIdentifier = document().frame()->loader().client().pageID().valueOr(PageIdentifier { });
     491        systemPreviewInfo.element.webPageIdentifier = document().frame()->loader().pageID().valueOr(PageIdentifier { });
    492492        if (auto* child = firstElementChild())
    493493            systemPreviewInfo.previewRect = child->boundsInRootViewSpace();

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

    r259173 r259752  
    3232#include "Frame.h"
    3333#include "FrameLoader.h"
    34 #include "FrameLoaderClient.h"
    3534#include "HTTPCookieAcceptPolicy.h"
    3635#include "NetworkStorageSession.h"
    … …  
    7675    Optional<PageIdentifier> pageID;
    7776    if (auto* frame = document.frame()) {
    78         frameID = frame->loader().client().frameID();
    79         pageID = frame->loader().client().pageID();
     77        frameID = frame->loader().frameID();
     78        pageID = frame->loader().pageID();
    8079    }
    8180
    … …  
    9998    Optional<PageIdentifier> pageID;
    10099    if (auto* frame = document.frame()) {
    101         frameID = frame->loader().client().frameID();
    102         pageID = frame->loader().client().pageID();
     100        frameID = frame->loader().frameID();
     101        pageID = frame->loader().pageID();
    103102    }
    104103
    … …  
    111110    Optional<PageIdentifier> pageID;
    112111    if (auto* frame = document.frame()) {
    113         frameID = frame->loader().client().frameID();
    114         pageID = frame->loader().client().pageID();
     112        frameID = frame->loader().frameID();
     113        pageID = frame->loader().pageID();
    115114    }
    116115
    … …  
    146145    Optional<PageIdentifier> pageID;
    147146    if (auto* frame = document.frame()) {
    148         frameID = frame->loader().client().frameID();
    149         pageID = frame->loader().client().pageID();
     147        frameID = frame->loader().frameID();
     148        pageID = frame->loader().pageID();
    150149    }
    151150
    … …  
    161160    Optional<PageIdentifier> pageID;
    162161    if (auto* frame = document.frame()) {
    163         frameID = frame->loader().client().frameID();
    164         pageID = frame->loader().client().pageID();
     162        frameID = frame->loader().frameID();
     163        pageID = frame->loader().pageID();
    165164    }
    166165

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

    r259629 r259752  
    3333#include "Frame.h"
    3434#include "FrameLoader.h"
    35 #include "FrameLoaderClient.h"
    3635#include "HistoryItem.h"
    3736#include "MouseEvent.h"
    … …  
    4241{
    4342    if (document.frame())
    44         return { document.frame()->loader().client().pageID().valueOr(PageIdentifier { }), document.frame()->loader().client().frameID().valueOr(FrameIdentifier { }) };
     43        return { document.frame()->loader().pageID().valueOr(PageIdentifier { }), document.frame()->loader().frameID().valueOr(FrameIdentifier { }) };
    4544    return GlobalFrameIdentifier();
    4645}

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

    r259522 r259752  
    5555
    5656#define IS_ALLOWED (m_frame.page() ? m_frame.page()->sessionID().isAlwaysOnLoggingAllowed() : false)
    57 #define PAGE_ID (m_frame.loader().client().pageID().valueOr(PageIdentifier()).toUInt64())
    58 #define FRAME_ID (m_frame.loader().client().frameID().valueOr(FrameIdentifier()).toUInt64())
     57#define PAGE_ID (m_frame.loader().pageID().valueOr(PageIdentifier()).toUInt64())
     58#define FRAME_ID (m_frame.loader().frameID().valueOr(FrameIdentifier()).toUInt64())
    5959#define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(IS_ALLOWED, Loading, "%p - [pageID=%" PRIu64 ", frameID=%" PRIu64 "] PolicyChecker::" fmt, this, PAGE_ID, FRAME_ID, ##__VA_ARGS__)
    6060

  • trunk/Source/WebCore/testing/Internals.cpp

    r259575 r259752  
    8181#include "Frame.h"
    8282#include "FrameLoader.h"
    83 #include "FrameLoaderClient.h"
    8483#include "FrameView.h"
    8584#include "FullscreenManager.h"
    … …  
    25842583{
    25852584    if (auto* page = document.page())
    2586         return page->mainFrame().loader().client().frameID().valueOr(FrameIdentifier { }).toUInt64();
     2585        return page->mainFrame().loader().frameID().valueOr(FrameIdentifier { }).toUInt64();
    25872586    return 0;
    25882587}

  • trunk/Source/WebKit/ChangeLog

    r259750 r259752  
     12020-04-08  Rob Buis  <rbuis@igalia.com>
     2
     3        Make more use of FrameLoader pageID/frameID getters
     4        https://bugs.webkit.org/show_bug.cgi?id=210182
     5
     6        Reviewed by Chris Dumez.
     7
     8        Make more use of FrameLoader pageID/frameID getters, before
     9        this change they were only used internally in FrameLoader.
     10
     11        * WebProcess/Network/WebLoaderStrategy.cpp:
     12        (WebKit::addParametersShared):
     13
    1142020-04-08  David Kilzer  <ddkilzer@apple.com>
    215

  • trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp

    r258667 r259752  
    274274    if (auto* ownerElement = frame->ownerElement()) {
    275275        if (auto* parentFrame = ownerElement->document().frame())
    276             parameters.parentFrameID = parentFrame->loader().client().frameID();
     276            parameters.parentFrameID = parentFrame->loader().frameID();
    277277    }
    278278}
Note: See TracChangeset for help on using the changeset viewer.