diff options
author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-23 11:25:48 +0000 |
---|---|---|
committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-23 11:25:48 +0000 |
commit | c22822797b06ed158a1e8db7b8282e6d54a245b7 (patch) | |
tree | bb1b5c111e20f30a14b97f9a822a3a693a7eec6c /url/url_util.h | |
parent | 4a3ddef359865759009e9576fb6c970bebb39f5f (diff) | |
download | chromium_src-c22822797b06ed158a1e8db7b8282e6d54a245b7.zip chromium_src-c22822797b06ed158a1e8db7b8282e6d54a245b7.tar.gz chromium_src-c22822797b06ed158a1e8db7b8282e6d54a245b7.tar.bz2 |
Revert 201723 "Make the copy of GURL in src/url buildable as a c..."
Speculative revert:
url_unittests url_unittests crashed or hung
http://build.chromium.org/p/chromium.win/builders/XP%20Tests%20%28dbg%29%281%29/builds/36158
> Make the copy of GURL in src/url buildable as a component build.
>
> BUG=229660
>
> Review URL: https://chromiumcodereview.appspot.com/15255009
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/15859003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201755 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'url/url_util.h')
-rw-r--r-- | url/url_util.h | 117 |
1 files changed, 58 insertions, 59 deletions
diff --git a/url/url_util.h b/url/url_util.h index a5f5176..419775c 100644 --- a/url/url_util.h +++ b/url/url_util.h @@ -9,7 +9,6 @@ #include "base/string16.h" #include "url/url_canon.h" -#include "url/url_export.h" #include "url/url_parse.h" namespace url_util { @@ -27,13 +26,13 @@ namespace url_util { // "noop", unless Shutdown() was called in the mean time. This will also be a // "noop" if other calls to the library have forced an initialization // beforehand. -URL_EXPORT void Initialize(); +void Initialize(); // Cleanup is not required, except some strings may leak. For most user // applications, this is fine. If you're using it in a library that may get // loaded and unloaded, you'll want to unload to properly clean up your // library. -URL_EXPORT void Shutdown(); +void Shutdown(); // Schemes -------------------------------------------------------------------- @@ -41,7 +40,7 @@ URL_EXPORT void Shutdown(); // schemes. This function is not threadsafe and can not be called concurrently // with any other url_util function. It will assert if the list of standard // schemes has been locked (see LockStandardSchemes). -URL_EXPORT void AddStandardScheme(const char* new_scheme); +void AddStandardScheme(const char* new_scheme); // Sets a flag to prevent future calls to AddStandardScheme from succeeding. // @@ -55,7 +54,7 @@ URL_EXPORT void AddStandardScheme(const char* new_scheme); // We could have had AddStandardScheme use a lock instead, but that would add // some platform-specific dependencies we don't otherwise have now, and is // overkill considering the normal usage is so simple. -URL_EXPORT void LockStandardSchemes(); +void LockStandardSchemes(); // Locates the scheme in the given string and places it into |found_scheme|, // which may be NULL to indicate the caller does not care about the range. @@ -63,14 +62,14 @@ URL_EXPORT void LockStandardSchemes(); // Returns whether the given |compare| scheme matches the scheme found in the // input (if any). The |compare| scheme must be a valid canonical scheme or // the result of the comparison is undefined. -URL_EXPORT bool FindAndCompareScheme(const char* str, - int str_len, - const char* compare, - url_parse::Component* found_scheme); -URL_EXPORT bool FindAndCompareScheme(const char16* str, - int str_len, - const char* compare, - url_parse::Component* found_scheme); +bool FindAndCompareScheme(const char* str, + int str_len, + const char* compare, + url_parse::Component* found_scheme); +bool FindAndCompareScheme(const char16* str, + int str_len, + const char* compare, + url_parse::Component* found_scheme); inline bool FindAndCompareScheme(const std::string& str, const char* compare, url_parse::Component* found_scheme) { @@ -86,10 +85,10 @@ inline bool FindAndCompareScheme(const string16& str, // Returns true if the given string represents a standard URL. This means that // either the scheme is in the list of known standard schemes. -URL_EXPORT bool IsStandard(const char* spec, - const url_parse::Component& scheme); -URL_EXPORT bool IsStandard(const char16* spec, - const url_parse::Component& scheme); +bool IsStandard(const char* spec, + const url_parse::Component& scheme); +bool IsStandard(const char16* spec, + const url_parse::Component& scheme); // TODO(brettw) remove this. This is a temporary compatibility hack to avoid // breaking the WebKit build when this version is synced via Chrome. @@ -110,16 +109,16 @@ inline bool IsStandard(const char* spec, int spec_len, // Returns true if a valid URL was produced, false if not. On failure, the // output and parsed structures will still be filled and will be consistent, // but they will not represent a loadable URL. -URL_EXPORT bool Canonicalize(const char* spec, - int spec_len, - url_canon::CharsetConverter* charset_converter, - url_canon::CanonOutput* output, - url_parse::Parsed* output_parsed); -URL_EXPORT bool Canonicalize(const char16* spec, - int spec_len, - url_canon::CharsetConverter* charset_converter, - url_canon::CanonOutput* output, - url_parse::Parsed* output_parsed); +bool Canonicalize(const char* spec, + int spec_len, + url_canon::CharsetConverter* charset_converter, + url_canon::CanonOutput* output, + url_parse::Parsed* output_parsed); +bool Canonicalize(const char16* spec, + int spec_len, + url_canon::CharsetConverter* charset_converter, + url_canon::CanonOutput* output, + url_parse::Parsed* output_parsed); // Resolves a potentially relative URL relative to the given parsed base URL. // The base MUST be valid. The resulting canonical URL and parsed information @@ -131,28 +130,28 @@ URL_EXPORT bool Canonicalize(const char16* spec, // // Returns true if the output is valid, false if the input could not produce // a valid URL. -URL_EXPORT bool ResolveRelative(const char* base_spec, - int base_spec_len, - const url_parse::Parsed& base_parsed, - const char* relative, - int relative_length, - url_canon::CharsetConverter* charset_converter, - url_canon::CanonOutput* output, - url_parse::Parsed* output_parsed); -URL_EXPORT bool ResolveRelative(const char* base_spec, - int base_spec_len, - const url_parse::Parsed& base_parsed, - const char16* relative, - int relative_length, - url_canon::CharsetConverter* charset_converter, - url_canon::CanonOutput* output, - url_parse::Parsed* output_parsed); +bool ResolveRelative(const char* base_spec, + int base_spec_len, + const url_parse::Parsed& base_parsed, + const char* relative, + int relative_length, + url_canon::CharsetConverter* charset_converter, + url_canon::CanonOutput* output, + url_parse::Parsed* output_parsed); +bool ResolveRelative(const char* base_spec, + int base_spec_len, + const url_parse::Parsed& base_parsed, + const char16* relative, + int relative_length, + url_canon::CharsetConverter* charset_converter, + url_canon::CanonOutput* output, + url_parse::Parsed* output_parsed); // Replaces components in the given VALID input url. The new canonical URL info // is written to output and out_parsed. // // Returns true if the resulting URL is valid. -URL_EXPORT bool ReplaceComponents( +bool ReplaceComponents( const char* spec, int spec_len, const url_parse::Parsed& parsed, @@ -160,7 +159,7 @@ URL_EXPORT bool ReplaceComponents( url_canon::CharsetConverter* charset_converter, url_canon::CanonOutput* output, url_parse::Parsed* out_parsed); -URL_EXPORT bool ReplaceComponents( +bool ReplaceComponents( const char* spec, int spec_len, const url_parse::Parsed& parsed, @@ -177,25 +176,25 @@ URL_EXPORT bool ReplaceComponents( // // The versions of this function that don't take a b_end assume that the b // string is NULL terminated. -URL_EXPORT bool LowerCaseEqualsASCII(const char* a_begin, - const char* a_end, - const char* b); -URL_EXPORT bool LowerCaseEqualsASCII(const char* a_begin, - const char* a_end, - const char* b_begin, - const char* b_end); -URL_EXPORT bool LowerCaseEqualsASCII(const char16* a_begin, - const char16* a_end, - const char* b); +bool LowerCaseEqualsASCII(const char* a_begin, + const char* a_end, + const char* b); +bool LowerCaseEqualsASCII(const char* a_begin, + const char* a_end, + const char* b_begin, + const char* b_end); +bool LowerCaseEqualsASCII(const char16* a_begin, + const char16* a_end, + const char* b); // Unescapes the given string using URL escaping rules. -URL_EXPORT void DecodeURLEscapeSequences(const char* input, int length, - url_canon::CanonOutputW* output); +void DecodeURLEscapeSequences(const char* input, int length, + url_canon::CanonOutputW* output); // Escapes the given string as defined by the JS method encodeURIComponent. See // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/encodeURIComponent -URL_EXPORT void EncodeURIComponent(const char* input, int length, - url_canon::CanonOutput* output); +void EncodeURIComponent(const char* input, int length, + url_canon::CanonOutput* output); } // namespace url_util |