Make Document::isSecureContext() work for OOPIFs

third_party/WebKit/Source/core/dom/SecurityContext.cpp

 /*
  * Copyright (C) 2011 Google Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 56 matching lines @@
     // a place to inherit the origin from).
     if (!haveInitializedSecurityOrigin())
         return true;
 
     RefPtr<SecurityOrigin> other = SecurityOrigin::create(url);
     return securityOrigin()->canAccess(other.get());
 }
 
 void SecurityContext::enforceSandboxFlags(SandboxFlags mask)
 {
+    // The security origin must be set already in order to determine a sandboxed origin's potential trustworthiness.
+    ASSERT(securityOrigin());
     m_sandboxFlags |= mask;
 
-    if (isSandboxed(SandboxOrigin) && securityOrigin() && !securityOrigin()->isUnique()) {
-        setSecurityOrigin(SecurityOrigin::createUnique());
+    if (isSandboxed(SandboxOrigin) && !securityOrigin()->isUnique()) {
+        // Before overwriting the original origin, compute secure
+        // context properties from it. These properties are used to do
+        // secure context checks involving unique origins in remote
+        // frames.
+        setSecurityOrigin(SecurityOrigin::createUnique(securityOrigin()->isPotentiallyTrustworthy(), securityOrigin()->isPotentiallyTrustworthy() && securityOrigin()->bypassSecureContextCheck()));
         didUpdateSecurityOrigin();
     }
 }
 
 } // namespace blink