[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit d8edc9b8a71744ae8127f8d57346da4e1cd3faaf
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 10 15:25:11 2011 +0000

    2011-01-10  Andreas Kling  <kling at webkit.org>
    
            Reviewed by Simon Hausmann.
    
            [Qt] [WK2] MiniBrowser does not load pages opened in new windows
            https://bugs.webkit.org/show_bug.cgi?id=52111
    
            When getting a createNewPage() callback from QWKPage, create the
            new page with the same QWKContext as the page that is passed to
            the callback.
    
            * MiniBrowser/qt/BrowserView.h:
            * MiniBrowser/qt/BrowserWindow.cpp:
            (newPageFunction):
            (BrowserWindow::BrowserWindow):
            * MiniBrowser/qt/BrowserWindow.h:
    2011-01-10  Andreas Kling  <kling at webkit.org>
    
            Reviewed by Simon Hausmann.
    
            [Qt] [WK2] MiniBrowser does not load pages opened in new windows
            https://bugs.webkit.org/show_bug.cgi?id=52111
    
            * UIProcess/API/qt/qwkpage.cpp:
            (QWKPage::context): Implement this method.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75373 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 160793e..33fc572 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,22 @@
 2011-01-10  Andreas Kling  <kling at webkit.org>
 
+        Reviewed by Simon Hausmann.
+
+        [Qt] [WK2] MiniBrowser does not load pages opened in new windows
+        https://bugs.webkit.org/show_bug.cgi?id=52111
+
+        When getting a createNewPage() callback from QWKPage, create the
+        new page with the same QWKContext as the page that is passed to
+        the callback.
+
+        * MiniBrowser/qt/BrowserView.h:
+        * MiniBrowser/qt/BrowserWindow.cpp:
+        (newPageFunction):
+        (BrowserWindow::BrowserWindow):
+        * MiniBrowser/qt/BrowserWindow.h:
+
+2011-01-10  Andreas Kling  <kling at webkit.org>
+
         Reviewed by Kenneth Rohde Christiansen.
 
         [Qt] MiniBrowser: Remove superfluous createNewPage() callback
diff --git a/Tools/MiniBrowser/qt/BrowserView.cpp b/Tools/MiniBrowser/qt/BrowserView.cpp
index 4b8bd90..6118f79 100644
--- a/Tools/MiniBrowser/qt/BrowserView.cpp
+++ b/Tools/MiniBrowser/qt/BrowserView.cpp
@@ -30,10 +30,10 @@
 
 #include <QGraphicsScene>
 
-BrowserView::BrowserView(QGraphicsWKView::BackingStoreType backingStoreType, QWidget* parent)
+BrowserView::BrowserView(QGraphicsWKView::BackingStoreType backingStoreType, QWKContext* context, QWidget* parent)
     : QGraphicsView(parent)
     , m_item(0)
-    , m_context(new QWKContext(this))
+    , m_context(context ? context : new QWKContext(this))
 {
     m_item = new QGraphicsWKView(m_context, backingStoreType, 0);
     setScene(new QGraphicsScene(this));
diff --git a/Tools/MiniBrowser/qt/BrowserView.h b/Tools/MiniBrowser/qt/BrowserView.h
index 7680aa7..e19cc59 100644
--- a/Tools/MiniBrowser/qt/BrowserView.h
+++ b/Tools/MiniBrowser/qt/BrowserView.h
@@ -37,7 +37,7 @@ class BrowserView : public QGraphicsView {
     Q_OBJECT
 
 public:
-    BrowserView(QGraphicsWKView::BackingStoreType, QWidget* parent = 0);
+    BrowserView(QGraphicsWKView::BackingStoreType, QWKContext*, QWidget* parent = 0);
     virtual ~BrowserView() { delete m_item; }
 
     void load(const QString&);
diff --git a/Tools/MiniBrowser/qt/BrowserWindow.cpp b/Tools/MiniBrowser/qt/BrowserWindow.cpp
index be08cae..c63c9d6 100644
--- a/Tools/MiniBrowser/qt/BrowserWindow.cpp
+++ b/Tools/MiniBrowser/qt/BrowserWindow.cpp
@@ -28,20 +28,20 @@
 
 #include "BrowserWindow.h"
 
-static QWKPage* newPageFunction(QWKPage*)
+static QWKPage* newPageFunction(QWKPage* page)
 {
-    BrowserWindow* window = new BrowserWindow();
+    BrowserWindow* window = new BrowserWindow(page->context());
     return window->page();
 }
 
 QGraphicsWKView::BackingStoreType BrowserWindow::backingStoreTypeForNewWindow = QGraphicsWKView::Simple;
 
-BrowserWindow::BrowserWindow()
+BrowserWindow::BrowserWindow(QWKContext* context)
 {
     setAttribute(Qt::WA_DeleteOnClose);
 
     m_menu = new QMenuBar();
-    m_browser = new BrowserView(backingStoreTypeForNewWindow);
+    m_browser = new BrowserView(backingStoreTypeForNewWindow, context);
     m_addressBar = new QLineEdit();
 
     m_menu->addAction("New Window", this, SLOT(newWindow()));
diff --git a/Tools/MiniBrowser/qt/BrowserWindow.h b/Tools/MiniBrowser/qt/BrowserWindow.h
index 0010fbe..f984309 100644
--- a/Tools/MiniBrowser/qt/BrowserWindow.h
+++ b/Tools/MiniBrowser/qt/BrowserWindow.h
@@ -38,7 +38,7 @@ class BrowserWindow : public QMainWindow {
     Q_OBJECT
 
 public:
-    BrowserWindow();
+    BrowserWindow(QWKContext* = 0);
     ~BrowserWindow();
     void load(const QString& url);
 
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index a00618e..afb140a 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-10  Andreas Kling  <kling at webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] [WK2] MiniBrowser does not load pages opened in new windows
+        https://bugs.webkit.org/show_bug.cgi?id=52111
+
+        * UIProcess/API/qt/qwkpage.cpp:
+        (QWKPage::context): Implement this method.
+
 2011-01-09  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index e113bd0..f0a0c56 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -488,6 +488,11 @@ WKPageRef QWKPage::pageRef() const
     return toAPI(d->page.get());
 }
 
+QWKContext* QWKPage::context() const
+{
+    return d->context;
+}
+
 QWKPreferences* QWKPage::preferences() const
 {
     if (!d->preferences) {

-- 
WebKit Debian packaging