Changeset 83412 in webkit
- Timestamp:
- Apr 10, 2011 6:49:57 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 2 deleted
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r83411 r83412 1 2011-04-10 Kent Tamura <tkent@chromium.org> 2 3 Unreviewed, rolling out r83353. 4 http://trac.webkit.org/changeset/83353 5 https://bugs.webkit.org/show_bug.cgi?id=58106 6 7 The new test doesn't pass on all Chromium platforms. 8 9 * editing/pasteboard/data-transfer-items-image-png-expected.html: Removed. 10 * editing/pasteboard/data-transfer-items-image-png.html: Removed. 11 1 12 2011-04-10 Daniel Bates <dbates@rim.com> 2 13 -
trunk/Source/WebCore/ChangeLog
r83410 r83412 1 2011-04-10 Kent Tamura <tkent@chromium.org> 2 3 Unreviewed, rolling out r83353. 4 http://trac.webkit.org/changeset/83353 5 https://bugs.webkit.org/show_bug.cgi?id=58106 6 7 The new test doesn't pass on all Chromium platforms. 8 9 * dom/DataTransferItem.h: 10 * dom/DataTransferItem.idl: 11 * platform/chromium/ClipboardMimeTypes.cpp: 12 * platform/chromium/ClipboardMimeTypes.h: 13 * platform/chromium/DataTransferItemChromium.cpp: 14 (WebCore::DataTransferItemChromium::getAsString): 15 * platform/chromium/DataTransferItemChromium.h: 16 * platform/chromium/PlatformBridge.h: 17 1 18 2011-04-10 Gyuyoung Kim <gyuyoung.kim@samsung.com> 2 19 -
trunk/Source/WebCore/dom/DataTransferItem.h
r83353 r83412 39 39 namespace WebCore { 40 40 41 class Blob;42 41 class StringCallback; 43 42 … … 53 52 54 53 virtual void getAsString(PassRefPtr<StringCallback>) = 0; 55 virtual PassRefPtr<Blob> getAsFile() = 0;56 54 }; 57 55 -
trunk/Source/WebCore/dom/DataTransferItem.idl
r83353 r83412 38 38 39 39 void getAsString(in [Callback] StringCallback callback); 40 Blob getAsFile();41 40 }; 42 41 -
trunk/Source/WebCore/platform/chromium/ClipboardMimeTypes.cpp
r83353 r83412 42 42 const char mimeTypeDownloadURL[] = "downloadurl"; 43 43 const char mimeTypeFiles[] = "Files"; 44 const char mimeTypeImagePng[] = "image/png";45 44 46 45 } // namespace WebCore -
trunk/Source/WebCore/platform/chromium/ClipboardMimeTypes.h
r83353 r83412 42 42 extern const char mimeTypeDownloadURL[]; 43 43 extern const char mimeTypeFiles[]; 44 extern const char mimeTypeImagePng[];45 44 46 45 } // namespace WebCore -
trunk/Source/WebCore/platform/chromium/DataTransferItemChromium.cpp
r83353 r83412 34 34 #if ENABLE(DATA_TRANSFER_ITEMS) 35 35 36 #include "Blob.h"37 36 #include "Clipboard.h" 38 37 #include "ClipboardMimeTypes.h" 39 38 #include "PlatformBridge.h" 40 #include "SharedBuffer.h"41 39 #include "StringCallback.h" 42 40 … … 91 89 return; 92 90 } 93 94 ASSERT(m_source == PasteboardSource);95 91 // This is ugly but there's no real alternative. 96 92 if (m_type == mimeTypeTextPlain) { … … 108 104 } 109 105 110 PassRefPtr<Blob> DataTransferItemChromium::getAsFile()111 {112 if (m_source == InternalSource)113 return 0;114 115 ASSERT(m_source == PasteboardSource);116 if (m_type == mimeTypeImagePng) {117 // TODO: This is pretty inefficient. We copy the data from the browser118 // to the renderer. We then place it in a blob in WebKit, which119 // registers it and copies it *back* to the browser. When a consumer120 // wants to read the data, we then copy the data back into the renderer.121 // https://bugs.webkit.org/show_bug.cgi?id=58107 has been filed to track122 // improvements to this code (in particular, add a registerClipboardBlob123 // method to the blob registry; that way the data is only copied over124 // into the renderer when it's actually read, not when the blob is125 // initially constructed).126 RefPtr<SharedBuffer> data = PlatformBridge::clipboardReadImage(PasteboardPrivate::StandardBuffer);127 RefPtr<RawData> rawData = RawData::create();128 rawData->mutableData()->append(data->data(), data->size());129 OwnPtr<BlobData> blobData = BlobData::create();130 blobData->appendData(rawData, 0, -1);131 blobData->setContentType(mimeTypeImagePng);132 return Blob::create(blobData.release(), data->size());133 }134 return 0;135 }136 137 106 } // namespace WebCore 138 107 -
trunk/Source/WebCore/platform/chromium/DataTransferItemChromium.h
r83353 r83412 52 52 53 53 virtual void getAsString(PassRefPtr<StringCallback>); 54 virtual PassRefPtr<Blob> getAsFile();55 54 56 55 private: -
trunk/Source/WebCore/platform/chromium/PlatformBridge.h
r83353 r83412 99 99 static String clipboardReadPlainText(PasteboardPrivate::ClipboardBuffer); 100 100 static void clipboardReadHTML(PasteboardPrivate::ClipboardBuffer, String*, KURL*); 101 static PassRefPtr<SharedBuffer> clipboardReadImage(PasteboardPrivate::ClipboardBuffer);102 101 103 102 // Only the clipboardRead functions take a buffer argument because -
trunk/Source/WebKit/chromium/ChangeLog
r83375 r83412 1 2011-04-10 Kent Tamura <tkent@chromium.org> 2 3 Unreviewed, rolling out r83353. 4 http://trac.webkit.org/changeset/83353 5 https://bugs.webkit.org/show_bug.cgi?id=58106 6 7 The new test doesn't pass on all Chromium platforms. 8 9 * DEPS: 10 * src/PlatformBridge.cpp: 11 1 12 2011-04-09 Sreeram Ramachandran <sreeram@google.com> 2 13 -
trunk/Source/WebKit/chromium/DEPS
r83353 r83412 33 33 vars = { 34 34 'chromium_svn': 'http://src.chromium.org/svn/trunk/src', 35 'chromium_rev': '80 890'35 'chromium_rev': '80767' 36 36 } 37 37 -
trunk/Source/WebKit/chromium/src/PlatformBridge.cpp
r83353 r83412 177 177 static_cast<WebClipboard::Buffer>(buffer), &url); 178 178 *sourceURL = url; 179 }180 181 PassRefPtr<SharedBuffer> PlatformBridge::clipboardReadImage(182 PasteboardPrivate::ClipboardBuffer buffer)183 {184 return webKitClient()->clipboard()->readImage(static_cast<WebClipboard::Buffer>(buffer));185 179 } 186 180
Note: See TracChangeset
for help on using the changeset viewer.