Title: [110566] trunk/Source/WebCore
- Revision
- 110566
- Author
- [email protected]
- Date
- 2012-03-13 08:24:02 -0700 (Tue, 13 Mar 2012)
Log Message
Fix signed/unsigned mismatch compiler warnings.
https://bugs.webkit.org/show_bug.cgi?id=80790
Reviewed by Alexey Proskuryakov.
* loader/icon/IconDatabase.cpp:
(WebCore::IconDatabase::synchronousLoadDecisionForIconURL):
* platform/network/MIMESniffing.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (110565 => 110566)
--- trunk/Source/WebCore/ChangeLog 2012-03-13 15:21:53 UTC (rev 110565)
+++ trunk/Source/WebCore/ChangeLog 2012-03-13 15:24:02 UTC (rev 110566)
@@ -1,3 +1,14 @@
+2012-03-13 George Staikos <[email protected]>
+
+ Fix signed/unsigned mismatch compiler warnings.
+ https://bugs.webkit.org/show_bug.cgi?id=80790
+
+ Reviewed by Alexey Proskuryakov.
+
+ * loader/icon/IconDatabase.cpp:
+ (WebCore::IconDatabase::synchronousLoadDecisionForIconURL):
+ * platform/network/MIMESniffing.cpp:
+
2012-03-13 Sheriff Bot <[email protected]>
Unreviewed, rolling out r110510.
Modified: trunk/Source/WebCore/loader/icon/IconDatabase.cpp (110565 => 110566)
--- trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2012-03-13 15:21:53 UTC (rev 110565)
+++ trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2012-03-13 15:24:02 UTC (rev 110566)
@@ -652,7 +652,7 @@
MutexLocker locker(m_urlAndIconLock);
if (IconRecord* icon = m_iconURLToRecordMap.get(iconURL)) {
LOG(IconDatabase, "Found expiration time on a present icon based on existing IconRecord");
- return (int)currentTime() - icon->getTimestamp() > iconExpirationTime ? IconLoadYes : IconLoadNo;
+ return static_cast<int>(currentTime()) - static_cast<int>(icon->getTimestamp()) > iconExpirationTime ? IconLoadYes : IconLoadNo;
}
}
Modified: trunk/Source/WebCore/platform/network/MIMESniffing.cpp (110565 => 110566)
--- trunk/Source/WebCore/platform/network/MIMESniffing.cpp 2012-03-13 15:21:53 UTC (rev 110565)
+++ trunk/Source/WebCore/platform/network/MIMESniffing.cpp 2012-03-13 15:24:02 UTC (rev 110566)
@@ -223,7 +223,7 @@
static inline size_t dataSizeNeededForImageSniffing()
{
size_t result = 0;
- for (int i = 0; i < imageTypesSize; ++i) {
+ for (size_t i = 0; i < imageTypesSize; ++i) {
if (imageTypes[i].size > result)
result = imageTypes[i].size;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
