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

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

Issue 1677513002: mus Window Server: implement event capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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/window_tree_host_impl.cc
diff --git a/components/mus/ws/window_tree_host_impl.cc b/components/mus/ws/window_tree_host_impl.cc
index d75b184a806be277716d0b7fc5c9ce2d45450b3b..293ba42a123a75db98441df8105fd60e616b9e69 100644
--- a/components/mus/ws/window_tree_host_impl.cc
+++ b/components/mus/ws/window_tree_host_impl.cc
@@ -161,6 +161,14 @@ const mojom::ViewportMetrics& WindowTreeHostImpl::GetViewportMetrics() const {
return display_manager_->GetViewportMetrics();
}
+void WindowTreeHostImpl::SetCapture(ServerWindow* window,
+ bool in_nonclient_area) {
+ ServerWindow* capture_window = event_dispatcher_.capture_window();
+ if (capture_window == window)
+ return;
+ event_dispatcher_.SetCaptureWindow(window, in_nonclient_area);
+}
+
mojom::Rotation WindowTreeHostImpl::GetRotation() const {
return display_manager_->GetRotation();
}
@@ -343,6 +351,19 @@ void WindowTreeHostImpl::OnEvent(const ui::Event& event) {
event_dispatcher_.ProcessEvent(std::move(mojo_event));
}
+void WindowTreeHostImpl::SetCapture(ServerWindow* window) {
+ if (window)
sky 2016/02/10 17:38:22 This should never supply null, right? If I'm right
jonross 2016/02/10 19:45:49 Window is no longer passed in. So removed.
+ display_manager_->SetCapture();
+}
+
+void WindowTreeHostImpl::ReleaseCapture(ServerWindow* window) {
+ display_manager_->ReleaseCapture();
+}
+
+void WindowTreeHostImpl::OnLostCapture() {
+ SetCapture(nullptr, false);
+}
+
void WindowTreeHostImpl::OnDisplayClosed() {
if (delegate_)
delegate_->OnDisplayClosed();
@@ -474,6 +495,11 @@ ServerWindow* WindowTreeHostImpl::GetFocusedWindowForEventDispatcher() {
return GetFocusedWindow();
}
+void WindowTreeHostImpl::OnLostCapture(ServerWindow* window) {
+ DCHECK(window);
+ connection_manager_->ProcessLostCapture(window);
+}
+
void WindowTreeHostImpl::DispatchInputEventToWindow(ServerWindow* target,
bool in_nonclient_area,
mojom::EventPtr event) {

Powered by Google App Engine
This is Rietveld 408576698