From 8b94282b611ce0bcafa8d12e58c2f6e499ae4ab6 Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange@themasta.com>
Date: Mon, 13 Apr 2015 15:42:58 -0400
Subject: [PATCH] Bug 1148868 - Disable the workaround from bug 1151890 unless
 we use the separate event thread runner. r=kats

--HG--
extra : rebase_source : e8a643f88775023d6c29d0708f3e8baae58b8b95
---
 widget/cocoa/nsChildView.mm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm
index 6b6126f54ee4..d7c5125fe946 100644
--- a/widget/cocoa/nsChildView.mm
+++ b/widget/cocoa/nsChildView.mm
@@ -1896,9 +1896,11 @@ nsChildView::ConfigureAPZCTreeManager()
 void
 nsChildView::ConfigureAPZControllerThread()
 {
-  // On OS X the EventThreadRunner is the controller thread, but it doesn't
-  // have a MessageLoop.
-  APZThreadUtils::SetControllerThread(nullptr);
+  if (gfxPrefs::AsyncPanZoomSeparateEventThread()) {
+    // The EventThreadRunner is the controller thread, but it doesn't
+    // have a MessageLoop.
+    APZThreadUtils::SetControllerThread(nullptr);
+  }
 }
 
 nsIntRect