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

Issue 10895020: Merge aura::DispatcherLinux into base::MessagePumpAuraX11. (Closed)

Created:
8 years, 3 months ago by Elliot Glaysher
Modified:
8 years, 3 months ago
CC:
chromium-reviews, erikwright+watch_chromium.org, brettw-cc_chromium.org, sadrul, tfarina, ben+watch_chromium.org
Visibility:
Public.

Description

Merge aura::DispatcherLinux into base::MessagePumpAuraX11. The majority of incoming XEvents are related to specific XWindows and need to be sent to a specific MessagePumpDispatcher. MessagePumpAuraX11 would pass the XEvent to aura::DispatcherLinux, which would pass it to the next dispatcher. Because of the chromeos unit tests, which spin up a new XDisplay on each test, these two objects need to have equivalent lifetimes. Due to the incoming clipboard support (which this patch was split off from), DispatcherLinux can't live in aura:: anymore. The solution is to merge the two objects that have to have equivalent lifetimes together. The one ui:: specific check was split off into an MessagePumpObserver. This also got rid of those hacks where we would static downcast to DispatcherLinux from MessagePumpDispatcher. BUG=130805 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=154174

Patch Set 1 #

Patch Set 2 : Actually delete the old files. #

Patch Set 3 : Fix chromeos compile #

Patch Set 4 : Fix win_aura #

Total comments: 5

Patch Set 5 : fixes for sadrul #

Unified diffs Side-by-side diffs Delta from patch set Stats (+215 lines, -218 lines) Patch
M ash/shell.cc View 3 chunks +5 lines, -8 lines 0 comments Download
M base/message_pump_aurax11.h View 1 2 3 4 5 chunks +36 lines, -5 lines 0 comments Download
M base/message_pump_aurax11.cc View 1 2 3 4 5 chunks +77 lines, -16 lines 0 comments Download
M base/message_pump_glib.h View 1 2 2 chunks +2 lines, -1 line 0 comments Download
M base/message_pump_observer.h View 1 chunk +1 line, -0 lines 0 comments Download
M ui/aura/aura.gyp View 1 chunk +2 lines, -2 lines 0 comments Download
A ui/aura/device_list_updater_aurax11.h View 1 chunk +32 lines, -0 lines 0 comments Download
A ui/aura/device_list_updater_aurax11.cc View 1 2 3 4 1 chunk +32 lines, -0 lines 0 comments Download
D ui/aura/dispatcher_linux.h View 1 1 chunk +0 lines, -61 lines 0 comments Download
M ui/aura/dispatcher_linux.cc View 1 1 chunk +0 lines, -106 lines 0 comments Download
M ui/aura/display_change_observer_x11.cc View 2 chunks +2 lines, -5 lines 0 comments Download
M ui/aura/env.h View 3 chunks +6 lines, -1 line 0 comments Download
M ui/aura/env.cc View 1 2 3 4 4 chunks +16 lines, -1 line 0 comments Download
M ui/aura/root_window_host_linux.cc View 3 chunks +2 lines, -5 lines 0 comments Download
M ui/views/widget/x11_desktop_handler.cc View 3 chunks +2 lines, -7 lines 0 comments Download

Messages

Total messages: 7 (0 generated)
Elliot Glaysher
8 years, 3 months ago (2012-08-28 23:36:51 UTC) #1
sadrul
I have left a few comments. LGTM http://codereview.chromium.org/10895020/diff/7005/base/message_pump_aurax11.cc File base/message_pump_aurax11.cc (right): http://codereview.chromium.org/10895020/diff/7005/base/message_pump_aurax11.cc#newcode49 base/message_pump_aurax11.cc:49: // MessagePumpAuraX11::Current()->display() ...
8 years, 3 months ago (2012-08-29 16:01:25 UTC) #2
Elliot Glaysher
sky: aura stamp willchan: base stamp
8 years, 3 months ago (2012-08-29 16:50:07 UTC) #3
sky
LGTM
8 years, 3 months ago (2012-08-29 20:50:34 UTC) #4
willchan no longer on Chromium
base/ lgtm
8 years, 3 months ago (2012-08-29 23:35:57 UTC) #5
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/erg@chromium.org/10895020/9006
8 years, 3 months ago (2012-08-29 23:37:33 UTC) #6
commit-bot: I haz the power
8 years, 3 months ago (2012-08-30 03:03:40 UTC) #7
Try job failure for 10895020-9006 (retry) on win_rel for step "browser_tests".
It's a second try, previously, step "browser_tests" failed.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

Powered by Google App Engine
This is Rietveld 408576698