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

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

Issue 17029020: linux_aura: Redo how memory is handled in clipboard/drag code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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
Index: ui/base/x/selection_requestor.h
diff --git a/ui/base/x/selection_requestor.h b/ui/base/x/selection_requestor.h
index 52ad1cf6266cfa704962f7d558a2fc62161bad52..318533a1a27f96c7c0eff170600d4f7a841d8238 100644
--- a/ui/base/x/selection_requestor.h
+++ b/ui/base/x/selection_requestor.h
@@ -14,6 +14,7 @@
#include "base/basictypes.h"
#include "base/callback.h"
+#include "base/memory/ref_counted_memory.h"
#include "ui/base/ui_export.h"
#include "ui/base/x/x11_atom_cache.h"
@@ -39,16 +40,16 @@ class UI_EXPORT SelectionRequestor {
// back. |out_data| is allocated with the X allocator and must be freed with
// XFree(). |out_data_bytes| is the length in machine chars, while
// |out_data_items| is the length in |out_type| items.
- bool PerformBlockingConvertSelection(::Atom target,
- unsigned char** out_data,
- size_t* out_data_bytes,
- size_t* out_data_items,
- ::Atom* out_type);
+ bool PerformBlockingConvertSelection(
+ ::Atom target,
+ scoped_refptr<base::RefCountedMemory>* out_data,
+ size_t* out_data_bytes,
+ size_t* out_data_items,
+ ::Atom* out_type);
// Returns the first of |types| offered by the current selection holder, or
// returns NULL if none of those types are available.
- scoped_ptr<SelectionData> RequestAndWaitForTypes(
- const std::vector< ::Atom>& types);
+ SelectionData RequestAndWaitForTypes(const std::vector< ::Atom>& types);
// It is our owner's responsibility to plumb X11 SelectionNotify events on
// |xwindow_| to us.

Powered by Google App Engine
This is Rietveld 408576698