summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-16 18:28:43 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-16 18:28:43 +0000
commitb7e62b5dcc16b6a7e87e1af59d2673ecd7edde6a (patch)
treeffc02a95d01d5467e63c4fb08235c017df3bbf52
parent7458b20b76ae96f42de87e8c47d07bb8fb304a0e (diff)
downloadchromium_src-b7e62b5dcc16b6a7e87e1af59d2673ecd7edde6a.zip
chromium_src-b7e62b5dcc16b6a7e87e1af59d2673ecd7edde6a.tar.gz
chromium_src-b7e62b5dcc16b6a7e87e1af59d2673ecd7edde6a.tar.bz2
Fix build break due to incorrect merge, TBR=awalker
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13860 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/glue/plugins/test/plugin_client.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/glue/plugins/test/plugin_client.cc b/webkit/glue/plugins/test/plugin_client.cc
index de6cd2a..9837f9e 100644
--- a/webkit/glue/plugins/test/plugin_client.cc
+++ b/webkit/glue/plugins/test/plugin_client.cc
@@ -43,7 +43,7 @@ NPError PluginClient::GetEntryPoints(NPPluginFuncs* pFuncs) {
pFuncs->urlnotify = NPP_URLNotify;
pFuncs->getvalue = NPP_GetValue;
pFuncs->setvalue = NPP_SetValue;
- pFuncs->javaClass = static_cast<JRIGlobalRef>(NPP_GetJavaClass);
+ pFuncs->javaClass = reinterpret_cast<JRIGlobalRef>(NPP_GetJavaClass);
return NPERR_NO_ERROR;
}