1 files changed, 20 insertions, 16 deletions

diff --git a/Source/WebCore/page/PageDebuggable.h b/Source/WebCore/page/PageDebuggable.h
index bc1ff6458..1723ad072 100644
--- a/Source/WebCore/page/PageDebuggable.h
+++ b/Source/WebCore/page/PageDebuggable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013, 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
@@ -23,42 +23,46 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef PageDebuggable_h
-#define PageDebuggable_h
+#pragma once
 
 #if ENABLE(REMOTE_INSPECTOR)
 
-#include <JavaScriptCore/RemoteInspectorDebuggable.h>
+#include <JavaScriptCore/RemoteInspectionTarget.h>
 #include <wtf/Noncopyable.h>
 
 namespace WebCore {
 
 class Page;
 
-class PageDebuggable final : public Inspector::RemoteInspectorDebuggable {
+class PageDebuggable final : public Inspector::RemoteInspectionTarget {
+    WTF_MAKE_FAST_ALLOCATED;
     WTF_MAKE_NONCOPYABLE(PageDebuggable);
 public:
     PageDebuggable(Page&);
     ~PageDebuggable() { }
 
-    virtual Inspector::RemoteInspectorDebuggable::DebuggableType type() const override { return Inspector::RemoteInspectorDebuggable::Web; }
+    Inspector::RemoteControllableTarget::Type type() const override { return Inspector::RemoteControllableTarget::Type::Web; }
 
-    virtual String name() const override;
-    virtual String url() const override;
-    virtual bool hasLocalDebugger() const override;
-    virtual pid_t parentProcessIdentifier() const override;
+    String name() const override;
+    String url() const override;
+    bool hasLocalDebugger() const override;
 
-    virtual void connect(Inspector::InspectorFrontendChannel*) override;
-    virtual void disconnect() override;
-    virtual void dispatchMessageFromRemoteFrontend(const String& message) override;
-    virtual void setIndicating(bool) override;
+    void connect(Inspector::FrontendChannel*, bool isAutomaticConnection = false) override;
+    void disconnect(Inspector::FrontendChannel*) override;
+    void dispatchMessageFromRemote(const String& message) override;
+    void setIndicating(bool) override;
+
+    String nameOverride() const { return m_nameOverride; }
+    void setNameOverride(const String&);
 
 private:
     Page& m_page;
+    String m_nameOverride;
+    bool m_forcedDeveloperExtrasEnabled;
 };
 
 } // namespace WebCore
 
-#endif // ENABLE(REMOTE_INSPECTOR)
+SPECIALIZE_TYPE_TRAITS_CONTROLLABLE_TARGET(WebCore::PageDebuggable, Web);
 
-#endif // !defined(PageDebuggable_h)
+#endif // ENABLE(REMOTE_INSPECTOR)