Bug 1370089 - Assume APZ is enabled in TabChild if we are queried before we have the compositor options. r=dvander a=bustage

MozReview-Commit-ID: KHvAvGCQQUr

--HG--
extra : source : 4ded92f42403ecd4582638f2209c534e64350c60

dom/ipc/TabChild.cpp

@@ -432,10 +432,11 @@ TabChild::TabChild(nsIContentChild* aManager,
 bool
 TabChild::AsyncPanZoomEnabled() const
 {
-  // By the time anybody calls this, we must have had InitRenderingState called
-  // already, and so mCompositorOptions should be populated.
-  MOZ_RELEASE_ASSERT(mCompositorOptions);
-  return mCompositorOptions->UseAPZ();
+  // This might get called by the TouchEvent::PrefEnabled code before we have
+  // mCompositorOptions populated (bug 1370089). In that case we just assume
+  // APZ is enabled because we're in a content process (because TabChild) and
+  // APZ is probably going to be enabled here since e10s is enabled.
+  return mCompositorOptions ? mCompositorOptions->UseAPZ() : true;
 }
 
 NS_IMETHODIMP