Bug 1376997 - Use the correct focus target in WebRenderBridgeParent::UpdateAPZ. r=kats
authorRyan Hunt <rhunt@eqrion.net>
Wed, 28 Jun 2017 20:00:48 -0400
changeset 601760 a60370560b8c0096a30dcf0807a166c4a0dd5a67
parent 601759 5283088aa3be7081cd26fdda0a1c006e67088f40
child 601761 61b71b3d8354994a136c785a25a205433cadcf1c
push id66200
push userhchang@mozilla.com
push dateThu, 29 Jun 2017 03:53:43 +0000
reviewerskats
bugs1376997
milestone56.0a1
Bug 1376997 - Use the correct focus target in WebRenderBridgeParent::UpdateAPZ. r=kats MozReview-Commit-ID: AXt28gZ3jdi
gfx/layers/wr/WebRenderBridgeParent.cpp
--- a/gfx/layers/wr/WebRenderBridgeParent.cpp
+++ b/gfx/layers/wr/WebRenderBridgeParent.cpp
@@ -388,17 +388,17 @@ WebRenderBridgeParent::UpdateAPZ()
   }
   uint64_t rootLayersId = cbp->RootLayerTreeId();
   RefPtr<WebRenderBridgeParent> rootWrbp = cbp->GetWebRenderBridgeParent();
   if (!rootWrbp) {
     return;
   }
   if (RefPtr<APZCTreeManager> apzc = cbp->GetAPZCTreeManager()) {
     apzc->UpdateFocusState(rootLayersId, GetLayersId(),
-                           rootWrbp->GetScrollData().GetFocusTarget());
+                           mScrollData.GetFocusTarget());
     apzc->UpdateHitTestingTree(rootLayersId, rootWrbp->GetScrollData(),
         mScrollData.IsFirstPaint(), GetLayersId(),
         mScrollData.GetPaintSequenceNumber());
   }
 }
 
 bool
 WebRenderBridgeParent::PushAPZStateToWR(nsTArray<WrTransformProperty>& aTransformArray)