Diff
Modified: trunk/Source/WebCore/ChangeLog (99236 => 99237)
--- trunk/Source/WebCore/ChangeLog 2011-11-03 20:49:21 UTC (rev 99236)
+++ trunk/Source/WebCore/ChangeLog 2011-11-03 22:28:51 UTC (rev 99237)
@@ -1,3 +1,12 @@
+2011-11-03 Daniel Cheng <[email protected]>
+
+ [chromium] Remove unused clipboard methods
+ https://bugs.webkit.org/show_bug.cgi?id=71512
+
+ Reviewed by Tony Chang.
+
+ * platform/chromium/PlatformSupport.h:
+
2011-11-03 Anna Cavender <[email protected]>
Implement TextTrackCueList.
Modified: trunk/Source/WebCore/platform/chromium/PlatformSupport.h (99236 => 99237)
--- trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2011-11-03 20:49:21 UTC (rev 99236)
+++ trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2011-11-03 22:28:51 UTC (rev 99237)
@@ -95,12 +95,14 @@
static void cacheMetadata(const KURL&, double responseTime, const Vector<char>&);
// Clipboard ----------------------------------------------------------
+ static uint64_t clipboardGetSequenceNumber();
+
static bool clipboardIsFormatAvailable(PasteboardPrivate::ClipboardFormat, PasteboardPrivate::ClipboardBuffer);
+ static HashSet<String> clipboardReadAvailableTypes(PasteboardPrivate::ClipboardBuffer, bool* containsFilenames);
static String clipboardReadPlainText(PasteboardPrivate::ClipboardBuffer);
static void clipboardReadHTML(PasteboardPrivate::ClipboardBuffer, String*, KURL*, unsigned* fragmentStart, unsigned* fragmentEnd);
static PassRefPtr<SharedBuffer> clipboardReadImage(PasteboardPrivate::ClipboardBuffer);
- static uint64_t clipboardGetSequenceNumber();
// Only the clipboardRead functions take a buffer argument because
// Chromium currently uses a different technique to write to alternate
@@ -109,13 +111,7 @@
static void clipboardWritePlainText(const String&);
static void clipboardWriteURL(const KURL&, const String&);
static void clipboardWriteImage(NativeImagePtr, const KURL&, const String&);
- static void clipboardWriteData(const String& type, const String& data, const String& metadata);
- // Interface for handling copy and paste, drag and drop, and selection copy.
- static HashSet<String> clipboardReadAvailableTypes(PasteboardPrivate::ClipboardBuffer, bool* containsFilenames);
- static bool clipboardReadData(PasteboardPrivate::ClipboardBuffer, const String& type, String& data, String& metadata);
- static Vector<String> clipboardReadFilenames(PasteboardPrivate::ClipboardBuffer);
-
// Cookies ------------------------------------------------------------
static void setCookies(const Document*, const KURL&, const String& value);
static String cookies(const Document*, const KURL&);
Modified: trunk/Source/WebKit/chromium/ChangeLog (99236 => 99237)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-11-03 20:49:21 UTC (rev 99236)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-11-03 22:28:51 UTC (rev 99237)
@@ -1,3 +1,18 @@
+2011-11-03 Daniel Cheng <[email protected]>
+
+ [chromium] Remove unused clipboard methods
+ https://bugs.webkit.org/show_bug.cgi?id=71512
+
+ Reviewed by Tony Chang.
+
+ * public/WebClipboard.h:
+ (WebKit::WebClipboard::getSequenceNumber):
+ (WebKit::WebClipboard::readAvailableTypes):
+ (WebKit::WebClipboard::writeImage):
+ * src/PlatformSupport.cpp:
+ (WebCore::PlatformSupport::clipboardGetSequenceNumber):
+ (WebCore::PlatformSupport::clipboardReadAvailableTypes):
+
2011-11-03 Fady Samuel <[email protected]>
[Chromium] Refactor WebFrameImpl::createFrameView() to use Frame:createView
Modified: trunk/Source/WebKit/chromium/public/WebClipboard.h (99236 => 99237)
--- trunk/Source/WebKit/chromium/public/WebClipboard.h 2011-11-03 20:49:21 UTC (rev 99236)
+++ trunk/Source/WebKit/chromium/public/WebClipboard.h 2011-11-03 22:28:51 UTC (rev 99237)
@@ -60,8 +60,14 @@
BufferDrag,
};
+ // Returns an identifier which can be used to determine whether the data
+ // contained within the clipboard has changed.
+ virtual uint64 getSequenceNumber() { return 0; }
+
virtual bool isFormatAvailable(Format, Buffer) { return false; }
+ virtual WebVector<WebString> readAvailableTypes(
+ Buffer, bool* containsFilenames) { return WebVector<WebString>(); }
virtual WebString readPlainText(Buffer) { return WebString(); }
// fragmentStart and fragmentEnd are indexes into the returned markup that
// indicate the start and end of the fragment if the returned markup
@@ -73,10 +79,6 @@
unsigned* fragmentEnd) { return WebString(); }
virtual WebData readImage(Buffer) { return WebData(); }
- // Returns an identifier which can be used to determine whether the data
- // contained within the clipboard has changed.
- virtual uint64 getSequenceNumber() { return 0; }
-
virtual void writePlainText(const WebString&) { }
virtual void writeHTML(
const WebString& htmlText, const WebURL&,
@@ -85,22 +87,7 @@
const WebURL&, const WebString& title) { }
virtual void writeImage(
const WebImage&, const WebURL&, const WebString& title) { }
- virtual void writeData(
- const WebString& type,
- const WebString& data,
- const WebString& metadata) { }
- // The following functions are used for reading platform data for copy and
- // paste, drag and drop, and selection copy (on X).
- virtual WebVector<WebString> readAvailableTypes(
- Buffer, bool* containsFilenames) { return WebVector<WebString>(); }
- // Returns true if the requested type was successfully read from the buffer.
- virtual bool readData(
- Buffer, const WebString& type, WebString* data,
- WebString* metadata) { return false; }
- virtual WebVector<WebString> readFilenames(
- Buffer) { return WebVector<WebString>(); }
-
protected:
~WebClipboard() {}
};
Modified: trunk/Source/WebKit/chromium/src/PlatformSupport.cpp (99236 => 99237)
--- trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2011-11-03 20:49:21 UTC (rev 99236)
+++ trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2011-11-03 22:28:51 UTC (rev 99237)
@@ -150,6 +150,11 @@
// Clipboard ------------------------------------------------------------------
+uint64_t PlatformSupport::clipboardGetSequenceNumber()
+{
+ return webKitPlatformSupport()->clipboard()->getSequenceNumber();
+}
+
bool PlatformSupport::clipboardIsFormatAvailable(
PasteboardPrivate::ClipboardFormat format,
PasteboardPrivate::ClipboardBuffer buffer)
@@ -159,6 +164,17 @@
static_cast<WebClipboard::Buffer>(buffer));
}
+HashSet<String> PlatformSupport::clipboardReadAvailableTypes(
+ PasteboardPrivate::ClipboardBuffer buffer, bool* containsFilenames)
+{
+ WebVector<WebString> result = webKitPlatformSupport()->clipboard()->readAvailableTypes(
+ static_cast<WebClipboard::Buffer>(buffer), containsFilenames);
+ HashSet<String> types;
+ for (size_t i = 0; i < result.size(); ++i)
+ types.add(result[i]);
+ return types;
+}
+
String PlatformSupport::clipboardReadPlainText(
PasteboardPrivate::ClipboardBuffer buffer)
{
@@ -182,11 +198,6 @@
return webKitPlatformSupport()->clipboard()->readImage(static_cast<WebClipboard::Buffer>(buffer));
}
-uint64_t PlatformSupport::clipboardGetSequenceNumber()
-{
- return webKitPlatformSupport()->clipboard()->getSequenceNumber();
-}
-
void PlatformSupport::clipboardWriteSelection(const String& htmlText,
const KURL& sourceURL,
const String& plainText,
@@ -218,48 +229,6 @@
webKitPlatformSupport()->clipboard()->writeImage(webImage, sourceURL, title);
}
-void PlatformSupport::clipboardWriteData(const String& type,
- const String& data,
- const String& metadata)
-{
- webKitPlatformSupport()->clipboard()->writeData(type, data, metadata);
-}
-
-HashSet<String> PlatformSupport::clipboardReadAvailableTypes(
- PasteboardPrivate::ClipboardBuffer buffer, bool* containsFilenames)
-{
- WebVector<WebString> result = webKitPlatformSupport()->clipboard()->readAvailableTypes(
- static_cast<WebClipboard::Buffer>(buffer), containsFilenames);
- HashSet<String> types;
- for (size_t i = 0; i < result.size(); ++i)
- types.add(result[i]);
- return types;
-}
-
-bool PlatformSupport::clipboardReadData(PasteboardPrivate::ClipboardBuffer buffer,
- const String& type, String& data, String& metadata)
-{
- WebString resultData;
- WebString resultMetadata;
- bool succeeded = webKitPlatformSupport()->clipboard()->readData(
- static_cast<WebClipboard::Buffer>(buffer), type, &resultData, &resultMetadata);
- if (succeeded) {
- data = ""
- metadata = resultMetadata;
- }
- return succeeded;
-}
-
-Vector<String> PlatformSupport::clipboardReadFilenames(PasteboardPrivate::ClipboardBuffer buffer)
-{
- WebVector<WebString> result = webKitPlatformSupport()->clipboard()->readFilenames(
- static_cast<WebClipboard::Buffer>(buffer));
- Vector<String> convertedResult;
- for (size_t i = 0; i < result.size(); ++i)
- convertedResult.append(result[i]);
- return convertedResult;
-}
-
// Cookies --------------------------------------------------------------------
void PlatformSupport::setCookies(const Document* document, const KURL& url,
