diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-11-04 07:13:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-04 07:13:31 -0700 |
| commit | 6be0d5f748267d7691c09a458651f0a2d8f9affc (patch) | |
| tree | 6cf3c3e5945419874ce51c104259f185585628b4 /WebKit/android/jni/WebCoreFrameBridge.cpp | |
| parent | a46f4f6ddce615b72109b5f6191640cff7ab4c4a (diff) | |
| parent | 96598f2d0549b4246e6fe1a888fff13e5e42fc48 (diff) | |
| download | external_webkit-6be0d5f748267d7691c09a458651f0a2d8f9affc.zip external_webkit-6be0d5f748267d7691c09a458651f0a2d8f9affc.tar.gz external_webkit-6be0d5f748267d7691c09a458651f0a2d8f9affc.tar.bz2 | |
Merge "Hook chromium logging up in WebKit"
Diffstat (limited to 'WebKit/android/jni/WebCoreFrameBridge.cpp')
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index c4d07a4..04db4a9 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -33,6 +33,7 @@ #include "Cache.h" #include "Chrome.h" #include "ChromeClientAndroid.h" +#include "ChromiumLogging.h" #include "ContextMenuClientAndroid.h" #include "DeviceMotionClientAndroid.h" #include "DeviceOrientationClientAndroid.h" @@ -960,6 +961,11 @@ static void CreateFrame(JNIEnv* env, jobject obj, jobject javaview, jobject jAss { ScriptController::initializeThreading(); +#if USE(CHROME_NETWORK_STACK) + // Initialize chromium logging, needs to be done before any chromium code is called + initChromiumLogging(); +#endif + #ifdef ANDROID_INSTRUMENT #if USE(V8) V8Counters::initCounters(); |