Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(349)

Unified Diff: src/url_parse_internal.h

Issue 14090005: Modify the headers in src/ to forward to url/*.h (Closed) Base URL: http://google-url.googlecode.com/svn/trunk
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/url_parse.h ('k') | src/url_test_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/url_parse_internal.h
diff --git a/src/url_parse_internal.h b/src/url_parse_internal.h
index 61bd0687f45ad117dc392429ce7958bfaf18c30a..d68a27c5c186fd3f41c7df706f39fb47aabf6d40 100644
--- a/src/url_parse_internal.h
+++ b/src/url_parse_internal.h
@@ -32,81 +32,6 @@
#ifndef GOOGLEURL_SRC_URL_PARSE_INTERNAL_H__
#define GOOGLEURL_SRC_URL_PARSE_INTERNAL_H__
-#include "googleurl/src/url_parse.h"
-
-namespace url_parse {
-
-// We treat slashes and backslashes the same for IE compatability.
-inline bool IsURLSlash(char16 ch) {
- return ch == '/' || ch == '\\';
-}
-
-// Returns true if we should trim this character from the URL because it is a
-// space or a control character.
-inline bool ShouldTrimFromURL(char16 ch) {
- return ch <= ' ';
-}
-
-// Given an already-initialized begin index and length, this shrinks the range
-// to eliminate "should-be-trimmed" characters. Note that the length does *not*
-// indicate the length of untrimmed data from |*begin|, but rather the position
-// in the input string (so the string starts at character |*begin| in the spec,
-// and goes until |*len|).
-template<typename CHAR>
-inline void TrimURL(const CHAR* spec, int* begin, int* len) {
- // Strip leading whitespace and control characters.
- while (*begin < *len && ShouldTrimFromURL(spec[*begin]))
- (*begin)++;
-
- // Strip trailing whitespace and control characters. We need the >i test for
- // when the input string is all blanks; we don't want to back past the input.
- while (*len > *begin && ShouldTrimFromURL(spec[*len - 1]))
- (*len)--;
-}
-
-// Counts the number of consecutive slashes starting at the given offset
-// in the given string of the given length.
-template<typename CHAR>
-inline int CountConsecutiveSlashes(const CHAR *str,
- int begin_offset, int str_len) {
- int count = 0;
- while (begin_offset + count < str_len &&
- IsURLSlash(str[begin_offset + count]))
- ++count;
- return count;
-}
-
-// Internal functions in url_parse.cc that parse the path, that is, everything
-// following the authority section. The input is the range of everything
-// following the authority section, and the output is the identified ranges.
-//
-// This is designed for the file URL parser or other consumers who may do
-// special stuff at the beginning, but want regular path parsing, it just
-// maps to the internal parsing function for paths.
-void ParsePathInternal(const char* spec,
- const Component& path,
- Component* filepath,
- Component* query,
- Component* ref);
-void ParsePathInternal(const char16* spec,
- const Component& path,
- Component* filepath,
- Component* query,
- Component* ref);
-
-
-// Given a spec and a pointer to the character after the colon following the
-// scheme, this parses it and fills in the structure, Every item in the parsed
-// structure is filled EXCEPT for the scheme, which is untouched.
-void ParseAfterScheme(const char* spec,
- int spec_len,
- int after_scheme,
- Parsed* parsed);
-void ParseAfterScheme(const char16* spec,
- int spec_len,
- int after_scheme,
- Parsed* parsed);
-
-} // namespace url_parse
+#include "url/url_parse_internal.h"
#endif // GOOGLEURL_SRC_URL_PARSE_INTERNAL_H__
« no previous file with comments | « src/url_parse.h ('k') | src/url_test_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698