summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
authorIain Merrick <husky@google.com>2010-09-14 14:13:01 +0100
committerIain Merrick <husky@google.com>2010-09-14 14:13:01 +0100
commit6f3ebb20ad2b62782db75f716367d7b1fe5f3fce (patch)
treead43d45df77d101e046962caffcbcf1bca1c309f /WebCore
parent7f2a883e6aacf727dc60d0eb38622ca99826a75f (diff)
downloadexternal_webkit-6f3ebb20ad2b62782db75f716367d7b1fe5f3fce.zip
external_webkit-6f3ebb20ad2b62782db75f716367d7b1fe5f3fce.tar.gz
external_webkit-6f3ebb20ad2b62782db75f716367d7b1fe5f3fce.tar.bz2
Fix prototype for V8Proxy::compileScriptInternal
Looks like this was broken in the last WebKit merge. It's only used when compiling with #define ANDROID_INSTRUMENT. Change-Id: Idc6d879cf733f84122c3b3f0608d8df1598eff36
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/bindings/v8/V8Proxy.cpp2
-rw-r--r--WebCore/bindings/v8/V8Proxy.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/bindings/v8/V8Proxy.cpp b/WebCore/bindings/v8/V8Proxy.cpp
index c661db4..b9e4b7f 100644
--- a/WebCore/bindings/v8/V8Proxy.cpp
+++ b/WebCore/bindings/v8/V8Proxy.cpp
@@ -249,7 +249,7 @@ v8::Handle<v8::Script> V8Proxy::compileScript(v8::Handle<v8::String> code, const
#ifdef ANDROID_INSTRUMENT
{
android::TimeCounter::start(android::TimeCounter::JavaScriptParseTimeCounter);
- v8::Handle<v8::Script> script = compileScriptInternal(code, fileName, baseLine);
+ v8::Handle<v8::Script> script = compileScriptInternal(code, fileName, baseLine, scriptData);
android::TimeCounter::record(android::TimeCounter::JavaScriptParseTimeCounter, __FUNCTION__);
return script;
}
diff --git a/WebCore/bindings/v8/V8Proxy.h b/WebCore/bindings/v8/V8Proxy.h
index ca3920b..4d2404f 100644
--- a/WebCore/bindings/v8/V8Proxy.h
+++ b/WebCore/bindings/v8/V8Proxy.h
@@ -295,7 +295,7 @@ namespace WebCore {
static v8::Handle<v8::Script> compileScript(v8::Handle<v8::String> code, const String& fileName, int baseLine, v8::ScriptData* = 0);
#ifdef ANDROID_INSTRUMENT
- static v8::Handle<v8::Script> compileScriptInternal(v8::Handle<v8::String> code, const String& fileName, int baseLine);
+ static v8::Handle<v8::Script> compileScriptInternal(v8::Handle<v8::String> code, const String& fileName, int baseLine, v8::ScriptData* scriptData);
#endif
// If the exception code is different from zero, a DOM exception is