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

[yurys at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit c6b0d6b88dba25963b7fc564701e37032f24ed18
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 15 09:45:26 2010 +0000

    2010-07-15  Pavel Podivilov  <podivilov at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Fix mac compilation failure
            https://bugs.webkit.org/show_bug.cgi?id=42344
    
            * src/AutoFillPopupMenuClient.cpp:
            (WebKit::AutoFillPopupMenuClient::removeSuggestionAtIndex):
            (WebKit::AutoFillPopupMenuClient::canRemoveSuggestionAtIndex):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63418 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 81807c2..512f22c 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-15  Pavel Podivilov  <podivilov at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Fix mac compilation failure
+        https://bugs.webkit.org/show_bug.cgi?id=42344
+
+        * src/AutoFillPopupMenuClient.cpp:
+        (WebKit::AutoFillPopupMenuClient::removeSuggestionAtIndex):
+        (WebKit::AutoFillPopupMenuClient::canRemoveSuggestionAtIndex):
+
 2010-07-14  George Yakovlev  <georgey at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/src/AutoFillPopupMenuClient.cpp b/WebKit/chromium/src/AutoFillPopupMenuClient.cpp
index db214c7..6b74f60 100644
--- a/WebKit/chromium/src/AutoFillPopupMenuClient.cpp
+++ b/WebKit/chromium/src/AutoFillPopupMenuClient.cpp
@@ -91,7 +91,7 @@ void AutoFillPopupMenuClient::removeSuggestionAtIndex(unsigned listIndex)
 
     int index = convertListIndexToInternalIndex(listIndex);
 
-    ASSERT(index < m_names.size());
+    ASSERT(static_cast<unsigned>(index) < m_names.size());
 
     m_names.remove(index);
     m_labels.remove(index);
@@ -106,7 +106,7 @@ bool AutoFillPopupMenuClient::canRemoveSuggestionAtIndex(unsigned listIndex)
     // Only allow deletion of items before the separator and those that don't
     // have a label (autocomplete).
     int index = convertListIndexToInternalIndex(listIndex);
-    return m_labels[index].isEmpty() && (m_separatorIndex == -1 || listIndex < m_separatorIndex);
+    return m_labels[index].isEmpty() && (m_separatorIndex == -1 || listIndex < static_cast<unsigned>(m_separatorIndex));
 }
 
 void AutoFillPopupMenuClient::valueChanged(unsigned listIndex, bool fireEvents)

-- 
WebKit Debian packaging