WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/platform/KURLGooglePrivate.h

 /*
  * Copyright (c) 2008, 2009, Google Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  * 
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 41 matching lines @@
         // Initializes the object. This will call through to one of the backend
         // initializers below depending on whether the string's internal
         // representation is 8 or 16 bit.
         void init(const KURL& base, const String& relative,
                   const TextEncoding* queryEncoding);
 
         // Backend initializers. The query encoding parameters are optional and can
         // be NULL (this implies UTF-8). These initializers require that the object
         // has just been created and the strings are NULL. Do not call on an
         // already-constructed object.
-        void init(const KURL& base, const char* rel, int relLen,
+        void init(const KURL& base, const char* rel, int relLength,
                   const TextEncoding* queryEncoding);
-        void init(const KURL& base, const UChar* rel, int relLen,
+        void init(const KURL& base, const UChar* rel, int relLength,
                   const TextEncoding* queryEncoding);
 
         // Does a deep copy to the given output object.
         void copyTo(KURLGooglePrivate* dest) const;
 
         // Returns the substring of the input identified by the given component.
         String componentString(const url_parse::Component&) const;
 
         // Replaces the given components, modifying the current URL. The current
         // URL must be valid.
         typedef url_canon::Replacements<url_parse::UTF16Char> Replacements;
         void replaceComponents(const Replacements&);
 
         // Setters for the data. Using the ASCII version when you know the
         // data is ASCII will be slightly more efficient. The UTF-8 version
         // will always be correct if the caller is unsure.
-        void setUtf8(const char* data, int dataLen);
-        void setAscii(const char* data, int dataLen);
+        void setUtf8(const char* data, int dataLength);
+        void setAscii(const char* data, int dataLength);
 
         // TODO(brettw) we can support an additional optimization.  Make this
         // buffer support both optinal Strings and UTF-8 data. This way, we can use
         // the optimization from the original KURL which uses = with the original
         // string when canonicalization did not change it. This allows the strings
         // to share a buffer internally, and saves a malloc.
 
         // Getters for the data.
         const CString& utf8String() const { return m_utf8; }
         const String& string() const;
@@ skipping 13 matching lines @@
         // hint (see setUtf8).
         bool m_utf8IsASCII;
 
         mutable bool m_stringIsValid;
         mutable String m_string;
     };
 
 } // namespace WebCore
 
 #endif