Changeset 206189 in webkit


Ignore:
Timestamp:
Sep 20, 2016, 5:27:17 PM (9 years ago)
Author:
Keith Rollin
Message:

Add new logging for network resource loading
​https://bugs.webkit.org/show_bug.cgi?id=162237

Reviewed by Antti Koivisto.

Add new logging along the non-main path for resource loading. This
logging should allow us to differentiate between lack-of-logging due
execution along a path that doesn't have logging statements and
lack-of-logging due to a hung process.

Source/WebCore:

No new tests -- there are no tests for logging.

  • loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::startLoadingMainResource):
(WebCore::DocumentLoader::isAlwaysOnLoggingAllowed):

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

(WebCore::FrameLoader::continueLoadAfterWillSubmitForm):

  • loader/cache/CachedResource.cpp:

(WebCore::CachedResource::load):

  • loader/cache/CachedResourceLoader.cpp:

(WebCore::CachedResourceLoader::requestResource):
(WebCore::CachedResourceLoader::isAlwaysOnLoggingAllowed):

  • loader/cache/CachedResourceLoader.h:
  • page/Frame.h:

Source/WebKit2:

  • NetworkProcess/NetworkResourceLoader.cpp:

(WebKit::NetworkResourceLoader::start):
(WebKit::NetworkResourceLoader::startNetworkLoad):
(WebKit::NetworkResourceLoader::setDefersLoading):
(WebKit::NetworkResourceLoader::abort):
(WebKit::NetworkResourceLoader::didReceiveBuffer):

  • NetworkProcess/NetworkResourceLoader.h:
  • WebProcess/Network/WebLoaderStrategy.cpp:

(WebKit::WebLoaderStrategy::loadResource):
(WebKit::WebLoaderStrategy::scheduleLoad):

