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

Unified Diff: ui/base/clipboard/clipboard_aurax11.cc

Issue 397223002: Enable copying long text to Chrome and pasting long text from Chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/base/ui_base.gyp » ('j') | ui/base/x/selection_owner.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « no previous file | ui/base/ui_base.gyp » ('j') | ui/base/x/selection_owner.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698