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

[alex at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 87318fdb06560a92d2d1ffa71ec7751d70acf7d8
Author: alex at webkit.org <alex at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 06:53:40 2010 +0000

    2010-10-04  Alejandro G. Castro  <alex at igalia.com>
    
            Reviewed by Kent Tamura.
    
            Fixed compilation problem added in commit 69082. The interface of
            the function has two parameters with the same name.
    
            * rendering/RenderBlock.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69086 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8805555..c76e3d3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-04  Alejandro G. Castro  <alex at igalia.com>
+
+        Reviewed by Kent Tamura.
+
+        Fixed compilation problem added in commit 69082. The interface of
+        the function has two parameters with the same name.
+
+        * rendering/RenderBlock.h:
+
 2010-10-04  Chris Rogers  <crogers at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/rendering/RenderBlock.h b/WebCore/rendering/RenderBlock.h
index 7c414a9..c569c40 100644
--- a/WebCore/rendering/RenderBlock.h
+++ b/WebCore/rendering/RenderBlock.h
@@ -529,7 +529,7 @@ private:
     void adjustPointToColumnContents(IntPoint&) const;
     void adjustForBorderFit(int x, int& left, int& right) const; // Helper function for borderFitAdjust
 
-    void markLinesDirtyInBlockRange(int logicalTop, int logicalTop, RootInlineBox* highest = 0);
+    void markLinesDirtyInBlockRange(int logicalTop, int logicalBottom, RootInlineBox* highest = 0);
 
     void newLine(EClear);
 

-- 
WebKit Debian packaging