From 35cc9a57cf734e93c17fc8df289ba90f16228bbe Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Thu, 13 Nov 2014 01:15:25 -0800
Subject: [PATCH] Bug 1098185 - Initialize some more fields in
 ShadowLayerForwarder when Valgrind is enabled. r=mattwoodrow.

--HG--
extra : rebase_source : 0063948d7a657421005535c8faad68e69b1a5fcf
---
 gfx/layers/ipc/ShadowLayers.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gfx/layers/ipc/ShadowLayers.cpp b/gfx/layers/ipc/ShadowLayers.cpp
index b6a433c3d872..d91451a994d5 100644
--- a/gfx/layers/ipc/ShadowLayers.cpp
+++ b/gfx/layers/ipc/ShadowLayers.cpp
@@ -610,6 +610,14 @@ ShadowLayerForwarder::EndTransaction(InfallibleTArray<EditReply>* aReplies,
       common.stickyScrollContainerId() = mutant->GetStickyScrollContainerId();
       common.stickyScrollRangeOuter() = mutant->GetStickyScrollRangeOuter();
       common.stickyScrollRangeInner() = mutant->GetStickyScrollRangeInner();
+    } else {
+#ifdef MOZ_VALGRIND
+      // Initialize these so that Valgrind doesn't complain when we send them
+      // to another process.
+      common.stickyScrollContainerId() = 0;
+      common.stickyScrollRangeOuter() = LayerRect();
+      common.stickyScrollRangeInner() = LayerRect();
+#endif
     }
     common.scrollbarTargetContainerId() = mutant->GetScrollbarTargetContainerId();
     common.scrollbarDirection() = mutant->GetScrollbarDirection();