commit 34e9989872e19b60f1ac2b0c49f6b795f102fb1e
author Anders Fredlund <anders.fredlund@sonymobile.com> Tue Oct 16 12:44:41 2012 +0200
committer Johan Redestig <johan.redestig@sonymobile.com> Mon Dec 03 15:06:27 2012 +0100
tree e7a44b2eed8977a1f1b3edf02599c65daf5d5c7e
parent e1e9db52f8df0681114665b56368f7b19449ee33

Fix leak of inspectorClient when INSPECTOR disabled

WebKit PageClient api has undefined memory management. It seems
to take custody of the parameters only if it wants to use it.
Thus, only allocate inspectorClient if needed.

Change-Id: Ibae7e683ec0c9553845c482b52dab7fad94e4398

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;