diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
| commit | cfd86b747d32ac22246a1aa908eaa720c63a88c1 (patch) | |
| tree | 24d68c6f61c464ecba1e05670b80390ea3b0e50c /Source/WebCore/plugins/PluginView.cpp | |
| parent | 69d7c744c9de19d152dbe2d8e46eb7dfd4511d1a (diff) | |
| download | qtwebkit-cfd86b747d32ac22246a1aa908eaa720c63a88c1.tar.gz | |
Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)
New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.
Diffstat (limited to 'Source/WebCore/plugins/PluginView.cpp')
| -rw-r--r-- | Source/WebCore/plugins/PluginView.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/WebCore/plugins/PluginView.cpp b/Source/WebCore/plugins/PluginView.cpp index bd3f8834d..0466846d4 100644 --- a/Source/WebCore/plugins/PluginView.cpp +++ b/Source/WebCore/plugins/PluginView.cpp @@ -548,8 +548,8 @@ static KURL makeURL(const KURL& baseURL, const char* relativeURLString) String urlString = relativeURLString; // Strip return characters. - urlString.replace('\n', ""); - urlString.replace('\r', ""); + urlString.replaceWithLiteral('\n', ""); + urlString.replaceWithLiteral('\r', ""); return KURL(baseURL, urlString); } @@ -1474,6 +1474,11 @@ NPError PluginView::setValueForURL(NPNURLVariable variable, const char* url, con NPError PluginView::getAuthenticationInfo(const char* protocol, const char* host, int32_t port, const char* /* scheme */, const char* /* realm */, char** /* username */, uint32_t* /* ulen */, char** /* password */, uint32_t* /* plen */) { +#if LOG_DISABLED + UNUSED_PARAM(protocol); + UNUSED_PARAM(host); + UNUSED_PARAM(port); +#endif LOG(Plugins, "PluginView::getAuthenticationInfo: protocol=%s, host=%s, port=%d", protocol, host, port); notImplemented(); return NPERR_GENERIC_ERROR; |