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

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

Issue 9419036: Change all platforms except Windows to access the clipboard solely from the UI thread (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 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
Index: ui/base/clipboard/clipboard_aurax11.cc
diff --git a/ui/base/clipboard/clipboard_aurax11.cc b/ui/base/clipboard/clipboard_aurax11.cc
index ee3975d5692e9684b861e763e8ef996f0970e964..bac440c66df7156fd59572ed26165d3046b7bc97 100644
--- a/ui/base/clipboard/clipboard_aurax11.cc
+++ b/ui/base/clipboard/clipboard_aurax11.cc
@@ -447,15 +447,18 @@ bool Clipboard::FormatType::Equals(const FormatType& other) const {
}
Clipboard::Clipboard() {
+ DCHECK(CalledOnValidThread());
// Make sure clipboard is created.
GetClipboard();
}
Clipboard::~Clipboard() {
+ DCHECK(CalledOnValidThread());
DeleteClipboard();
}
void Clipboard::WriteObjects(const ObjectMap& objects) {
+ DCHECK(CalledOnValidThread());
for (ObjectMap::const_iterator iter = objects.begin();
iter != objects.end(); ++iter) {
DispatchObject(static_cast<ObjectType>(iter->first), iter->second);
@@ -465,6 +468,7 @@ void Clipboard::WriteObjects(const ObjectMap& objects) {
bool Clipboard::IsFormatAvailable(const FormatType& format,
Buffer buffer) const {
+ DCHECK(CalledOnValidThread());
DCHECK(IsValidBuffer(buffer));
AuraClipboard* clipboard = GetClipboard();
if (GetPlainTextFormatType().Equals(format))
@@ -487,6 +491,7 @@ bool Clipboard::IsFormatAvailable(const FormatType& format,
void Clipboard::ReadAvailableTypes(Buffer buffer, std::vector<string16>* types,
bool* contains_filenames) const {
+ DCHECK(CalledOnValidThread());
if (!types || !contains_filenames) {
NOTREACHED();
return;
@@ -513,10 +518,12 @@ void Clipboard::ReadAvailableTypes(Buffer buffer, std::vector<string16>* types,
}
void Clipboard::ReadText(Buffer buffer, string16* result) const {
+ DCHECK(CalledOnValidThread());
GetClipboard()->ReadText(result);
}
void Clipboard::ReadAsciiText(Buffer buffer, std::string* result) const {
+ DCHECK(CalledOnValidThread());
GetClipboard()->ReadAsciiText(result);
}
@@ -525,24 +532,29 @@ void Clipboard::ReadHTML(Buffer buffer,
std::string* src_url,
uint32* fragment_start,
uint32* fragment_end) const {
+ DCHECK(CalledOnValidThread());
GetClipboard()->ReadHTML(markup, src_url, fragment_start, fragment_end);
}
SkBitmap Clipboard::ReadImage(Buffer buffer) const {
+ DCHECK(CalledOnValidThread());
return GetClipboard()->ReadImage();
}
void Clipboard::ReadCustomData(Buffer buffer,
const string16& type,
string16* result) const {
+ DCHECK(CalledOnValidThread());
GetClipboard()->ReadCustomData(type, result);
}
void Clipboard::ReadBookmark(string16* title, std::string* url) const {
+ DCHECK(CalledOnValidThread());
GetClipboard()->ReadBookmark(title, url);
}
void Clipboard::ReadFile(FilePath* file) const {
+ DCHECK(CalledOnValidThread());
GetClipboard()->ReadFile(file);
}
@@ -551,10 +563,12 @@ void Clipboard::ReadFiles(std::vector<FilePath>* files) const {
}
void Clipboard::ReadData(const FormatType& format, std::string* result) const {
+ DCHECK(CalledOnValidThread());
GetClipboard()->ReadData(format.ToString(), result);
}
uint64 Clipboard::GetSequenceNumber(Buffer buffer) {
+ DCHECK(CalledOnValidThread());
return GetClipboard()->GetNumClipboardEntries();
}

Powered by Google App Engine
This is Rietveld 408576698