Changeset 257297 in webkit
- Timestamp:
- Feb 24, 2020 11:37:45 PM (4 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r257296 r257297 1 2020-02-24 Fujii Hironori <Hironori.Fujii@sony.com> 2 3 Unreviewed build fix for WinCairo port 4 https://bugs.webkit.org/show_bug.cgi?id=208112 5 <rdar://problem/59709701> 6 7 > WebCore\layout/inlineformatting/LineLayoutContext.cpp(337): error C2397: conversion from 'size_t' to 'WTF::Optional<unsigned int>' requires a narrowing conversion 8 > WebCore\layout/inlineformatting/LineLayoutContext.cpp(361): error C2397: conversion from 'size_t' to 'WTF::Optional<unsigned int>' requires a narrowing conversion 9 10 * layout/inlineformatting/LineLayoutContext.cpp: 11 (WebCore::Layout::LineLayoutContext::close): Changed the type of 'trailingInlineItemIndex' from 'auto' to 'unsigned'. 12 1 13 2020-02-23 Darin Adler <darin@apple.com> 2 14 -
trunk/Source/WebCore/layout/inlineformatting/LineLayoutContext.cpp
r257291 r257297 334 334 return LineContent { { }, { }, WTFMove(m_floats), line.close(), line.lineBox() }; 335 335 } 336 autotrailingInlineItemIndex = layoutRange.start + m_floats.size();336 unsigned trailingInlineItemIndex = layoutRange.start + m_floats.size(); 337 337 return LineContent { trailingInlineItemIndex, { }, WTFMove(m_floats), line.close(), line.lineBox() }; 338 338 } … … 343 343 m_successiveHyphenatedLineCount = 0; 344 344 ASSERT(committedInlineItemCount); 345 autotrailingInlineItemIndex = layoutRange.start + committedInlineItemCount + m_floats.size() - 1;345 unsigned trailingInlineItemIndex = layoutRange.start + committedInlineItemCount + m_floats.size() - 1; 346 346 ASSERT(trailingInlineItemIndex < layoutRange.end); 347 347 auto isLastLineWithInlineContent = [&] {
Note: See TracChangeset
for help on using the changeset viewer.