fixed memory leak and thread conflict

Author: AndriyP

inc/extension_qt/qml_web_view_executor.h

@@ -5,6 +5,7 @@
 #include <vector>
 #include <map>
 
+#include "base/memory/scoped_ptr.h"
 #include "webdriver_view_executor.h"
 #include "webdriver_error.h"
 #include "extension_qt/qdeclarativewebview.h"
@@ -134,7 +135,7 @@ class QmlWebViewCmdExecutor : public ViewCmdExecutor {
 #endif
 
 private:
-    QWebkitProxy* webkitProxy_;
+    scoped_ptr<QWebkitProxy> webkitProxy_;
     QDeclarativeWebView* view_;
     QDeclarativeView* container_;
 

inc/extension_qt/web_view_executor.h

@@ -122,7 +122,7 @@ class QWebViewCmdExecutor : public QViewCmdExecutor {
 	QWebView* getView(const ViewId& viewId, Error** error);
 
 private:
-    QWebkitProxy* webkitProxy_;
+    scoped_ptr<QWebkitProxy> webkitProxy_;
     QWebView* view_;
 
     DISALLOW_COPY_AND_ASSIGN(QWebViewCmdExecutor);

src/webdriver/extension_qt/qml_web_view_executor.cc

@@ -23,7 +23,8 @@ namespace webdriver {
         session_->logger().Log(kWarningLogLevel, "checkView - no such qml web view("+view_id_.id()+")"); \
         *error = new Error(kNoSuchWindow); \
         return; \
-    } 
+    } \
+    webkitProxy_.reset(new QWebkitProxy(session_, (view_)?view_->page():NULL));
 
 const ViewType QmlWebViewCmdExecutorCreator::QML_WEB_VIEW_TYPE = 0x23f1;
 
@@ -82,7 +83,7 @@ QmlWebViewCmdExecutor::QmlWebViewCmdExecutor(Session* session, ViewId viewId)
 
     view_ = _getDeclarativeWebView(session, viewId);
     container_ = _getDeclarativeView(session, viewId);
-    webkitProxy_ = new QWebkitProxy(session, (view_)?view_->page():NULL);
+    //webkitProxy_ = new QWebkitProxy(session, (view_)?view_->page():NULL);
 }
 
 QmlWebViewCmdExecutor::~QmlWebViewCmdExecutor() {

src/webdriver/extension_qt/web_view_executor.cc

@@ -39,7 +39,8 @@ namespace webdriver {
         session_->logger().Log(kWarningLogLevel, "checkView - no such web view("+view_id_.id()+")"); \
         *error = new Error(kNoSuchWindow); \
         return; \
-    } 
+    } \
+    webkitProxy_.reset(new QWebkitProxy(session_, (view_)?view_->page():NULL));
 
 const ViewType QWebViewCmdExecutorCreator::WEB_VIEW_TYPE = 0x13f0;
 
@@ -73,7 +74,7 @@ QWebViewCmdExecutor::QWebViewCmdExecutor(Session* session, ViewId viewId)
     : QViewCmdExecutor(session, viewId) {
 
     view_ = QWebViewUtil::getWebView(session_, viewId);
-    webkitProxy_ = new QWebkitProxy(session_, (view_)?view_->page():NULL);
+    //webkitProxy_.reset(new QWebkitProxy(session_, (view_)?view_->page():NULL));
 }
 
 QWebViewCmdExecutor::~QWebViewCmdExecutor() {}