Commit 2d53758d authored Jan 15, 2016 by David Rajchenbach-Teller

Bug 1224374 - Profiler labels for the top 26-100 chrome hangs;r=BenWa

--HG--
extra : rebase_source : 51d39d6f88bf58ccb29f5897c3dbbe71007ee842

parent f5531f52

dom/media/webspeech/synth/windows/SapiService.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -196,6 +196,8 @@ SapiService::~SapiService()
		bool
		SapiService::Init()
		{
		PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);

		MOZ_ASSERT(!mInitialized);

		if (Preferences::GetBool("media.webspeech.synth.test") \|\|

dom/plugins/base/nsJSNPRuntime.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -1646,6 +1646,8 @@ NPObjWrapper_Resolve(JSContext cx, JS::Handle<JSObject> obj, JS::Handle<jsid>
		if (JSID_IS_SYMBOL(id))
		return true;

		PROFILER_LABEL_FUNC(js::ProfileEntry::Category::JS);

		NPObject *npobj = GetNPObject(cx, obj);

		if (!npobj \|\| !npobj->_class \|\| !npobj->_class->hasProperty \|\|
		@@ -2110,6 +2112,8 @@ static bool
		NPObjectMember_GetProperty(JSContext *cx, JS::HandleObject obj, JS::HandleId id,
		JS::MutableHandleValue vp)
		{
		PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);

		if (JSID_IS_SYMBOL(id)) {
		JS::RootedSymbol sym(cx, JSID_TO_SYMBOL(id));
		if (JS::GetSymbolCode(sym) == JS::SymbolCode::toPrimitive) {

dom/plugins/base/nsNPAPIPlugin.cpp

+3 −0

Original line number	Diff line number	Diff line
		@@ -265,6 +265,8 @@ nsNPAPIPlugin::RunPluginOOP(const nsPluginTag *aPluginTag)
		inline PluginLibrary*
		GetNewPluginLibrary(nsPluginTag *aPluginTag)
		{
		PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);

		if (!aPluginTag) {
		return nullptr;
		}
		@@ -283,6 +285,7 @@ GetNewPluginLibrary(nsPluginTag *aPluginTag)
		nsresult
		nsNPAPIPlugin::CreatePlugin(nsPluginTag aPluginTag, nsNPAPIPlugin* aResult)
		{
		PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
		*aResult = nullptr;

		if (!aPluginTag) {

dom/plugins/base/nsNPAPIPluginInstance.cpp

+3 −0

Original line number	Diff line number	Diff line
		@@ -280,6 +280,7 @@ nsNPAPIPluginInstance::StopTime()

		nsresult nsNPAPIPluginInstance::Initialize(nsNPAPIPlugin aPlugin, nsPluginInstanceOwner aOwner, const nsACString& aMIMEType)
		{
		PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
		PLUGIN_LOG(PLUGIN_LOG_NORMAL, ("nsNPAPIPluginInstance::Initialize this=%p\n",this));

		NS_ENSURE_ARG_POINTER(aPlugin);
		@@ -655,6 +656,8 @@ nsresult nsNPAPIPluginInstance::HandleEvent(void* event, int16_t* result,
		if (RUNNING != mRunning)
		return NS_OK;

		PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);

		if (!event)
		return NS_ERROR_FAILURE;

dom/plugins/base/nsNPAPIPluginStreamListener.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -286,6 +286,7 @@ nsNPAPIPluginStreamListener::CallURLNotify(NPReason reason)
		nsresult
		nsNPAPIPluginStreamListener::OnStartBinding(nsPluginStreamListenerPeer* streamPeer)
		{
		PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
		if (!mInst \|\| !mInst->CanFireNotifications() \|\| mStreamCleanedUp)
		return NS_ERROR_FAILURE;