1 files changed, 8 insertions, 21 deletions
diff --git a/WebCore/page/DOMTimer.cpp b/WebCore/page/DOMTimer.cpp
index 3ac6d15..57e6512 100644
--- a/WebCore/page/DOMTimer.cpp
+++ b/WebCore/page/DOMTimer.cpp
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "DOMTimer.h"
 
-#include "InspectorTimelineAgent.h"
+#include "InspectorInstrumentation.h"
 #include "ScheduledAction.h"
 #include "ScriptExecutionContext.h"
 #include <wtf/HashSet.h>
@@ -81,10 +81,7 @@ int DOMTimer::install(ScriptExecutionContext* context, PassOwnPtr<ScheduledActio
     // or if it is a one-time timer and it has fired (DOMTimer::fired).
     DOMTimer* timer = new DOMTimer(context, action, timeout, singleShot);
 
-#if ENABLE(INSPECTOR)
-    if (InspectorTimelineAgent* timelineAgent = InspectorTimelineAgent::retrieve(context))
-        timelineAgent->didInstallTimer(timer->m_timeoutId, timeout, singleShot);
-#endif    
+    InspectorInstrumentation::didInstallTimer(context, timer->m_timeoutId, timeout, singleShot);
 
     return timer->m_timeoutId;
 }
@@ -97,10 +94,7 @@ void DOMTimer::removeById(ScriptExecutionContext* context, int timeoutId)
     if (timeoutId <= 0)
         return;
 
-#if ENABLE(INSPECTOR)
-    if (InspectorTimelineAgent* timelineAgent = InspectorTimelineAgent::retrieve(context))
-        timelineAgent->didRemoveTimer(timeoutId);
-#endif
+    InspectorInstrumentation::didRemoveTimer(context, timeoutId);
 
     delete context->findTimeout(timeoutId);
 }
@@ -110,10 +104,7 @@ void DOMTimer::fired()
     ScriptExecutionContext* context = scriptExecutionContext();
     timerNestingLevel = m_nestingLevel;
 
-#if ENABLE(INSPECTOR)
-    if (InspectorTimelineAgent* timelineAgent = InspectorTimelineAgent::retrieve(context))
-        timelineAgent->willFireTimer(m_timeoutId);
-#endif
+    InspectorInstrumentationCookie cookie = InspectorInstrumentation::willFireTimer(context, m_timeoutId);
 
     // Simple case for non-one-shot timers.
     if (isActive()) {
@@ -125,10 +116,9 @@ void DOMTimer::fired()
 
         // No access to member variables after this point, it can delete the timer.
         m_action->execute(context);
-#if ENABLE(INSPECTOR)
-        if (InspectorTimelineAgent* timelineAgent = InspectorTimelineAgent::retrieve(context))
-            timelineAgent->didFireTimer();
-#endif
+
+        InspectorInstrumentation::didFireTimer(cookie);
+
         return;
     }
 
@@ -140,10 +130,7 @@ void DOMTimer::fired()
 
     action->execute(context);
 
-#if ENABLE(INSPECTOR)
-    if (InspectorTimelineAgent* timelineAgent = InspectorTimelineAgent::retrieve(context))
-        timelineAgent->didFireTimer();
-#endif
+    InspectorInstrumentation::didFireTimer(cookie);
 
     timerNestingLevel = 0;
 }