Backed out changeset 0c030f97a04f (bug 1144366) for being on top of patches being backed out
CLOSED TREE
This commit is contained in:
@@ -40,42 +40,42 @@ struct ReceiverObj
|
||||
struct InVariant
|
||||
{
|
||||
JSVariant variant;
|
||||
explicit InVariant(const JSVariant& variant) : variant(variant) {}
|
||||
explicit InVariant(const JSVariant &variant) : variant(variant) {}
|
||||
};
|
||||
|
||||
struct OutVariant
|
||||
{
|
||||
JSVariant variant;
|
||||
explicit OutVariant(const JSVariant& variant) : variant(variant) {}
|
||||
explicit OutVariant(const JSVariant &variant) : variant(variant) {}
|
||||
};
|
||||
|
||||
struct Identifier
|
||||
{
|
||||
JSIDVariant variant;
|
||||
explicit Identifier(const JSIDVariant& variant) : variant(variant) {}
|
||||
explicit Identifier(const JSIDVariant &variant) : variant(variant) {}
|
||||
};
|
||||
|
||||
class Logging
|
||||
{
|
||||
public:
|
||||
Logging(JavaScriptShared* shared, JSContext* cx) : shared(shared), cx(cx) {}
|
||||
Logging(JavaScriptShared *shared, JSContext *cx) : shared(shared), cx(cx) {}
|
||||
|
||||
void print(const nsCString& str) {
|
||||
const char* side = shared->isParent() ? "from child" : "from parent";
|
||||
void print(const nsCString &str) {
|
||||
const char *side = shared->isParent() ? "from child" : "from parent";
|
||||
printf("CPOW %s: %s\n", side, str.get());
|
||||
}
|
||||
|
||||
void print(const char* str) {
|
||||
void print(const char *str) {
|
||||
print(nsCString(str));
|
||||
}
|
||||
template<typename T1>
|
||||
void print(const char* fmt, const T1& a1) {
|
||||
void print(const char *fmt, const T1 &a1) {
|
||||
nsAutoCString tmp1;
|
||||
format(a1, tmp1);
|
||||
print(nsPrintfCString(fmt, tmp1.get()));
|
||||
}
|
||||
template<typename T1, typename T2>
|
||||
void print(const char* fmt, const T1& a1, const T2& a2) {
|
||||
void print(const char *fmt, const T1 &a1, const T2 &a2) {
|
||||
nsAutoCString tmp1;
|
||||
nsAutoCString tmp2;
|
||||
format(a1, tmp1);
|
||||
@@ -83,7 +83,7 @@ class Logging
|
||||
print(nsPrintfCString(fmt, tmp1.get(), tmp2.get()));
|
||||
}
|
||||
template<typename T1, typename T2, typename T3>
|
||||
void print(const char* fmt, const T1& a1, const T2& a2, const T3& a3) {
|
||||
void print(const char *fmt, const T1 &a1, const T2 &a2, const T3 &a3) {
|
||||
nsAutoCString tmp1;
|
||||
nsAutoCString tmp2;
|
||||
nsAutoCString tmp3;
|
||||
@@ -93,13 +93,13 @@ class Logging
|
||||
print(nsPrintfCString(fmt, tmp1.get(), tmp2.get(), tmp3.get()));
|
||||
}
|
||||
|
||||
void format(const nsString& str, nsCString& out) {
|
||||
void format(const nsString &str, nsCString &out) {
|
||||
out = NS_ConvertUTF16toUTF8(str);
|
||||
}
|
||||
|
||||
void formatObject(bool incoming, bool local, ObjectId id, nsCString& out) {
|
||||
const char* side, *objDesc;
|
||||
void* ptr;
|
||||
void formatObject(bool incoming, bool local, ObjectId id, nsCString &out) {
|
||||
const char *side, *objDesc;
|
||||
void *ptr;
|
||||
|
||||
if (local == incoming) {
|
||||
JS::RootedObject obj(cx);
|
||||
@@ -122,11 +122,11 @@ class Logging
|
||||
out = nsPrintfCString("<%s %s:%d:%p>", side, objDesc, id.serialNumber(), ptr);
|
||||
}
|
||||
|
||||
void format(const ReceiverObj& obj, nsCString& out) {
|
||||
void format(const ReceiverObj &obj, nsCString &out) {
|
||||
formatObject(true, true, obj.id, out);
|
||||
}
|
||||
|
||||
void format(const nsTArray<JSParam>& values, nsCString& out) {
|
||||
void format(const nsTArray<JSParam> &values, nsCString &out) {
|
||||
nsAutoCString tmp;
|
||||
out.Truncate();
|
||||
for (size_t i = 0; i < values.Length(); i++) {
|
||||
@@ -141,15 +141,15 @@ class Logging
|
||||
}
|
||||
}
|
||||
|
||||
void format(const InVariant& value, nsCString& out) {
|
||||
void format(const InVariant &value, nsCString &out) {
|
||||
format(true, value.variant, out);
|
||||
}
|
||||
|
||||
void format(const OutVariant& value, nsCString& out) {
|
||||
void format(const OutVariant &value, nsCString &out) {
|
||||
format(false, value.variant, out);
|
||||
}
|
||||
|
||||
void format(bool incoming, const JSVariant& value, nsCString& out) {
|
||||
void format(bool incoming, const JSVariant &value, nsCString &out) {
|
||||
switch (value.type()) {
|
||||
case JSVariant::TUndefinedVariant: {
|
||||
out = "undefined";
|
||||
@@ -166,7 +166,7 @@ class Logging
|
||||
break;
|
||||
}
|
||||
case JSVariant::TObjectVariant: {
|
||||
const ObjectVariant& ovar = value.get_ObjectVariant();
|
||||
const ObjectVariant &ovar = value.get_ObjectVariant();
|
||||
if (ovar.type() == ObjectVariant::TLocalObject)
|
||||
formatObject(incoming, true, ObjectId::deserialize(ovar.get_LocalObject().serializedId()), out);
|
||||
else
|
||||
@@ -196,7 +196,7 @@ class Logging
|
||||
}
|
||||
}
|
||||
|
||||
void format(const Identifier& id, nsCString& out) {
|
||||
void format(const Identifier &id, nsCString &out) {
|
||||
switch (id.variant.type()) {
|
||||
case JSIDVariant::TSymbolVariant: {
|
||||
out = "<Symbol>";
|
||||
@@ -220,8 +220,8 @@ class Logging
|
||||
}
|
||||
|
||||
private:
|
||||
JavaScriptShared* shared;
|
||||
JSContext* cx;
|
||||
JavaScriptShared *shared;
|
||||
JSContext *cx;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user