| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 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 13 matching lines...) Expand all Loading... |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "public/platform/WebURL.h" | 31 #include "public/platform/WebURL.h" |
| 32 | 32 |
| 33 #include "platform/weborigin/KURL.h" | 33 #include "platform/weborigin/KURL.h" |
| 34 #include "wtf/text/StringView.h" |
| 34 | 35 |
| 35 namespace blink { | 36 namespace blink { |
| 36 | 37 |
| 37 bool WebURL::protocolIs(const char* protocol) const { | 38 bool WebURL::protocolIs(const char* protocol) const { |
| 38 return ::blink::protocolIs(m_string, protocol); | 39 const url::Component& scheme = m_parsed.scheme; |
| 40 StringView urlView = m_string; |
| 41 // For subtlety why this works in all cases, see KURL::componentString. |
| 42 return m_isValid && StringView(urlView, scheme.begin, scheme.len) == protocol; |
| 39 } | 43 } |
| 40 | 44 |
| 41 WebURL::WebURL(const KURL& url) | 45 WebURL::WebURL(const KURL& url) |
| 42 : m_string(url.getString()), | 46 : m_string(url.getString()), |
| 43 m_parsed(url.parsed()), | 47 m_parsed(url.parsed()), |
| 44 m_isValid(url.isValid()) {} | 48 m_isValid(url.isValid()) {} |
| 45 | 49 |
| 46 WebURL& WebURL::operator=(const KURL& url) { | 50 WebURL& WebURL::operator=(const KURL& url) { |
| 47 m_string = url.getString(); | 51 m_string = url.getString(); |
| 48 m_parsed = url.parsed(); | 52 m_parsed = url.parsed(); |
| 49 m_isValid = url.isValid(); | 53 m_isValid = url.isValid(); |
| 50 return *this; | 54 return *this; |
| 51 } | 55 } |
| 52 | 56 |
| 53 WebURL::operator KURL() const { | 57 WebURL::operator KURL() const { |
| 54 return KURL(m_string, m_parsed, m_isValid); | 58 return KURL(m_string, m_parsed, m_isValid); |
| 55 } | 59 } |
| 56 | 60 |
| 57 } // namespace blink | 61 } // namespace blink |
| OLD | NEW |