Make the fullscreen element ready check static

Source/core/dom/Fullscreen.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
@@ skipping 30 matching lines @@
 #include "core/page/ChromeClient.h"
 #include "core/rendering/RenderFullScreen.h"
 #include "platform/UserGestureIndicator.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 static bool fullscreenIsAllowedForAllOwners(const Document& document)
 {
-    for (const HTMLFrameOwnerElement* owner = document.ownerElement(); owner; owner = owner->document().ownerElement()) {
+    for (const Element* owner = document.ownerElement(); owner; owner = owner->document().ownerElement()) {
         if (!isHTMLIFrameElement(owner))
             return false;
         if (!owner->hasAttribute(allowfullscreenAttr))
             return false;
     }
     return true;
 }
 
 static bool fullscreenIsSupported(const Document& document)
 {
     // Fullscreen is supported if there is no previously-established user preference,
     // security risk, or platform limitation.
     return !document.settings() || document.settings()->fullscreenSupported();
 }
 
 static bool fullscreenIsSupported(const Document& document, const Element& element)
 {
     if (!document.settings() || (document.settings()->disallowFullscreenForNonMediaElements() && !isHTMLMediaElement(element)))
         return false;
     return fullscreenIsSupported(document);
 }
 
+static bool fullscreenElementReady(const Element& element, Fullscreen::RequestType requestType)
+{
+    // A fullscreen element ready check for an element |element| returns true if all of the
+    // following are true, and false otherwise:
+
+    // |element| is in a document.
+    if (!element.inDocument())
+        return false;
+
+    // |element|'s node document's fullscreen enabled flag is set.
+    if (!fullscreenIsAllowedForAllOwners(element.document())) {
+        if (requestType == Fullscreen::PrefixedVideoRequest)
+            UseCounter::count(element.document(), UseCounter::VideoFullscreenAllowedExemption);
+        else
+            return false;
+    }
+
+    // |element|'s node document's fullscreen element stack is either empty or its top element is an
+    // inclusive ancestor of |element|.
+    if (const Element* topElement = Fullscreen::fullscreenElementFrom(element.document())) {
+        if (!topElement->contains(&element))
+            return false;
+    }
+
+    // |element| has no ancestor element whose local name is iframe and namespace is the HTML
+    // namespace.
+    if (Traversal<HTMLIFrameElement>::firstAncestor(element))
+        return false;
+
+    // |element|'s node document's browsing context either has a browsing context container and the
+    // fullscreen element ready check returns true for |element|'s node document's browsing
+    // context's browsing context container, or it has no browsing context container.
+    if (const Element* owner = element.document().ownerElement()) {
+        if (!fullscreenElementReady(*owner, requestType))
+            return false;
+    }
+
+    return true;
+}
+
 static bool isPrefixed(const AtomicString& type)
 {
     return type == EventTypeNames::webkitfullscreenchange || type == EventTypeNames::webkitfullscreenerror;
 }
 
 static PassRefPtrWillBeRawPtr<Event> createEvent(const AtomicString& type, EventTarget& target)
 {
     EventInit initializer;
     initializer.bubbles = isPrefixed(type);
     RefPtrWillBeRawPtr<Event> event = Event::create(type, initializer);
@@ skipping 76 matching lines @@
 #if !ENABLE(OILPAN)
 void Fullscreen::documentWasDisposed()
 {
     // NOTE: the context dispose phase is not supported in oilpan. Please
     // consider using the detach phase instead.
     m_fullScreenElement = nullptr;
     m_fullScreenElementStack.clear();
 }
 #endif
 
-bool Fullscreen::elementReady(Element& element, RequestType requestType)
-{
-    // A fullscreen element ready check for an element |element| returns true if all of the
-    // following are true, and false otherwise:
-
-    // |element| is in a document.
-    if (!element.inDocument())
-        return false;
-
-    // |element|'s node document's fullscreen enabled flag is set.
-    if (!fullscreenIsAllowedForAllOwners(element.document())) {
-        if (requestType == PrefixedVideoRequest)
-            UseCounter::count(element.document(), UseCounter::VideoFullscreenAllowedExemption);
-        else
-            return false;
-    }
-
-    // |element|'s node document's fullscreen element stack is either empty or its top element is an
-    // inclusive ancestor of |element|.
-    if (Element* topElement = fullscreenElementFrom(element.document())) {
-        if (!topElement->contains(&element))
-            return false;
-    }
-
-    // |element| has no ancestor element whose local name is iframe and namespace is the HTML
-    // namespace.
-    if (Traversal<HTMLIFrameElement>::firstAncestor(element))
-        return false;
-
-    // |element|'s node document's browsing context either has a browsing context container and the
-    // fullscreen element ready check returns true for |element|'s node document's browsing
-    // context's browsing context container, or it has no browsing context container.
-    if (HTMLFrameOwnerElement* container = element.document().ownerElement()) {
-        if (!elementReady(*container, requestType))
-            return false;
-    }
-
-    return true;
-}
-
 void Fullscreen::requestFullscreen(Element& element, RequestType requestType)
 {
     // Ignore this request if the document is not in a live frame.
     if (!document()->isActive())
         return;
 
     // If |element| is on top of |doc|'s fullscreen element stack, terminate these substeps.
     if (&element == fullscreenElement())
         return;
 
     do {
         // 1. If any of the following conditions are true, terminate these steps and queue a task to fire
         // an event named fullscreenerror with its bubbles attribute set to true on the context object's
         // node document:
 
         // The fullscreen element ready check returns false.
-        if (!elementReady(element, requestType))
+        if (!fullscreenElementReady(element, requestType))
             break;
 
         // This algorithm is not allowed to show a pop-up:
         //   An algorithm is allowed to show a pop-up if, in the task in which the algorithm is running, either:
         //   - an activation behavior is currently being processed whose click event was trusted, or
         //   - the event listener for a trusted click event is being handled.
         if (!UserGestureIndicator::processingUserGesture())
             break;
 
         // Fullscreen is not supported.
@@ skipping 377 matching lines @@
 void Fullscreen::trace(Visitor* visitor)
 {
     visitor->trace(m_fullScreenElement);
     visitor->trace(m_fullScreenElementStack);
     visitor->trace(m_fullScreenRenderer);
     visitor->trace(m_eventQueue);
     DocumentSupplement::trace(visitor);
 }
 
 } // namespace blink