Make sure blink scheduler doesn't wait for the PingLoader

third_party/WebKit/Source/core/loader/PingLoader.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 33 matching lines @@
 #include "core/loader/FrameLoaderClient.h"
 #include "core/loader/MixedContentChecker.h"
 #include "core/page/Page.h"
 #include "platform/exported/WrappedResourceRequest.h"
 #include "platform/network/ResourceError.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/network/ResourceResponse.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "platform/weborigin/SecurityPolicy.h"
 #include "public/platform/Platform.h"
+#include "public/platform/WebFrameScheduler.h"
 #include "public/platform/WebURLLoader.h"
 #include "public/platform/WebURLRequest.h"
 #include "public/platform/WebURLResponse.h"
 #include "wtf/PtrUtil.h"
 
 namespace blink {
 
 static void finishPingRequestInitialization(ResourceRequest& request, LocalFrame* frame)
 {
     request.setRequestContext(WebURLRequest::RequestContextPing);
@@ skipping 69 matching lines @@
 PingLoader::PingLoader(LocalFrame* frame, ResourceRequest& request, const FetchInitiatorInfo& initiatorInfo, StoredCredentials credentialsAllowed)
     : LocalFrameLifecycleObserver(frame)
     , m_timeout(this, &PingLoader::timeout)
     , m_url(request.url())
     , m_identifier(createUniqueIdentifier())
     , m_keepAlive(this)
 {
     frame->loader().client()->didDispatchPingLoader(request.url());
     frame->document()->fetcher()->context().willStartLoadingResource(m_identifier, request, Resource::Image);
     frame->document()->fetcher()->context().dispatchWillSendRequest(m_identifier, request, ResourceResponse(), initiatorInfo);
+    // Make sure the scheduler doesn't wait for the ping.
+    if (frame->frameScheduler())
+        frame->frameScheduler()->didStopLoading(m_identifier);
 
     m_loader = wrapUnique(Platform::current()->createURLLoader());
     ASSERT(m_loader);
     WrappedResourceRequest wrappedRequest(request);
     wrappedRequest.setAllowStoredCredentials(credentialsAllowed == AllowStoredCredentials);
     m_loader->loadAsynchronously(wrappedRequest, this);
 
     // If the server never responds, FrameLoader won't be able to cancel this load and
     // we'll sit here waiting forever. Set a very generous timeout, just in case.
     m_timeout.startOneShot(60000, BLINK_FROM_HERE);
@@ skipping 67 matching lines @@
     InspectorInstrumentation::didFailLoading(frame, m_identifier, ResourceError::cancelledError(m_url));
     frame->console().didFailLoading(m_identifier, ResourceError::cancelledError(m_url));
 }
 
 DEFINE_TRACE(PingLoader)
 {
     LocalFrameLifecycleObserver::trace(visitor);
 }
 
 } // namespace blink