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>2019-07-31 15:50:41 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-08-30 12:35:23 +0000
commit7b2ffa587235a47d4094787d72f38102089f402a (patch)
tree30e82af9cbab08a7fa028bb18f4f2987a3f74dfa /chromium/third_party/blink/renderer/core/layout/layout_tree_as_text.cc
parentd94af01c90575348c4e81a418257f254b6f8d225 (diff)
downloadqtwebengine-chromium-7b2ffa587235a47d4094787d72f38102089f402a.tar.gz
BASELINE: Update Chromium to 76.0.3809.94
Change-Id: I321c3f5f929c105aec0f98c5091ef6108822e647 Reviewed-by: Michael BrĂ¼ning <michael.bruning@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.cc23
1 files changed, 12 insertions, 11 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 af34bbcb179..a7ee036bf62 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
@@ -158,7 +158,7 @@ void LayoutTreeAsText::WriteLayoutObject(WTF::TextStream& ts,
ts << " {" << tag_name << "}";
}
- LayoutRect rect = o.DebugRect();
+ PhysicalRect rect = o.DebugRect();
ts << " " << rect;
if (!(o.IsText() && !o.IsBR())) {
@@ -445,21 +445,22 @@ static void WriteTextRun(WTF::TextStream& ts,
static void WriteTextFragment(WTF::TextStream& ts,
const NGPhysicalFragment& physical_fragment,
- NGPhysicalOffset offset_to_container_box) {
+ PhysicalOffset offset_to_container_box) {
const auto* physical_text_fragment =
DynamicTo<NGPhysicalTextFragment>(physical_fragment);
if (!physical_text_fragment)
return;
const ComputedStyle& style = physical_fragment.Style();
+ // TODO(layout-dev): Dump physical coordinates when removing the legacy inline
+ // layout code.
NGTextFragment fragment(style.GetWritingMode(), *physical_text_fragment);
if (UNLIKELY(style.IsFlippedBlocksWritingMode())) {
if (physical_fragment.GetLayoutObject()) {
- LayoutRect rect(offset_to_container_box.ToLayoutPoint(),
- physical_fragment.Size().ToLayoutSize());
+ PhysicalRect rect(offset_to_container_box, physical_fragment.Size());
const LayoutBlock* containing_block =
physical_fragment.GetLayoutObject()->ContainingBlock();
- containing_block->FlipForWritingMode(rect);
- offset_to_container_box.left = rect.X();
+ LayoutRect layout_rect = containing_block->FlipForWritingMode(rect);
+ offset_to_container_box.left = layout_rect.X();
}
}
@@ -596,9 +597,9 @@ enum LayerPaintPhase {
static void Write(WTF::TextStream& ts,
PaintLayer& layer,
- const LayoutRect& layer_bounds,
- const LayoutRect& background_clip_rect,
- const LayoutRect& clip_rect,
+ const PhysicalRect& layer_bounds,
+ const PhysicalRect& background_clip_rect,
+ const PhysicalRect& clip_rect,
LayerPaintPhase paint_phase = kLayerPaintPhaseAll,
int indent = 0,
LayoutAsTextBehavior behavior = kLayoutAsTextBehaviorNormal,
@@ -706,7 +707,7 @@ void LayoutTreeAsText::WriteLayers(WTF::TextStream& ts,
LayoutAsTextBehavior behavior,
const PaintLayer* marked_layer) {
// Calculate the clip rects we should use.
- LayoutRect layer_bounds;
+ PhysicalRect layer_bounds;
ClipRect damage_rect, clip_rect_to_apply;
if (layer->GetLayoutObject().FirstFragment().HasLocalBorderBoxProperties()) {
layer->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
@@ -723,7 +724,7 @@ void LayoutTreeAsText::WriteLayers(WTF::TextStream& ts,
nullptr, layer_bounds, damage_rect, clip_rect_to_apply);
}
- LayoutPoint offset_from_root;
+ PhysicalOffset offset_from_root;
layer->ConvertToLayerCoords(root_layer, offset_from_root);
bool should_paint =
(behavior & kLayoutAsTextShowAllLayers)