summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-29 23:23:29 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-29 23:23:29 +0000
commit8c6c7b074616bbb5aac505bb5305777ea92ed9ad (patch)
tree6cd426a9104467fc64baaddcce714e3b339cfbe4 /webkit
parent60ceb6b29c613a3fa31834e0a1f440fecaf7d005 (diff)
downloadchromium_src-8c6c7b074616bbb5aac505bb5305777ea92ed9ad.zip
chromium_src-8c6c7b074616bbb5aac505bb5305777ea92ed9ad.tar.gz
chromium_src-8c6c7b074616bbb5aac505bb5305777ea92ed9ad.tar.bz2
linux: use intptr_t where appropriate to fix 64-bit build
Review URL: http://codereview.chromium.org/553157 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37558 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webplugin_impl.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc
index f032340..296b65de 100644
--- a/webkit/glue/webplugin_impl.cc
+++ b/webkit/glue/webplugin_impl.cc
@@ -354,7 +354,7 @@ void WebPluginImpl::didFinishLoadingFrameRequest(
const WebURL& url, void* notify_data) {
if (delegate_) {
delegate_->DidFinishLoadWithReason(
- url, NPRES_DONE, reinterpret_cast<int>(notify_data));
+ url, NPRES_DONE, reinterpret_cast<intptr_t>(notify_data));
}
}
@@ -366,7 +366,7 @@ void WebPluginImpl::didFailLoadingFrameRequest(
NPReason reason =
error.reason == net::ERR_ABORTED ? NPRES_USER_BREAK : NPRES_NETWORK_ERR;
delegate_->DidFinishLoadWithReason(
- url, reason, reinterpret_cast<int>(notify_data));
+ url, reason, reinterpret_cast<intptr_t>(notify_data));
}
// -----------------------------------------------------------------------------