wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 7abb50d91618 (bug 962325) for bustage.

Browse Source 
CLOSED TREE
This commit is contained in:
Ryan VanderMeulen 2014-02-06 12:29:13 -05:00
parent edef572118
commit d59a03c9a8
3 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/profiler/ProfilerIOInterposeObserver.cpp
View File

@ -35,11 +35,7 @@ void ProfilerIOInterposeObserver::Observe(Observation& aObservation)
return;
}
ProfilerBacktrace* stack = profiler_get_backtrace();
const char *filename = (NS_ConvertUTF16toUTF8(aObservation.Filename())).get();
IOMarkerPayload* markerPayload = new IOMarkerPayload(aObservation.Reference(),
filename,
aObservation.Start(),
aObservation.End(),
stack);

11
tools/profiler/ProfilerMarkers.cpp
View File

@ -110,30 +110,21 @@ template JSObjectBuilder::Object
ProfilerMarkerImagePayload::preparePayloadImp<JSObjectBuilder>(JSObjectBuilder& b);
IOMarkerPayload::IOMarkerPayload(const char* aSource,
const char* aFilename,
const mozilla::TimeStamp& aStartTime,
const mozilla::TimeStamp& aEndTime,
ProfilerBacktrace* aStack)
: ProfilerMarkerPayload(aStartTime, aEndTime, aStack),
mSource(aSource),
mFilename(strdup(aFilename))
mSource(aSource)
{
MOZ_ASSERT(aSource);
}
IOMarkerPayload::~IOMarkerPayload(){
free(mFilename);
}
template<typename Builder> typename Builder::Object
IOMarkerPayload::preparePayloadImp(Builder& b)
{
typename Builder::RootedObject data(b.context(), b.CreateObject());
prepareCommonProps("io", b, data);
b.DefineProperty(data, "source", mSource);
if (mFilename != nullptr) {
b.DefineProperty(data, "filename", mFilename);
}
return data;
}

4
tools/profiler/ProfilerMarkers.h
View File

@ -120,10 +120,9 @@ private:
class IOMarkerPayload : public ProfilerMarkerPayload
{
public:
IOMarkerPayload(const char* aSource, const char* aFilename, const mozilla::TimeStamp& aStartTime,
IOMarkerPayload(const char* aSource, const mozilla::TimeStamp& aStartTime,
const mozilla::TimeStamp& aEndTime,
ProfilerBacktrace* aStack);
~IOMarkerPayload();
protected:
virtual JSCustomObjectBuilder::Object
@ -136,7 +135,6 @@ private:
typename Builder::Object preparePayloadImp(Builder& b);
const char* mSource;
const char* mFilename;
};
#endif // PROFILER_MARKERS_H