summaryrefslogtreecommitdiffstats
path: root/webkit/plugins/npapi/webplugin_impl.cc
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-10 23:49:34 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-10 23:49:34 +0000
commitc0671d88b8314dae752caec425b33d0afeca7c2f (patch)
treef61de633d024faec780aed449d9d9528aec1e26f /webkit/plugins/npapi/webplugin_impl.cc
parentb3eeee0144b1a63c48e9ab5a9ccc922582624dfc (diff)
downloadchromium_src-c0671d88b8314dae752caec425b33d0afeca7c2f.zip
chromium_src-c0671d88b8314dae752caec425b33d0afeca7c2f.tar.gz
chromium_src-c0671d88b8314dae752caec425b33d0afeca7c2f.tar.bz2
Fix more 64 bit compile errors flagged by conversions from size_t to uint32 and to int.
Looks like these were masked in webkit_glue.gypi. Using static_cast for now. BUG=237249 TBR=jam Review URL: https://codereview.chromium.org/14743008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199575 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins/npapi/webplugin_impl.cc')
-rw-r--r--webkit/plugins/npapi/webplugin_impl.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/webkit/plugins/npapi/webplugin_impl.cc b/webkit/plugins/npapi/webplugin_impl.cc
index 880cb97..d23c473 100644
--- a/webkit/plugins/npapi/webplugin_impl.cc
+++ b/webkit/plugins/npapi/webplugin_impl.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -602,7 +602,9 @@ bool WebPluginImpl::IsValidUrl(const GURL& url, Referrer referrer_flag) {
// scheme and url path.
const char* url_to_check(url.spec().data());
url_parse::Parsed parsed;
- url_parse::ParseStandardURL(url_to_check, strlen(url_to_check), &parsed);
+ url_parse::ParseStandardURL(url_to_check,
+ static_cast<int>(strlen(url_to_check)),
+ &parsed);
if (parsed.path.begin <= parsed.scheme.end())
return true;
std::string string_to_search;
@@ -1081,7 +1083,7 @@ void WebPluginImpl::HandleURLRequestInternal(const char* url,
// in which case we route the output to the plugin rather than routing it
// to the plugin's frame.
bool is_javascript_url = url_util::FindAndCompareScheme(
- url, strlen(url), "javascript", NULL);
+ url, static_cast<int>(strlen(url)), "javascript", NULL);
RoutingStatus routing_status = RouteToFrame(
url, is_javascript_url, popups_allowed, method, target, buf, len,
notify_id, referrer_flag);