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

[mitz at apple.com]

The following commit has been merged in the debian/experimental branch:
commit b34bbfc628add8687d969c8c1086bb5e67dddd76
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 9 23:02:54 2010 +0000

    Removed an unused variable.
    
    Reviewed by Dave Hyatt.
    
    * rendering/InlineFlowBox.cpp:
    (WebCore::InlineFlowBox::computeLogicalBoxHeights): Removed parentLineHeight.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73653 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a477483..f5b7223 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-09  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        Removed an unused variable.
+
+        * rendering/InlineFlowBox.cpp:
+        (WebCore::InlineFlowBox::computeLogicalBoxHeights): Removed parentLineHeight.
+
 2010-12-09  Darin Adler  <darin at apple.com>
 
         Reviewed by Geoffrey Garen.
diff --git a/WebCore/rendering/InlineFlowBox.cpp b/WebCore/rendering/InlineFlowBox.cpp
index 320a31a..200dfd5 100644
--- a/WebCore/rendering/InlineFlowBox.cpp
+++ b/WebCore/rendering/InlineFlowBox.cpp
@@ -499,7 +499,6 @@ void InlineFlowBox::computeLogicalBoxHeights(int& maxPositionTop, int& maxPositi
 
         if (usedFonts && curr->renderer()->style(m_firstLine)->lineHeight().isNegative()) {
             usedFonts->append(curr->renderer()->style(m_firstLine)->font().primaryFont());
-            Length parentLineHeight = curr->renderer()->parent()->style()->lineHeight();
             bool baselineSet = false;
             baseline = 0;
             int baselineToBottom = 0;

-- 
WebKit Debian packaging