Changeset 260396 in webkit

Timestamp:

Apr 20, 2020 1:38:44 PM (4 years ago)

Author:

Fujii Hironori

Message:

MSVC: LayoutUnits.h(248): warning C4245: 'argument': conversion from 'const int' to 'size_t', signed/unsigned mismatch
​https://bugs.webkit.org/show_bug.cgi?id=210592

Reviewed by Zalan Bujtas.

• layout/LayoutUnits.h:

(WTF::HashTraits<WebCore::Layout::SlotPosition>::emptyValue):
(WTF::HashTraits<WebCore::Layout::SlotPosition>::constructDeletedValue):
(WTF::HashTraits<WebCore::Layout::SlotPosition>::isDeletedValue):
Use std::numeric_limits<size_t>::max() for empty and deleted
values instead of WebCore::intMinForLayoutUnit.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/LayoutUnits.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-20  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        MSVC: LayoutUnits.h(248): warning C4245: 'argument': conversion from 'const int' to 'size_t', signed/unsigned mismatch
+        https://bugs.webkit.org/show_bug.cgi?id=210592
+
+        Reviewed by Zalan Bujtas.
+
+        * layout/LayoutUnits.h:
+        (WTF::HashTraits<WebCore::Layout::SlotPosition>::emptyValue):
+        (WTF::HashTraits<WebCore::Layout::SlotPosition>::constructDeletedValue):
+        (WTF::HashTraits<WebCore::Layout::SlotPosition>::isDeletedValue):
+        Use std::numeric_limits<size_t>::max() for empty and deleted
+        values instead of WebCore::intMinForLayoutUnit.
+
 2020-04-20  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/layout/LayoutUnits.h

@@ -246 +246 @@
 };
 template<> struct HashTraits<WebCore::Layout::SlotPosition> : GenericHashTraits<WebCore::Layout::SlotPosition> {
-    static WebCore::Layout::SlotPosition emptyValue() { return WebCore::Layout::SlotPosition(0, WebCore::intMinForLayoutUnit); }
-
-    static void constructDeletedValue(WebCore::Layout::SlotPosition& slot) { slot = WebCore::Layout::SlotPosition(WebCore::intMinForLayoutUnit, 0); }
-    static bool isDeletedValue(const WebCore::Layout::SlotPosition& slot) { return slot == WebCore::Layout::SlotPosition(WebCore::intMinForLayoutUnit, 0); }
+    static WebCore::Layout::SlotPosition emptyValue() { return WebCore::Layout::SlotPosition(0, std::numeric_limits<size_t>::max()); }
+
+    static void constructDeletedValue(WebCore::Layout::SlotPosition& slot) { slot = WebCore::Layout::SlotPosition(std::numeric_limits<size_t>::max(), 0); }
+    static bool isDeletedValue(const WebCore::Layout::SlotPosition& slot) { return slot == WebCore::Layout::SlotPosition(std::numeric_limits<size_t>::max(), 0); }
 };
 template<> struct DefaultHash<WebCore::Layout::SlotPosition> {