Reland: Add support for entering/exiting HTML fullscreen from OOPIFs.

third_party/WebKit/Source/core/dom/Fullscreen.cpp

Index: third_party/WebKit/Source/core/dom/Fullscreen.cpp
diff --git a/third_party/WebKit/Source/core/dom/Fullscreen.cpp b/third_party/WebKit/Source/core/dom/Fullscreen.cpp
index f3e434437ce05757cbce2784eba15f768649da24..5172640245769b75e36dd61427d98aeac4b42836 100644
--- a/third_party/WebKit/Source/core/dom/Fullscreen.cpp
+++ b/third_party/WebKit/Source/core/dom/Fullscreen.cpp
@@ -410,7 +410,7 @@ bool Fullscreen::fullscreenEnabled(Document& document)
     return fullscreenIsAllowedForAllOwners(document) && fullscreenIsSupported(document);
 }
 
-void Fullscreen::didEnterFullScreenForElement(Element* element)
+void Fullscreen::didEnterFullScreenForElement(Element* element, bool isAncestorOfFullscreenElement)
 {
     DCHECK(element);
     if (!document()->isActive())
@@ -432,10 +432,20 @@ void Fullscreen::didEnterFullScreenForElement(Element* element)
         m_savedPlaceholderComputedStyle = ComputedStyle::clone(layoutObject->styleRef());
     }
 
+    // TODO(alexmos): When |isAncestorOfFullscreenElement| is true, some of
+    // this layout work has already been done in another process, so it should
+    // not be necessary to repeat it here.
     if (m_fullScreenElement != document()->documentElement())
         LayoutFullScreen::wrapLayoutObject(layoutObject, layoutObject ? layoutObject->parent() : 0, document());
 
+    if (isAncestorOfFullscreenElement) {
+        DCHECK(m_fullScreenElement->isFrameOwnerElement());
+        DCHECK(toHTMLFrameOwnerElement(m_fullScreenElement)->contentFrame()->isRemoteFrame());
+        m_fullScreenElement->setContainsFullScreenElement(true);
+    }
+
     m_fullScreenElement->setContainsFullScreenElementOnAncestorsCrossingFrameBoundaries(true);
+
     document()->styleEngine().ensureFullscreenUAStyle();
     m_fullScreenElement->pseudoStateChanged(CSSSelector::PseudoFullScreen);
 
@@ -450,7 +460,7 @@ void Fullscreen::didEnterFullScreenForElement(Element* element)
     m_eventQueueTimer.startOneShot(0, BLINK_FROM_HERE);
 }
 
-void Fullscreen::didExitFullScreenForElement(Element*)
+void Fullscreen::didExitFullScreenForElement(bool isAncestorOfFullscreenElement)
 {
     if (!m_fullScreenElement)
         return;
@@ -460,6 +470,9 @@ void Fullscreen::didExitFullScreenForElement(Element*)
 
     m_fullScreenElement->willStopBeingFullscreenElement();
 
+    if (isAncestorOfFullscreenElement)
+        m_fullScreenElement->setContainsFullScreenElement(false);
+
     m_fullScreenElement->setContainsFullScreenElementOnAncestorsCrossingFrameBoundaries(false);
 
     if (m_fullScreenLayoutObject)