commit 2524fd2870eca69549fca08c055ca347d1453ed0
author John Reck <jreck@android.com> Thu Dec 06 10:24:24 2012 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 06 10:24:24 2012 -0800
tree 28e0701e20a662b6a504289c0c2f9654716ac017
parent 1bedf08833861aacd3bc8463332e9d11c3d614a5
parent 34e9989872e19b60f1ac2b0c49f6b795f102fb1e

Merge "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;