Change the ChromiumPasteboard to have a notion of an alternate clipboard...

webkit/glue/webclipboard_impl.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.  Use of this
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
 #include "webkit/glue/webclipboard_impl.h"
 
 #include "base/clipboard.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "googleurl/src/gurl.h"
@@ skipping 37 matching lines @@
   markup.append("\"");
   if (!title.isEmpty()) {
     markup.append(" alt=\"");
     markup.append(EscapeForHTML(UTF16ToUTF8(title)));
     markup.append("\"");
   }
   markup.append("/>");
   return markup;
 }
 
-bool WebClipboardImpl::isFormatAvailable(Format format) {
+bool WebClipboardImpl::isFormatAvailable(Format format, Buffer buffer) {
   Clipboard::FormatType format_type;
+  Clipboard::Buffer buffer_type;
 
   switch (format) {
     case FormatHTML:
       format_type = Clipboard::GetHtmlFormatType();
       break;
     case FormatSmartPaste:
       format_type = Clipboard::GetWebKitSmartPasteFormatType();
       break;
     case FormatBookmark:
 #if defined(OS_WIN) || defined(OS_MACOSX)
       format_type = Clipboard::GetUrlWFormatType();
       break;
 #endif
     default:
       NOTREACHED();
       return false;
   }
 
-  return ClipboardIsFormatAvailable(format_type);
+  if (!ConvertBufferType(buffer, &buffer_type))
+    return false;
+
+  return ClipboardIsFormatAvailable(format_type, buffer_type);
 }
 
-WebString WebClipboardImpl::readPlainText() {
-  if (ClipboardIsFormatAvailable(Clipboard::GetPlainTextWFormatType())) {
+WebString WebClipboardImpl::readPlainText(Buffer buffer) {
+  Clipboard::Buffer buffer_type;
+  if (!ConvertBufferType(buffer, &buffer_type))
+    return WebString();
+
+  if (ClipboardIsFormatAvailable(Clipboard::GetPlainTextWFormatType(),
+                                 buffer_type)) {
     string16 text;
-    ClipboardReadText(&text);
+    ClipboardReadText(buffer_type, &text);
     if (!text.empty())
       return text;
   }
 
-  if (ClipboardIsFormatAvailable(Clipboard::GetPlainTextFormatType())) {
+  if (ClipboardIsFormatAvailable(Clipboard::GetPlainTextFormatType(),
+                                 buffer_type)) {
     std::string text;
-    ClipboardReadAsciiText(&text);
+    ClipboardReadAsciiText(buffer_type, &text);
     if (!text.empty())
       return ASCIIToUTF16(text);
   }
 
   return WebString();
 }
 
-WebString WebClipboardImpl::readHTML(WebURL* source_url) {
+WebString WebClipboardImpl::readHTML(Buffer buffer, WebURL* source_url) {
+  Clipboard::Buffer buffer_type;
+  if (!ConvertBufferType(buffer, &buffer_type))
+    return WebString();
+
   string16 html_stdstr;
   GURL gurl;
-  ClipboardReadHTML(&html_stdstr, &gurl);
+  ClipboardReadHTML(buffer_type, &html_stdstr, &gurl);
   *source_url = gurl;
   return html_stdstr;
 }
 
 void WebClipboardImpl::writeHTML(
     const WebString& html_text, const WebURL& source_url,
     const WebString& plain_text, bool write_smart_paste) {
   ScopedClipboardWriterGlue scw(ClipboardGetClipboard());
   scw.WriteHTML(html_text, source_url.spec());
   scw.WriteText(plain_text);
@@ skipping 24 matching lines @@
     scw.WriteBitmapFromPixels(bitmap.getPixels(), image.size());
   }
 
   if (!url.isEmpty()) {
     scw.WriteBookmark(title, url.spec());
     scw.WriteHTML(UTF8ToUTF16(URLToImageMarkup(url, title)), "");
     scw.WriteText(UTF8ToUTF16(url.spec()));
   }
 }
 
+bool WebClipboardImpl::ConvertBufferType(Buffer buffer,
+                                         Clipboard::Buffer* result) {
+  switch (buffer) {
+    case BufferStandard:
+      *result = Clipboard::BUFFER_STANDARD;
+      break;
+    case BufferSelection:
+#if defined(OS_LINUX)
+      *result = Clipboard::BUFFER_SELECTION;
+      break;
+#endif
+    default:
+      NOTREACHED();
+      return false;
+  }
+  return true;
+}
+
 }  // namespace webkit_glue