Skip to content

Commit

Permalink
Constrict DEPS so //content/ can't add further dependencies on ozone.
Browse files Browse the repository at this point in the history
Under --mus and --mash, the code in //content/ can't access the raw
ozone devices. It appears the most of the uses of ozone aren't used in
mus builds anyway. Further constrain DEPS so new instances can't be
added.

Bug: 734668
Change-Id: I5b8661aa4c000a58602ffce0e6f3e9cf35cff87e
Reviewed-on: https://chromium-review.googlesource.com/617591
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Elliot Glaysher <erg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#495228}
  • Loading branch information
eglaysher authored and Commit Bot committed Aug 17, 2017
1 parent cae7bbb commit 2f18c48
Show file tree
Hide file tree
Showing 8 changed files with 54 additions and 6 deletions.
1 change: 0 additions & 1 deletion content/DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ include_rules = [
"+ui/gl",
"+ui/latency",
"+ui/native_theme",
"+ui/ozone/public",
"+ui/resources/grit/ui_resources.h",
"+ui/resources/grit/webui_resources.h",
"+ui/resources/grit/webui_resources_map.h",
Expand Down
14 changes: 14 additions & 0 deletions content/browser/compositor/DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,17 @@ include_rules = [
"+services/ui/public/cpp",
"+ui/platform_window",
]

# TODO(crbug.com/734668): Dependencies on ozone should be removed, as content
# embedded in mus won't be able to talk to the native ozone.
specific_include_rules = {
".*ozone.*cc": [
"+ui/ozone/public",
],
"gpu_process_transport_factory\.cc": [
"+ui/ozone/public",
],
"reflector_impl_unittest\.cc": [
"+ui/ozone/public",
]
}
10 changes: 10 additions & 0 deletions content/browser/gpu/DEPS
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# TODO(crbug.com/734668): Dependencies on ozone should be removed, as content
# embedded in mus won't be able to talk to the native ozone.
specific_include_rules = {
"gpu_data_manager_impl_private\.cc": [
"+ui/ozone/public/ozone_switches.h",
],
"gpu_process_host\.cc": [
"+ui/ozone/public",
],
}
3 changes: 3 additions & 0 deletions content/browser/renderer_host/DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ specific_include_rules = {
],
"render_process_host_impl\.cc": [
"+content/browser/frame_host/render_frame_message_filter.h",
# TODO(crbug.com/734668): Dependencies on ozone should be removed, as content
# embedded in mus won't be able to talk to the native ozone.
"+ui/ozone/public/ozone_switches.h",
],
"render_widget_host_view_mac\.mm": [
"+content/browser/frame_host",
Expand Down
8 changes: 8 additions & 0 deletions content/common/cursors/DEPS
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
include_rules = [
"+third_party/WebKit/public/platform",
]

specific_include_rules = {
# TODO(crbug.com/734668): Dependencies on ozone should be removed, as content
# embedded in mus won't be able to talk to the native ozone.
"webcursor_ozone.cc": [
"+ui/ozone/public/cursor_factory_ozone.h",
],
}
14 changes: 14 additions & 0 deletions content/gpu/DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,17 @@ include_rules = [
"+sandbox",
"+skia",
]

# TODO(crbug.com/734668): Dependencies on ozone should be removed, as content
# embedded in mus won't be able to talk to the native ozone.
specific_include_rules = {
"gpu_child_thread\.cc": [
"+ui/ozone/public/ozone_platform.h",
],
"gpu_main\.cc": [
"+ui/ozone/public/ozone_platform.h",
],
"in_process_gpu_thread\.cc": [
"+ui/ozone/public/ozone_platform.h",
]
}
5 changes: 0 additions & 5 deletions content/public/test/content_test_suite_base.cc
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@
#include "content/public/browser/android/compositor.h"
#endif

#if defined(USE_OZONE)
#include "ui/ozone/public/ozone_platform.h"
#endif


namespace content {

ContentTestSuiteBase::ContentTestSuiteBase(int argc, char** argv)
Expand Down
5 changes: 5 additions & 0 deletions content/renderer/DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,9 @@ specific_include_rules = {
"+components/discardable_memory/service",
"+content/browser/browser_main_loop.h",
],
# TODO(crbug.com/734668): Dependencies on ozone should be removed, as content
# embedded in mus won't be able to talk to the native ozone.
"renderer_main\.cc": [
"+ui/ozone/public/client_native_pixmap_factory_ozone.h",
]
}

0 comments on commit 2f18c48

Please sign in to comment.