Commit d8d4a2d1 authored by Sebastian Hengst's avatar Sebastian Hengst
Browse files

Backed out 2 changesets (bug 1224374) for Windows bustage. r=bustage on a CLOSED TREE 

Backed out changeset 5f458e6e4997 (bug 1224374)
Backed out changeset 0dc02cb0b604 (bug 1224374)
parent 970440e2

accessible/base/NotificationController.cpp

+0 −1
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ NotificationController::IsUpdatePending() 
void

NotificationController::WillRefresh(mozilla::TimeStamp aTime)

{

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

  Telemetry::AutoTimer<Telemetry::A11Y_UPDATE_TIME> updateTimer;



  // If the document accessible that notification collector was created for is

dom/base/nsFrameLoader.cpp

+0 −1
Original line number Diff line number Diff line
@@ -781,7 +781,6 @@ bool 
nsFrameLoader::ShowRemoteFrame(const ScreenIntSize& size,

                               nsSubDocumentFrame *aFrame)

{

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

  NS_ASSERTION(IsRemoteFrame(), "ShowRemote only makes sense on remote frames.");



  if (!mRemoteBrowser && !TryRemoteBrowser()) {

dom/base/nsJSEnvironment.cpp

+0 −2
Original line number Diff line number Diff line
@@ -1335,8 +1335,6 @@ nsJSContext::ShrinkGCBuffersNow() 
static void

FinishAnyIncrementalGC()

{

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



  if (sCCLockedOut) {

    // We're in the middle of an incremental GC, so finish it.

    JS::PrepareForIncrementalGC(sRuntime);

dom/base/nsObjectLoadingContent.cpp

+0 −1
Original line number Diff line number Diff line
@@ -3102,7 +3102,6 @@ nsObjectLoadingContent::DoStopPlugin(nsPluginInstanceOwner* aInstanceOwner, 
NS_IMETHODIMP

nsObjectLoadingContent::StopPluginInstance()

{

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

  // Clear any pending events

  mPendingInstantiateEvent = nullptr;

  mPendingCheckPluginStopEvent = nullptr;

dom/ipc/ContentParent.cpp

+0 −6
Original line number Diff line number Diff line
@@ -1237,8 +1237,6 @@ ContentParent::CreateBrowserOrApp(const TabContext& aContext, 
                                  Element* aFrameElement,

                                  ContentParent* aOpenerContentParent)

{

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



  if (!sCanLaunchSubprocesses) {

    return nullptr;

  }
@@ -2388,8 +2386,6 @@ ContentParent::InitializeMembers() 
bool

ContentParent::LaunchSubprocess(ProcessPriority aInitialPriority /* = PROCESS_PRIORITY_FOREGROUND */)

{

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



  std::vector<std::string> extraArgs;

  if (mIsNuwaProcess) {

    extraArgs.push_back("-nuwa");
@@ -3646,8 +3642,6 @@ ContentParent::ForceKillTimerCallback(nsITimer* aTimer, void* aClosure) 
void

ContentParent::KillHard(const char* aReason)

{

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



  // On Windows, calling KillHard multiple times causes problems - the

  // process handle becomes invalid on the first call, causing a second call

  // to crash our process - more details in bug 890840.