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

Issue 1390883003: aura: Unify WindowTreeHost for some platforms (Closed)

Created:
5 years, 2 months ago by no sievers
Modified:
5 years, 2 months ago
CC:
chromium-reviews, kalyank, dnicoara
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

aura: Unify Ozone+Windows+Android WindowTreeHost This effectively adds an Android WindowTreeHost. For these three most platform-specific stuff happens in PlatformWindow* and the WTH is mostly a shim. BUG=507792 Committed: https://crrev.com/1b4ef1a69b08dd2d779521118ddb1f3a285d4c83 Cr-Commit-Position: refs/heads/master@{#354585}

Patch Set 1 #

Total comments: 24

Patch Set 2 : address comments #

Total comments: 10

Patch Set 3 : more comments, add android #

Patch Set 4 : missing factories #

Total comments: 13

Patch Set 5 : rebase #

Patch Set 6 : fix build #

Patch Set 7 : comments #

Patch Set 8 : platform_window_java GN dep #

Patch Set 9 : revert factory #

Patch Set 10 : rebase #

Patch Set 11 : fix ozone GN #

Total comments: 2

Patch Set 12 : build fix, rebase #

Patch Set 13 : #

Patch Set 14 : win build #

Total comments: 9

Patch Set 15 : fix ash_unittests, sadrul's comments #

Total comments: 6

Patch Set 16 : comments #

Patch Set 17 : win build #

Unified diffs Side-by-side diffs Delta from patch set Stats (+248 lines, -470 lines) Patch
M ash/host/ash_window_tree_host_ozone.cc View 1 2 3 4 5 6 7 8 4 chunks +4 lines, -4 lines 0 comments Download
M ash/host/ash_window_tree_host_win.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 4 chunks +19 lines, -24 lines 0 comments Download
M ash/test/ash_test_base.cc View 1 chunk +0 lines, -1 line 0 comments Download
M ui/aura/BUILD.gn View 1 2 3 4 5 6 7 8 9 10 3 chunks +18 lines, -7 lines 0 comments Download
M ui/aura/aura.gyp View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 2 chunks +13 lines, -4 lines 0 comments Download
M ui/aura/window_tree_host.cc View 1 2 1 chunk +0 lines, -11 lines 0 comments Download
D ui/aura/window_tree_host_ozone.h View 1 chunk +0 lines, -69 lines 0 comments Download
D ui/aura/window_tree_host_ozone.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +0 lines, -119 lines 0 comments Download
A + ui/aura/window_tree_host_platform.h View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 3 chunks +15 lines, -11 lines 0 comments Download
A ui/aura/window_tree_host_platform.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 1 chunk +176 lines, -0 lines 0 comments Download
D ui/aura/window_tree_host_win.h View 1 chunk +0 lines, -64 lines 0 comments Download
D ui/aura/window_tree_host_win.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +0 lines, -155 lines 0 comments Download
M ui/platform_window/win/win_window.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 1 chunk +3 lines, -1 line 0 comments Download

Dependent Patchsets:

Messages

