| Index: third_party/WebKit/Source/platform/weborigin/KURL.h
|
| diff --git a/third_party/WebKit/Source/platform/weborigin/KURL.h b/third_party/WebKit/Source/platform/weborigin/KURL.h
|
| index abb207fdcebdf796b4717d6072272071f0aad9a6..d36a1e1a4bafc6b11a7e20c6372a0aa10e7d7857 100644
|
| --- a/third_party/WebKit/Source/platform/weborigin/KURL.h
|
| +++ b/third_party/WebKit/Source/platform/weborigin/KURL.h
|
| @@ -26,7 +26,7 @@
|
| #ifndef KURL_h
|
| #define KURL_h
|
|
|
| -#include "platform/PlatformExport.h"
|
| +#include "platform/weborigin/OriginExport.h"
|
| #include "url/third_party/mozilla/url_parse.h"
|
| #include "url/url_canon.h"
|
| #include "wtf/Allocator.h"
|
| @@ -45,7 +45,7 @@ struct KURLHash;
|
|
|
| enum ParsedURLStringTag { ParsedURLString };
|
|
|
| -class PLATFORM_EXPORT KURL {
|
| +class ORIGIN_EXPORT KURL {
|
| USING_FAST_MALLOC(KURL);
|
| public:
|
| // This must be called during initialization (before we create
|
| @@ -167,7 +167,7 @@ public:
|
| void setFragmentIdentifier(const String&);
|
| void removeFragmentIdentifier();
|
|
|
| - PLATFORM_EXPORT friend bool equalIgnoringFragmentIdentifier(const KURL&, const KURL&);
|
| + ORIGIN_EXPORT friend bool equalIgnoringFragmentIdentifier(const KURL&, const KURL&);
|
|
|
| unsigned hostStart() const;
|
| unsigned hostEnd() const;
|
| @@ -205,35 +205,35 @@ private:
|
| std::unique_ptr<KURL> m_innerURL;
|
| };
|
|
|
| -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&);
|
| +ORIGIN_EXPORT bool operator==(const KURL&, const KURL&);
|
| +ORIGIN_EXPORT bool operator==(const KURL&, const String&);
|
| +ORIGIN_EXPORT bool operator==(const String&, const KURL&);
|
| +ORIGIN_EXPORT bool operator!=(const KURL&, const KURL&);
|
| +ORIGIN_EXPORT bool operator!=(const KURL&, const String&);
|
| +ORIGIN_EXPORT bool operator!=(const String&, const KURL&);
|
|
|
| -PLATFORM_EXPORT bool equalIgnoringFragmentIdentifier(const KURL&, const KURL&);
|
| +ORIGIN_EXPORT bool equalIgnoringFragmentIdentifier(const KURL&, const KURL&);
|
|
|
| -PLATFORM_EXPORT const KURL& blankURL();
|
| -PLATFORM_EXPORT const KURL& srcdocURL();
|
| +ORIGIN_EXPORT const KURL& blankURL();
|
| +ORIGIN_EXPORT const KURL& srcdocURL();
|
|
|
| // 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.
|
|
|
| -PLATFORM_EXPORT bool protocolIs(const String& url, const char* protocol);
|
| -PLATFORM_EXPORT bool protocolIsJavaScript(const String& url);
|
| +ORIGIN_EXPORT bool protocolIs(const String& url, const char* protocol);
|
| +ORIGIN_EXPORT bool protocolIsJavaScript(const String& url);
|
|
|
| -PLATFORM_EXPORT bool isValidProtocol(const String&);
|
| +ORIGIN_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!
|
| -PLATFORM_EXPORT String decodeURLEscapeSequences(const String&);
|
| -PLATFORM_EXPORT String decodeURLEscapeSequences(const String&, const WTF::TextEncoding&);
|
| +ORIGIN_EXPORT String decodeURLEscapeSequences(const String&);
|
| +ORIGIN_EXPORT String decodeURLEscapeSequences(const String&, const WTF::TextEncoding&);
|
|
|
| -PLATFORM_EXPORT String encodeWithURLEscapeSequences(const String&);
|
| +ORIGIN_EXPORT String encodeWithURLEscapeSequences(const String&);
|
|
|
| // Inlines.
|
|
|
|
|