Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(572)

Unified Diff: components/mus/ws/platform_display.cc

Issue 2008193002: Change mojo geometry structs from using type converters to StructTraits. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/mus/ws/platform_display.cc
diff --git a/components/mus/ws/platform_display.cc b/components/mus/ws/platform_display.cc
index 10e6e7bc5bd2ae36a06ed6f24b2d5f61271be522..14d886493c4e3b1f78e08c896bcbb099e914f00f 100644
--- a/components/mus/ws/platform_display.cc
+++ b/components/mus/ws/platform_display.cc
@@ -22,7 +22,6 @@
#include "components/mus/ws/server_window_surface.h"
#include "components/mus/ws/server_window_surface_manager.h"
#include "components/mus/ws/window_coordinate_conversions.h"
-#include "mojo/converters/geometry/geometry_type_converters.h"
#include "mojo/converters/input_events/input_events_type_converters.h"
#include "mojo/converters/input_events/mojo_extended_key_event_data.h"
#include "mojo/converters/surfaces/surfaces_type_converters.h"
@@ -48,9 +47,6 @@
#include "ui/ozone/public/ozone_platform.h"
#endif
-using mojo::Rect;
-using mojo::Size;
-
namespace mus {
namespace ws {
@@ -175,16 +171,15 @@ DefaultPlatformDisplay::DefaultPlatformDisplay(
cursor_loader_(ui::CursorLoader::Create()),
#endif
weak_factory_(this) {
- metrics_.size_in_pixels = mojo::Size::New();
- metrics_.size_in_pixels->width = init_params.display_bounds.width();
- metrics_.size_in_pixels->height = init_params.display_bounds.height();
+ metrics_.size_in_pixels.SetSize(init_params.display_bounds.width(),
+ init_params.display_bounds.height());
// TODO(rjkroege): Preserve the display_id when Ozone platform can use it.
}
void DefaultPlatformDisplay::Init(PlatformDisplayDelegate* delegate) {
delegate_ = delegate;
- gfx::Rect bounds(metrics_.size_in_pixels.To<gfx::Size>());
+ gfx::Rect bounds(metrics_.size_in_pixels);
#if defined(OS_WIN)
platform_window_.reset(new ui::WinWindow(this, bounds));
#elif defined(USE_X11)
@@ -319,14 +314,14 @@ void DefaultPlatformDisplay::UpdateMetrics(const gfx::Size& size,
float device_pixel_ratio) {
if (display::Display::HasForceDeviceScaleFactor())
device_pixel_ratio = display::Display::GetForcedDeviceScaleFactor();
- if (metrics_.size_in_pixels.To<gfx::Size>() == size &&
+ if (metrics_.size_in_pixels == size &&
metrics_.device_pixel_ratio == device_pixel_ratio)
return;
mojom::ViewportMetrics old_metrics;
- old_metrics.size_in_pixels = metrics_.size_in_pixels.Clone();
+ old_metrics.size_in_pixels = metrics_.size_in_pixels;
old_metrics.device_pixel_ratio = metrics_.device_pixel_ratio;
- metrics_.size_in_pixels = mojo::Size::From(size);
+ metrics_.size_in_pixels = size;
metrics_.device_pixel_ratio = device_pixel_ratio;
delegate_->OnViewportMetricsChanged(old_metrics, metrics_);
@@ -336,7 +331,7 @@ std::unique_ptr<cc::CompositorFrame>
DefaultPlatformDisplay::GenerateCompositorFrame() {
std::unique_ptr<cc::RenderPass> render_pass = cc::RenderPass::Create();
render_pass->damage_rect = dirty_rect_;
- render_pass->output_rect = gfx::Rect(metrics_.size_in_pixels.To<gfx::Size>());
+ render_pass->output_rect = gfx::Rect(metrics_.size_in_pixels);
std::set<WindowId> referenced_window_ids;
DrawWindowTree(render_pass.get(), delegate_->GetRootWindow(), gfx::Vector2d(),
@@ -423,7 +418,7 @@ void DefaultPlatformDisplay::OnAcceleratedWidgetAvailable(
new DisplayCompositor(base::ThreadTaskRunnerHandle::Get(), widget,
gpu_state_, surfaces_state_));
}
- UpdateMetrics(metrics_.size_in_pixels.To<gfx::Size>(), device_pixel_ratio);
+ UpdateMetrics(metrics_.size_in_pixels, device_pixel_ratio);
}
void DefaultPlatformDisplay::OnAcceleratedWidgetDestroyed() {

Powered by Google App Engine
This is Rietveld 408576698