Chromium Code Reviews| Index: Source/core/loader/PingLoader.h |
| diff --git a/Source/core/loader/PingLoader.h b/Source/core/loader/PingLoader.h |
| index fef62e47f90bb64bdba8152089122b230ca43cd4..595e343b697c291bc993e120955385077e96191c 100644 |
| --- a/Source/core/loader/PingLoader.h |
| +++ b/Source/core/loader/PingLoader.h |
| @@ -34,7 +34,7 @@ |
| #include "core/CoreExport.h" |
| #include "core/fetch/ResourceLoaderOptions.h" |
| -#include "core/page/PageLifecycleObserver.h" |
| +#include "core/frame/LocalFrameLifecycleObserver.h" |
| #include "platform/Timer.h" |
| #include "platform/heap/Handle.h" |
| #include "public/platform/WebURLLoaderClient.h" |
| @@ -57,7 +57,7 @@ class ResourceRequest; |
| // The ping loader is used by audit pings, beacon transmissions and image loads |
| // during page unloading. |
| // |
| -class CORE_EXPORT PingLoader : public RefCountedWillBeRefCountedGarbageCollected<PingLoader>, public PageLifecycleObserver, private WebURLLoaderClient { |
| +class CORE_EXPORT PingLoader : public RefCountedWillBeRefCountedGarbageCollected<PingLoader>, public LocalFrameLifecycleObserver, private WebURLLoaderClient { |
| WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(PingLoader); |
| WTF_MAKE_NONCOPYABLE(PingLoader); |
| WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(PingLoader); |
| @@ -83,14 +83,14 @@ protected: |
| void dispose(); |
| private: |
| - void didReceiveResponse(WebURLLoader*, const WebURLResponse&) override; |
| - void didReceiveData(WebURLLoader*, const char*, int, int) override; |
| - void didFinishLoading(WebURLLoader*, double, int64_t) override; |
| - void didFail(WebURLLoader*, const WebURLError&) override; |
| + void didReceiveResponse(WebURLLoader*, const WebURLResponse&) final; |
|
dcheng
2015/08/31 23:54:18
Maybe just mark the class final.
ncarter (slow)
2015/09/01 21:10:56
Can't. BeaconLoader derives from PingLoader (which
|
| + void didReceiveData(WebURLLoader*, const char*, int, int) final; |
| + void didFinishLoading(WebURLLoader*, double, int64_t) final; |
| + void didFail(WebURLLoader*, const WebURLError&) final; |
| void timeout(Timer<PingLoader>*); |
| - void didFailLoading(Page*); |
| + void didFailLoading(LocalFrame*); |
| OwnPtr<WebURLLoader> m_loader; |
| Timer<PingLoader> m_timeout; |