diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-21 10:57:44 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-21 10:57:44 +0200 |
| commit | 5ef7c8a6a70875d4430752d146bdcb069605d71d (patch) | |
| tree | f6256640b6c46d7da221435803cae65326817ba2 /Source/WebKit/chromium/src/WebBlobData.cpp | |
| parent | decad929f578d8db641febc8740649ca6c574638 (diff) | |
| download | qtwebkit-5ef7c8a6a70875d4430752d146bdcb069605d71d.tar.gz | |
Imported WebKit commit 356d83016b090995d08ad568f2d2c243aa55e831 (http://svn.webkit.org/repository/webkit/trunk@126147)
New snapshot including various build fixes for newer Qt 5
Diffstat (limited to 'Source/WebKit/chromium/src/WebBlobData.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/WebBlobData.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/WebKit/chromium/src/WebBlobData.cpp b/Source/WebKit/chromium/src/WebBlobData.cpp index c767d1bdd..094ff8013 100644 --- a/Source/WebKit/chromium/src/WebBlobData.cpp +++ b/Source/WebKit/chromium/src/WebBlobData.cpp @@ -83,7 +83,12 @@ bool WebBlobData::itemAt(size_t index, Item& result) const return true; case BlobDataItem::Blob: result.type = Item::TypeBlob; - result.blobURL = item.url; + result.blobURL = item.url; // FIXME: deprecate this. + result.url = item.url; + return true; + case BlobDataItem::URL: + result.type = Item::TypeURL; + result.url = item.url; return true; } ASSERT_NOT_REACHED(); |