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

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit b88cdaa816f4d6de6b67f0c048af9e2f9729255c
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 28 00:55:29 2010 +0000

    2010-10-27  Kenneth Rohde Christiansen  <kenneth at webkit.org>
    
            Reviewed by Andreas Kling.
    
            Remove the reference to the pageNamespace in the QWKPagePrivate.
            Access it though the WebPageProxy instead which holds a strong
            ref to it.
    
            * UIProcess/API/qt/qwkpage.cpp:
            (QWKPagePrivate::QWKPagePrivate):
            (QWKPage::preferences):
            * UIProcess/API/qt/qwkpage_p.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70734 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index e2149c1..89d3008 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-27  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        Remove the reference to the pageNamespace in the QWKPagePrivate.
+        Access it though the WebPageProxy instead which holds a strong
+        ref to it.
+
+        * UIProcess/API/qt/qwkpage.cpp:
+        (QWKPagePrivate::QWKPagePrivate):
+        (QWKPage::preferences):
+        * UIProcess/API/qt/qwkpage_p.h:
+
 2010-10-27  Enrica Casucci  <enrica at apple.com>
 
         Reviewed by Alexey Proskuryakov.
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index 5027597..5f525bf 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -66,9 +66,8 @@ QWKPagePrivate::QWKPagePrivate(QWKPage* qq, WKPageNamespaceRef namespaceRef)
 {
     initializePlatformStrategiesIfNeeded();
     memset(actions, 0, sizeof(actions));
-    page = toImpl(namespaceRef)->createWebPage();
+    page = toImpl(namespaceRef)->createWebPage(); // Page gets a ref to namespace.
     page->setPageClient(this);
-    pageNamespaceRef = namespaceRef;
     history = QWKHistoryPrivate::createHistory(page->backForwardList());
 }
 
@@ -422,7 +421,7 @@ WKPageRef QWKPage::pageRef() const
 QWKPreferences* QWKPage::preferences() const
 {
     if (!d->preferences) {
-        WKContextRef contextRef = WKPageNamespaceGetContext(d->pageNamespaceRef);
+        WKContextRef contextRef = WKPageNamespaceGetContext(toAPI(d->page->pageNamespace()));
         d->preferences = QWKPreferencesPrivate::createPreferences(contextRef);
     }
 
diff --git a/WebKit2/UIProcess/API/qt/qwkpage_p.h b/WebKit2/UIProcess/API/qt/qwkpage_p.h
index 00ae9bf..73fbe33 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage_p.h
+++ b/WebKit2/UIProcess/API/qt/qwkpage_p.h
@@ -91,7 +91,7 @@ public:
     QWKPreferences* preferences;
 
     RefPtr<WebKit::WebPageProxy> page;
-    WKPageNamespaceRef pageNamespaceRef;
+
     WebCore::ViewportArguments viewportArguments;
 
     QWKPage::CreateNewPageFn createNewPageFn;

-- 
WebKit Debian packaging