Merge DevTools Refactor CL to Blink36

Source/core/inspector/InspectorRuntimeAgent.h

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 26 matching lines @@
 #include "wtf/Noncopyable.h"
 
 namespace WebCore {
 
 class InjectedScript;
 class InjectedScriptManager;
 class InstrumentingAgents;
 class JSONArray;
 class ScriptState;
 class ScriptDebugServer;
+class ScriptDebugServerBase;
 
 typedef String ErrorString;
 
 class InspectorRuntimeAgent : public InspectorBaseAgent<InspectorRuntimeAgent>, public InspectorBackendDispatcher::RuntimeCommandHandler {
     WTF_MAKE_NONCOPYABLE(InspectorRuntimeAgent);
 public:
     virtual ~InspectorRuntimeAgent();
 
     // Part of the protocol.
     virtual void enable(ErrorString*) OVERRIDE;
@@ skipping 11 matching lines @@
     virtual void callFunctionOn(ErrorString*,
                         const String& objectId,
                         const String& expression,
                         const RefPtr<JSONArray>* optionalArguments,
                         const bool* doNotPauseOnExceptionsAndMuteConsole,
                         const bool* returnByValue,
                         const bool* generatePreview,
                         RefPtr<TypeBuilder::Runtime::RemoteObject>& result,
                         TypeBuilder::OptOutput<bool>* wasThrown) OVERRIDE FINAL;
     virtual void releaseObject(ErrorString*, const String& objectId) OVERRIDE FINAL;
+    virtual void getCompletions(ErrorString*,
+        const String& expression,
+        const int* executionContextId,
+        RefPtr<TypeBuilder::Array<String> >& result) OVERRIDE FINAL;
+
     virtual void getProperties(ErrorString*, const String& objectId, const bool* ownProperties, const bool* accessorPropertiesOnly, RefPtr<TypeBuilder::Array<TypeBuilder::Runtime::PropertyDescriptor> >& result, RefPtr<TypeBuilder::Array<TypeBuilder::Runtime::InternalPropertyDescriptor> >& internalProperties) OVERRIDE FINAL;
+    virtual void getProperty(ErrorString*, const String& objectId, const RefPtr<JSONArray>& propertyPath, RefPtr<TypeBuilder::Runtime::RemoteObject>& result, TypeBuilder::OptOutput<bool>* wasThrown);
     virtual void releaseObjectGroup(ErrorString*, const String& objectGroup) OVERRIDE FINAL;
     virtual void run(ErrorString*) OVERRIDE;
 
     virtual void setFrontend(InspectorFrontend*) OVERRIDE FINAL;
     virtual void clearFrontend() OVERRIDE FINAL;
     virtual void restore() OVERRIDE FINAL;
 
 protected:
-    InspectorRuntimeAgent(InjectedScriptManager*, ScriptDebugServer*);
-    virtual InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId) = 0;
+    InspectorRuntimeAgent(InjectedScriptManager*, ScriptDebugServerBase*);
+    virtual InjectedScript& injectedScriptForEval(ErrorString*, const int* executionContextId) = 0;
 
     virtual void muteConsole() = 0;
     virtual void unmuteConsole() = 0;
 
     InjectedScriptManager* injectedScriptManager() { return m_injectedScriptManager; }
     void addExecutionContextToFrontend(ScriptState*, bool isPageContext, const String& name, const String& frameId);
 
     bool m_enabled;
     InspectorFrontend::Runtime* m_frontend;
 
     typedef HashMap<RefPtr<ScriptState>, int> ScriptStateToId;
     ScriptStateToId m_scriptStateToId;
 
 private:
     InjectedScriptManager* m_injectedScriptManager;
-    ScriptDebugServer* m_scriptDebugServer;
+    ScriptDebugServerBase* m_scriptDebugServer;
 };
 
 } // namespace WebCore
 
 #endif // InspectorRuntimeAgent_h