WebKit changes needed for supporting filesystem URLs natively in GURL/KURL.

Source/WebCore/page/SecurityOrigin.cpp

 /*
  * Copyright (C) 2007 Apple 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
@@ skipping 66 matching lines @@
     return false;
 }
 
 // In general, extracting the inner URL varies by scheme. It just so happens
 // that all the URL schemes we currently support that use inner URLs for their
 // security origin can be parsed using this algorithm.
 static KURL extractInnerURL(const KURL& url)
 {
     // FIXME: Update this callsite to use the innerURL member function when
     // we finish implementing it.
+#if ENABLE(FILE_SYSTEM)
+    if (url.inner_url())
+        return *url.inner_url();
+#endif
     return KURL(ParsedURLString, decodeURLEscapeSequences(url.path()));

[abarth-chromium, 2011/12/20 07:03:15]

This shouldn't be conditional on ENABLE(FILE_SYSTEM).  You should just replaces
this the goofy call to KURL() with url.innerURL().

[ericu, 2011/12/20 23:55:34]

Currently innerURL only exists if ENABLE(FILE_SYSTEM), and is 0 for blob URLs. 
It looks like blob URLs will hit here and use the KURL constructor somehow, but
I'm not sure quite how.

 }
 
 static bool shouldTreatAsUniqueOrigin(const KURL& url)
 {
     if (!url.isValid())
         return true;
 
     // FIXME: Do we need to unwrap the URL further?
     KURL innerURL = shouldUseInnerURL(url) ? extractInnerURL(url) : url;
 
@@ skipping 19 matching lines @@
 SecurityOrigin::SecurityOrigin(const KURL& url)
     : m_protocol(url.protocol().isNull() ? "" : url.protocol().lower())
     , m_host(url.host().isNull() ? "" : url.host().lower())
     , m_port(url.port())
     , m_isUnique(false)
     , m_universalAccess(false)
     , m_domainWasSetInDOM(false)
     , m_enforceFilePathSeparation(false)
     , m_needsDatabaseIdentifierQuirkForFiles(false)
 {
+    // These protocols do not create security origins; the owner frame provides the origin
+    if (m_protocol == "about" || m_protocol == "javascript")
+        m_protocol = "";
+
+#if ENABLE(BLOB)
+    if (m_protocol == BlobURL::blobProtocol()) {
+        KURL originURL(ParsedURLString, decodeURLEscapeSequences(url.path()));
+        if (originURL.isValid()) {
+            m_protocol = originURL.protocol().lower();
+            m_host = originURL.host().lower();
+            m_port = originURL.port();
+        } else
+            m_isUnique = true;
+    }
+#endif
+
+#if ENABLE(FILE_SYSTEM)
+    if (m_protocol == "filesystem") {
+        if (url.inner_url() && url.inner_url()->isValid()) {
+            m_protocol = url.inner_url()->protocol().lower();
+            m_host = url.inner_url()->host().lower();
+            m_port = url.inner_url()->port();
+        } else
+            m_isUnique = true;
+    }
+#endif
+

[abarth-chromium, 2011/12/20 07:03:15]

None of this code should be here anymore.  It all got refactored into more
sensible places.

[ericu, 2011/12/20 23:55:34]

I took out the non-FILE_SYSTEM code, but left my stuff.  Is there a more
sensible place for it too?

Also, m_filePath below is in a different namespace for filesystem:file: URLs vs.
file: URLs.  Will that ever get invoked in Chromium, or do we always just have
blank paths for file SecurityOrigins?

     // document.domain starts as m_host, but can be set by the DOM.
     m_domain = m_host;
 
     if (isDefaultPortForProtocol(m_port, m_protocol))
         m_port = InvalidPort;
 
     // By default, only local SecurityOrigins can load local resources.
     m_canLoadLocalResources = isLocal();
 
     if (m_canLoadLocalResources)
@@ skipping 364 matching lines @@
     if (m_port != other->m_port)
         return false;
 
     if (isLocal() && !passesFileCheck(other))
         return false;
 
     return true;
 }
 
 } // namespace WebCore