third_party/WebKit/Source/core/loader/FrameLoader.cpp - Issue 2080623002: Revert "Remove OwnPtr from Blink."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/loader/FrameLoader.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:

Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp

diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp

index 8be7514cc67d7bc098861f0535720d03c1da2c37..4f8c4d0a9cb3e3ed7f94be0bad612c82b8b0cdd3 100644

--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp

+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp

@@ -99,7 +99,6 @@

#include "wtf/TemporaryChange.h"

#include "wtf/text/CString.h"

#include "wtf/text/WTFString.h"

-#include <memory>

using blink::WebURLRequest;

@@ -1598,9 +1597,9 @@ SecurityContext::InsecureNavigationsSet* FrameLoader::insecureNavigationsToUpgra

return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade();

}

-std::unique_ptr<TracedValue> FrameLoader::toTracedValue() const

+PassOwnPtr<TracedValue> FrameLoader::toTracedValue() const

{

- std::unique_ptr<TracedValue> tracedValue = TracedValue::create();

+ OwnPtr<TracedValue> tracedValue = TracedValue::create();

tracedValue->beginDictionary("frame");

tracedValue->setString("id_ref", String::format("0x%" PRIx64, static_cast<uint64_t>(reinterpret_cast<uintptr_t>(m_frame.get()))));

tracedValue->endDictionary();