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

[hyatt at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 26c55633a617a1bbb7923c2dbc775b85b31c5086
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 16 21:53:07 2010 +0000

    Fix Windows build. Yay for the style review bot telling me to do something that breaks Windows.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67671 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/rendering/ColumnInfo.h b/WebCore/rendering/ColumnInfo.h
index 77313f8..5e6f619 100644
--- a/WebCore/rendering/ColumnInfo.h
+++ b/WebCore/rendering/ColumnInfo.h
@@ -29,8 +29,6 @@
 #include <wtf/Vector.h>
 #include "IntRect.h"
 
-using namespace std;
-
 namespace WebCore {
 
 class ColumnInfo : public Noncopyable {
@@ -64,7 +62,7 @@ public:
     }
     void setColumnHeight(int height) { m_columnHeight = height; }
 
-    void updateMinimumColumnHeight(int height) { m_minimumColumnHeight = max(height, m_minimumColumnHeight); }
+    void updateMinimumColumnHeight(int height) { m_minimumColumnHeight = std::max(height, m_minimumColumnHeight); }
     int minimumColumnHeight() const { return m_minimumColumnHeight; }
 
     int forcedBreaks() const { return m_forcedBreaks; }
@@ -83,7 +81,7 @@ public:
         if (!distanceFromLastBreak)
             return;
         m_forcedBreaks++;
-        m_maximumDistanceBetweenForcedBreaks = max(m_maximumDistanceBetweenForcedBreaks, distanceFromLastBreak);
+        m_maximumDistanceBetweenForcedBreaks = std::max(m_maximumDistanceBetweenForcedBreaks, distanceFromLastBreak);
         m_forcedBreakOffset = offsetFromFirstPage;
     }
 

-- 
WebKit Debian packaging