Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(690)

Unified Diff: third_party/WebKit/Source/modules/fetch/FetchDataLoader.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/fetch/FetchDataLoader.cpp
diff --git a/third_party/WebKit/Source/modules/fetch/FetchDataLoader.cpp b/third_party/WebKit/Source/modules/fetch/FetchDataLoader.cpp
index ea21ae5816a72697f71c7c486bd2921d4b63947b..abf39003580d577ffa2166c50f44b87151ce5324 100644
--- a/third_party/WebKit/Source/modules/fetch/FetchDataLoader.cpp
+++ b/third_party/WebKit/Source/modules/fetch/FetchDataLoader.cpp
@@ -5,9 +5,11 @@
#include "modules/fetch/FetchDataLoader.h"
#include "core/html/parser/TextResourceDecoder.h"
+#include "wtf/PtrUtil.h"
#include "wtf/text/StringBuilder.h"
#include "wtf/text/WTFString.h"
#include "wtf/typed_arrays/ArrayBufferBuilder.h"
+#include <memory>
namespace blink {
@@ -101,11 +103,11 @@ private:
m_client.clear();
}
- OwnPtr<FetchDataConsumerHandle::Reader> m_reader;
+ std::unique_ptr<FetchDataConsumerHandle::Reader> m_reader;
Member<FetchDataLoader::Client> m_client;
String m_mimeType;
- OwnPtr<BlobData> m_blobData;
+ std::unique_ptr<BlobData> m_blobData;
};
class FetchDataLoaderAsArrayBuffer
@@ -128,7 +130,7 @@ protected:
ASSERT(!m_rawData);
ASSERT(!m_reader);
m_client = client;
- m_rawData = adoptPtr(new ArrayBufferBuilder());
+ m_rawData = wrapUnique(new ArrayBufferBuilder());
m_reader = handle->obtainReader(this);
}
@@ -191,10 +193,10 @@ protected:
m_client.clear();
}
- OwnPtr<FetchDataConsumerHandle::Reader> m_reader;
+ std::unique_ptr<FetchDataConsumerHandle::Reader> m_reader;
Member<FetchDataLoader::Client> m_client;
- OwnPtr<ArrayBufferBuilder> m_rawData;
+ std::unique_ptr<ArrayBufferBuilder> m_rawData;
};
class FetchDataLoaderAsString
@@ -277,10 +279,10 @@ protected:
m_client.clear();
}
- OwnPtr<FetchDataConsumerHandle::Reader> m_reader;
+ std::unique_ptr<FetchDataConsumerHandle::Reader> m_reader;
Member<FetchDataLoader::Client> m_client;
- OwnPtr<TextResourceDecoder> m_decoder;
+ std::unique_ptr<TextResourceDecoder> m_decoder;
StringBuilder m_builder;
};
@@ -369,7 +371,7 @@ protected:
m_outStream.clear();
}
- OwnPtr<FetchDataConsumerHandle::Reader> m_reader;
+ std::unique_ptr<FetchDataConsumerHandle::Reader> m_reader;
Member<FetchDataLoader::Client> m_client;
Member<Stream> m_outStream;

Powered by Google App Engine
This is Rietveld 408576698