Refactor Timer classes in preparation for landing FrameTimers.

third_party/WebKit/Source/core/loader/FrameLoader.h

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  * Copyright (C) 2011 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:
  *
@@ skipping 174 matching lines @@
     void restoreScrollPositionAndViewState();
 
     bool shouldContinueForNavigationPolicy(const ResourceRequest&, const SubstituteData&, DocumentLoader*, ContentSecurityPolicyDisposition,
         NavigationType, NavigationPolicy, bool shouldReplaceCurrentEntry, bool isClientRedirect);
 
     DECLARE_TRACE();
 
     static void setReferrerForFrameRequest(FrameLoadRequest&);
 
 private:
-    void checkTimerFired(Timer<FrameLoader>*);
-    void didAccessInitialDocumentTimerFired(Timer<FrameLoader>*);
+    void checkTimerFired(TimerBase*);
+    void didAccessInitialDocumentTimerFired(TimerBase*);
 
     bool prepareRequestForThisFrame(FrameLoadRequest&);
     FrameLoadType determineFrameLoadType(const FrameLoadRequest&);
 
     SubstituteData defaultSubstituteDataForURL(const KURL&);
 
     bool shouldPerformFragmentNavigation(bool isFormSubmission, const String& httpMethod, FrameLoadType, const KURL&);
     void processFragment(const KURL&, LoadStartType);
 
     void startLoad(FrameLoadRequest&, FrameLoadType, NavigationPolicy);
@@ skipping 60 matching lines @@
         ResourceRequest m_request;
         Member<HistoryItem> m_item;
         FrameLoadType m_loadType;
         HistoryLoadType m_historyLoadType;
     };
 
     Member<DeferredHistoryLoad> m_deferredHistoryLoad;
 
     bool m_inStopAllLoaders;
 
-    Timer<FrameLoader> m_checkTimer;
+    TaskRunnerTimer<FrameLoader> m_checkTimer;

[haraken, 2016/07/28 14:44:46]

Is this change needed?

[dcheng, 2016/07/29 02:23:18]

Yes: in this CL, Timer no longer takes a TaskRunner argument. I want to rename
the Timer class to something else (DefaultThreadTimer?) but I haven't thought of
a good name yet.

This one will change to something like LoadingTimer or LoadingFrameTimer. WDYT?

 
     bool m_didAccessInitialDocument;
 
     SandboxFlags m_forcedSandboxFlags;
 
     bool m_dispatchingDidClearWindowObjectInMainWorld;
     bool m_protectProvisionalLoader;
 };
 
 } // namespace blink
 
 #endif // FrameLoader_h