commit fd7652c93bfdf31ea3273c465d524391a5a0c9f6
author John Reck <jreck@android.com> Fri Dec 07 12:21:58 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Dec 07 12:21:58 2012 -0800
tree df3a820935509dc882e989942ce40624e24f3262
parent a2c5f805f838b31fbbeb248aa021e0cf0c758d7b
parent b40f5d724d7ee13d54246f5794375c3c9945f90a

am b40f5d72: am 2524fd28: Merge "Fix leak of inspectorClient when INSPECTOR disabled"

* commit 'b40f5d724d7ee13d54246f5794375c3c9945f90a':
  Fix leak of inspectorClient when INSPECTOR disabled

Source/WebKit/android/jni/WebCoreFrameBridge.cpp

diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
index ecda831..9df4dbd 100644
--- a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -1103,7 +1103,9 @@
     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;