[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 42abed10a915db2da6c5fff08cb42b94f6d39db9
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 20 22:48:40 2011 +0000

    2011-01-20  Anders Carlsson  <andersca at apple.com>
    
            Reviewed by Adam Roben.
    
            Add a timestamp to UpdateInfo
            https://bugs.webkit.org/show_bug.cgi?id=52844
    
            * Shared/UpdateInfo.cpp:
            (WebKit::UpdateInfo::encode):
            (WebKit::UpdateInfo::decode):
            * Shared/UpdateInfo.h:
            * WebProcess/WebPage/DrawingAreaImpl.cpp:
            (WebKit::DrawingAreaImpl::setSize):
            (WebKit::DrawingAreaImpl::display):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76285 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 76b5f56..e9c3ffb 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,5 +1,20 @@
 2011-01-20  Anders Carlsson  <andersca at apple.com>
 
+        Reviewed by Adam Roben.
+
+        Add a timestamp to UpdateInfo
+        https://bugs.webkit.org/show_bug.cgi?id=52844
+
+        * Shared/UpdateInfo.cpp:
+        (WebKit::UpdateInfo::encode):
+        (WebKit::UpdateInfo::decode):
+        * Shared/UpdateInfo.h:
+        * WebProcess/WebPage/DrawingAreaImpl.cpp:
+        (WebKit::DrawingAreaImpl::setSize):
+        (WebKit::DrawingAreaImpl::display):
+
+2011-01-20  Anders Carlsson  <andersca at apple.com>
+
         Reviewed by Beth Dakin.
 
         Add Connection::waitForAndDispatchImmediately
diff --git a/Source/WebKit2/Shared/UpdateInfo.cpp b/Source/WebKit2/Shared/UpdateInfo.cpp
index f8871d9..182f75b 100644
--- a/Source/WebKit2/Shared/UpdateInfo.cpp
+++ b/Source/WebKit2/Shared/UpdateInfo.cpp
@@ -31,6 +31,7 @@ namespace WebKit {
 
 void UpdateInfo::encode(CoreIPC::ArgumentEncoder* encoder) const
 {
+    encoder->encode(timestamp);
     encoder->encode(viewSize);
     encoder->encode(scrollRect);
     encoder->encode(scrollOffset);
@@ -41,6 +42,8 @@ void UpdateInfo::encode(CoreIPC::ArgumentEncoder* encoder) const
 
 bool UpdateInfo::decode(CoreIPC::ArgumentDecoder* decoder, UpdateInfo& result)
 {
+    if (!decoder->decode(result.timestamp))
+        return false;
     if (!decoder->decode(result.viewSize))
         return false;
     if (!decoder->decode(result.scrollRect))
diff --git a/Source/WebKit2/Shared/UpdateInfo.h b/Source/WebKit2/Shared/UpdateInfo.h
index 7b5454e..4d1f3aa 100644
--- a/Source/WebKit2/Shared/UpdateInfo.h
+++ b/Source/WebKit2/Shared/UpdateInfo.h
@@ -46,6 +46,9 @@ public:
     void encode(CoreIPC::ArgumentEncoder*) const;
     static bool decode(CoreIPC::ArgumentDecoder*, UpdateInfo&);
 
+    // The timestamp of this update.
+    double timestamp;
+
     // The size of the web view.
     WebCore::IntSize viewSize;
 
diff --git a/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp b/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp
index 2c05434..2063bd6 100644
--- a/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp
@@ -143,9 +143,10 @@ void DrawingAreaImpl::setSize(const IntSize& size)
 
     UpdateInfo updateInfo;
 
-    if (m_isPaintingSuspended)
+    if (m_isPaintingSuspended) {
+        updateInfo.timestamp = currentTime();
         updateInfo.viewSize = m_webPage->size();
-    else
+    } else
         display(updateInfo);
 
     m_webPage->send(Messages::DrawingAreaProxy::DidSetSize(updateInfo));
@@ -262,6 +263,7 @@ void DrawingAreaImpl::display(UpdateInfo& updateInfo)
 
     m_webPage->layoutIfNeeded();
     
+    updateInfo.timestamp = currentTime();
     updateInfo.viewSize = m_webPage->size();
     updateInfo.updateRectBounds = bounds;
 

-- 
WebKit Debian packaging