[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[tonikitoo at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 08ac31d1065223be50027bd3dd4ec68064f32e32
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 17 03:54:56 2009 +0000

    [Qt] QGLauncher leaks WebPage object
    https://bugs.webkit.org/show_bug.cgi?id=30465
    
    Patch by Antonio Gomes <tonikitoo at webkit.org> on 2009-10-16
    Reviewed by Simon Hausmann.
    
    Make 'SharedScene' to own 'WebPage' reference and delete it at its destructor.
    
    * Api/qwebpage.cpp:
    (QWebPage::view):
    * Api/qwebpage_p.h:
    * QGVLauncher/main.cpp:
    (SharedScene::SharedScene):
    (SharedScene::~SharedScene):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49730 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index d4e962d..e1c576c 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -2,6 +2,22 @@
 
         Reviewed by Simon Hausmann.
 
+        [Qt] QGLauncher leaks WebPage object
+        https://bugs.webkit.org/show_bug.cgi?id=30465
+
+        Make 'SharedScene' to own 'WebPage' reference and delete it at its destructor.
+
+        * Api/qwebpage.cpp:
+        (QWebPage::view):
+        * Api/qwebpage_p.h:
+        * QGVLauncher/main.cpp:
+        (SharedScene::SharedScene):
+        (SharedScene::~SharedScene):
+
+2009-10-16  Antonio Gomes  <tonikitoo at webkit.org>
+
+        Reviewed by Simon Hausmann.
+
         [Qt] "dangling" pointer to qwebpage's view object can leads QGLauncher to crash
         https://bugs.webkit.org/show_bug.cgi?id=30459
 
diff --git a/WebKit/qt/QGVLauncher/main.cpp b/WebKit/qt/QGVLauncher/main.cpp
index d75ea75..5800b78 100644
--- a/WebKit/qt/QGVLauncher/main.cpp
+++ b/WebKit/qt/QGVLauncher/main.cpp
@@ -125,9 +125,8 @@ public:
     SharedScene()
     {
         m_scene = new QGraphicsScene;
-
         m_item = new QGraphicsWebView;
-        m_item->setPage(new WebPage());
+        m_item->setPage((m_page = new WebPage));
 
         m_scene->addItem(m_item);
         m_scene->setActiveWindow(m_item);
@@ -137,6 +136,7 @@ public:
     {
         delete m_item;
         delete m_scene;
+        delete m_page;
     }
 
     QGraphicsScene* scene() const { return m_scene; }
@@ -145,6 +145,7 @@ public:
 private:
     QGraphicsScene* m_scene;
     QGraphicsWebView* m_item;
+    WebPage* m_page;
 };
 
 

-- 
WebKit Debian packaging