Move Feature Policy test to Frame

third_party/WebKit/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)
@@ skipping 11 matching lines @@
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #include "core/dom/Fullscreen.h"
 
-#include "bindings/core/v8/ConditionalFeaturesForCore.h"
 #include "core/dom/Document.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/StyleEngine.h"
 #include "core/dom/TaskRunnerHelper.h"
 #include "core/events/Event.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/HostsUsingFeatures.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/frame/UseCounter.h"
@@ skipping 36 matching lines @@
 
     // 4. Return false.
     return false;
   }
 
   // If Feature Policy is enabled, then we need this hack to support it, until
   // we have proper support for <iframe allowfullscreen> in FP:
 
   // 1. If FP, by itself, enables fullscreen in this document, then fullscreen
   // is allowed.
-  if (isFeatureEnabledInFrame(WebFeaturePolicyFeature::Fullscreen, frame)) {
+  if (frame->isFeatureEnabled(WebFeaturePolicyFeature::Fullscreen)) {
     return true;
   }
 
   // 2. Otherwise, if the embedding frame's document is allowed to use
   // fullscreen (either through FP or otherwise), and either:
   //   a) this is a same-origin embedded document, or
   //   b) this document's iframe has the allowfullscreen attribute set,
   // then fullscreen is allowed.
   if (!frame->isMainFrame()) {
     if (allowedToUseFullscreen(frame->tree().parent())) {
@@ skipping 766 matching lines @@
 DEFINE_TRACE(Fullscreen) {
   visitor->trace(m_pendingFullscreenElement);
   visitor->trace(m_fullscreenElementStack);
   visitor->trace(m_currentFullScreenElement);
   visitor->trace(m_eventQueue);
   Supplement<Document>::trace(visitor);
   ContextLifecycleObserver::trace(visitor);
 }
 
 }  // namespace blink