Backed out changeset d24b3983c4c2 (bug 1322656) for causing merge conflict with m-c

--HG--
extra : rebase_source : 2a5ec1a8ad6115b79edad5276d69cde3cf3a346e

layout/style/ServoBindings.cpp

@@ -8,7 +8,6 @@
 
 #include "ChildIterator.h"
 #include "NullPrincipalURI.h"
-#include "GeckoProfiler.h"
 #include "gfxFontFamilyList.h"
 #include "nsAnimationManager.h"
 #include "nsAttrValueInlines.h"
@@ -1689,19 +1688,6 @@ Gecko_Construct_nsStyleVariables(nsStyleVariables* ptr)
   new (ptr) nsStyleVariables();
 }
 
-void
-Gecko_RegisterProfilerThread(const char* name)
-{
-  char stackTop;
-  profiler_register_thread(name, &stackTop);
-}
-
-void
-Gecko_UnregisterProfilerThread()
-{
-  profiler_unregister_thread();
-}
-
 #include "nsStyleStructList.h"
 
 #undef STYLE_STRUCT

layout/style/ServoBindings.h

@@ -418,9 +418,6 @@ bool Gecko_MatchStringArgPseudo(RawGeckoElementBorrowed element,
 
 void Gecko_Construct_nsStyleVariables(nsStyleVariables* ptr);
 
-void Gecko_RegisterProfilerThread(const char* name);
-void Gecko_UnregisterProfilerThread();
-
 #define SERVO_BINDING_FUNC(name_, return_, ...) return_ name_(__VA_ARGS__);
 #include "mozilla/ServoBindingList.h"
 #undef SERVO_BINDING_FUNC