diff options
Diffstat (limited to 'src/3rdparty/webkit/WebCore/loader/MainResourceLoader.h')
-rw-r--r-- | src/3rdparty/webkit/WebCore/loader/MainResourceLoader.h | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/3rdparty/webkit/WebCore/loader/MainResourceLoader.h b/src/3rdparty/webkit/WebCore/loader/MainResourceLoader.h index 6c69c1f..d9ce2f9 100644 --- a/src/3rdparty/webkit/WebCore/loader/MainResourceLoader.h +++ b/src/3rdparty/webkit/WebCore/loader/MainResourceLoader.h @@ -29,16 +29,21 @@ #include "FrameLoaderTypes.h" #include "ResourceLoader.h" #include "SubstituteData.h" -#include "Timer.h" #include <wtf/Forward.h> +#if HAVE(RUNLOOP_TIMER) +#include "RunLoopTimer.h" +#else +#include "Timer.h" +#endif + namespace WebCore { #if ENABLE(OFFLINE_WEB_APPLICATIONS) class ApplicationCache; #endif class FormState; - class ResourceRequest; + struct ResourceRequest; class MainResourceLoader : public ResourceLoader { public: @@ -56,7 +61,13 @@ namespace WebCore { virtual void didFinishLoading(); virtual void didFail(const ResourceError&); - void handleDataLoadNow(Timer<MainResourceLoader>*); +#if HAVE(RUNLOOP_TIMER) + typedef RunLoopTimer<MainResourceLoader> MainResourceLoaderTimer; +#else + typedef Timer<MainResourceLoader> MainResourceLoaderTimer; +#endif + + void handleDataLoadNow(MainResourceLoaderTimer*); bool isLoadingMultipartContent() const { return m_loadingMultipartContent; } @@ -74,6 +85,7 @@ namespace WebCore { void handleEmptyLoad(const KURL&, bool forURLScheme); void handleDataLoadSoon(ResourceRequest& r); + void startDataLoadTimer(); void handleDataLoad(ResourceRequest&); void receivedError(const ResourceError&); @@ -90,7 +102,8 @@ namespace WebCore { ResourceRequest m_initialRequest; SubstituteData m_substituteData; - Timer<MainResourceLoader> m_dataLoadTimer; + + MainResourceLoaderTimer m_dataLoadTimer; #if ENABLE(OFFLINE_WEB_APPLICATIONS) // The application cache that the main resource was loaded from (if any). |