Fix an unwitting victim of the kMin->min change. calcBlockMinMaxWidth

        was accidentally renamed to calcBlominMaxWidth.

        * rendering/RenderBlock.cpp:
        (WebCore::RenderBlock::calcMinMaxWidth):
        (WebCore::RenderBlock::calcBlockMinMaxWidth):
        * rendering/RenderBlock.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16297 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ca5d1859f41e52636eac59336f3dfa117dc840cf..cb37b15dbe5d918a52813183e0bc116a7125dfa4 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2006-09-11  David Hyatt  <hyatt@apple.com>
+
+        Fix an unwitting victim of the kMin->min change.  calcBlockMinMaxWidth
+        was accidentally renamed to calcBlominMaxWidth.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::calcMinMaxWidth):
+        (WebCore::RenderBlock::calcBlockMinMaxWidth):
+        * rendering/RenderBlock.h:
+
 2006-09-10  David Hyatt  <hyatt@apple.com>
 
         Rework the printer font stuff a little bit so that the Font API doesn't

diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp
index 6393c140928482752ef703471ec3d55877174df2..be533e5f5efc576a5dfb64d32b9ea599f3569785 100644 (file)
--- a/WebCore/rendering/RenderBlock.cpp
+++ b/WebCore/rendering/RenderBlock.cpp
@@ -2749,7 +2749,7 @@ void RenderBlock::calcMinMaxWidth()
     if (childrenInline())
         calcInlineMinMaxWidth();
     else
-        calcBlocminMaxWidth();
+        calcBlockMinMaxWidth();
 
     if(m_maxWidth < m_minWidth) m_maxWidth = m_minWidth;
 
@@ -3146,7 +3146,7 @@ void RenderBlock::calcInlineMinMaxWidth()
 // Use a very large value (in effect infinite).
 #define BLOCK_MAX_WIDTH 15000
 
-void RenderBlock::calcBlocminMaxWidth()
+void RenderBlock::calcBlockMinMaxWidth()
 {
     bool nowrap = style()->whiteSpace() == NOWRAP;
 

diff --git a/WebCore/rendering/RenderBlock.h b/WebCore/rendering/RenderBlock.h
index 7fbc7220470d2848e5c07558908f0e7c11bfd15d..5ccb35875e159676a30cd4a4e444b2723a600123 100644 (file)
--- a/WebCore/rendering/RenderBlock.h
+++ b/WebCore/rendering/RenderBlock.h
@@ -207,7 +207,7 @@ public:
     
     virtual void calcMinMaxWidth();
     void calcInlineMinMaxWidth();
-    void calcBlocminMaxWidth();
+    void calcBlockMinMaxWidth();
 
     virtual int getBaselineOfFirstLineBox() const;
     virtual int getBaselineOfLastLineBox() const;