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

Issue 2445163002: Make aura work with mus (Closed)

Created:
4 years, 1 month ago by sky
Modified:
4 years, 1 month ago
Reviewers:
danakj, sadrul
CC:
chromium-reviews, kalyank, tfarina
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Make aura work with mus The basic idea is to add the option of having aura work with mus. This is done by way of adding a porting layer for aura::Window. Specifically WindowPort. Each Window has a WindowPort. WindowPort is typically created by aura::Window during Init() time (WindowPort may be explicitly passed in the constructor, but that is not the common case). If a WindowPort was not explicitly passed in the constructor then Window calls to Env::CreateWindowPort to create the WindowPort. Env gets a factory function for creation. Window calls to WindowPort at key times that need to differ for mus, or as a hook for mus to call to the server. For example, Window::AddChild() calls to WindowPort::OnWillAddChild(). WindowPortMus calls to a class similar to ui::WindowTreeClient on on any changes. WindowTreeClient forwards changes to the server as appropriate. Changes originating from the server call to WindowMus (implemented by WindowPortMus). The implementation of the functions in WindowPortMus called by WindowTreeClient ensure calls made from the server don't make their way back to the server. For example, we don't want something like the following happening: WindowTreeClient is told bounds change -> change bounds on window -> try to set bounds change back to server. Wiring up aura to use mus then becomes something like: . Create WindowTreeClient (encapsulates connection to mus). . Install factory on Env. And then use aura like you normally would. You can see this in AuraTestHelper. This patch is huge and works, but there are a bunch of TODOs and a handful of comment out code. I will be addressing this ASAP, but wanted to land this for others. BUG=none TEST=none R=sadrul@chromium.org Committed: https://crrev.com/25714fe6afb80a6f6fe562cadad3e598deb3668d Cr-Commit-Position: refs/heads/master@{#428031}

Patch Set 1 #

Patch Set 2 : cleanup #

Patch Set 3 : split out #

Patch Set 4 : split out #

Total comments: 11

Patch Set 5 : merge 2 trunk #

Patch Set 6 : feedback #

Patch Set 7 : dep #

Total comments: 1

Patch Set 8 : explicit cc DEPS #

Patch Set 9 : std::move for compiling #

Patch Set 10 : NON_EXPORTED_BASE_CLASS #

Unified diffs Side-by-side diffs Delta from patch set Stats (+3634 lines, -998 lines) Patch
M ui/aura/BUILD.gn View 1 2 3 4 5 6 8 chunks +38 lines, -0 lines 0 comments Download
M ui/aura/DEPS View 1 2 3 4 5 6 7 1 chunk +7 lines, -0 lines 0 comments Download
A + ui/aura/mus/in_flight_change.h View 1 16 chunks +33 lines, -28 lines 0 comments Download
A + ui/aura/mus/in_flight_change.cc View 12 chunks +50 lines, -44 lines 0 comments Download
A + ui/aura/mus/input_method_mus.h View 3 chunks +13 lines, -15 lines 0 comments Download
A + ui/aura/mus/input_method_mus.cc View 3 chunks +11 lines, -8 lines 0 comments Download
A + ui/aura/mus/mus_types.h View 1 chunk +9 lines, -7 lines 0 comments Download
A ui/aura/mus/property_converter.h View 1 1 chunk +52 lines, -0 lines 0 comments Download
A + ui/aura/mus/surface_id_handler.h View 2 chunks +5 lines, -5 lines 0 comments Download
A + ui/aura/mus/text_input_client_impl.h View 3 chunks +5 lines, -7 lines 0 comments Download
A + ui/aura/mus/text_input_client_impl.cc View 2 chunks +4 lines, -4 lines 0 comments Download
A + ui/aura/mus/window_manager_delegate.h View 1 2 3 7 chunks +14 lines, -11 lines 0 comments Download
A + ui/aura/mus/window_manager_delegate.cc View 1 chunk +5 lines, -5 lines 0 comments Download
A ui/aura/mus/window_mus.h View 1 2 3 1 chunk +88 lines, -0 lines 0 comments Download
A ui/aura/mus/window_port_mus.h View 1 2 3 4 1 chunk +204 lines, -0 lines 0 comments Download
A ui/aura/mus/window_port_mus.cc View 1 2 3 4 5 1 chunk +301 lines, -0 lines 0 comments Download
A + ui/aura/mus/window_tree_client.h View 1 2 3 4 5 6 7 8 9 18 chunks +163 lines, -141 lines 0 comments Download
A + ui/aura/mus/window_tree_client.cc View 1 2 3 4 5 6 7 8 47 chunks +746 lines, -533 lines 0 comments Download
A + ui/aura/mus/window_tree_client_delegate.h View 1 2 chunks +25 lines, -6 lines 0 comments Download
A + ui/aura/mus/window_tree_client_delegate.cc View 1 chunk +3 lines, -3 lines 0 comments Download
A + ui/aura/mus/window_tree_client_observer.h View 1 2 3 2 chunks +8 lines, -12 lines 0 comments Download
A ui/aura/mus/window_tree_client_unittest.cc View 1 1 chunk +1051 lines, -0 lines 0 comments Download
A ui/aura/mus/window_tree_host_mus.h View 1 2 3 4 5 1 chunk +78 lines, -0 lines 0 comments Download
A + ui/aura/mus/window_tree_host_mus.cc View 1 2 3 6 chunks +78 lines, -17 lines 0 comments Download
A ui/aura/test/aura_mus_test_base.h View 1 chunk +52 lines, -0 lines 0 comments Download
A + ui/aura/test/aura_mus_test_base.cc View 1 2 3 1 chunk +17 lines, -9 lines 0 comments Download
M ui/aura/test/aura_test_base.h View 1 2 3 3 chunks +77 lines, -3 lines 0 comments Download
M ui/aura/test/aura_test_base.cc View 1 2 3 6 chunks +116 lines, -4 lines 0 comments Download
M ui/aura/test/aura_test_helper.h View 5 chunks +27 lines, -4 lines 0 comments Download
M ui/aura/test/aura_test_helper.cc View 1 2 3 4 5 chunks +64 lines, -8 lines 0 comments Download
M ui/aura/test/env_test_helper.h View 1 chunk +4 lines, -0 lines 0 comments Download
A + ui/aura/test/mus/test_window_tree.h View 7 chunks +76 lines, -24 lines 0 comments Download
A + ui/aura/test/mus/test_window_tree.cc View 6 chunks +126 lines, -48 lines 0 comments Download
A + ui/aura/test/mus/test_window_tree_client_setup.h View 3 chunks +5 lines, -5 lines 0 comments Download
A + ui/aura/test/mus/test_window_tree_client_setup.cc View 2 chunks +10 lines, -8 lines 0 comments Download
A + ui/aura/test/mus/window_tree_client_private.h View 5 chunks +11 lines, -9 lines 0 comments Download
A + ui/aura/test/mus/window_tree_client_private.cc View 4 chunks +21 lines, -18 lines 0 comments Download
M ui/aura/test/test_screen.h View 4 chunks +7 lines, -2 lines 0 comments Download
M ui/aura/test/test_screen.cc View 4 chunks +15 lines, -6 lines 0 comments Download
M ui/aura/window_delegate.h View 1 chunk +3 lines, -0 lines 0 comments Download
A + ui/aura/window_delegate.cc View 1 4 1 chunk +5 lines, -2 lines 0 comments Download
M ui/aura/window_observer.h View 1 chunk +4 lines, -0 lines 0 comments Download
M ui/aura/window_observer.cc View 1 chunk +2 lines, -0 lines 0 comments Download
M ui/views/mus/input_method_mus.h View 2 chunks +1 line, -2 lines 0 comments Download

