commit 9163630ea50a987afb0e477c86fd38791cf57bde
author Ian Kilpatrick <ikilpatrick@chromium.org> Tue May 14 22:09:35 2019
committer Commit Bot <commit-bot@chromium.org> Tue May 14 22:09:35 2019
tree dc60672dffff78ddaef664e01b3bd7289c9fb9da
parent 9b162a3155b787d1a55c2da1f0f3689e45c4b4f5

[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: Joel Einbinder <einbinder@chromium.org>
Cr-Commit-Position: refs/heads/master@{#659682}

third_party/blink/renderer/core/inspector/inspector_highlight.cc

diff --git a/third_party/blink/renderer/core/inspector/inspector_highlight.cc b/third_party/blink/renderer/core/inspector/inspector_highlight.cc
index 09dd603..ba2b988 100644
--- a/third_party/blink/renderer/core/inspector/inspector_highlight.cc
+++ b/third_party/blink/renderer/core/inspector/inspector_highlight.cc
@@ -639,17 +639,11 @@
   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 @@
   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");