summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-15 01:13:54 +0000
committerdcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-15 01:13:54 +0000
commit6a90d5c514d82080a8d15265094e10e1a79a3c55 (patch)
treee185002a465b75abd38965311f2f98f33deaf63d
parentd4de021797b34583cdf72983cdbf653fe4d290fe (diff)
downloadchromium_src-6a90d5c514d82080a8d15265094e10e1a79a3c55.zip
chromium_src-6a90d5c514d82080a8d15265094e10e1a79a3c55.tar.gz
chromium_src-6a90d5c514d82080a8d15265094e10e1a79a3c55.tar.bz2
Revert r78134+r78136
BUG=none TEST=none TBR=levin@chromium.org Review URL: http://codereview.chromium.org/6698011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78139 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat
-rw-r--r--chrome/common/clipboard_messages.h4
-rw-r--r--chrome/renderer/renderer_glue.cc15
-rw-r--r--content/browser/renderer_host/clipboard_message_filter.cc10
-rw-r--r--content/browser/renderer_host/clipboard_message_filter.h1
-rw-r--r--ui/base/clipboard/clipboard.h4
-rw-r--r--ui/base/clipboard/clipboard_linux.cc9
-rw-r--r--ui/base/clipboard/clipboard_mac.mm8
-rw-r--r--ui/base/clipboard/clipboard_win.cc8
-rw-r--r--webkit/glue/webclipboard_impl.cc12
-rw-r--r--webkit/glue/webclipboard_impl.h1
-rw-r--r--webkit/glue/webkit_glue.h2
11 files changed, 8 insertions, 66 deletions
diff --git a/chrome/common/clipboard_messages.h b/chrome/common/clipboard_messages.h
index 7679c3f..9bbce5b 100644
--- a/chrome/common/clipboard_messages.h
+++ b/chrome/common/clipboard_messages.h
@@ -7,6 +7,7 @@
#include <string>
#include <vector>
+// #include "chrome/common/common_param_traits.h"
#include "content/common/common_param_traits.h"
#include "ipc/ipc_message_macros.h"
#include "ipc/ipc_param_traits.h"
@@ -41,9 +42,6 @@ IPC_SYNC_MESSAGE_CONTROL1_2(ClipboardHostMsg_ReadHTML,
ui::Clipboard::Buffer /* buffer */,
string16 /* markup */,
GURL /* url */)
-IPC_SYNC_MESSAGE_CONTROL1_1(ClipboardHostMsg_ReadImage,
- ui::Clipboard::Buffer /* buffer */,
- std::string /* PNG-encoded image */)
#if defined(OS_MACOSX)
IPC_MESSAGE_CONTROL1(ClipboardHostMsg_FindPboardWriteStringAsync,
string16 /* text */)
diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc
index 4b31730..f61a011 100644
--- a/chrome/renderer/renderer_glue.cc
+++ b/chrome/renderer/renderer_glue.cc
@@ -167,22 +167,19 @@ bool ClipboardIsFormatAvailable(const ui::Clipboard::FormatType& format,
}
void ClipboardReadText(ui::Clipboard::Buffer buffer, string16* result) {
- RenderThread::current()->Send(new ClipboardHostMsg_ReadText(buffer, result));
+ RenderThread::current()->Send(new ClipboardHostMsg_ReadText(buffer,
+ result));
}
void ClipboardReadAsciiText(ui::Clipboard::Buffer buffer, std::string* result) {
- RenderThread::current()->Send(
- new ClipboardHostMsg_ReadAsciiText(buffer, result));
+ RenderThread::current()->Send(new ClipboardHostMsg_ReadAsciiText(buffer,
+ result));
}
void ClipboardReadHTML(ui::Clipboard::Buffer buffer, string16* markup,
GURL* url) {
- RenderThread::current()->Send(
- new ClipboardHostMsg_ReadHTML(buffer, markup, url));
-}
-
-void ClipboardReadImage(ui::Clipboard::Buffer buffer, std::string* data) {
- RenderThread::current()->Send(new ClipboardHostMsg_ReadImage(buffer, data));
+ RenderThread::current()->Send(new ClipboardHostMsg_ReadHTML(buffer,
+ markup, url));
}
bool ClipboardReadAvailableTypes(ui::Clipboard::Buffer buffer,
diff --git a/content/browser/renderer_host/clipboard_message_filter.cc b/content/browser/renderer_host/clipboard_message_filter.cc
index ca71e5d..8cb3b9d 100644
--- a/content/browser/renderer_host/clipboard_message_filter.cc
+++ b/content/browser/renderer_host/clipboard_message_filter.cc
@@ -38,9 +38,7 @@ ClipboardMessageFilter::ClipboardMessageFilter() {
void ClipboardMessageFilter::OverrideThreadForMessage(
const IPC::Message& message, BrowserThread::ID* thread) {
#if defined(USE_X11)
- if (message.type() == ClipboardHostMsg_ReadImage::ID)
- *thread = BrowserThread::BACKGROUND_X11;
- else if (IPC_MESSAGE_CLASS(message) == ClipboardMsgStart)
+ if (IPC_MESSAGE_CLASS(message) == ClipboardMsgStart)
*thread = BrowserThread::UI;
#endif
}
@@ -55,7 +53,6 @@ bool ClipboardMessageFilter::OnMessageReceived(const IPC::Message& message,
IPC_MESSAGE_HANDLER(ClipboardHostMsg_ReadText, OnReadText)
IPC_MESSAGE_HANDLER(ClipboardHostMsg_ReadAsciiText, OnReadAsciiText)
IPC_MESSAGE_HANDLER(ClipboardHostMsg_ReadHTML, OnReadHTML)
- IPC_MESSAGE_HANDLER(ClipboardHostMsg_ReadImage, OnReadImage)
#if defined(OS_MACOSX)
IPC_MESSAGE_HANDLER(ClipboardHostMsg_FindPboardWriteStringAsync,
OnFindPboardWriteString)
@@ -135,11 +132,6 @@ void ClipboardMessageFilter::OnReadHTML(
*url = GURL(src_url_str);
}
-void ClipboardMessageFilter::OnReadImage(
- ui::Clipboard::Buffer buffer, std::string* data) {
- GetClipboard()->ReadImage(buffer, data);
-}
-
void ClipboardMessageFilter::OnReadAvailableTypes(
ui::Clipboard::Buffer buffer, bool* succeeded, std::vector<string16>* types,
bool* contains_filenames) {
diff --git a/content/browser/renderer_host/clipboard_message_filter.h b/content/browser/renderer_host/clipboard_message_filter.h
index 682e241e..f755d91 100644
--- a/content/browser/renderer_host/clipboard_message_filter.h
+++ b/content/browser/renderer_host/clipboard_message_filter.h
@@ -35,7 +35,6 @@ class ClipboardMessageFilter : public BrowserMessageFilter {
void OnReadText(ui::Clipboard::Buffer buffer, string16* result);
void OnReadAsciiText(ui::Clipboard::Buffer buffer, std::string* result);
void OnReadHTML(ui::Clipboard::Buffer buffer, string16* markup, GURL* url);
- void OnReadImage(ui::Clipboard::Buffer buffer, std::string* data);
#if defined(OS_MACOSX)
void OnFindPboardWriteString(const string16& text);
#endif
diff --git a/ui/base/clipboard/clipboard.h b/ui/base/clipboard/clipboard.h
index bb3bc29..715e6ea 100644
--- a/ui/base/clipboard/clipboard.h
+++ b/ui/base/clipboard/clipboard.h
@@ -148,10 +148,6 @@ class Clipboard {
// Reads HTML from the clipboard, if available.
void ReadHTML(Buffer buffer, string16* markup, std::string* src_url) const;
- // Reads an image from the clipboard, if available. The returned data will be
- // encoded in PNG format.
- void ReadImage(Buffer buffer, std::string* data) const;
-
// Reads a bookmark from the clipboard, if available.
void ReadBookmark(string16* title, std::string* url) const;
diff --git a/ui/base/clipboard/clipboard_linux.cc b/ui/base/clipboard/clipboard_linux.cc
index 3bb1e88..f9ec174 100644
--- a/ui/base/clipboard/clipboard_linux.cc
+++ b/ui/base/clipboard/clipboard_linux.cc
@@ -360,15 +360,6 @@ void Clipboard::ReadHTML(Clipboard::Buffer buffer, string16* markup,
gtk_selection_data_free(data);
}
-void Clipboard::ReadImage(Buffer buffer, std::string* data) const {
- // TODO(dcheng): implement this.
- NOTIMPLEMENTED();
- if (!data) {
- NOTREACHED();
- return;
- }
-}
-
void Clipboard::ReadBookmark(string16* title, std::string* url) const {
// TODO(estade): implement this.
NOTIMPLEMENTED();
diff --git a/ui/base/clipboard/clipboard_mac.mm b/ui/base/clipboard/clipboard_mac.mm
index 2761eba..89ad97d 100644
--- a/ui/base/clipboard/clipboard_mac.mm
+++ b/ui/base/clipboard/clipboard_mac.mm
@@ -222,14 +222,6 @@ void Clipboard::ReadHTML(Clipboard::Buffer buffer, string16* markup,
src_url->clear();
}
-void Clipboard::ReadImage(Buffer buffer, std::string* data) const {
- DCHECK_EQ(buffer, BUFFER_STANDARD);
- if (!data) {
- NOTREACHED();
- return;
- }
-}
-
void Clipboard::ReadBookmark(string16* title, std::string* url) const {
NSPasteboard* pb = GetPasteboard();
diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
index 603779b..88a1ff5 100644
--- a/ui/base/clipboard/clipboard_win.cc
+++ b/ui/base/clipboard/clipboard_win.cc
@@ -404,14 +404,6 @@ void Clipboard::ReadHTML(Clipboard::Buffer buffer, string16* markup,
markup->assign(UTF8ToWide(markup_utf8));
}
-void Clipboard::ReadImage(Buffer buffer, std::string* data) const {
- DCHECK_EQ(buffer, BUFFER_STANDARD);
- if (!data) {
- NOTREACHED();
- return;
- }
-}
-
void Clipboard::ReadBookmark(string16* title, std::string* url) const {
if (title)
title->clear();
diff --git a/webkit/glue/webclipboard_impl.cc b/webkit/glue/webclipboard_impl.cc
index 9eddb68..b917677 100644
--- a/webkit/glue/webclipboard_impl.cc
+++ b/webkit/glue/webclipboard_impl.cc
@@ -10,7 +10,6 @@
#include "googleurl/src/gurl.h"
#include "net/base/escape.h"
#include "third_party/skia/include/core/SkBitmap.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebData.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebImage.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
@@ -25,7 +24,6 @@
#endif
using WebKit::WebClipboard;
-using WebKit::WebData;
using WebKit::WebImage;
using WebKit::WebString;
using WebKit::WebURL;
@@ -126,16 +124,6 @@ WebString WebClipboardImpl::readHTML(Buffer buffer, WebURL* source_url) {
return html_stdstr;
}
-WebData WebClipboardImpl::readImage(Buffer buffer) {
- ui::Clipboard::Buffer buffer_type;
- if (!ConvertBufferType(buffer, &buffer_type))
- return WebData();
-
- std::string png_data;
- ClipboardReadImage(buffer_type, &png_data);
- return WebData(png_data);
-}
-
void WebClipboardImpl::writeHTML(
const WebString& html_text, const WebURL& source_url,
const WebString& plain_text, bool write_smart_paste) {
diff --git a/webkit/glue/webclipboard_impl.h b/webkit/glue/webclipboard_impl.h
index c50f38d..ba3e747 100644
--- a/webkit/glue/webclipboard_impl.h
+++ b/webkit/glue/webclipboard_impl.h
@@ -25,7 +25,6 @@ class WebClipboardImpl : public WebKit::WebClipboard {
virtual bool isFormatAvailable(Format, Buffer);
virtual WebKit::WebString readPlainText(Buffer);
virtual WebKit::WebString readHTML(Buffer, WebKit::WebURL* source_url);
- virtual WebKit::WebData readImage(Buffer);
virtual void writeHTML(
const WebKit::WebString& html_text,
const WebKit::WebURL& source_url,
diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h
index 68c3394..c1f45e6 100644
--- a/webkit/glue/webkit_glue.h
+++ b/webkit/glue/webkit_glue.h
@@ -198,8 +198,6 @@ void ClipboardReadAsciiText(ui::Clipboard::Buffer buffer, std::string* result);
void ClipboardReadHTML(ui::Clipboard::Buffer buffer, string16* markup,
GURL* url);
-void ClipboardReadImage(ui::Clipboard::Buffer buffer, std::string* data);
-
// Reads the available types from the clipboard, if available.
bool ClipboardReadAvailableTypes(ui::Clipboard::Buffer buffer,
std::vector<string16>* types,
generated by cgit v1.1 at 2025-03-11 06:53:46 +0000