Changeset 83412 in webkit


Ignore:
Timestamp:
Apr 10, 2011 6:49:57 PM (13 years ago)
Author:
tkent@chromium.org
Message:

2011-04-10 Kent Tamura <​tkent@chromium.org>

Unreviewed, rolling out r83353.
​http://trac.webkit.org/changeset/83353
​https://bugs.webkit.org/show_bug.cgi?id=58106

The new test doesn't pass on all Chromium platforms.

  • editing/pasteboard/data-transfer-items-image-png-expected.html: Removed.
  • editing/pasteboard/data-transfer-items-image-png.html: Removed.

2011-04-10 Kent Tamura <​tkent@chromium.org>

Unreviewed, rolling out r83353.
​http://trac.webkit.org/changeset/83353
​https://bugs.webkit.org/show_bug.cgi?id=58106

The new test doesn't pass on all Chromium platforms.

  • dom/DataTransferItem.h:
  • dom/DataTransferItem.idl:
  • platform/chromium/ClipboardMimeTypes.cpp:
  • platform/chromium/ClipboardMimeTypes.h:
  • platform/chromium/DataTransferItemChromium.cpp: (WebCore::DataTransferItemChromium::getAsString):
  • platform/chromium/DataTransferItemChromium.h:
  • platform/chromium/PlatformBridge.h:

2011-04-10 Kent Tamura <​tkent@chromium.org>

Unreviewed, rolling out r83353.
​http://trac.webkit.org/changeset/83353
​https://bugs.webkit.org/show_bug.cgi?id=58106

The new test doesn't pass on all Chromium platforms.

  • DEPS:
  • src/PlatformBridge.cpp:
Location:
trunk
Files:
2 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r83411 r83412  
     12011-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
    1122011-04-10  Daniel Bates  <dbates@rim.com>
    213

  • trunk/Source/WebCore/ChangeLog

    r83410 r83412  
     12011-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
    1182011-04-10  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
    219

  • trunk/Source/WebCore/dom/DataTransferItem.h

    r83353 r83412  
    3939namespace WebCore {
    4040
    41 class Blob;
    4241class StringCallback;
    4342
    … …  
    5352
    5453    virtual void getAsString(PassRefPtr<StringCallback>) = 0;
    55     virtual PassRefPtr<Blob> getAsFile() = 0;
    5654};
    5755

  • trunk/Source/WebCore/dom/DataTransferItem.idl

    r83353 r83412  
    3838
    3939        void getAsString(in [Callback] StringCallback callback);
    40         Blob getAsFile();
    4140    };
    4241

  • trunk/Source/WebCore/platform/chromium/ClipboardMimeTypes.cpp

    r83353 r83412  
    4242const char mimeTypeDownloadURL[] = "downloadurl";
    4343const char mimeTypeFiles[] = "Files";
    44 const char mimeTypeImagePng[] = "image/png";
    4544
    4645} // namespace WebCore

  • trunk/Source/WebCore/platform/chromium/ClipboardMimeTypes.h

    r83353 r83412  
    4242extern const char mimeTypeDownloadURL[];
    4343extern const char mimeTypeFiles[];
    44 extern const char mimeTypeImagePng[];
    4544
    4645} // namespace WebCore

  • trunk/Source/WebCore/platform/chromium/DataTransferItemChromium.cpp

    r83353 r83412  
    3434#if ENABLE(DATA_TRANSFER_ITEMS)
    3535
    36 #include "Blob.h"
    3736#include "Clipboard.h"
    3837#include "ClipboardMimeTypes.h"
    3938#include "PlatformBridge.h"
    40 #include "SharedBuffer.h"
    4139#include "StringCallback.h"
    4240
    … …  
    9189        return;
    9290    }
    93 
    94     ASSERT(m_source == PasteboardSource);
    9591    // This is ugly but there's no real alternative.
    9692    if (m_type == mimeTypeTextPlain) {
    … …  
    108104}
    109105
    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 browser
    118         // to the renderer. We then place it in a blob in WebKit, which
    119         // registers it and copies it *back* to the browser. When a consumer
    120         // 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 track
    122         // improvements to this code (in particular, add a registerClipboardBlob
    123         // method to the blob registry; that way the data is only copied over
    124         // into the renderer when it's actually read, not when the blob is
    125         // 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 
    137106} // namespace WebCore
    138107

  • trunk/Source/WebCore/platform/chromium/DataTransferItemChromium.h

    r83353 r83412  
    5252
    5353    virtual void getAsString(PassRefPtr<StringCallback>);
    54     virtual PassRefPtr<Blob> getAsFile();
    5554
    5655private:

  • trunk/Source/WebCore/platform/chromium/PlatformBridge.h

    r83353 r83412  
    9999    static String clipboardReadPlainText(PasteboardPrivate::ClipboardBuffer);
    100100    static void clipboardReadHTML(PasteboardPrivate::ClipboardBuffer, String*, KURL*);
    101     static PassRefPtr<SharedBuffer> clipboardReadImage(PasteboardPrivate::ClipboardBuffer);
    102101
    103102    // Only the clipboardRead functions take a buffer argument because

  • trunk/Source/WebKit/chromium/ChangeLog

    r83375 r83412  
     12011-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
    1122011-04-09  Sreeram Ramachandran  <sreeram@google.com>
    213

  • trunk/Source/WebKit/chromium/DEPS

    r83353 r83412  
    3333vars = {
    3434  'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
    35   'chromium_rev': '80890'
     35  'chromium_rev': '80767'
    3636}
    3737

  • trunk/Source/WebKit/chromium/src/PlatformBridge.cpp

    r83353 r83412  
    177177        static_cast<WebClipboard::Buffer>(buffer), &url);
    178178    *sourceURL = url;
    179 }
    180 
    181 PassRefPtr<SharedBuffer> PlatformBridge::clipboardReadImage(
    182     PasteboardPrivate::ClipboardBuffer buffer)
    183 {
    184     return webKitClient()->clipboard()->readImage(static_cast<WebClipboard::Buffer>(buffer));
    185179}
    186180
Note: See TracChangeset for help on using the changeset viewer.