Added [SecureContext] to the subtle attribute

third_party/WebKit/Source/core/dom/Document.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, 2011, 2012 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
@@ skipping 3880 matching lines @@
 }
 
 void Document::CloneDataFromDocument(const Document& other) {
   SetCompatibilityMode(other.GetCompatibilityMode());
   SetEncodingData(other.encoding_data_);
   SetContextFeatures(other.GetContextFeatures());
   SetSecurityOrigin(other.GetSecurityOrigin()->IsolatedCopy());
   SetMimeType(other.contentType());
 }
 
-bool Document::IsSecureContextImpl(
-    const SecureContextCheck privilege_context_check) const {
+bool Document::IsSecureContextImpl() const {
   // There may be exceptions for the secure context check defined for certain
   // schemes. The exceptions are applied only to the special scheme and to
   // sandboxed URLs from those origins, but *not* to any children.
   //
   // For example:
   //   <iframe src="http://host">
   //     <iframe src="scheme-has-exception://host"></iframe>
   //     <iframe sandbox src="scheme-has-exception://host"></iframe>
   //   </iframe>
   // both inner iframes pass this check, assuming that the scheme
@@ skipping 15 matching lines @@
   //
   // In all cases, a frame must be potentially trustworthy in addition to
   // having an exception listed in order for the exception to be granted.
   if (!GetSecurityOrigin()->IsPotentiallyTrustworthy())
     return false;
 
   if (SchemeRegistry::SchemeShouldBypassSecureContextCheck(
           GetSecurityOrigin()->Protocol()))
     return true;
 
-  if (privilege_context_check == kStandardSecureContextCheck) {
-    if (!frame_)
-      return true;
-    Frame* parent = frame_->Tree().Parent();
-    while (parent) {
-      if (!parent->GetSecurityContext()
-               ->GetSecurityOrigin()
-               ->IsPotentiallyTrustworthy())
-        return false;
-      parent = parent->Tree().Parent();
-    }
+  if (!frame_)
+    return true;
+  Frame* parent = frame_->Tree().Parent();
+  while (parent) {
+    if (!parent->GetSecurityContext()
+             ->GetSecurityOrigin()
+             ->IsPotentiallyTrustworthy())
+      return false;
+    parent = parent->Tree().Parent();
   }
   return true;
 }
 
 StyleSheetList& Document::StyleSheets() {
   if (!style_sheet_list_)
     style_sheet_list_ = StyleSheetList::Create(this);
   return *style_sheet_list_;
 }
 
@@ skipping 2563 matching lines @@
     list->InvalidateCacheForAttribute(attr_name);
 }
 
 void Document::PlatformColorsChanged() {
   if (!IsActive())
     return;
 
   GetStyleEngine().PlatformColorsChanged();
 }
 
-bool Document::IsSecureContext(
-    String& error_message,
-    const SecureContextCheck privilege_context_check) const {
-  if (!IsSecureContext(privilege_context_check)) {
+bool Document::IsSecureContext(String& error_message) const {
+  if (!IsSecureContext()) {
     error_message = SecurityOrigin::IsPotentiallyTrustworthyErrorMessage();
     return false;
   }
   return true;
 }
 
-bool Document::IsSecureContext(
-    const SecureContextCheck privilege_context_check) const {
-  bool is_secure = IsSecureContextImpl(privilege_context_check);
+bool Document::IsSecureContext() const {
+  bool is_secure = IsSecureContextImpl();
   if (GetSandboxFlags() != kSandboxNone) {
     UseCounter::Count(
         *this, is_secure
                    ? UseCounter::kSecureContextCheckForSandboxedOriginPassed
                    : UseCounter::kSecureContextCheckForSandboxedOriginFailed);
   }
   UseCounter::Count(*this, is_secure ? UseCounter::kSecureContextCheckPassed
                                      : UseCounter::kSecureContextCheckFailed);
   return is_secure;
 }
@@ skipping 180 matching lines @@
 }
 
 void showLiveDocumentInstances() {
   WeakDocumentSet& set = liveDocumentSet();
   fprintf(stderr, "There are %u documents currently alive:\n", set.size());
   for (blink::Document* document : set)
     fprintf(stderr, "- Document %p URL: %s\n", document,
             document->Url().GetString().Utf8().data());
 }
 #endif