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

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

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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.cpp
diff --git a/third_party/WebKit/Source/platform/network/ResourceTimingInfo.cpp b/third_party/WebKit/Source/platform/network/ResourceTimingInfo.cpp
index 064cc455f53795a771dfdc95e4f23990251388f5..03d02971ef685fc434935a7dbf71326a0b2fc4a7 100644
--- a/third_party/WebKit/Source/platform/network/ResourceTimingInfo.cpp
+++ b/third_party/WebKit/Source/platform/network/ResourceTimingInfo.cpp
@@ -5,14 +5,12 @@
#include "platform/network/ResourceTimingInfo.h"
#include "platform/CrossThreadCopier.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
namespace blink {
-std::unique_ptr<ResourceTimingInfo> ResourceTimingInfo::adopt(std::unique_ptr<CrossThreadResourceTimingInfoData> data)
+PassOwnPtr<ResourceTimingInfo> ResourceTimingInfo::adopt(PassOwnPtr<CrossThreadResourceTimingInfoData> data)
{
- std::unique_ptr<ResourceTimingInfo> info = ResourceTimingInfo::create(AtomicString(data->m_type), data->m_initialTime, data->m_isMainResource);
+ OwnPtr<ResourceTimingInfo> info = ResourceTimingInfo::create(AtomicString(data->m_type), data->m_initialTime, data->m_isMainResource);
info->m_originalTimingAllowOrigin = AtomicString(data->m_originalTimingAllowOrigin);
info->m_loadFinishTime = data->m_loadFinishTime;
info->m_initialRequest = ResourceRequest(data->m_initialRequest.get());
@@ -22,9 +20,9 @@ std::unique_ptr<ResourceTimingInfo> ResourceTimingInfo::adopt(std::unique_ptr<Cr
return info;
}
-std::unique_ptr<CrossThreadResourceTimingInfoData> ResourceTimingInfo::copyData() const
+PassOwnPtr<CrossThreadResourceTimingInfoData> ResourceTimingInfo::copyData() const
{
- std::unique_ptr<CrossThreadResourceTimingInfoData> data = wrapUnique(new CrossThreadResourceTimingInfoData);
+ OwnPtr<CrossThreadResourceTimingInfoData> data = adoptPtr(new CrossThreadResourceTimingInfoData);
data->m_type = m_type.getString().isolatedCopy();
data->m_originalTimingAllowOrigin = m_originalTimingAllowOrigin.getString().isolatedCopy();
data->m_initialTime = m_initialTime;

Powered by Google App Engine
This is Rietveld 408576698