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

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit bd71f431729848456946c493b41875a802d250af
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 24 22:11:29 2010 +0000

    Add WebPageProxy::creationParameters
    
    Fixes <http://webkit.org/b/46510> WebPageProxy has a bunch of
    duplicated WebPageCreationParameters code
    
    Reviewed by Anders Carlsson.
    
    * UIProcess/WebPageProxy.cpp:
    (WebKit::WebPageProxy::initializeWebPage):
    (WebKit::WebPageProxy::reinitializeWebPage):
    (WebKit::WebPageProxy::didReceiveSyncMessage):
    Use creationParameters.
    
    (WebKit::WebPageProxy::creationParameters):
    * UIProcess/WebPageProxy.h:
    Added creationParameters.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68297 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index ca4ef3e..12a1313 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,24 @@
 2010-09-24  Adam Roben  <aroben at apple.com>
 
+        Add WebPageProxy::creationParameters
+
+        Fixes <http://webkit.org/b/46510> WebPageProxy has a bunch of
+        duplicated WebPageCreationParameters code
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::initializeWebPage):
+        (WebKit::WebPageProxy::reinitializeWebPage):
+        (WebKit::WebPageProxy::didReceiveSyncMessage):
+        Use creationParameters.
+
+        (WebKit::WebPageProxy::creationParameters):
+        * UIProcess/WebPageProxy.h:
+        Added creationParameters.
+
+2010-09-24  Adam Roben  <aroben at apple.com>
+
         Make WebPage::create take a WebPageCreationParameter struct
 
         It only makes sense, after all.
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index 4757d82..9ba516c 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -155,11 +155,7 @@ void WebPageProxy::initializeWebPage(const IntSize& size)
 
     ASSERT(m_drawingArea);
 
-    WebPageCreationParameters parameters;
-    parameters.viewSize = size;
-    parameters.store = pageNamespace()->context()->preferences()->store();
-    parameters.drawingAreaInfo = m_drawingArea->info();
-    process()->send(WebProcessMessage::Create, m_pageID, CoreIPC::In(parameters));
+    process()->send(WebProcessMessage::Create, m_pageID, CoreIPC::In(creationParameters(size)));
 }
 
 void WebPageProxy::reinitializeWebPage(const WebCore::IntSize& size)
@@ -169,11 +165,7 @@ void WebPageProxy::reinitializeWebPage(const WebCore::IntSize& size)
 
     ASSERT(m_drawingArea);
 
-    WebPageCreationParameters parameters;
-    parameters.viewSize = size;
-    parameters.store = pageNamespace()->context()->preferences()->store();
-    parameters.drawingAreaInfo = m_drawingArea->info();
-    process()->send(WebProcessMessage::Create, m_pageID, CoreIPC::In(parameters));
+    process()->send(WebProcessMessage::Create, m_pageID, CoreIPC::In(creationParameters(size)));
 }
 
 void WebPageProxy::close()
@@ -893,9 +885,7 @@ void WebPageProxy::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIP
             WebPageCreationParameters parameters;
             if (newPage) {
                 // FIXME: Pass the real size.
-                parameters.viewSize = IntSize(100, 100);
-                parameters.store = newPage->pageNamespace()->context()->preferences()->store();
-                parameters.drawingAreaInfo = newPage->drawingArea()->info();
+                parameters = newPage->creationParameters(IntSize(100, 100));
                 reply->encode(CoreIPC::In(newPage->pageID(), parameters));
             } else {
                 reply->encode(CoreIPC::In(static_cast<uint64_t>(0), parameters));
@@ -1354,6 +1344,15 @@ void WebPageProxy::processDidRevive()
     m_pageClient->processDidRevive();
 }
 
+WebPageCreationParameters WebPageProxy::creationParameters(const IntSize& size) const
+{
+    WebPageCreationParameters parameters;
+    parameters.viewSize = size;
+    parameters.store = pageNamespace()->context()->preferences()->store();
+    parameters.drawingAreaInfo = m_drawingArea->info();
+    return parameters;
+}
+
 #if USE(ACCELERATED_COMPOSITING)
 void WebPageProxy::didEnterAcceleratedCompositing()
 {
diff --git a/WebKit2/UIProcess/WebPageProxy.h b/WebKit2/UIProcess/WebPageProxy.h
index 91635eb..98029aa 100644
--- a/WebKit2/UIProcess/WebPageProxy.h
+++ b/WebKit2/UIProcess/WebPageProxy.h
@@ -76,6 +76,7 @@ class WebProcessProxy;
 class WebURLRequest;
 class WebWheelEvent;
 struct WebNavigationDataStore;
+struct WebPageCreationParameters;
 
 typedef GenericCallback<WKStringRef, StringImpl*> FrameSourceCallback;
 typedef GenericCallback<WKStringRef, StringImpl*> RenderTreeExternalRepresentationCallback;
@@ -260,6 +261,8 @@ private:
     void didGetRenderTreeExternalRepresentation(const String&, uint64_t);
     void didGetSourceForFrame(const String&, uint64_t);
 
+    WebPageCreationParameters creationParameters(const WebCore::IntSize&) const;
+
 #if USE(ACCELERATED_COMPOSITING)
     void didChangeAcceleratedCompositing(bool compositing);
 #endif    

-- 
WebKit Debian packaging