diff options
| author | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-16 20:20:01 +0000 |
|---|---|---|
| committer | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-16 20:20:01 +0000 |
| commit | 7a7835f529ae65cba8f96e2f51fbc2edda2c1f4a (patch) | |
| tree | 335a5d280ebc993c46facaf8bf0e54841d2c3ce2 /webkit/glue/glue_util.cc | |
| parent | a5bf6960db0b678d48ce2c894f12dbda0f12c4a9 (diff) | |
| download | chromium_src-7a7835f529ae65cba8f96e2f51fbc2edda2c1f4a.zip chromium_src-7a7835f529ae65cba8f96e2f51fbc2edda2c1f4a.tar.gz chromium_src-7a7835f529ae65cba8f96e2f51fbc2edda2c1f4a.tar.bz2 | |
WebKit Merge 40875:41017, Chromium side
R=tc
BUG=NONE
The changes are to account for:
http://trac.webkit.org/changeset/40925 -- Adding MediaPlayerPrivate
http://trac.webkit.org/changeset/40981 -- Converting GKURL constructor arg to CString.
Review URL: http://codereview.chromium.org/20409
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9860 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/glue_util.cc')
| -rw-r--r-- | webkit/glue/glue_util.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/glue/glue_util.cc b/webkit/glue/glue_util.cc index 41b3364..a81da6b 100644 --- a/webkit/glue/glue_util.cc +++ b/webkit/glue/glue_util.cc @@ -110,7 +110,8 @@ WebCore::KURL GURLToKURL(const GURL& url) { const std::string& spec = url.possibly_invalid_spec(); #if USE(GOOGLEURL) // Convert using the internal structures to avoid re-parsing. - return WebCore::KURL(spec.c_str(), static_cast<int>(spec.length()), + return WebCore::KURL(WebCore::CString(spec.c_str(), + static_cast<unsigned>(spec.length())), url.parsed_for_possibly_invalid_spec(), url.is_valid()); #else return WebCore::KURL(StdWStringToString(UTF8ToWide(spec))); |