Diff
Modified: trunk/Source/WebCore/ChangeLog (88191 => 88192)
--- trunk/Source/WebCore/ChangeLog 2011-06-06 21:45:38 UTC (rev 88191)
+++ trunk/Source/WebCore/ChangeLog 2011-06-06 21:52:46 UTC (rev 88192)
@@ -1,3 +1,20 @@
+2011-06-06 Daniel Cheng <[email protected]>
+
+ Reviewed by Tony Chang.
+
+ [chromium] Delete dead clipboard code.
+ https://bugs.webkit.org/show_bug.cgi?id=62113
+
+ No new tests since this change only deleted unused code.
+
+ * WebCore.gypi:
+ * platform/chromium/ChromiumDataObjectLegacy.cpp: Removed.
+ * platform/chromium/ChromiumDataObjectLegacy.h: Removed.
+ * platform/chromium/ReadableDataObject.cpp: Removed.
+ * platform/chromium/ReadableDataObject.h: Removed.
+ * platform/chromium/WritableDataObject.cpp: Removed.
+ * platform/chromium/WritableDataObject.h: Removed.
+
2011-06-06 Levi Weintraub <[email protected]>
Reviewed by Eric Seidel.
Modified: trunk/Source/WebCore/WebCore.gypi (88191 => 88192)
--- trunk/Source/WebCore/WebCore.gypi 2011-06-06 21:45:38 UTC (rev 88191)
+++ trunk/Source/WebCore/WebCore.gypi 2011-06-06 21:52:46 UTC (rev 88192)
@@ -3784,8 +3784,6 @@
'platform/cf/SharedBufferCF.cpp',
'platform/chromium/ChromiumDataObject.cpp',
'platform/chromium/ChromiumDataObject.h',
- 'platform/chromium/ChromiumDataObjectLegacy.cpp',
- 'platform/chromium/ChromiumDataObjectLegacy.h',
'platform/chromium/ClipboardChromium.cpp',
'platform/chromium/ClipboardChromium.h',
'platform/chromium/ClipboardChromiumLinux.cpp',
@@ -3833,8 +3831,6 @@
'platform/chromium/PopupMenuChromium.cpp',
'platform/chromium/PopupMenuChromium.h',
'platform/chromium/PopupMenuPrivate.h',
- 'platform/chromium/ReadableDataObject.cpp',
- 'platform/chromium/ReadableDataObject.h',
'platform/chromium/SSLKeyGeneratorChromium.cpp',
'platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.h',
'platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm',
@@ -3858,8 +3854,6 @@
'platform/chromium/ThemeChromiumMac.mm',
'platform/chromium/TraceEvent.h',
'platform/chromium/WidgetChromium.cpp',
- 'platform/chromium/WritableDataObject.cpp',
- 'platform/chromium/WritableDataObject.h',
'platform/cocoa/KeyEventCocoa.h',
'platform/cocoa/KeyEventCocoa.mm',
'platform/efl/ClipboardEfl.cpp',
Deleted: trunk/Source/WebCore/platform/chromium/ChromiumDataObjectLegacy.cpp (88191 => 88192)
--- trunk/Source/WebCore/platform/chromium/ChromiumDataObjectLegacy.cpp 2011-06-06 21:45:38 UTC (rev 88191)
+++ trunk/Source/WebCore/platform/chromium/ChromiumDataObjectLegacy.cpp 2011-06-06 21:52:46 UTC (rev 88192)
@@ -1,249 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "ChromiumDataObjectLegacy.h"
-
-#include "ClipboardMimeTypes.h"
-#include "Pasteboard.h"
-#include "PlatformBridge.h"
-
-namespace WebCore {
-
-// Per RFC 2483, the line separator for "text/..." MIME types is CR-LF.
-static char const* const textMIMETypeLineSeparator = "\r\n";
-
-void ChromiumDataObjectLegacy::clearData(const String& type)
-{
- if (type == mimeTypeTextPlain) {
- m_plainText = "";
- return;
- }
-
- if (type == mimeTypeURL || type == mimeTypeTextURIList) {
- m_uriList = "";
- m_url = KURL();
- m_urlTitle = "";
- return;
- }
-
- if (type == mimeTypeTextHTML) {
- m_textHtml = "";
- m_htmlBaseUrl = KURL();
- return;
- }
-
- if (type == mimeTypeDownloadURL) {
- m_downloadMetadata = "";
- return;
- }
-}
-
-void ChromiumDataObjectLegacy::clearAll()
-{
- clearAllExceptFiles();
- m_filenames.clear();
-}
-
-void ChromiumDataObjectLegacy::clearAllExceptFiles()
-{
- m_urlTitle = "";
- m_url = KURL();
- m_uriList = "";
- m_downloadMetadata = "";
- m_fileExtension = "";
- m_plainText = "";
- m_textHtml = "";
- m_htmlBaseUrl = KURL();
- m_fileContentFilename = "";
- if (m_fileContent)
- m_fileContent->clear();
-}
-
-bool ChromiumDataObjectLegacy::hasData() const
-{
- return !m_url.isEmpty()
- || !m_uriList.isEmpty()
- || !m_downloadMetadata.isEmpty()
- || !m_fileExtension.isEmpty()
- || !m_filenames.isEmpty()
- || !m_plainText.isEmpty()
- || !m_textHtml.isEmpty()
- || m_fileContent;
-}
-
-HashSet<String> ChromiumDataObjectLegacy::types() const
-{
- // This is currently broken for pasteboard events, and always has been.
- HashSet<String> results;
-
- if (!m_plainText.isEmpty()) {
- results.add(mimeTypeText);
- results.add(mimeTypeTextPlain);
- }
-
- if (m_url.isValid())
- results.add(mimeTypeURL);
-
- if (!m_uriList.isEmpty())
- results.add(mimeTypeTextURIList);
-
- if (!m_textHtml.isEmpty())
- results.add(mimeTypeTextHTML);
-
- if (!m_filenames.isEmpty())
- results.add("Files");
-
- return results;
-}
-
-String ChromiumDataObjectLegacy::getData(const String& type, bool& success)
-{
- if (type == mimeTypeTextPlain) {
- if (m_clipboardType == Clipboard::CopyAndPaste) {
- PasteboardPrivate::ClipboardBuffer buffer =
- Pasteboard::generalPasteboard()->isSelectionMode() ?
- PasteboardPrivate::SelectionBuffer :
- PasteboardPrivate::StandardBuffer;
- String text = PlatformBridge::clipboardReadPlainText(buffer);
- success = !text.isEmpty();
- return text;
- }
- success = !m_plainText.isEmpty();
- return m_plainText;
- }
-
- if (type == mimeTypeURL) {
- success = !m_url.isEmpty();
- return m_url.string();
- }
-
- if (type == mimeTypeTextURIList) {
- success = !m_uriList.isEmpty();
- return m_uriList;
- }
-
- if (type == mimeTypeTextHTML) {
- if (m_clipboardType == Clipboard::CopyAndPaste) {
- PasteboardPrivate::ClipboardBuffer buffer =
- Pasteboard::generalPasteboard()->isSelectionMode() ?
- PasteboardPrivate::SelectionBuffer :
- PasteboardPrivate::StandardBuffer;
- String htmlText;
- KURL sourceURL;
- PlatformBridge::clipboardReadHTML(buffer, &htmlText, &sourceURL);
- success = !htmlText.isEmpty();
- return htmlText;
- }
- success = !m_textHtml.isEmpty();
- return m_textHtml;
- }
-
- if (type == mimeTypeDownloadURL) {
- success = !m_downloadMetadata.isEmpty();
- return m_downloadMetadata;
- }
-
- success = false;
- return String();
-}
-
-bool ChromiumDataObjectLegacy::setData(const String& type, const String& data)
-{
- if (type == mimeTypeTextPlain) {
- m_plainText = data;
- return true;
- }
-
- if (type == mimeTypeURL || type == mimeTypeTextURIList) {
- m_url = KURL();
- Vector<String> uriList;
- // Line separator is \r\n per RFC 2483 - however, for compatibility
- // reasons we also allow just \n here.
- data.split('\n', uriList);
- // Process the input and copy the first valid URL into the url member.
- // In case no URLs can be found, subsequent calls to getData("URL")
- // will get an empty string. This is in line with the HTML5 spec (see
- // "The DragEvent and DataTransfer interfaces").
- for (size_t i = 0; i < uriList.size(); ++i) {
- String& line = uriList[i];
- line = line.stripWhiteSpace();
- if (line.isEmpty())
- continue;
- if (line[0] == '#')
- continue;
- KURL url = "" line);
- if (url.isValid()) {
- m_url = url;
- break;
- }
- }
- m_uriList = data;
- return true;
- }
-
- if (type == mimeTypeTextHTML) {
- m_textHtml = data;
- m_htmlBaseUrl = KURL();
- return true;
- }
-
- if (type == mimeTypeDownloadURL) {
- m_downloadMetadata = data;
- return true;
- }
-
- return false;
-}
-
-ChromiumDataObjectLegacy::ChromiumDataObjectLegacy(Clipboard::ClipboardType clipboardType)
- : m_clipboardType(clipboardType)
-{
-}
-
-ChromiumDataObjectLegacy::ChromiumDataObjectLegacy(const ChromiumDataObjectLegacy& other)
- : RefCounted<ChromiumDataObjectLegacy>()
- , m_clipboardType(other.m_clipboardType)
- , m_urlTitle(other.m_urlTitle)
- , m_downloadMetadata(other.m_downloadMetadata)
- , m_fileExtension(other.m_fileExtension)
- , m_filenames(other.m_filenames)
- , m_plainText(other.m_plainText)
- , m_textHtml(other.m_textHtml)
- , m_htmlBaseUrl(other.m_htmlBaseUrl)
- , m_fileContentFilename(other.m_fileContentFilename)
- , m_url(other.m_url)
- , m_uriList(other.m_uriList)
-{
- if (other.m_fileContent.get())
- m_fileContent = other.m_fileContent->copy();
-}
-
-} // namespace WebCore
Deleted: trunk/Source/WebCore/platform/chromium/ChromiumDataObjectLegacy.h (88191 => 88192)
--- trunk/Source/WebCore/platform/chromium/ChromiumDataObjectLegacy.h 2011-06-06 21:45:38 UTC (rev 88191)
+++ trunk/Source/WebCore/platform/chromium/ChromiumDataObjectLegacy.h 2011-06-06 21:52:46 UTC (rev 88192)
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef ChromiumDataObjectLegacy_h
-#define ChromiumDataObjectLegacy_h
-
-#include "Clipboard.h"
-#include "KURL.h"
-#include "PlatformString.h"
-#include "SharedBuffer.h"
-#include <wtf/HashSet.h>
-#include <wtf/RefPtr.h>
-#include <wtf/Vector.h>
-#include <wtf/text/StringHash.h>
-
-namespace WebCore {
-
-// A data object for holding data that would be in a clipboard or moved
-// during a drag-n-drop operation. This is the data that WebCore is aware
-// of and is not specific to a platform.
-class ChromiumDataObjectLegacy : public RefCounted<ChromiumDataObjectLegacy> {
-public:
- static PassRefPtr<ChromiumDataObjectLegacy> create(Clipboard::ClipboardType clipboardType)
- {
- return adoptRef(new ChromiumDataObjectLegacy(clipboardType));
- }
-
- PassRefPtr<ChromiumDataObjectLegacy> copy() const
- {
- return adoptRef(new ChromiumDataObjectLegacy(*this));
- }
-
- void clearData(const String& type);
- void clearAll();
- void clearAllExceptFiles();
-
- bool hasData() const;
-
- HashSet<String> types() const;
- String getData(const String& type, bool& success);
- bool setData(const String& type, const String& data);
-
- // Special handlers for URL/HTML metadata.
- String urlTitle() const { return m_urlTitle; }
- void setUrlTitle(const String& urlTitle) { m_urlTitle = urlTitle; }
- KURL htmlBaseUrl() const { return m_htmlBaseUrl; }
- void setHtmlBaseUrl(const KURL& url) { m_htmlBaseUrl = url; }
-
- // Used to handle files being dragged in.
- bool containsFilenames() const { return !m_filenames.isEmpty(); }
- Vector<String> filenames() const { return m_filenames; }
- void setFilenames(const Vector<String>& filenames) { m_filenames = filenames; }
-
- // Used to handle files (images) being dragged out.
- String fileExtension() const { return m_fileExtension; }
- void setFileExtension(const String& fileExtension) { m_fileExtension = fileExtension; }
- String fileContentFilename() const { return m_fileContentFilename; }
- void setFileContentFilename(const String& fileContentFilename) { m_fileContentFilename = fileContentFilename; }
- PassRefPtr<SharedBuffer> fileContent() const { return m_fileContent; }
- void setFileContent(PassRefPtr<SharedBuffer> fileContent) { m_fileContent = fileContent; }
-
-private:
- ChromiumDataObjectLegacy(Clipboard::ClipboardType);
- ChromiumDataObjectLegacy(const ChromiumDataObjectLegacy&);
-
- Clipboard::ClipboardType m_clipboardType;
-
- String m_urlTitle;
-
- String m_downloadMetadata;
-
- String m_fileExtension;
- Vector<String> m_filenames;
-
- String m_plainText;
-
- String m_textHtml;
- KURL m_htmlBaseUrl;
-
- String m_fileContentFilename;
- RefPtr<SharedBuffer> m_fileContent;
-
- // These two are linked. Setting m_url will set m_uriList to the same
- // string value; setting m_uriList will cause its contents to be parsed
- // according to RFC 2483 and the first URL found will be set in m_url.
- KURL m_url;
- String m_uriList;
-};
-
-} // namespace WebCore
-
-#endif
Deleted: trunk/Source/WebCore/platform/chromium/ReadableDataObject.cpp (88191 => 88192)
--- trunk/Source/WebCore/platform/chromium/ReadableDataObject.cpp 2011-06-06 21:45:38 UTC (rev 88191)
+++ trunk/Source/WebCore/platform/chromium/ReadableDataObject.cpp 2011-06-06 21:52:46 UTC (rev 88192)
@@ -1,139 +0,0 @@
-/*
- * Copyright (c) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "ReadableDataObject.h"
-
-#include "ClipboardMimeTypes.h"
-#include "Pasteboard.h"
-#include "PasteboardPrivate.h"
-#include "PlatformBridge.h"
-
-namespace WebCore {
-
-static PasteboardPrivate::ClipboardBuffer clipboardBuffer(Clipboard::ClipboardType clipboardType)
-{
- return clipboardType == Clipboard::DragAndDrop ? PasteboardPrivate::DragBuffer : PasteboardPrivate::StandardBuffer;
-}
-
-PassRefPtr<ReadableDataObject> ReadableDataObject::create(Clipboard::ClipboardType clipboardType)
-{
- return adoptRef(new ReadableDataObject(clipboardType));
-}
-
-ReadableDataObject::ReadableDataObject(Clipboard::ClipboardType clipboardType)
- : m_clipboardType(clipboardType)
- , m_containsFilenames(false)
- , m_isTypeCacheInitialized(false)
-{
-}
-
-bool ReadableDataObject::hasData() const
-{
- ensureTypeCacheInitialized();
- return !m_types.isEmpty() || m_containsFilenames;
-}
-
-HashSet<String> ReadableDataObject::types() const
-{
- ensureTypeCacheInitialized();
- return m_types;
-}
-
-String ReadableDataObject::getData(const String& type, bool& succeeded) const
-{
- String data;
- String ignoredMetadata;
- // Since the Chromium-side bridge isn't complete yet, we special case this
- // for copy-and-paste, since that code path no longer uses
- // ChromiumDataObjectLegacy.
- if (m_clipboardType == Clipboard::CopyAndPaste) {
- if (type == mimeTypeTextPlain) {
- PasteboardPrivate::ClipboardBuffer buffer =
- Pasteboard::generalPasteboard()->isSelectionMode() ?
- PasteboardPrivate::SelectionBuffer :
- PasteboardPrivate::StandardBuffer;
- data = ""
- } else if (type == mimeTypeTextHTML) {
- PasteboardPrivate::ClipboardBuffer buffer =
- Pasteboard::generalPasteboard()->isSelectionMode() ?
- PasteboardPrivate::SelectionBuffer :
- PasteboardPrivate::StandardBuffer;
- KURL ignoredSourceURL;
- PlatformBridge::clipboardReadHTML(buffer, &data, &ignoredSourceURL);
- }
- succeeded = !data.isEmpty();
- return data;
- }
- succeeded = PlatformBridge::clipboardReadData(
- clipboardBuffer(m_clipboardType), type, data, ignoredMetadata);
- return data;
-}
-
-String ReadableDataObject::urlTitle() const
-{
- String ignoredData;
- String urlTitle;
- PlatformBridge::clipboardReadData(
- clipboardBuffer(m_clipboardType), mimeTypeTextURIList, ignoredData, urlTitle);
- return urlTitle;
-}
-
-KURL ReadableDataObject::htmlBaseUrl() const
-{
- String ignoredData;
- String htmlBaseUrl;
- PlatformBridge::clipboardReadData(
- clipboardBuffer(m_clipboardType), mimeTypeTextHTML, ignoredData, htmlBaseUrl);
- return KURL(ParsedURLString, htmlBaseUrl);
-}
-
-bool ReadableDataObject::containsFilenames() const
-{
- ensureTypeCacheInitialized();
- return m_containsFilenames;
-}
-
-Vector<String> ReadableDataObject::filenames() const
-{
- return PlatformBridge::clipboardReadFilenames(clipboardBuffer(m_clipboardType));
-}
-
-void ReadableDataObject::ensureTypeCacheInitialized() const
-{
- if (m_isTypeCacheInitialized)
- return;
-
- m_types = PlatformBridge::clipboardReadAvailableTypes(
- clipboardBuffer(m_clipboardType), &m_containsFilenames);
- m_isTypeCacheInitialized = true;
-}
-
-} // namespace WebCore
Deleted: trunk/Source/WebCore/platform/chromium/ReadableDataObject.h (88191 => 88192)
--- trunk/Source/WebCore/platform/chromium/ReadableDataObject.h 2011-06-06 21:45:38 UTC (rev 88191)
+++ trunk/Source/WebCore/platform/chromium/ReadableDataObject.h 2011-06-06 21:52:46 UTC (rev 88192)
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef ReadableDataObject_h
-#define ReadableDataObject_h
-
-#include "Clipboard.h"
-#include "PlatformString.h"
-#include <wtf/HashSet.h>
-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
-#include <wtf/text/StringHash.h>
-
-namespace WebCore {
-
-// Used for one way communication of drag/drop and copy/paste data from the
-// browser to the renderer.
-class ReadableDataObject : public RefCounted<ReadableDataObject> {
-public:
- static PassRefPtr<ReadableDataObject> create(Clipboard::ClipboardType);
-
- bool hasData() const;
- HashSet<String> types() const;
- String getData(const String& type, bool& succeeded) const;
-
- String urlTitle() const;
- KURL htmlBaseUrl() const;
-
- bool containsFilenames() const;
- Vector<String> filenames() const;
-
-private:
- explicit ReadableDataObject(Clipboard::ClipboardType);
-
- // This isn't always const... but most of the time it is.
- void ensureTypeCacheInitialized() const;
-
- Clipboard::ClipboardType m_clipboardType;
-
- // To avoid making a lot of IPC calls for each drag event, we cache some
- // values in the renderer.
- mutable HashSet<String> m_types;
- mutable bool m_containsFilenames;
- mutable bool m_isTypeCacheInitialized;
-};
-
-} // namespace WebCore
-
-#endif
Deleted: trunk/Source/WebCore/platform/chromium/WritableDataObject.cpp (88191 => 88192)
--- trunk/Source/WebCore/platform/chromium/WritableDataObject.cpp 2011-06-06 21:45:38 UTC (rev 88191)
+++ trunk/Source/WebCore/platform/chromium/WritableDataObject.cpp 2011-06-06 21:52:46 UTC (rev 88192)
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WritableDataObject.h"
-
-#include "ClipboardMimeTypes.h"
-#include "PlatformBridge.h"
-
-namespace WebCore {
-
-PassRefPtr<WritableDataObject> WritableDataObject::create(Clipboard::ClipboardType clipboardType)
-{
- return adoptRef(new WritableDataObject(clipboardType));
-}
-
-WritableDataObject::WritableDataObject(Clipboard::ClipboardType clipboardType)
- : m_clipboardType(clipboardType)
-{
-}
-
-void WritableDataObject::clearData(const String& type)
-{
- m_dataMap.remove(type);
- if (type == mimeTypeTextURIList)
- m_urlTitle = "";
- else if (type == mimeTypeTextHTML)
- m_htmlBaseURL = KURL();
-}
-
-void WritableDataObject::clearAllExceptFiles()
-{
- // FIXME: The spec does not provide a way to populate FileList currently. In
- // fact, the spec explicitly states that dragging files can only happen from
- // outside a browsing context.
- clearAll();
-}
-
-void WritableDataObject::clearAll()
-{
- m_dataMap.clear();
- m_urlTitle = "";
- m_htmlBaseURL = KURL();
- m_fileContentFilename = "";
- if (m_fileContent)
- m_fileContent->clear();
- m_fileExtension = "";
-}
-
-bool WritableDataObject::setData(const String& type, const String& data)
-{
- if (m_clipboardType == Clipboard::CopyAndPaste) {
- // FIXME: This is currently unimplemented on the Chromium-side. This is
- // "okay" for now since the original implementation didn't support it
- // anyway. Going forward, this is something we'll need to fix though.
- PlatformBridge::clipboardWriteData(type, data, "");
- return true;
- }
- m_dataMap.set(type, data);
- if (type == mimeTypeTextURIList)
- m_urlTitle = "";
- else if (type == mimeTypeTextHTML)
- m_htmlBaseURL = KURL();
- return true;
-}
-
-} // namespace WebCore
Deleted: trunk/Source/WebCore/platform/chromium/WritableDataObject.h (88191 => 88192)
--- trunk/Source/WebCore/platform/chromium/WritableDataObject.h 2011-06-06 21:45:38 UTC (rev 88191)
+++ trunk/Source/WebCore/platform/chromium/WritableDataObject.h 2011-06-06 21:52:46 UTC (rev 88192)
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WritableDataObject_h
-#define WritableDataObject_h
-
-#include "Clipboard.h"
-#include "KURL.h"
-#include "PlatformString.h"
-#include "SharedBuffer.h"
-#include <wtf/HashMap.h>
-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
-#include <wtf/text/StringHash.h>
-
-namespace WebCore {
-
-// Used for one way communication of drag/drop and copy/paste data from the
-// renderer to the browser. This is intenteded to be used in dragstart/copy/cut
-// events. Due to shortcomings, writes to the pasteboard cannot be performed
-// atomically.
-class WritableDataObject : public RefCounted<WritableDataObject> {
-public:
- static PassRefPtr<WritableDataObject> create(Clipboard::ClipboardType);
-
- void clearData(const String& type);
- void clearAllExceptFiles();
- void clearAll();
- bool setData(const String& type, const String& data);
-
- void setUrlTitle(const String& title) { m_urlTitle = title; }
- void setHtmlBaseUrl(const KURL& baseURL) { m_htmlBaseURL = baseURL; }
-
- // Used for transferring drag data from the renderer to the browser.
- HashMap<String, String> dataMap() const { return m_dataMap; }
- String urlTitle() const { return m_urlTitle; }
- KURL htmlBaseURL() const { return m_htmlBaseURL; }
-
- String fileExtension() const { return m_fileExtension; }
- String fileContentFilename() const { return m_fileContentFilename; }
- PassRefPtr<SharedBuffer> fileContent() const { return m_fileContent; }
- void setFileExtension(const String& fileExtension) { m_fileExtension = fileExtension; }
- void setFileContentFilename(const String& fileContentFilename) { m_fileContentFilename = fileContentFilename; }
- void setFileContent(PassRefPtr<SharedBuffer> fileContent) { m_fileContent = fileContent; }
-
-private:
- explicit WritableDataObject(Clipboard::ClipboardType);
-
- Clipboard::ClipboardType m_clipboardType;
-
- HashMap<String, String> m_dataMap;
- String m_urlTitle;
- KURL m_htmlBaseURL;
- String m_fileExtension;
- String m_fileContentFilename;
- RefPtr<SharedBuffer> m_fileContent;
-};
-
-} // namespace WebCore
-
-#endif
Modified: trunk/Source/WebKit/chromium/ChangeLog (88191 => 88192)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-06-06 21:45:38 UTC (rev 88191)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-06-06 21:52:46 UTC (rev 88192)
@@ -1,3 +1,12 @@
+2011-06-06 Daniel Cheng <[email protected]>
+
+ Reviewed by Tony Chang.
+
+ [chromium] Delete dead clipboard code.
+ https://bugs.webkit.org/show_bug.cgi?id=62113
+
+ * src/WebDragData.cpp:
+
2011-06-06 Nico Weber <[email protected]>
Reviewed by James Robinson.
Modified: trunk/Source/WebKit/chromium/src/WebDragData.cpp (88191 => 88192)
--- trunk/Source/WebKit/chromium/src/WebDragData.cpp 2011-06-06 21:45:38 UTC (rev 88191)
+++ trunk/Source/WebKit/chromium/src/WebDragData.cpp 2011-06-06 21:52:46 UTC (rev 88192)
@@ -32,7 +32,6 @@
#include "WebDragData.h"
#include "ChromiumDataObject.h"
-#include "ChromiumDataObjectLegacy.h"
#include "ClipboardMimeTypes.h"
#include "WebData.h"
#include "WebString.h"
