Revert r78134+r78136

webkit/glue/webclipboard_impl.cc

 // Copyright (c) 2011 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/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #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"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "webkit/glue/scoped_clipboard_writer_glue.h"
 #include "webkit/glue/webkit_glue.h"
 
 #if WEBKIT_USING_CG
 #include "skia/ext/skia_utils_mac.h"
 #endif
 
 using WebKit::WebClipboard;
-using WebKit::WebData;
 using WebKit::WebImage;
 using WebKit::WebString;
 using WebKit::WebURL;
 using WebKit::WebVector;
 
 namespace webkit_glue {
 
 // Static
 std::string WebClipboardImpl::URLToMarkup(const WebURL& url,
     const WebString& title) {
@@ skipping 80 matching lines @@
   if (!ConvertBufferType(buffer, &buffer_type))
     return WebString();
 
   string16 html_stdstr;
   GURL gurl;
   ClipboardReadHTML(buffer_type, &html_stdstr, &gurl);
   *source_url = gurl;
   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) {
   ScopedClipboardWriterGlue scw(ClipboardGetClipboard());
   scw.WriteHTML(html_text, source_url.spec());
   scw.WriteText(plain_text);
 
   if (write_smart_paste)
     scw.WriteWebSmartPaste();
 }
@@ skipping 90 matching lines @@
       break;
 #endif
     default:
       NOTREACHED();
       return false;
   }
   return true;
 }
 
 }  // namespace webkit_glue