commit 41acbc90ee38ed95b7fbe27e6be4c8bfa3c5e233 Author: Nicolas Vigier <boklm@torproject.org> Date: Fri May 22 12:37:03 2015 +0200 instantbird: add patch to fix bug 1133689 --- ...ckport-Make-D3DVsyncDisplay-destructor.mozpatch | 45 ++++++++++++++++++++ projects/instantbird/config | 2 + 2 files changed, 47 insertions(+) diff --git a/projects/instantbird/Bug-1133689-backport-Make-D3DVsyncDisplay-destructor.mozpatch b/projects/instantbird/Bug-1133689-backport-Make-D3DVsyncDisplay-destructor.mozpatch new file mode 100644 index 0000000..7e891c1 --- /dev/null +++ b/projects/instantbird/Bug-1133689-backport-Make-D3DVsyncDisplay-destructor.mozpatch @@ -0,0 +1,45 @@ +From 6f443d4c93cee1df3ad645b06d1441df8c3706a3 Mon Sep 17 00:00:00 2001 +From: Nicolas Vigier <boklm@torproject.org> +Date: Fri, 22 May 2015 12:27:53 +0200 +Subject: [PATCH] Bug 1133689 (backport) - Make D3DVsyncDisplay destructor + private. + +--- + 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 37e6907fb3cb..5a7b18cc97da 100644 +--- a/gfx/thebes/gfxWindowsPlatform.cpp ++++ b/gfx/thebes/gfxWindowsPlatform.cpp +@@ -2001,13 +2001,6 @@ public: + mSoftwareVsyncRate = TimeDuration::FromMilliseconds(rate); + } + +- virtual ~D3DVsyncDisplay() +- { +- MOZ_ASSERT(NS_IsMainThread()); +- DisableVsync(); +- delete mVsyncThread; +- } +- + virtual void EnableVsync() override + { + MOZ_ASSERT(NS_IsMainThread()); +@@ -2110,6 +2103,13 @@ public: + } + + private: ++ virtual ~D3DVsyncDisplay() ++ { ++ MOZ_ASSERT(NS_IsMainThread()); ++ DisableVsync(); ++ delete mVsyncThread; ++ } ++ + bool IsInVsyncThread() + { + return mVsyncThread->thread_id() == PlatformThread::CurrentId(); +-- +2.1.0 + diff --git a/projects/instantbird/config b/projects/instantbird/config index 3b0ca9c..4959816 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -84,6 +84,8 @@ input_files: enable: '[% c("var/windows") %]' - filename: 824009fbc42f.mozpatch enable: '[% c("var/windows") %]' + - filename: Bug-1133689-backport-Make-D3DVsyncDisplay-destructor.mozpatch + enable: '[% c("var/windows") %]' - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig - name: python