summaryrefslogtreecommitdiff
path: root/data/patches/0001-Bug-1133689-Make-D3DVsyncDisplay-destructor-private..patch
diff options
context:
space:
mode:
authorRuben Rodriguez <ruben@gnu.org>2016-11-21 15:05:02 -0500
committerRuben Rodriguez <ruben@gnu.org>2016-11-21 15:05:02 -0500
commit3386a6f438c7549e2ff5ca88498f27af40cf72e1 (patch)
tree11b9c65334627e881b31e8ae5657e645a2440a65 /data/patches/0001-Bug-1133689-Make-D3DVsyncDisplay-destructor-private..patch
parent1aecd18e5cc9d8b9dfd4063e749ce61eb0077e2a (diff)
Removed unnecesary upstreamed patches
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, 0 insertions, 42 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
deleted file mode 100644
index e8cc3a6..0000000
--- a/data/patches/0001-Bug-1133689-Make-D3DVsyncDisplay-destructor-private..patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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();