Changeset 260396 in webkit
- Timestamp:
- Apr 20, 2020 1:38:44 PM (4 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r260393 r260396 1 2020-04-20 Fujii Hironori <Hironori.Fujii@sony.com> 2 3 MSVC: LayoutUnits.h(248): warning C4245: 'argument': conversion from 'const int' to 'size_t', signed/unsigned mismatch 4 https://bugs.webkit.org/show_bug.cgi?id=210592 5 6 Reviewed by Zalan Bujtas. 7 8 * layout/LayoutUnits.h: 9 (WTF::HashTraits<WebCore::Layout::SlotPosition>::emptyValue): 10 (WTF::HashTraits<WebCore::Layout::SlotPosition>::constructDeletedValue): 11 (WTF::HashTraits<WebCore::Layout::SlotPosition>::isDeletedValue): 12 Use std::numeric_limits<size_t>::max() for empty and deleted 13 values instead of WebCore::intMinForLayoutUnit. 14 1 15 2020-04-20 Wenson Hsieh <wenson_hsieh@apple.com> 2 16 -
trunk/Source/WebCore/layout/LayoutUnits.h
r259981 r260396 246 246 }; 247 247 template<> struct HashTraits<WebCore::Layout::SlotPosition> : GenericHashTraits<WebCore::Layout::SlotPosition> { 248 static WebCore::Layout::SlotPosition emptyValue() { return WebCore::Layout::SlotPosition(0, WebCore::intMinForLayoutUnit); }249 250 static void constructDeletedValue(WebCore::Layout::SlotPosition& slot) { slot = WebCore::Layout::SlotPosition( WebCore::intMinForLayoutUnit, 0); }251 static bool isDeletedValue(const WebCore::Layout::SlotPosition& slot) { return slot == WebCore::Layout::SlotPosition( WebCore::intMinForLayoutUnit, 0); }248 static WebCore::Layout::SlotPosition emptyValue() { return WebCore::Layout::SlotPosition(0, std::numeric_limits<size_t>::max()); } 249 250 static void constructDeletedValue(WebCore::Layout::SlotPosition& slot) { slot = WebCore::Layout::SlotPosition(std::numeric_limits<size_t>::max(), 0); } 251 static bool isDeletedValue(const WebCore::Layout::SlotPosition& slot) { return slot == WebCore::Layout::SlotPosition(std::numeric_limits<size_t>::max(), 0); } 252 252 }; 253 253 template<> struct DefaultHash<WebCore::Layout::SlotPosition> {
Note: See TracChangeset
for help on using the changeset viewer.