Title: [110071] trunk/Source/WebCore
- Revision
- 110071
- Author
- commit-qu...@webkit.org
- Date
- 2012-03-07 11:01:34 -0800 (Wed, 07 Mar 2012)
Log Message
[BlackBerry] Fix warnings in CookieMap
https://bugs.webkit.org/show_bug.cgi?id=80512
Patch by Konrad Piascik <kpias...@rim.com> on 2012-03-07
Reviewed by Rob Buis.
No new tests. No behavioural changes.
* platform/blackberry/CookieMap.cpp:
(WebCore::CookieMap::addOrReplaceCookie):
(WebCore::CookieMap::removeCookie):
(WebCore::CookieMap::getAllCookies):
(WebCore::CookieMap::updateOldestCookie):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (110070 => 110071)
--- trunk/Source/WebCore/ChangeLog 2012-03-07 18:59:46 UTC (rev 110070)
+++ trunk/Source/WebCore/ChangeLog 2012-03-07 19:01:34 UTC (rev 110071)
@@ -1,3 +1,18 @@
+2012-03-07 Konrad Piascik <kpias...@rim.com>
+
+ [BlackBerry] Fix warnings in CookieMap
+ https://bugs.webkit.org/show_bug.cgi?id=80512
+
+ Reviewed by Rob Buis.
+
+ No new tests. No behavioural changes.
+
+ * platform/blackberry/CookieMap.cpp:
+ (WebCore::CookieMap::addOrReplaceCookie):
+ (WebCore::CookieMap::removeCookie):
+ (WebCore::CookieMap::getAllCookies):
+ (WebCore::CookieMap::updateOldestCookie):
+
2012-03-07 Levi Weintraub <le...@chromium.org>
Update usage of LayoutUnits in InlineBox and InlineFlowBox
Modified: trunk/Source/WebCore/platform/blackberry/CookieMap.cpp (110070 => 110071)
--- trunk/Source/WebCore/platform/blackberry/CookieMap.cpp 2012-03-07 18:59:46 UTC (rev 110070)
+++ trunk/Source/WebCore/platform/blackberry/CookieMap.cpp 2012-03-07 19:01:34 UTC (rev 110071)
@@ -59,7 +59,8 @@
CookieLog("CookieMap - Attempting to add cookie - %s", cookie->name().utf8().data());
ParsedCookie* prevCookie = 0;
- for (int i = 0; i < m_cookieVector.size(); i++) {
+ size_t cookieCount = m_cookieVector.size();
+ for (size_t i = 0; i < cookieCount; i++) {
if (m_cookieVector[i]->name() == cookie->name() && m_cookieVector[i]->path() == cookie->path()) {
prevCookie = m_cookieVector[i];
m_cookieVector[i] = cookie;
@@ -101,7 +102,7 @@
ParsedCookie* CookieMap::removeCookie(const ParsedCookie* cookie)
{
size_t cookieCount = m_cookieVector.size();
- for (int position = 0; position < cookieCount; ++position) {
+ for (size_t position = 0; position < cookieCount; ++position) {
if (m_cookieVector[position]->name() == cookie->name() && m_cookieVector[position]->path() == cookie->path())
return removeCookieAtIndex(position, cookie);
}
@@ -129,7 +130,7 @@
stackOfCookies->reserveCapacity(stackOfCookies->size() + m_cookieVector.size());
- int position = 0;
+ size_t position = 0;
while (position < m_cookieVector.size()) {
ParsedCookie* newCookie = m_cookieVector[position];
if (newCookie->hasExpired()) {
@@ -186,7 +187,7 @@
}
m_oldestCookie = m_cookieVector[0];
- for (int i = 1; i < size; ++i) {
+ for (size_t i = 1; i < size; ++i) {
if (m_oldestCookie->lastAccessed() > m_cookieVector[i]->lastAccessed())
m_oldestCookie = m_cookieVector[i];
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
