Changeset 270150 in webkit


Ignore:
Timestamp:
Nov 21, 2020 11:43:11 AM (3 years ago)
Author:
Antti Koivisto
Message:

[LFC][Integration] Remove ensureLineBoxes call from RenderedPosition constructor
​https://bugs.webkit.org/show_bug.cgi?id=219164

Reviewed by Zalan Bujtas.

Source/WebCore:

It is not needed anymore. We can use LFC line layout through the editing code.

  • dom/Position.cpp:

(WebCore::Position::ensureLineBoxes const): Deleted.

  • dom/Position.h:
  • editing/RenderedPosition.cpp:

(WebCore::RenderedPosition::RenderedPosition):

  • editing/RenderedPosition.h:

(WebCore::RenderedPosition::rootBox): Deleted.

LayoutTests:

  • accessibility/mac/attachment-element-replacement-character-expected.txt:
  • platform/ios/fast/text/whitespace/pre-wrap-overflow-selection-expected.txt:
Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r270149 r270150  
     12020-11-21  Antti Koivisto  <antti@apple.com>
     2
     3        [LFC][Integration] Remove ensureLineBoxes call from RenderedPosition constructor
     4        https://bugs.webkit.org/show_bug.cgi?id=219164
     5
     6        Reviewed by Zalan Bujtas.
     7
     8        * accessibility/mac/attachment-element-replacement-character-expected.txt:
     9        * platform/ios/fast/text/whitespace/pre-wrap-overflow-selection-expected.txt:
     10
    1112020-11-21  Brian Burg  <bburg@apple.com>
    212

  • trunk/LayoutTests/accessibility/mac/attachment-element-replacement-character-expected.txt

    r269745 r270150  
    66
    77String:
    8 some[ATTACHMENT] test
     8some [ATTACHMENT] test
    99This tests that attachment element replacements are present in strings.
    1010

  • trunk/LayoutTests/platform/ios/fast/text/whitespace/pre-wrap-overflow-selection-expected.txt

    r179104 r270150  
    2222      RenderBlock {HR} at (0,198) size 784x2 [border: (1px inset #000000)]
    2323      RenderBlock {PRE} at (0,213) size 108x78 [border: (4px solid #0000FF)]
    24         RenderText {#text} at (4,4) size 100x70
    25           text run at (4,4) width 86: "This   text"
    26           text run at (89,4) width 15: "     "
     24        RenderText {#text} at (4,4) size 94x70
     25          text run at (4,4) width 86: "This   text     "
    2726          text run at (4,18) width 71: "will wrap"
    2827          text run at (74,18) width 1: " "
    29           text run at (4,32) width 71: "and   fit"
    30           text run at (74,32) width 24: "   "
     28          text run at (4,32) width 94: "and   fit   "
    3129          text run at (4,46) width 79: "within the"
    3230          text run at (82,46) width 1: " "

  • trunk/Source/WebCore/ChangeLog

    r270148 r270150  
     12020-11-21  Antti Koivisto  <antti@apple.com>
     2
     3        [LFC][Integration] Remove ensureLineBoxes call from RenderedPosition constructor
     4        https://bugs.webkit.org/show_bug.cgi?id=219164
     5
     6        Reviewed by Zalan Bujtas.
     7
     8        It is not needed anymore. We can use LFC line layout through the editing code.
     9
     10        * dom/Position.cpp:
     11        (WebCore::Position::ensureLineBoxes const): Deleted.
     12        * dom/Position.h:
     13        * editing/RenderedPosition.cpp:
     14        (WebCore::RenderedPosition::RenderedPosition):
     15        * editing/RenderedPosition.h:
     16        (WebCore::RenderedPosition::rootBox): Deleted.
     17
    1182020-11-21  Aditya Keerthi  <akeerthi@apple.com>
    219

  • trunk/Source/WebCore/dom/Position.cpp

    r270025 r270150  
    13641364}
    13651365
    1366 void Position::ensureLineBoxes() const
    1367 {
    1368     auto node = deprecatedNode();
    1369     if (!node)
    1370         return;
    1371     auto renderer = node->renderer();
    1372     if (!renderer)
    1373         return;
    1374     auto* parent = renderer->parent();
    1375     if (is<RenderBlockFlow>(parent))
    1376         downcast<RenderBlockFlow>(*parent).ensureLineBoxes();
    1377 }
    1378 
    13791366TextDirection Position::primaryDirection() const
    13801367{

  • trunk/Source/WebCore/dom/Position.h

    r270025 r270150  
    200200    bool equals(const Position&) const;
    201201
    202     void ensureLineBoxes() const;
    203 
    204202private:
    205203    // For creating legacy editing positions: (Anchor type will be determined from editingIgnoresContent(node))

  • trunk/Source/WebCore/editing/RenderedPosition.cpp

    r269693 r270150  
    8686        return;
    8787
    88     // FIXME: Remove.
    89     position.ensureLineBoxes();
    90 
    9188    auto runAndOffset = position.inlineRunAndOffset(affinity);
    9289    m_run = runAndOffset.run;

  • trunk/Source/WebCore/editing/RenderedPosition.h

    r269693 r270150  
    5252    LayoutIntegration::LineIterator line() const { return m_run ? m_run.line() : LayoutIntegration::LineIterator(); }
    5353
    54     RootInlineBox* rootBox() { return m_run ? &m_run->legacyInlineBox()->root() : nullptr; }
    55 
    5654    unsigned char bidiLevelOnLeft() const;
    5755    unsigned char bidiLevelOnRight() const;
Note: See TracChangeset for help on using the changeset viewer.