Changeset 174322 in webkit for trunk/Source/JavaScriptCore/profiler/LegacyProfiler.h

Timestamp:

Oct 4, 2014, 2:55:58 PM (11 years ago)

Author:

Brian Burg

Message:

Unreviewed, rolling out r174319.

Causes assertions in fast/profiler tests. Needs nontrivial
investigation, will take offline.

Reverted changeset:

"Web Inspector: timelines should not count time elapsed while
paused in the debugger"
​https://bugs.webkit.org/show_bug.cgi?id=136351
​http://trac.webkit.org/changeset/174319

File:

• trunk/Source/JavaScriptCore/profiler/LegacyProfiler.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/profiler/LegacyProfiler.h

@@ -33 +33 @@
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
-#include <wtf/Stopwatch.h>
 #include <wtf/Vector.h>
 
 namespace JSC {
 
+class DebuggerCallFrame;
 class ExecState;
+class VM;
 class JSGlobalObject;
 class JSObject;
@@ -48 +49 @@
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    JS_EXPORT_PRIVATE static LegacyProfiler* profiler();
+    JS_EXPORT_PRIVATE static LegacyProfiler* profiler(); 
     static CallIdentifier createCallIdentifier(ExecState*, JSValue, const WTF::String& sourceURL, unsigned defaultLineNumber, unsigned defaultColumnNumber);
 
-    JS_EXPORT_PRIVATE void startProfiling(ExecState*, const WTF::String& title, PassRefPtr<Stopwatch>);
+    JS_EXPORT_PRIVATE void startProfiling(ExecState*, const WTF::String& title);
     JS_EXPORT_PRIVATE PassRefPtr<Profile> stopProfiling(ExecState*, const WTF::String& title);
     void stopProfiling(JSGlobalObject*);
@@ -66 +67 @@
     void exceptionUnwind(ExecState* handlerCallFrame);
 
+    void didPause(PassRefPtr<DebuggerCallFrame>);
+    void didContinue(PassRefPtr<DebuggerCallFrame>);
+
     const Vector<RefPtr<ProfileGenerator>>& currentProfiles() { return m_currentProfiles; };