summaryrefslogtreecommitdiff
path: root/data/patches/0001-Bug-1133689-Make-D3DVsyncDisplay-destructor-private..patch
blob: e8cc3a66f09797a6225d64d670d94c28def8eb31 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
From 3f33df4d9a338ae4af9ab438d050eb08a52eb029 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Mon, 23 Feb 2015 12:14:49 +0100
Subject: [PATCH 1/3] Bug 1133689 - Make D3DVsyncDisplay destructor private.
 r=jmuizelaar


diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp
index b52a188..23507ce 100644

Index: gfx/thebes/gfxWindowsPlatform.cpp
===================================================================
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -1990,13 +1990,6 @@ public:
         mSoftwareVsyncRate = TimeDuration::FromMilliseconds(rate);
       }
 
-      virtual ~D3DVsyncDisplay()
-      {
-        MOZ_ASSERT(NS_IsMainThread());
-        DisableVsync();
-        delete mVsyncThread;
-      }
-
       virtual void EnableVsync() override
       {
         MOZ_ASSERT(NS_IsMainThread());
@@ -2099,6 +2092,13 @@ public:
       }
 
     private:
+      virtual ~D3DVsyncDisplay()
+      {
+        MOZ_ASSERT(NS_IsMainThread());
+        DisableVsync();
+        delete mVsyncThread;
+      }
+
       bool IsInVsyncThread()
       {
         return mVsyncThread->thread_id() == PlatformThread::CurrentId();