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

Unified Diff: components/mus/public/cpp/lib/window_tree_client_impl.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/public/cpp/lib/window_tree_client_impl.cc
diff --git a/components/mus/public/cpp/lib/window_tree_client_impl.cc b/components/mus/public/cpp/lib/window_tree_client_impl.cc
index 38485f329fe5f6a9f6949c2a0fc66381d1003398..143b6ce5d7564cf1deff5f9e03e4cc2d7ecd7737 100644
--- a/components/mus/public/cpp/lib/window_tree_client_impl.cc
+++ b/components/mus/public/cpp/lib/window_tree_client_impl.cc
@@ -22,7 +22,6 @@
#include "components/mus/public/cpp/window_tree_connection.h"
#include "components/mus/public/cpp/window_tree_connection_observer.h"
#include "components/mus/public/cpp/window_tree_delegate.h"
-#include "mojo/converters/geometry/geometry_type_converters.h"
#include "mojo/converters/input_events/input_events_type_converters.h"
#include "services/shell/public/cpp/connector.h"
#include "ui/events/event.h"
@@ -57,8 +56,7 @@ Window* AddWindowToConnection(WindowTreeClientImpl* client,
window_data->properties
.To<std::map<std::string, std::vector<uint8_t>>>());
client->AddWindow(window);
- private_window.LocalSetBounds(gfx::Rect(),
- window_data->bounds.To<gfx::Rect>());
+ private_window.LocalSetBounds(gfx::Rect(), window_data->bounds);
if (parent)
WindowPrivate(parent).LocalAddChild(window);
return window;
@@ -275,8 +273,7 @@ void WindowTreeClientImpl::SetBounds(Window* window,
DCHECK(tree_);
const uint32_t change_id = ScheduleInFlightChange(
base::WrapUnique(new InFlightBoundsChange(window, old_bounds)));
- tree_->SetWindowBounds(change_id, server_id(window),
- mojo::Rect::From(bounds));
+ tree_->SetWindowBounds(change_id, server_id(window), bounds);
}
void WindowTreeClientImpl::SetCapture(Window* window) {
@@ -308,19 +305,18 @@ void WindowTreeClientImpl::SetClientArea(
const gfx::Insets& client_area,
const std::vector<gfx::Rect>& additional_client_areas) {
DCHECK(tree_);
- tree_->SetClientArea(
- window_id, mojo::Insets::From(client_area),
- mojo::Array<mojo::RectPtr>::From(additional_client_areas));
+ tree_->SetClientArea(window_id, client_area,
+ std::vector<gfx::Rect>(additional_client_areas));
dcheng 2016/05/26 22:20:40 Why is there an explicit copy here?
Sam McNally 2016/05/27 03:44:47 mojo::Array has a std::vector constructor, but it
dcheng 2016/05/27 03:47:54 Why can't it have a const std::vector<>& version t
Sam McNally 2016/05/27 06:34:05 Done. mojo::Array is getting quite strange now: mo
}
void WindowTreeClientImpl::SetHitTestMask(Id window_id, const gfx::Rect& mask) {
DCHECK(tree_);
- tree_->SetHitTestMask(window_id, mojo::Rect::From(mask));
+ tree_->SetHitTestMask(window_id, mask);
}
void WindowTreeClientImpl::ClearHitTestMask(Id window_id) {
DCHECK(tree_);
- tree_->SetHitTestMask(window_id, nullptr);
+ tree_->SetHitTestMask(window_id, {});
}
void WindowTreeClientImpl::SetFocus(Window* window) {
@@ -740,7 +736,7 @@ void WindowTreeClientImpl::OnTopLevelCreated(uint32_t change_id,
window_private.LocalSetVisible(true);
}
- const gfx::Rect bounds(data->bounds.To<gfx::Rect>());
+ const gfx::Rect bounds(data->bounds);
{
InFlightBoundsChange bounds_change(window, bounds);
InFlightChange* current_change =
@@ -771,28 +767,27 @@ void WindowTreeClientImpl::OnTopLevelCreated(uint32_t change_id,
}
void WindowTreeClientImpl::OnWindowBoundsChanged(Id window_id,
- mojo::RectPtr old_bounds,
- mojo::RectPtr new_bounds) {
+ const gfx::Rect& old_bounds,
+ const gfx::Rect& new_bounds) {
Window* window = GetWindowByServerId(window_id);
if (!window)
return;
- InFlightBoundsChange new_change(window, new_bounds.To<gfx::Rect>());
+ InFlightBoundsChange new_change(window, new_bounds);
if (ApplyServerChangeToExistingInFlightChange(new_change))
return;
- WindowPrivate(window)
- .LocalSetBounds(old_bounds.To<gfx::Rect>(), new_bounds.To<gfx::Rect>());
+ WindowPrivate(window).LocalSetBounds(old_bounds, new_bounds);
}
void WindowTreeClientImpl::OnClientAreaChanged(
uint32_t window_id,
- mojo::InsetsPtr new_client_area,
- mojo::Array<mojo::RectPtr> new_additional_client_areas) {
+ const gfx::Insets& new_client_area,
+ mojo::Array<gfx::Rect> new_additional_client_areas) {
Window* window = GetWindowByServerId(window_id);
if (window) {
WindowPrivate(window).LocalSetClientArea(
- new_client_area.To<gfx::Insets>(),
+ new_client_area,
new_additional_client_areas.To<std::vector<gfx::Rect>>());
}
}
@@ -1036,17 +1031,17 @@ void WindowTreeClientImpl::RequestClose(uint32_t window_id) {
void WindowTreeClientImpl::WmSetBounds(uint32_t change_id,
Id window_id,
- mojo::RectPtr transit_bounds) {
+ const gfx::Rect& transit_bounds) {
Window* window = GetWindowByServerId(window_id);
bool result = false;
if (window) {
DCHECK(window_manager_delegate_);
- gfx::Rect bounds = transit_bounds.To<gfx::Rect>();
+ gfx::Rect bounds = transit_bounds;
result = window_manager_delegate_->OnWmSetBounds(window, &bounds);
if (result) {
// If the resulting bounds differ return false. Returning false ensures
// the client applies the bounds we set below.
- result = bounds == transit_bounds.To<gfx::Rect>();
+ result = bounds == transit_bounds;
window->SetBounds(bounds);
}
}
@@ -1160,8 +1155,7 @@ void WindowTreeClientImpl::SetUnderlaySurfaceOffsetAndExtendedHitArea(
const gfx::Insets& hit_area) {
if (window_manager_internal_client_) {
window_manager_internal_client_->SetUnderlaySurfaceOffsetAndExtendedHitArea(
- server_id(window), offset.x(), offset.y(),
- mojo::Insets::From(hit_area));
+ server_id(window), offset.x(), offset.y(), hit_area);
}
}

Powered by Google App Engine
This is Rietveld 408576698