diff options
Diffstat (limited to 'Source/WebKit/chromium/src')
| -rw-r--r-- | Source/WebKit/chromium/src/AssertMatchingEnums.cpp | 9 | ||||
| -rw-r--r-- | Source/WebKit/chromium/src/PlatformSupport.cpp | 92 |
2 files changed, 0 insertions, 101 deletions
diff --git a/Source/WebKit/chromium/src/AssertMatchingEnums.cpp b/Source/WebKit/chromium/src/AssertMatchingEnums.cpp index 94985b20c..c323d10ab 100644 --- a/Source/WebKit/chromium/src/AssertMatchingEnums.cpp +++ b/Source/WebKit/chromium/src/AssertMatchingEnums.cpp @@ -59,7 +59,6 @@ #include "MediaStreamSource.h" #include "NotificationClient.h" #include "PageVisibilityState.h" -#include "PasteboardPrivate.h" #include "PeerConnection00.h" #include "PlatformCursor.h" #include "ReferrerPolicy.h" @@ -268,14 +267,6 @@ COMPILE_ASSERT_MATCHING_ENUM(WebApplicationCacheHost::UpdateReadyEvent, Applicat COMPILE_ASSERT_MATCHING_ENUM(WebApplicationCacheHost::CachedEvent, ApplicationCacheHost::CACHED_EVENT); COMPILE_ASSERT_MATCHING_ENUM(WebApplicationCacheHost::ObsoleteEvent, ApplicationCacheHost::OBSOLETE_EVENT); -COMPILE_ASSERT_MATCHING_ENUM(WebClipboard::FormatPlainText, PasteboardPrivate::PlainTextFormat); -COMPILE_ASSERT_MATCHING_ENUM(WebClipboard::FormatHTML, PasteboardPrivate::HTMLFormat); -COMPILE_ASSERT_MATCHING_ENUM(WebClipboard::FormatBookmark, PasteboardPrivate::BookmarkFormat); -COMPILE_ASSERT_MATCHING_ENUM(WebClipboard::FormatSmartPaste, PasteboardPrivate::WebSmartPasteFormat); - -COMPILE_ASSERT_MATCHING_ENUM(WebClipboard::BufferStandard, PasteboardPrivate::StandardBuffer); -COMPILE_ASSERT_MATCHING_ENUM(WebClipboard::BufferSelection, PasteboardPrivate::SelectionBuffer); - COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypePointer, PlatformCursor::TypePointer); COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeCross, PlatformCursor::TypeCross); COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeHand, PlatformCursor::TypeHand); diff --git a/Source/WebKit/chromium/src/PlatformSupport.cpp b/Source/WebKit/chromium/src/PlatformSupport.cpp index b6266fea1..cfaf097ef 100644 --- a/Source/WebKit/chromium/src/PlatformSupport.cpp +++ b/Source/WebKit/chromium/src/PlatformSupport.cpp @@ -80,7 +80,6 @@ #include "AsyncFileSystemChromium.h" #include "BitmapImage.h" -#include "ClipboardChromium.h" #include "Cookie.h" #include "Document.h" #include "FrameView.h" @@ -94,7 +93,6 @@ #include "Worker.h" #include "WorkerContextProxy.h" -#include <public/WebClipboard.h> #include <public/WebCookie.h> #include <public/WebCookieJar.h> #include <public/WebMimeRegistry.h> @@ -141,96 +139,6 @@ static WebCookieJar* getCookieJar(const Document* document) return cookieJar; } -// Clipboard ------------------------------------------------------------------ - -uint64_t PlatformSupport::clipboardSequenceNumber(PasteboardPrivate::ClipboardBuffer buffer) -{ - return webKitPlatformSupport()->clipboard()->sequenceNumber( - static_cast<WebClipboard::Buffer>(buffer)); -} - -bool PlatformSupport::clipboardIsFormatAvailable( - PasteboardPrivate::ClipboardFormat format, - PasteboardPrivate::ClipboardBuffer buffer) -{ - return webKitPlatformSupport()->clipboard()->isFormatAvailable( - static_cast<WebClipboard::Format>(format), - 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) -{ - return webKitPlatformSupport()->clipboard()->readPlainText( - static_cast<WebClipboard::Buffer>(buffer)); -} - -void PlatformSupport::clipboardReadHTML( - PasteboardPrivate::ClipboardBuffer buffer, - String* htmlText, KURL* sourceURL, unsigned* fragmentStart, unsigned* fragmentEnd) -{ - WebURL url; - *htmlText = webKitPlatformSupport()->clipboard()->readHTML( - static_cast<WebClipboard::Buffer>(buffer), &url, fragmentStart, fragmentEnd); - *sourceURL = url; -} - -PassRefPtr<SharedBuffer> PlatformSupport::clipboardReadImage( - PasteboardPrivate::ClipboardBuffer buffer) -{ - return webKitPlatformSupport()->clipboard()->readImage(static_cast<WebClipboard::Buffer>(buffer)); -} - -String PlatformSupport::clipboardReadCustomData( - PasteboardPrivate::ClipboardBuffer buffer, const String& type) -{ - return webKitPlatformSupport()->clipboard()->readCustomData(static_cast<WebClipboard::Buffer>(buffer), type); -} - -void PlatformSupport::clipboardWriteSelection(const String& htmlText, - const KURL& sourceURL, - const String& plainText, - bool writeSmartPaste) -{ - webKitPlatformSupport()->clipboard()->writeHTML( - htmlText, sourceURL, plainText, writeSmartPaste); -} - -void PlatformSupport::clipboardWritePlainText(const String& plainText) -{ - webKitPlatformSupport()->clipboard()->writePlainText(plainText); -} - -void PlatformSupport::clipboardWriteURL(const KURL& url, const String& title) -{ - webKitPlatformSupport()->clipboard()->writeURL(url, title); -} - -void PlatformSupport::clipboardWriteImage(NativeImagePtr image, - const KURL& sourceURL, - const String& title) -{ - WebImage webImage(image->bitmap()); - webKitPlatformSupport()->clipboard()->writeImage(webImage, sourceURL, title); -} - -void PlatformSupport::clipboardWriteDataObject(Clipboard* clipboard) -{ - WebDragData data = static_cast<ClipboardChromium*>(clipboard)->dataObject(); - webKitPlatformSupport()->clipboard()->writeDataObject(data); -} - // Cookies -------------------------------------------------------------------- void PlatformSupport::setCookies(const Document* document, const KURL& url, |