Changeset 257297 in webkit


Ignore:
Timestamp:
Feb 24, 2020 11:37:45 PM (4 years ago)
Author:
Fujii Hironori
Message:

Unreviewed build fix for WinCairo port
https://bugs.webkit.org/show_bug.cgi?id=208112
<rdar://problem/59709701>

WebCore\layout/inlineformatting/LineLayoutContext.cpp(337): error C2397: conversion from 'size_t' to 'WTF::Optional<unsigned int>' requires a narrowing conversion
WebCore\layout/inlineformatting/LineLayoutContext.cpp(361): error C2397: conversion from 'size_t' to 'WTF::Optional<unsigned int>' requires a narrowing conversion

  • layout/inlineformatting/LineLayoutContext.cpp:

(WebCore::Layout::LineLayoutContext::close): Changed the type of 'trailingInlineItemIndex' from 'auto' to 'unsigned'.

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r257296 r257297  
     12020-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
    1132020-02-23  Darin Adler  <darin@apple.com>
    214
  • trunk/Source/WebCore/layout/inlineformatting/LineLayoutContext.cpp

    r257291 r257297  
    334334            return LineContent { { }, { }, WTFMove(m_floats), line.close(), line.lineBox() };
    335335        }
    336         auto trailingInlineItemIndex = layoutRange.start + m_floats.size();
     336        unsigned trailingInlineItemIndex = layoutRange.start + m_floats.size();
    337337        return LineContent { trailingInlineItemIndex, { }, WTFMove(m_floats), line.close(), line.lineBox() };
    338338    }
     
    343343        m_successiveHyphenatedLineCount = 0;
    344344    ASSERT(committedInlineItemCount);
    345     auto trailingInlineItemIndex = layoutRange.start + committedInlineItemCount + m_floats.size() - 1;
     345    unsigned trailingInlineItemIndex = layoutRange.start + committedInlineItemCount + m_floats.size() - 1;
    346346    ASSERT(trailingInlineItemIndex < layoutRange.end);
    347347    auto isLastLineWithInlineContent = [&] {
Note: See TracChangeset for help on using the changeset viewer.