| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2011, 2012 Apple Inc. All r
ights reserved. | 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2011, 2012 Apple Inc. All r
ights 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 | 25 |
| 26 #ifndef KURL_h | 26 #ifndef KURL_h |
| 27 #define KURL_h | 27 #define KURL_h |
| 28 | 28 |
| 29 #include "platform/PlatformExport.h" | 29 #include "platform/PlatformExport.h" |
| 30 #include "url/third_party/mozilla/url_parse.h" | 30 #include "url/third_party/mozilla/url_parse.h" |
| 31 #include "url/url_canon.h" | 31 #include "url/url_canon.h" |
| 32 #include "wtf/Allocator.h" | 32 #include "wtf/Allocator.h" |
| 33 #include "wtf/Forward.h" | 33 #include "wtf/Forward.h" |
| 34 #include "wtf/HashTableDeletedValueType.h" | 34 #include "wtf/HashTableDeletedValueType.h" |
| 35 #include "wtf/OwnPtr.h" |
| 35 #include "wtf/text/WTFString.h" | 36 #include "wtf/text/WTFString.h" |
| 36 #include <memory> | |
| 37 | 37 |
| 38 namespace WTF { | 38 namespace WTF { |
| 39 class TextEncoding; | 39 class TextEncoding; |
| 40 } | 40 } |
| 41 | 41 |
| 42 namespace blink { | 42 namespace blink { |
| 43 | 43 |
| 44 struct KURLHash; | 44 struct KURLHash; |
| 45 | 45 |
| 46 enum ParsedURLStringTag { ParsedURLString }; | 46 enum ParsedURLStringTag { ParsedURLString }; |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 195 | 195 |
| 196 template <typename CHAR> | 196 template <typename CHAR> |
| 197 void init(const KURL& base, const CHAR* relative, int relativeLength, const
WTF::TextEncoding* queryEncoding); | 197 void init(const KURL& base, const CHAR* relative, int relativeLength, const
WTF::TextEncoding* queryEncoding); |
| 198 void initInnerURL(); | 198 void initInnerURL(); |
| 199 void initProtocolIsInHTTPFamily(); | 199 void initProtocolIsInHTTPFamily(); |
| 200 | 200 |
| 201 bool m_isValid; | 201 bool m_isValid; |
| 202 bool m_protocolIsInHTTPFamily; | 202 bool m_protocolIsInHTTPFamily; |
| 203 url::Parsed m_parsed; | 203 url::Parsed m_parsed; |
| 204 String m_string; | 204 String m_string; |
| 205 std::unique_ptr<KURL> m_innerURL; | 205 OwnPtr<KURL> m_innerURL; |
| 206 }; | 206 }; |
| 207 | 207 |
| 208 PLATFORM_EXPORT bool operator==(const KURL&, const KURL&); | 208 PLATFORM_EXPORT bool operator==(const KURL&, const KURL&); |
| 209 PLATFORM_EXPORT bool operator==(const KURL&, const String&); | 209 PLATFORM_EXPORT bool operator==(const KURL&, const String&); |
| 210 PLATFORM_EXPORT bool operator==(const String&, const KURL&); | 210 PLATFORM_EXPORT bool operator==(const String&, const KURL&); |
| 211 PLATFORM_EXPORT bool operator!=(const KURL&, const KURL&); | 211 PLATFORM_EXPORT bool operator!=(const KURL&, const KURL&); |
| 212 PLATFORM_EXPORT bool operator!=(const KURL&, const String&); | 212 PLATFORM_EXPORT bool operator!=(const KURL&, const String&); |
| 213 PLATFORM_EXPORT bool operator!=(const String&, const KURL&); | 213 PLATFORM_EXPORT bool operator!=(const String&, const KURL&); |
| 214 | 214 |
| 215 PLATFORM_EXPORT bool equalIgnoringFragmentIdentifier(const KURL&, const KURL&); | 215 PLATFORM_EXPORT bool equalIgnoringFragmentIdentifier(const KURL&, const KURL&); |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 namespace WTF { | 272 namespace WTF { |
| 273 | 273 |
| 274 // KURLHash is the default hash for String | 274 // KURLHash is the default hash for String |
| 275 template<> struct DefaultHash<blink::KURL> { | 275 template<> struct DefaultHash<blink::KURL> { |
| 276 typedef blink::KURLHash Hash; | 276 typedef blink::KURLHash Hash; |
| 277 }; | 277 }; |
| 278 | 278 |
| 279 } // namespace WTF | 279 } // namespace WTF |
| 280 | 280 |
| 281 #endif // KURL_h | 281 #endif // KURL_h |
| OLD | NEW |