| 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 58440dd00e87283f85c142f17de4adbca84da24e..e2398d48e5034f604f927bf9099f59b68da460dd 100644
|
| --- a/third_party/WebKit/Source/core/dom/Fullscreen.cpp
|
| +++ b/third_party/WebKit/Source/core/dom/Fullscreen.cpp
|
| @@ -410,7 +410,7 @@
|
| return fullscreenIsAllowedForAllOwners(document) && fullscreenIsSupported(document);
|
| }
|
|
|
| -void Fullscreen::didEnterFullScreenForElement(Element* element, bool isAncestorOfFullscreenElement)
|
| +void Fullscreen::didEnterFullScreenForElement(Element* element)
|
| {
|
| DCHECK(element);
|
| if (!document()->isActive())
|
| @@ -432,20 +432,10 @@
|
| 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);
|
|
|
| @@ -460,7 +450,7 @@
|
| m_eventQueueTimer.startOneShot(0, BLINK_FROM_HERE);
|
| }
|
|
|
| -void Fullscreen::didExitFullScreenForElement(bool isAncestorOfFullscreenElement)
|
| +void Fullscreen::didExitFullScreenForElement(Element*)
|
| {
|
| if (!m_fullScreenElement)
|
| return;
|
| @@ -469,9 +459,6 @@
|
| return;
|
|
|
| m_fullScreenElement->willStopBeingFullscreenElement();
|
| -
|
| - if (isAncestorOfFullscreenElement)
|
| - m_fullScreenElement->setContainsFullScreenElement(false);
|
|
|
| m_fullScreenElement->setContainsFullScreenElementOnAncestorsCrossingFrameBoundaries(false);
|
|
|
|
|