Initial Implementation of Iframe Attribute for Feature Policy (Part 4)

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 62 matching lines @@
     // is an iframe element with an |allowattribute| attribute specified, and
     // whose node document is allowed to use the feature indicated by
     // |allowattribute|, then return true.
     if (frame->owner() && frame->owner()->allowFullscreen())
       return allowedToUseFullscreen(frame->tree().parent());
 
     // 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 (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())) {
-      return (frame->owner() && frame->owner()->allowFullscreen()) ||
-             frame->tree()
-                 .parent()
-                 ->securityContext()
-                 ->getSecurityOrigin()
-                 ->isSameSchemeHostPortAndSuborigin(
-                     frame->securityContext()->getSecurityOrigin());
-    }
-  }
-
-  // Otherwise, fullscreen is not allowed. (If we reach here and this is the
-  // main frame, then fullscreen must have been disabled by FP.)
-  return false;
+  // 2. If Feature Policy is enabled, return the policy for "fullscreen"
+  // feature.
+  return frame->isFeatureEnabled(WebFeaturePolicyFeature::Fullscreen);
 }
 
 bool allowedToRequestFullscreen(Document& document) {
   // An algorithm is allowed to request fullscreen if one of the following is
   // true:
 
   //  The algorithm is triggered by a user activation.
   if (UserGestureIndicator::utilizeUserGesture())
     return true;
 
@@ skipping 743 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