[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 27a0699836fba17840a6d6e43a72b35ddb77fe5e
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 15 14:28:51 2002 +0000

    	Fixed an "unused variable" build breaker. Note that I just
    	commented out the code and put a FIXME, as I know this is code
    	that David has been banging on a lot. This should be either
    	used for real or removed eventually, but I'll leave that for
    	Hyatt.
    
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::layoutBlockChildren):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2324 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 8863e6f..e908b26 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-10-15  Ken Kocienda  <kocienda at apple.com>
+
+	Fixed an "unused variable" build breaker. Note that I just 
+	commented out the code and put a FIXME, as I know this is code
+	that David has been banging on a lot. This should be either
+	used for real or removed eventually, but I'll leave that for 
+	Hyatt.
+
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layoutBlockChildren):
+
 2002-10-14  David Hyatt  <hyatt at apple.com>
 
 	More collapsing margin surgery.  Working on setting up blocks 
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 8863e6f..e908b26 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2002-10-15  Ken Kocienda  <kocienda at apple.com>
+
+	Fixed an "unused variable" build breaker. Note that I just 
+	commented out the code and put a FIXME, as I know this is code
+	that David has been banging on a lot. This should be either
+	used for real or removed eventually, but I'll leave that for 
+	Hyatt.
+
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layoutBlockChildren):
+
 2002-10-14  David Hyatt  <hyatt at apple.com>
 
 	More collapsing margin surgery.  Working on setting up blocks 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8863e6f..e908b26 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2002-10-15  Ken Kocienda  <kocienda at apple.com>
+
+	Fixed an "unused variable" build breaker. Note that I just 
+	commented out the code and put a FIXME, as I know this is code
+	that David has been banging on a lot. This should be either
+	used for real or removed eventually, but I'll leave that for 
+	Hyatt.
+
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layoutBlockChildren):
+
 2002-10-14  David Hyatt  <hyatt at apple.com>
 
 	More collapsing margin surgery.  Working on setting up blocks 
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index e59702b..27aacc0 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -345,7 +345,8 @@ void RenderFlow::layoutBlockChildren( bool relayoutChildren )
         xPos = marginLeft() + m_width - paddingRight() - borderRight();
     }
 
-    bool canCollapseWithChildren = !isPositioned() && !isFloating() && !isTableCell();
+    // FIXME: The following variable appears to be unused.
+    // bool canCollapseWithChildren = !isPositioned() && !isFloating() && !isTableCell();
     
     RenderObject *child = firstChild();
     RenderFlow *prevFlow = 0;

-- 
WebKit Debian packaging