Changeset 70308 in webkit

Timestamp:

Oct 22, 2010 8:35:38 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-10-22 Yi Shen <​yi.4.shen@nokia.com>

Reviewed by Andreas Kling.

[Qt] InspectorClientQt crashes when deleting a qwebpage which has an inspector
​https://bugs.webkit.org/show_bug.cgi?id=48079

• Api/qwebpage.cpp: (QWebPagePrivate::~QWebPagePrivate): (QWebPage::~QWebPage):

Location:

trunk/WebKit/qt

Files:

• Api/qwebpage.cpp (modified) (3 diffs)
• ChangeLog (modified) (1 diff)

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -324 +324 @@
 QWebPagePrivate::~QWebPagePrivate()
 {
+    if (inspector && inspectorIsInternalOnly) {
+        // Since we have to delete an internal inspector,
+        // call setInspector(0) directly to prevent potential crashes
+        setInspector(0);
+    }
 #ifndef QT_NO_CONTEXTMENU
     delete currentContextMenu;
@@ -333 +338 @@
     delete page;
     
+    if (inspector)
+        inspector->setPage(0);
+
 #if ENABLE(NOTIFICATIONS)
     NotificationPresenterClientQt::notificationPresenter()->removeClient();
@@ -1760 +1768 @@
     if (loader)
         loader->detachFromParent();
-    if (d->inspector) {
-        // Since we have to delete an internal inspector,
-        // call setInspector(0) directly to prevent potential crashes
-        if (d->inspectorIsInternalOnly)
-            d->setInspector(0);
-        else
-            d->inspector->setPage(0);
-    }
     delete d;
 }

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-10-22  Yi Shen  <yi.4.shen@nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] InspectorClientQt crashes when deleting a qwebpage which has an inspector
+        https://bugs.webkit.org/show_bug.cgi?id=48079
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::~QWebPagePrivate):
+        (QWebPage::~QWebPage):
+
 2010-10-22  Benjamin Poulain  <benjamin.poulain@nokia.com>