DevTools: merge InjectedScriptBase into InjectedScript

Source/core/inspector/InjectedScript.h

 /*
  * Copyright (C) 2012 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 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef InjectedScript_h
 #define InjectedScript_h
 
 #include "bindings/core/v8/ScriptValue.h"
 #include "core/InspectorTypeBuilder.h"
-#include "core/inspector/InjectedScriptBase.h"
 #include "core/inspector/InjectedScriptManager.h"
 #include "core/inspector/InjectedScriptNative.h"
 #include "wtf/Forward.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
+class JSONValue;
 class Node;
+class ScriptFunctionCall;
 
-class InjectedScript final : public InjectedScriptBase {
+typedef String ErrorString;
+PassRefPtr<JSONValue> toJSONValue(const ScriptValue&);
+
+
+class InjectedScript final {
 public:
     InjectedScript();
-    virtual ~InjectedScript() { }
+    ~InjectedScript();
+
+    bool isEmpty() const { return m_injectedScriptObject.isEmpty(); }
+    ScriptState* scriptState() const
+    {
+        ASSERT(!isEmpty());
+        return m_injectedScriptObject.scriptState();
+    }
 
     void evaluate(
         ErrorString*,
         const String& expression,
         const String& objectGroup,
         bool includeCommandLineAPI,
         bool returnByValue,
         bool generatePreview,
         RefPtr<TypeBuilder::Runtime::RemoteObject>* result,
         TypeBuilder::OptOutput<bool>* wasThrown,
@@ skipping 39 matching lines @@
     PassRefPtr<TypeBuilder::Runtime::RemoteObject> wrapNode(Node*, const String& groupName);
     ScriptValue findObjectById(const String& objectId) const;
 
     String objectIdToObjectGroupName(const String& objectId) const;
     void releaseObjectGroup(const String&);
 
     void setCustomObjectFormatterEnabled(bool);
 
 private:
     friend InjectedScript InjectedScriptManager::injectedScriptFor(ScriptState*);
+    using InspectedStateAccessCheck = bool (*)(ScriptState*);
     InjectedScript(ScriptValue, InspectedStateAccessCheck, PassRefPtr<InjectedScriptNative>);
 
     ScriptValue nodeAsScriptValue(Node*);
+    void initialize(ScriptValue, InspectedStateAccessCheck);
+    bool canAccessInspectedWindow() const;
+    const ScriptValue& injectedScriptObject() const;
+    ScriptValue callFunctionWithEvalEnabled(ScriptFunctionCall&, bool& hadException) const;
+    void makeCall(ScriptFunctionCall&, RefPtr<JSONValue>* result);
+    void makeEvalCall(ErrorString*, ScriptFunctionCall&, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown, RefPtr<TypeBuilder::Debugger::ExceptionDetails>* = 0);
+    void makeCallWithExceptionDetails(ScriptFunctionCall&, RefPtr<JSONValue>* result, RefPtr<TypeBuilder::Debugger::ExceptionDetails>*);
 
+    ScriptValue m_injectedScriptObject;
+    InspectedStateAccessCheck m_inspectedStateAccessCheck;
     RefPtr<InjectedScriptNative> m_native;
 };
 
 } // namespace blink
 
 #endif