Commit 95824c42 authored by tasak@google.com's avatar tasak@google.com

Make classes and structures in core/inspector fast-allocated.

Added STATIC_ONLY, STACK_ALLOCATED, DISALLOW_ALLOCATION, or ALLOW_ONLY_INLINE_ALLOCATION
instead of WTF_MAKE_FAST_ALLOCATED(_WILL_BE_REMOVED) if possible.

BUG=523249

Review URL: https://codereview.chromium.org/1308273007

git-svn-id: svn://svn.chromium.org/blink/trunk@201632 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent e647a2a4
...@@ -55,6 +55,7 @@ class XMLHttpRequest; ...@@ -55,6 +55,7 @@ class XMLHttpRequest;
class CORE_EXPORT AsyncCallTracker final : public NoBaseWillBeGarbageCollectedFinalized<AsyncCallTracker>, public V8DebuggerAgent::AsyncCallTrackingListener { class CORE_EXPORT AsyncCallTracker final : public NoBaseWillBeGarbageCollectedFinalized<AsyncCallTracker>, public V8DebuggerAgent::AsyncCallTrackingListener {
WTF_MAKE_NONCOPYABLE(AsyncCallTracker); WTF_MAKE_NONCOPYABLE(AsyncCallTracker);
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(AsyncCallTracker); WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(AsyncCallTracker);
WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(AsyncCallTracker);
public: public:
AsyncCallTracker(V8DebuggerAgent*, InstrumentingAgents*); AsyncCallTracker(V8DebuggerAgent*, InstrumentingAgents*);
~AsyncCallTracker() override; ~AsyncCallTracker() override;
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#define IdentifiersFactory_h #define IdentifiersFactory_h
#include "core/CoreExport.h" #include "core/CoreExport.h"
#include "wtf/Allocator.h"
#include "wtf/text/WTFString.h" #include "wtf/text/WTFString.h"
namespace blink { namespace blink {
...@@ -35,6 +36,7 @@ class DocumentLoader; ...@@ -35,6 +36,7 @@ class DocumentLoader;
class LocalFrame; class LocalFrame;
class CORE_EXPORT IdentifiersFactory { class CORE_EXPORT IdentifiersFactory {
STATIC_ONLY(IdentifiersFactory);
public: public:
static void setProcessId(long); static void setProcessId(long);
static String createIdentifier(); static String createIdentifier();
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include "core/InspectorTypeBuilder.h" #include "core/InspectorTypeBuilder.h"
#include "core/inspector/InjectedScriptManager.h" #include "core/inspector/InjectedScriptManager.h"
#include "core/inspector/InjectedScriptNative.h" #include "core/inspector/InjectedScriptNative.h"
#include "wtf/Allocator.h"
#include "wtf/Forward.h" #include "wtf/Forward.h"
#include <v8.h> #include <v8.h>
...@@ -49,6 +50,7 @@ PassRefPtr<JSONValue> toJSONValue(const ScriptValue&); ...@@ -49,6 +50,7 @@ PassRefPtr<JSONValue> toJSONValue(const ScriptValue&);
class InjectedScript final { class InjectedScript final {
DISALLOW_ALLOCATION();
public: public:
InjectedScript(); InjectedScript();
~InjectedScript(); ~InjectedScript();
......
...@@ -5,9 +5,12 @@ ...@@ -5,9 +5,12 @@
#ifndef InjectedScriptHostClient_h #ifndef InjectedScriptHostClient_h
#define InjectedScriptHostClient_h #define InjectedScriptHostClient_h
#include "wtf/FastAllocBase.h"
namespace blink { namespace blink {
class InjectedScriptHostClient { class InjectedScriptHostClient {
WTF_MAKE_FAST_ALLOCATED(InjectedScriptHostClient);
public: public:
virtual void muteWarningsAndDeprecations() { } virtual void muteWarningsAndDeprecations() { }
virtual void unmuteWarningsAndDeprecations() { } virtual void unmuteWarningsAndDeprecations() { }
......
...@@ -48,6 +48,7 @@ class InstrumentingAgents; ...@@ -48,6 +48,7 @@ class InstrumentingAgents;
class LocalFrame; class LocalFrame;
class CORE_EXPORT InspectorAgent : public NoBaseWillBeGarbageCollectedFinalized<InspectorAgent> { class CORE_EXPORT InspectorAgent : public NoBaseWillBeGarbageCollectedFinalized<InspectorAgent> {
WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(InspectorAgent);
public: public:
explicit InspectorAgent(const String&); explicit InspectorAgent(const String&);
virtual ~InspectorAgent(); virtual ~InspectorAgent();
......
...@@ -77,6 +77,7 @@ public: ...@@ -77,6 +77,7 @@ public:
}; };
class InlineStyleOverrideScope { class InlineStyleOverrideScope {
STACK_ALLOCATED();
public: public:
InlineStyleOverrideScope(SecurityContext* context) InlineStyleOverrideScope(SecurityContext* context)
: m_contentSecurityPolicy(context->contentSecurityPolicy()) : m_contentSecurityPolicy(context->contentSecurityPolicy())
......
...@@ -81,6 +81,7 @@ private: ...@@ -81,6 +81,7 @@ private:
namespace InspectorInstrumentation { namespace InspectorInstrumentation {
class CORE_EXPORT FrontendCounter { class CORE_EXPORT FrontendCounter {
STATIC_ONLY(FrontendCounter);
private: private:
friend void frontendCreated(); friend void frontendCreated();
friend void frontendDeleted(); friend void frontendDeleted();
......
...@@ -92,6 +92,7 @@ private: ...@@ -92,6 +92,7 @@ private:
class CORE_EXPORT InspectorCompositeState final : public NoBaseWillBeGarbageCollectedFinalized<InspectorCompositeState>, public InspectorStateUpdateListener { class CORE_EXPORT InspectorCompositeState final : public NoBaseWillBeGarbageCollectedFinalized<InspectorCompositeState>, public InspectorStateUpdateListener {
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(InspectorCompositeState); WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(InspectorCompositeState);
WTF_MAKE_NONCOPYABLE(InspectorCompositeState); WTF_MAKE_NONCOPYABLE(InspectorCompositeState);
WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(InspectorCompositeState);
public: public:
InspectorCompositeState(InspectorStateClient* inspectorStateClient) InspectorCompositeState(InspectorStateClient* inspectorStateClient)
: m_client(inspectorStateClient) : m_client(inspectorStateClient)
......
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
#define InspectorTaskRunner_h #define InspectorTaskRunner_h
#include "core/CoreExport.h" #include "core/CoreExport.h"
#include "wtf/Allocator.h"
#include "wtf/FastAllocBase.h"
#include "wtf/Forward.h" #include "wtf/Forward.h"
#include "wtf/Noncopyable.h" #include "wtf/Noncopyable.h"
#include "wtf/OwnPtr.h" #include "wtf/OwnPtr.h"
...@@ -16,11 +18,13 @@ namespace blink { ...@@ -16,11 +18,13 @@ namespace blink {
class CORE_EXPORT InspectorTaskRunner final { class CORE_EXPORT InspectorTaskRunner final {
WTF_MAKE_NONCOPYABLE(InspectorTaskRunner); WTF_MAKE_NONCOPYABLE(InspectorTaskRunner);
WTF_MAKE_FAST_ALLOCATED(InspectorTaskRunner);
public: public:
explicit InspectorTaskRunner(v8::Isolate*); explicit InspectorTaskRunner(v8::Isolate*);
~InspectorTaskRunner(); ~InspectorTaskRunner();
class Task { class Task {
WTF_MAKE_FAST_ALLOCATED(Task);
public: public:
virtual ~Task() { } virtual ~Task() { }
virtual void run() = 0; virtual void run() = 0;
...@@ -31,6 +35,7 @@ public: ...@@ -31,6 +35,7 @@ public:
void runPendingTasks(); void runPendingTasks();
class CORE_EXPORT IgnoreInterruptsScope final { class CORE_EXPORT IgnoreInterruptsScope final {
WTF_MAKE_FAST_ALLOCATED(IgnoreInterruptsScope);
public: public:
explicit IgnoreInterruptsScope(InspectorTaskRunner*); explicit IgnoreInterruptsScope(InspectorTaskRunner*);
~IgnoreInterruptsScope(); ~IgnoreInterruptsScope();
......
...@@ -45,12 +45,14 @@ class WorkerThread; ...@@ -45,12 +45,14 @@ class WorkerThread;
class XMLHttpRequest; class XMLHttpRequest;
class InspectorLayoutEvent { class InspectorLayoutEvent {
STATIC_ONLY(InspectorLayoutEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> beginData(FrameView*); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> beginData(FrameView*);
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> endData(LayoutObject* rootForThisLayout); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> endData(LayoutObject* rootForThisLayout);
}; };
class InspectorScheduleStyleInvalidationTrackingEvent { class InspectorScheduleStyleInvalidationTrackingEvent {
STATIC_ONLY(InspectorScheduleStyleInvalidationTrackingEvent);
public: public:
static const char Attribute[]; static const char Attribute[];
static const char Class[]; static const char Class[];
...@@ -75,6 +77,7 @@ private: ...@@ -75,6 +77,7 @@ private:
InspectorScheduleStyleInvalidationTrackingEvent::changeType((element), (invalidationSet), __VA_ARGS__)) InspectorScheduleStyleInvalidationTrackingEvent::changeType((element), (invalidationSet), __VA_ARGS__))
class InspectorStyleRecalcInvalidationTrackingEvent { class InspectorStyleRecalcInvalidationTrackingEvent {
STATIC_ONLY(InspectorStyleRecalcInvalidationTrackingEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(Node*, const StyleChangeReasonForTracing&); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(Node*, const StyleChangeReasonForTracing&);
}; };
...@@ -82,6 +85,7 @@ public: ...@@ -82,6 +85,7 @@ public:
String descendantInvalidationSetToIdString(const DescendantInvalidationSet&); String descendantInvalidationSetToIdString(const DescendantInvalidationSet&);
class InspectorStyleInvalidatorInvalidateEvent { class InspectorStyleInvalidatorInvalidateEvent {
STATIC_ONLY(InspectorStyleInvalidatorInvalidateEvent);
public: public:
static const char ElementHasPendingInvalidationList[]; static const char ElementHasPendingInvalidationList[];
static const char InvalidateCustomPseudo[]; static const char InvalidateCustomPseudo[];
...@@ -159,82 +163,98 @@ extern const char ScrollbarChanged[]; ...@@ -159,82 +163,98 @@ extern const char ScrollbarChanged[];
typedef const char LayoutInvalidationReasonForTracing[]; typedef const char LayoutInvalidationReasonForTracing[];
class CORE_EXPORT InspectorLayoutInvalidationTrackingEvent { class CORE_EXPORT InspectorLayoutInvalidationTrackingEvent {
STATIC_ONLY(InspectorLayoutInvalidationTrackingEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const LayoutObject*, LayoutInvalidationReasonForTracing); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const LayoutObject*, LayoutInvalidationReasonForTracing);
}; };
class InspectorPaintInvalidationTrackingEvent { class InspectorPaintInvalidationTrackingEvent {
STATIC_ONLY(InspectorPaintInvalidationTrackingEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const LayoutObject*, const LayoutObject& paintContainer); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const LayoutObject*, const LayoutObject& paintContainer);
}; };
class InspectorScrollInvalidationTrackingEvent { class InspectorScrollInvalidationTrackingEvent {
STATIC_ONLY(InspectorScrollInvalidationTrackingEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const LayoutObject&); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const LayoutObject&);
}; };
class InspectorSendRequestEvent { class InspectorSendRequestEvent {
STATIC_ONLY(InspectorSendRequestEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(unsigned long identifier, LocalFrame*, const ResourceRequest&); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(unsigned long identifier, LocalFrame*, const ResourceRequest&);
}; };
class InspectorReceiveResponseEvent { class InspectorReceiveResponseEvent {
STATIC_ONLY(InspectorReceiveResponseEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(unsigned long identifier, LocalFrame*, const ResourceResponse&); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(unsigned long identifier, LocalFrame*, const ResourceResponse&);
}; };
class InspectorReceiveDataEvent { class InspectorReceiveDataEvent {
STATIC_ONLY(InspectorReceiveDataEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(unsigned long identifier, LocalFrame*, int encodedDataLength); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(unsigned long identifier, LocalFrame*, int encodedDataLength);
}; };
class InspectorResourceFinishEvent { class InspectorResourceFinishEvent {
STATIC_ONLY(InspectorResourceFinishEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(unsigned long identifier, double finishTime, bool didFail); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(unsigned long identifier, double finishTime, bool didFail);
}; };
class InspectorTimerInstallEvent { class InspectorTimerInstallEvent {
STATIC_ONLY(InspectorTimerInstallEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, int timerId, int timeout, bool singleShot); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, int timerId, int timeout, bool singleShot);
}; };
class InspectorTimerRemoveEvent { class InspectorTimerRemoveEvent {
STATIC_ONLY(InspectorTimerRemoveEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, int timerId); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, int timerId);
}; };
class InspectorTimerFireEvent { class InspectorTimerFireEvent {
STATIC_ONLY(InspectorTimerFireEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, int timerId); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, int timerId);
}; };
class InspectorAnimationFrameEvent { class InspectorAnimationFrameEvent {
STATIC_ONLY(InspectorAnimationFrameEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, int callbackId); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, int callbackId);
}; };
class InspectorParseHtmlEvent { class InspectorParseHtmlEvent {
STATIC_ONLY(InspectorParseHtmlEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> beginData(Document*, unsigned startLine); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> beginData(Document*, unsigned startLine);
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> endData(unsigned endLine); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> endData(unsigned endLine);
}; };
class InspectorParseAuthorStyleSheetEvent { class InspectorParseAuthorStyleSheetEvent {
STATIC_ONLY(InspectorParseAuthorStyleSheetEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const CSSStyleSheetResource*); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const CSSStyleSheetResource*);
}; };
class InspectorXhrReadyStateChangeEvent { class InspectorXhrReadyStateChangeEvent {
STATIC_ONLY(InspectorXhrReadyStateChangeEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, XMLHttpRequest*); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, XMLHttpRequest*);
}; };
class InspectorXhrLoadEvent { class InspectorXhrLoadEvent {
STATIC_ONLY(InspectorXhrLoadEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, XMLHttpRequest*); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, XMLHttpRequest*);
}; };
class InspectorLayerInvalidationTrackingEvent { class InspectorLayerInvalidationTrackingEvent {
STATIC_ONLY(InspectorLayerInvalidationTrackingEvent);
public: public:
static const char SquashingLayerGeometryWasUpdated[]; static const char SquashingLayerGeometryWasUpdated[];
static const char AddedToSquashingLayer[]; static const char AddedToSquashingLayer[];
...@@ -253,11 +273,13 @@ public: ...@@ -253,11 +273,13 @@ public:
InspectorLayerInvalidationTrackingEvent::data((LAYER), (REASON))) InspectorLayerInvalidationTrackingEvent::data((LAYER), (REASON)))
class InspectorPaintEvent { class InspectorPaintEvent {
STATIC_ONLY(InspectorPaintEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(LayoutObject*, const LayoutRect& clipRect, const GraphicsLayer*); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(LayoutObject*, const LayoutRect& clipRect, const GraphicsLayer*);
}; };
class InspectorPaintImageEvent { class InspectorPaintImageEvent {
STATIC_ONLY(InspectorPaintImageEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const LayoutImage&); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const LayoutImage&);
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const LayoutObject&, const StyleImage&); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const LayoutObject&, const StyleImage&);
...@@ -265,86 +287,103 @@ public: ...@@ -265,86 +287,103 @@ public:
}; };
class InspectorCommitLoadEvent { class InspectorCommitLoadEvent {
STATIC_ONLY(InspectorCommitLoadEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(LocalFrame*); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(LocalFrame*);
}; };
class InspectorMarkLoadEvent { class InspectorMarkLoadEvent {
STATIC_ONLY(InspectorMarkLoadEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(LocalFrame*); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(LocalFrame*);
}; };
class InspectorScrollLayerEvent { class InspectorScrollLayerEvent {
STATIC_ONLY(InspectorScrollLayerEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(LayoutObject*); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(LayoutObject*);
}; };
class InspectorUpdateLayerTreeEvent { class InspectorUpdateLayerTreeEvent {
STATIC_ONLY(InspectorUpdateLayerTreeEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(LocalFrame*); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(LocalFrame*);
}; };
class InspectorEvaluateScriptEvent { class InspectorEvaluateScriptEvent {
STATIC_ONLY(InspectorEvaluateScriptEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(LocalFrame*, const String& url, int lineNumber); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(LocalFrame*, const String& url, int lineNumber);
}; };
class InspectorFunctionCallEvent { class InspectorFunctionCallEvent {
STATIC_ONLY(InspectorFunctionCallEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, int scriptId, const String& scriptName, int scriptLine); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, int scriptId, const String& scriptName, int scriptLine);
}; };
class InspectorUpdateCountersEvent { class InspectorUpdateCountersEvent {
STATIC_ONLY(InspectorUpdateCountersEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data();
}; };
class InspectorInvalidateLayoutEvent { class InspectorInvalidateLayoutEvent {
STATIC_ONLY(InspectorInvalidateLayoutEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(LocalFrame*); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(LocalFrame*);
}; };
class InspectorRecalculateStylesEvent { class InspectorRecalculateStylesEvent {
STATIC_ONLY(InspectorRecalculateStylesEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(LocalFrame*); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(LocalFrame*);
}; };
class InspectorEventDispatchEvent { class InspectorEventDispatchEvent {
STATIC_ONLY(InspectorEventDispatchEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const Event&); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const Event&);
}; };
class InspectorTimeStampEvent { class InspectorTimeStampEvent {
STATIC_ONLY(InspectorTimeStampEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, const String& message); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, const String& message);
}; };
class InspectorTracingSessionIdForWorkerEvent { class InspectorTracingSessionIdForWorkerEvent {
STATIC_ONLY(InspectorTracingSessionIdForWorkerEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const String& sessionId, const String& workerId, WorkerThread*); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const String& sessionId, const String& workerId, WorkerThread*);
}; };
class InspectorTracingStartedInFrame { class InspectorTracingStartedInFrame {
STATIC_ONLY(InspectorTracingStartedInFrame);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const String& sessionId, LocalFrame*); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const String& sessionId, LocalFrame*);
}; };
class InspectorSetLayerTreeId { class InspectorSetLayerTreeId {
STATIC_ONLY(InspectorSetLayerTreeId);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const String& sessionId, int layerTreeId); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const String& sessionId, int layerTreeId);
}; };
class InspectorAnimationEvent { class InspectorAnimationEvent {
STATIC_ONLY(InspectorAnimationEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const Animation&); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const Animation&);
}; };
class InspectorAnimationStateEvent { class InspectorAnimationStateEvent {
STATIC_ONLY(InspectorAnimationStateEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const Animation&); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const Animation&);
}; };
class InspectorHitTestEvent { class InspectorHitTestEvent {
STATIC_ONLY(InspectorHitTestEvent);
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> endData(const HitTestRequest&, const HitTestLocation&, const HitTestResult&); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> endData(const HitTestRequest&, const HitTestLocation&, const HitTestResult&);
}; };
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#define InstanceCounters_h #define InstanceCounters_h
#include "core/CoreExport.h" #include "core/CoreExport.h"
#include "wtf/FastAllocBase.h" #include "wtf/Allocator.h"
#if ENABLE(ASSERT) #if ENABLE(ASSERT)
#include "wtf/MainThread.h" #include "wtf/MainThread.h"
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
namespace blink { namespace blink {
class InstanceCounters { class InstanceCounters {
STATIC_ONLY(InstanceCounters);
public: public:
enum CounterType { enum CounterType {
ActiveDOMObjectCounter, ActiveDOMObjectCounter,
...@@ -73,8 +74,6 @@ public: ...@@ -73,8 +74,6 @@ public:
CORE_EXPORT static int counterValue(CounterType); CORE_EXPORT static int counterValue(CounterType);
private: private:
InstanceCounters();
CORE_EXPORT static int s_counters[CounterTypeLength]; CORE_EXPORT static int s_counters[CounterTypeLength];
}; };
......
...@@ -23,6 +23,7 @@ class JSONArray; ...@@ -23,6 +23,7 @@ class JSONArray;
class JSONObject; class JSONObject;
class CORE_EXPORT LayoutEditor final : public NoBaseWillBeGarbageCollectedFinalized<LayoutEditor> { class CORE_EXPORT LayoutEditor final : public NoBaseWillBeGarbageCollectedFinalized<LayoutEditor> {
WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(LayoutEditor);
public: public:
static PassOwnPtrWillBeRawPtr<LayoutEditor> create(InspectorCSSAgent* cssAgent, InspectorDOMAgent* domAgent) static PassOwnPtrWillBeRawPtr<LayoutEditor> create(InspectorCSSAgent* cssAgent, InspectorDOMAgent* domAgent)
{ {
......
...@@ -49,6 +49,7 @@ class CORE_EXPORT MainThreadDebugger final : public ScriptDebuggerBase { ...@@ -49,6 +49,7 @@ class CORE_EXPORT MainThreadDebugger final : public ScriptDebuggerBase {
WTF_MAKE_NONCOPYABLE(MainThreadDebugger); WTF_MAKE_NONCOPYABLE(MainThreadDebugger);
public: public:
class ClientMessageLoop { class ClientMessageLoop {
WTF_MAKE_FAST_ALLOCATED(ClientMessageLoop);
public: public:
virtual ~ClientMessageLoop() { } virtual ~ClientMessageLoop() { }
virtual void run(LocalFrame*) = 0; virtual void run(LocalFrame*) = 0;
......
...@@ -23,6 +23,7 @@ class ScriptValue; ...@@ -23,6 +23,7 @@ class ScriptValue;
class PromiseTracker final : public NoBaseWillBeGarbageCollectedFinalized<PromiseTracker> { class PromiseTracker final : public NoBaseWillBeGarbageCollectedFinalized<PromiseTracker> {
WTF_MAKE_NONCOPYABLE(PromiseTracker); WTF_MAKE_NONCOPYABLE(PromiseTracker);
WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(PromiseTracker);
public: public:
class CORE_EXPORT Listener : public WillBeGarbageCollectedMixin { class CORE_EXPORT Listener : public WillBeGarbageCollectedMixin {
public: public:
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#ifndef RemoteObjectId_h #ifndef RemoteObjectId_h
#define RemoteObjectId_h #define RemoteObjectId_h
#include "wtf/FastAllocBase.h"
#include "wtf/Forward.h" #include "wtf/Forward.h"
namespace blink { namespace blink {
...@@ -12,6 +13,7 @@ namespace blink { ...@@ -12,6 +13,7 @@ namespace blink {
class JSONObject; class JSONObject;
class RemoteObjectIdBase { class RemoteObjectIdBase {
WTF_MAKE_FAST_ALLOCATED(RemoteObjectIdBase);
public: public:
int contextId() const { return m_injectedScriptId; } int contextId() const { return m_injectedScriptId; }
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#define ScriptCallFrame_h #define ScriptCallFrame_h
#include "core/InspectorTypeBuilder.h" #include "core/InspectorTypeBuilder.h"
#include "wtf/Allocator.h"
#include "wtf/Forward.h" #include "wtf/Forward.h"
#include "wtf/text/WTFString.h" #include "wtf/text/WTFString.h"
...@@ -40,6 +41,7 @@ namespace blink { ...@@ -40,6 +41,7 @@ namespace blink {
class TracedValue; class TracedValue;
class ScriptCallFrame { class ScriptCallFrame {
ALLOW_ONLY_INLINE_ALLOCATION();
public: public:
ScriptCallFrame(); ScriptCallFrame();
ScriptCallFrame(const String& functionName, const String& scriptId, const String& scriptName, unsigned lineNumber, unsigned column = 0); ScriptCallFrame(const String& functionName, const String& scriptId, const String& scriptName, unsigned lineNumber, unsigned column = 0);
......
...@@ -19,6 +19,7 @@ class ScriptState; ...@@ -19,6 +19,7 @@ class ScriptState;
class V8AsyncCallTracker final : public NoBaseWillBeGarbageCollectedFinalized<V8AsyncCallTracker>, public ScriptState::Observer, public V8DebuggerAgent::AsyncCallTrackingListener { class V8AsyncCallTracker final : public NoBaseWillBeGarbageCollectedFinalized<V8AsyncCallTracker>, public ScriptState::Observer, public V8DebuggerAgent::AsyncCallTrackingListener {
WTF_MAKE_NONCOPYABLE(V8AsyncCallTracker); WTF_MAKE_NONCOPYABLE(V8AsyncCallTracker);
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(V8AsyncCallTracker); WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(V8AsyncCallTracker);
WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(V8AsyncCallTracker);
public: public:
static PassOwnPtrWillBeRawPtr<V8AsyncCallTracker> create(V8DebuggerAgent* debuggerAgent) static PassOwnPtrWillBeRawPtr<V8AsyncCallTracker> create(V8DebuggerAgent* debuggerAgent)
{ {
......
...@@ -30,11 +30,13 @@ ...@@ -30,11 +30,13 @@
#ifndef ScriptBreakpoint_h #ifndef ScriptBreakpoint_h
#define ScriptBreakpoint_h #define ScriptBreakpoint_h
#include "wtf/Allocator.h"
#include "wtf/text/WTFString.h" #include "wtf/text/WTFString.h"
namespace blink { namespace blink {
struct ScriptBreakpoint { struct ScriptBreakpoint {
STACK_ALLOCATED();
ScriptBreakpoint() : ScriptBreakpoint(0, 0, String()) { } ScriptBreakpoint() : ScriptBreakpoint(0, 0, String()) { }
ScriptBreakpoint(int lineNumber, int columnNumber, const String& condition) ScriptBreakpoint(int lineNumber, int columnNumber, const String& condition)
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include "core/CoreExport.h" #include "core/CoreExport.h"
#include "core/InspectorTypeBuilder.h" #include "core/InspectorTypeBuilder.h"
#include "core/inspector/v8/V8DebuggerListener.h" #include "core/inspector/v8/V8DebuggerListener.h"
#include "wtf/FastAllocBase.h"
#include "wtf/Forward.h" #include "wtf/Forward.h"
#include "wtf/PassOwnPtr.h" #include "wtf/PassOwnPtr.h"
...@@ -21,6 +22,7 @@ class V8DebuggerClient; ...@@ -21,6 +22,7 @@ class V8DebuggerClient;
struct ScriptBreakpoint; struct ScriptBreakpoint;
class CORE_EXPORT V8Debugger { class CORE_EXPORT V8Debugger {
WTF_MAKE_FAST_ALLOCATED(V8Debugger);
public: public:
static PassOwnPtr<V8Debugger> create(v8::Isolate*, V8DebuggerClient*); static PassOwnPtr<V8Debugger> create(v8::Isolate*, V8DebuggerClient*);
virtual ~V8Debugger() { } virtual ~V8Debugger() { }
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#define V8DebuggerClient_h #define V8DebuggerClient_h
#include "core/CoreExport.h" #include "core/CoreExport.h"
#include "wtf/FastAllocBase.h"
#include <v8.h> #include <v8.h>
...@@ -14,6 +15,7 @@ namespace blink { ...@@ -14,6 +15,7 @@ namespace blink {
class V8DebuggerListener; class V8DebuggerListener;
class CORE_EXPORT V8DebuggerClient { class CORE_EXPORT V8DebuggerClient {
WTF_MAKE_FAST_ALLOCATED(V8DebuggerClient);
public: public:
virtual ~V8DebuggerClient() { } virtual ~V8DebuggerClient() { }
virtual v8::Local<v8::Object> compileDebuggerScript() = 0; virtual v8::Local<v8::Object> compileDebuggerScript() = 0;
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#define V8DebuggerListener_h #define V8DebuggerListener_h
#include "core/CoreExport.h" #include "core/CoreExport.h"
#include "wtf/Allocator.h"
#include "wtf/Forward.h" #include "wtf/Forward.h"
#include "wtf/Vector.h" #include "wtf/Vector.h"
#include "wtf/text/WTFString.h" #include "wtf/text/WTFString.h"
...@@ -43,6 +44,7 @@ enum CompileResult { CompileSuccess, CompileError }; ...@@ -43,6 +44,7 @@ enum CompileResult { CompileSuccess, CompileError };
class CORE_EXPORT V8DebuggerListener { class CORE_EXPORT V8DebuggerListener {
public: public:
class Script { class Script {
DISALLOW_ALLOCATION();
public: public:
Script(); Script();
...@@ -97,6 +99,7 @@ public: ...@@ -97,6 +99,7 @@ public:
}; };
struct ParsedScript { struct ParsedScript {
ALLOW_ONLY_INLINE_ALLOCATION();
String scriptId; String scriptId;
Script script; Script script;
CompileResult compileResult; CompileResult compileResult;
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#ifndef V8JavaScriptCallFrame_h #ifndef V8JavaScriptCallFrame_h
#define V8JavaScriptCallFrame_h #define V8JavaScriptCallFrame_h
#include "wtf/Allocator.h"
#include "wtf/Forward.h" #include "wtf/Forward.h"
#include <v8.h> #include <v8.h>
...@@ -13,6 +14,7 @@ namespace blink { ...@@ -13,6 +14,7 @@ namespace blink {
class JavaScriptCallFrame; class JavaScriptCallFrame;
class V8JavaScriptCallFrame { class V8JavaScriptCallFrame {
STATIC_ONLY(V8JavaScriptCallFrame);
public: public:
static v8::Local<v8::FunctionTemplate> createWrapperTemplate(v8::Isolate*); static v8::Local<v8::FunctionTemplate> createWrapperTemplate(v8::Isolate*);
static v8::Local<v8::Object> wrap(v8::Local<v8::FunctionTemplate> constructorTemplate, v8::Local<v8::Context>, PassRefPtr<JavaScriptCallFrame>); static v8::Local<v8::Object> wrap(v8::Local<v8::FunctionTemplate> constructorTemplate, v8::Local<v8::Context>, PassRefPtr<JavaScriptCallFrame>);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment