From a430dc90dc817dd75e82b608e7e973b5821480de Mon Sep 17 00:00:00 2001
From: Jim Mathies <jmathies@mozilla.com>
Date: Mon, 19 Oct 2015 10:38:42 -0500
Subject: [PATCH] Bug 1214878 - When async scrolling with e10s hide windowed
 plugins in sub documents. r=roc

---
 layout/generic/nsGfxScrollFrame.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index cb5bcdba780..095e4f535b0 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -1992,6 +1992,13 @@ NotifyPluginFramesCallback(nsISupports* aSupports, void* aFlag)
     }
   }
 }
+static bool
+NotifyPluginSubframesCallback(nsIDocument* aDocument, void* aFlag)
+{
+  aDocument->EnumerateActivityObservers(NotifyPluginFramesCallback,
+                                        aFlag);
+  return true;
+}
 #endif
 
 void
@@ -2011,6 +2018,9 @@ ScrollFrameHelper::NotifyPluginFrames(AsyncScrollEventType aEvent)
       bool begin = (aEvent == BEGIN_APZ || aEvent == BEGIN_DOM);
       presContext->Document()->EnumerateActivityObservers(NotifyPluginFramesCallback,
                                                           (void*)begin);
+      presContext->Document()->EnumerateSubDocuments(NotifyPluginSubframesCallback,
+                                                     (void*)begin);
+
       mAsyncScrollEvent = aEvent;
     }
   }