Merge DevTools Refactor CL to Blink36

Source/bindings/common/ScriptValue.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;
 
 // 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
@@ skipping 126 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
+    {

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

ASSERT(m_isJavaScript) ?

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

Done.

+        return m_scriptValue;
+    }
+
+    Dart_StackTrace asDart() const
+    {

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

ASSERT(!m_isJavaScript) ?

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

Done.

+        return m_dartStackTrace;
+    }
+
+    bool isNull() const
+    {
+        return m_isJavaScript ? m_scriptValue.isNull() : !m_dartStackTrace;
+    }
+
+private:
+    bool m_isJavaScript;
+    ScriptValue m_scriptValue;

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

RefPtr<V8ScriptValue>

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

Done.

+    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; }

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

Ditto on asserts for these two.

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

Done.

+
+private:
+    bool m_isJavaScript;
+    ScriptValue m_scriptValue;

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

RefPtr<V8ScriptValue>

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

Done.

+    Dart_ActivationFrame m_dartActivationFrame;
+};
+
 } // namespace WebCore
 
 #endif // ScriptValue_h