Bug 1458259 - Remove assertion that is no longer valid. r?botond draft
authorKartikaya Gupta <kgupta@mozilla.com>
Wed, 02 May 2018 12:47:54 -0400
changeset 790735 139f04c647437135664beebd4d1415c7e45977f4
parent 790505 87bd488c19f620d726b8363d47c8a320bae9bb7c
push id108563
push userkgupta@mozilla.com
push dateWed, 02 May 2018 16:48:13 +0000
reviewersbotond
bugs1458259
milestone61.0a1
Bug 1458259 - Remove assertion that is no longer valid. r?botond MozReview-Commit-ID: BMBZJ9q93vA
gfx/layers/apz/src/APZCTreeManager.cpp
--- a/gfx/layers/apz/src/APZCTreeManager.cpp
+++ b/gfx/layers/apz/src/APZCTreeManager.cpp
@@ -1979,20 +1979,21 @@ APZCTreeManager::SetTargetAPZC(uint64_t 
 }
 
 void
 APZCTreeManager::UpdateZoomConstraints(const ScrollableLayerGuid& aGuid,
                                        const Maybe<ZoomConstraints>& aConstraints)
 {
   if (!GetUpdater()->IsUpdaterThread()) {
     // This can happen if we're in the UI process and got a call directly from
-    // nsBaseWidget (as opposed to over PAPZCTreeManager). We want this function
-    // to run on the updater thread, so bounce it over.
-    MOZ_ASSERT(XRE_IsParentProcess());
-
+    // nsBaseWidget or from a content process over PAPZCTreeManager. In that case
+    // we get this call on the compositor thread, which may be different from
+    // the updater thread. It can also happen in the GPU process if that is
+    // enabled, since the call will go over PAPZCTreeManager and arrive on the
+    // compositor thread in the GPU process.
     GetUpdater()->RunOnUpdaterThread(
         aGuid.mLayersId,
         NewRunnableMethod<ScrollableLayerGuid, Maybe<ZoomConstraints>>(
             "APZCTreeManager::UpdateZoomConstraints",
             this,
             &APZCTreeManager::UpdateZoomConstraints,
             aGuid,
             aConstraints));