Changeset 54469 in webkit


Ignore:
Timestamp:
Feb 7, 2010 4:35:36 AM (14 years ago)
Author:
eric@webkit.org
Message:

2010-02-07 Jian Li <​jianli@chromium.org>

Reviewed by Darin Fisher.

[chromium] Change chromium interface to handle DownloadURL format.
​https://bugs.webkit.org/show_bug.cgi?id=34655

  • platform/chromium/ChromiumDataObject.cpp: (WebCore::ChromiumDataObject::clear): (WebCore::ChromiumDataObject::hasData): (WebCore::ChromiumDataObject::ChromiumDataObject):
  • platform/chromium/ChromiumDataObject.h:
  • platform/chromium/ClipboardChromium.cpp: (WebCore::ClipboardChromium::setData):

2010-02-07 Jian Li <​jianli@chromium.org>

Reviewed by Darin Fisher.

[chromium] Change chromium interface to handle DownloadURL format.
​https://bugs.webkit.org/show_bug.cgi?id=34655

  • public/WebDragData.h:
  • src/WebDragData.cpp: (WebKit::WebDragData::downloadMetadata): (WebKit::WebDragData::setDownloadMetadata):
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r54466 r54469  
     12010-02-07  Jian Li  <jianli@chromium.org>
     2
     3        Reviewed by Darin Fisher.
     4
     5        [chromium] Change chromium interface to handle DownloadURL format.
     6        https://bugs.webkit.org/show_bug.cgi?id=34655
     7
     8        * platform/chromium/ChromiumDataObject.cpp:
     9        (WebCore::ChromiumDataObject::clear):
     10        (WebCore::ChromiumDataObject::hasData):
     11        (WebCore::ChromiumDataObject::ChromiumDataObject):
     12        * platform/chromium/ChromiumDataObject.h:
     13        * platform/chromium/ClipboardChromium.cpp:
     14        (WebCore::ClipboardChromium::setData):
     15
    1162010-02-06  Dimitri Glazkov  <dglazkov@chromium.org>
    217

  • trunk/WebCore/platform/chromium/ChromiumDataObject.cpp

    r52160 r54469  
    3939    urlTitle = "";
    4040    downloadURL = KURL();
     41    downloadMetadata = "";
    4142    fileExtension = "";
    4243    filenames.clear();
    … …  
    5354    return !url.isEmpty()
    5455        || !downloadURL.isEmpty()
     56        || !downloadMetadata.isEmpty()
    5557        || !fileExtension.isEmpty()
    5658        || !filenames.isEmpty()
    … …  
    6466    , urlTitle(other.urlTitle)
    6567    , downloadURL(other.downloadURL)
     68    , downloadMetadata(other.downloadMetadata)
    6669    , fileExtension(other.fileExtension)
    6770    , filenames(other.filenames)

  • trunk/WebCore/platform/chromium/ChromiumDataObject.h

    r52160 r54469  
    6161
    6262        KURL downloadURL;
     63        String downloadMetadata;
    6364
    6465        String fileExtension;

  • trunk/WebCore/platform/chromium/ClipboardChromium.cpp

    r54368 r54469  
    161161   
    162162    if (winType == ClipboardDataTypeDownloadURL) {
     163        m_dataObject->downloadMetadata = data;
    163164        KURL url = KURL(ParsedURLString, data);
    164         if (url.isValid()) {
     165        if (url.isValid())
    165166            m_dataObject->downloadURL = url;
    166             return true;
    167         }
     167        return true;
    168168    }
    169169

  • trunk/WebKit/chromium/ChangeLog

    r54466 r54469  
     12010-02-07  Jian Li  <jianli@chromium.org>
     2
     3        Reviewed by Darin Fisher.
     4
     5        [chromium] Change chromium interface to handle DownloadURL format.
     6        https://bugs.webkit.org/show_bug.cgi?id=34655
     7
     8        * public/WebDragData.h:
     9        * src/WebDragData.cpp:
     10        (WebKit::WebDragData::downloadMetadata):
     11        (WebKit::WebDragData::setDownloadMetadata):
     12
    1132010-02-06  Dimitri Glazkov  <dglazkov@chromium.org>
    214

  • trunk/WebKit/chromium/public/WebDragData.h

    r52160 r54469  
    7575    WEBKIT_API WebURL downloadURL() const;
    7676    WEBKIT_API void setDownloadURL(const WebURL&);
     77    WEBKIT_API WebString downloadMetadata() const;
     78    WEBKIT_API void setDownloadMetadata(const WebString&);
    7779
    7880    WEBKIT_API WebString fileExtension() const;

  • trunk/WebKit/chromium/src/WebDragData.cpp

    r52160 r54469  
    101101}
    102102
     103WebString WebDragData::downloadMetadata() const
     104{
     105    ASSERT(!isNull());
     106    return m_private->downloadMetadata;
     107}
     108
     109void WebDragData::setDownloadMetadata(const WebString& downloadMetadata)
     110{
     111    ensureMutable();
     112    m_private->downloadMetadata = downloadMetadata;
     113}
     114
    103115WebString WebDragData::fileExtension() const
    104116{
Note: See TracChangeset for help on using the changeset viewer.