| Index: third_party/WebKit/Source/core/dom/Fullscreen.h
|
| diff --git a/third_party/WebKit/Source/core/dom/Fullscreen.h b/third_party/WebKit/Source/core/dom/Fullscreen.h
|
| index 566e697617702bdb57ea43bc119950675185dec2..b67a4a9490d39a4ee93dbc998fe41baf38ab94ae 100644
|
| --- a/third_party/WebKit/Source/core/dom/Fullscreen.h
|
| +++ b/third_party/WebKit/Source/core/dom/Fullscreen.h
|
| @@ -67,9 +67,10 @@ public:
|
| PrefixedRequest,
|
| };
|
|
|
| - // |forCrossProcessAncestor| is used in OOPIF scenarios and is set to true
|
| - // when fullscreen is requested for an out-of-process descendant element.
|
| - void requestFullscreen(Element&, RequestType, bool forCrossProcessAncestor = false);
|
| + // |forCrossProcessDescendant| is used in OOPIF scenarios and is set to
|
| + // true when fullscreen is requested for an out-of-process descendant
|
| + // element.
|
| + void requestFullscreen(Element&, RequestType, bool forCrossProcessDescendant = false);
|
|
|
| static void fullyExitFullscreen(Document&);
|
| void exitFullscreen();
|
| @@ -77,12 +78,6 @@ public:
|
| static bool fullscreenEnabled(Document&);
|
| Element* fullscreenElement() const { return !m_fullScreenElementStack.isEmpty() ? m_fullScreenElementStack.last().first.get() : 0; }
|
|
|
| - // |isAncestorOfFullscreenElement| is used in OOPIF scenarios and is set to
|
| - // true when these functions are called to enter/exit fullscreen for an
|
| - // out-of-process descendant element. In this case, we enter fullscreen
|
| - // for its (local) iframe container and make sure to also set the
|
| - // ContainsFullScreenElement flag on it (so that it gains the
|
| - // -webkit-full-screen-ancestor style).
|
| void didEnterFullscreenForElement(Element*);
|
| void didExitFullscreen();
|
|
|
| @@ -93,8 +88,9 @@ public:
|
| void elementRemoved(Element&);
|
|
|
| // Returns true if the current fullscreen element stack corresponds to a
|
| - // container for an actual fullscreen element in an out-of-process iframe.
|
| - bool forCrossProcessAncestor() { return m_forCrossProcessAncestor; }
|
| + // container for an actual fullscreen element in a descendant
|
| + // out-of-process iframe.
|
| + bool forCrossProcessDescendant() { return m_forCrossProcessDescendant; }
|
|
|
| // Mozilla API
|
| Element* webkitCurrentFullScreenElement() const { return m_fullScreenElement.get(); }
|
| @@ -136,7 +132,7 @@ private:
|
| // change if https://crbug.com/161068 is fixed so that cross-process
|
| // postMessage can carry user gestures. If that happens, this should be
|
| // moved to be part of |m_fullScreenElementStack|.
|
| - bool m_forCrossProcessAncestor;
|
| + bool m_forCrossProcessDescendant;
|
| };
|
|
|
| inline bool Fullscreen::isActiveFullScreenElement(const Element& element)
|
|
|