[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

commit-queue at webkit.org commit-queue at webkit.org
Sun Feb 20 23:15:50 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 6531f746e193ede6e398877ea6b66ebe858e63ee
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 19 14:01:13 2011 +0000

    2011-01-19  Aparna Nandyal  <aparna.nand at wipro.com>
    
            Reviewed by Andreas Kling.
    
            [Qt] QtTestBrowser crashes when closing if Facebook is opened
            https://bugs.webkit.org/show_bug.cgi?id=52554
    
            QtNetworkAccessManager is created in a thread and set as
            member variable in QWebPage. When the thread is destroyed
            the object is still used. So fix will set the object to
            NULL once the thread is destroyed.
    
            * QtTestBrowser/launcherwindow.cpp:
            (LauncherWindow::~LauncherWindow):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76119 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index f87b9d1..70dbef3 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,18 @@
+2011-01-19  Aparna Nandyal  <aparna.nand at wipro.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] QtTestBrowser crashes when closing if Facebook is opened
+        https://bugs.webkit.org/show_bug.cgi?id=52554
+        
+        QtNetworkAccessManager is created in a thread and set as
+        member variable in QWebPage. When the thread is destroyed
+        the object is still used. So fix will set the object to
+        NULL once the thread is destroyed.
+
+        * QtTestBrowser/launcherwindow.cpp:
+        (LauncherWindow::~LauncherWindow):
+
 2011-01-18  Maciej Stachowiak  <mjs at apple.com>
 
         Rubber stamped by Csaba Osztrogonac
diff --git a/Tools/QtTestBrowser/launcherwindow.cpp b/Tools/QtTestBrowser/launcherwindow.cpp
index 8a4b884..a21b92c 100644
--- a/Tools/QtTestBrowser/launcherwindow.cpp
+++ b/Tools/QtTestBrowser/launcherwindow.cpp
@@ -56,6 +56,9 @@ LauncherWindow::LauncherWindow(WindowOptions* data, QGraphicsScene* sharedScene)
 LauncherWindow::~LauncherWindow()
 {
     grabZoomKeys(false);
+
+    if (page())
+        page()->setQnamThreaded(false);
 }
 
 void LauncherWindow::init()

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list