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

Side by Side Diff: third_party/WebKit/WebCore/platform/KURL.h

Issue 21343: Make it possible to initialize KURLGoogle from a CString. This is so that I... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | third_party/WebKit/WebCore/platform/KURLGoogle.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 // FIXME: If the base URL is invalid, this always creates an invalid 77 // FIXME: If the base URL is invalid, this always creates an invalid
78 // URL. Instead I think it would be better to treat all invalid base URLs 78 // URL. Instead I think it would be better to treat all invalid base URLs
79 // the same way we treate null and empty base URLs. 79 // the same way we treate null and empty base URLs.
80 KURL(const KURL& base, const String& relative); 80 KURL(const KURL& base, const String& relative);
81 KURL(const KURL& base, const String& relative, const TextEncoding&); 81 KURL(const KURL& base, const String& relative, const TextEncoding&);
82 82
83 #if USE(GOOGLEURL) 83 #if USE(GOOGLEURL)
84 // For conversions for other structures that have already parsed and 84 // For conversions for other structures that have already parsed and
85 // canonicalized the URL. The input must be exactly what KURL would have 85 // canonicalized the URL. The input must be exactly what KURL would have
86 // done with the same input. 86 // done with the same input.
87 KURL(const char* canonicalSpec, int canonicalSpecLen, 87 KURL(const CString& canonicalSpec,
88 const url_parse::Parsed& parsed, bool isValid); 88 const url_parse::Parsed& parsed, bool isValid);
89 #endif 89 #endif
90 90
91 // FIXME: The above functions should be harmonized so that passing a 91 // FIXME: The above functions should be harmonized so that passing a
92 // base of null or the empty string gives the same result as the 92 // base of null or the empty string gives the same result as the
93 // standard String constructor. 93 // standard String constructor.
94 94
95 // Makes a deep copy. Helpful only if you need to use a KURL on another 95 // Makes a deep copy. Helpful only if you need to use a KURL on another
96 // thread. Since the underlying StringImpl objects are immutable, there's 96 // thread. Since the underlying StringImpl objects are immutable, there's
97 // no other reason to ever prefer copy() over plain old assignment. 97 // no other reason to ever prefer copy() over plain old assignment.
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 352
353 // KURLHash is the default hash for String 353 // KURLHash is the default hash for String
354 template<typename T> struct DefaultHash; 354 template<typename T> struct DefaultHash;
355 template<> struct DefaultHash<WebCore::KURL> { 355 template<> struct DefaultHash<WebCore::KURL> {
356 typedef WebCore::KURLHash Hash; 356 typedef WebCore::KURLHash Hash;
357 }; 357 };
358 358
359 } // namespace WTF 359 } // namespace WTF
360 360
361 #endif // KURL_h 361 #endif // KURL_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/WebCore/platform/KURLGoogle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698