From 5738c3783f6df237854200454a57eb12303724ea Mon Sep 17 00:00:00 2001
From: Timothy Nikkel <tnikkel@gmail.com>
Date: Mon, 27 Jan 2014 17:30:29 -0600
Subject: [PATCH] Bug 950301. Make the underlying frame of scroll layer items
 be the scrolled frame before the layerizing display lists. r=mattwoodrow

---
 layout/base/nsDisplayList.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index 9c02f8bb0db..12628312e36 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -3709,6 +3709,10 @@ nsDisplayScrollLayer::ShouldFlattenAway(nsDisplayListBuilder* aBuilder)
     PropagateClip(aBuilder, GetClip(), &mList);
     return true;
   }
+  if (mFrame != mScrolledFrame) {
+    mMergedFrames.AppendElement(mFrame);
+    mFrame = mScrolledFrame;
+  }
   return false;
 }