Commit 87e27d9a authored by Scott Violet's avatar Scott Violet Committed by Commit Bot

Revert "latency_info: remove unnecessary dep"

This reverts commit e8aa5e34.

Reason for revert: Looks to have broken build.

Original change's description:
> latency_info: remove unnecessary dep
> 
> latency_info was including and depending upon gfx, but it isn't actually
> using anything from there. This removes the deps and fixs the targets that
> were using gfx.
> 
> BUG=none
> TEST=none
> 
> Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel
> Change-Id: I7f5f04316b9d11d55ed442d99e34e4155e36566a
> Reviewed-on: https://chromium-review.googlesource.com/c/1267516
> Reviewed-by: Tom Sepez <tsepez@chromium.org>
> Commit-Queue: Scott Violet <sky@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#597638}

TBR=sky@chromium.org,tsepez@google.com,tsepez@chromium.org

Change-Id: I367de1e9d0a003c02d05bcf15505e3d45dc68bca
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: none
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel
Reviewed-on: https://chromium-review.googlesource.com/c/1269107Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#597643}
parent 14a7b2c9
...@@ -349,7 +349,6 @@ source_set("common") { ...@@ -349,7 +349,6 @@ source_set("common") {
"//ui/events/blink", "//ui/events/blink",
"//ui/gfx", "//ui/gfx",
"//ui/gfx/geometry", "//ui/gfx/geometry",
"//ui/gfx/geometry/mojo:struct_traits",
"//ui/gfx/ipc", "//ui/gfx/ipc",
"//ui/gfx/ipc/color", "//ui/gfx/ipc/color",
"//ui/gfx/ipc/geometry", "//ui/gfx/ipc/geometry",
......
...@@ -7,7 +7,6 @@ public_headers = [ "//cc/trees/render_frame_metadata.h" ] ...@@ -7,7 +7,6 @@ public_headers = [ "//cc/trees/render_frame_metadata.h" ]
traits_headers = [ "//content/common/render_frame_metadata_struct_traits.h" ] traits_headers = [ "//content/common/render_frame_metadata_struct_traits.h" ]
deps = [ deps = [
"//cc", "//cc",
"//ui/gfx/geometry/mojo:struct_traits",
] ]
sources = [ sources = [
"//content/common/render_frame_metadata_struct_traits.cc", "//content/common/render_frame_metadata_struct_traits.cc",
......
...@@ -1945,7 +1945,6 @@ test("content_unittests") { ...@@ -1945,7 +1945,6 @@ test("content_unittests") {
"//ui/events/blink", "//ui/events/blink",
"//ui/gfx:test_support", "//ui/gfx:test_support",
"//ui/gfx/geometry", "//ui/gfx/geometry",
"//ui/gfx/geometry/mojo:struct_traits",
"//ui/gfx/ipc", "//ui/gfx/ipc",
"//ui/gfx/ipc/skia", "//ui/gfx/ipc/skia",
"//ui/gl", "//ui/gl",
......
...@@ -47,6 +47,5 @@ source_set("perftests") { ...@@ -47,6 +47,5 @@ source_set("perftests") {
"//ui/gfx", "//ui/gfx",
"//ui/gfx:test_support", "//ui/gfx:test_support",
"//ui/gfx/geometry", "//ui/gfx/geometry",
"//ui/gfx/geometry/mojo:struct_traits",
] ]
} }
...@@ -14,5 +14,4 @@ sources = [ ...@@ -14,5 +14,4 @@ sources = [
type_mappings = [ "viz.mojom.TransferableResource=viz::TransferableResource" ] type_mappings = [ "viz.mojom.TransferableResource=viz::TransferableResource" ]
deps = [ deps = [
"//gpu/ipc/common:struct_traits", "//gpu/ipc/common:struct_traits",
"//ui/gfx/geometry/mojo:struct_traits",
] ]
...@@ -70,7 +70,6 @@ source_set("tests") { ...@@ -70,7 +70,6 @@ source_set("tests") {
"//testing/gtest", "//testing/gtest",
"//ui/display/types", "//ui/display/types",
"//ui/gfx:test_support", "//ui/gfx:test_support",
"//ui/gfx/geometry/mojo:struct_traits",
"//ui/gfx/range/mojo:struct_traits", "//ui/gfx/range/mojo:struct_traits",
] ]
} }
...@@ -6,6 +6,3 @@ mojom = "//ui/gfx/mojo/selection_bound.mojom" ...@@ -6,6 +6,3 @@ mojom = "//ui/gfx/mojo/selection_bound.mojom"
public_headers = [ "//ui/gfx/selection_bound.h" ] public_headers = [ "//ui/gfx/selection_bound.h" ]
traits_headers = [ "//ui/gfx/mojo/selection_bound_struct_traits.h" ] traits_headers = [ "//ui/gfx/mojo/selection_bound_struct_traits.h" ]
type_mappings = [ "gfx.mojom.SelectionBound=gfx::SelectionBound" ] type_mappings = [ "gfx.mojom.SelectionBound=gfx::SelectionBound" ]
deps = [
"//ui/gfx/geometry/mojo:struct_traits",
]
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
#ifndef UI_GFX_MOJO_SELECTION_BOUND_STRUCT_TRAITS_H_ #ifndef UI_GFX_MOJO_SELECTION_BOUND_STRUCT_TRAITS_H_
#define UI_GFX_MOJO_SELECTION_BOUND_STRUCT_TRAITS_H_ #define UI_GFX_MOJO_SELECTION_BOUND_STRUCT_TRAITS_H_
#include "ui/gfx/geometry/mojo/geometry_struct_traits.h"
#include "ui/gfx/mojo/selection_bound.mojom-shared.h" #include "ui/gfx/mojo/selection_bound.mojom-shared.h"
#include "ui/gfx/selection_bound.h" #include "ui/gfx/selection_bound.h"
......
...@@ -11,6 +11,7 @@ mojom("interfaces") { ...@@ -11,6 +11,7 @@ mojom("interfaces") {
public_deps = [ public_deps = [
"//mojo/public/mojom/base", "//mojo/public/mojom/base",
"//ui/gfx/geometry/mojo",
] ]
} }
......
include_rules = [ include_rules = [
"+mojo/public", "+mojo/public",
"+ui/gfx/geometry/mojo",
"+ui/latency", "+ui/latency",
] ]
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
module ui.mojom; module ui.mojom;
import "mojo/public/mojom/base/time.mojom"; import "mojo/public/mojom/base/time.mojom";
import "ui/gfx/geometry/mojo/geometry.mojom";
enum LatencyComponentType { enum LatencyComponentType {
// ---------------------------BEGIN COMPONENT------------------------------- // ---------------------------BEGIN COMPONENT-------------------------------
......
...@@ -13,6 +13,7 @@ sources = [ ...@@ -13,6 +13,7 @@ sources = [
"latency_info_struct_traits.h", "latency_info_struct_traits.h",
] ]
public_deps = [ public_deps = [
"//ui/gfx/geometry/mojo:struct_traits",
"//ui/latency", "//ui/latency",
] ]
deps = [ deps = [
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#ifndef UI_LATENCY_MOJO_LATENCY_INFO_STRUCT_TRAITS_H_ #ifndef UI_LATENCY_MOJO_LATENCY_INFO_STRUCT_TRAITS_H_
#define UI_LATENCY_MOJO_LATENCY_INFO_STRUCT_TRAITS_H_ #define UI_LATENCY_MOJO_LATENCY_INFO_STRUCT_TRAITS_H_
#include "ui/gfx/geometry/mojo/geometry_struct_traits.h"
#include "ui/latency/latency_info.h" #include "ui/latency/latency_info.h"
#include "ui/latency/mojo/latency_info.mojom-shared.h" #include "ui/latency/mojo/latency_info.mojom-shared.h"
......
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