diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-01 00:13:41 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-01 00:13:41 +0000 |
| commit | 561b90ed703cd49da7e5c9ed4b19060ed4342e61 (patch) | |
| tree | e4ae93d24150d9c1c447775e5f182b184d39fd7e /webkit/api | |
| parent | 54fd1d3ac91d117719f157fad3ead41518865f52 (diff) | |
| download | chromium_src-561b90ed703cd49da7e5c9ed4b19060ed4342e61.zip chromium_src-561b90ed703cd49da7e5c9ed4b19060ed4342e61.tar.gz chromium_src-561b90ed703cd49da7e5c9ed4b19060ed4342e61.tar.bz2 | |
Pull in webkit revision 47912. This involves a build fix matching
http://trac.webkit.org/changeset/47907 where KURL no longer has
a single argument constructor.
TBR=brettw@chromium.org,michaeln@chromium.org
TEST=try server
BUG=none
Review URL: http://codereview.chromium.org/180049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24980 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/api')
| -rw-r--r-- | webkit/api/src/WebHistoryItem.cpp | 2 | ||||
| -rw-r--r-- | webkit/api/src/WebMediaPlayerClientImpl.cpp | 2 | ||||
| -rw-r--r-- | webkit/api/src/WebURLError.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/webkit/api/src/WebHistoryItem.cpp b/webkit/api/src/WebHistoryItem.cpp index 1cbbfae..77c0edc 100644 --- a/webkit/api/src/WebHistoryItem.cpp +++ b/webkit/api/src/WebHistoryItem.cpp @@ -73,7 +73,7 @@ WebString WebHistoryItem::urlString() const void WebHistoryItem::setURLString(const WebString& url) { ensureMutable(); - m_private->setURLString(KURL(url).string()); + m_private->setURLString(KURL(ParsedURLString, url).string()); } WebString WebHistoryItem::originalURLString() const diff --git a/webkit/api/src/WebMediaPlayerClientImpl.cpp b/webkit/api/src/WebMediaPlayerClientImpl.cpp index 400fa7e..60e9656 100644 --- a/webkit/api/src/WebMediaPlayerClientImpl.cpp +++ b/webkit/api/src/WebMediaPlayerClientImpl.cpp @@ -118,7 +118,7 @@ void WebMediaPlayerClientImpl::load(const String& url) m_mediaPlayer->mediaPlayerClient())->document()->frame(); m_webMediaPlayer.set(TemporaryGlue::createWebMediaPlayer(this, frame)); if (m_webMediaPlayer.get()) - m_webMediaPlayer->load(KURL(url)); + m_webMediaPlayer->load(KURL(ParsedURLString, url)); } void WebMediaPlayerClientImpl::cancelLoad() diff --git a/webkit/api/src/WebURLError.cpp b/webkit/api/src/WebURLError.cpp index cd7d72d..08c0be2 100644 --- a/webkit/api/src/WebURLError.cpp +++ b/webkit/api/src/WebURLError.cpp @@ -51,7 +51,7 @@ WebURLError& WebURLError::operator=(const ResourceError& error) else { domain = error.domain(); reason = error.errorCode(); - unreachableURL = KURL(error.failingURL()); + unreachableURL = KURL(ParsedURLString, error.failingURL()); } return *this; } |