[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 07734305549e3eb677647824d3266a2f6aa752a8
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 12 20:11:47 2011 +0000

    2011-01-12  Anders Carlsson  <andersca at apple.com>
    
            Reviewed by Sam Weinig.
    
            Send Update and DidUpdate messages
            https://bugs.webkit.org/show_bug.cgi?id=52316
    
            * UIProcess/DrawingAreaProxy.h:
            (WebKit::DrawingAreaProxy::update):
            Add empty stub.
    
            * UIProcess/DrawingAreaProxy.messages.in:
            Add Update message.
    
            * UIProcess/DrawingAreaProxyImpl.cpp:
            (WebKit::DrawingAreaProxyImpl::update):
            Just send back a DidUpdate message.
    
            * WebProcess/WebPage/DrawingArea.h:
            (WebKit::DrawingArea::didUpdate):
            Add empty stub.
    
            * WebProcess/WebPage/DrawingArea.messages.in:
            Add DidUpdate message.
    
            * WebProcess/WebPage/DrawingAreaImpl.cpp:
            (WebKit::DrawingAreaImpl::didUpdate):
            Call display().
    
            (WebKit::DrawingAreaImpl::display):
            Send an Update message.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75630 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index adf7ac2..be8a21d 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -2,6 +2,38 @@
 
         Reviewed by Sam Weinig.
 
+        Send Update and DidUpdate messages
+        https://bugs.webkit.org/show_bug.cgi?id=52316
+
+        * UIProcess/DrawingAreaProxy.h:
+        (WebKit::DrawingAreaProxy::update):
+        Add empty stub.
+
+        * UIProcess/DrawingAreaProxy.messages.in:
+        Add Update message.
+
+        * UIProcess/DrawingAreaProxyImpl.cpp:
+        (WebKit::DrawingAreaProxyImpl::update):
+        Just send back a DidUpdate message.
+
+        * WebProcess/WebPage/DrawingArea.h:
+        (WebKit::DrawingArea::didUpdate):
+        Add empty stub.
+
+        * WebProcess/WebPage/DrawingArea.messages.in:
+        Add DidUpdate message.
+
+        * WebProcess/WebPage/DrawingAreaImpl.cpp:
+        (WebKit::DrawingAreaImpl::didUpdate):
+        Call display().
+
+        (WebKit::DrawingAreaImpl::display):
+        Send an Update message.
+
+2011-01-12  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Sam Weinig.
+
         Make the new drawing area actually draw something
         https://bugs.webkit.org/show_bug.cgi?id=52314
 
diff --git a/WebKit2/UIProcess/DrawingAreaProxy.h b/WebKit2/UIProcess/DrawingAreaProxy.h
index fe45da7..a58a0d9 100644
--- a/WebKit2/UIProcess/DrawingAreaProxy.h
+++ b/WebKit2/UIProcess/DrawingAreaProxy.h
@@ -36,7 +36,8 @@ class QPainter;
 namespace WebKit {
 
 class WebPageProxy;
-
+struct UpdateInfo;
+    
 #if PLATFORM(MAC)
 typedef CGContextRef PlatformDrawingContext;
 #elif PLATFORM(WIN)
@@ -87,6 +88,7 @@ protected:
 private:
     // CoreIPC message handlers.
     // FIXME: These should be pure virtual.
+    virtual void update(const UpdateInfo&) { }
     virtual void didSetSize() { }
 };
 
diff --git a/WebKit2/UIProcess/DrawingAreaProxy.messages.in b/WebKit2/UIProcess/DrawingAreaProxy.messages.in
index 00c2ce4..7e340d4 100644
--- a/WebKit2/UIProcess/DrawingAreaProxy.messages.in
+++ b/WebKit2/UIProcess/DrawingAreaProxy.messages.in
@@ -21,5 +21,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 messages -> DrawingAreaProxy {
+    Update(WebKit::UpdateInfo updateInfo)
     DidSetSize()
 }
diff --git a/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp b/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
index e886c3c..3a309bc 100644
--- a/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
+++ b/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
@@ -85,6 +85,13 @@ void DrawingAreaProxyImpl::detachCompositingContext()
     ASSERT_NOT_REACHED();
 }
 
+void DrawingAreaProxyImpl::update(const UpdateInfo&)
+{
+    // FIXME: Incorporate the update.
+
+    m_webPageProxy->process()->send(Messages::DrawingArea::DidUpdate(), m_webPageProxy->pageID());
+}
+
 void DrawingAreaProxyImpl::didSetSize()
 {
 }
diff --git a/WebKit2/UIProcess/DrawingAreaProxyImpl.h b/WebKit2/UIProcess/DrawingAreaProxyImpl.h
index 0659b42..32ab4e1 100644
--- a/WebKit2/UIProcess/DrawingAreaProxyImpl.h
+++ b/WebKit2/UIProcess/DrawingAreaProxyImpl.h
@@ -48,6 +48,7 @@ private:
     virtual void detachCompositingContext();
 
     // CoreIPC message handlers
+    virtual void update(const UpdateInfo&);
     virtual void didSetSize();
     
     void sendSetSize();
diff --git a/WebKit2/WebProcess/WebPage/DrawingArea.h b/WebKit2/WebProcess/WebPage/DrawingArea.h
index 4ccc88e..e6ad9fe 100644
--- a/WebKit2/WebProcess/WebPage/DrawingArea.h
+++ b/WebKit2/WebProcess/WebPage/DrawingArea.h
@@ -80,6 +80,7 @@ private:
     // CoreIPC message handlers.
     // FIXME: These should be pure virtual.
     virtual void setSize(const WebCore::IntSize&) { }
+    virtual void didUpdate() { }
 };
 
 } // namespace WebKit
diff --git a/WebKit2/WebProcess/WebPage/DrawingArea.messages.in b/WebKit2/WebProcess/WebPage/DrawingArea.messages.in
index 9fd38e2..6c628fb 100644
--- a/WebKit2/WebProcess/WebPage/DrawingArea.messages.in
+++ b/WebKit2/WebProcess/WebPage/DrawingArea.messages.in
@@ -22,4 +22,5 @@
 
 messages -> DrawingArea {
     SetSize(WebCore::IntSize size)
+    DidUpdate()    
 }
diff --git a/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp b/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp
index 32b47d5..55df966 100644
--- a/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp
+++ b/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp
@@ -106,6 +106,14 @@ void DrawingAreaImpl::setSize(const IntSize& size)
     m_webPage->send(Messages::DrawingAreaProxy::DidSetSize());
 }
 
+void DrawingAreaImpl::didUpdate()
+{
+    m_isWaitingForDidUpdate = false;
+
+    // Display if needed.
+    display();
+}
+
 void DrawingAreaImpl::scheduleDisplay()
 {
     if (m_isWaitingForDidUpdate)
@@ -128,7 +136,8 @@ void DrawingAreaImpl::display()
     UpdateInfo updateInfo;
     display(updateInfo);
 
-    // FIXME: Send over the updateInfo struct.
+    m_webPage->send(Messages::DrawingAreaProxy::Update(updateInfo));
+    m_isWaitingForDidUpdate = true;
 }
 
 void DrawingAreaImpl::display(UpdateInfo& updateInfo)
diff --git a/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h b/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h
index df97857..da5a132 100644
--- a/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h
+++ b/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h
@@ -54,6 +54,7 @@ private:
 
     // CoreIPC message handlers.
     virtual void setSize(const WebCore::IntSize&);
+    virtual void didUpdate();
 
     void scheduleDisplay();
     void display();

-- 
WebKit Debian packaging