From f54206dc5a0e0308171d9bf371e301ffdf887298 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Mon, 23 Feb 2015 12:14:49 +0100 Subject: [PATCH] Bug 1133689 - Make D3DVsyncDisplay destructor private. r=jmuizelaar --- gfx/thebes/gfxWindowsPlatform.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp index 3fed33d3e921..1b2dd8c88734 100644 --- a/gfx/thebes/gfxWindowsPlatform.cpp +++ b/gfx/thebes/gfxWindowsPlatform.cpp @@ -1973,13 +1973,6 @@ public: mSoftwareVsyncRate = TimeDuration::FromMilliseconds(rate); } - virtual ~D3DVsyncDisplay() - { - MOZ_ASSERT(NS_IsMainThread()); - DisableVsync(); - delete mVsyncThread; - } - virtual void EnableVsync() MOZ_OVERRIDE { MOZ_ASSERT(NS_IsMainThread()); @@ -2082,6 +2075,13 @@ public: } private: + virtual ~D3DVsyncDisplay() + { + MOZ_ASSERT(NS_IsMainThread()); + DisableVsync(); + delete mVsyncThread; + } + bool IsInVsyncThread() { return mVsyncThread->thread_id() == PlatformThread::CurrentId();