Messages

Total messages: 39 (26 generated)
sky
There is some commented out code that will be addressed shortly. This patch is already ...
4 years, 1 month ago (2016-10-25 16:15:02 UTC) #1
sadrul
Would it make sense to put the mus bits into a separate target, so that ...
4 years, 1 month ago (2016-10-26 16:53:29 UTC) #2
sky
I could do that, but do you think it's worth it? I believe everywhere we ...
4 years, 1 month ago (2016-10-26 17:04:28 UTC) #3
sadrul
> I could do that, but do you think it's worth it? I believe > ...
4 years, 1 month ago (2016-10-26 18:38:21 UTC) #4
rjkroege
On 2016/10/26 18:38:21, sadrul wrote: > > I could do that, but do you think ...
4 years, 1 month ago (2016-10-26 18:45:36 UTC) #5
sadrul
On 2016/10/26 18:45:36, rjkroege wrote: > On 2016/10/26 18:38:21, sadrul wrote: > > > I ...
4 years, 1 month ago (2016-10-26 18:48:47 UTC) #6
sky
+dana for deps from ui/aura/ to cc/surfaces https://codereview.chromium.org/2445163002/diff/60001/ui/aura/mus/window_port_mus.cc File ui/aura/mus/window_port_mus.cc (right): https://codereview.chromium.org/2445163002/diff/60001/ui/aura/mus/window_port_mus.cc#newcode64 ui/aura/mus/window_port_mus.cc:64: for (auto ...
4 years, 1 month ago (2016-10-26 19:56:45 UTC) #11
danakj
https://codereview.chromium.org/2445163002/diff/120001/ui/aura/DEPS File ui/aura/DEPS (right): https://codereview.chromium.org/2445163002/diff/120001/ui/aura/DEPS#newcode2 ui/aura/DEPS:2: "+cc/surfaces", If it's just for surface_id.h then maybe specify ...
4 years, 1 month ago (2016-10-26 20:37:25 UTC) #18
sky
On 2016/10/26 20:37:25, danakj wrote: > https://codereview.chromium.org/2445163002/diff/120001/ui/aura/DEPS > File ui/aura/DEPS (right): > > https://codereview.chromium.org/2445163002/diff/120001/ui/aura/DEPS#newcode2 > ...
4 years, 1 month ago (2016-10-26 20:42:47 UTC) #19
sadrul
lgtm
4 years, 1 month ago (2016-10-27 04:59:30 UTC) #32
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2445163002/180001
4 years, 1 month ago (2016-10-27 15:15:49 UTC) #35
commit-bot: I haz the power
Committed patchset #10 (id:180001)
4 years, 1 month ago (2016-10-27 15:22:02 UTC) #37
commit-bot: I haz the power
4 years, 1 month ago (2016-10-27 15:28:42 UTC) #39
Message was sent while issue was closed.
Patchset 10 (id:??) landed as
https://crrev.com/25714fe6afb80a6f6fe562cadad3e598deb3668d
Cr-Commit-Position: refs/heads/master@{#428031}

Powered by Google App Engine
This is Rietveld 408576698