webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 10 insertions, 17 deletions

diff --git a/Source/WebCore/inspector/PageConsoleAgent.h b/Source/WebCore/inspector/PageConsoleAgent.h
index d557f1a8b..3177dc0fc 100644
--- a/Source/WebCore/inspector/PageConsoleAgent.h
+++ b/Source/WebCore/inspector/PageConsoleAgent.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -28,35 +29,27 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef PageConsoleAgent_h
-#define PageConsoleAgent_h
+#pragma once
 
-#include "InspectorConsoleAgent.h"
-#include <wtf/PassOwnPtr.h>
-
-#if ENABLE(INSPECTOR)
+#include "InspectorWebAgentBase.h"
+#include "WebConsoleAgent.h"
 
 namespace WebCore {
 
 class InspectorDOMAgent;
 
-class PageConsoleAgent : public InspectorConsoleAgent {
+class PageConsoleAgent final : public WebConsoleAgent {
     WTF_MAKE_NONCOPYABLE(PageConsoleAgent);
+    WTF_MAKE_FAST_ALLOCATED;
 public:
-    PageConsoleAgent(InstrumentingAgents*, PageInjectedScriptManager*, InspectorDOMAgent*);
-    virtual ~PageConsoleAgent();
-
-    virtual bool isWorkerAgent() override { return false; }
+    PageConsoleAgent(WebAgentContext&, Inspector::InspectorHeapAgent*, InspectorDOMAgent*);
+    virtual ~PageConsoleAgent() { }
 
 private:
-    virtual void clearMessages(ErrorString*) override;
-    virtual void addInspectedNode(ErrorString*, int nodeId) override;
+    void clearMessages(ErrorString&) override;
+    void addInspectedNode(ErrorString&, int nodeId) override;
 
     InspectorDOMAgent* m_inspectorDOMAgent;
 };
 
 } // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)
-
-#endif // !defined(PageConsoleAgent_h)