Merge DevTools Refactor CL to Blink36

Source/core/inspector/InjectedScriptBase.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 25 matching lines @@
 #include "bindings/v8/ScriptState.h"
 #include "wtf/Forward.h"
 
 namespace WebCore {
 
 class JSONValue;
 class ScriptFunctionCall;
 
 typedef String ErrorString;
 
-
 class InjectedScriptBase {
 public:
     virtual ~InjectedScriptBase() { }
-
-    const String& name() const { return m_name; }
-    bool isEmpty() const { return m_injectedScriptObject.isEmpty(); }
-    ScriptState* scriptState() const { return m_injectedScriptObject.scriptState(); }
+    virtual const String& name() const = 0;
+    virtual bool isEmpty() const = 0;
+    virtual ScriptState* scriptState() const = 0;
+    virtual bool isJavaScript() const = 0;
 
 protected:
     typedef bool (*InspectedStateAccessCheck)(ScriptState*);
-    InjectedScriptBase(const String& name);
-    InjectedScriptBase(const String& name, ScriptObject, InspectedStateAccessCheck);
+};
+
+class V8InjectedScriptBase : public virtual InjectedScriptBase {

[vsm, 2014/06/03 14:24:49]

The virtual base class feels kind of nasty.  Not sure I've seen it in blink code
either.

Is InjectedScriptBase an instantiated class?  If not, maybe this could be folded
into V8InjectedScript.

[Jacob, 2014/06/03 20:23:13]

This is ugly. Added a FIXMEDart that we need to find a better solution before
upstreaming.
I feel there is a cleaner way to do it but I haven't figured it out yet.
InjectedScriptBase isn't instantiated so I suspect the best thing to do is to
just make this V8InjectedScriptBaseUtil
and call it from the two V8 classes that subclass this.

+public:
+    virtual ~V8InjectedScriptBase() { }
+
+    virtual bool isEmpty() const { return m_injectedScriptObject.isEmpty(); }
+    virtual ScriptState* scriptState() const { return m_injectedScriptObject.scriptState(); }
+
+    virtual bool isJavaScript() const { return true; }
+
+    virtual const String& name() const { return m_name; }
+
+protected:
+    V8InjectedScriptBase(const String& name);
+    V8InjectedScriptBase(const String& name, ScriptObject, InspectedStateAccessCheck);
 
     void initialize(ScriptObject, InspectedStateAccessCheck);
-    bool canAccessInspectedWindow() const;
+
     const ScriptObject& 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);
 
+    bool canAccessInspectedWindow() const;
+    String m_name;
+    InspectedStateAccessCheck m_inspectedStateAccessCheck;
+
 private:
-    String m_name;
     ScriptObject m_injectedScriptObject;

[rmacnak, 2014/06/03 17:32:34]

Add a note this should become V8ScriptValue in M37.

[Jacob, 2014/06/03 20:23:13]

done.

-    InspectedStateAccessCheck m_inspectedStateAccessCheck;
 };
 
 
 } // namespace WebCore
 
 #endif