webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 18 insertions, 24 deletions

diff --git a/Source/WebCore/inspector/PageDebuggerAgent.h b/Source/WebCore/inspector/PageDebuggerAgent.h
index 9bf78a312..5220054a9 100644
--- a/Source/WebCore/inspector/PageDebuggerAgent.h
+++ b/Source/WebCore/inspector/PageDebuggerAgent.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
+ * Copyright (C) 2015-2016 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,55 +29,48 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef PageDebuggerAgent_h
-#define PageDebuggerAgent_h
+#pragma once
 
-#if ENABLE(INSPECTOR)
-
-#include "PageScriptDebugServer.h"
 #include "WebDebuggerAgent.h"
 
 namespace WebCore {
 
 class InspectorOverlay;
 class InspectorPageAgent;
-class InstrumentingAgents;
 class Page;
-class PageScriptDebugServer;
 
 class PageDebuggerAgent final : public WebDebuggerAgent {
     WTF_MAKE_NONCOPYABLE(PageDebuggerAgent);
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    PageDebuggerAgent(Inspector::InjectedScriptManager*, InstrumentingAgents*, InspectorPageAgent*, InspectorOverlay*);
+    PageDebuggerAgent(PageAgentContext&, InspectorPageAgent*, InspectorOverlay*);
     virtual ~PageDebuggerAgent() { }
 
     void didClearMainFrameWindowObject();
 
+    void mainFrameStartedLoading();
+    void mainFrameStoppedLoading();
+    void mainFrameNavigated();
+
 protected:
-    virtual void enable() override;
-    virtual void disable(bool isBeingDestroyed) override;
+    void enable() override;
+    void disable(bool isBeingDestroyed) override;
 
-    virtual String sourceMapURLForScript(const Script&) override;
+    String sourceMapURLForScript(const Script&) override;
 
 private:
-    virtual void startListeningScriptDebugServer() override;
-    virtual void stopListeningScriptDebugServer(bool isBeingDestroyed) override;
-    virtual PageScriptDebugServer& scriptDebugServer() override;
-    virtual void muteConsole() override;
-    virtual void unmuteConsole() override;
+    void muteConsole() override;
+    void unmuteConsole() override;
+
+    void breakpointActionLog(JSC::ExecState&, const String&) override;
 
-    virtual void breakpointActionLog(JSC::ExecState*, const String&) override;
+    Inspector::InjectedScript injectedScriptForEval(ErrorString&, const int* executionContextId) override;
+    void setOverlayMessage(ErrorString&, const String* const) final;
 
-    virtual Inspector::InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId) override;
-    virtual void setOverlayMessage(ErrorString*, const String*) override;
+    Page& m_page;
 
     InspectorPageAgent* m_pageAgent;
-    InspectorOverlay* m_overlay;
+    InspectorOverlay* m_overlay { nullptr };
 };
 
 } // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)
-
-#endif // !defined(PageDebuggerAgent_h)