summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/core/layout/layout_tree_as_text.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-05-20 09:47:09 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-06-07 11:15:42 +0000
commit189d4fd8fad9e3c776873be51938cd31a42b6177 (patch)
tree6497caeff5e383937996768766ab3bb2081a40b2 /chromium/third_party/blink/renderer/core/layout/layout_tree_as_text.cc
parent8bc75099d364490b22f43a7ce366b366c08f4164 (diff)
downloadqtwebengine-chromium-189d4fd8fad9e3c776873be51938cd31a42b6177.tar.gz
BASELINE: Update Chromium to 90.0.4430.221
Change-Id: Iff4d9d18d2fcf1a576f3b1f453010f744a232920 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/core/layout/layout_tree_as_text.cc')
-rw-r--r--chromium/third_party/blink/renderer/core/layout/layout_tree_as_text.cc24
1 files changed, 8 insertions, 16 deletions
diff --git a/chromium/third_party/blink/renderer/core/layout/layout_tree_as_text.cc b/chromium/third_party/blink/renderer/core/layout/layout_tree_as_text.cc
index a84ae32eb78..6075c988de8 100644
--- a/chromium/third_party/blink/renderer/core/layout/layout_tree_as_text.cc
+++ b/chromium/third_party/blink/renderer/core/layout/layout_tree_as_text.cc
@@ -235,7 +235,8 @@ void LayoutTreeAsText::WriteLayoutObject(WTF::TextStream& ts,
if (o.IsDetailsMarker()) {
ts << ": ";
- switch (To<LayoutDetailsMarker>(o).GetOrientation()) {
+ const auto& marker = To<LayoutDetailsMarker>(o);
+ switch (marker.GetOrientation(marker.StyleRef(), marker.IsOpen())) {
case LayoutDetailsMarker::kLeft:
ts << "left";
break;
@@ -447,27 +448,13 @@ static void WriteTextFragment(WTF::TextStream& ts,
static void WriteTextFragment(WTF::TextStream& ts,
const NGInlineCursor& cursor) {
- if (const NGPaintFragment* const paint_fragment =
- cursor.CurrentPaintFragment()) {
- const auto* physical_text_fragment =
- DynamicTo<NGPhysicalTextFragment>(paint_fragment->PhysicalFragment());
- if (!physical_text_fragment)
- return;
- const NGFragment fragment(paint_fragment->Style().GetWritingDirection(),
- *physical_text_fragment);
- WriteTextFragment(ts, paint_fragment->GetLayoutObject(),
- paint_fragment->RectInContainerBlock(),
- paint_fragment->Style(), physical_text_fragment->Text(),
- fragment.InlineSize());
- return;
- }
DCHECK(cursor.CurrentItem());
const NGFragmentItem& item = *cursor.CurrentItem();
DCHECK(item.Type() == NGFragmentItem::kText ||
item.Type() == NGFragmentItem::kGeneratedText);
const LayoutUnit inline_size =
item.IsHorizontal() ? item.Size().width : item.Size().height;
- WriteTextFragment(ts, item.GetLayoutObject(), item.RectInContainerBlock(),
+ WriteTextFragment(ts, item.GetLayoutObject(), item.RectInContainerFragment(),
item.Style(), item.Text(cursor.Items()), inline_size);
}
@@ -492,6 +479,11 @@ static void WritePaintProperties(WTF::TextStream& ts,
ts << " state=(" << fragment->LocalBorderBoxProperties().ToString()
<< ")";
}
+ if (RuntimeEnabledFeatures::CullRectUpdateEnabled()) {
+ ts << " cull_rect=(" << fragment->GetCullRect().ToString()
+ << ") contents_cull_rect=("
+ << fragment->GetContentsCullRect().ToString() << ")";
+ }
ts << "\n";
}
}