[webkit-changes] [102142] trunk/Source/WebKit2

Tue, 06 Dec 2011 08:35:55 -0800

Title: [102142] trunk/Source/WebKit2
Revision
102142
Author
commit-qu...@webkit.org
Date
2011-12-06 08:35:41 -0800 (Tue, 06 Dec 2011)

Log Message

[qt][wk2] Tests of QQuickWebView assert in debug builds when destroying QQuickWebViewPrivate
https://bugs.webkit.org/show_bug.cgi?id=73907

Patch by Michael Brüning <michael.brun...@nokia.com> on 2011-12-06
Reviewed by Kenneth Rohde Christiansen.

* UIProcess/API/qt/qquickwebview.cpp: Disconnect signals from
QtViewportInteractionEngine in ~QQuickWebViewPrivate.
(QQuickWebViewPrivate::~QQuickWebViewPrivate):
* UIProcess/API/qt/qquickwebview_p_p.h: Remove empty inline implementation of ~QQuickWebViewPrivate.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (102141 => 102142)


--- trunk/Source/WebKit2/ChangeLog	2011-12-06 16:25:15 UTC (rev 102141)
+++ trunk/Source/WebKit2/ChangeLog	2011-12-06 16:35:41 UTC (rev 102142)
@@ -1,3 +1,15 @@
+2011-12-06  Michael Brüning  <michael.brun...@nokia.com>
+
+        [qt][wk2] Tests of QQuickWebView assert in debug builds when destroying QQuickWebViewPrivate 
+        https://bugs.webkit.org/show_bug.cgi?id=73907 
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * UIProcess/API/qt/qquickwebview.cpp: Disconnect signals from
+        QtViewportInteractionEngine in ~QQuickWebViewPrivate.
+        (QQuickWebViewPrivate::~QQuickWebViewPrivate):
+        * UIProcess/API/qt/qquickwebview_p_p.h: Remove empty inline implementation of ~QQuickWebViewPrivate.
+
 2011-12-06  Kenneth Rohde Christiansen  <kenn...@webkit.org>
 
         [Qt] Add initial support for focusing when entering edit mode.

Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (102141 => 102142)


--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2011-12-06 16:25:15 UTC (rev 102141)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2011-12-06 16:35:41 UTC (rev 102142)
@@ -72,6 +72,12 @@
     pageProxy->init(eventHandler.data());
 }
 
+QQuickWebViewPrivate::~QQuickWebViewPrivate()
+{
+    if (interactionEngine)
+        interactionEngine->disconnect();
+}
+
 void QQuickWebViewPrivate::enableMouseEvents()
 {
     Q_Q(QQuickWebView);

Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h (102141 => 102142)


--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h	2011-12-06 16:25:15 UTC (rev 102141)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h	2011-12-06 16:35:41 UTC (rev 102142)
@@ -49,7 +49,7 @@
 
 public:
     QQuickWebViewPrivate(QQuickWebView* viewport, WKContextRef contextRef = 0, WKPageGroupRef pageGroupRef = 0);
-    virtual ~QQuickWebViewPrivate() { }
+    virtual ~QQuickWebViewPrivate(); 
     void setPageProxy(QtWebPageProxy*);
     void initializeTouch(QQuickWebView* viewport);
     void initializeDesktop(QQuickWebView* viewport);

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to