Location:
trunk/Source
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r206188 r206189  
     12016-09-20  Keith Rollin  <krollin@apple.com>
     2
     3        Add new logging for network resource loading
     4        https://bugs.webkit.org/show_bug.cgi?id=162237
     5
     6        Reviewed by Antti Koivisto.
     7
     8        Add new logging along the non-main path for resource loading. This
     9        logging should allow us to differentiate between lack-of-logging due
     10        execution along a path that doesn't have logging statements and
     11        lack-of-logging due to a hung process.
     12
     13        No new tests -- there are no tests for logging.
     14
     15        * loader/DocumentLoader.cpp:
     16        (WebCore::DocumentLoader::startLoadingMainResource):
     17        (WebCore::DocumentLoader::isAlwaysOnLoggingAllowed):
     18        * loader/DocumentLoader.h:
     19        * loader/FrameLoader.cpp:
     20        (WebCore::FrameLoader::continueLoadAfterWillSubmitForm):
     21        * loader/cache/CachedResource.cpp:
     22        (WebCore::CachedResource::load):
     23        * loader/cache/CachedResourceLoader.cpp:
     24        (WebCore::CachedResourceLoader::requestResource):
     25        (WebCore::CachedResourceLoader::isAlwaysOnLoggingAllowed):
     26        * loader/cache/CachedResourceLoader.h:
     27        * page/Frame.h:
     28
    1292016-09-20  Zalan Bujtas  <zalan@apple.com>
    230

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

    r206016 r206189  
    8282#endif
    8383
     84#define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), Network, "%p - DocumentLoader::" fmt, this, ##__VA_ARGS__)
     85
    8486namespace WebCore {
    8587
    … …  
    14721474    m_loadingMainResource = true;
    14731475
    1474     if (maybeLoadEmpty())
    1475         return;
     1476    if (maybeLoadEmpty()) {
     1477        RELEASE_LOG_IF_ALLOWED("startLoadingMainResource: Returning empty document (frame = %p, main = %d)", m_frame, m_frame->isMainFrame());
     1478        return;
     1479    }
    14761480
    14771481#if ENABLE(CONTENT_FILTERING)
    … …  
    14921496
    14931497    // willSendRequest() may lead to our Frame being detached or cancelling the load via nulling the ResourceRequest.
    1494     if (!m_frame || m_request.isNull())
    1495         return;
     1498    if (!m_frame || m_request.isNull()) {
     1499        RELEASE_LOG_IF_ALLOWED("startLoadingMainResource: Load canceled after willSendRequest (frame = %p, main = %d)", m_frame, m_frame->isMainFrame());
     1500        return;
     1501    }
    14961502
    14971503    m_applicationCacheHost->maybeLoadMainResource(m_request, m_substituteData);
    14981504
    14991505    if (m_substituteData.isValid() && m_frame->page()) {
     1506        RELEASE_LOG_IF_ALLOWED("startLoadingMainResource: Returning cached main resource (frame = %p, main = %d)", m_frame, m_frame->isMainFrame());
    15001507        m_identifierForLoadWithoutResourceLoader = m_frame->page()->progress().createUniqueIdentifier();
    15011508        frameLoader()->notifier().assignIdentifierToInitialRequest(m_identifierForLoadWithoutResourceLoader, this, m_request);
    … …  
    15101517    request.makeUnconditional();
    15111518
     1519    RELEASE_LOG_IF_ALLOWED("startLoadingMainResource: Starting load (frame = %p, main = %d)", m_frame, m_frame->isMainFrame());
     1520
    15121521    static NeverDestroyed<ResourceLoaderOptions> mainResourceLoadOptions(SendCallbacks, SniffContent, BufferData, AllowStoredCredentials, ClientCredentialPolicy::MayAskClientForCredentials, FetchOptions::Credentials::Include, SkipSecurityCheck, FetchOptions::Mode::NoCors, IncludeCertificateInfo, ContentSecurityPolicyImposition::DoPolicyCheck, DefersLoadingPolicy::AllowDefersLoading, CachingPolicy::AllowCaching);
    15131522    m_mainResource = m_cachedResourceLoader->requestMainResource(CachedResourceRequest(ResourceRequest(request), mainResourceLoadOptions));
    … …  
    15151524#if ENABLE(CONTENT_EXTENSIONS)
    15161525    if (m_mainResource && m_mainResource->errorOccurred() && m_frame->page() && m_mainResource->resourceError().domain() == ContentExtensions::WebKitContentBlockerDomain) {
     1526        RELEASE_LOG_IF_ALLOWED("startLoadingMainResource: Blocked by content blocker error (frame = %p, main = %d)", m_frame, m_frame->isMainFrame());
    15171527        cancelMainResourceLoad(frameLoader()->blockedByContentBlockerError(m_request));
    15181528        return;
    … …  
    15221532    if (!m_mainResource) {
    15231533        if (!m_request.url().isValid()) {
     1534            RELEASE_LOG_IF_ALLOWED("startLoadingMainResource: Unable to load main resource, URL is invalid (frame = %p, main = %d)", m_frame, m_frame->isMainFrame());
    15241535            cancelMainResourceLoad(frameLoader()->client().cannotShowURLError(m_request));
    15251536            return;
    15261537        }
     1538
     1539        RELEASE_LOG_IF_ALLOWED("startLoadingMainResource: Unable to load main resource, returning empty document (frame = %p, main = %d)", m_frame, m_frame->isMainFrame());
    15271540
    15281541        setRequest(ResourceRequest());
    … …  
    17121725#endif
    17131726
     1727bool DocumentLoader::isAlwaysOnLoggingAllowed() const
     1728{
     1729    return m_frame ? m_frame->isAlwaysOnLoggingAllowed() : true;
     1730}
     1731
    17141732} // namespace WebCore

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

    r204429 r206189  
    287287#endif
    288288
     289        bool isAlwaysOnLoggingAllowed() const;
     290
    289291    protected:
    290292        WEBCORE_EXPORT DocumentLoader(const ResourceRequest&, const SubstituteData&);

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

    r206166 r206189  
    23612361    // The load might be cancelled inside of prepareForLoadStart(), nulling out the m_provisionalDocumentLoader,
    23622362    // so we need to null check it again.
    2363     if (!m_provisionalDocumentLoader)
    2364         return;
     2363    if (!m_provisionalDocumentLoader) {
     2364        RELEASE_LOG_IF_ALLOWED("continueLoadAfterWillSubmitForm: Frame load canceled (frame = %p, main = %d)", &m_frame, m_frame.isMainFrame());
     2365        return;
     2366    }
    23652367
    23662368    DocumentLoader* activeDocLoader = activeDocumentLoader();
    2367     if (activeDocLoader && activeDocLoader->isLoadingMainResource())
    2368         return;
     2369    if (activeDocLoader && activeDocLoader->isLoadingMainResource()) {
     2370        RELEASE_LOG_IF_ALLOWED("continueLoadAfterWillSubmitForm: Main frame already being loaded (frame = %p, main = %d)", &m_frame, m_frame.isMainFrame());
     2371        return;
     2372    }
    23692373
    23702374    m_loadingFromCachedPage = false;

  • trunk/Source/WebCore/loader/cache/CachedResource.cpp

    r206016 r206189  
    6363using namespace WTF;
    6464
     65#define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(cachedResourceLoader.isAlwaysOnLoggingAllowed(), Network, "%p - CachedResource::" fmt, this, ##__VA_ARGS__)
     66
    6567namespace WebCore {
    6668
    … …  
    264266{
    265267    if (!cachedResourceLoader.frame()) {
     268        RELEASE_LOG_IF_ALLOWED("load: No associated frame");
    266269        failBeforeStarting();
    267270        return;
    … …  
    275278    if (auto* topDocument = frame.mainFrame().document()) {
    276279        if (topDocument->pageCacheState() != Document::NotInPageCache) {
     280            RELEASE_LOG_IF_ALLOWED("load: Already in page cache or being added to it (frame = %p)", &frame);
    277281            failBeforeStarting();
    278282            return;
    … …  
    282286    FrameLoader& frameLoader = frame.loader();
    283287    if (m_options.securityCheck == DoSecurityCheck && (frameLoader.state() == FrameStateProvisional || !frameLoader.activeDocumentLoader() || frameLoader.activeDocumentLoader()->isStopping())) {
     288        if (frameLoader.state() == FrameStateProvisional)
     289            RELEASE_LOG_IF_ALLOWED("load: Failed security check -- state is provisional (frame = %p)", &frame);
     290        else if (!frameLoader.activeDocumentLoader())
     291            RELEASE_LOG_IF_ALLOWED("load: Failed security check -- not active document (frame = %p)", &frame);
     292        else if (frameLoader.activeDocumentLoader()->isStopping())
     293            RELEASE_LOG_IF_ALLOWED("load: Failed security check -- active loader is stopping (frame = %p)", &frame);
    284294        failBeforeStarting();
    285295        return;
    … …  
    338348    m_loader = platformStrategies()->loaderStrategy()->loadResource(frame, *this, request, m_options);
    339349    if (!m_loader) {
     350        RELEASE_LOG_IF_ALLOWED("load: Unable to create SubresourceLoader (frame = %p)", &frame);
    340351        failBeforeStarting();
    341352        return;

  • trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp

    r206062 r206189  
    8181#define PRELOAD_DEBUG 0
    8282
     83#define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), Network, "%p - CachedResourceLoader::" fmt, this, ##__VA_ARGS__)
     84
    8385namespace WebCore {
    8486
    … …  
    608610    url = MemoryCache::removeFragmentIdentifierIfNeeded(url);
    609611
    610     if (!url.isValid())
     612    if (!url.isValid()) {
     613        RELEASE_LOG_IF_ALLOWED("requestResource: URL is invalid (frame = %p)", frame());
    611614        return nullptr;
    612 
    613     if (!canRequest(type, url, request.options(), request.forPreload()))
     615    }
     616
     617    if (!canRequest(type, url, request.options(), request.forPreload())) {
     618        RELEASE_LOG_IF_ALLOWED("requestResource: Not allowed to request resource (frame = %p)", frame());
    614619        return nullptr;
     620    }
    615621
    616622#if ENABLE(CONTENT_EXTENSIONS)
    … …  
    620626        applyBlockedStatusToRequest(blockedStatus, resourceRequest);
    621627        if (blockedStatus.blockedLoad) {
     628            RELEASE_LOG_IF_ALLOWED("requestResource: Resource blocked by content blocker (frame = %p)", frame());
    622629            if (type == CachedResource::Type::MainResource) {
    623630                auto resource = createResource(type, WTFMove(request), sessionID());
    … …  
    12911298}
    12921299
    1293 }
     1300bool CachedResourceLoader::isAlwaysOnLoggingAllowed() const
     1301{
     1302    return m_documentLoader ? m_documentLoader->isAlwaysOnLoggingAllowed() : true;
     1303}
     1304
     1305}

  • trunk/Source/WebCore/loader/cache/CachedResourceLoader.h

    r206016 r206189  
    145145    ResourceTimingInformation& resourceTimingInformation() { return m_resourceTimingInfo; }
    146146#endif
     147
     148    bool isAlwaysOnLoggingAllowed() const;
    147149
    148150private:

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

    r204717 r206189  
    265265
    266266        bool isURLAllowed(const URL&) const;
    267         bool isAlwaysOnLoggingAllowed() const;
     267        WEBCORE_EXPORT bool isAlwaysOnLoggingAllowed() const;
    268268
    269269    // ========

  • trunk/Source/WebKit2/ChangeLog

    r206176 r206189  
     12016-09-20  Keith Rollin  <krollin@apple.com>
     2
     3        Add new logging for network resource loading
     4        https://bugs.webkit.org/show_bug.cgi?id=162237
     5
     6        Reviewed by Antti Koivisto.
     7
     8        Add new logging along the non-main path for resource loading. This
     9        logging should allow us to differentiate between lack-of-logging due
     10        execution along a path that doesn't have logging statements and
     11        lack-of-logging due to a hung process.
     12
     13        * NetworkProcess/NetworkResourceLoader.cpp:
     14        (WebKit::NetworkResourceLoader::start):
     15        (WebKit::NetworkResourceLoader::startNetworkLoad):
     16        (WebKit::NetworkResourceLoader::setDefersLoading):
     17        (WebKit::NetworkResourceLoader::abort):
     18        (WebKit::NetworkResourceLoader::didReceiveBuffer):
     19        * NetworkProcess/NetworkResourceLoader.h:
     20        * WebProcess/Network/WebLoaderStrategy.cpp:
     21        (WebKit::WebLoaderStrategy::loadResource):
     22        (WebKit::WebLoaderStrategy::scheduleLoad):
     23
    1242016-09-20  Anders Carlsson  <andersca@apple.com>
    225

  • trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp

    r206166 r206189  
    149149    ASSERT(RunLoop::isMain());
    150150
    151     if (m_defersLoading)
    152         return;
     151    if (m_defersLoading) {
     152        RELEASE_LOG_IF_ALLOWED("start: Loading is deferred (pageID = %llu, frameID = %llu, resourceID = %llu, isMainResource = %d, isSynchronous = %d)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier, isMainResource(), isSynchronous());
     153        return;
     154    }
    153155
    154156#if ENABLE(NETWORK_CACHE)
    155157    if (canUseCache(originalRequest())) {
     158        RELEASE_LOG_IF_ALLOWED("start: Retrieving resource from cache (pageID = %llu, frameID = %llu, resourceID = %llu, isMainResource = %d, isSynchronous = %d)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier, isMainResource(), isSynchronous());
    156159        retrieveCacheEntry(originalRequest());
    157160        return;
    … …  
    196199void NetworkResourceLoader::startNetworkLoad(const ResourceRequest& request)
    197200{
     201    RELEASE_LOG_IF_ALLOWED("startNetworkLoad: (pageID = %llu, frameID = %llu, resourceID = %llu, isMainResource = %d, isSynchronous = %d)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier, isMainResource(), isSynchronous());
     202
    198203    consumeSandboxExtensions();
    199204
    … …  
    205210        m_bufferedDataForCache = SharedBuffer::create();
    206211#endif
    207 
    208     RELEASE_LOG_IF_ALLOWED("startNetworkLoad: (pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d)", m_parameters.webPageID, m_parameters.webFrameID, isMainResource(), isSynchronous());
    209212
    210213    NetworkLoadParameters parameters = m_parameters;
    … …  
    216219    if (!networkSession) {
    217220        WTFLogAlways("Attempted to create a NetworkLoad with a session (id=%" PRIu64 ") that does not exist.", parameters.sessionID.sessionID());
     221        RELEASE_LOG_IF_ALLOWED("startNetworkLoad: Attempted to create a NetworkLoad with a session that does not exist (pageID = %llu, frameID = %llu, resourceID = %llu, sessionID=%llu)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier, parameters.sessionID.sessionID());
    218222        didFailLoading(internalError(request.url()));
    219223        return;
    … …  
    223227    m_networkLoad = std::make_unique<NetworkLoad>(*this, WTFMove(parameters));
    224228#endif
     229
     230    if (m_defersLoading) {
     231        RELEASE_LOG_IF_ALLOWED("startNetworkLoad: Created, but deferred (pageID = %llu, frameID = %llu, resourceID = %llu)",
     232            m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier);
     233    }
    225234}
    226235
    … …  
    230239        return;
    231240    m_defersLoading = defers;
     241
     242    if (defers)
     243        RELEASE_LOG_IF_ALLOWED("setDefersLoading: Deferring resource load (pageID = %llu, frameID = %llu, resourceID = %llu)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier);
     244    else
     245        RELEASE_LOG_IF_ALLOWED("setDefersLoading: Resuming deferred resource load (pageID = %llu, frameID = %llu, resourceID = %llu)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier);
    232246
    233247    if (m_networkLoad) {
    … …  
    238252    if (!m_defersLoading)
    239253        start();
     254    else
     255        RELEASE_LOG_IF_ALLOWED("setDefersLoading: defers = TRUE, but nothing to stop (pageID = %llu, frameID = %llu, resourceID = %llu)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier);
    240256}
    241257
    … …  
    273289{
    274290    ASSERT(RunLoop::isMain());
     291
     292    RELEASE_LOG_IF_ALLOWED("abort: Canceling resource load (pageID = %llu, frameID = %llu, resourceID = %llu)",
     293        m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier);
    275294
    276295    if (m_networkLoad && !m_didConvertToDownload) {
    … …  
    321340        if (isSynchronous())
    322341            m_synchronousLoadData->response = m_response;
    323         else {
    324             RELEASE_LOG_IF_ALLOWED("didReceiveResponse: Sending didReceiveResponse message to the WebContent process (pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d)", static_cast<unsigned long long>(m_parameters.webPageID), static_cast<unsigned long long>(m_parameters.webFrameID), isMainResource(), isSynchronous());
     342        else
    325343            send(Messages::WebResourceLoader::DidReceiveResponse(m_response, shouldWaitContinueDidReceiveResponse));
    326         }
    327344    }
    328345
    … …  
    344361void NetworkResourceLoader::didReceiveBuffer(Ref<SharedBuffer>&& buffer, int reportedEncodedDataLength)
    345362{
     363    if (!m_hasReceivedData) {
     364        RELEASE_LOG_IF_ALLOWED("didReceiveBuffer: Started receiving data (pageID = %llu, frameID = %llu, resourceID = %llu)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier);
     365        m_hasReceivedData = true;
     366    }
     367
    346368#if ENABLE(NETWORK_CACHE)
    347369    ASSERT(!m_cacheEntryForValidation);

  • trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h

    r205052 r206189  
    154154    bool m_didConsumeSandboxExtensions { false };
    155155    bool m_defersLoading { false };
     156    bool m_hasReceivedData { false };
    156157
    157158    WebCore::Timer m_bufferingTimer;

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

    r206166 r206189  
    5858using namespace WebCore;
    5959
    60 #define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(loadParameters.sessionID.isAlwaysOnLoggingAllowed(), Network, "%p - WebLoaderStrategy::" fmt, this, ##__VA_ARGS__)
    61 #define RELEASE_LOG_ERROR_IF_ALLOWED(fmt, ...) RELEASE_LOG_ERROR_IF(loadParameters.sessionID.isAlwaysOnLoggingAllowed(), Network, "%p - WebLoaderStrategy::" fmt, this, ##__VA_ARGS__)
     60#define RELEASE_LOG_IF_ALLOWED(permissionChecker, fmt, ...) RELEASE_LOG_IF(permissionChecker.isAlwaysOnLoggingAllowed(), Network, "%p - WebLoaderStrategy::" fmt, this, ##__VA_ARGS__)
     61#define RELEASE_LOG_ERROR_IF_ALLOWED(permissionChecker, fmt, ...) RELEASE_LOG_ERROR_IF(permissionChecker.isAlwaysOnLoggingAllowed(), Network, "%p - WebLoaderStrategy::" fmt, this, ##__VA_ARGS__)
    6262
    6363namespace WebKit {
    … …  
    7777    if (loader)
    7878        scheduleLoad(*loader, &resource, frame.document()->referrerPolicy() == ReferrerPolicy::Default);
     79    else
     80        RELEASE_LOG_ERROR_IF_ALLOWED(frame, "loadResource: Unable to create SubresourceLoader (frame = %p", &frame);
    7981    return loader;
    8082}
    … …  
    150152    if (resourceLoader.documentLoader()->scheduleArchiveLoad(resourceLoader, resourceLoader.request())) {
    151153        LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be handled as an archive resource.", resourceLoader.url().string().utf8().data());
     154        RELEASE_LOG_IF_ALLOWED(resourceLoader, "scheduleLoad: URL will be handled as an archive resource (frame = %p, resourceID = %llu)", resourceLoader.frame(), identifier);
    152155        m_webResourceLoaders.set(identifier, WebResourceLoader::create(resourceLoader, trackingParameters));
    153156        return;
    … …  
    157160    if (resourceLoader.documentLoader()->applicationCacheHost()->maybeLoadResource(resourceLoader, resourceLoader.request(), resourceLoader.request().url())) {
    158161        LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be loaded from application cache.", resourceLoader.url().string().utf8().data());
     162        RELEASE_LOG_IF_ALLOWED(resourceLoader, "scheduleLoad: URL will be loaded from application cache (frame = %p, resourceID = %llu)", resourceLoader.frame(), identifier);
    159163        m_webResourceLoaders.set(identifier, WebResourceLoader::create(resourceLoader, trackingParameters));
    160164        return;
    … …  
    163167    if (resourceLoader.request().url().protocolIsData()) {
    164168        LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be loaded as data.", resourceLoader.url().string().utf8().data());
     169        RELEASE_LOG_IF_ALLOWED(resourceLoader, "scheduleLoad: URL will be loaded as data (frame = %p, resourceID = %llu)", resourceLoader.frame(), identifier);
    165170        startLocalLoad(resourceLoader);
    166171        return;
    … …  
    170175    if (resourceLoader.request().url().protocolIs(QLPreviewProtocol())) {
    171176        LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be handled as a QuickLook resource.", resourceLoader.url().string().utf8().data());
     177        RELEASE_LOG_IF_ALLOWED(resourceLoader, "scheduleLoad: URL will be handled as a QuickLook resource (frame = %p, resourceID = %llu)", resourceLoader.frame(), identifier);
    172178        startLocalLoad(resourceLoader);
    173179        return;
    … …  
    180186    if (resourceLoader.request().url().protocolIs("resource")) {
    181187        LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be handled as a GResource.", resourceLoader.url().string().utf8().data());
     188        RELEASE_LOG_IF_ALLOWED(resourceLoader, "scheduleLoad: URL will be handled as a GResource (frame = %p, resourceID = %llu)", resourceLoader.frame(), identifier);
    182189        startLocalLoad(resourceLoader);
    183190        return;
    … …  
    208215
    209216    if (!WebProcess::singleton().networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::ScheduleResourceLoad(loadParameters), 0)) {
    210         RELEASE_LOG_ERROR_IF_ALLOWED("scheduleLoad: Unable to schedule resource with the NetworkProcess (frame = %p, priority = %d, pageID = %llu, frameID = %llu, resourceID = %llu)", resourceLoader.frame(), static_cast<int>(resourceLoader.request().priority()), loadParameters.webPageID, loadParameters.identifier, loadParameters.webFrameID);
     217        RELEASE_LOG_ERROR_IF_ALLOWED(resourceLoader, "scheduleLoad: Unable to schedule resource with the NetworkProcess (frame = %p, priority = %d, pageID = %llu, frameID = %llu, resourceID = %llu)", resourceLoader.frame(), static_cast<int>(resourceLoader.request().priority()), loadParameters.webPageID, loadParameters.identifier, loadParameters.webFrameID);
    211218        // We probably failed to schedule this load with the NetworkProcess because it had crashed.
    212219        // This load will never succeed so we will schedule it to fail asynchronously.
    … …  
    216223
    217224    auto webResourceLoader = WebResourceLoader::create(resourceLoader, trackingParameters);
    218     RELEASE_LOG_IF_ALLOWED("scheduleLoad: Resource has been queued for scheduling with the NetworkProcess (frame = %p, priority = %d, pageID = %llu, frameID = %llu, resourceID = %llu, WebResourceLoader = %p)", resourceLoader.frame(), static_cast<int>(resourceLoader.request().priority()), loadParameters.webPageID, loadParameters.webFrameID, loadParameters.identifier, webResourceLoader.ptr());
     225    RELEASE_LOG_IF_ALLOWED(resourceLoader, "scheduleLoad: Resource has been queued for scheduling with the NetworkProcess (frame = %p, priority = %d, pageID = %llu, frameID = %llu, resourceID = %llu, WebResourceLoader = %p)", resourceLoader.frame(), static_cast<int>(resourceLoader.request().priority()), loadParameters.webPageID, loadParameters.webFrameID, loadParameters.identifier, webResourceLoader.ptr());
    219226    m_webResourceLoaders.set(identifier, WTFMove(webResourceLoader));
    220227}
Note: See TracChangeset for help on using the changeset viewer.