Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 103 ASSERT(other.m_private); | 103 ASSERT(other.m_private); |
| 104 return m_private->canAccess(other.m_private); | 104 return m_private->canAccess(other.m_private); |
| 105 } | 105 } |
| 106 | 106 |
| 107 bool WebSecurityOrigin::canRequest(const WebURL& url) const | 107 bool WebSecurityOrigin::canRequest(const WebURL& url) const |
| 108 { | 108 { |
| 109 ASSERT(m_private); | 109 ASSERT(m_private); |
| 110 return m_private->canRequest(url); | 110 return m_private->canRequest(url); |
| 111 } | 111 } |
| 112 | 112 |
| 113 bool WebSecurityOrigin::canAccessFeatureRequiringSecureOrigin(const WebString& e rrorMessage) const | |
| 114 { | |
| 115 ASSERT(m_private); | |
| 116 WTF::String message(errorMessage); | |
|
jochen (gone - plz use gerrit)
2014/07/29 19:02:47
is this required? The WebString should be automati
| |
| 117 return m_private->canAccessFeatureRequiringSecureOrigin(message); | |
| 118 } | |
| 119 | |
| 113 WebString WebSecurityOrigin::toString() const | 120 WebString WebSecurityOrigin::toString() const |
| 114 { | 121 { |
| 115 ASSERT(m_private); | 122 ASSERT(m_private); |
| 116 return m_private->toString(); | 123 return m_private->toString(); |
| 117 } | 124 } |
| 118 | 125 |
| 119 WebString WebSecurityOrigin::databaseIdentifier() const | 126 WebString WebSecurityOrigin::databaseIdentifier() const |
| 120 { | 127 { |
| 121 ASSERT(m_private); | 128 ASSERT(m_private); |
| 122 return createDatabaseIdentifierFromSecurityOrigin(m_private); | 129 return createDatabaseIdentifierFromSecurityOrigin(m_private); |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 156 m_private->deref(); | 163 m_private->deref(); |
| 157 m_private = p; | 164 m_private = p; |
| 158 } | 165 } |
| 159 | 166 |
| 160 void WebSecurityOrigin::grantLoadLocalResources() const | 167 void WebSecurityOrigin::grantLoadLocalResources() const |
| 161 { | 168 { |
| 162 get()->grantLoadLocalResources(); | 169 get()->grantLoadLocalResources(); |
| 163 } | 170 } |
| 164 | 171 |
| 165 } // namespace blink | 172 } // namespace blink |
| OLD | NEW |