diff options
author | Steve Block <steveblock@google.com> | 2010-08-27 11:02:25 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2010-09-02 17:17:20 +0100 |
commit | e8b154fd68f9b33be40a3590e58347f353835f5c (patch) | |
tree | 0733ce26384183245aaa5656af26c653636fe6c1 /WebCore/inspector/InspectorTimelineAgent.h | |
parent | da56157816334089526a7a115a85fd85a6e9a1dc (diff) | |
download | external_webkit-e8b154fd68f9b33be40a3590e58347f353835f5c.zip external_webkit-e8b154fd68f9b33be40a3590e58347f353835f5c.tar.gz external_webkit-e8b154fd68f9b33be40a3590e58347f353835f5c.tar.bz2 |
Merge WebKit at r66079 : Initial merge by git
Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
Diffstat (limited to 'WebCore/inspector/InspectorTimelineAgent.h')
-rw-r--r-- | WebCore/inspector/InspectorTimelineAgent.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/WebCore/inspector/InspectorTimelineAgent.h b/WebCore/inspector/InspectorTimelineAgent.h index 16d7b83..6b3324b 100644 --- a/WebCore/inspector/InspectorTimelineAgent.h +++ b/WebCore/inspector/InspectorTimelineAgent.h @@ -42,7 +42,7 @@ namespace WebCore { class Event; -class RemoteInspectorFrontend; +class InspectorFrontend; class IntRect; class ResourceRequest; class ResourceResponse; @@ -74,11 +74,11 @@ enum TimelineRecordType { class InspectorTimelineAgent : ScriptGCEventListener, public Noncopyable { public: - InspectorTimelineAgent(RemoteInspectorFrontend* frontend); + InspectorTimelineAgent(InspectorFrontend* frontend); ~InspectorTimelineAgent(); void reset(); - void resetFrontendProxyObject(RemoteInspectorFrontend*); + void resetFrontendProxyObject(InspectorFrontend*); // Methods called from WebCore. void willCallFunction(const String& scriptName, int scriptLine); @@ -152,7 +152,7 @@ private: void pushGCEventRecords(); - RemoteInspectorFrontend* m_frontend; + InspectorFrontend* m_frontend; Vector<TimelineRecordEntry> m_recordStack; static int s_instanceCount; |