corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 763587 - rename AutoHashtable::ReflectHashtable; r=taras

Browse Source
This commit is contained in:
Nathan Froyd
2012-06-18 16:20:52 -04:00
parent 9986ad0753
commit 32d6978d71
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
toolkit/components/telemetry/Telemetry.cpp
View File

@@ -37,7 +37,7 @@ public:
AutoHashtable(uint32_t initSize = PL_DHASH_MIN_SIZE); AutoHashtable(uint32_t initSize = PL_DHASH_MIN_SIZE);
~AutoHashtable(); ~AutoHashtable();
typedef bool (*ReflectEntryFunc)(EntryType *entry, JSContext *cx, JSObject *obj); typedef bool (*ReflectEntryFunc)(EntryType *entry, JSContext *cx, JSObject *obj);
bool ReflectHashtable(ReflectEntryFunc entryFunc, JSContext *cx, JSObject *obj); bool ReflectIntoJS(ReflectEntryFunc entryFunc, JSContext *cx, JSObject *obj);
private: private:
struct EnumeratorArgs { struct EnumeratorArgs {
JSContext *cx; JSContext *cx;
@@ -76,7 +76,7 @@ AutoHashtable<EntryType>::ReflectEntryStub(EntryType *entry, void *arg)
*/ */
template<typename EntryType> template<typename EntryType>
bool bool
AutoHashtable<EntryType>::ReflectHashtable(ReflectEntryFunc entryFunc, AutoHashtable<EntryType>::ReflectIntoJS(ReflectEntryFunc entryFunc,
JSContext *cx, JSObject *obj) JSContext *cx, JSObject *obj)
{ {
EnumeratorArgs args = { cx, obj, entryFunc }; EnumeratorArgs args = { cx, obj, entryFunc };
@@ -563,7 +563,7 @@ TelemetryImpl::AddSQLInfo(JSContext *cx, JSObject *rootObj, bool mainThread,
(mainThread ? mSlowSQLOnMainThread : mSlowSQLOnOtherThread); (mainThread ? mSlowSQLOnMainThread : mSlowSQLOnOtherThread);
AutoHashtable<SlowSQLEntryType>::ReflectEntryFunc reflectFunction = AutoHashtable<SlowSQLEntryType>::ReflectEntryFunc reflectFunction =
(includePrivateStrings ? ReflectPrivateSql : ReflectPublicSql); (includePrivateStrings ? ReflectPrivateSql : ReflectPublicSql);
if(!sqlMap.ReflectHashtable(reflectFunction, cx, statsObj)) { if(!sqlMap.ReflectIntoJS(reflectFunction, cx, statsObj)) {
return false; return false;
} }
@@ -936,7 +936,7 @@ TelemetryImpl::AddonReflector(AddonEntryType *entry,
JS::AutoObjectRooter r(cx, subobj); JS::AutoObjectRooter r(cx, subobj);
AddonHistogramMapType *map = entry->mData; AddonHistogramMapType *map = entry->mData;
if (!(map->ReflectHashtable(AddonHistogramReflector, cx, subobj) if (!(map->ReflectIntoJS(AddonHistogramReflector, cx, subobj)
&& JS_DefineProperty(cx, obj, && JS_DefineProperty(cx, obj,
PromiseFlatCString(addonId).get(), PromiseFlatCString(addonId).get(),
OBJECT_TO_JSVAL(subobj), NULL, NULL, OBJECT_TO_JSVAL(subobj), NULL, NULL,
@@ -956,7 +956,7 @@ TelemetryImpl::GetAddonHistogramSnapshots(JSContext *cx, jsval *ret)
} }
JS::AutoObjectRooter r(cx, obj); JS::AutoObjectRooter r(cx, obj);
if (!mAddonMap.ReflectHashtable(AddonReflector, cx, obj)) { if (!mAddonMap.ReflectIntoJS(AddonReflector, cx, obj)) {
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }
*ret = OBJECT_TO_JSVAL(obj); *ret = OBJECT_TO_JSVAL(obj);