[webkit-changes] [WebKit/WebKit] b14c7b: [LFC][Integration] Stop adjusting effective displa...

Antti Koivisto noreply at github.com
Thu Sep 22 08:38:53 PDT 2022


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: b14c7b56eb6e7ee0bae20d9ebf937a297c7b0f1d
      https://github.com/WebKit/WebKit/commit/b14c7b56eb6e7ee0bae20d9ebf937a297c7b0f1d
  Author: Antti Koivisto <antti at apple.com>
  Date:   2022-09-22 (Thu, 22 Sep 2022)

  Changed paths:
    M Source/WebCore/layout/LayoutState.cpp
    M Source/WebCore/layout/formattingContexts/inline/InlineContentBreaker.cpp
    M Source/WebCore/layout/formattingContexts/inline/InlineFormattingQuirks.cpp
    M Source/WebCore/layout/formattingContexts/inline/InlineFormattingQuirks.h
    M Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp
    M Source/WebCore/layout/integration/LayoutIntegrationBoxTree.cpp
    M Source/WebCore/layout/integration/inline/LayoutIntegrationInlineContentBuilder.cpp
    M Source/WebCore/layout/layouttree/LayoutBox.cpp

  Log Message:
  -----------
  [LFC][Integration] Stop adjusting effective display of the root box to 'block'
https://bugs.webkit.org/show_bug.cgi?id=245472
<rdar://problem/100222978>

Reviewed by Alan Bujtas.

This hack is not needed.

* Source/WebCore/layout/formattingContexts/inline/InlineContentBreaker.cpp:
(WebCore::Layout::hasTextRun):
* Source/WebCore/layout/formattingContexts/inline/InlineFormattingQuirks.cpp:
(WebCore::Layout::InlineFormattingQuirks::hasSoftWrapOpportunityAtImage const): Deleted.

Remove this quirk that didn't do anything before this change (because the root box was never considered a table cell)
and now breaks fast/text/whitespace/021.html.

* Source/WebCore/layout/formattingContexts/inline/InlineFormattingQuirks.h:
* Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp:
(WebCore::Layout::isAtSoftWrapOpportunity):
(WebCore::Layout::LineBuilder::nextWrapOpportunity const):
* Source/WebCore/layout/integration/LayoutIntegrationBoxTree.cpp:
(WebCore::LayoutIntegration::rootBoxStyle):
(WebCore::LayoutIntegration::firstLineStyleFor):
(WebCore::LayoutIntegration::BoxTree::BoxTree):
(WebCore::LayoutIntegration::BoxTree::buildTreeForInlineContent):
(WebCore::LayoutIntegration::BoxTree::updateStyle):
(WebCore::LayoutIntegration::rootBoxFirstLineStyle): Deleted.

Also remove the first-line define and clean up the functions.

Canonical link: https://commits.webkit.org/254755@main




More information about the webkit-changes mailing list