OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "webkit/database/database_util.h" | 5 #include "webkit/database/database_util.h" |
6 | 6 |
7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" | 8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" |
9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" | 9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" |
10 #include "webkit/database/database_tracker.h" | 10 #include "webkit/database/database_tracker.h" |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 } | 70 } |
71 | 71 |
72 string16 DatabaseUtil::GetOriginIdentifier(const GURL& url) { | 72 string16 DatabaseUtil::GetOriginIdentifier(const GURL& url) { |
73 string16 spec = UTF8ToUTF16(url.spec()); | 73 string16 spec = UTF8ToUTF16(url.spec()); |
74 return WebKit::WebSecurityOrigin::createFromString(spec).databaseIdentifier(); | 74 return WebKit::WebSecurityOrigin::createFromString(spec).databaseIdentifier(); |
75 } | 75 } |
76 | 76 |
77 GURL DatabaseUtil::GetOriginFromIdentifier(const string16& origin_identifier) { | 77 GURL DatabaseUtil::GetOriginFromIdentifier(const string16& origin_identifier) { |
78 GURL origin(WebKit::WebSecurityOrigin::createFromDatabaseIdentifier( | 78 GURL origin(WebKit::WebSecurityOrigin::createFromDatabaseIdentifier( |
79 origin_identifier).toString()); | 79 origin_identifier).toString()); |
80 DCHECK(origin == origin.GetOrigin()); | 80 // We need this work-around for file:/// URIs as |
| 81 // createFromDatabaseIdentifier returns empty origin url for them. |
| 82 if (origin.spec().empty() && |
| 83 origin_identifier.find(ASCIIToUTF16("file__")) == 0) |
| 84 return GURL("file:///"); |
81 return origin; | 85 return origin; |
82 } | 86 } |
83 | 87 |
84 } // namespace webkit_database | 88 } // namespace webkit_database |
OLD | NEW |