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

[mitz at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 26f5ffbdb9c18d9d760cfeba47b6ad290a5f3142
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 2 18:20:25 2010 +0000

    Remove unused methods and member variables from AutoTableLayout.
    
    Reviewed by Anders Carlsson.
    
    * rendering/AutoTableLayout.cpp:
    (WebCore::AutoTableLayout::AutoTableLayout): Removed initialization of m_percentagesDirty
    and m_totalPercent.
    (WebCore::AutoTableLayout::fullRecalc): Removed setting of m_percentagesDirty.
    (WebCore::AutoTableLayout::calcPercentages): Removed.
    * rendering/AutoTableLayout.h: Removed totalPercent(), m_percentagesDirty, and m_totalPercent.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71138 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 803f9f3..7ff68db 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-02  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        Remove unused methods and member variables from AutoTableLayout.
+
+        * rendering/AutoTableLayout.cpp:
+        (WebCore::AutoTableLayout::AutoTableLayout): Removed initialization of m_percentagesDirty
+        and m_totalPercent.
+        (WebCore::AutoTableLayout::fullRecalc): Removed setting of m_percentagesDirty.
+        (WebCore::AutoTableLayout::calcPercentages): Removed.
+        * rendering/AutoTableLayout.h: Removed totalPercent(), m_percentagesDirty, and m_totalPercent.
+
 2010-11-02  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebCore/rendering/AutoTableLayout.cpp b/WebCore/rendering/AutoTableLayout.cpp
index 1dcdeb8..55a4afc 100644
--- a/WebCore/rendering/AutoTableLayout.cpp
+++ b/WebCore/rendering/AutoTableLayout.cpp
@@ -34,9 +34,7 @@ namespace WebCore {
 AutoTableLayout::AutoTableLayout(RenderTable* table)
     : TableLayout(table)
     , m_hasPercent(false)
-    , m_percentagesDirty(true)
     , m_effWidthDirty(true)
-    , m_totalPercent(0)
 {
 }
 
@@ -153,7 +151,6 @@ void AutoTableLayout::recalcColumn(int effCol)
 
 void AutoTableLayout::fullRecalc()
 {
-    m_percentagesDirty = true;
     m_hasPercent = false;
     m_effWidthDirty = true;
 
@@ -766,18 +763,4 @@ void AutoTableLayout::layout()
     m_table->columnPositions()[m_table->columnPositions().size() - 1] = pos;
 }
 
-
-void AutoTableLayout::calcPercentages() const
-{
-    unsigned totalPercent = 0;
-    for (unsigned i = 0; i < m_layoutStruct.size(); i++) {
-        if (m_layoutStruct[i].width.isPercent())
-            totalPercent += m_layoutStruct[i].width.rawValue();
-    }
-    m_totalPercent = totalPercent / percentScaleFactor;
-    m_percentagesDirty = false;
-}
-
-#undef DEBUG_LAYOUT
-
 }
diff --git a/WebCore/rendering/AutoTableLayout.h b/WebCore/rendering/AutoTableLayout.h
index 5726ba6..0e6b77b 100644
--- a/WebCore/rendering/AutoTableLayout.h
+++ b/WebCore/rendering/AutoTableLayout.h
@@ -42,14 +42,6 @@ protected:
     void fullRecalc();
     void recalcColumn(int effCol);
 
-    void calcPercentages() const;
-    int totalPercent() const
-    {
-        if (m_percentagesDirty)
-            calcPercentages();
-        return m_totalPercent;
-    }
-
     int calcEffectiveWidth();
 
     void insertSpanCell(RenderTableCell*);
@@ -75,9 +67,7 @@ protected:
     Vector<Layout, 4> m_layoutStruct;
     Vector<RenderTableCell*, 4> m_spanCells;
     bool m_hasPercent : 1;
-    mutable bool m_percentagesDirty : 1;
     mutable bool m_effWidthDirty : 1;
-    mutable unsigned short m_totalPercent;
 };
 
 } // namespace WebCore

-- 
WebKit Debian packaging