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

ajwong at chromium.org ajwong at chromium.org
Wed Dec 22 11:09:00 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit f88c1d42907c3deb0e2ea9af222b989b3bc11ac8
Author: ajwong at chromium.org <ajwong at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 13 20:25:56 2010 +0000

    Unreviewed, build fix.
    
    [chromium] The comparision between signed/unsigned breaks the chromium
    mac build.
    
    * src/AutoFillPopupMenuClient.cpp:
    (WebKit::AutoFillPopupMenuClient::getSuggestion):
    (WebKit::AutoFillPopupMenuClient::getLabel):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63242 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index f619707..640a828 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-13  Albert J. Wong  <ajwong at chromium.org>
+
+        Unreviewed, build fix.
+
+        [chromium] The comparision between signed/unsigned breaks the chromium
+        mac build.
+
+        * src/AutoFillPopupMenuClient.cpp:
+        (WebKit::AutoFillPopupMenuClient::getSuggestion):
+        (WebKit::AutoFillPopupMenuClient::getLabel):
+
 2010-07-10  Zhenyao Mo  <zmo at google.com>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/src/AutoFillPopupMenuClient.cpp b/WebKit/chromium/src/AutoFillPopupMenuClient.cpp
index 9493c93..30d91f9 100644
--- a/WebKit/chromium/src/AutoFillPopupMenuClient.cpp
+++ b/WebKit/chromium/src/AutoFillPopupMenuClient.cpp
@@ -70,7 +70,7 @@ WebString AutoFillPopupMenuClient::getSuggestion(unsigned listIndex) const
     if (index == -1)
         return WebString();
 
-    ASSERT(index < m_names.size());
+    ASSERT(index >= 0 && static_cast<size_t>(index) < m_names.size());
     return m_names[index];
 }
 
@@ -80,7 +80,7 @@ WebString AutoFillPopupMenuClient::getLabel(unsigned listIndex) const
     if (index == -1)
         return WebString();
 
-    ASSERT(index < m_labels.size());
+    ASSERT(index >= 0 && static_cast<size_t>(index) < m_labels.size());
     return m_labels[index];
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list