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

Unified Diff: third_party/WebKit/Source/platform/network/ResourceTimingInfo.h

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/platform/network/ResourceTimingInfo.h
diff --git a/third_party/WebKit/Source/platform/network/ResourceTimingInfo.h b/third_party/WebKit/Source/platform/network/ResourceTimingInfo.h
index da3c5b51684f8ede570d41f05fdff72faf8d76eb..f7ff7c1655655ea5c158af4d28cb01561c31bc99 100644
--- a/third_party/WebKit/Source/platform/network/ResourceTimingInfo.h
+++ b/third_party/WebKit/Source/platform/network/ResourceTimingInfo.h
@@ -37,7 +37,9 @@
#include "wtf/Allocator.h"
#include "wtf/Functional.h"
#include "wtf/Noncopyable.h"
+#include "wtf/PtrUtil.h"
#include "wtf/text/AtomicString.h"
+#include <memory>
namespace blink {
@@ -47,14 +49,14 @@ class PLATFORM_EXPORT ResourceTimingInfo {
USING_FAST_MALLOC(ResourceTimingInfo);
WTF_MAKE_NONCOPYABLE(ResourceTimingInfo);
public:
- static PassOwnPtr<ResourceTimingInfo> create(const AtomicString& type, const double time, bool isMainResource)
+ static std::unique_ptr<ResourceTimingInfo> create(const AtomicString& type, const double time, bool isMainResource)
{
- return adoptPtr(new ResourceTimingInfo(type, time, isMainResource));
+ return wrapUnique(new ResourceTimingInfo(type, time, isMainResource));
}
- static PassOwnPtr<ResourceTimingInfo> adopt(PassOwnPtr<CrossThreadResourceTimingInfoData>);
+ static std::unique_ptr<ResourceTimingInfo> adopt(std::unique_ptr<CrossThreadResourceTimingInfoData>);
// Gets a copy of the data suitable for passing to another thread.
- PassOwnPtr<CrossThreadResourceTimingInfoData> copyData() const;
+ std::unique_ptr<CrossThreadResourceTimingInfoData> copyData() const;
double initialTime() const { return m_initialTime; }
bool isMainResource() const { return m_isMainResource; }
@@ -112,15 +114,15 @@ public:
String m_originalTimingAllowOrigin;
double m_initialTime;
double m_loadFinishTime;
- OwnPtr<CrossThreadResourceRequestData> m_initialRequest;
- OwnPtr<CrossThreadResourceResponseData> m_finalResponse;
- Vector<OwnPtr<CrossThreadResourceResponseData>> m_redirectChain;
+ std::unique_ptr<CrossThreadResourceRequestData> m_initialRequest;
+ std::unique_ptr<CrossThreadResourceResponseData> m_finalResponse;
+ Vector<std::unique_ptr<CrossThreadResourceResponseData>> m_redirectChain;
bool m_isMainResource;
};
template <>
struct CrossThreadCopier<ResourceTimingInfo> {
- typedef WTF::PassedWrapper<PassOwnPtr<CrossThreadResourceTimingInfoData>> Type;
+ typedef WTF::PassedWrapper<std::unique_ptr<CrossThreadResourceTimingInfoData>> Type;
static Type copy(const ResourceTimingInfo& info) { return passed(info.copyData()); }
};

Powered by Google App Engine
This is Rietveld 408576698