diff options
24 files changed, 97 insertions, 57 deletions
diff --git a/ui/ozone/BUILD.gn b/ui/ozone/BUILD.gn index da5f9ab..4d13863 100644 --- a/ui/ozone/BUILD.gn +++ b/ui/ozone/BUILD.gn @@ -68,23 +68,6 @@ config("vgem_map") { # GYP version: ui/ozone/ozone.gyp:ozone_base component("ozone_base") { sources = [ - "common/display_mode_proxy.cc", - "common/display_mode_proxy.h", - "common/display_snapshot_proxy.cc", - "common/display_snapshot_proxy.h", - "common/display_util.cc", - "common/display_util.h", - "common/egl_util.cc", - "common/egl_util.h", - "common/gpu/ozone_gpu_message_generator.cc", - "common/gpu/ozone_gpu_message_generator.h", - "common/gpu/ozone_gpu_message_params.cc", - "common/gpu/ozone_gpu_message_params.h", - "common/gpu/ozone_gpu_messages.h", - "common/native_display_delegate_ozone.cc", - "common/native_display_delegate_ozone.h", - "common/stub_overlay_manager.cc", - "common/stub_overlay_manager.h", "public/cursor_factory_ozone.cc", "public/cursor_factory_ozone.h", "public/gpu_platform_support.cc", @@ -108,7 +91,7 @@ component("ozone_base") { defines = [ "OZONE_BASE_IMPLEMENTATION" ] - deps = [ + public_deps = [ "//base", "//ipc", "//skia", diff --git a/ui/ozone/common/BUILD.gn b/ui/ozone/common/BUILD.gn new file mode 100644 index 0000000..5fca52d --- /dev/null +++ b/ui/ozone/common/BUILD.gn @@ -0,0 +1,33 @@ +# Copyright 2016 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/ui.gni") + +assert(use_ozone) + +source_set("common") { + sources = [ + "display_mode_proxy.cc", + "display_mode_proxy.h", + "display_snapshot_proxy.cc", + "display_snapshot_proxy.h", + "display_util.cc", + "display_util.h", + "egl_util.cc", + "egl_util.h", + "gpu/ozone_gpu_message_generator.cc", + "gpu/ozone_gpu_message_generator.h", + "gpu/ozone_gpu_message_params.cc", + "gpu/ozone_gpu_message_params.h", + "gpu/ozone_gpu_messages.h", + "native_display_delegate_ozone.cc", + "native_display_delegate_ozone.h", + "stub_overlay_manager.cc", + "stub_overlay_manager.h", + ] + + public_deps = [ + "//ui/ozone:ozone_base", + ] +} diff --git a/ui/ozone/common/display_mode_proxy.h b/ui/ozone/common/display_mode_proxy.h index 0b35379..c1821acb 100644 --- a/ui/ozone/common/display_mode_proxy.h +++ b/ui/ozone/common/display_mode_proxy.h @@ -7,13 +7,12 @@ #include "base/macros.h" #include "ui/display/types/display_mode.h" -#include "ui/ozone/ozone_base_export.h" namespace ui { struct DisplayMode_Params; -class OZONE_BASE_EXPORT DisplayModeProxy : public DisplayMode { +class DisplayModeProxy : public DisplayMode { public: DisplayModeProxy(const DisplayMode_Params& params); ~DisplayModeProxy() override; diff --git a/ui/ozone/common/display_snapshot_proxy.h b/ui/ozone/common/display_snapshot_proxy.h index f2a53eb..6a5c4c9 100644 --- a/ui/ozone/common/display_snapshot_proxy.h +++ b/ui/ozone/common/display_snapshot_proxy.h @@ -7,13 +7,12 @@ #include "base/macros.h" #include "ui/display/types/display_snapshot.h" -#include "ui/ozone/ozone_base_export.h" namespace ui { struct DisplaySnapshot_Params; -class OZONE_BASE_EXPORT DisplaySnapshotProxy : public DisplaySnapshot { +class DisplaySnapshotProxy : public DisplaySnapshot { public: DisplaySnapshotProxy(const DisplaySnapshot_Params& params); ~DisplaySnapshotProxy() override; diff --git a/ui/ozone/common/display_util.h b/ui/ozone/common/display_util.h index efa4e91..9887126 100644 --- a/ui/ozone/common/display_util.h +++ b/ui/ozone/common/display_util.h @@ -10,7 +10,6 @@ #include <vector> #include "ui/ozone/common/gpu/ozone_gpu_message_params.h" -#include "ui/ozone/ozone_base_export.h" namespace base { class FilePath; @@ -33,8 +32,7 @@ class FindDisplayById { int64_t display_id_; }; -DisplayMode_Params OZONE_BASE_EXPORT -GetDisplayModeParams(const DisplayMode& mode); +DisplayMode_Params GetDisplayModeParams(const DisplayMode& mode); DisplaySnapshot_Params GetDisplaySnapshotParams(const DisplaySnapshot& display); // Create a display using the Ozone command line parameters. diff --git a/ui/ozone/common/egl_util.h b/ui/ozone/common/egl_util.h index c18d708..dbf9a8f 100644 --- a/ui/ozone/common/egl_util.h +++ b/ui/ozone/common/egl_util.h @@ -5,19 +5,16 @@ #ifndef UI_OZONE_COMMON_EGL_UTIL_H_ #define UI_OZONE_COMMON_EGL_UTIL_H_ -#include "ui/ozone/ozone_base_export.h" #include "ui/ozone/public/surface_factory_ozone.h" #include "ui/ozone/public/surface_ozone_egl.h" namespace ui { -OZONE_BASE_EXPORT bool LoadDefaultEGLGLES2Bindings( SurfaceFactoryOzone::AddGLLibraryCallback add_gl_library, SurfaceFactoryOzone::SetGLGetProcAddressProcCallback set_gl_get_proc_address); -OZONE_BASE_EXPORT bool LoadEGLGLES2Bindings( SurfaceFactoryOzone::AddGLLibraryCallback add_gl_library, SurfaceFactoryOzone::SetGLGetProcAddressProcCallback @@ -25,7 +22,6 @@ bool LoadEGLGLES2Bindings( const char* egl_library_name, const char* gles_library_name); -OZONE_BASE_EXPORT void* /* EGLConfig */ ChooseEGLConfig(const EglConfigCallbacks& egl, const int32_t* attributes); diff --git a/ui/ozone/common/gpu/ozone_gpu_message_params.h b/ui/ozone/common/gpu/ozone_gpu_message_params.h index 820bc2c..db948fb 100644 --- a/ui/ozone/common/gpu/ozone_gpu_message_params.h +++ b/ui/ozone/common/gpu/ozone_gpu_message_params.h @@ -16,12 +16,11 @@ #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/size.h" #include "ui/gfx/overlay_transform.h" -#include "ui/ozone/ozone_base_export.h" #include "ui/ozone/public/overlay_candidates_ozone.h" namespace ui { -struct OZONE_BASE_EXPORT DisplayMode_Params { +struct DisplayMode_Params { DisplayMode_Params(); ~DisplayMode_Params(); @@ -30,7 +29,7 @@ struct OZONE_BASE_EXPORT DisplayMode_Params { float refresh_rate = 0.0f; }; -struct OZONE_BASE_EXPORT DisplaySnapshot_Params { +struct DisplaySnapshot_Params { DisplaySnapshot_Params(); ~DisplaySnapshot_Params(); @@ -52,7 +51,7 @@ struct OZONE_BASE_EXPORT DisplaySnapshot_Params { std::string string_representation; }; -struct OZONE_BASE_EXPORT OverlayCheck_Params { +struct OverlayCheck_Params { OverlayCheck_Params(); OverlayCheck_Params( const OverlayCandidatesOzone::OverlaySurfaceCandidate& candidate); diff --git a/ui/ozone/common/gpu/ozone_gpu_messages.h b/ui/ozone/common/gpu/ozone_gpu_messages.h index 0960a76..96048cb 100644 --- a/ui/ozone/common/gpu/ozone_gpu_messages.h +++ b/ui/ozone/common/gpu/ozone_gpu_messages.h @@ -20,10 +20,9 @@ #include "ui/gfx/ipc/gfx_param_traits_macros.h" #include "ui/gfx/native_widget_types.h" #include "ui/ozone/common/gpu/ozone_gpu_message_params.h" -#include "ui/ozone/ozone_base_export.h" #undef IPC_MESSAGE_EXPORT -#define IPC_MESSAGE_EXPORT OZONE_BASE_EXPORT +#define IPC_MESSAGE_EXPORT #define IPC_MESSAGE_START OzoneGpuMsgStart diff --git a/ui/ozone/common/native_display_delegate_ozone.h b/ui/ozone/common/native_display_delegate_ozone.h index 8c5a8cb..6def01f 100644 --- a/ui/ozone/common/native_display_delegate_ozone.h +++ b/ui/ozone/common/native_display_delegate_ozone.h @@ -10,12 +10,10 @@ #include "base/macros.h" #include "base/memory/scoped_vector.h" #include "ui/display/types/native_display_delegate.h" -#include "ui/ozone/ozone_base_export.h" namespace ui { -class OZONE_BASE_EXPORT NativeDisplayDelegateOzone - : public NativeDisplayDelegate { +class NativeDisplayDelegateOzone : public NativeDisplayDelegate { public: NativeDisplayDelegateOzone(); ~NativeDisplayDelegateOzone() override; diff --git a/ui/ozone/common/stub_overlay_manager.h b/ui/ozone/common/stub_overlay_manager.h index 3d42c2b..54fa3a3 100644 --- a/ui/ozone/common/stub_overlay_manager.h +++ b/ui/ozone/common/stub_overlay_manager.h @@ -6,12 +6,11 @@ #define UI_OZONE_COMMON_STUB_OVERLAY_MANAGER_H_ #include "base/macros.h" -#include "ui/ozone/ozone_base_export.h" #include "ui/ozone/public/overlay_manager_ozone.h" namespace ui { -class OZONE_BASE_EXPORT StubOverlayManager : public OverlayManagerOzone { +class StubOverlayManager : public OverlayManagerOzone { public: StubOverlayManager(); ~StubOverlayManager() override; diff --git a/ui/ozone/ozone.gyp b/ui/ozone/ozone.gyp index 3c9c860..18cdd65 100644 --- a/ui/ozone/ozone.gyp +++ b/ui/ozone/ozone.gyp @@ -42,23 +42,6 @@ 'OZONE_BASE_IMPLEMENTATION', ], 'sources': [ - 'common/display_mode_proxy.cc', - 'common/display_mode_proxy.h', - 'common/display_snapshot_proxy.cc', - 'common/display_snapshot_proxy.h', - 'common/display_util.cc', - 'common/display_util.h', - 'common/egl_util.cc', - 'common/egl_util.h', - 'common/gpu/ozone_gpu_message_generator.cc', - 'common/gpu/ozone_gpu_message_generator.h', - 'common/gpu/ozone_gpu_message_params.cc', - 'common/gpu/ozone_gpu_message_params.h', - 'common/gpu/ozone_gpu_messages.h', - 'common/native_display_delegate_ozone.cc', - 'common/native_display_delegate_ozone.h', - 'common/stub_overlay_manager.cc', - 'common/stub_overlay_manager.h', 'public/client_native_pixmap.h', 'public/cursor_factory_ozone.cc', 'public/cursor_factory_ozone.h', @@ -83,6 +66,40 @@ ], }, { + # GN version: //ui/ozone/common + 'target_name': 'ozone_common', + 'type': 'static_library', + 'dependencies': [ + 'ozone_base', + '<(DEPTH)/base/base.gyp:base', + '<(DEPTH)/ipc/ipc.gyp:ipc', + '<(DEPTH)/skia/skia.gyp:skia', + '<(DEPTH)/ui/display/display.gyp:display_types', + '<(DEPTH)/ui/display/display.gyp:display_util', + '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', + '<(DEPTH)/ui/gfx/ipc/gfx_ipc.gyp:gfx_ipc', + ], + 'sources': [ + 'common/display_mode_proxy.cc', + 'common/display_mode_proxy.h', + 'common/display_snapshot_proxy.cc', + 'common/display_snapshot_proxy.h', + 'common/display_util.cc', + 'common/display_util.h', + 'common/egl_util.cc', + 'common/egl_util.h', + 'common/gpu/ozone_gpu_message_generator.cc', + 'common/gpu/ozone_gpu_message_generator.h', + 'common/gpu/ozone_gpu_message_params.cc', + 'common/gpu/ozone_gpu_message_params.h', + 'common/gpu/ozone_gpu_messages.h', + 'common/native_display_delegate_ozone.cc', + 'common/native_display_delegate_ozone.h', + 'common/stub_overlay_manager.cc', + 'common/stub_overlay_manager.h', + ], + }, + { # GN version: //ui/ozone:platform 'target_name': 'ozone_platform', 'type': 'static_library', diff --git a/ui/ozone/platform/caca/BUILD.gn b/ui/ozone/platform/caca/BUILD.gn index 7f4aa89..32a3892 100644 --- a/ui/ozone/platform/caca/BUILD.gn +++ b/ui/ozone/platform/caca/BUILD.gn @@ -29,6 +29,7 @@ source_set("caca") { "//ui/gfx", "//ui/gfx/geometry", "//ui/ozone:ozone_base", + "//ui/ozone/common", "//ui/platform_window", ] diff --git a/ui/ozone/platform/caca/caca.gypi b/ui/ozone/platform/caca/caca.gypi index fc1b6d2..4fccd3d 100644 --- a/ui/ozone/platform/caca/caca.gypi +++ b/ui/ozone/platform/caca/caca.gypi @@ -19,6 +19,8 @@ 'OZONE_IMPLEMENTATION', ], 'dependencies': [ + 'ozone.gyp:ozone_base', + 'ozone.gyp:ozone_common', '../../base/base.gyp:base', '../../skia/skia.gyp:skia', '../events/events.gyp:events', diff --git a/ui/ozone/platform/cast/BUILD.gn b/ui/ozone/platform/cast/BUILD.gn index 29c3e10..0365def 100644 --- a/ui/ozone/platform/cast/BUILD.gn +++ b/ui/ozone/platform/cast/BUILD.gn @@ -38,5 +38,6 @@ source_set("cast") { "//ui/gfx", "//ui/gfx/geometry", "//ui/ozone:ozone_base", + "//ui/ozone/common", ] } diff --git a/ui/ozone/platform/cast/cast.gypi b/ui/ozone/platform/cast/cast.gypi index 22b33bd..ce3a62d 100644 --- a/ui/ozone/platform/cast/cast.gypi +++ b/ui/ozone/platform/cast/cast.gypi @@ -18,6 +18,8 @@ 'target_name': 'ozone_platform_cast', 'type': 'static_library', 'dependencies': [ + 'ozone.gyp:ozone_base', + 'ozone.gyp:ozone_common', '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../gfx/gfx.gyp:gfx_geometry', diff --git a/ui/ozone/platform/drm/BUILD.gn b/ui/ozone/platform/drm/BUILD.gn index 30cd686..391e536 100644 --- a/ui/ozone/platform/drm/BUILD.gn +++ b/ui/ozone/platform/drm/BUILD.gn @@ -132,6 +132,7 @@ source_set("gbm") { "//ui/gfx", "//ui/gfx/geometry", "//ui/ozone:ozone_base", + "//ui/ozone/common", "//ui/platform_window", ] @@ -190,6 +191,7 @@ source_set("gbm_unittests") { "//testing/gtest", "//ui/gfx", "//ui/ozone:platform", + "//ui/ozone/common", ] public_configs = [ ":libdrm" ] diff --git a/ui/ozone/platform/drm/gbm.gypi b/ui/ozone/platform/drm/gbm.gypi index cc1a0a7..1309b78 100644 --- a/ui/ozone/platform/drm/gbm.gypi +++ b/ui/ozone/platform/drm/gbm.gypi @@ -34,6 +34,8 @@ 'target_name': 'ozone_platform_gbm', 'type': 'static_library', 'dependencies': [ + 'ozone.gyp:ozone_base', + 'ozone.gyp:ozone_common', '../../base/base.gyp:base', '../../build/linux/system.gyp:libdrm', '../../third_party/minigbm/minigbm.gyp:minigbm', diff --git a/ui/ozone/platform/egltest/BUILD.gn b/ui/ozone/platform/egltest/BUILD.gn index f0e019b..a2dcc29 100644 --- a/ui/ozone/platform/egltest/BUILD.gn +++ b/ui/ozone/platform/egltest/BUILD.gn @@ -26,6 +26,7 @@ source_set("egltest") { "//ui/events/platform", "//ui/gfx", "//ui/ozone:ozone_base", + "//ui/ozone/common", "//ui/platform_window", ] } diff --git a/ui/ozone/platform/egltest/egltest.gypi b/ui/ozone/platform/egltest/egltest.gypi index 4f79c56..8daed8c 100644 --- a/ui/ozone/platform/egltest/egltest.gypi +++ b/ui/ozone/platform/egltest/egltest.gypi @@ -19,6 +19,8 @@ 'OZONE_IMPLEMENTATION', ], 'dependencies': [ + 'ozone.gyp:ozone_base', + 'ozone.gyp:ozone_common', '../../base/base.gyp:base', '../../third_party/khronos/khronos.gyp:khronos_headers', '../events/devices/events_devices.gyp:events_devices', diff --git a/ui/ozone/platform/headless/BUILD.gn b/ui/ozone/platform/headless/BUILD.gn index cb9f26a..b65b524 100644 --- a/ui/ozone/platform/headless/BUILD.gn +++ b/ui/ozone/platform/headless/BUILD.gn @@ -25,6 +25,7 @@ source_set("headless") { "//ui/events/platform", "//ui/gfx/geometry", "//ui/ozone:ozone_base", + "//ui/ozone/common", "//ui/platform_window", ] } diff --git a/ui/ozone/platform/headless/headless.gypi b/ui/ozone/platform/headless/headless.gypi index 65de1fa..c356992 100644 --- a/ui/ozone/platform/headless/headless.gypi +++ b/ui/ozone/platform/headless/headless.gypi @@ -19,6 +19,8 @@ 'OZONE_IMPLEMENTATION', ], 'dependencies': [ + 'ozone.gyp:ozone_base', + 'ozone.gyp:ozone_common', '../../base/base.gyp:base', '../base/ui_base.gyp:ui_base', '../events/events.gyp:events', diff --git a/ui/ozone/platform/wayland/BUILD.gn b/ui/ozone/platform/wayland/BUILD.gn index bc8b37e..81e1385 100644 --- a/ui/ozone/platform/wayland/BUILD.gn +++ b/ui/ozone/platform/wayland/BUILD.gn @@ -27,6 +27,7 @@ source_set("wayland") { "//ui/gfx", "//ui/gfx/geometry", "//ui/ozone:ozone_base", + "//ui/ozone/common", "//ui/platform_window", ] diff --git a/ui/ozone/platform/wayland/wayland.gypi b/ui/ozone/platform/wayland/wayland.gypi index 336f1d6..d872403 100644 --- a/ui/ozone/platform/wayland/wayland.gypi +++ b/ui/ozone/platform/wayland/wayland.gypi @@ -22,6 +22,8 @@ 'OZONE_IMPLEMENTATION', ], 'dependencies': [ + 'ozone.gyp:ozone_base', + 'ozone.gyp:ozone_common', '../../base/base.gyp:base', '../../skia/skia.gyp:skia', '../../third_party/wayland-protocols/wayland-protocols.gyp:xdg_shell_protocol', diff --git a/ui/ozone/platform/x11/BUILD.gn b/ui/ozone/platform/x11/BUILD.gn index d38682d..22f26ee 100644 --- a/ui/ozone/platform/x11/BUILD.gn +++ b/ui/ozone/platform/x11/BUILD.gn @@ -30,6 +30,7 @@ source_set("x11") { "//ui/gfx/geometry", "//ui/gfx/x", "//ui/ozone:ozone_base", + "//ui/ozone/common", "//ui/platform_window/x11", ] |