| Index: third_party/WebKit/Source/platform/blob/BlobData.cpp
|
| diff --git a/third_party/WebKit/Source/platform/blob/BlobData.cpp b/third_party/WebKit/Source/platform/blob/BlobData.cpp
|
| index c0c7199c6e2bfce24dfb039663abea02bc6c4359..8bd32f885bd059f6974c5d4df2d7d814c28369d6 100644
|
| --- a/third_party/WebKit/Source/platform/blob/BlobData.cpp
|
| +++ b/third_party/WebKit/Source/platform/blob/BlobData.cpp
|
| @@ -102,8 +102,8 @@ void BlobData::setContentType(const String& contentType) {
|
| void BlobData::appendData(PassRefPtr<RawData> data,
|
| long long offset,
|
| long long length) {
|
| - CHECK_EQ(m_fileComposition, FileCompositionStatus::NO_UNKNOWN_SIZE_FILES)
|
| - << "Blobs with a unknown-size file cannot have other items.";
|
| + // Blobs with a unknown-size file cannot have other items.
|
| + CHECK_EQ(m_fileComposition, FileCompositionStatus::NO_UNKNOWN_SIZE_FILES);
|
| m_items.append(BlobDataItem(std::move(data), offset, length));
|
| }
|
|
|
| @@ -111,16 +111,16 @@ void BlobData::appendFile(const String& path,
|
| long long offset,
|
| long long length,
|
| double expectedModificationTime) {
|
| - CHECK_EQ(m_fileComposition, FileCompositionStatus::NO_UNKNOWN_SIZE_FILES)
|
| - << "Blobs with a unknown-size file cannot have other items.";
|
| + // Blobs with a unknown-size file cannot have other items.
|
| + CHECK_EQ(m_fileComposition, FileCompositionStatus::NO_UNKNOWN_SIZE_FILES);
|
| m_items.append(BlobDataItem(path, offset, length, expectedModificationTime));
|
| }
|
|
|
| void BlobData::appendBlob(PassRefPtr<BlobDataHandle> dataHandle,
|
| long long offset,
|
| long long length) {
|
| - CHECK_EQ(m_fileComposition, FileCompositionStatus::NO_UNKNOWN_SIZE_FILES)
|
| - << "Blobs with a unknown-size file cannot have other items.";
|
| + // Blobs with a unknown-size file cannot have other items.
|
| + CHECK_EQ(m_fileComposition, FileCompositionStatus::NO_UNKNOWN_SIZE_FILES);
|
| m_items.append(BlobDataItem(std::move(dataHandle), offset, length));
|
| }
|
|
|
| @@ -128,15 +128,15 @@ void BlobData::appendFileSystemURL(const KURL& url,
|
| long long offset,
|
| long long length,
|
| double expectedModificationTime) {
|
| - CHECK_EQ(m_fileComposition, FileCompositionStatus::NO_UNKNOWN_SIZE_FILES)
|
| - << "Blobs with a unknown-size file cannot have other items.";
|
| + // Blobs with a unknown-size file cannot have other items.
|
| + CHECK_EQ(m_fileComposition, FileCompositionStatus::NO_UNKNOWN_SIZE_FILES);
|
| m_items.append(BlobDataItem(url, offset, length, expectedModificationTime));
|
| }
|
|
|
| void BlobData::appendText(const String& text,
|
| bool doNormalizeLineEndingsToNative) {
|
| - CHECK_EQ(m_fileComposition, FileCompositionStatus::NO_UNKNOWN_SIZE_FILES)
|
| - << "Blobs with a unknown-size file cannot have other items.";
|
| + // Blobs with a unknown-size file cannot have other items.
|
| + CHECK_EQ(m_fileComposition, FileCompositionStatus::NO_UNKNOWN_SIZE_FILES);
|
| CString utf8Text = UTF8Encoding().encode(text, WTF::EntitiesForUnencodables);
|
| RefPtr<RawData> data = nullptr;
|
| Vector<char>* buffer;
|
| @@ -158,8 +158,8 @@ void BlobData::appendText(const String& text,
|
| }
|
|
|
| void BlobData::appendBytes(const void* bytes, size_t length) {
|
| - CHECK_EQ(m_fileComposition, FileCompositionStatus::NO_UNKNOWN_SIZE_FILES)
|
| - << "Blobs with a unknown-size file cannot have other items.";
|
| + // Blobs with a unknown-size file cannot have other items.
|
| + CHECK_EQ(m_fileComposition, FileCompositionStatus::NO_UNKNOWN_SIZE_FILES);
|
| if (canConsolidateData(length)) {
|
| m_items.back().data->mutableData()->append(static_cast<const char*>(bytes),
|
| length);
|
|
|