Make Document::isSecureContext() work for OOPIFs

third_party/WebKit/public/platform/WebSecurityOrigin.h

 /*
  * Copyright (C) 2010 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 44 matching lines @@
     WebSecurityOrigin& operator=(const WebSecurityOrigin& s)
     {
         assign(s);
         return *this;
     }
 
     BLINK_PLATFORM_EXPORT static WebSecurityOrigin createFromDatabaseIdentifier(const WebString& databaseIdentifier);
     BLINK_PLATFORM_EXPORT static WebSecurityOrigin createFromString(const WebString&);
     BLINK_PLATFORM_EXPORT static WebSecurityOrigin create(const WebURL&);
     BLINK_PLATFORM_EXPORT static WebSecurityOrigin createUnique();
+    BLINK_PLATFORM_EXPORT static WebSecurityOrigin createUnique(bool isPotentiallyTrustworthy, bool shouldBypassSecureContextCheck);
 
     BLINK_PLATFORM_EXPORT void reset();
     BLINK_PLATFORM_EXPORT void assign(const WebSecurityOrigin&);
 
     bool isNull() const { return !m_private; }
 
     BLINK_PLATFORM_EXPORT WebString protocol() const;
     BLINK_PLATFORM_EXPORT WebString host() const;
     BLINK_PLATFORM_EXPORT unsigned short port() const;
 
@@ skipping 41 matching lines @@
 #if INSIDE_BLINK
     BLINK_PLATFORM_EXPORT WebSecurityOrigin(const WTF::PassRefPtr<SecurityOrigin>&);
     BLINK_PLATFORM_EXPORT WebSecurityOrigin& operator=(const WTF::PassRefPtr<SecurityOrigin>&);
     BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<SecurityOrigin>() const;
     BLINK_PLATFORM_EXPORT SecurityOrigin* get() const;
 #else
     // TODO(mkwst): A number of properties don't survive a round-trip ('document.domain', for instance).
     // We'll need to fix that for OOPI-enabled embedders: https://crbug.com/490074.
     operator url::Origin() const
     {
-        return isUnique()
-            ? url::Origin()
-            : url::Origin::UnsafelyCreateOriginWithoutNormalization(protocol().utf8(), host().utf8(), effectivePort());
+        if (!isUnique())
+            return url::Origin::UnsafelyCreateOriginWithoutNormalization(protocol().utf8(), host().utf8(), effectivePort());
+
+        url::Origin origin;
+        origin.set_is_unique_origin_potentially_trustworthy(isUniqueOriginPotentiallyTrustworthy());
+        origin.set_should_unique_origin_bypass_secure_context_check(shouldUniqueOriginBypassSecureContextCheck());
+        return origin;
     }
 
     WebSecurityOrigin(const url::Origin& origin)
         : m_private(0)
     {
         if (origin.unique()) {
-            assign(WebSecurityOrigin::createUnique());
+            assign(WebSecurityOrigin::createUnique(origin.is_unique_origin_potentially_trustworthy(), origin.should_unique_origin_bypass_secure_context_check()));
             return;
         }
 
         // TODO(mkwst): This might open up issues by double-canonicalizing the host.
         assign(WebSecurityOrigin::createFromTuple(WebString::fromUTF8(origin.scheme()),
             WebString::fromUTF8(origin.host()),
             origin.port()));
     }
 #endif
 
 private:
     // Present only to facilitate conversion from 'url::Origin'; this constructor shouldn't be used anywhere else.
     BLINK_PLATFORM_EXPORT static WebSecurityOrigin createFromTuple(const WebString& protocol, const WebString& host, int port);
 
     void assign(WebSecurityOriginPrivate*);
+    bool isUniqueOriginPotentiallyTrustworthy() const;
+    bool shouldUniqueOriginBypassSecureContextCheck() const;
+
     WebSecurityOriginPrivate* m_private;
 };
 
 } // namespace blink
 
 #endif