Commit 9163630e authored by Ian Kilpatrick's avatar Ian Kilpatrick Committed by Commit Bot

[LayoutNG] Remove devtools inspect color shifting for NG objects.

As above this is a partial revert of:
https://chromium-review.googlesource.com/c/chromium/src/+/1158391

(partial as LayoutObject::IsLayoutNGObject() is used elsewhere now).

Bug: 869866
Change-Id: I9e775fc484f004445a0a7d03cd899943dc5a07af
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1611859
Commit-Queue: Joel Einbinder <einbinder@chromium.org>
Auto-Submit: Ian Kilpatrick <ikilpatrick@chromium.org>
Reviewed-by: default avatarJoel Einbinder <einbinder@chromium.org>
Cr-Commit-Position: refs/heads/master@{#659682}
parent 9b162a31
......@@ -639,17 +639,11 @@ void InspectorHighlight::AppendNodeHighlight(
if (!layout_object)
return;
// Just for testing, invert the content color for nodes rendered by LayoutNG.
// TODO(layout-dev): Stop munging the color before NG ships. crbug.com/869866
Color content_color =
layout_object->IsLayoutNGObject() && !WebTestSupport::IsRunningWebTest()
? Color(highlight_config.content.Rgb() ^ 0x00ffffff)
: highlight_config.content;
Vector<FloatQuad> svg_quads;
if (BuildSVGQuads(node, svg_quads)) {
for (wtf_size_t i = 0; i < svg_quads.size(); ++i) {
AppendQuad(svg_quads[i], content_color, highlight_config.content_outline);
AppendQuad(svg_quads[i], highlight_config.content,
highlight_config.content_outline);
}
return;
}
......@@ -657,8 +651,8 @@ void InspectorHighlight::AppendNodeHighlight(
FloatQuad content, padding, border, margin;
if (!BuildNodeQuads(node, &content, &padding, &border, &margin))
return;
AppendQuad(content, content_color, highlight_config.content_outline,
"content");
AppendQuad(content, highlight_config.content,
highlight_config.content_outline, "content");
AppendQuad(padding, highlight_config.padding, Color::kTransparent, "padding");
AppendQuad(border, highlight_config.border, Color::kTransparent, "border");
AppendQuad(margin, highlight_config.margin, Color::kTransparent, "margin");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment