diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/platform/KURL.h | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/platform/KURL.h')
| -rw-r--r-- | Source/WebCore/platform/KURL.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/WebCore/platform/KURL.h b/Source/WebCore/platform/KURL.h index 5764494..db2dd42 100644 --- a/Source/WebCore/platform/KURL.h +++ b/Source/WebCore/platform/KURL.h @@ -76,6 +76,12 @@ public: KURL(ParsedURLStringTag, const char*); KURL(ParsedURLStringTag, const String&); KURL(ParsedURLStringTag, const URLString&); +#if USE(GOOGLEURL) + KURL(WTF::HashTableDeletedValueType) : m_url(WTF::HashTableDeletedValue) { } +#else + KURL(WTF::HashTableDeletedValueType) : m_string(WTF::HashTableDeletedValue) { } +#endif + bool isHashTableDeletedValue() const { return string().isHashTableDeletedValue(); } // Resolves the relative URL with the given base URL. If provided, the // TextEncoding is used to encode non-ASCII characers. The base URL can be |