Chromium Code Reviews| Index: ui/base/clipboard/clipboard_aurax11.cc |
| diff --git a/ui/base/clipboard/clipboard_aurax11.cc b/ui/base/clipboard/clipboard_aurax11.cc |
| index 1017c81acb1681e3fc47074662f879d2d0967417..c5b4172ca3275c673e218e761c9fc3a3baa22758 100644 |
| --- a/ui/base/clipboard/clipboard_aurax11.cc |
| +++ b/ui/base/clipboard/clipboard_aurax11.cc |
| @@ -513,7 +513,15 @@ void Clipboard::AuraX11Details::StoreCopyPasteDataAndWait() { |
| } |
| bool Clipboard::AuraX11Details::CanDispatchEvent(const PlatformEvent& event) { |
| - return event->xany.window == x_window_; |
| + if (event->xany.window == x_window_) |
| + return true; |
|
Elliot Glaysher
2014/07/17 22:32:46
I don't like that we're moving away from a mapping
|
| + |
| + if (event->type == PropertyNotify) { |
| + return primary_owner_.CanDispatchPropertyEvent(*event) || |
| + clipboard_owner_.CanDispatchPropertyEvent(*event) || |
| + selection_requestor_.CanDispatchPropertyEvent(*event); |
| + } |
| + return false; |
| } |
| uint32_t Clipboard::AuraX11Details::DispatchEvent(const PlatformEvent& xev) { |
| @@ -543,6 +551,14 @@ uint32_t Clipboard::AuraX11Details::DispatchEvent(const PlatformEvent& xev) { |
| } |
| break; |
| } |
| + case PropertyNotify: |
|
dcheng
2014/07/25 23:48:30
{}s to be consistent =)
|
| + if (primary_owner_.CanDispatchPropertyEvent(*xev)) |
| + primary_owner_.OnPropertyEvent(*xev); |
| + if (clipboard_owner_.CanDispatchPropertyEvent(*xev)) |
| + clipboard_owner_.OnPropertyEvent(*xev); |
| + if (selection_requestor_.CanDispatchPropertyEvent(*xev)) |
| + selection_requestor_.OnPropertyEvent(*xev); |
| + break; |
| default: |
| break; |
| } |