Header is blank on https://nader.org
https://bugs.webkit.org/show_bug.cgi?id=205747
<rdar://problem/58305910>
Reviewed by Simon Fraser.
Source/WebCore:
Do not use stale containing block width value while computing preferred width.
Test: fast/text/text-indent-inside-float.html
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::computeInlinePreferredLogicalWidths const):
LayoutTests:
* fast/text/text-indent-inside-float-expected.html: Added.
* fast/text/text-indent-inside-float.html: Added.
* platform/mac/editing/pasteboard/drop-text-without-selection-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@260905 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/rendering/RenderBlockFlow.cpp b/Source/WebCore/rendering/RenderBlockFlow.cpp
index 404de13..e213aac 100644
--- a/Source/WebCore/rendering/RenderBlockFlow.cpp
+++ b/Source/WebCore/rendering/RenderBlockFlow.cpp
@@ -4218,9 +4218,6 @@
float inlineMin = 0;
const RenderStyle& styleToUse = style();
- RenderBlock* containingBlock = this->containingBlock();
- LayoutUnit cw = containingBlock ? containingBlock->contentLogicalWidth() : 0_lu;
-
// If we are at the start of a line, we want to ignore all white-space.
// Also strip spaces if we previously had text that ended in a trailing space.
bool stripFrontSpaces = true;
@@ -4240,7 +4237,14 @@
// Signals the text indent was more negative than the min preferred width
bool hasRemainingNegativeTextIndent = false;
- LayoutUnit textIndent = minimumValueForLength(styleToUse.textIndent(), cw);
+ auto textIndent = LayoutUnit { };
+ if (styleToUse.textIndent().isFixed())
+ textIndent = LayoutUnit { styleToUse.textIndent().value() };
+ else if (auto* containingBlock = this->containingBlock(); containingBlock && containingBlock->style().logicalWidth().isFixed()) {
+ // At this point of the shrink-to-fit computatation, we don't have a used value for the containing block width
+ // (that's exactly to what we try to contribute here) unless the computed value is fixed.
+ textIndent = minimumValueForLength(styleToUse.textIndent(), containingBlock->style().logicalWidth().value());
+ }
RenderObject* prevFloat = 0;
bool isPrevChildInlineFlow = false;
bool shouldBreakLineAfterText = false;
