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

Unified Diff: ui/base/x/selection_owner.h

Issue 2700043002: [Desktop Linux]: Fix copy and pasting long selections (Closed)
Patch Set: Merge branch 'master' into selection_requestor Created 3 years, 10 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/x/selection_owner.cc » ('j') | ui/base/x/selection_owner.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/x/selection_owner.h
diff --git a/ui/base/x/selection_owner.h b/ui/base/x/selection_owner.h
index fd2326c9752151a0f129f7ae38cf0882812439c7..52657e34c2c97ba633939d5173e66a8eb62042d9 100644
--- a/ui/base/x/selection_owner.h
+++ b/ui/base/x/selection_owner.h
@@ -65,18 +65,25 @@ class UI_BASE_EXPORT SelectionOwner {
IncrementalTransfer(XID window,
XAtom target,
XAtom property,
+ std::unique_ptr<XScopedEventSelector> event_selector,
const scoped_refptr<base::RefCountedMemory>& data,
int offset,
base::TimeTicks timeout);
- IncrementalTransfer(const IncrementalTransfer& other);
~IncrementalTransfer();
+ // Move-only class.
+ IncrementalTransfer(IncrementalTransfer&&);
+ IncrementalTransfer& operator=(IncrementalTransfer&&);
+
// Parameters from the XSelectionRequest. The data is transferred over
// |property| on |window|.
XID window;
XAtom target;
XAtom property;
+ // Selects events on |window|.
+ std::unique_ptr<XScopedEventSelector> event_selector;
+
// The data to be transferred.
scoped_refptr<base::RefCountedMemory> data;
@@ -87,6 +94,9 @@ class UI_BASE_EXPORT SelectionOwner {
// Time when the transfer should be aborted because the selection requestor
// is taking too long to notify us that we can send the next chunk.
base::TimeTicks timeout;
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(IncrementalTransfer);
};
// Attempts to convert the selection to |target|. If the conversion is
@@ -113,9 +123,6 @@ class UI_BASE_EXPORT SelectionOwner {
XDisplay* x_display_;
XID x_window_;
- // Events selected on the requesting window.
- std::unique_ptr<XScopedEventSelector> requestor_events_;
-
// The X11 selection that this instance communicates on.
XAtom selection_name_;
« no previous file with comments | « no previous file | ui/base/x/selection_owner.cc » ('j') | ui/base/x/selection_owner.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698