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

[thakis at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit f3b40934d1b75e7e3b2f24fd40fc128d4b1bf6e6
Author: thakis at chromium.org <thakis at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 21 03:08:32 2010 +0000

    2010-09-20  Nico Weber  <thakis at chromium.org>
    
            Reviewed by Adam Barth.
    
            Fix "operands of ? are integers of different signs" clang warnings
            https://bugs.webkit.org/show_bug.cgi?id=46157
    
            * platform/graphics/mac/ComplexTextController.cpp:
            (WebCore::ComplexTextController::advance):
            * rendering/RenderBox.cpp:
            (WebCore::RenderBox::calcHeight):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67915 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 01f2f28..6d7d2ec 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-20  Nico Weber  <thakis at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Fix "operands of ? are integers of different signs" clang warnings
+        https://bugs.webkit.org/show_bug.cgi?id=46157
+
+        * platform/graphics/mac/ComplexTextController.cpp:
+        (WebCore::ComplexTextController::advance):
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::calcHeight):
+
 2010-09-20  Vangelis Kokkevis  <vangelis at chromium.org>
 
         Unreviewed, rolling out r67906.
diff --git a/WebCore/platform/graphics/mac/ComplexTextController.cpp b/WebCore/platform/graphics/mac/ComplexTextController.cpp
index da381f2..5d27302 100644
--- a/WebCore/platform/graphics/mac/ComplexTextController.cpp
+++ b/WebCore/platform/graphics/mac/ComplexTextController.cpp
@@ -382,9 +382,9 @@ void ComplexTextController::advance(unsigned offset, GlyphBuffer* glyphBuffer)
             unsigned glyphEndOffset;
             if (complexTextRun.isMonotonic()) {
                 if (ltr)
-                    glyphEndOffset = max<unsigned>(glyphStartOffset, g + 1 < glyphCount ? complexTextRun.indexAt(g + 1) : complexTextRun.stringLength());
+                    glyphEndOffset = max<unsigned>(glyphStartOffset, g + 1 < glyphCount ? static_cast<unsigned>(complexTextRun.indexAt(g + 1)) : complexTextRun.stringLength());
                 else
-                    glyphEndOffset = max<unsigned>(glyphStartOffset, g > 0 ? complexTextRun.indexAt(g - 1) : complexTextRun.stringLength());
+                    glyphEndOffset = max<unsigned>(glyphStartOffset, g > 0 ? static_cast<unsigned>(complexTextRun.indexAt(g - 1)) : complexTextRun.stringLength());
             } else
                 glyphEndOffset = complexTextRun.endOffsetAt(g);
 
diff --git a/WebCore/rendering/RenderBox.cpp b/WebCore/rendering/RenderBox.cpp
index 65a6b0b..4eb4a42 100644
--- a/WebCore/rendering/RenderBox.cpp
+++ b/WebCore/rendering/RenderBox.cpp
@@ -1519,7 +1519,7 @@ void RenderBox::calcHeight()
         && (isRoot() || (isBody() && document()->documentElement()->renderer()->style()->height().isPercent()));
     if (stretchesToViewHeight() || paginatedContentNeedsBaseHeight) {
         int margins = collapsedMarginTop() + collapsedMarginBottom();
-        int visHeight = document()->printing() ? view()->pageHeight() : view()->viewHeight();
+        int visHeight = document()->printing() ? static_cast<int>(view()->pageHeight()) : view()->viewHeight();
         if (isRoot())
             setHeight(max(height(), visHeight - margins));
         else {

-- 
WebKit Debian packaging