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

Issue 2578893003: Converts chrome to aura-mus (Closed)

Created:
4 years ago by sky
Modified:
3 years, 11 months ago
Reviewers:
reveman, Peng, sadrul
CC:
blundell+watchlist_chromium.org, chromium-reviews, droger+watchlist_chromium.org, kalyank, Matt Giuca, rjkroege, sadrul, sdefresne+watchlist_chromium.org, tfarina
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Converts chrome to aura-mus aura-mus has a different environment than mus, so WMHelperMus (in exo) was updated accordingly. This breaks switches::kUseMusInRenderer. I'll fix that next. BUG=672932 663525 TEST=covered by tests R=reveman@chromium.org, sadrul@chromium.org Committed: https://crrev.com/e3e1ea3c0699e70c8ca5a6a790641c58be4e1381 Committed: https://crrev.com/cea631eaeaa21f4a0865cbb2d6f6a51535509681 Cr-Original-Commit-Position: refs/heads/master@{#439044} Cr-Commit-Position: refs/heads/master@{#439201}

Patch Set 1 #

Patch Set 2 : cleanup #

Patch Set 3 : merge 2 trunk #

Total comments: 4

Patch Set 4 : todo #

Patch Set 5 : merge 2 trunk #

Patch Set 6 : fix #

Patch Set 7 : merge again #

Total comments: 2
Unified diffs Side-by-side diffs Delta from patch set Stats (+332 lines, -297 lines) Patch
M chrome/app/DEPS View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/app/chrome_main.cc View 2 chunks +3 lines, -0 lines 2 comments Download
M chrome/browser/chrome_content_browser_client.cc View 1 2 3 4 5 6 3 chunks +8 lines, -9 lines 0 comments Download
M chrome/browser/ui/ash/app_list/app_list_presenter_delegate_mus.cc View 2 chunks +6 lines, -8 lines 0 comments Download
M chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/ui/ash/launcher/settings_window_observer.h View 2 chunks +3 lines, -3 lines 0 comments Download
M chrome/browser/ui/ash/launcher/settings_window_observer.cc View 3 chunks +2 lines, -37 lines 0 comments Download
M chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc View 3 chunks +8 lines, -5 lines 0 comments Download
M chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h View 3 chunks +5 lines, -1 line 0 comments Download
M chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc View 3 chunks +8 lines, -2 lines 0 comments Download
M chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h View 3 chunks +8 lines, -2 lines 0 comments Download
M chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc View 2 chunks +6 lines, -3 lines 0 comments Download
M chrome/browser/ui/views/frame/browser_frame_mus.h View 2 chunks +4 lines, -7 lines 0 comments Download
M chrome/browser/ui/views/frame/browser_frame_mus.cc View 2 chunks +21 lines, -34 lines 0 comments Download
M chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.h View 2 chunks +1 line, -7 lines 0 comments Download
M chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc View 4 chunks +9 lines, -11 lines 0 comments Download
M chrome/browser/ui/views/frame/immersive_context_mus.h View 2 chunks +9 lines, -1 line 0 comments Download
M chrome/browser/ui/views/frame/immersive_context_mus.cc View 2 chunks +11 lines, -13 lines 0 comments Download
M chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc View 2 chunks +6 lines, -15 lines 0 comments Download
M chrome/browser/ui/views/status_bubble_views.cc View 2 chunks +8 lines, -2 lines 0 comments Download
M chrome/browser/ui/views/tabs/window_finder_mus.cc View 2 chunks +6 lines, -6 lines 0 comments Download
M chrome/test/base/mash_browser_tests_main.cc View 3 chunks +3 lines, -0 lines 0 comments Download
M components/exo/BUILD.gn View 1 2 3 4 5 3 chunks +4 lines, -4 lines 0 comments Download
M components/exo/DEPS View 1 chunk +0 lines, -1 line 0 comments Download
M components/exo/wm_helper_mus.h View 3 chunks +25 lines, -7 lines 0 comments Download
M components/exo/wm_helper_mus.cc View 1 3 chunks +61 lines, -64 lines 0 comments Download
M services/ui/ws/window_tree.cc View 1 2 1 chunk +28 lines, -6 lines 0 comments Download
M ui/aura/mus/focus_synchronizer.h View 3 chunks +5 lines, -0 lines 0 comments Download
M ui/aura/mus/focus_synchronizer.cc View 1 2 3 2 chunks +14 lines, -4 lines 0 comments Download
M ui/views/mus/desktop_window_tree_host_mus.cc View 1 2 1 chunk +5 lines, -0 lines 0 comments Download
M ui/views/mus/mus_client.h View 4 chunks +14 lines, -8 lines 0 comments Download
M ui/views/mus/mus_client.cc View 2 chunks +39 lines, -37 lines 0 comments Download

