| Index: Source/core/loader/PingLoader.h
|
| diff --git a/Source/core/loader/PingLoader.h b/Source/core/loader/PingLoader.h
|
| index 168a0c19501dd4c6d84b3a9525a83280b1f99aa9..12924eba41f39dde68be2017173ed4494c65406e 100644
|
| --- a/Source/core/loader/PingLoader.h
|
| +++ b/Source/core/loader/PingLoader.h
|
| @@ -32,10 +32,7 @@
|
| #ifndef PingLoader_h
|
| #define PingLoader_h
|
|
|
| -#include "core/fetch/ResourceLoaderOptions.h"
|
| -#include "core/page/PageLifecycleObserver.h"
|
| -#include "platform/Timer.h"
|
| -#include "public/platform/WebURLLoaderClient.h"
|
| +#include "core/loader/SimplexLoader.h"
|
| #include "wtf/Noncopyable.h"
|
| #include "wtf/RefPtr.h"
|
|
|
| @@ -44,18 +41,12 @@ namespace WebCore {
|
| class FormData;
|
| class LocalFrame;
|
| class KURL;
|
| -class ResourceError;
|
| -class ResourceHandle;
|
| -class ResourceRequest;
|
| -class ResourceResponse;
|
|
|
| // This class triggers asynchronous loads independent of LocalFrame staying alive (i.e., auditing pingbacks).
|
| -// Since nothing depends on resources loaded through this class, we just want
|
| -// to allow the load to live long enough to ensure the message was actually sent.
|
| -// Therefore, as soon as a callback is received from the ResourceHandle, this class
|
| -// will cancel the load and delete itself.
|
| -class PingLoader FINAL : public PageLifecycleObserver, private blink::WebURLLoaderClient {
|
| - WTF_MAKE_NONCOPYABLE(PingLoader); WTF_MAKE_FAST_ALLOCATED;
|
| +// It is an instance of a SimplexLoader; see its class declaration for the functionality provided.
|
| +class PingLoader FINAL : public SimplexLoader {
|
| + WTF_MAKE_NONCOPYABLE(PingLoader);
|
| + WTF_MAKE_FAST_ALLOCATED;
|
| public:
|
| enum ViolationReportType {
|
| ContentSecurityPolicyViolationReport,
|
| @@ -66,24 +57,7 @@ public:
|
| static void sendPing(LocalFrame*, const KURL& pingURL, const KURL& destinationURL);
|
| static void sendViolationReport(LocalFrame*, const KURL& reportURL, PassRefPtr<FormData> report, ViolationReportType);
|
|
|
| - virtual ~PingLoader();
|
| -
|
| -private:
|
| - PingLoader(LocalFrame*, ResourceRequest&, const FetchInitiatorInfo&, StoredCredentials);
|
| -
|
| - static void start(LocalFrame*, ResourceRequest&, const FetchInitiatorInfo&, StoredCredentials = AllowStoredCredentials);
|
| -
|
| - virtual void didReceiveResponse(blink::WebURLLoader*, const blink::WebURLResponse&) OVERRIDE;
|
| - virtual void didReceiveData(blink::WebURLLoader*, const char*, int, int) OVERRIDE;
|
| - virtual void didFinishLoading(blink::WebURLLoader*, double, int64_t) OVERRIDE;
|
| - virtual void didFail(blink::WebURLLoader*, const blink::WebURLError&) OVERRIDE;
|
| -
|
| - void timeout(Timer<PingLoader>*);
|
| -
|
| - OwnPtr<blink::WebURLLoader> m_loader;
|
| - Timer<PingLoader> m_timeout;
|
| - String m_url;
|
| - unsigned long m_identifier;
|
| + virtual ~PingLoader() { }
|
| };
|
|
|
| }
|
|
|