[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[andersca at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 40fe2a8795d8056d471dd4f423a4482270c4d92c
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 11 02:49:48 2011 +0000

    2011-01-10  Anders Carlsson  <andersca at apple.com>
    
            Reviewed by Sam Weinig.
    
            WebPageProxy::creationParameters no longer needs to take a size
            https://bugs.webkit.org/show_bug.cgi?id=52187
    
            WebPageProxy::creationParameters can just ask the page client for the view size now.
    
            * UIProcess/WebInspectorProxy.cpp:
            (WebKit::WebInspectorProxy::createInspectorPage):
            * UIProcess/WebPageProxy.cpp:
            (WebKit::WebPageProxy::initializeWebPage):
            (WebKit::WebPageProxy::reinitializeWebPage):
            (WebKit::WebPageProxy::createNewPage):
            (WebKit::WebPageProxy::creationParameters):
            * UIProcess/WebPageProxy.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75465 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 4b8e6eb..58309ff 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -2,6 +2,24 @@
 
         Reviewed by Sam Weinig.
 
+        WebPageProxy::creationParameters no longer needs to take a size
+        https://bugs.webkit.org/show_bug.cgi?id=52187
+
+        WebPageProxy::creationParameters can just ask the page client for the view size now.
+
+        * UIProcess/WebInspectorProxy.cpp:
+        (WebKit::WebInspectorProxy::createInspectorPage):
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::initializeWebPage):
+        (WebKit::WebPageProxy::reinitializeWebPage):
+        (WebKit::WebPageProxy::createNewPage):
+        (WebKit::WebPageProxy::creationParameters):
+        * UIProcess/WebPageProxy.h:
+
+2011-01-10  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Sam Weinig.
+
         Pass information about the view in the WebPageCreationParameters
         https://bugs.webkit.org/show_bug.cgi?id=52186
 
diff --git a/WebKit2/UIProcess/WebInspectorProxy.cpp b/WebKit2/UIProcess/WebInspectorProxy.cpp
index 396d7d7..dfeff6a 100644
--- a/WebKit2/UIProcess/WebInspectorProxy.cpp
+++ b/WebKit2/UIProcess/WebInspectorProxy.cpp
@@ -170,7 +170,7 @@ void WebInspectorProxy::createInspectorPage(uint64_t& inspectorPageID, WebPageCr
         return;
 
     inspectorPageID = inspectorPage->pageID();
-    inspectorPageParameters = inspectorPage->creationParameters(IntSize(0, 0));
+    inspectorPageParameters = inspectorPage->creationParameters();
 
     inspectorPage->loadURL(inspectorPageURL());
 }
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index 45903da..d029b5e 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -212,7 +212,7 @@ void WebPageProxy::relaunch()
     m_pageClient->didRelaunchProcess();
 }
 
-void WebPageProxy::initializeWebPage(const IntSize& size)
+void WebPageProxy::initializeWebPage()
 {
     if (!isValid()) {
         relaunch();
@@ -222,7 +222,7 @@ void WebPageProxy::initializeWebPage(const IntSize& size)
     m_drawingArea = m_pageClient->createDrawingAreaProxy();
     ASSERT(m_drawingArea);
 
-    process()->send(Messages::WebProcess::CreateWebPage(m_pageID, creationParameters(size)), 0);
+    process()->send(Messages::WebProcess::CreateWebPage(m_pageID, creationParameters()), 0);
 }
 
 void WebPageProxy::reinitializeWebPage(const WebCore::IntSize& size)
@@ -233,7 +233,7 @@ void WebPageProxy::reinitializeWebPage(const WebCore::IntSize& size)
     m_drawingArea = m_pageClient->createDrawingAreaProxy();
     ASSERT(m_drawingArea);
 
-    process()->send(Messages::WebProcess::CreateWebPage(m_pageID, creationParameters(size)), 0);
+    process()->send(Messages::WebProcess::CreateWebPage(m_pageID, creationParameters()), 0);
 }
 
 void WebPageProxy::close()
@@ -1395,7 +1395,7 @@ void WebPageProxy::createNewPage(const WindowFeatures& windowFeatures, uint32_t
     RefPtr<WebPageProxy> newPage = m_uiClient.createNewPage(this, windowFeatures, static_cast<WebEvent::Modifiers>(opaqueModifiers), static_cast<WebMouseEvent::Button>(opaqueMouseButton));
     if (newPage) {
         newPageID = newPage->pageID();
-        newPageParameters = newPage->creationParameters(newPage->drawingArea()->size());
+        newPageParameters = newPage->creationParameters();
     } else
         newPageID = 0;
 }
@@ -2134,11 +2134,11 @@ void WebPageProxy::processDidCrash()
     m_loaderClient.processDidCrash(this);
 }
 
-WebPageCreationParameters WebPageProxy::creationParameters(const IntSize& size) const
+WebPageCreationParameters WebPageProxy::creationParameters() const
 {
     WebPageCreationParameters parameters;
 
-    parameters.viewSize = size;
+    parameters.viewSize = m_pageClient->viewSize();
     parameters.isActive = m_pageClient->isViewWindowActive();
     parameters.isFocused = m_pageClient->isViewFocused();
     parameters.isVisible = m_pageClient->isViewVisible();
diff --git a/WebKit2/UIProcess/WebPageProxy.h b/WebKit2/UIProcess/WebPageProxy.h
index 82cf2d6..622d991 100644
--- a/WebKit2/UIProcess/WebPageProxy.h
+++ b/WebKit2/UIProcess/WebPageProxy.h
@@ -134,7 +134,7 @@ public:
     void initializeUIClient(const WKPageUIClient*);
     void relaunch();
 
-    void initializeWebPage(const WebCore::IntSize&);
+    void initializeWebPage();
     void reinitializeWebPage(const WebCore::IntSize&);
 
     void close();
@@ -303,7 +303,7 @@ public:
     void didChooseFilesForOpenPanel(const Vector<String>&);
     void didCancelForOpenPanel();
 
-    WebPageCreationParameters creationParameters(const WebCore::IntSize&) const;
+    WebPageCreationParameters creationParameters() const;
 
 #if PLATFORM(QT)
     void findZoomableAreaForPoint(const WebCore::IntPoint&);

-- 
WebKit Debian packaging