OSDN Git Service
(root)
/
android-x86
/
external-webkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
14fdbbe
)
Correctly guard V8Counters::initCounters() in WebCoreFrameBridge
author
Steve Block
<steveblock@google.com>
Fri, 5 Feb 2010 12:38:27 +0000
(12:38 +0000)
committer
Steve Block
<steveblock@google.com>
Fri, 5 Feb 2010 12:45:55 +0000
(12:45 +0000)
WebKit/android/jni/WebCoreFrameBridge.cpp
patch
|
blob
|
history
diff --git
a/WebKit/android/jni/WebCoreFrameBridge.cpp
b/WebKit/android/jni/WebCoreFrameBridge.cpp
index
7a998e0
..
086b10d
100644
(file)
--- a/
WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/
WebKit/android/jni/WebCoreFrameBridge.cpp
@@
-857,7
+857,9
@@
static void CreateFrame(JNIEnv* env, jobject obj, jobject javaview, jobject jAss
ScriptController::initializeThreading();
#ifdef ANDROID_INSTRUMENT
+#if USE(V8)
V8Counters::initCounters();
+#endif
TimeCounterAuto counter(TimeCounter::NativeCallbackTimeCounter);
#endif
ChromeClientAndroid* chromeC = new ChromeClientAndroid;