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

[simon.fraser at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 1fb7a73de058943be639420b59a6e634f6244dfe
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 11 00:31:49 2010 +0000

    2010-11-10  Simon Fraser  <simon.fraser at apple.com>
    
            Reviewed by Anders Carlsson.
    
            Misc drawing area cleanup
            https://bugs.webkit.org/show_bug.cgi?id=49349
    
            * UIProcess/LayerBackedDrawingAreaProxy.cpp:
            (WebKit::LayerBackedDrawingAreaProxy::setSize):
            (WebKit::LayerBackedDrawingAreaProxy::setPageIsVisible):
            (WebKit::LayerBackedDrawingAreaProxy::update):
            Call process()->send() instead of process()->connection()->send() in case
            the web process has not been launched yet.
    
            * WebProcess/WebPage/WebPage.cpp:
            (WebKit::WebPage::WebPage): Delay creation of the drawing area
            until after other WebPage state has been initialized, in case
            the DrawingArea creation needs to call back to the WebPage.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71782 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index ebacff7..29ab713 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,24 @@
 2010-11-10  Simon Fraser  <simon.fraser at apple.com>
 
+        Reviewed by Anders Carlsson.
+
+        Misc drawing area cleanup
+        https://bugs.webkit.org/show_bug.cgi?id=49349
+        
+        * UIProcess/LayerBackedDrawingAreaProxy.cpp:
+        (WebKit::LayerBackedDrawingAreaProxy::setSize):
+        (WebKit::LayerBackedDrawingAreaProxy::setPageIsVisible):
+        (WebKit::LayerBackedDrawingAreaProxy::update):
+        Call process()->send() instead of process()->connection()->send() in case
+        the web process has not been launched yet.
+        
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::WebPage): Delay creation of the drawing area
+        until after other WebPage state has been initialized, in case
+        the DrawingArea creation needs to call back to the WebPage.
+
+2010-11-10  Simon Fraser  <simon.fraser at apple.com>
+
         Reviewed by Adam Roben.
 
         Push m_viewSize down to DrawingAreaProxy base class
diff --git a/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.cpp b/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.cpp
index f90ed46..5348882 100644
--- a/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.cpp
+++ b/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.cpp
@@ -79,7 +79,7 @@ void LayerBackedDrawingAreaProxy::setSize(const IntSize& viewSize)
     m_isWaitingForDidSetFrameNotification = true;
 
     page->process()->responsivenessTimer()->start();
-    page->process()->connection()->send(DrawingAreaMessage::SetSize, page->pageID(), CoreIPC::In(info().id, viewSize));
+    page->process()->send(DrawingAreaMessage::SetSize, page->pageID(), CoreIPC::In(info().id, viewSize));
 }
 
 #if !PLATFORM(MAC)
@@ -101,12 +101,12 @@ void LayerBackedDrawingAreaProxy::setPageIsVisible(bool isVisible)
 
     if (!m_isVisible) {
         // Tell the web process that it doesn't need to paint anything for now.
-        page->process()->connection()->send(DrawingAreaMessage::SuspendPainting, page->pageID(), CoreIPC::In(info().id));
+        page->process()->send(DrawingAreaMessage::SuspendPainting, page->pageID(), CoreIPC::In(info().id));
         return;
     }
     
     // The page is now visible.
-    page->process()->connection()->send(DrawingAreaMessage::ResumePainting, page->pageID(), CoreIPC::In(info().id));
+    page->process()->send(DrawingAreaMessage::ResumePainting, page->pageID(), CoreIPC::In(info().id));
     
     // FIXME: We should request a full repaint here if needed.
 }
@@ -122,7 +122,7 @@ void LayerBackedDrawingAreaProxy::didSetSize()
 void LayerBackedDrawingAreaProxy::update()
 {
     WebPageProxy* page = this->page();
-    page->process()->connection()->send(DrawingAreaMessage::DidUpdate, page->pageID(), CoreIPC::In(info().id));
+    page->process()->send(DrawingAreaMessage::DidUpdate, page->pageID(), CoreIPC::In(info().id));
 }
 
 void LayerBackedDrawingAreaProxy::didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments)
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index 1dfb376..6058274 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -105,7 +105,6 @@ PassRefPtr<WebPage> WebPage::create(uint64_t pageID, const WebPageCreationParame
 
 WebPage::WebPage(uint64_t pageID, const WebPageCreationParameters& parameters)
     : m_viewSize(parameters.viewSize)
-    , m_drawingArea(DrawingArea::create(parameters.drawingAreaInfo.type, parameters.drawingAreaInfo.id, this))
     , m_isInRedo(false)
     , m_isClosed(false)
 #if PLATFORM(MAC)
@@ -134,6 +133,8 @@ WebPage::WebPage(uint64_t pageID, const WebPageCreationParameters& parameters)
     platformInitialize();
     Settings::setMinDOMTimerInterval(0.004);
 
+    m_drawingArea = DrawingArea::create(parameters.drawingAreaInfo.type, parameters.drawingAreaInfo.id, this);
+
     m_mainFrame = WebFrame::createMainFrame(this);
 
 #ifndef NDEBUG

-- 
WebKit Debian packaging