[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[darin at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 7424aedec5488192e87c04cba2eecfb7e18b8d17
Author: darin at chromium.org <darin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 8 22:38:39 2010 +0000

    2010-03-08  Michael Nordman  <michaeln at google.com>
    
            Reviewed by Darin Fisher.
    
            Quick fix for a chromium unit test failures around r55675 (repaint refactoring).
            This change restores the tests for empty rects that were deleted.
    
            https://bugs.webkit.org/show_bug.cgi?id=35878
    
            * src/ChromeClientImpl.cpp:
            (WebKit::ChromeClientImpl::invalidateContentsAndWindow):
            * src/WebPopupMenuImpl.cpp:
            (WebKit::WebPopupMenuImpl::invalidateContentsAndWindow):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55683 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 72aa822..491bf6c 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2010-03-08  Michael Nordman  <michaeln at google.com>
+
+        Reviewed by Darin Fisher.
+
+        Quick fix for a chromium unit test failures around r55675 (repaint refactoring).
+        This change restores the tests for empty rects that were deleted.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35878
+
+        * src/ChromeClientImpl.cpp:
+        (WebKit::ChromeClientImpl::invalidateContentsAndWindow):
+        * src/WebPopupMenuImpl.cpp:
+        (WebKit::WebPopupMenuImpl::invalidateContentsAndWindow):
+
 2010-03-02  Adam Treat  <atreat at rim.com>
 
         Reviewed by Dave Hyatt.
diff --git a/WebKit/chromium/src/ChromeClientImpl.cpp b/WebKit/chromium/src/ChromeClientImpl.cpp
index 44e78ac..efd2d38 100644
--- a/WebKit/chromium/src/ChromeClientImpl.cpp
+++ b/WebKit/chromium/src/ChromeClientImpl.cpp
@@ -478,6 +478,8 @@ void ChromeClientImpl::invalidateWindow(const IntRect&, bool)
 
 void ChromeClientImpl::invalidateContentsAndWindow(const IntRect& updateRect, bool /*immediate*/)
 {
+    if (updateRect.isEmpty())
+        return;
     if (m_webView->client())
         m_webView->client()->didInvalidateRect(updateRect);
 }
diff --git a/WebKit/chromium/src/WebPopupMenuImpl.cpp b/WebKit/chromium/src/WebPopupMenuImpl.cpp
index 79919ef..f9da394 100644
--- a/WebKit/chromium/src/WebPopupMenuImpl.cpp
+++ b/WebKit/chromium/src/WebPopupMenuImpl.cpp
@@ -262,6 +262,8 @@ void WebPopupMenuImpl::invalidateWindow(const IntRect&, bool)
 
 void WebPopupMenuImpl::invalidateContentsAndWindow(const IntRect& paintRect, bool /*immediate*/)
 {
+    if (paintRect.isEmpty())
+        return;
     if (m_client)
         m_client->didInvalidateRect(paintRect);
 }

-- 
WebKit Debian packaging