Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(693)

Unified Diff: url/origin.cc

Issue 2378323003: Add url::Origin::GetURL() to convert Origins to URLs without reparsing (Closed)
Patch Set: propagate file:/// change to weborigin Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « url/origin.h ('k') | url/origin_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: url/origin.cc
diff --git a/url/origin.cc b/url/origin.cc
index a14c8918d35bfbf4430d0d5c5d7ebee577639f95..68f978e8fd640025eb161aca57b6d83fda64fe23 100644
--- a/url/origin.cc
+++ b/url/origin.cc
@@ -17,6 +17,12 @@
namespace url {
+namespace {
+
+const char kRootFileUrl[] = "file:///";
+
+} // namespace
+
Origin::Origin() : unique_(true) {
}
@@ -60,11 +66,21 @@ std::string Origin::Serialize() const {
return "null";
if (scheme() == kFileScheme)
- return "file://";
+ return kRootFileUrl;
brettw 2016/10/03 18:56:34 It looks like this returns the new "file:///" inst
return tuple_.Serialize();
}
+GURL Origin::GetURL() const {
+ if (unique())
+ return GURL();
+
+ if (scheme() == kFileScheme)
+ return GURL(kRootFileUrl);
+
+ return tuple_.GetURL();
+}
+
bool Origin::IsSameOriginWith(const Origin& other) const {
if (unique_ || other.unique_)
return false;
« no previous file with comments | « url/origin.h ('k') | url/origin_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698