From e8c97c2ed535b22bbdb81115e67f59b6fe06deab Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 17 Feb 2014 14:51:49 +1300
Subject: [PATCH] Bug 966397. Part 2: Don't look at ancestors of
 mContainerReferenceFrame when searching for a fixed-pos ancestor we belong
 to, since we'll change coordinate spaces. The metadata will be attached to an
 ancestor layer in that case. r=mattwoodrow

--HG--
extra : rebase_source : cfb56bb2111abce99cd475b9fa8c516d53621ed4
---
 layout/base/FrameLayerBuilder.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp
index bd622a54dad..b9e0c7208c3 100644
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -1690,6 +1690,10 @@ ContainerState::FindFixedPosFrameForLayerData(const nsIFrame* aAnimatedGeometryR
         result = f;
         break;
       }
+      if (f == mContainerReferenceFrame) {
+        // The metadata will go on an ancestor layer if necessary.
+        return nullptr;
+      }
     }
     if (!result) {
       return nullptr;