summaryrefslogtreecommitdiffstats
path: root/webkit/glue/chromium_bridge_impl.cc
diff options
context:
space:
mode:
authorager@google.com <ager@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-04 07:03:14 +0000
committerager@google.com <ager@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-04 07:03:14 +0000
commit9d4e10b96b68d8b1181856410865f5f1d4b55aa8 (patch)
tree4766848959c6bdf95fd9d664e8846d5d9e9dafdc /webkit/glue/chromium_bridge_impl.cc
parent88af41c2203595c4b73da3e26dceaff4766d76ce (diff)
downloadchromium_src-9d4e10b96b68d8b1181856410865f5f1d4b55aa8.zip
chromium_src-9d4e10b96b68d8b1181856410865f5f1d4b55aa8.tar.gz
chromium_src-9d4e10b96b68d8b1181856410865f5f1d4b55aa8.tar.bz2
Update to latest trunk version of V8.
This includes Evan's change to use char instead of wchar_t for counter names. Also, because of changes to the regexp parser, we need to rebaseline a couple of tests mainly because of error message changes. Most of the tests were already rebaselined because of differences in error messages. Review URL: http://codereview.chromium.org/12902 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6349 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/chromium_bridge_impl.cc')
-rw-r--r--webkit/glue/chromium_bridge_impl.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/webkit/glue/chromium_bridge_impl.cc b/webkit/glue/chromium_bridge_impl.cc
index aa7f994..8ebba8d 100644
--- a/webkit/glue/chromium_bridge_impl.cc
+++ b/webkit/glue/chromium_bridge_impl.cc
@@ -490,11 +490,8 @@ void ChromiumBridge::incrementStatsCounter(const char* name) {
#if USE(V8)
// TODO(evanm): remove this conversion thunk once v8 supports plain char*
// counter functions.
-static int* CounterFunction(const wchar_t* name) {
- return StatsTable::FindLocation(WideToASCII(name).c_str());
-}
void ChromiumBridge::initV8CounterFunction() {
- v8::V8::SetCounterFunction(CounterFunction);
+ v8::V8::SetCounterFunction(StatsTable::FindLocation);
}
#endif