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

[mitz at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 8b7b7ec7b381a5806db11803d449e4c44c84646e
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 16 00:19:13 2010 +0000

    Try to fix the Chromium build.
    
    * rendering/RenderThemeChromiumMac.mm:
    (WebCore::RenderThemeChromiumMac::convertToPaintingRect):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54802 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a06eece..f2b2f83 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-15  Dan Bernstein  <mitz at apple.com>
+
+        Try to fix the Chromium build.
+
+        * rendering/RenderThemeChromiumMac.mm:
+        (WebCore::RenderThemeChromiumMac::convertToPaintingRect):
+
 2010-02-14  Gavin Barraclough  <barraclough at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/rendering/RenderThemeChromiumMac.mm b/WebCore/rendering/RenderThemeChromiumMac.mm
index e274b05..03aab1c 100644
--- a/WebCore/rendering/RenderThemeChromiumMac.mm
+++ b/WebCore/rendering/RenderThemeChromiumMac.mm
@@ -572,7 +572,7 @@ FloatRect RenderThemeChromiumMac::convertToPaintingRect(const RenderObject* inpu
     const RenderObject* renderer = partRenderer;
     while (renderer && renderer != inputRenderer) {
         RenderObject* containingRenderer = renderer->container();
-        offsetFromInputRenderer -= renderer->offsetFromContainer(containingRenderer);
+        offsetFromInputRenderer -= renderer->offsetFromContainer(containingRenderer, IntPoint());
         renderer = containingRenderer;
     }
     // If the input renderer was not a container, something went wrong

-- 
WebKit Debian packaging