Clipboard: Remove unused ui::ClipboardType argument from Write functions.

Remove unused arguments, to make blink and mojo more "thin" and readable.

https://cs.chromium.org/chromium/src/third_party/blink/public/mojom/clipboard/clipboard.mojom?l=62

Bug: 956291
Change-Id: I62a14b7fd3cb35f566a31d3fd5ac43995724534f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1582305Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Darwin Huang <huangdarwin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#654710}

content/browser/renderer_host/clipboard_host_impl.cc

@@ -141,23 +141,20 @@ void ClipboardHostImpl::ReadCustomData(ui::ClipboardType clipboard_type,
   std::move(callback).Run(result);
 }
 
-void ClipboardHostImpl::WriteText(ui::ClipboardType,
-                                  const base::string16& text) {
+void ClipboardHostImpl::WriteText(const base::string16& text) {
   clipboard_writer_->WriteText(text);
 }
 
-void ClipboardHostImpl::WriteHtml(ui::ClipboardType,
-                                  const base::string16& markup,
+void ClipboardHostImpl::WriteHtml(const base::string16& markup,
                                   const GURL& url) {
   clipboard_writer_->WriteHTML(markup, url.spec());
 }
 
-void ClipboardHostImpl::WriteSmartPasteMarker(ui::ClipboardType) {
+void ClipboardHostImpl::WriteSmartPasteMarker() {
   clipboard_writer_->WriteWebSmartPaste();
 }
 
 void ClipboardHostImpl::WriteCustomData(
-    ui::ClipboardType,
     const base::flat_map<base::string16, base::string16>& data) {
   base::Pickle pickle;
   ui::WriteCustomDataToPickle(data, &pickle);
@@ -165,17 +162,16 @@ void ClipboardHostImpl::WriteCustomData(
       pickle, ui::ClipboardFormatType::GetWebCustomDataType());
 }
 
-void ClipboardHostImpl::WriteBookmark(ui::ClipboardType,
-                                      const std::string& url,
+void ClipboardHostImpl::WriteBookmark(const std::string& url,
                                       const base::string16& title) {
   clipboard_writer_->WriteBookmark(title, url);
 }
 
-void ClipboardHostImpl::WriteImage(ui::ClipboardType, const SkBitmap& bitmap) {
+void ClipboardHostImpl::WriteImage(const SkBitmap& bitmap) {
   clipboard_writer_->WriteImage(bitmap);
 }
 
-void ClipboardHostImpl::CommitWrite(ui::ClipboardType) {
+void ClipboardHostImpl::CommitWrite() {
   clipboard_writer_.reset(
       new ui::ScopedClipboardWriter(ui::CLIPBOARD_TYPE_COPY_PASTE));
 }

content/browser/renderer_host/clipboard_host_impl.h

@@ -55,21 +55,15 @@ class CONTENT_EXPORT ClipboardHostImpl : public blink::mojom::ClipboardHost {
   void ReadCustomData(ui::ClipboardType clipboard_type,
                       const base::string16& type,
                       ReadCustomDataCallback callback) override;
-  void WriteText(ui::ClipboardType clipboard_type,
-                 const base::string16& text) override;
-  void WriteHtml(ui::ClipboardType clipboard_type,
-                 const base::string16& markup,
-                 const GURL& url) override;
-  void WriteSmartPasteMarker(ui::ClipboardType clipboard_type) override;
+  void WriteText(const base::string16& text) override;
+  void WriteHtml(const base::string16& markup, const GURL& url) override;
+  void WriteSmartPasteMarker() override;
   void WriteCustomData(
-      ui::ClipboardType clipboard_type,
       const base::flat_map<base::string16, base::string16>& data) override;
-  void WriteBookmark(ui::ClipboardType clipboard_type,
-                     const std::string& url,
+  void WriteBookmark(const std::string& url,
                      const base::string16& title) override;
-  void WriteImage(ui::ClipboardType clipboard_type,
-                  const SkBitmap& bitmap) override;
-  void CommitWrite(ui::ClipboardType clipboard_type) override;
+  void WriteImage(const SkBitmap& bitmap) override;
+  void CommitWrite() override;
 #if defined(OS_MACOSX)
   void WriteStringToFindPboard(const base::string16& text) override;
 #endif

content/browser/renderer_host/clipboard_host_impl_unittest.cc

@@ -47,10 +47,10 @@ TEST_F(ClipboardHostImplTest, SimpleImage) {
   SkBitmap bitmap;
   bitmap.allocN32Pixels(3, 2);
   bitmap.eraseARGB(255, 0, 255, 0);
-  mojo_clipboard()->WriteImage(ui::CLIPBOARD_TYPE_COPY_PASTE, bitmap);
+  mojo_clipboard()->WriteImage(bitmap);
   uint64_t sequence_number =
       system_clipboard()->GetSequenceNumber(ui::CLIPBOARD_TYPE_COPY_PASTE);
-  mojo_clipboard()->CommitWrite(ui::CLIPBOARD_TYPE_COPY_PASTE);
+  mojo_clipboard()->CommitWrite();
   base::RunLoop().RunUntilIdle();
 
   EXPECT_NE(sequence_number, system_clipboard()->GetSequenceNumber(

content/renderer/pepper/pepper_webplugin_impl.cc

@@ -330,9 +330,9 @@ bool PepperWebPluginImpl::ExecuteEditCommand(const blink::WebString& name,
       markup = instance_->GetSelectedText(true);
       text = instance_->GetSelectedText(false);
     }
-    clipboard_->WriteHtml(ui::CLIPBOARD_TYPE_COPY_PASTE, markup, GURL());
-    clipboard_->WriteText(ui::CLIPBOARD_TYPE_COPY_PASTE, text);
-    clipboard_->CommitWrite(ui::CLIPBOARD_TYPE_COPY_PASTE);
+    clipboard_->WriteHtml(markup, GURL());
+    clipboard_->WriteText(text);
+    clipboard_->CommitWrite();
 
     instance_->ReplaceSelection("");
     return true;

content/test/mock_clipboard_host.cc

@@ -98,15 +98,13 @@ void MockClipboardHost::ReadCustomData(ui::ClipboardType clipboard_type,
                                                    : base::string16());
 }
 
-void MockClipboardHost::WriteText(ui::ClipboardType,
-                                  const base::string16& text) {
+void MockClipboardHost::WriteText(const base::string16& text) {
   if (needs_reset_)
     Reset();
   plain_text_ = text;
 }
 
-void MockClipboardHost::WriteHtml(ui::ClipboardType,
-                                  const base::string16& markup,
+void MockClipboardHost::WriteHtml(const base::string16& markup,
                                   const GURL& url) {
   if (needs_reset_)
     Reset();
@@ -114,14 +112,13 @@ void MockClipboardHost::WriteHtml(ui::ClipboardType,
   url_ = url;
 }
 
-void MockClipboardHost::WriteSmartPasteMarker(ui::ClipboardType) {
+void MockClipboardHost::WriteSmartPasteMarker() {
   if (needs_reset_)
     Reset();
   write_smart_paste_ = true;
 }
 
 void MockClipboardHost::WriteCustomData(
-    ui::ClipboardType,
     const base::flat_map<base::string16, base::string16>& data) {
   if (needs_reset_)
     Reset();
@@ -129,17 +126,16 @@ void MockClipboardHost::WriteCustomData(
     custom_data_[it.first] = it.second;
 }
 
-void MockClipboardHost::WriteBookmark(ui::ClipboardType,
-                                      const std::string& url,
+void MockClipboardHost::WriteBookmark(const std::string& url,
                                       const base::string16& title) {}
 
-void MockClipboardHost::WriteImage(ui::ClipboardType, const SkBitmap& bitmap) {
+void MockClipboardHost::WriteImage(const SkBitmap& bitmap) {
   if (needs_reset_)
     Reset();
   image_ = bitmap;
 }
 
-void MockClipboardHost::CommitWrite(ui::ClipboardType) {
+void MockClipboardHost::CommitWrite() {
   ++sequence_number_;
   needs_reset_ = true;
 }

content/test/mock_clipboard_host.h

@@ -42,21 +42,15 @@ class MockClipboardHost : public blink::mojom::ClipboardHost {
   void ReadCustomData(ui::ClipboardType clipboard_type,
                       const base::string16& type,
                       ReadCustomDataCallback callback) override;
-  void WriteText(ui::ClipboardType clipboard_type,
-                 const base::string16& text) override;
-  void WriteHtml(ui::ClipboardType clipboard_type,
-                 const base::string16& markup,
-                 const GURL& url) override;
-  void WriteSmartPasteMarker(ui::ClipboardType clipboard_type) override;
+  void WriteText(const base::string16& text) override;
+  void WriteHtml(const base::string16& markup, const GURL& url) override;
+  void WriteSmartPasteMarker() override;
   void WriteCustomData(
-      ui::ClipboardType clipboard_type,
       const base::flat_map<base::string16, base::string16>& data) override;
-  void WriteBookmark(ui::ClipboardType clipboard_type,
-                     const std::string& url,
+  void WriteBookmark(const std::string& url,
                      const base::string16& title) override;
-  void WriteImage(ui::ClipboardType clipboard_type,
-                  const SkBitmap& bitmap) override;
-  void CommitWrite(ui::ClipboardType clipboard_type) override;
+  void WriteImage(const SkBitmap& bitmap) override;
+  void CommitWrite() override;
 #if defined(OS_MACOSX)
   void WriteStringToFindPboard(const base::string16& text) override;
 #endif

third_party/blink/public/mojom/clipboard/clipboard.mojom

@@ -55,34 +55,28 @@ interface ClipboardHost {
   ReadCustomData(ClipboardBuffer buffer, mojo_base.mojom.String16 type) =>
       (mojo_base.mojom.BigString16 result);
 
-  // Writing to the clipboard via IPC is a two-phase operation. First, the
+  // Writing to the clipboard via mojo is a two-phase operation. First, the
   // sender sends the different types of data it'd like to write to the
   // receiver. Then, it sends a commit message to commit the data to the system
   // clipboard.
-  // TODO(dcheng): Remove |buffer| parameters from Write* functions.
-  WriteText(ClipboardBuffer buffer, mojo_base.mojom.BigString16 text);
+  WriteText(mojo_base.mojom.BigString16 text);
 
-  WriteHtml(ClipboardBuffer buffer,
-            mojo_base.mojom.BigString16 markup,
-            url.mojom.Url url);
+  WriteHtml(mojo_base.mojom.BigString16 markup, url.mojom.Url url);
 
-  WriteSmartPasteMarker(ClipboardBuffer buffer);
+  WriteSmartPasteMarker();
 
-  WriteCustomData(
-      ClipboardBuffer buffer,
-      map<mojo_base.mojom.String16, mojo_base.mojom.BigString16> data);
+  WriteCustomData(map<mojo_base.mojom.String16, mojo_base.mojom.BigString16> data);
 
   // TODO(dcheng): The |url| parameter should really be a GURL, but <canvas>'s
   // copy as image tries to set very long data: URLs on the clipboard. Using
   // GURL causes the browser to kill the renderer for sending a bad IPC (GURLs
   // bigger than 2 megabytes are considered to be bad). https://crbug.com/459822
-  WriteBookmark(ClipboardBuffer buffer,
-                string url,
+  WriteBookmark(string url,
                 mojo_base.mojom.String16 title);
 
-  WriteImage(ClipboardBuffer buffer, skia.mojom.Bitmap image);
+  WriteImage(skia.mojom.Bitmap image);
 
-  CommitWrite(ClipboardBuffer buffer);
+  CommitWrite();
 
   [EnableIf=is_mac]
   WriteStringToFindPboard(mojo_base.mojom.String16 text);

third_party/blink/renderer/core/clipboard/system_clipboard.cc

@@ -101,7 +101,7 @@ void SystemClipboard::WritePlainText(const String& plain_text,
 #if defined(OS_WIN)
   ReplaceNewlinesWithWindowsStyleNewlines(text);
 #endif
-  clipboard_->WriteText(mojom::ClipboardBuffer::kStandard, NonNullString(text));
+  clipboard_->WriteText(NonNullString(text));
 }
 
 String SystemClipboard::ReadHTML(KURL& url,
@@ -131,11 +131,10 @@ void SystemClipboard::WriteHTML(const String& markup,
 #endif
   ReplaceNBSPWithSpace(text);
 
-  clipboard_->WriteHtml(mojom::ClipboardBuffer::kStandard,
-                        NonNullString(markup), document_url);
-  clipboard_->WriteText(mojom::ClipboardBuffer::kStandard, NonNullString(text));
+  clipboard_->WriteHtml(NonNullString(markup), document_url);
+  clipboard_->WriteText(NonNullString(text));
   if (smart_replace_option == kCanSmartReplace)
-    clipboard_->WriteSmartPasteMarker(mojom::ClipboardBuffer::kStandard);
+    clipboard_->WriteSmartPasteMarker();
 }
 
 String SystemClipboard::ReadRTF() {
@@ -161,7 +160,7 @@ void SystemClipboard::WriteImageWithTag(Image* image,
   SkBitmap bitmap;
   if (sk_sp<SkImage> sk_image = paint_image.GetSkImage())
     sk_image->asLegacyBitmap(&bitmap);
-  clipboard_->WriteImage(mojom::ClipboardBuffer::kStandard, bitmap);
+  clipboard_->WriteImage(bitmap);
 
   if (url.IsValid() && !url.IsEmpty()) {
 #if !defined(OS_MACOSX)
@@ -169,21 +168,19 @@ void SystemClipboard::WriteImageWithTag(Image* image,
     // consistency between platforms, and to help fix errors in applications
     // which prefer text/plain content over image content for compatibility with
     // Microsoft Word.
-    clipboard_->WriteBookmark(mojom::ClipboardBuffer::kStandard,
-                              url.GetString(), NonNullString(title));
+    clipboard_->WriteBookmark(url.GetString(), NonNullString(title));
 #endif
 
     // When writing the image, we also write the image markup so that pasting
     // into rich text editors, such as Gmail, reveals the image. We also don't
     // want to call writeText(), since some applications (WordPad) don't pick
     // the image if there is also a text format on the clipboard.
-    clipboard_->WriteHtml(mojom::ClipboardBuffer::kStandard,
-                          URLToImageMarkup(url, title), KURL());
+    clipboard_->WriteHtml(URLToImageMarkup(url, title), KURL());
   }
 }
 
 void SystemClipboard::WriteImage(const SkBitmap& bitmap) {
-  clipboard_->WriteImage(mojom::ClipboardBuffer::kStandard, bitmap);
+  clipboard_->WriteImage(bitmap);
 }
 
 String SystemClipboard::ReadCustomData(const String& type) {
@@ -211,24 +208,21 @@ void SystemClipboard::WriteDataObject(DataObject* data_object) {
   for (const WebDragData::Item& item : data.Items()) {
     if (item.storage_type == WebDragData::Item::kStorageTypeString) {
       if (item.string_type == blink::kMimeTypeTextPlain) {
-        clipboard_->WriteText(mojom::ClipboardBuffer::kStandard,
-                              NonNullString(item.string_data));
+        clipboard_->WriteText(NonNullString(item.string_data));
       } else if (item.string_type == blink::kMimeTypeTextHTML) {
-        clipboard_->WriteHtml(mojom::ClipboardBuffer::kStandard,
-                              NonNullString(item.string_data), KURL());
+        clipboard_->WriteHtml(NonNullString(item.string_data), KURL());
       } else if (item.string_type != blink::kMimeTypeDownloadURL) {
         custom_data.insert(item.string_type, NonNullString(item.string_data));
       }
     }
   }
   if (!custom_data.IsEmpty()) {
-    clipboard_->WriteCustomData(mojom::ClipboardBuffer::kStandard,
-                                std::move(custom_data));
+    clipboard_->WriteCustomData(std::move(custom_data));
   }
 }
 
 void SystemClipboard::CommitWrite() {
-  clipboard_->CommitWrite(mojom::ClipboardBuffer::kStandard);
+  clipboard_->CommitWrite();
 }
 
 bool SystemClipboard::IsValidBufferType(mojom::ClipboardBuffer buffer) {