Add suborigins to WebSecurityOrigin

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 58 matching lines @@
 
   BLINK_PLATFORM_EXPORT WebString protocol() const;
   BLINK_PLATFORM_EXPORT WebString host() const;
   BLINK_PLATFORM_EXPORT unsigned short port() const;
 
   // |port()| will return 0 if the port is the default for an origin. This
   // method instead returns the effective port, even if it is the default port
   // (e.g. "http" => 80).
   BLINK_PLATFORM_EXPORT unsigned short effectivePort() const;
 
+  BLINK_PLATFORM_EXPORT WebString suborigin() const;
+
   // A unique WebSecurityOrigin is the least privileged WebSecurityOrigin.
   BLINK_PLATFORM_EXPORT bool isUnique() const;
 
   // Returns true if this WebSecurityOrigin can script objects in the given
   // SecurityOrigin. For example, call this function before allowing
   // script from one security origin to read or write objects from
   // another SecurityOrigin.
   BLINK_PLATFORM_EXPORT bool canAccess(const WebSecurityOrigin&) const;
 
   // Returns true if this WebSecurityOrigin can read content retrieved from
@@ skipping 24 matching lines @@
   BLINK_PLATFORM_EXPORT WebSecurityOrigin& operator=(
       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::CreateFromNormalizedTuple(
-                            protocol().utf8(), host().utf8(), effectivePort());
+                      : url::Origin::CreateFromNormalizedTupleWithSuborigin(
+                            protocol().utf8(), host().utf8(), effectivePort(),
+                            suborigin().utf8());
   }
 
   WebSecurityOrigin(const url::Origin& origin) : m_private(0) {
     if (origin.unique()) {
       assign(WebSecurityOrigin::createUnique());
       return;
     }
 
     // TODO(mkwst): This might open up issues by double-canonicalizing the host.
-    assign(WebSecurityOrigin::createFromTuple(
+    assign(WebSecurityOrigin::createFromTupleWithSuborigin(
         WebString::fromUTF8(origin.scheme()),
-        WebString::fromUTF8(origin.host()), origin.port()));
+        WebString::fromUTF8(origin.host()), origin.port(),
+        WebString::fromUTF8(origin.suborigin())));
   }
 #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);
+  BLINK_PLATFORM_EXPORT static WebSecurityOrigin createFromTupleWithSuborigin(
+      const WebString& protocol,
+      const WebString& host,
+      int port,
+      const WebString& suborigin);
 
   void assign(WebSecurityOriginPrivate*);
   WebSecurityOriginPrivate* m_private;
 };
 
 }  // namespace blink
 
 #endif