Changeset 56581 in webkit

Timestamp:

Mar 25, 2010 5:24:34 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-25 Yael Aharon <​yael.aharon@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] QtLauncher crashes on Mac OS and Linux when exiting with QGraphicsView mode enabled
​https://bugs.webkit.org/show_bug.cgi?id=35251

Followed the way QWebView registers for the signal QWebPage::destroyed(), to prevent
QGraphicsWebView from referencing QWebPage after it was deleted.

• Api/qgraphicswebview.cpp: (QGraphicsWebViewPrivate::_q_pageDestroyed): (QGraphicsWebView::setPage):
• Api/qgraphicswebview.h:

Location:

trunk/WebKit/qt

Files:

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

trunk/WebKit/qt/Api/qgraphicswebview.cpp

@@ -142 +142 @@
 
     void _q_updateMicroFocus();
+    void _q_pageDestroyed();
 
     QGraphicsWebView* q;
@@ -264 +265 @@
     }
 #endif
+}
+
+void QGraphicsWebViewPrivate::_q_pageDestroyed()
+{
+    page = 0;
+    q->setPage(0);
 }
 
@@ -782 +789 @@
     connect(d->page, SIGNAL(microFocusChanged()),
             this, SLOT(_q_updateMicroFocus()));
+    connect(d->page, SIGNAL(destroyed()),
+            this, SLOT(_q_pageDestroyed()));
 }
 

trunk/WebKit/qt/Api/qgraphicswebview.h

@@ -144 +144 @@
     Q_PRIVATE_SLOT(d, void _q_doLoadFinished(bool success))
     Q_PRIVATE_SLOT(d, void _q_updateMicroFocus())
+    Q_PRIVATE_SLOT(d, void _q_pageDestroyed())
     // we don't want to change the moc based on USE() macro, so this function is here
     // but will be empty if ACCLERATED_COMPOSITING is disabled

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-03-25  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] QtLauncher crashes on Mac OS and Linux when exiting with QGraphicsView mode enabled
+        https://bugs.webkit.org/show_bug.cgi?id=35251
+
+        Followed the way QWebView registers for the signal QWebPage::destroyed(), to prevent
+        QGraphicsWebView from referencing QWebPage after it was deleted.        
+
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::_q_pageDestroyed):
+        (QGraphicsWebView::setPage):
+        * Api/qgraphicswebview.h:
+
 2010-03-25  Kent Hansen  <kent.hansen@nokia.com>