| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef UI_AURA_MUS_WINDOW_PORT_MUS_H_ | 5 #ifndef UI_AURA_MUS_WINDOW_PORT_MUS_H_ |
| 6 #define UI_AURA_MUS_WINDOW_PORT_MUS_H_ | 6 #define UI_AURA_MUS_WINDOW_PORT_MUS_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 return client_surface_embedder_.get(); | 54 return client_surface_embedder_.get(); |
| 55 } | 55 } |
| 56 | 56 |
| 57 const cc::SurfaceInfo& PrimarySurfaceInfoForTesting() const { | 57 const cc::SurfaceInfo& PrimarySurfaceInfoForTesting() const { |
| 58 return primary_surface_info_; | 58 return primary_surface_info_; |
| 59 } | 59 } |
| 60 | 60 |
| 61 void SetTextInputState(mojo::TextInputStatePtr state); | 61 void SetTextInputState(mojo::TextInputStatePtr state); |
| 62 void SetImeVisibility(bool visible, mojo::TextInputStatePtr state); | 62 void SetImeVisibility(bool visible, mojo::TextInputStatePtr state); |
| 63 | 63 |
| 64 ui::mojom::CursorType predefined_cursor() const { return predefined_cursor_; } | 64 const ui::CursorData& cursor() const { return cursor_; } |
| 65 void SetPredefinedCursor(ui::mojom::CursorType cursor_id); | 65 void SetCursor(const ui::CursorData& cursor); |
| 66 | 66 |
| 67 // Sets the EventTargetingPolicy, default is TARGET_AND_DESCENDANTS. | 67 // Sets the EventTargetingPolicy, default is TARGET_AND_DESCENDANTS. |
| 68 void SetEventTargetingPolicy(ui::mojom::EventTargetingPolicy policy); | 68 void SetEventTargetingPolicy(ui::mojom::EventTargetingPolicy policy); |
| 69 | 69 |
| 70 // Sets whether this window can accept drops, defaults to false. | 70 // Sets whether this window can accept drops, defaults to false. |
| 71 void SetCanAcceptDrops(bool can_accept_drops); | 71 void SetCanAcceptDrops(bool can_accept_drops); |
| 72 | 72 |
| 73 // Embeds a new client in this Window. See WindowTreeClient::Embed() for | 73 // Embeds a new client in this Window. See WindowTreeClient::Embed() for |
| 74 // details on arguments. | 74 // details on arguments. |
| 75 void Embed(ui::mojom::WindowTreeClientPtr client, | 75 void Embed(ui::mojom::WindowTreeClientPtr client, |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 void AddChildFromServer(WindowMus* window) override; | 217 void AddChildFromServer(WindowMus* window) override; |
| 218 void RemoveChildFromServer(WindowMus* child) override; | 218 void RemoveChildFromServer(WindowMus* child) override; |
| 219 void ReorderFromServer(WindowMus* child, | 219 void ReorderFromServer(WindowMus* child, |
| 220 WindowMus* relative, | 220 WindowMus* relative, |
| 221 ui::mojom::OrderDirection) override; | 221 ui::mojom::OrderDirection) override; |
| 222 void SetBoundsFromServer( | 222 void SetBoundsFromServer( |
| 223 const gfx::Rect& bounds, | 223 const gfx::Rect& bounds, |
| 224 const base::Optional<cc::LocalSurfaceId>& local_surface_id) override; | 224 const base::Optional<cc::LocalSurfaceId>& local_surface_id) override; |
| 225 void SetVisibleFromServer(bool visible) override; | 225 void SetVisibleFromServer(bool visible) override; |
| 226 void SetOpacityFromServer(float opacity) override; | 226 void SetOpacityFromServer(float opacity) override; |
| 227 void SetPredefinedCursorFromServer(ui::mojom::CursorType cursor) override; | 227 void SetCursorFromServer(const ui::CursorData& cursor) override; |
| 228 void SetPropertyFromServer( | 228 void SetPropertyFromServer( |
| 229 const std::string& property_name, | 229 const std::string& property_name, |
| 230 const std::vector<uint8_t>* property_data) override; | 230 const std::vector<uint8_t>* property_data) override; |
| 231 void SetFrameSinkIdFromServer(const cc::FrameSinkId& frame_sink_id) override; | 231 void SetFrameSinkIdFromServer(const cc::FrameSinkId& frame_sink_id) override; |
| 232 const cc::LocalSurfaceId& GetOrAllocateLocalSurfaceId( | 232 const cc::LocalSurfaceId& GetOrAllocateLocalSurfaceId( |
| 233 const gfx::Size& surface_size) override; | 233 const gfx::Size& surface_size) override; |
| 234 void SetPrimarySurfaceInfo(const cc::SurfaceInfo& surface_info) override; | 234 void SetPrimarySurfaceInfo(const cc::SurfaceInfo& surface_info) override; |
| 235 void SetFallbackSurfaceInfo(const cc::SurfaceInfo& surface_info) override; | 235 void SetFallbackSurfaceInfo(const cc::SurfaceInfo& surface_info) override; |
| 236 void DestroyFromServer() override; | 236 void DestroyFromServer() override; |
| 237 void AddTransientChildFromServer(WindowMus* child) override; | 237 void AddTransientChildFromServer(WindowMus* child) override; |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 279 cc::FrameSinkId frame_sink_id_; | 279 cc::FrameSinkId frame_sink_id_; |
| 280 base::Closure pending_compositor_frame_sink_request_; | 280 base::Closure pending_compositor_frame_sink_request_; |
| 281 | 281 |
| 282 cc::SurfaceInfo primary_surface_info_; | 282 cc::SurfaceInfo primary_surface_info_; |
| 283 cc::SurfaceInfo fallback_surface_info_; | 283 cc::SurfaceInfo fallback_surface_info_; |
| 284 | 284 |
| 285 cc::LocalSurfaceId local_surface_id_; | 285 cc::LocalSurfaceId local_surface_id_; |
| 286 cc::LocalSurfaceIdAllocator local_surface_id_allocator_; | 286 cc::LocalSurfaceIdAllocator local_surface_id_allocator_; |
| 287 gfx::Size last_surface_size_; | 287 gfx::Size last_surface_size_; |
| 288 | 288 |
| 289 ui::mojom::CursorType predefined_cursor_ = ui::mojom::CursorType::kNull; | 289 ui::CursorData cursor_; |
| 290 | 290 |
| 291 DISALLOW_COPY_AND_ASSIGN(WindowPortMus); | 291 DISALLOW_COPY_AND_ASSIGN(WindowPortMus); |
| 292 }; | 292 }; |
| 293 | 293 |
| 294 } // namespace aura | 294 } // namespace aura |
| 295 | 295 |
| 296 #endif // UI_AURA_MUS_WINDOW_PORT_MUS_H_ | 296 #endif // UI_AURA_MUS_WINDOW_PORT_MUS_H_ |
| OLD | NEW |