Total messages: 48 (12 generated)
no sievers
ptal
5 years, 2 months ago (2015-10-08 00:26:00 UTC) #2
mfomitchev
+dnicoara for feedback on USE_OZONE ifdefs in window_tree_host_impl.cc https://codereview.chromium.org/1390883003/diff/1/ui/aura/window_tree_host_impl.cc File ui/aura/window_tree_host_impl.cc (right): https://codereview.chromium.org/1390883003/diff/1/ui/aura/window_tree_host_impl.cc#newcode45 ui/aura/window_tree_host_impl.cc:45: WindowTreeHostImpl::WindowTreeHostWin(const ...
5 years, 2 months ago (2015-10-08 15:03:27 UTC) #3
sadrul
https://codereview.chromium.org/1390883003/diff/1/ui/aura/window_tree_host_impl.h File ui/aura/window_tree_host_impl.h (right): https://codereview.chromium.org/1390883003/diff/1/ui/aura/window_tree_host_impl.h#newcode20 ui/aura/window_tree_host_impl.h:20: class AURA_EXPORT WindowTreeHostImpl Because we have other impls of ...
5 years, 2 months ago (2015-10-08 15:18:10 UTC) #4
no sievers
https://codereview.chromium.org/1390883003/diff/1/ui/aura/window_tree_host_impl.cc File ui/aura/window_tree_host_impl.cc (right): https://codereview.chromium.org/1390883003/diff/1/ui/aura/window_tree_host_impl.cc#newcode174 ui/aura/window_tree_host_impl.cc:174: #if !defined(USE_OZONE) On 2015/10/08 15:03:27, mfomitchev wrote: > I ...
5 years, 2 months ago (2015-10-08 17:59:06 UTC) #5
no sievers
https://codereview.chromium.org/1390883003/diff/1/ui/aura/window_tree_host_impl.cc File ui/aura/window_tree_host_impl.cc (right): https://codereview.chromium.org/1390883003/diff/1/ui/aura/window_tree_host_impl.cc#newcode45 ui/aura/window_tree_host_impl.cc:45: WindowTreeHostImpl::WindowTreeHostWin(const gfx::Rect& bounds) On 2015/10/08 15:03:27, mfomitchev wrote: > ...
5 years, 2 months ago (2015-10-09 00:34:18 UTC) #7
mfomitchev
https://codereview.chromium.org/1390883003/diff/1/ui/aura/window_tree_host_impl.cc File ui/aura/window_tree_host_impl.cc (right): https://codereview.chromium.org/1390883003/diff/1/ui/aura/window_tree_host_impl.cc#newcode174 ui/aura/window_tree_host_impl.cc:174: #if !defined(USE_OZONE) On 2015/10/08 17:59:06, sievers wrote: > On ...
5 years, 2 months ago (2015-10-09 13:56:54 UTC) #8
dnicoara
https://codereview.chromium.org/1390883003/diff/40001/ui/aura/window_tree_host_platform.cc File ui/aura/window_tree_host_platform.cc (right): https://codereview.chromium.org/1390883003/diff/40001/ui/aura/window_tree_host_platform.cc#newcode60 ui/aura/window_tree_host_platform.cc:60: window_.reset(); Any reason this is needed? The destructor should ...
5 years, 2 months ago (2015-10-09 15:04:22 UTC) #10
no sievers
https://codereview.chromium.org/1390883003/diff/40001/ui/aura/aura.gyp File ui/aura/aura.gyp (right): https://codereview.chromium.org/1390883003/diff/40001/ui/aura/aura.gyp#newcode141 ui/aura/aura.gyp:141: ['OS=="win" or use_ozone==1', { On 2015/10/09 13:56:54, mfomitchev wrote: ...
5 years, 2 months ago (2015-10-09 19:31:51 UTC) #12
mfomitchev
On 2015/10/09 19:31:51, sievers wrote: > https://codereview.chromium.org/1390883003/diff/40001/ui/aura/aura.gyp > File ui/aura/aura.gyp (right): > > https://codereview.chromium.org/1390883003/diff/40001/ui/aura/aura.gyp#newcode141 > ...
5 years, 2 months ago (2015-10-09 20:11:49 UTC) #13
no sievers
https://codereview.chromium.org/1390883003/diff/1/ui/platform_window/platform_window.h File ui/platform_window/platform_window.h (right): https://codereview.chromium.org/1390883003/diff/1/ui/platform_window/platform_window.h#newcode27 ui/platform_window/platform_window.h:27: static scoped_ptr<PlatformWindow> Create(PlatformWindowDelegate* delegate, On 2015/10/09 13:56:54, mfomitchev wrote: ...
5 years, 2 months ago (2015-10-09 20:47:46 UTC) #14
mfomitchev
Looks pretty good! https://codereview.chromium.org/1390883003/diff/100001/ash/host/ash_window_tree_host_win.cc File ash/host/ash_window_tree_host_win.cc (right): https://codereview.chromium.org/1390883003/diff/100001/ash/host/ash_window_tree_host_win.cc#newcode43 ash/host/ash_window_tree_host_win.cc:43: saved_window_style_ = GetWindowLong(GetAcceleratedWidget(), GWL_STYLE); hwnd = ...
5 years, 2 months ago (2015-10-09 21:24:18 UTC) #15
no sievers
+oshima for ash/* https://codereview.chromium.org/1390883003/diff/100001/ash/host/ash_window_tree_host_win.cc File ash/host/ash_window_tree_host_win.cc (right): https://codereview.chromium.org/1390883003/diff/100001/ash/host/ash_window_tree_host_win.cc#newcode43 ash/host/ash_window_tree_host_win.cc:43: saved_window_style_ = GetWindowLong(GetAcceleratedWidget(), GWL_STYLE); On 2015/10/09 ...
5 years, 2 months ago (2015-10-09 21:41:14 UTC) #17
no sievers
https://codereview.chromium.org/1390883003/diff/100001/ui/aura/BUILD.gn File ui/aura/BUILD.gn (right): https://codereview.chromium.org/1390883003/diff/100001/ui/aura/BUILD.gn#newcode151 ui/aura/BUILD.gn:151: "//ui/platform_window/android", On 2015/10/09 21:24:18, mfomitchev wrote: > I also ...
5 years, 2 months ago (2015-10-09 21:42:23 UTC) #18
no sievers
@sadrul: how about I remove the platform_window_win/x11/android targets? now that there is a factory this ...
5 years, 2 months ago (2015-10-09 22:30:06 UTC) #19
sadrul
On 2015/10/09 22:30:06, sievers wrote: > @sadrul: how about I remove the platform_window_win/x11/android targets? now ...
5 years, 2 months ago (2015-10-09 23:50:31 UTC) #20
no sievers
On 2015/10/09 23:50:31, sadrul wrote: > On 2015/10/09 22:30:06, sievers wrote: > > @sadrul: how ...
5 years, 2 months ago (2015-10-09 23:55:32 UTC) #21
no sievers
On 2015/10/09 23:55:32, sievers wrote: > On 2015/10/09 23:50:31, sadrul wrote: > > On 2015/10/09 ...
5 years, 2 months ago (2015-10-09 23:57:10 UTC) #22
no sievers
On 2015/10/09 23:50:31, sadrul wrote: > On 2015/10/09 22:30:06, sievers wrote: > > @sadrul: how ...
5 years, 2 months ago (2015-10-10 00:02:24 UTC) #23
sadrul
On 2015/10/10 00:02:24, sievers wrote: > On 2015/10/09 23:50:31, sadrul wrote: > > On 2015/10/09 ...
5 years, 2 months ago (2015-10-10 00:10:05 UTC) #24
no sievers
@sadrul: I've reverted the factory. how's the latest patch set?
5 years, 2 months ago (2015-10-12 20:47:30 UTC) #25
no sievers
On 2015/10/12 20:47:30, sievers wrote: > @sadrul: I've reverted the factory. how's the latest patch ...
5 years, 2 months ago (2015-10-14 23:26:34 UTC) #26
mfomitchev
https://codereview.chromium.org/1390883003/diff/240001/ui/aura/window_tree_host_platform.cc File ui/aura/window_tree_host_platform.cc (right): https://codereview.chromium.org/1390883003/diff/240001/ui/aura/window_tree_host_platform.cc#newcode60 ui/aura/window_tree_host_platform.cc:60: new ui::OzonePlatform::GetInstance()->CreatePlatformWindow(this, bounds)); We need to get rid of ...
5 years, 2 months ago (2015-10-15 15:00:57 UTC) #27
no sievers
https://codereview.chromium.org/1390883003/diff/240001/ui/aura/window_tree_host_platform.cc File ui/aura/window_tree_host_platform.cc (right): https://codereview.chromium.org/1390883003/diff/240001/ui/aura/window_tree_host_platform.cc#newcode60 ui/aura/window_tree_host_platform.cc:60: new ui::OzonePlatform::GetInstance()->CreatePlatformWindow(this, bounds)); On 2015/10/15 15:00:57, mfomitchev wrote: > ...
5 years, 2 months ago (2015-10-15 17:24:24 UTC) #28
sadrul
I think some of the #idefs can be removed, and that would be cleaner. The ...
5 years, 2 months ago (2015-10-15 19:47:40 UTC) #30
oshima
can you look into test failures on ozone build?
5 years, 2 months ago (2015-10-15 21:56:31 UTC) #31
no sievers
https://codereview.chromium.org/1390883003/diff/320001/ui/aura/window_tree_host_platform.cc File ui/aura/window_tree_host_platform.cc (right): https://codereview.chromium.org/1390883003/diff/320001/ui/aura/window_tree_host_platform.cc#newcode137 ui/aura/window_tree_host_platform.cc:137: if (bounds_.origin() != old_bounds.origin()) These two optimizations for redundant ...
5 years, 2 months ago (2015-10-16 00:06:15 UTC) #32
oshima
On 2015/10/16 00:06:15, sievers wrote: > https://codereview.chromium.org/1390883003/diff/320001/ui/aura/window_tree_host_platform.cc > File ui/aura/window_tree_host_platform.cc (right): > > https://codereview.chromium.org/1390883003/diff/320001/ui/aura/window_tree_host_platform.cc#newcode137 > ...
5 years, 2 months ago (2015-10-16 17:15:45 UTC) #33
no sievers
Ok thanks, added the device scale factor check similar to WTHX11. Tests are passing now. ...
5 years, 2 months ago (2015-10-16 18:26:15 UTC) #34
dnicoara
https://codereview.chromium.org/1390883003/diff/340001/ui/aura/window_tree_host_platform.cc File ui/aura/window_tree_host_platform.cc (right): https://codereview.chromium.org/1390883003/diff/340001/ui/aura/window_tree_host_platform.cc#newcode7 ui/aura/window_tree_host_platform.cc:7: #include <algorithm> And this include can probably go to. ...
5 years, 2 months ago (2015-10-16 18:30:57 UTC) #35
oshima
lgtm https://codereview.chromium.org/1390883003/diff/340001/ui/aura/aura.gyp File ui/aura/aura.gyp (right): https://codereview.chromium.org/1390883003/diff/340001/ui/aura/aura.gyp#newcode151 ui/aura/aura.gyp:151: '../platform_window/android/android_window.gyp:android_window', nit: indent
5 years, 2 months ago (2015-10-16 18:31:42 UTC) #36
no sievers
https://codereview.chromium.org/1390883003/diff/340001/ui/aura/window_tree_host_platform.cc File ui/aura/window_tree_host_platform.cc (right): https://codereview.chromium.org/1390883003/diff/340001/ui/aura/window_tree_host_platform.cc#newcode7 ui/aura/window_tree_host_platform.cc:7: #include <algorithm> On 2015/10/16 18:30:57, dnicoara wrote: > And ...
5 years, 2 months ago (2015-10-16 18:42:24 UTC) #37
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1390883003/380001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1390883003/380001
5 years, 2 months ago (2015-10-16 19:17:22 UTC) #40
commit-bot: I haz the power
Try jobs failed on following builders: win_chromium_x64_rel_ng on tryserver.chromium.win (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_x64_rel_ng/builds/118238)
5 years, 2 months ago (2015-10-16 19:50:11 UTC) #42
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1390883003/400001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1390883003/400001
5 years, 2 months ago (2015-10-16 19:58:06 UTC) #46
commit-bot: I haz the power
Committed patchset #17 (id:400001)
5 years, 2 months ago (2015-10-16 20:44:44 UTC) #47
commit-bot: I haz the power
5 years, 2 months ago (2015-10-16 20:45:26 UTC) #48
Message was sent while issue was closed.
Patchset 17 (id:??) landed as
https://crrev.com/1b4ef1a69b08dd2d779521118ddb1f3a285d4c83
Cr-Commit-Position: refs/heads/master@{#354585}

Powered by Google App Engine
This is Rietveld 408576698