[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 0c1b0c5ce142dea734fc00be64dcf73d8151d58a
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 18 20:57:17 2010 +0000

    Address review comments on the last change
    
    * rendering/TrailingFloatsRootInlineBox.h:
    (WebCore::TrailingFloatsRootInlineBox::TrailingFloatsRootInlineBox):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53421 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 785ac12..9789ae3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,12 @@
 2010-01-18  Dan Bernstein  <mitz at apple.com>
 
+        Address review comments on the last change
+
+        * rendering/TrailingFloatsRootInlineBox.h:
+        (WebCore::TrailingFloatsRootInlineBox::TrailingFloatsRootInlineBox):
+
+2010-01-18  Dan Bernstein  <mitz at apple.com>
+
         Reviewed by Darin Adler.
 
         <rdar://problem/6892207> REGRESSION (Safari 4): Menus at sciencedirect.com push the main article context down the page
diff --git a/WebCore/rendering/TrailingFloatsRootInlineBox.h b/WebCore/rendering/TrailingFloatsRootInlineBox.h
index 9ceff10..0cba7fc 100644
--- a/WebCore/rendering/TrailingFloatsRootInlineBox.h
+++ b/WebCore/rendering/TrailingFloatsRootInlineBox.h
@@ -32,11 +32,12 @@ namespace WebCore {
 
 class TrailingFloatsRootInlineBox : public RootInlineBox {
 public:
-    TrailingFloatsRootInlineBox(RenderObject* obj) : RootInlineBox(obj)
+    TrailingFloatsRootInlineBox(RenderObject* object) : RootInlineBox(object)
     {
         setHasVirtualHeight();
     }
 
+private:
     virtual int virtualHeight() const { return 0; }
 };
 

-- 
WebKit Debian packaging