Bug 592131. Don't propagate invalidations across document boundaries where the child document's docshell is inactive (e.g., a hidden tab). r=tnikkel,a=blocking

--HG--
extra : rebase_source : 468f5fab9b2a50f515d50e147fb79bdb8d6a845c

layout/base/nsPresShell.cpp

@@ -7189,7 +7189,7 @@ PresShell::IsVisible()
 NS_IMETHODIMP_(PRBool)
 PresShell::ShouldIgnoreInvalidation()
 {
-  return mPaintingSuppressed;
+  return mPaintingSuppressed || !mIsActive;
 }
 
 NS_IMETHODIMP_(void)

layout/generic/nsViewportFrame.cpp

@@ -361,7 +361,8 @@ ViewportFrame::InvalidateInternal(const nsRect& aDamageRect,
                                   PRUint32 aFlags)
 {
   nsRect r = aDamageRect + nsPoint(aX, aY);
-  PresContext()->NotifyInvalidation(r, aFlags);
+  nsPresContext* presContext = PresContext();
+  presContext->NotifyInvalidation(r, aFlags);
 
   if ((mState & NS_FRAME_HAS_CONTAINER_LAYER) &&
       !(aFlags & INVALIDATE_NO_THEBES_LAYERS)) {
@@ -372,8 +373,10 @@ ViewportFrame::InvalidateInternal(const nsRect& aDamageRect,
 
   nsIFrame* parent = nsLayoutUtils::GetCrossDocParentFrame(this);
   if (parent) {
+    if (!presContext->PresShell()->IsActive())
+      return;
     nsPoint pt = -parent->GetOffsetToCrossDoc(this);
-    PRInt32 ourAPD = PresContext()->AppUnitsPerDevPixel();
+    PRInt32 ourAPD = presContext->AppUnitsPerDevPixel();
     PRInt32 parentAPD = parent->PresContext()->AppUnitsPerDevPixel();
     r = r.ConvertAppUnitsRoundOut(ourAPD, parentAPD);
     parent->InvalidateInternal(r, pt.x, pt.y, this,