Bug 637572: Implement Debugger.Source.prototype.text; r=jimb

js/src/jit-test/tests/debug/Source-surfaces.js

@@ -0,0 +1,13 @@
+// Debugger.Source.prototype
+
+load(libdir + 'asserts.js');
+
+assertThrowsInstanceOf(function () {
+    Debugger.Source.prototype.text.call(42)
+}, TypeError);
+assertThrowsInstanceOf(function () {
+    Debugger.Source.prototype.text.call({})
+}, TypeError);
+assertThrowsInstanceOf(function () {
+    Debugger.Source.prototype.text.call(Debugger.Source.prototype)
+}, TypeError);

js/src/jit-test/tests/debug/Source-text-01.js

@@ -0,0 +1,25 @@
+/* 
+ * Script.prototype.source should be a string. Moreover, it should be the
+ * same string for each child script within the same debugger.
+ */
+let g = newGlobal('new-compartment');
+let dbg = new Debugger(g);
+
+var count = 0;
+dbg.onNewScript = function (script) {
+    var text = script.source.text;
+    assertEq(typeof text, "string");
+    function traverse(script) {
+        ++count;
+        script.getChildScripts().forEach(function (script) {
+            assertEq(script.source.text, text);
+            traverse(script);
+        });
+    };
+    traverse(script);
+}
+
+g.eval("2 * 3");
+g.eval("function f() {}");
+g.eval("function f() { function g() {} }");
+assertEq(count, 6);

js/src/jit-test/tests/debug/Source-text-02.js

@@ -0,0 +1,18 @@
+// Source.prototype.text should be a string
+let g = newGlobal('new-compartment');
+let dbg = new Debugger(g);
+
+var count = 0;
+dbg.onNewScript = function (script) {
+    ++count;
+    if (count % 2 == 0)
+        assertEq(script.source.text, text);
+}
+
+g.eval("eval('" + (text = "") + "')");
+g.eval("eval('" + (text = "2 * 3") + "')");
+g.eval("new Function('" + (text = "") + "')");
+g.eval("new Function('" + (text = "2 * 3") + "')");
+evaluate("", { global: g });
+evaluate("2 * 3", { global: g });
+assertEq(count, 10);

js/src/vm/Debugger.cpp

@@ -3506,6 +3506,13 @@ static const JSFunctionSpec DebuggerScript_methods[] = {
 
 /*** Debugger.Source *****************************************************************************/
 
+static inline ScriptSourceObject *
+GetSourceReferent(JSObject *obj)
+{
+    JS_ASSERT(obj->getClass() == &DebuggerSource_class);
+    return static_cast<ScriptSourceObject *>(obj->getPrivate());
+}
+
 static void
 DebuggerSource_trace(JSTracer *trc, JSObject *obj)
 {
@@ -3513,7 +3520,7 @@ DebuggerSource_trace(JSTracer *trc, JSObject *obj)
      * There is a barrier on private pointers, so the Unbarriered marking
      * is okay.
      */
-    if (JSObject *referent = (JSObject *) obj->getPrivate()) {
+    if (JSObject *referent = GetSourceReferent(obj)) {
         MarkCrossCompartmentObjectUnbarriered(trc, obj, &referent, "Debugger.Source referent");
         obj->setPrivateUnbarriered(referent);
     }
@@ -3573,7 +3580,7 @@ Debugger::wrapSource(JSContext *cx, JS::HandleScriptSource source)
         }
     }
 
-    JS_ASSERT((JSObject *) p->value->getPrivate() == source);
+    JS_ASSERT(GetSourceReferent(p->value) == source);
     return p->value;
 }
 
@@ -3584,7 +3591,55 @@ DebuggerSource_construct(JSContext *cx, unsigned argc, Value *vp)
     return false;
 }
 
+static JSObject *
+DebuggerSource_checkThis(JSContext *cx, const CallArgs &args, const char *fnname)
+{
+    if (!args.thisv().isObject()) {
+        ReportObjectRequired(cx);
+        return NULL;
+    }
+
+    JSObject *thisobj = &args.thisv().toObject();
+    if (thisobj->getClass() != &DebuggerSource_class) {
+        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_INCOMPATIBLE_PROTO,
+                             "Debugger.Source", fnname, thisobj->getClass()->name);
+        return NULL;
+    }
+
+    if (!GetSourceReferent(thisobj)) {
+        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_INCOMPATIBLE_PROTO,
+                             "Debugger.Frame", fnname, "prototype object");
+        return NULL;
+    }
+
+    return thisobj;
+}
+
+#define THIS_DEBUGSOURCE_REFERENT(cx, argc, vp, fnname, args, obj, sourceObject)    \
+    CallArgs args = CallArgsFromVp(argc, vp);                                       \
+    RootedObject obj(cx, DebuggerSource_checkThis(cx, args, fnname));               \
+    if (!obj)                                                                       \
+        return false;                                                               \
+    JS::RootedScriptSource sourceObject(cx, GetSourceReferent(obj));                \
+    if (!sourceObject)                                                              \
+        return false;
+
+static JSBool
+DebuggerSource_getText(JSContext *cx, unsigned argc, Value *vp)
+{
+    THIS_DEBUGSOURCE_REFERENT(cx, argc, vp, "(get text)", args, obj, sourceObject);
+
+    ScriptSource *ss = sourceObject->source();
+    JSString *str = ss->substring(cx, 0, ss->length());
+    if (!str)
+        return false;
+
+    args.rval().setString(str);
+    return true;
+}
+
 static const JSPropertySpec DebuggerSource_properties[] = {
+    JS_PSG("text", DebuggerSource_getText, 0),
     JS_PS_END
 };