diff options
| author | John Reck <jreck@android.com> | 2012-12-07 12:18:41 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-07 12:18:41 -0800 |
| commit | b40f5d724d7ee13d54246f5794375c3c9945f90a (patch) | |
| tree | 81e29deb7034825ddb0ea9ec9468bc447e0b7a87 | |
| parent | 09e90f537aaeec9a49c9d199826d290671709d59 (diff) | |
| parent | 2524fd2870eca69549fca08c055ca347d1453ed0 (diff) | |
| download | webkit-b40f5d724d7ee13d54246f5794375c3c9945f90a.tar.gz | |
am 2524fd28: Merge "Fix leak of inspectorClient when INSPECTOR disabled"
* commit '2524fd2870eca69549fca08c055ca347d1453ed0':
Fix leak of inspectorClient when INSPECTOR disabled
| -rw-r--r-- | Source/WebKit/android/jni/WebCoreFrameBridge.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp index ecda8316d..9df4dbdc4 100644 --- a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -1103,7 +1103,9 @@ static void CreateFrame(JNIEnv* env, jobject obj, jobject javaview, jobject jAss pageClients.contextMenuClient = new ContextMenuClientAndroid; pageClients.editorClient = editorC; pageClients.dragClient = new DragClientAndroid; +#if ENABLE(INSPECTOR) pageClients.inspectorClient = new InspectorClientAndroid; +#endif pageClients.deviceMotionClient = deviceMotionC; pageClients.deviceOrientationClient = deviceOrientationC; pageClients.geolocationClient = geolocationC; |