| Index: Source/platform/weborigin/KURL.h
|
| diff --git a/Source/weborigin/KURL.h b/Source/platform/weborigin/KURL.h
|
| similarity index 88%
|
| rename from Source/weborigin/KURL.h
|
| rename to Source/platform/weborigin/KURL.h
|
| index 9b7da04212b5ccc668f9b0868fda2eca2414edde..2a45e77c3b06427136bdb7cea90c4ede04711f63 100644
|
| --- a/Source/weborigin/KURL.h
|
| +++ b/Source/platform/weborigin/KURL.h
|
| @@ -26,7 +26,7 @@
|
| #ifndef KURL_h
|
| #define KURL_h
|
|
|
| -#include "weborigin/WebOriginExport.h"
|
| +#include "platform/PlatformExport.h"
|
| #include "wtf/Forward.h"
|
| #include "wtf/HashMap.h"
|
| #include "wtf/HashTableDeletedValueType.h"
|
| @@ -43,7 +43,7 @@ struct KURLHash;
|
|
|
| enum ParsedURLStringTag { ParsedURLString };
|
|
|
| -class WEBORIGIN_EXPORT KURL {
|
| +class PLATFORM_EXPORT KURL {
|
| public:
|
| KURL()
|
| : m_isValid(false)
|
| @@ -159,7 +159,7 @@ public:
|
| void setFragmentIdentifier(const String&);
|
| void removeFragmentIdentifier();
|
|
|
| - WEBORIGIN_EXPORT friend bool equalIgnoringFragmentIdentifier(const KURL&, const KURL&);
|
| + PLATFORM_EXPORT friend bool equalIgnoringFragmentIdentifier(const KURL&, const KURL&);
|
|
|
| unsigned hostStart() const;
|
| unsigned hostEnd() const;
|
| @@ -201,34 +201,34 @@ private:
|
| OwnPtr<KURL> m_innerURL;
|
| };
|
|
|
| -WEBORIGIN_EXPORT bool operator==(const KURL&, const KURL&);
|
| -WEBORIGIN_EXPORT bool operator==(const KURL&, const String&);
|
| -WEBORIGIN_EXPORT bool operator==(const String&, const KURL&);
|
| -WEBORIGIN_EXPORT bool operator!=(const KURL&, const KURL&);
|
| -WEBORIGIN_EXPORT bool operator!=(const KURL&, const String&);
|
| -WEBORIGIN_EXPORT bool operator!=(const String&, const KURL&);
|
| +PLATFORM_EXPORT bool operator==(const KURL&, const KURL&);
|
| +PLATFORM_EXPORT bool operator==(const KURL&, const String&);
|
| +PLATFORM_EXPORT bool operator==(const String&, const KURL&);
|
| +PLATFORM_EXPORT bool operator!=(const KURL&, const KURL&);
|
| +PLATFORM_EXPORT bool operator!=(const KURL&, const String&);
|
| +PLATFORM_EXPORT bool operator!=(const String&, const KURL&);
|
|
|
| -WEBORIGIN_EXPORT bool equalIgnoringFragmentIdentifier(const KURL&, const KURL&);
|
| +PLATFORM_EXPORT bool equalIgnoringFragmentIdentifier(const KURL&, const KURL&);
|
|
|
| -WEBORIGIN_EXPORT const KURL& blankURL();
|
| +PLATFORM_EXPORT const KURL& blankURL();
|
|
|
| // Functions to do URL operations on strings.
|
| // These are operations that aren't faster on a parsed URL.
|
| // These are also different from the KURL functions in that they don't require the string to be a valid and parsable URL.
|
| // This is especially important because valid javascript URLs are not necessarily considered valid by KURL.
|
|
|
| -WEBORIGIN_EXPORT bool protocolIs(const String& url, const char* protocol);
|
| -WEBORIGIN_EXPORT bool protocolIsJavaScript(const String& url);
|
| +PLATFORM_EXPORT bool protocolIs(const String& url, const char* protocol);
|
| +PLATFORM_EXPORT bool protocolIsJavaScript(const String& url);
|
|
|
| -WEBORIGIN_EXPORT bool isValidProtocol(const String&);
|
| +PLATFORM_EXPORT bool isValidProtocol(const String&);
|
|
|
| // Unescapes the given string using URL escaping rules, given an optional
|
| // encoding (defaulting to UTF-8 otherwise). DANGER: If the URL has "%00"
|
| // in it, the resulting string will have embedded null characters!
|
| -WEBORIGIN_EXPORT String decodeURLEscapeSequences(const String&);
|
| -WEBORIGIN_EXPORT String decodeURLEscapeSequences(const String&, const WTF::TextEncoding&);
|
| +PLATFORM_EXPORT String decodeURLEscapeSequences(const String&);
|
| +PLATFORM_EXPORT String decodeURLEscapeSequences(const String&, const WTF::TextEncoding&);
|
|
|
| -WEBORIGIN_EXPORT String encodeWithURLEscapeSequences(const String&);
|
| +PLATFORM_EXPORT String encodeWithURLEscapeSequences(const String&);
|
|
|
| // Inlines.
|
|
|
|
|