1 files changed, 25 insertions, 76 deletions
diff --git a/Source/WebCore/inspector/TimelineRecordFactory.h b/Source/WebCore/inspector/TimelineRecordFactory.h
index e4bf90a97..fb705d1ea 100644
--- a/Source/WebCore/inspector/TimelineRecordFactory.h
+++ b/Source/WebCore/inspector/TimelineRecordFactory.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
+ * Copyright (C) 2014 University of Washington.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -28,92 +29,40 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  
-#ifndef TimelineRecordFactory_h
-#define TimelineRecordFactory_h
+#pragma once
 
-#include "URL.h"
 #include <inspector/InspectorValues.h>
 #include <wtf/Forward.h>
 #include <wtf/text/WTFString.h>
 
-namespace WebCore {
-
-    class Event;
-    class FloatQuad;
-    class ResourceRequest;
-    class ResourceResponse;
-
-    class TimelineRecordFactory {
-    public:
-        static PassRefPtr<Inspector::InspectorObject> createGenericRecord(double startTime, int maxCallStackDepth);
-        static PassRefPtr<Inspector::InspectorObject> createBackgroundRecord(double startTime, const String& thread);
-
-        static PassRefPtr<Inspector::InspectorObject> createGCEventData(const size_t usedHeapSizeDelta);
-
-        static PassRefPtr<Inspector::InspectorObject> createFunctionCallData(const String& scriptName, int scriptLine);
-
-        static PassRefPtr<Inspector::InspectorObject> createEventDispatchData(const Event&);
-
-        static PassRefPtr<Inspector::InspectorObject> createGenericTimerData(int timerId);
-
-        static PassRefPtr<Inspector::InspectorObject> createTimerInstallData(int timerId, int timeout, bool singleShot);
-
-        static PassRefPtr<Inspector::InspectorObject> createXHRReadyStateChangeData(const String& url, int readyState);
-
-        static PassRefPtr<Inspector::InspectorObject> createXHRLoadData(const String& url);
-
-        static PassRefPtr<Inspector::InspectorObject> createEvaluateScriptData(const String&, double lineNumber);
-
-        static PassRefPtr<Inspector::InspectorObject> createTimeStampData(const String&);
+namespace Inspector {
+struct ScriptBreakpointAction;
+}
 
-        static PassRefPtr<Inspector::InspectorObject> createResourceSendRequestData(const String& requestId, const ResourceRequest&);
-
-        static PassRefPtr<Inspector::InspectorObject> createScheduleResourceRequestData(const String&);
-
-        static PassRefPtr<Inspector::InspectorObject> createResourceReceiveResponseData(const String& requestId, const ResourceResponse&);
-
-        static PassRefPtr<Inspector::InspectorObject> createReceiveResourceData(const String& requestId, int length);
-
-        static PassRefPtr<Inspector::InspectorObject> createResourceFinishData(const String& requestId, bool didFail, double finishTime);
-
-        static PassRefPtr<Inspector::InspectorObject> createLayoutData(unsigned dirtyObjects, unsigned totalObjects, bool partialLayout);
-
-        static PassRefPtr<Inspector::InspectorObject> createDecodeImageData(const String& imageType);
-
-        static PassRefPtr<Inspector::InspectorObject> createResizeImageData(bool shouldCache);
-
-        static PassRefPtr<Inspector::InspectorObject> createMarkData(bool isMainFrame);
-
-        static PassRefPtr<Inspector::InspectorObject> createParseHTMLData(unsigned startLine);
+namespace WebCore {
 
-        static PassRefPtr<Inspector::InspectorObject> createAnimationFrameData(int callbackId);
+class Event;
+class FloatQuad;
 
-        static PassRefPtr<Inspector::InspectorObject> createPaintData(const FloatQuad&);
+class TimelineRecordFactory {
+public:
+    static Ref<Inspector::InspectorObject> createGenericRecord(double startTime, int maxCallStackDepth);
 
-        static void appendLayoutRoot(Inspector::InspectorObject* data, const FloatQuad&);
+    static Ref<Inspector::InspectorObject> createFunctionCallData(const String& scriptName, int scriptLine);
+    static Ref<Inspector::InspectorObject> createConsoleProfileData(const String& title);
+    static Ref<Inspector::InspectorObject> createProbeSampleData(const Inspector::ScriptBreakpointAction&, unsigned sampleId);
+    static Ref<Inspector::InspectorObject> createEventDispatchData(const Event&);
+    static Ref<Inspector::InspectorObject> createGenericTimerData(int timerId);
+    static Ref<Inspector::InspectorObject> createTimerInstallData(int timerId, std::chrono::milliseconds timeout, bool singleShot);
+    static Ref<Inspector::InspectorObject> createEvaluateScriptData(const String&, double lineNumber);
+    static Ref<Inspector::InspectorObject> createTimeStampData(const String&);
+    static Ref<Inspector::InspectorObject> createAnimationFrameData(int callbackId);
+    static Ref<Inspector::InspectorObject> createPaintData(const FloatQuad&);
 
-#if ENABLE(WEB_SOCKETS)
-        static inline PassRefPtr<Inspector::InspectorObject> createWebSocketCreateData(unsigned long identifier, const URL& url, const String& protocol)
-        {
-            RefPtr<Inspector::InspectorObject> data = Inspector::InspectorObject::create();
-            data->setNumber("identifier", identifier);
-            data->setString("url", url.string());
-            if (!protocol.isNull())
-                data->setString("webSocketProtocol", protocol);
-            return data.release();
-        }
+    static void appendLayoutRoot(Inspector::InspectorObject* data, const FloatQuad&);
 
-        static inline PassRefPtr<Inspector::InspectorObject> createGenericWebSocketData(unsigned long identifier)
-        {
-            RefPtr<Inspector::InspectorObject> data = Inspector::InspectorObject::create();
-            data->setNumber("identifier", identifier);
-            return data.release();
-        }
-#endif
-    private:
-        TimelineRecordFactory() { }
-    };
+private:
+    TimelineRecordFactory() { }
+};
 
 } // namespace WebCore
-
-#endif // !defined(TimelineRecordFactory_h)