summaryrefslogtreecommitdiff
path: root/data/patches/0001-Bug-1133689-Make-D3DVsyncDisplay-destructor-private..patch
diff options
context:
space:
mode:
authorRuben Rodriguez <ruben@gnu.org>2016-02-03 13:35:05 -0600
committerRuben Rodriguez <ruben@gnu.org>2016-02-03 13:35:05 -0600
commitef670fd8cfbc2794d0d4fe04476e4b2226ae5eae (patch)
tree9a68a9d1026a0573cce8a01e31a4f0e55389a956 /data/patches/0001-Bug-1133689-Make-D3DVsyncDisplay-destructor-private..patch
parent27aa09b3b18538eaa2ab0628827f05c5a3de1a0b (diff)
Added Windows build patches from TorBrowser
Diffstat (limited to 'data/patches/0001-Bug-1133689-Make-D3DVsyncDisplay-destructor-private..patch')
-rw-r--r--data/patches/0001-Bug-1133689-Make-D3DVsyncDisplay-destructor-private..patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/data/patches/0001-Bug-1133689-Make-D3DVsyncDisplay-destructor-private..patch b/data/patches/0001-Bug-1133689-Make-D3DVsyncDisplay-destructor-private..patch
new file mode 100644
index 0000000..e8cc3a6
--- /dev/null
+++ b/data/patches/0001-Bug-1133689-Make-D3DVsyncDisplay-destructor-private..patch
@@ -0,0 +1,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();