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

Unified Diff: Source/WebCore/page/SecurityOrigin.cpp

Issue 7569017: Merge 91957 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/782/
Patch Set: Created 9 years, 4 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 | « Source/WebCore/bindings/generic/BindingSecurityBase.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/page/SecurityOrigin.cpp
===================================================================
--- Source/WebCore/page/SecurityOrigin.cpp (revision 92508)
+++ Source/WebCore/page/SecurityOrigin.cpp (working copy)
@@ -147,6 +147,7 @@
bool SecurityOrigin::isEmpty() const
{
+ ASSERT(!m_protocol.isEmpty() || m_isUnique);
return m_protocol.isEmpty();
}
@@ -173,6 +174,7 @@
m_domain = newDomain.lower();
}
+// FIXME: This should move to SchemeRegistry!
static HashSet<String>& schemesForbiddenFromDomainRelaxation()
{
DEFINE_STATIC_LOCAL(HashSet<String>, schemes, ());
@@ -373,8 +375,8 @@
}
bool SecurityOrigin::isSecureTransitionTo(const KURL& url) const
-{
- // New window created by the application
+{
+ // This origin represents a new window created by the application.
if (isEmpty())
return true;
@@ -384,9 +386,6 @@
String SecurityOrigin::toString() const
{
- if (isEmpty())
- return "null";
-
if (isUnique())
return "null";
« no previous file with comments | « Source/WebCore/bindings/generic/BindingSecurityBase.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698