Merge DevTools Refactor CL to Blink36

Source/bindings/common/StackTrace.h

 /*
  * Copyright (C) 2008, 2009 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 20 matching lines @@
 #ifndef ScriptValue_h
 #define ScriptValue_h
 
 #include "bindings/common/AbstractScriptValue.h"
 #include "bindings/dart/DartScriptValue.h"
 #include "bindings/v8/SharedPersistent.h"
 #include "bindings/v8/V8ScriptValue.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
 #include "wtf/text/WTFString.h"
+#include <dart_debugger_api.h>
 #include <v8.h>
 
 namespace WebCore {
 
 class JSONValue;
 class ScriptState;
-class V8ScriptState;
 
 // Indirection to avoid re-writing the parts of Blink that pass ScriptValue by
 // value.
 // FIXME: Should change pass by value uses to pass by reference and use
 // AbstractScriptValue directly.
 class ScriptValue {
 public:
     ScriptValue()
         : m_implScriptValue(V8ScriptValue::create())
     {
     }
 
     virtual ~ScriptValue();
 
     // FIXME: This method is deprecated and will be removed soon.
     // We should always pass a ScriptState when creating a new ScriptValue.
     ScriptValue(v8::Handle<v8::Value> value, v8::Isolate* isolate)
         : m_implScriptValue(V8ScriptValue::create(value, isolate))
     {
     }
 
-    ScriptValue(V8ScriptState* scriptState, v8::Handle<v8::Value> value)
+    ScriptValue(ScriptState* scriptState, v8::Handle<v8::Value> value)
         : m_implScriptValue(V8ScriptValue::create(scriptState, value))
     {
     }
 
     ScriptValue(const ScriptValue& value)
         : m_implScriptValue(value.m_implScriptValue)
     {
     }
 
     ScriptValue(PassRefPtr<AbstractScriptValue> value)
         : m_implScriptValue(value)
     {
     }
 
+    // FIXME: Replace with an instance member of ScriptState.
+    static ScriptValue createNull()
+    {
+        return ScriptValue(V8ScriptValue::createNull());
+    }
+
+    // FIXME: Replace with an instance member of ScriptState.
+    static ScriptValue createBoolean(bool b)
+    {
+        return ScriptValue(V8ScriptValue::createBoolean(b));
+    }
+
     ScriptState* scriptState() const
     {
         return m_implScriptValue->scriptState();
     }
 
     v8::Isolate* isolate() const
     {
         ASSERT(m_implScriptValue->isV8());
         return static_cast<V8ScriptValue*>(m_implScriptValue.get())->isolate();
     }
@@ skipping 72 matching lines @@
 
     AbstractScriptValue* scriptValue() const
     {
         return m_implScriptValue.get();
     }
 
 private:
     RefPtr<AbstractScriptValue> m_implScriptValue;
 };
 
+// FIXMEDART: where should we define this class that holds either a V8 or Dart
+// stack trace?
+class StackTrace {
+public:
+    explicit StackTrace()
+    {
+        m_isJavaScript = true;
+        m_dartStackTrace = 0;
+    }
+
+    explicit StackTrace(const ScriptValue& stackTrace)
+    {
+        m_isJavaScript = true;
+        m_scriptValue = stackTrace;
+        m_dartStackTrace = 0;
+    }
+
+    explicit StackTrace(Dart_StackTrace stackTrace)
+    {
+        m_isJavaScript = false;
+        m_dartStackTrace = stackTrace;
+    }
+
+    bool isJavaScript() const
+    {
+        return m_isJavaScript;
+    }
+
+    ScriptValue asJavaScript() const
+    {
+        return m_scriptValue;
+    }
+
+    Dart_StackTrace asDart() const
+    {
+        return m_dartStackTrace;
+    }
+
+    bool isNull() const
+    {
+        return m_isJavaScript ? m_scriptValue.isNull() : !m_dartStackTrace;
+    }
+
+private:
+    bool m_isJavaScript;
+    ScriptValue m_scriptValue;
+    Dart_StackTrace m_dartStackTrace;
+};
+
+// FIXMEDART: where should we define this class that holds either a V8 or Dart
+// activation frame?
+class ActivationFrame {
+public:
+    explicit ActivationFrame()
+    {
+        m_isJavaScript = true;
+        m_dartActivationFrame = 0;
+    }
+
+    explicit ActivationFrame(const ScriptValue& activationFrame)
+    {
+        m_isJavaScript = true;
+        m_scriptValue = activationFrame;
+        m_dartActivationFrame = 0;
+    }
+
+    explicit ActivationFrame(Dart_ActivationFrame activationFrame)
+    {
+        m_isJavaScript = false;
+        m_dartActivationFrame = activationFrame;
+    }
+
+    bool isJavaScript() const { return m_isJavaScript; }
+    ScriptValue asJavaScript() const { return m_scriptValue; }
+    Dart_ActivationFrame asDart() const { return m_dartActivationFrame; }
+
+private:
+    bool m_isJavaScript;
+    ScriptValue m_scriptValue;
+    Dart_ActivationFrame m_dartActivationFrame;
+};
+
 } // namespace WebCore
 
 #endif // ScriptValue_h