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

[tony at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 5c9fcc3d2e4749ab13fbdc80cb4586156256ff71
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 29 21:22:50 2010 +0000

    2010-11-29  Tony Chang  <tony at chromium.org>
    
            Reviewed by James Robinson.
    
            [chromium] try to enable WebCore compiler warnings on linux
            https://bugs.webkit.org/show_bug.cgi?id=50168
    
            * WebCore.gyp/WebCore.gyp:
            * platform/graphics/chromium/FontLinux.cpp:
            (WebCore::TextRunWalker::setPadding):
            (WebCore::TextRunWalker::setGlyphXPositions):
            (WebCore::glyphIndexForXPositionInScriptRun):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72824 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fe8f9f6..4f2e9db 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-29  Tony Chang  <tony at chromium.org>
+
+        Reviewed by James Robinson.
+
+        [chromium] try to enable WebCore compiler warnings on linux
+        https://bugs.webkit.org/show_bug.cgi?id=50168
+
+        * WebCore.gyp/WebCore.gyp:
+        * platform/graphics/chromium/FontLinux.cpp:
+        (WebCore::TextRunWalker::setPadding):
+        (WebCore::TextRunWalker::setGlyphXPositions):
+        (WebCore::glyphIndexForXPositionInScriptRun):
+
 2010-11-29  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/WebCore.gyp/WebCore.gyp b/WebCore/WebCore.gyp/WebCore.gyp
index e8f343a..bb18095 100644
--- a/WebCore/WebCore.gyp/WebCore.gyp
+++ b/WebCore/WebCore.gyp/WebCore.gyp
@@ -245,14 +245,7 @@
           '../platform/mac',
           '../platform/text/mac',
         ],
-        # enable -Wall and -Werror, just for Mac and Linux builds for now
-        # FIXME: Also enable this for Windows after verifying no warnings
-        'chromium_code': 1,
       }],
-# FIXME: disabled for now due to failures on different gcc versions
-#     ['OS=="linux"', {
-#        'chromium_code': 1,
-#      }],
       ['OS=="win"', {
         'webcore_include_dirs': [
           '../page/win',
@@ -260,6 +253,10 @@
           '../platform/text/win',
           '../platform/win',
         ],
+      },{
+        # enable -Wall and -Werror, just for Mac and Linux builds for now
+        # FIXME: Also enable this for Windows after verifying no warnings
+        'chromium_code': 1,
       }],
       ['OS=="win" and buildtype=="Official"', {
         # On windows official release builds, we try to preserve symbol space.
diff --git a/WebCore/platform/graphics/chromium/FontLinux.cpp b/WebCore/platform/graphics/chromium/FontLinux.cpp
index 79b2caf..82b9df7 100644
--- a/WebCore/platform/graphics/chromium/FontLinux.cpp
+++ b/WebCore/platform/graphics/chromium/FontLinux.cpp
@@ -341,7 +341,6 @@ void TextRunWalker::setPadding(int padding)
     // amount to each space. The last space gets the smaller amount, if
     // any.
     unsigned numWordBreaks = 0;
-    bool isRTL = m_iterateBackwards;
 
     for (unsigned i = 0; i < m_item.stringLength; i++) {
         if (isWordBreak(i))
@@ -524,7 +523,7 @@ void TextRunWalker::setGlyphXPositions(bool isRTL)
                 // Whitespace must be laid out in logical order, so when inserting
                 // spaces in RTL (but iterating in LTR order) we must insert spaces
                 // _before_ the next glyph.
-                if (i + 1 >= m_item.num_glyphs || m_item.attributes[i + 1].clusterStart)
+                if (static_cast<unsigned>(i + 1) >= m_item.num_glyphs || m_item.attributes[i + 1].clusterStart)
                     position += m_letterSpacing;
 
                 position += determineWordBreakSpacing(logClustersIndex);
@@ -541,7 +540,7 @@ void TextRunWalker::setGlyphXPositions(bool isRTL)
                 position += truncateFixedPointToInteger(m_item.advances[i]);
         }
     } else {
-        for (int i = 0; i < m_item.num_glyphs; ++i) {
+        for (size_t i = 0; i < m_item.num_glyphs; ++i) {
             m_glyphs16[i] = m_item.glyphs[i];
             double offsetX = truncateFixedPointToInteger(m_item.offsets[i].x);
             m_xPositions[i] = m_offsetX + position + offsetX;
@@ -556,7 +555,7 @@ void TextRunWalker::setGlyphXPositions(bool isRTL)
             if (m_item.attributes[i].clusterStart)
                 advance += m_letterSpacing;
 
-            while (logClustersIndex < m_item.item.length && logClusters()[logClustersIndex] == i)
+            while (static_cast<unsigned>(logClustersIndex) < m_item.item.length && logClusters()[logClustersIndex] == i)
                 logClustersIndex++;
 
             position += advance;
@@ -708,7 +707,7 @@ static int glyphIndexForXPositionInScriptRun(const TextRunWalker& walker, int x)
         for (glyphIndex = walker.length() - 1; glyphIndex >= 0; --glyphIndex) {
             // When iterating LTR over RTL text, we must include the whitespace
             // _before_ the glyph, so no + 1 here.
-            if (x < (walker.length() - glyphIndex) * letterSpacing + truncateFixedPointToInteger(advances[glyphIndex]))
+            if (x < (static_cast<int>(walker.length()) - glyphIndex) * letterSpacing + truncateFixedPointToInteger(advances[glyphIndex]))
                 break;
             x -= truncateFixedPointToInteger(advances[glyphIndex]);
         }

-- 
WebKit Debian packaging