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

[weinig at apple.com]

The following commit has been merged in the debian/experimental branch:
commit eab070faf3dae66a5690264fa6644097992e2601
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 27 23:56:09 2010 +0000

    Move WKBundle didCreatePage callback to outside the WebPage
    constructor to avoid adoptRef errors.
    
    Reviewed by Gavin Barraclough.
    
    * WebProcess/WebPage/WebPage.cpp:
    (WebKit::WebPage::create):
    (WebKit::WebPage::WebPage):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66279 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 641cb31..d8006d7 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-27  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Gavin Barraclough.
+
+        Move WKBundle didCreatePage callback to outside the WebPage
+        constructor to avoid adoptRef errors.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::create):
+        (WebKit::WebPage::WebPage):
+
 2010-08-27  Brady Eidson  <beidson at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index 2cc69ec..f88941c 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -74,7 +74,12 @@ static WTF::RefCountedLeakCounter webPageCounter("WebPage");
 
 PassRefPtr<WebPage> WebPage::create(uint64_t pageID, const IntSize& viewSize, const WebPreferencesStore& store, const DrawingAreaBase::DrawingAreaInfo& drawingAreaInfo)
 {
-    return adoptRef(new WebPage(pageID, viewSize, store, drawingAreaInfo));
+    RefPtr<WebPage> page = adoptRef(new WebPage(pageID, viewSize, store, drawingAreaInfo));
+
+    if (WebProcess::shared().injectedBundle())
+        WebProcess::shared().injectedBundle()->didCreatePage(page.get());
+
+    return page.release();
 }
 
 WebPage::WebPage(uint64_t pageID, const IntSize& viewSize, const WebPreferencesStore& store, const DrawingAreaBase::DrawingAreaInfo& drawingAreaInfo)
@@ -118,9 +123,6 @@ WebPage::WebPage(uint64_t pageID, const IntSize& viewSize, const WebPreferencesS
     m_mainFrame = WebFrame::createMainFrame(this);
     WebProcess::shared().connection()->send(WebPageProxyMessage::DidCreateMainFrame, m_pageID, CoreIPC::In(m_mainFrame->frameID()));
 
-    if (WebProcess::shared().injectedBundle())
-        WebProcess::shared().injectedBundle()->didCreatePage(this);
-
 #ifndef NDEBUG
     webPageCounter.increment();
 #endif

-- 
WebKit Debian packaging