[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit a582b5baef23e802f2ec74bb25603641343752e0
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 11 01:56:49 2010 +0000

    2010-09-10  Balazs Kelemen  <kb at inf.u-szeged.hu>
    
            Reviewed by Andreas Kling.
    
            [Qt] MiniBrowser crashes with multiply windows when closing one of them
            https://bugs.webkit.org/show_bug.cgi?id=45536
    
            * UIProcess/API/qt/qwkpage.cpp:
            (QWKPage::~QWKPage): Do not call WKPageTerminate since this is designed
            to terminate the web process. We are correctly detaching the page without
            this call anyway.
    2010-09-10  Balazs Kelemen  <kb at inf.u-szeged.hu>
    
            Reviewed by Andreas Kling.
    
            [Qt] MiniBrowser crashes with multiply windows when closing one of them
            https://bugs.webkit.org/show_bug.cgi?id=45536
    
            * MiniBrowser/qt/BrowserView.cpp:
            (BrowserView::BrowserView): Reference the context instead of adopting it
            because it can be shared across different views.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67266 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 25d8cbc..b53b30d 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-10  Balazs Kelemen  <kb at inf.u-szeged.hu>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] MiniBrowser crashes with multiply windows when closing one of them
+        https://bugs.webkit.org/show_bug.cgi?id=45536
+
+        * UIProcess/API/qt/qwkpage.cpp:
+        (QWKPage::~QWKPage): Do not call WKPageTerminate since this is designed
+        to terminate the web process. We are correctly detaching the page without
+        this call anyway.
+
 2010-09-10  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index 7d7dabe..c72c267 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -266,7 +266,6 @@ QWKPage::QWKPage(WKPageNamespaceRef namespaceRef)
 QWKPage::~QWKPage()
 {
     delete d;
-    WKPageTerminate(pageRef());
 }
 
 void QWKPage::timerEvent(QTimerEvent* ev)
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 11f87c9..1b21784 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-10  Balazs Kelemen  <kb at inf.u-szeged.hu>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] MiniBrowser crashes with multiply windows when closing one of them
+        https://bugs.webkit.org/show_bug.cgi?id=45536
+
+        * MiniBrowser/qt/BrowserView.cpp:
+        (BrowserView::BrowserView): Reference the context instead of adopting it
+        because it can be shared across different views.
+
 2010-09-10  Tony Chang  <tony at chromium.org>
 
         Unreviewed, rolling out r67241.
diff --git a/WebKitTools/MiniBrowser/qt/BrowserView.cpp b/WebKitTools/MiniBrowser/qt/BrowserView.cpp
index a5e06ec..ce101c2 100644
--- a/WebKitTools/MiniBrowser/qt/BrowserView.cpp
+++ b/WebKitTools/MiniBrowser/qt/BrowserView.cpp
@@ -39,9 +39,8 @@ static QWKPage* createNewPage(QWKPage* page)
 BrowserView::BrowserView(QWidget* parent)
     : QGraphicsView(parent)
     , m_item(0)
+    , m_context(WKContextGetSharedProcessContext())
 {
-    m_context.adopt(WKContextGetSharedProcessContext());
-
     WKRetainPtr<WKPageNamespaceRef> pageNamespace(AdoptWK, WKPageNamespaceCreate(m_context.get()));
 
     m_item = new QGraphicsWKView(pageNamespace.get(), QGraphicsWKView::Simple, 0);

-- 
WebKit Debian packaging