Messages

Total messages: 44 (23 generated)
sky
reveman: exo sadrul: the rest
4 years ago (2016-12-15 16:33:44 UTC) #1
reveman
components/exo lgtm
4 years ago (2016-12-16 01:35:03 UTC) #6
sadrul
LGTM https://codereview.chromium.org/2578893003/diff/40001/chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc File chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc (right): https://codereview.chromium.org/2578893003/diff/40001/chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc#newcode357 chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc:357: GetWidget()->GetNativeWindow()->GetHost()) We are using this static-cast in a ...
4 years ago (2016-12-16 02:17:48 UTC) #7
sky
https://codereview.chromium.org/2578893003/diff/40001/chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc File chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc (right): https://codereview.chromium.org/2578893003/diff/40001/chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc#newcode357 chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.cc:357: GetWidget()->GetNativeWindow()->GetHost()) On 2016/12/16 02:17:48, sadrul wrote: > We are ...
4 years ago (2016-12-16 03:51:51 UTC) #8
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/2578893003/60001
4 years ago (2016-12-16 03:53:07 UTC) #11
commit-bot: I haz the power
Committed patchset #4 (id:60001)
4 years ago (2016-12-16 06:18:10 UTC) #14
commit-bot: I haz the power
Patchset 4 (id:??) landed as https://crrev.com/e3e1ea3c0699e70c8ca5a6a790641c58be4e1381 Cr-Commit-Position: refs/heads/master@{#439044}
4 years ago (2016-12-16 06:21:15 UTC) #16
Kunihiko Sakamoto
A revert of this CL (patchset #4 id:60001) has been created in https://codereview.chromium.org/2577963006/ by ksakamoto@chromium.org. ...
4 years ago (2016-12-16 07:59:50 UTC) #17
sky
On 2016/12/16 07:59:50, Kunihiko Sakamoto wrote: > A revert of this CL (patchset #4 id:60001) ...
4 years ago (2016-12-16 17:02:29 UTC) #19
sky
Diff between patchsets 5 and 6 to see the change to BUILD.gn
4 years ago (2016-12-16 17:02:55 UTC) #21
sky
Diff between patchsets 5 and 6 to see the change to BUILD.gn
4 years ago (2016-12-16 17:02:58 UTC) #22
reveman
lgtm
4 years ago (2016-12-16 17:05:37 UTC) #24
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/2578893003/100001
4 years ago (2016-12-16 17:07:30 UTC) #27
commit-bot: I haz the power
Try jobs failed on following builders: android_n5x_swarming_rel on master.tryserver.chromium.android (JOB_FAILED, https://build.chromium.org/p/tryserver.chromium.android/builders/android_n5x_swarming_rel/builds/87712)
4 years ago (2016-12-16 18:08:39 UTC) #29
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/2578893003/100001
4 years ago (2016-12-16 18:16:27 UTC) #31
commit-bot: I haz the power
Try jobs failed on following builders: android_n5x_swarming_rel on master.tryserver.chromium.android (JOB_FAILED, https://build.chromium.org/p/tryserver.chromium.android/builders/android_n5x_swarming_rel/builds/87729)
4 years ago (2016-12-16 18:24:41 UTC) #33
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/2578893003/120001
4 years ago (2016-12-16 18:28:06 UTC) #36
commit-bot: I haz the power
Committed patchset #7 (id:120001)
4 years ago (2016-12-16 21:52:55 UTC) #39
commit-bot: I haz the power
Patchset 7 (id:??) landed as https://crrev.com/cea631eaeaa21f4a0865cbb2d6f6a51535509681 Cr-Commit-Position: refs/heads/master@{#439201}
4 years ago (2016-12-16 21:56:01 UTC) #41
Peng
https://codereview.chromium.org/2578893003/diff/120001/chrome/app/chrome_main.cc File chrome/app/chrome_main.cc (right): https://codereview.chromium.org/2578893003/diff/120001/chrome/app/chrome_main.cc#newcode108 chrome/app/chrome_main.cc:108: params.env_mode = aura::Env::Mode::MUS; This change breaks exo in mus. ...
3 years, 11 months ago (2017-01-03 20:15:38 UTC) #43
sadrul
3 years, 11 months ago (2017-01-03 20:19:31 UTC) #44
Message was sent while issue was closed.
https://codereview.chromium.org/2578893003/diff/120001/chrome/app/chrome_main.cc
File chrome/app/chrome_main.cc (right):

https://codereview.chromium.org/2578893003/diff/120001/chrome/app/chrome_main...
chrome/app/chrome_main.cc:108: params.env_mode = aura::Env::Mode::MUS;
On 2017/01/03 20:15:38, Peng wrote:
> This change breaks exo in mus. The exo crashes at [1]. Sky, do you have any
idea
> how to fix it?
> 
> 
> [1]
>
https://cs.chromium.org/chromium/src/components/exo/shell_surface.cc?rcl=0&l=838
> 
> [24848:24848:0103/151250.080451:FATAL:wm_window_aura.cc(104)] Check failed:
> aura::Env::Mode::LOCAL == aura::Env::GetInstance()->mode() (0 vs. 1)
> #0 0x2b02254b1bde base::debug::StackTrace::StackTrace()
> #1 0x2b02254d25ba logging::LogMessage::~LogMessage()
> #2 0x2b022af09a1e ash::WmWindowAura::Get()
> #3 0x2b022b0518af ash::wm::GetWindowState()

Looks like exo is trying to use ash? We need to make sure that does not happen.
(since ash is in a separate process)

How did it work before this change?

> #4 0x2b02222061a8 exo::ShellSurface::CreateNonClientFrameView()
> #5 0x2b02222062ea exo::ShellSurface::CreateNonClientFrameView()
> #6 0x2b02297e7dea views::Widget::CreateNonClientFrameView()
> #7 0x2b02297e5c3c views::Widget::Init()
> #8 0x2b022220324c exo::ShellSurface::CreateShellSurfaceWidget()
> #9 0x2b0222205828 exo::ShellSurface::OnSurfaceCommit()
> #10 0x2b022220aeb1 exo::Surface::Commit()
> #11 0x2b022d90dadc ffi_call_unix64
> #12 0x2b022d90d40c ffi_call
> #13 0x2b02239a2477 wl_closure_invoke
> #14 0x2b02239a0280 wl_client_connection_data
> #15 0x2b022399f982 wl_event_loop_dispatch
> #16 0x2b02222fc64d exo::wayland::Server::Dispatch()
> #17 0x2b022264676f
> ChromeBrowserMainExtraPartsExo::WaylandWatcher::OnFileCanReadWithoutBlocking()
> #18 0x2b02254e2041 base::MessagePumpLibevent::OnLibeventNotification()
> #19 0x2b0225596627 event_base_loop
> #20 0x2b02254e2306 base::MessagePumpLibevent::Run()
> #21 0x2b02254df2ab base::MessageLoop::RunHandler()
> #22 0x2b022550ef5f base::RunLoop::Run()
> #23 0x2b0222445dd3 ChromeBrowserMainParts::MainMessageLoopRun()
> #24 0x2b0227393b43 content::BrowserMainLoop::RunMainMessageLoopParts()
> #25 0x2b02273968aa content::BrowserMainRunnerImpl::Run()
> #26 0x2b022738ee78 content::BrowserMain()
> #27 0x2b0227ae9ffc content::ContentMainRunnerImpl::Run()
> #28 0x2b0227ae8b30 content::ContentMain()
> #29 0x2b0221b971e0 ChromeMain
> #30 0x2b022e0e5f45 __libc_start_main
> #31 0x2b0221b9701d <unknown>

Powered by Google App Engine
This is Rietveld 408576698