diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/platform/KURL.h | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/platform/KURL.h')
| -rw-r--r-- | Source/WebCore/platform/KURL.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/WebCore/platform/KURL.h b/Source/WebCore/platform/KURL.h index 521e7ca..be72824 100644 --- a/Source/WebCore/platform/KURL.h +++ b/Source/WebCore/platform/KURL.h @@ -30,7 +30,7 @@ #include "URLString.h" #include <wtf/HashMap.h> -#if PLATFORM(CF) +#if USE(CF) typedef const struct __CFURL* CFURLRef; #endif @@ -96,6 +96,8 @@ public: const url_parse::Parsed& parsed, bool isValid); #endif + String strippedForUseAsReferrer() const; + // FIXME: The above functions should be harmonized so that passing a // base of null or the empty string gives the same result as the // standard String constructor. @@ -190,7 +192,7 @@ public: unsigned pathAfterLastSlash() const; operator const String&() const { return string(); } -#if PLATFORM(CF) +#if USE(CF) KURL(CFURLRef); CFURLRef createCFURL() const; #endif |